mono-jit (#167)

- fix alignment issue with jitcache that could cause a crash.
- Reimplement sparse-jit to only use 1 layer.
    - the old 2 layer approach basically only ever used 1 path due to the bottom-layer size, so doing a double look-up seemed wasteful.
    - changed memory block allocation stategy to allocate based on requested code range instead of the possible address-space.

Co-authored-by: LotP1 <68976644+LotP1@users.noreply.github.com>
Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/167

.forgejo/workflows/canary.yml

@@ -68,7 +68,7 @@ jobs:
           sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place '/^Name=Ryujinx$/s/Name=Ryujinx/Name=Ryujinx-Canary/' distribution/linux/Ryujinx.desktop
+          sed -r --in-place '/^Name=Ryujinx$/s/Name=Ryujinx/Name=Ryujinx-Canary/' distribution/linux/app.ryujinx.Ryujinx.desktop
         shell: bash
 
       - name: Create output dir

.gitignore

@@ -72,6 +72,9 @@ ipch/
 _ReSharper*/
 *.[Rr]e[Ss]harper
 
+# .NET
+.dotnet-home/
+
 # TeamCity is a build add-in
 _TeamCity*
 

Directory.Packages.props

@@ -3,12 +3,12 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.3.15" />
+    <PackageVersion Include="Avalonia" Version="11.3.18" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.15" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.15" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.15" />
-    <PackageVersion Include="SharpCompress" Version="0.48.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.18" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.18" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.18" />
+    <PackageVersion Include="SharpCompress" Version="0.49.1" />
     <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.9.5" />
     <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
@@ -27,7 +27,7 @@
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.18.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.19.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -39,21 +39,20 @@
     <!-- OpenTk.Audio.OpenAL has moved to OpenTk.Audio -->
     <!--<PackageVersion Include="OpenTK.Audio" Version="5.0.0-pre.15" />-->
     <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
-    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.9.4" />
     <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
     <!-- Ryujinx.Audio.OpenAL.Dependencies is from the original project, last updated 12/30/20 -->
     <!--<PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />-->
-    <PackageVersion Include="Ryujinx.Audio.OpenAL" Version="1.25.1" />
+    <PackageVersion Include="Ryujinx.Audio.OpenAL" Version="1.25.2" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.4-build6" />
-    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.3" />
+    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.4" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="2.0.6" />
     <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="2.0.6" />
     <PackageVersion Include="Gommon" Version="2.8.1.2" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageVersion Include="Sep" Version="0.14.1" />
-    <PackageVersion Include="shaderc.net" Version="0.1.0" />
+    <PackageVersion Include="Sep" Version="0.15.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
+    <PackageVersion Include="Silk.NET.Shaderc" Version="2.23.0" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.23.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.23.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.23.0" />
@@ -63,6 +62,6 @@
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
     <PackageVersion Include="System.IO.Hashing" Version="9.0.15" />
-    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.3" />
+    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
   </ItemGroup>
 </Project>

README.md

@@ -40,8 +40,14 @@
 
 ## Usage
 
-To run this emulator, your PC must be equipped with at least 8GiB of RAM;
-failing to meet this requirement may result in a poor gameplay experience or unexpected crashes.
+To run this emulator, your PC must be equipped with at least:
+- 8GiB of RAM 
+- 6 cores
+- A GPU released within the last 10 years.
+- OpenGL 4.6 | Vulkan 1.4
+- Windows 10 version 20H1 | macOS Big Sur (Apple Silicon)
+
+Failing to meet these requirements may result in a poor gameplay experience or unexpected crashes.
 
 ## Latest build
 

assets/Locales/Amiibo.json

@@ -0,0 +1,229 @@
+{
+  "Locales": [
+		{
+      "ID": "WindowTitle",
+      "Translations": {
+        "ar_SA": "أميبو",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Amiibo",
+        "es_ES": null,
+        "fr_FR": null,
+        "he_IL": "אמיבו",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": null,
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": null,
+        "ru_RU": null,
+        "sv_SE": null,
+        "th_TH": "อมิโบ้",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": null,
+        "zh_TW": null
+      }
+    },
+    {
+      "ID": "SeriesLabel",
+      "Translations": {
+        "ar_SA": "سلسلة",
+        "de_DE": "Serie",
+        "el_GR": "Σειρά",
+        "en_US": "Series",
+        "es_ES": "Serie",
+        "fr_FR": "Séries",
+        "he_IL": "סדרה",
+        "it_IT": "Serie",
+        "ja_JP": "シリーズ",
+        "ko_KR": "시리즈",
+        "no_NO": "Serie",
+        "pl_PL": "Seria",
+        "pt_BR": "Série",
+        "ru_RU": "Серия",
+        "sv_SE": "Serie",
+        "th_TH": "ซีรีส์",
+        "tr_TR": "Seri",
+        "uk_UA": "Серія",
+        "zh_CN": "系列",
+        "zh_TW": "系列"
+      }
+    },
+    {
+      "ID": "ShowAllAmiiboLabel",
+      "Translations": {
+        "ar_SA": "إظهار الكل Amiibo",
+        "de_DE": "Alle Amiibo anzeigen",
+        "el_GR": "Εμφάνιση Όλων των Amiibo",
+        "en_US": "Show All Amiibo",
+        "es_ES": "Mostrar Todas las Amiibo",
+        "fr_FR": "Afficher Tous les Amiibo",
+        "he_IL": "הצג הכל Amiibo",
+        "it_IT": "Mostra tutti gli Amiibo",
+        "ja_JP": "すべてのAmiiboを表示",
+        "ko_KR": "모든 Amiibo 표시",
+        "no_NO": "Vis alle Amiibo",
+        "pl_PL": "Pokaż Wszystkie Amiibo",
+        "pt_BR": "Mostrar Todos os Amiibo",
+        "ru_RU": "Показывать все Amiibo",
+        "sv_SE": "Visa alla Amiibo",
+        "th_TH": "แสดง Amiibo ทั้งหมด",
+        "tr_TR": "Tüm Amiibo'ları Göster",
+        "uk_UA": "Показати всі Amiibo",
+        "zh_CN": "显示所有 Amiibo",
+        "zh_TW": "顯示所有 Amiibo"
+      }
+    },
+    {
+      "ID": "UseRandomUuidLabel",
+      "Translations": {
+        "ar_SA": "استخدام UUID عشوائي",
+        "de_DE": "Zufällige UUID verwenden",
+        "el_GR": "Χρήση τυχαίου UUID",
+        "en_US": "Use Random UUID",
+        "es_ES": "Usar UUID aleatorio",
+        "fr_FR": "Utiliser un UUID aléatoire",
+        "he_IL": "השתמש ב-UUID אקראי",
+        "it_IT": "Usa UUID casuale",
+        "ja_JP": "ランダム UUID を使用",
+        "ko_KR": "무작위 UUID 사용",
+        "no_NO": "Bruk tilfeldig UUID",
+        "pl_PL": "Użyj losowego UUID",
+        "pt_BR": "Usar UUID aleatório",
+        "ru_RU": "Использовать случайный UUID",
+        "sv_SE": "Använd slumpmässig UUID",
+        "th_TH": "ใช้ UUID แบบสุ่ม",
+        "tr_TR": "Rastgele UUID kullan",
+        "uk_UA": "Використовувати випадковий UUID",
+        "zh_CN": "使用随机 UUID",
+        "zh_TW": "使用隨機 UUID"
+      }
+    },
+    {
+      "ID": "PauseEmulationWhileScanningAmiibo",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Emulation während des Scannens pausieren",
+        "el_GR": "",
+        "en_US": "Pause Emulation While Scanning",
+        "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": "UsageLabel",
+      "Translations": {
+        "ar_SA": "الاستخدام:",
+        "de_DE": "Nutzung:",
+        "el_GR": "Χρήση:",
+        "en_US": "Usage:",
+        "es_ES": "Uso:",
+        "fr_FR": "Utilisation :",
+        "he_IL": "שימוש:",
+        "it_IT": "Utilizzo:",
+        "ja_JP": "使用法：",
+        "ko_KR": "사용법:",
+        "no_NO": "Forbruk:",
+        "pl_PL": "Użycie:",
+        "pt_BR": "Uso:",
+        "ru_RU": "Применение:",
+        "sv_SE": "Användning:",
+        "th_TH": "การใช้งาน:",
+        "tr_TR": "Kullanım:",
+        "uk_UA": "Використання:",
+        "zh_CN": "用法：",
+        "zh_TW": "用途："
+      }
+    },
+    {
+      "ID": "WritableLabel",
+      "Translations": {
+        "ar_SA": "الاستخدام (يمكنه حفظ البيانات):",
+        "de_DE": "Nutzung (Kann Daten speichern):",
+        "el_GR": "Χρήση (Μπορεί να αποθηκεύσει δεδομένα):",
+        "en_US": "Usage (Can Save Data):",
+        "es_ES": "Uso (Puede guardar datos):",
+        "fr_FR": "Utilisation (Peut enregistrer des données) :",
+        "he_IL": "שימוש (יכול לשמור נתונים):",
+        "it_IT": "Utilizzo (Può salvare dati):",
+        "ja_JP": "使用法（データを保存できます）：",
+        "ko_KR": "사용법 (데이터 저장 가능):",
+        "no_NO": "Bruk (Kan lagre data):",
+        "pl_PL": "Użycie (Może zapisywać dane):",
+        "pt_BR": "Uso (Pode salvar dados):",
+        "ru_RU": "Применение (Может сохранять данные):",
+        "sv_SE": "Användning (Kan spara data):",
+        "th_TH": "การใช้งาน (สามารถบันทึกข้อมูลได้):",
+        "tr_TR": "Kullanım (Veri kaydedebilir):",
+        "uk_UA": "Використання (Може зберігати дані):",
+        "zh_CN": "用法（可保存数据）：",
+        "zh_TW": "用途（可儲存資料）："
+      }
+    },
+    {
+      "ID": "UnknownLabel",
+      "Translations": {
+        "ar_SA": "غير معروف",
+        "de_DE": "Unbekannt",
+        "el_GR": "Άγνωστο",
+        "en_US": "Unknown",
+        "es_ES": "Desconocido",
+        "fr_FR": "Inconnu",
+        "he_IL": "לא ידוע",
+        "it_IT": "Sconosciuto",
+        "ja_JP": "不明",
+        "ko_KR": "알 수 없음",
+        "no_NO": "Ukjent",
+        "pl_PL": "Nieznane",
+        "pt_BR": "Desconhecido",
+        "ru_RU": "Неизвестно",
+        "sv_SE": "Okänt",
+        "th_TH": "ไม่รู้จัก",
+        "tr_TR": "Bilinmeyen",
+        "uk_UA": "Невідомо",
+        "zh_CN": "未知",
+        "zh_TW": "未知"
+      }
+    },
+	  {
+      "ID": "ScanButton",
+      "Translations": {
+        "ar_SA": "فحص Amiibo",
+        "de_DE": "Amiibo einscannen",
+        "el_GR": "Σαρώστε το Amiibo",
+        "en_US": "Scan Amiibo",
+        "es_ES": "Escanear Amiibo",
+        "fr_FR": "Scanner l'Amiibo",
+        "he_IL": "סרוק את ה-Amiibo",
+        "it_IT": "Scansiona l'Amiibo",
+        "ja_JP": "Amiiboをスキャン",
+        "ko_KR": "Amiibo 스캔하기",
+        "no_NO": "Skanne Amiibo",
+        "pl_PL": "Zeskanuj Amiibo",
+        "pt_BR": "Escanear Amiibo",
+        "ru_RU": "Сканировать Amiibo",
+        "sv_SE": "Skanna Amiibo",
+        "th_TH": "สแกน Amiibo",
+        "tr_TR": "Amiibo'yu tara",
+        "uk_UA": "Сканувати Amiibo",
+        "zh_CN": "扫描 Amiibo",
+        "zh_TW": "掃描 Amiibo"
+      }
+    }
+  ]
+}

assets/Locales/Common_Buttons.json

@@ -0,0 +1,29 @@
+{
+  "Locales": [
+    {
+      "ID": "Cancel",
+      "Translations": {
+        "ar_SA": "إلغاء",
+        "de_DE": "Abbrechen",
+        "el_GR": "Ακύρωση",
+        "en_US": "Cancel",
+        "es_ES": "Cancelar",
+        "fr_FR": "Annuler",
+        "he_IL": "ביטול",
+        "it_IT": "Annulla",
+        "ja_JP": "キャンセル",
+        "ko_KR": "취소",
+        "no_NO": "Avbryt",
+        "pl_PL": "Anuluj",
+        "pt_BR": "Cancelar",
+        "ru_RU": "Отмена",
+        "sv_SE": "Avbryt",
+        "th_TH": "ยกเลิก",
+        "tr_TR": "İptal",
+        "uk_UA": "Скасувати",
+        "zh_CN": "取消",
+        "zh_TW": "取消"
+      }
+    }
+  ]
+}

assets/Locales/Common_FilePicker.json

@@ -0,0 +1,29 @@
+{
+  "Locales": [
+    {
+      "ID": "AllSupportedFormats",
+      "Translations": {
+        "ar_SA": "كل التنسيقات المدعومة",
+        "de_DE": "Alle unterstützten Formate",
+        "el_GR": "Όλες Οι Υποστηριζόμενες Μορφές",
+        "en_US": "All Supported Formats",
+        "es_ES": "Todos los Formatos Soportados",
+        "fr_FR": "Tous les Formats Supportés",
+        "he_IL": "כל הפורמטים הנתמכים",
+        "it_IT": "Tutti i formati supportati",
+        "ja_JP": "すべての対応フォーマット",
+        "ko_KR": "지원되는 모든 형식",
+        "no_NO": "Alle støttede formater",
+        "pl_PL": "Wszystkie Obsługiwane Formaty",
+        "pt_BR": "Todos os Formatos Suportados",
+        "ru_RU": "Все поддерживаемые форматы",
+        "sv_SE": "Alla format som stöds",
+        "th_TH": "รูปแบบที่รองรับทั้งหมด",
+        "tr_TR": "Tüm Desteklenen Formatlar",
+        "uk_UA": "Усі підтримувані формати",
+        "zh_CN": "所有支持的格式",
+        "zh_TW": "所有支援的格式"
+      }
+    }
+  ]
+}

assets/Locales/Common_Search.json

@@ -0,0 +1,54 @@
+{
+  "Locales": [
+    {
+      "ID": "SearchAmiiboWatermark",
+      "Translations": {
+        "ar_SA": "بحث Amiibo...",
+        "de_DE": "Amiibo suchen...",
+        "el_GR": "Αναζήτηση Amiibo...",
+        "en_US": "Search Amiibo...",
+        "es_ES": "Buscar Amiibo...",
+        "fr_FR": "Rechercher Amiibo...",
+        "he_IL": "חפש Amiibo...",
+        "it_IT": "Cerca Amiibo...",
+        "ja_JP": "Amiiboを検索...",
+        "ko_KR": "Amiibo 검색...",
+        "no_NO": "Søk Amiibo...",
+        "pl_PL": "Wyszukaj Amiibo...",
+        "pt_BR": "Buscar Amiibo...",
+        "ru_RU": "Поиск Amiibo...",
+        "sv_SE": "Sök Amiibo...",
+        "th_TH": "ค้นหา Amiibo...",
+        "tr_TR": "Amiibo Ara...",
+        "uk_UA": "Пошук Amiibo...",
+        "zh_CN": "搜索 Amiibo...",
+        "zh_TW": "搜尋 Amiibo..."
+      }
+    },
+    {
+      "ID": "SearchWatermark",
+      "Translations": {
+        "ar_SA": "بحث",
+        "de_DE": "Suche",
+        "el_GR": "Αναζήτηση",
+        "en_US": "Search",
+        "es_ES": "Buscar",
+        "fr_FR": "Rechercher",
+        "he_IL": "חפש",
+        "it_IT": "Cerca",
+        "ja_JP": "検索",
+        "ko_KR": "찾기",
+        "no_NO": "Søk",
+        "pl_PL": "Wyszukaj",
+        "pt_BR": "Buscar",
+        "ru_RU": "Поиск",
+        "sv_SE": "Sök",
+        "th_TH": "ค้นหา",
+        "tr_TR": "Ara",
+        "uk_UA": "Пошук",
+        "zh_CN": "搜索",
+        "zh_TW": "搜尋"
+      }
+    }
+  ]
+}

assets/Locales/Common_Sort.json

@@ -0,0 +1,129 @@
+{
+  "Locales": [
+    {
+      "ID": "NameLabel",
+      "Translations": {
+        "ar_SA": "الاسم",
+        "de_DE": "",
+        "el_GR": "Όνομα",
+        "en_US": "Name",
+        "es_ES": "Nombre",
+        "fr_FR": "Nom",
+        "he_IL": "שם",
+        "it_IT": "Nome",
+        "ja_JP": "名称",
+        "ko_KR": "이름",
+        "no_NO": "Navn",
+        "pl_PL": "Nazwa",
+        "pt_BR": "Nome",
+        "ru_RU": "Название",
+        "sv_SE": "Namn",
+        "th_TH": "ชื่อ",
+        "tr_TR": "İsim",
+        "uk_UA": "Назва",
+        "zh_CN": "名称",
+        "zh_TW": "名稱"
+      }
+    },
+    {
+      "ID": "SavingsLabel",
+      "Translations": {
+        "ar_SA": "التوفير",
+        "de_DE": "Einsparung",
+        "el_GR": "Εξοικονόμηση",
+        "en_US": "Savings",
+        "es_ES": "Ahorro",
+        "fr_FR": "Économies",
+        "he_IL": "חיסכון",
+        "it_IT": "Risparmio",
+        "ja_JP": "節約",
+        "ko_KR": "절약",
+        "no_NO": "Besparelse",
+        "pl_PL": "Oszczędność",
+        "pt_BR": "Economia",
+        "ru_RU": "Экономия",
+        "sv_SE": "Besparing",
+        "th_TH": "การประหยัด",
+        "tr_TR": "Tasarruf",
+        "uk_UA": "Економія",
+        "zh_CN": "节省",
+        "zh_TW": "節省"
+      }
+    },
+    {
+      "ID": "TrimStatusLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Trimmstatus",
+        "el_GR": "",
+        "en_US": "Trim Status",
+        "es_ES": "Estado del recorte",
+        "fr_FR": "État de réduction",
+        "he_IL": "",
+        "it_IT": "Stato della riduzione",
+        "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": "OrderAscending",
+      "Translations": {
+        "ar_SA": "تصاعدي",
+        "de_DE": "Aufsteigend",
+        "el_GR": "Αύξουσα",
+        "en_US": "Ascending",
+        "es_ES": "Ascendente",
+        "fr_FR": "Croissant",
+        "he_IL": "סדר עולה",
+        "it_IT": "Crescente",
+        "ja_JP": "昇順",
+        "ko_KR": "오름차순",
+        "no_NO": "Stigende",
+        "pl_PL": "Rosnąco",
+        "pt_BR": "Ascendente",
+        "ru_RU": "По Возрастанию",
+        "sv_SE": "Stigande",
+        "th_TH": "จากน้อยไปมาก",
+        "tr_TR": "Artan",
+        "uk_UA": "За зростанням",
+        "zh_CN": "升序",
+        "zh_TW": "從小到大"
+      }
+    },
+    {
+      "ID": "OrderDescending",
+      "Translations": {
+        "ar_SA": "تنازلي",
+        "de_DE": "Absteigend",
+        "el_GR": "Φθίνουσα",
+        "en_US": "Descending",
+        "es_ES": "Descendente",
+        "fr_FR": "Décroissant",
+        "he_IL": "סדר יורד",
+        "it_IT": "Decrescente",
+        "ja_JP": "降順",
+        "ko_KR": "내림차순",
+        "no_NO": "Synkende",
+        "pl_PL": "Malejąco",
+        "pt_BR": "Descendente",
+        "ru_RU": "По Убыванию",
+        "sv_SE": "Fallande",
+        "th_TH": "จากมากไปน้อย",
+        "tr_TR": "Azalan",
+        "uk_UA": "За спаданням",
+        "zh_CN": "降序",
+        "zh_TW": "從大到小"
+      }
+    }
+  ]
+}

assets/Locales/Dialog_Amiibo.json

@@ -0,0 +1,179 @@
+{
+  "Locales": [
+    {
+      "ID": "ScanAmiiboFromBinFilePickerTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Wähle eine BIN-Datei aus, um ein Amiibo zu scannen.",
+        "el_GR": "",
+        "en_US": "Select a BIN file to scan an Amiibo from",
+        "es_ES": "Selecciona un archivo BIN para escanear un Amiibo",
+        "fr_FR": "Sélectionnez un fichier BIN pour scanner un Amiibo",
+        "he_IL": "",
+        "it_IT": "Seleziona un file BIN da cui scansionare un Amiibo",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Selecione um arquivo BIN para escanear um Amiibo",
+        "ru_RU": "Выберите BIN-файл для сканирования Amiibo",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Виберіть BIN-файл для сканування Amiibo",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "APITitle",
+      "Translations": {
+        "ar_SA": "أميبو API",
+        "de_DE": "Amiibo-API",
+        "el_GR": "API για Amiibo.",
+        "en_US": "Amiibo API",
+        "es_ES": "API Amiibo",
+        "fr_FR": "API Amiibo",
+        "he_IL": "ממשק תכנות אמיבו",
+        "it_IT": "API Amiibo",
+        "ja_JP": "",
+        "ko_KR": null,
+        "no_NO": "",
+        "pl_PL": "API Amiibo",
+        "pt_BR": "API Amiibo",
+        "ru_RU": "API Amiibo",
+        "sv_SE": "Amiibo-API",
+        "th_TH": "อามิโบ้ API",
+        "tr_TR": "",
+        "uk_UA": "API Amiibo",
+        "zh_CN": null,
+        "zh_TW": null
+      }
+    },
+    {
+      "ID": "APIFailFetchMessage",
+      "Translations": {
+        "ar_SA": "حدث خطأ أثناء جلب المعلومات من API.",
+        "de_DE": "Beim Abrufen von Informationen aus der API ist ein Fehler aufgetreten.",
+        "el_GR": "Παρουσιάστηκε σφάλμα κατά την ανάκτηση πληροφοριών από το API.",
+        "en_US": "An error occured while fetching information from the API.",
+        "es_ES": "Ocurrió un error al recibir información de la API.",
+        "fr_FR": "Une erreur est survenue lors de la récupération des informations de l'API.",
+        "he_IL": "אירעה שגיאה בעת שליפת מידע מהממשק.",
+        "it_IT": "Si è verificato un errore durante il recupero delle informazioni dall'API.",
+        "ja_JP": "API からの情報取得中にエラーが発生しました.",
+        "ko_KR": "API에서 정보를 가져오는 중에 오류가 발생했습니다.",
+        "no_NO": "En feil oppstod under henting av informasjon fra API.",
+        "pl_PL": "Wystąpił błąd podczas pobierania informacji z API.",
+        "pt_BR": "Um erro ocorreu ao tentar obter informações da API.",
+        "ru_RU": "Произошла ошибка при получении информации из API.",
+        "sv_SE": "Ett fel inträffade vid hämtning av information från API.",
+        "th_TH": "เกิดข้อผิดพลาดขณะเรียกข้อมูลจาก API",
+        "tr_TR": "API'dan bilgi alırken bir hata oluştu.",
+        "uk_UA": "Під час отримання інформації з API сталася помилка.",
+        "zh_CN": "从 API 获取信息时出错。",
+        "zh_TW": "從 API 取得資訊時出現錯誤。"
+      }
+    },
+    {
+      "ID": "APIConnectErrorMessage",
+      "Translations": {
+        "ar_SA": "غير قادر على الاتصال بخادم API أميبو. قد تكون الخدمة معطلة أو قد تحتاج إلى التحقق من اتصالك بالإنترنت.",
+        "de_DE": "Verbindung zum Amiibo API Server kann nicht hergestellt werden. Der Dienst ist möglicherweise nicht verfügbar oder es existiert keine Internetverbindung.",
+        "el_GR": "Δεν είναι δυνατή η σύνδεση με τον διακομιστή Amiibo API. Η υπηρεσία μπορεί να είναι εκτός λειτουργίας ή μπορεί να χρειαστεί να επαληθεύσετε ότι έχετε ενεργή σύνδεσή στο Διαδίκτυο.",
+        "en_US": "Unable to connect to Amiibo API server. The service may be down or you may need to verify your internet connection is online.",
+        "es_ES": "No se pudo conectar al servidor de la API Amiibo. El servicio puede estar caído o tu conexión a internet puede haberse desconectado.",
+        "fr_FR": "Impossible de se connecter au serveur API Amiibo. Le service est peut-être hors service ou vous devriez peut-être vérifier que votre connexion internet est connectée.",
+        "he_IL": "לא ניתן להתחבר לממשק שרת האמיבו. ייתכן שהשירות מושבת או שתצטרך לוודא שהחיבור לאינטרנט שלך מקוון.",
+        "it_IT": "Impossibile connettersi al server dell'API Amiibo. Il servizio potrebbe non essere disponibile o potresti non essere connesso a Internet.",
+        "ja_JP": "Amiibo API サーバに接続できませんでした. サーバがダウンしているか, インターネット接続に問題があるかもしれません.",
+        "ko_KR": "Amiibo API 서버에 연결할 수 없습니다. 서비스가 다운되었거나 인터넷 연결이 온라인 상태인지 확인이 필요합니다.",
+        "no_NO": "Kan ikke koble til Amiibo API server. Tjenesten kan være nede, eller du må kanskje verifisere at din internettforbindelse er tilkoblet.",
+        "pl_PL": "Nie można połączyć się z serwerem API Amiibo. Usługa może nie działać lub może być konieczne sprawdzenie, czy połączenie internetowe jest online.",
+        "pt_BR": "Não foi possível conectar ao servidor da API Amiibo. O serviço pode estar fora do ar ou você precisa verificar sua conexão com a Internet.",
+        "ru_RU": "Не удалось подключиться к серверу Amiibo API. Служба может быть недоступна или вам может потребоваться проверить ваше интернет-соединение.",
+        "sv_SE": "Kunde inte ansluta till Amiibo API-server. Tjänsten kanske är nere eller så behöver du kontrollera att din internetanslutning fungerar.",
+        "th_TH": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ Amiibo API บางบริการอาจหยุดทำงาน หรือไม่คุณต้องทำการตรวจสอบว่าอินเทอร์เน็ตของคุณอยู่ในสถานะเชื่อมต่ออยู่หรือไม่",
+        "tr_TR": "Amiibo API sunucusuna bağlanılamadı. Sunucu çevrimdışı olabilir veya uygun bir internet bağlantınızın olduğunu kontrol etmeniz gerekebilir.",
+        "uk_UA": "Неможливо підключитися до сервера Amiibo API. Можливо, служба не працює або вам потрібно перевірити, чи є підключення до Інтернету.",
+        "zh_CN": "无法连接到 Amiibo API 服务器，服务可能已关闭，或者没有连接互联网。",
+        "zh_TW": "無法連接 Amiibo API 伺服器。服務可能已停機，或者您可能需要確認網際網路連線是否在線上。"
+      }
+    },
+    {
+      "ID": "RenameAmiiboTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Amiibo umbenennen",
+        "el_GR": "",
+        "en_US": "Rename Amiibo",
+        "es_ES": "Renombrar Amiibo",
+        "fr_FR": "Renommer l'Amiibo",
+        "he_IL": "",
+        "it_IT": "Rinomina Amiibo",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Renomear Amiibo",
+        "ru_RU": "Переименовать Amiibo",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Перейменувати Amiibo",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+	  {
+      "ID": "ScanAmiiboTitle",
+      "Translations": {
+        "ar_SA": "فحص Amiibo",
+        "de_DE": "Amiibo einscannen",
+        "el_GR": "Σαρώστε το Amiibo",
+        "en_US": "Scan Amiibo",
+        "es_ES": "Escanear Amiibo",
+        "fr_FR": "Scanner l'Amiibo",
+        "he_IL": "סרוק את ה-Amiibo",
+        "it_IT": "Scansiona l'Amiibo",
+        "ja_JP": "Amiiboをスキャン",
+        "ko_KR": "Amiibo 스캔하기",
+        "no_NO": "Skanne Amiibo",
+        "pl_PL": "Zeskanuj Amiibo",
+        "pt_BR": "Escanear Amiibo",
+        "ru_RU": "Сканировать Amiibo",
+        "sv_SE": "Skanna Amiibo",
+        "th_TH": "สแกน Amiibo",
+        "tr_TR": "Amiibo'yu tara",
+        "uk_UA": "Сканувати Amiibo",
+        "zh_CN": "扫描 Amiibo",
+        "zh_TW": "掃描 Amiibo"
+      }
+    },
+    {
+      "ID": "ScanAmiiboMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Bitte scanne jetzt dein Amiibo.",
+        "el_GR": "",
+        "en_US": "Please scan your Amiibo now.",
+        "es_ES": "Escanea tu Amiibo ahora.",
+        "fr_FR": "Veuillez scannez votre Amiibo.",
+        "he_IL": "",
+        "it_IT": "Scansiona ora il tuo Amiibo.",
+        "ja_JP": "",
+        "ko_KR": "지금 Amiibo를 스캔하세요.",
+        "no_NO": "Vennligst skann Amiiboene dine nå.",
+        "pl_PL": "",
+        "pt_BR": "Por favor, escaneie seu Amiibo agora.",
+        "ru_RU": "Пожалуйста, сканируйте ваш Amiibo.",
+        "sv_SE": "Skanna din Amiibo nu.",
+        "th_TH": "กรุณาสแกน Amiibo ของคุณตอนนี้",
+        "tr_TR": "",
+        "uk_UA": "Будь ласка, проскануйте Ваш Amiibo.",
+        "zh_CN": "请现在扫描你的 Amiibo",
+        "zh_TW": "請掃描你的 Amiibo。"
+      }
+    }
+  ]
+}

assets/Locales/Dialog_ContentLoading.json

@@ -0,0 +1,104 @@
+{
+  "Locales": [
+    {
+      "ID": "UpdatesAddedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Updates hinzugefügt: {0}",
+        "el_GR": "",
+        "en_US": "Updates Added: {0}",
+        "es_ES": "Actualizaciones Añadidas: {0}",
+        "fr_FR": "Mises à Jour Ajoutées : {0}",
+        "he_IL": "",
+        "it_IT": "Aggiornamenti aggiunti: {0}",
+        "ja_JP": "",
+        "ko_KR": "추가된 업데이트: {0}",
+        "no_NO": "Oppdateringer lagt til: {0}",
+        "pl_PL": "",
+        "pt_BR": "Atualizações adicionadas: {0}",
+        "ru_RU": "Добавлено обновлений: {0}",
+        "sv_SE": "Tillagda uppdateringar: {0}",
+        "th_TH": "การอัปเดตที่เพิ่มเข้ามา: {0}",
+        "tr_TR": "",
+        "uk_UA": "Додані оновлення: {0}",
+        "zh_CN": "已添加更新：{0}",
+        "zh_TW": "已新增更新：{0}"
+      }
+    },
+    {
+      "ID": "UpdatesRemovedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Updates entfernt: {0}",
+        "el_GR": "",
+        "en_US": "Updates Removed: {0}",
+        "es_ES": "Actualizaciones Eliminadas: {0}",
+        "fr_FR": "Mises à Jour Supprimées : {0}",
+        "he_IL": "",
+        "it_IT": "Aggiornamenti rimossi: {0}",
+        "ja_JP": "",
+        "ko_KR": "제거된 업데이트: {0}",
+        "no_NO": "Fjernede oppdateringer: {0}",
+        "pl_PL": "",
+        "pt_BR": "Atualizações removidas: {0}",
+        "ru_RU": "Удалено обновлений: {0}",
+        "sv_SE": "Borttagna uppdateringar: {0}",
+        "th_TH": "การอัปเดตที่ถูกลบ: {0}",
+        "tr_TR": "",
+        "uk_UA": "Видалені оновлення: {0}",
+        "zh_CN": "已移除更新：{0}",
+        "zh_TW": "已移除更新：{0}"
+      }
+    },
+    {
+      "ID": "DLCAddedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "DLC hinzugefügt: {0}",
+        "el_GR": "",
+        "en_US": "DLC Added: {0}",
+        "es_ES": "DLC Añadidos: {0}",
+        "fr_FR": "DLC Ajoutés : {0}",
+        "he_IL": "",
+        "it_IT": "DLC aggiunti: {0}",
+        "ja_JP": "",
+        "ko_KR": "추가된 DLC: {0}",
+        "no_NO": "DLC lagt til: {0}",
+        "pl_PL": "",
+        "pt_BR": "DLC adicionados: {0}",
+        "ru_RU": "Добавлено DLC: {0}",
+        "sv_SE": "Tillagda DLC: {0}",
+        "th_TH": "DLC ที่เพิ่มเข้ามา: {0}",
+        "tr_TR": "",
+        "uk_UA": "Додані DLC: {0}",
+        "zh_CN": "已添加 DLC：{0}",
+        "zh_TW": "已新增 DLC：{0}"
+      }
+    },
+    {
+      "ID": "DLCRemovedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "DLC entfernt: {0}",
+        "el_GR": "",
+        "en_US": "DLC Removed: {0}",
+        "es_ES": "DLC Eliminados: {0}",
+        "fr_FR": "DLC Supprimés : {0}",
+        "he_IL": "",
+        "it_IT": "DLC rimossi: {0}",
+        "ja_JP": "",
+        "ko_KR": "제거된 DLC: {0}",
+        "no_NO": "DLC fjernet: {0}",
+        "pl_PL": "",
+        "pt_BR": "DLC removidos: {0}",
+        "ru_RU": "Удалено DLC: {0}",
+        "sv_SE": "DLC borttaget: {0}",
+        "th_TH": "ลบ DLC: {0}",
+        "tr_TR": "",
+        "uk_UA": "Видалено DLC: {0}",
+        "zh_CN": "已移除 DLC：{0}",
+        "zh_TW": "已移除 DLC：{0}"
+      }
+    }
+  ]
+}

assets/Locales/Dialog_FileMenu.json

@@ -0,0 +1,79 @@
+{
+  "Locales": [
+    {
+      "ID": "LoadApplicationFromFileFilePickerTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Wähle eine Switch-Anwendungsdatei zum Laden aus",
+        "el_GR": "",
+        "en_US": "Select a Switch application file to load",
+        "es_ES": "Selecciona un archivo de aplicación de Switch para cargar",
+        "fr_FR": "Sélectionnez un fichier d’application Switch à charger",
+        "he_IL": "",
+        "it_IT": "Seleziona un file applicazione Switch da caricare",
+        "ja_JP": "",
+        "ko_KR": "로드할 Switch 애플리케이션 파일을 선택하세요",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Selecione um arquivo de aplicativo Switch para carregar",
+        "ru_RU": "Выберите файл приложения Switch для загрузки",
+        "sv_SE": "Välj en Switch-applikationsfil att läsa in",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Виберіть файл застосунку Switch для завантаження",
+        "zh_CN": "请选择要加载的 Switch 应用程序文件",
+        "zh_TW": "請選擇要載入的 Switch 應用程式檔案"
+      }
+    },
+    {
+      "ID": "LoadUnpackedApplicationFromFolderFilePickerTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Wähle einen Ordner mit einer entpackten Switch-Anwendung zum Laden",
+        "el_GR": "",
+        "en_US": "Select a folder containing an unpacked Switch application to load",
+        "es_ES": "Selecciona una carpeta que contenga una aplicación de Switch descomprimida para cargar",
+        "fr_FR": "Sélectionnez un dossier contenant une application Switch décompressée à charger",
+        "he_IL": "",
+        "it_IT": "Seleziona una cartella contenente un’applicazione Switch non compressa da caricare",
+        "ja_JP": "",
+        "ko_KR": "압축 해제된 Switch 애플리케이션이 포함된 폴더를 선택하여 로드하세요",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Selecione uma pasta que contenha um aplicativo Switch descompactado para carregar",
+        "ru_RU": "Выберите папку, содержащую распакованное приложение Switch, для загрузки",
+        "sv_SE": "Välj en mapp som innehåller en uppackad Switch-applikation att läsa in",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Виберіть папку, що містить розпакований застосунок Switch, для завантаження",
+        "zh_CN": "请选择包含未打包 Switch 应用程序的文件夹以加载",
+        "zh_TW": "請選擇包含未解壓縮 Switch 應用程式的資料夾以載入"
+      }
+    },
+    {
+      "ID": "LoadUpdatesAndDLCFromFolderFilePickerTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Wähle einen oder mehrere Ordner zum Laden von Updates und DLC aus",
+        "el_GR": "",
+        "en_US": "Select one or more folders to bulk load updates and DLC from",
+        "es_ES": "Selecciona una o más carpetas para cargar de forma masiva actualizaciones y DLC",
+        "fr_FR": "Sélectionnez un ou plusieurs dossiers pour charger en masse des mises à jour et des DLC",
+        "he_IL": "",
+        "it_IT": "Seleziona una o più cartelle da cui caricare in blocco aggiornamenti e DLC",
+        "ja_JP": "",
+        "ko_KR": "업데이트 및 DLC를 대량으로 로드할 폴더를 하나 이상 선택하세요",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Selecione uma ou mais pastas para carregar em massa atualizações e DLC",
+        "ru_RU": "Выберите одну или несколько папок для массовой загрузки обновлений и DLC",
+        "sv_SE": "Välj en eller flera mappar för att massinläsa uppdateringar och DLC",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Виберіть одну або кілька папок для масового завантаження оновлень і DLC",
+        "zh_CN": "请选择一个或多个文件夹以批量加载更新和 DLC",
+        "zh_TW": "請選擇一個或多個資料夾以批次載入更新與 DLC"
+      }
+    }
+  ]
+}

assets/Locales/Dialog_FileTypeAssociations.json

@@ -0,0 +1,104 @@
+{
+  "Locales": [
+    {
+      "ID": "AssociationSuccessMessage",
+      "Translations": {
+        "ar_SA": "تم ربط أنواع الملفات بنجاح.",
+        "de_DE": "Dateitypen erfolgreich zugeordnet.",
+        "el_GR": "Οι τύποι αρχείων συσχετίστηκαν με επιτυχία.",
+        "en_US": "Successfully associated file types.",
+        "es_ES": "¡Tipos de archivo asociados con éxito.",
+        "fr_FR": "Types de fichiers associés avec succès.",
+        "he_IL": "שיוך סוגי הקבצים בוצע בהצלחה.",
+        "it_IT": "Tipi di file associati con successo.",
+        "ja_JP": "ファイルの種類の関連付けに成功しました。",
+        "ko_KR": "파일 형식 연결에 성공했습니다.",
+        "no_NO": "Filtyper ble tilknyttet.",
+        "pl_PL": "Pomyślnie powiązano typy plików.",
+        "pt_BR": "Tipos de arquivo associados com sucesso.",
+        "ru_RU": "Типы файлов успешно связаны.",
+        "sv_SE": "Filtyper har kopplats.",
+        "th_TH": "เชื่อมโยงประเภทไฟล์สำเร็จแล้ว",
+        "tr_TR": "Dosya türleri başarıyla ilişkilendirildi.",
+        "uk_UA": "Типи файлів успішно пов’язані.",
+        "zh_CN": "文件类型关联成功。",
+        "zh_TW": "檔案類型關聯成功。"
+      }
+    },
+    {
+      "ID": "RemoveAssociationSuccessMessage",
+      "Translations": {
+        "ar_SA": "تمت إزالة ارتباطات أنواع الملفات بنجاح.",
+        "de_DE": "Dateitypzuordnungen erfolgreich entfernt.",
+        "el_GR": "Οι συσχετίσεις τύπων αρχείων αφαιρέθηκαν με επιτυχία.",
+        "en_US": "Successfully removed file type associations.",
+        "es_ES": "Asociaciones de tipos de archivo eliminadas con éxito.",
+        "fr_FR": "Associations de types de fichiers supprimées avec succès.",
+        "he_IL": "שיוכי סוגי הקבצים הוסרו בהצלחה.",
+        "it_IT": "Associazioni dei tipi di file rimosse con successo.",
+        "ja_JP": "ファイルの種類の関連付けの削除に成功しました。",
+        "ko_KR": "파일 형식 연결이 성공적으로 제거되었습니다.",
+        "no_NO": "Filtype-tilknytninger ble fjernet.",
+        "pl_PL": "Pomyślnie usunięto skojarzenia typów plików.",
+        "pt_BR": "Associações de tipos de arquivo removidas com sucesso.",
+        "ru_RU": "Связи типов файлов успешно удалены.",
+        "sv_SE": "Filtypsassociationer har tagits bort.",
+        "th_TH": "ลบการเชื่อมโยงประเภทไฟล์สำเร็จแล้ว",
+        "tr_TR": "Dosya türü ilişkilendirmeleri başarıyla kaldırıldı.",
+        "uk_UA": "Прив’язки типів файлів успішно видалено.",
+        "zh_CN": "文件类型关联已成功移除。",
+        "zh_TW": "檔案類型關聯已成功移除。"
+      }
+    },
+    {
+      "ID": "AssociationFailedMessage",
+      "Translations": {
+        "ar_SA": "فشل ربط أنواع الملفات.",
+        "de_DE": "Fehler beim Zuordnen der Dateitypen.",
+        "el_GR": "Απέτυχε η συσχέτιση των τύπων αρχείων.",
+        "en_US": "Failed to associate file types.",
+        "es_ES": "No se pudieron asociar los tipos de archivo.",
+        "fr_FR": "Échec de l’association des types de fichiers.",
+        "he_IL": "שיוך סוגי הקבצים נכשל.",
+        "it_IT": "Associazione dei tipi di file non riuscita.",
+        "ja_JP": "ファイルの種類の関連付けに失敗しました。",
+        "ko_KR": "파일 형식 연결에 실패했습니다.",
+        "no_NO": "Klarte ikke å tilknytte filtyper.",
+        "pl_PL": "Nie udało się powiązać typów plików.",
+        "pt_BR": "Falha ao associar tipos de arquivo.",
+        "ru_RU": "Не удалось связать типы файлов.",
+        "sv_SE": "Det gick inte att koppla filtyper.",
+        "th_TH": "เชื่อมโยงประเภทไฟล์ไม่สำเร็จ",
+        "tr_TR": "Dosya türleri ilişkilendirilemedi.",
+        "uk_UA": "Не вдалося пов’язати типи файлів.",
+        "zh_CN": "文件类型关联失败。",
+        "zh_TW": "檔案類型關聯失敗。"
+      }
+    },
+    {
+      "ID": "RemoveAssociationFailedMessage",
+      "Translations": {
+        "ar_SA": "فشلت إزالة ارتباطات أنواع الملفات.",
+        "de_DE": "Das Entfernen der Dateitypzuordnungen ist fehlgeschlagen.",
+        "el_GR": "Η αφαίρεση των συσχετίσεων τύπων αρχείων απέτυχε.",
+        "en_US": "Failed to remove file type associations.",
+        "es_ES": "No se pudieron eliminar las asociaciones de tipos de archivo.",
+        "fr_FR": "Échec de la suppression des associations de types de fichiers.",
+        "he_IL": "הסרת שיוכי סוגי הקבצים נכשלה.",
+        "it_IT": "Rimozione delle associazioni dei tipi di file non riuscita.",
+        "ja_JP": "ファイルの種類の関連付けの削除に失敗しました。",
+        "ko_KR": "파일 형식 연결 제거에 실패했습니다.",
+        "no_NO": "Fjerning av filtype-tilknytninger mislyktes.",
+        "pl_PL": "Nie udało się usunąć skojarzeń typów plików.",
+        "pt_BR": "Falha ao remover associações de tipos de arquivo.",
+        "ru_RU": "Не удалось удалить связи типов файлов.",
+        "sv_SE": "Det gick inte att ta bort filtypsassociationer.",
+        "th_TH": "ไม่สามารถลบการเชื่อมโยงประเภทไฟล์ได้",
+        "tr_TR": "Dosya türü ilişkilendirmeleri kaldırılamadı.",
+        "uk_UA": "Не вдалося видалити прив’язки типів файлів.",
+        "zh_CN": "文件类型关联移除失败。",
+        "zh_TW": "無法移除檔案類型關聯。"
+      }
+    }
+  ]
+}

assets/Locales/Dialog_Skylanders.json

@@ -0,0 +1,29 @@
+{
+  "Locales": [
+    {
+      "ID": "ScanSkylanderFilePickerTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Wähle eine BIN-, SKY-, DMP- oder DUMP-Datei aus, um einen Skylander zu scannen.",
+        "el_GR": "",
+        "en_US": "Select a BIN, SKY, DMP, or DUMP file to scan a Skylander from",
+        "es_ES": "Selecciona un archivo BIN, SKY, DMP o DUMP para escanear un Skylander",
+        "fr_FR": "Sélectionnez un fichier BIN, SKY, DMP ou DUMP pour scanner un Skylander",
+        "he_IL": "",
+        "it_IT": "Seleziona un file BIN, SKY, DMP o DUMP da cui scansionare uno Skylander",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "Selecione um arquivo BIN, SKY, DMP ou DUMP para escanear um Skylander",
+        "ru_RU": "Выберите файл BIN, SKY, DMP или DUMP для сканирования Skylander",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Виберіть файл BIN, SKY, DMP або DUMP для сканування Skylander",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    }
+  ]
+}

assets/Locales/Dialog_XCITrimmer.json

@@ -0,0 +1,304 @@
+{
+  "Locales": [
+    {
+      "ID": "PrimaryMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Entfernt ungenutzten Speicherplatz aus der XCI-Datei, um ihre Dateigröße zu verringern.",
+        "el_GR": "",
+        "en_US": "Removes unused space from the XCI to reduce its file size.",
+        "es_ES": "Elimina el espacio no utilizado del XCI para reducir su tamaño.",
+        "fr_FR": "Supprime l’espace inutilisé du XCI afin de réduire sa taille.",
+        "he_IL": "",
+        "it_IT": "Rimuove lo spazio inutilizzato dall'XCI per ridurne le dimensioni.",
+        "ja_JP": "",
+        "ko_KR": "XCI에서 사용되지 않는 공간을 제거하여 파일 크기를 줄입니다.",
+        "no_NO": "Fjerner ubrukt plass fra XCI-filen for å redusere filstørrelsen.",
+        "pl_PL": "Usuwa nieużywane miejsce z pliku XCI, aby zmniejszyć jego rozmiar.",
+        "pt_BR": "Remove o espaço não utilizado do XCI para reduzir seu tamanho.",
+        "ru_RU": "Удаляет неиспользуемое пространство из XCI, уменьшая размер файла.",
+        "sv_SE": "Tar bort oanvänt utrymme från XCI-filen för att minska filstorleken.",
+        "th_TH": "ลบพื้นที่ที่ไม่ได้ใช้งานออกจาก XCI เพื่อลดขนาดไฟล์",
+        "tr_TR": "",
+        "uk_UA": "Видаляє невикористаний простір із XCI, зменшуючи розмір файлу.",
+        "zh_CN": "移除 XCI 中未使用的空间以减小文件大小。",
+        "zh_TW": "移除 XCI 中未使用的空間以減少檔案大小。"
+      }
+    },
+    {
+      "ID": "SecondaryMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Datei: {0:n} MB • Spiel: {1:n} MB\n\nErsparnis: {2:n} MB",
+        "el_GR": "",
+        "en_US": "File: {0:n} MB • Game: {1:n} MB\n\nSavings: {2:n} MB",
+        "es_ES": "Archivo: {0:n} MB • Juego: {1:n} MB\n\nAhorro: {2:n} MB",
+        "fr_FR": "Fichier: {0:n} Mo • Jeu: {1:n} Mo\n\nÉconomies: {2:n} Mo",
+        "he_IL": "",
+        "it_IT": "File: {0:n} MB • Gioco: {1:n} MB\n\nRisparmio: {2:n} MB",
+        "ja_JP": "",
+        "ko_KR": "파일: {0:n} MB • 게임: {1:n} MB\n\n절약: {2:n} MB",
+        "no_NO": "Fil: {0:n} MB • Spill: {1:n} MB\n\nBesparelse: {2:n} MB",
+        "pl_PL": "Plik: {0:n} MB • Gra: {1:n} MB\n\nOszczędności: {2:n} MB",
+        "pt_BR": "Arquivo: {0:n} MB • Jogo: {1:n} MB\n\nEconomia: {2:n} MB",
+        "ru_RU": "Файл: {0:n} МБ • Игра: {1:n} МБ\n\nЭкономия: {2:n} МБ",
+        "sv_SE": "Fil: {0:n} MB • Spel: {1:n} MB\n\nBesparing: {2:n} MB",
+        "th_TH": "ไฟล์: {0:n} MB • เกม: {1:n} MB\n\nการประหยัด: {2:n} MB",
+        "tr_TR": "",
+        "uk_UA": "Файл: {0:n} МБ • Гра: {1:n} МБ\n\nЕкономія: {2:n} МБ",
+        "zh_CN": "文件: {0:n} MB • 游戏: {1:n} MB\n\n节省: {2:n} MB",
+        "zh_TW": "檔案: {0:n} MB • 遊戲: {1:n} MB\n\n節省: {2:n} MB"
+      }
+    },
+    {
+      "ID": "NoTrimNecessaryMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI muss nicht getrimmt werden. Prüfen Sie die Logs für Details.",
+        "el_GR": "",
+        "en_US": "XCI does not require trimming. Check logs for details.",
+        "es_ES": "El XCI no necesita ser recortado. Verifica los logs para detalles.",
+        "fr_FR": "Le XCI n’a pas besoin d’être réduit. Référez-vous aux journaux pour détails.",
+        "he_IL": "",
+        "it_IT": "Non è necessario ridurre la dimensione del XCI. Controlla i log per dettagli.",
+        "ja_JP": "",
+        "ko_KR": "XCI는 트리밍할 필요가 없습니다. 자세한 내용은 로그를 확인.",
+        "no_NO": "XCI trenger ikke å trimmes. Sjekk loggene for detaljer.",
+        "pl_PL": "XCI nie wymaga przycinania. Sprawdź dzienniki, aby uzyskać szczegóły.",
+        "pt_BR": "O XCI não precisa ser reduzido. Verifique os logs para detalhes.",
+        "ru_RU": "XCI не требует обрезки. Проверьте логи для подробностей.",
+        "sv_SE": "XCI behöver inte optimeras. Kontrollera loggen för detaljer.",
+        "th_TH": "XCI ไม่จำเป็นต้องถูกตัดแต่ง โปรดตรวจสอบบันทึกสำหรับรายละเอียด",
+        "tr_TR": "",
+        "uk_UA": "XCI не потребує обрізання. Перевірте журнали для отримання деталей.",
+        "zh_CN": "XCI 不需要被瘦身。查看日志以获得更多细节。",
+        "zh_TW": "XCI 不需要修剪。檢查日誌以取得更多資訊。"
+      }
+    },
+    {
+      "ID": "NoUntrimPossibleMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Das Trimmen der XCI kann nicht rückgängig gemacht werden. Prüfen Sie die Logs für Details.",
+        "el_GR": "",
+        "en_US": "XCI cannot be untrimmed. Check logs for details.",
+        "es_ES": "El recorte del XCI no puede ser deshecho. Verifica los registros para detalles.",
+        "fr_FR": "Le XCI ne peut être restauré. Référez-vous aux journaux pour détails.",
+        "he_IL": "",
+        "it_IT": "XCI non può essere ripristinato. Controlla i log per dettagli.",
+        "ja_JP": "",
+        "ko_KR": "XCI는 복원할 수 없습니다. 자세한 내용은 로그를 확인.",
+        "no_NO": "XCI kan ikke gjenopprettes. Sjekk loggene for detaljer.",
+        "pl_PL": "XCI nie może zostać przywrócone. Sprawdź dzienniki, aby uzyskać szczegóły.",
+        "pt_BR": "XCI não pode ser desfeito. Verifique os logs para detalhes.",
+        "ru_RU": "XCI не может быть восстановлен. Проверьте журналы для подробностей.",
+        "sv_SE": "XCI kan inte återställas. Kontrollera loggen för detaljer.",
+        "th_TH": "ไม่สามารถคืนค่า XCI ได้ โปรดตรวจสอบบันทึกสำหรับรายละเอียด",
+        "tr_TR": "",
+        "uk_UA": "XCI не можна відновити. Перевірте журнали для деталей.",
+        "zh_CN": "XCI 不能恢复。查看日志以获取详情。",
+        "zh_TW": "XCI 無法恢復。檢查日誌以取得詳情。"
+      }
+    },
+    {
+      "ID": "ReadOnlyFileCannotFixMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI ist schreibgeschützt und konnte nicht schreibbar gemacht werden. Prüfen Sie die Logs für Details.",
+        "el_GR": "",
+        "en_US": "XCI is read-only and could not be made writable. Check logs for details.",
+        "es_ES": "XCI es solo lectura y no se puede escribir. Verifica los registros para detalles.",
+        "fr_FR": "XCI en lecture seule et n'a pas pu être rendu écrivable. Référez-vous aux journaux pour détails.",
+        "he_IL": "",
+        "it_IT": "XCI è solo lettura e non può essere scritto. Controlla i log per dettagli.",
+        "ja_JP": "",
+        "ko_KR": "XCI 파일은 읽기 전용이며 쓰기 불가. 로그를 확인하십시오.",
+        "no_NO": "XCI er skrivebeskyttet og kunne ikke gjøres skrivbar. Sjekk loggene for detaljer.",
+        "pl_PL": "XCI jest tylko do odczytu i nie można zapisać. Sprawdź logi dla szczegółów.",
+        "pt_BR": "XCI é somente leitura e não pode ser gravado. Verifique os logs para detalhes.",
+        "ru_RU": "XCI только для чтения и не стал доступен для записи. Проверьте журналы для подробностей.",
+        "sv_SE": "XCI-filen är skrivskyddad och kunde inte göras skrivbar. Kontrollera loggen för mer information",
+        "th_TH": "XCI เป็นอ่านอย่างเดียวและไม่สามารถเขียนได้ ตรวจสอบบันทึกสำหรับรายละเอียด",
+        "tr_TR": "",
+        "uk_UA": "XCI тільки для читання і не можна записати. Перевірте логи для деталей.",
+        "zh_CN": "XCI 只读，无法写入。查看日志以获取详情。",
+        "zh_TW": "XCI 檔案唯讀，無法寫入。檢查日誌以取得詳情。"
+      }
+    },
+    {
+      "ID": "SizeChangedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI-Größe hat sich seit dem letzten Scan geändert. Stellen Sie sicher, dass die Datei nicht beschrieben wird, und versuchen Sie es erneut.",
+        "el_GR": "",
+        "en_US": "XCI size changed since last scan. Ensure the file is not being written to and try again.",
+        "es_ES": "El tamaño de XCI ha cambiado desde que fue escaneado. Verifica que no se esté escribiendo al archivo y vuelve a intentarlo.",
+        "fr_FR": "La taille de XCI a changé depuis son analyse. Vérifiez que le fichier n’est pas en cours d’écriture, puis réessayez.",
+        "he_IL": "",
+        "it_IT": "La dimensione di XCI è cambiata da quando è stato scansionato. Controlla che il file non sia scritto e riprova.",
+        "ja_JP": "",
+        "ko_KR": "XCI 크기가 스캔 후 변경되었습니다. 파일이 쓰여지고 있지 않은지 확인하고 다시 시도하세요.",
+        "no_NO": "XCI har endret størrelse siden den ble skannet. Kontroller at det ikke skrives til filen, og prøv på nytt.",
+        "pl_PL": "Rozmiar XCI zmienił się od momentu zeskanowania. Sprawdź, czy plik nie jest zapisywany, a następnie spróbuj ponownie.",
+        "pt_BR": "O tamanho de XCI mudou desde que foi escaneado. Verifique se o arquivo não está sendo gravado e tente novamente.",
+        "ru_RU": "Размер XCI изменился после сканирования. Проверьте, не записывается ли файл, и попробуйте снова.",
+        "sv_SE": "XCI har ändrats i storlek sedan den lästes av. Kontrollera att filen inte skrivs till och försök igen.",
+        "th_TH": "ขนาด XCI เปลี่ยนไปตั้งแต่การสแกนครั้งล่าสุด ตรวจสอบว่าไฟล์ไม่ได้ถูกเขียน และลองใหม่",
+        "tr_TR": "",
+        "uk_UA": "Розмір XCI змінився з моменту сканування. Перевірте, чи не записується файл, та спробуйте знову.",
+        "zh_CN": "XCI 在扫描后大小发生了变化。请检查文件是否未被写入，然后重试。",
+        "zh_TW": "XCI 檔案大小自上次掃描以來已經改變。請檢查檔案是否未被寫入，然後再嘗試。"
+      }
+    },
+    {
+      "ID": "FreeSpaceCheckFailedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI enthält Daten im freien Speicherbereich. Es ist unsicher zu trimmen.",
+        "el_GR": "",
+        "en_US": "XCI has data in the free space area. It is not safe to trim.",
+        "es_ES": "XCI tiene datos en el área de espacio libre. No es seguro recortarlo.",
+        "fr_FR": "XCI contient des données dans la zone d'espace libre. Il n'est pas sûr de le réduire.",
+        "he_IL": "",
+        "it_IT": "XCI contiene dati nell'area di spazio libero. Non è sicuro ridurre la sua dimensione.",
+        "ja_JP": "",
+        "ko_KR": "XCI 파일에 여유 공간 영역에 데이터가 있으므로 트리밍하는 것이 안전하지 않습니다.",
+        "no_NO": "XCI har data i den ledige plassen. Det er ikke trygt å trimme den.",
+        "pl_PL": "XCI zawiera dane w obszarze wolnego miejsca. Nie jest bezpieczne go przycinać.",
+        "pt_BR": "XCI tem dados na área de espaço livre. Não é seguro reduzi-lo.",
+        "ru_RU": "XCI содержит данные в свободной области. Его обрезка небезопасна.",
+        "sv_SE": "XCI har data i det lediga utrymmet. Det är inte säkert att optimera.",
+        "th_TH": "XCI มีข้อมูลในพื้นที่ว่าง จึงไม่ปลอดภัยที่จะทำการตัดแต่ง",
+        "tr_TR": "",
+        "uk_UA": "XCI містить дані в зоні вільного простору. Тому обрізка небезпечна.",
+        "zh_CN": "XCI 文件的空闲区域内有数据。不能安全瘦身。",
+        "zh_TW": "XCI 檔案有數據儲存於空閒區域。修剪不安全。"
+      }
+    },
+    {
+      "ID": "InvalidDataMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI enthält ungültige Daten. Prüfen Sie die Logs für Details.",
+        "el_GR": "",
+        "en_US": "XCI contains invalid data. Check logs for details.",
+        "es_ES": "XCI contiene datos inválidos. Lee el registro para detalles.",
+        "fr_FR": "XCI contient des données invalides. Référez-vous aux journaux pour détails.",
+        "he_IL": "",
+        "it_IT": "XCI contiene dati non validi. Controlla i log per dettagli.",
+        "ja_JP": "",
+        "ko_KR": "XCI 파일에 유효하지 않은 데이터가 포함되어 있습니다. 로그를 확인하세요.",
+        "no_NO": "XCI-filen inneholder ugyldige data. Sjekk loggene for detaljer.",
+        "pl_PL": "XCI zawiera nieprawidłowe dane. Sprawdź dzienniki, aby uzyskać szczegóły.",
+        "pt_BR": "XCI contém dados inválidos. Verifique os logs para detalhes.",
+        "ru_RU": "XCI содержит недопустимые данные. Проверьте журналы для подробностей.",
+        "sv_SE": "XCI-filen innehåller ogiltig data. Kontrollera loggen för detaljer.",
+        "th_TH": "XCI มีข้อมูลที่ไม่ถูกต้อง โปรดตรวจสอบบันทึกสำหรับรายละเอียด",
+        "tr_TR": "",
+        "uk_UA": "XCI містить недійсні дані. Перевірте журнали для деталей.",
+        "zh_CN": "XCI 文件含有无效数据。查看日志以获得更多细节。",
+        "zh_TW": "XCI 檔案帶有無效的數據。檢查日誌以取得更多資訊"
+      }
+    },
+    {
+      "ID": "WriteErrorMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI konnte nicht zum Schreiben geöffnet werden. Prüfen Sie die Logs für Details.",
+        "el_GR": "",
+        "en_US": "XCI could not be opened for writing. Check logs for details.",
+        "es_ES": "XCI no se puede abrir para escribir. Lee el registro para detalles.",
+        "fr_FR": "XCI n'a pas pu être ouvert pour écriture. Consultez les journaux pour détails.",
+        "he_IL": "",
+        "it_IT": "XCI non può essere aperto in scrittura. Controlla i log per dettagli.",
+        "ja_JP": "",
+        "ko_KR": "XCI를 쓰기 위해 열 수 없습니다. 로그를 확인하세요.",
+        "no_NO": "XCI kunne ikke åpnes for skriving. Sjekk loggene for detaljer.",
+        "pl_PL": "Nie można otworzyć XCI do zapisu. Sprawdź dzienniki, aby uzyskać szczegóły.",
+        "pt_BR": "XCI não pôde ser aberto para gravação. Verifique os logs para detalhes.",
+        "ru_RU": "Не удалось открыть XCI для записи. Проверьте журналы для подробностей.",
+        "sv_SE": "XCI kunde inte öppnas för skrivning. Kontrollera loggen för detaljer.",
+        "th_TH": "ไม่สามารถเปิด XCI เพื่อเขียนข้อมูลได้ โปรดตรวจสอบบันทึกสำหรับรายละเอียด",
+        "tr_TR": "",
+        "uk_UA": "Не вдалося відкрити XCI для запису. Перевірте журнали для деталей.",
+        "zh_CN": "XCI 不能写入。查看日志以获得更多细节。",
+        "zh_TW": "XCI 無法開啟以進行寫入。請檢查日誌以取得更多資訊。"
+      }
+    },
+    {
+      "ID": "TrimFailedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Trimmen der XCI fehlgeschlagen.",
+        "el_GR": "",
+        "en_US": "Failed to trim XCI.",
+        "es_ES": "El recorte del XCI falló.",
+        "fr_FR": "La réduction du XCI a échoué.",
+        "he_IL": "",
+        "it_IT": "Riduzione del XCI fallita.",
+        "ja_JP": "",
+        "ko_KR": "XCI 트리밍에 실패했습니다.",
+        "no_NO": "Trimming av XCI mislyktes.",
+        "pl_PL": "Nie udało się przyciąć XCI.",
+        "pt_BR": "A redução do XCI falhou.",
+        "ru_RU": "Обрезка XCI не удалась.",
+        "sv_SE": "Optimering av XCI misslyckades.",
+        "th_TH": "การตัดแต่ง XCI ล้มเหลว",
+        "tr_TR": "",
+        "uk_UA": "Не вдалося обрізати XCI.",
+        "zh_CN": "XCI 瘦身失败。",
+        "zh_TW": "修剪 XCI 失敗。"
+      }
+    },
+    {
+      "ID": "TrimCancelledMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Der Vorgang wurde abgebrochen.",
+        "el_GR": "",
+        "en_US": "The operation was cancelled.",
+        "es_ES": "La operación fue cancelada.",
+        "fr_FR": "L'opération a été annulée.",
+        "he_IL": "",
+        "it_IT": "L'operazione è stata annullata.",
+        "ja_JP": "",
+        "ko_KR": "작업이 취소되었습니다.",
+        "no_NO": "Operasjonen ble avbrutt.",
+        "pl_PL": "",
+        "pt_BR": "A operação foi cancelada.",
+        "ru_RU": "Операция была отменена.",
+        "sv_SE": "Åtgärden avbröts.",
+        "th_TH": "การดำเนินการถูกยกเลิกแล้ว.",
+        "tr_TR": "",
+        "uk_UA": "Операцію перервано.",
+        "zh_CN": "操作已取消。",
+        "zh_TW": "操作已取消。"
+      }
+    },
+    {
+      "ID": "NoOperationPerformedMessage",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Es wurde keine Aktion durchgeführt.",
+        "el_GR": "",
+        "en_US": "No operation was performed.",
+        "es_ES": "No se realizó ninguna operación.",
+        "fr_FR": "Aucune opération n'a été effectuée.",
+        "he_IL": "",
+        "it_IT": "Non è stata effettuata alcuna operazione.",
+        "ja_JP": "",
+        "ko_KR": "작업이 수행되지 않았습니다.",
+        "no_NO": "Ingen operasjon ble utført.",
+        "pl_PL": "",
+        "pt_BR": "Nenhuma operação foi realizada.",
+        "ru_RU": "Операция не была выполнена.",
+        "sv_SE": "Ingen åtgärd genomfördes.",
+        "th_TH": "ไม่มีการดำเนินการใด ๆ",
+        "tr_TR": "",
+        "uk_UA": "Операцію не було виконано.",
+        "zh_CN": "未执行任何操作。",
+        "zh_TW": "沒有執行任何操作。"
+      }
+    }
+  ]
+}

assets/Locales/Error.json

@@ -1,5 +1,55 @@
 {
   "Locales": [
+    {
+      "ID": "NoApplicationFoundInFile",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Keine Anwendungen in ausgewählter Datei gefunden.",
+        "el_GR": "",
+        "en_US": "No applications found in selected file.",
+        "es_ES": "No se encontraron aplicaciones en el archivo seleccionado.",
+        "fr_FR": "Aucune application trouvée dans le fichier sélectionné.",
+        "he_IL": "",
+        "it_IT": "Nessuna applicazione trovata nel file selezionato.",
+        "ja_JP": "",
+        "ko_KR": "선택한 파일에서 앱을 찾을 수 없습니다.",
+        "no_NO": "Ingen apper ble funnet i valgt fil.",
+        "pl_PL": "",
+        "pt_BR": "Nenhum aplicativo encontrado no arquivo selecionado.",
+        "ru_RU": "Приложений в выбранном файле не найдены",
+        "sv_SE": "Inga applikationer hittades i vald fil.",
+        "th_TH": "ไม่พบแอปพลิเคชั่นจากไฟล์ที่เลือก",
+        "tr_TR": "",
+        "uk_UA": "У вибраному файлі не знайдено жодних додатків.",
+        "zh_CN": "未发现应用",
+        "zh_TW": "未能從已選擇的檔案中找到應用程式。"
+      }
+    },
+    {
+      "ID": "NoUnpackedApplicationFoundInFolder",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Bitte wähle einen entpackten Anwendungsordner mit gültigem ExeFS oder NSO/NRO aus.",
+        "el_GR": "",
+        "en_US": "Please select an unpacked application folder with a valid ExeFS or NSO/NRO.",
+        "es_ES": "",
+        "fr_FR": "Veuillez sélectionner un répertoire d’application décompressée contenant un ExeFS valide ou NSO/NRO.",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "Пожалуйста, выберите папку распакованного приложения с корректным ExeFS или NSO/NRO",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "NoKeysFound",
       "Translations": {

assets/Locales/GameListContextMenu.json

@@ -0,0 +1,29 @@
+{
+  "Locales": [
+    {
+      "ID": "TrimXCIButton",
+      "Translations": {
+        "ar_SA": "تقليم XCI",
+        "de_DE": "Zuschneiden der XCI",
+        "el_GR": "Κοπή XCI",
+        "en_US": "Trim XCI",
+        "es_ES": "Recortar XCI",
+        "fr_FR": "Réduire le XCI",
+        "he_IL": "חתוך XCI",
+        "it_IT": "Riduci il XCI",
+        "ja_JP": "XCIをトリム",
+        "ko_KR": "XCI 트림",
+        "no_NO": "Trim XCI-filen",
+        "pl_PL": "Przytnij XCI",
+        "pt_BR": "Reduzir o XCI",
+        "ru_RU": "Обрезать XCI",
+        "sv_SE": "Optimera XCI",
+        "th_TH": "ลดขนาด XCI",
+        "tr_TR": "XCI'yi Kırp",
+        "uk_UA": "Нарізка XCI",
+        "zh_CN": "精简 XCI",
+        "zh_TW": "修剪 XCI"
+      }
+    }
+  ]
+}

assets/Locales/MenuBar_Actions.json

@@ -229,25 +229,25 @@
       "ID": "XCITrimmerButton",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "XCI-Dateien trimmen",
+        "de_DE": "XCI-Trimmer",
         "el_GR": "",
-        "en_US": "Trim XCI Files",
-        "es_ES": "Recortar Archivos XCI",
-        "fr_FR": "Réduire les Fichiers XCI",
+        "en_US": "XCI Trimmer",
+        "es_ES": "Recortador de XCI",
+        "fr_FR": "Réducteur de XCI",
         "he_IL": "",
-        "it_IT": "Riduci dimensioni dei file XCI",
+        "it_IT": "Trimmer XCI",
         "ja_JP": "",
         "ko_KR": "XCI 파일 트리머",
         "no_NO": "Trim XCI-filer",
-        "pl_PL": "",
-        "pt_BR": "Reduzir Arquivos XCI",
-        "ru_RU": "Обрезать XCI файлы",
-        "sv_SE": "Optimera XCI-filer",
-        "th_TH": "ตัดแต่งไฟล์ XCI",
-        "tr_TR": "",
-        "uk_UA": "Обрізати XCI файли",
-        "zh_CN": "瘦身 XCI 文件",
-        "zh_TW": "修剪 XCI 檔案"
+        "pl_PL": "Przycinacz XCI",
+        "pt_BR": "Cortador de XCI",
+        "ru_RU": "Триммер XCI",
+        "sv_SE": "XCI-trimmer",
+        "th_TH": "",
+        "tr_TR": "XCI Kesici",
+        "uk_UA": "Тример XCI",
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {
@@ -378,26 +378,26 @@
     {
       "ID": "ScanAmiiboFromBinButton",
       "Translations": {
-        "ar_SA": "مسح Amiibo (.BIN)",
-        "de_DE": "Amiibo scannen (.BIN)",
-        "el_GR": "Σάρωση Amiibo (.BIN)",
-        "en_US": "Scan Amiibo (.BIN)",
-        "es_ES": "Escanear un Amiibo (.BIN)",
-        "fr_FR": "Scanner un Amiibo (.BIN)",
-        "he_IL": "סרוק Amiibo (.BIN)",
-        "it_IT": "Scansiona un Amiibo (.BIN)",
-        "ja_JP": "Amiibo をスキャン (.BIN)",
-        "ko_KR": "Amiibo 스캔 (.BIN)",
-        "no_NO": "Skann en Amiibo (.BIN)",
-        "pl_PL": "Skanuj Amiibo (.BIN)",
-        "pt_BR": "Escaneie um Amiibo (.BIN)",
-        "ru_RU": "Сканировать Amiibo (.BIN)",
-        "sv_SE": "Skanna en Amiibo (.BIN)",
-        "th_TH": "สแกนอามีโบ (.BIN)",
-        "tr_TR": "Amiibo Tara (.BIN)",
-        "uk_UA": "Сканувати Amiibo (.BIN)",
-        "zh_CN": "扫描 Amiibo (.BIN)",
-        "zh_TW": "掃瞄 Amiibo (.BIN)"
+        "ar_SA": "مسح Amiibo (BIN)",
+        "de_DE": "Amiibo scannen (BIN)",
+        "el_GR": "Σάρωση Amiibo (BIN)",
+        "en_US": "Scan Amiibo (BIN)",
+        "es_ES": "Escanear un Amiibo (BIN)",
+        "fr_FR": "Scanner un Amiibo (BIN)",
+        "he_IL": "סרוק Amiibo (BIN)",
+        "it_IT": "Scansiona un Amiibo (BIN)",
+        "ja_JP": "Amiibo をスキャン (BIN)",
+        "ko_KR": "Amiibo 스캔 (BIN)",
+        "no_NO": "Skann en Amiibo (BIN)",
+        "pl_PL": "Skanuj Amiibo (BIN)",
+        "pt_BR": "Escaneie um Amiibo (BIN)",
+        "ru_RU": "Сканировать Amiibo (BIN)",
+        "sv_SE": "Skanna en Amiibo (BIN)",
+        "th_TH": "สแกนอามีโบ (BIN)",
+        "tr_TR": "Amiibo Tara (BIN)",
+        "uk_UA": "Сканувати Amiibo (BIN)",
+        "zh_CN": "扫描 Amiibo (BIN)",
+        "zh_TW": "掃瞄 Amiibo (BIN)"
       }
     },
     {
@@ -450,6 +450,31 @@
         "zh_TW": "移除 Skylander"
       }
     },
+    {
+      "ID": "SimulateWakeUpMessageButton",
+      "Translations": {
+        "ar_SA": "محاكاة رسالة الاستيقاظ",
+        "de_DE": "Aufwachnachricht simulieren",
+        "el_GR": "Προσομοίωση Μηνύματος Αφύπνισης",
+        "en_US": "Simulate Wake-Up Message",
+        "es_ES": "Simular Mensaje de Reactivación",
+        "fr_FR": "Simuler un Message de Réveil",
+        "he_IL": "דמה הודעת השכמה",
+        "it_IT": "Simula messaggio di risveglio",
+        "ja_JP": "スリープ復帰メッセージをシミュレート",
+        "ko_KR": "절전 모드 해제 메시지 시뮬레이션",
+        "no_NO": "Simuler oppvåknings-melding",
+        "pl_PL": "Symuluj wiadomość wybudzania",
+        "pt_BR": "Simular Mensagem de Acordar o Console",
+        "ru_RU": "Имитировать сообщение пробуждения",
+        "sv_SE": "Simulera uppvakningsmeddelande",
+        "th_TH": "จำลองการปลุกอุปกรณ์ให้ทำงาน",
+        "tr_TR": "Uyandırma Mesajı Simüle Et",
+        "uk_UA": "Симулювати повідомлення про пробудження",
+        "zh_CN": "模拟唤醒消息",
+        "zh_TW": "模擬喚醒訊息"
+      }
+    },
     {
       "ID": "TakeScreenshotButton",
       "Translations": {

assets/Locales/MenuBar_File.json

@@ -1,78 +1,278 @@
 {
   "Locales": [
     {
-      "ID": "ManageFileTypes",
+      "ID": "FileLabel",
       "Translations": {
-        "ar_SA": "إدارة أنواع الملفات",
-        "de_DE": "Dateitypen verwalten",
-        "el_GR": "Διαχείριση τύπων αρχείων",
-        "en_US": "Manage File Types",
-        "es_ES": "Administrar Tipos de Archivo",
-        "fr_FR": "Gérer les Types de Fichiers",
-        "he_IL": "ניהול סוגי קבצים",
-        "it_IT": "Gestisci i tipi di file",
-        "ja_JP": "ファイル形式を管理",
-        "ko_KR": "파일 형식 관리",
-        "no_NO": "Behandle filtyper",
-        "pl_PL": "Zarządzaj rodzajami plików",
-        "pt_BR": "Gerenciar Tipos de Arquivos",
-        "ru_RU": "Управление типами файлов",
-        "sv_SE": "Hantera filtyper",
-        "th_TH": "จัดการประเภทไฟล์",
-        "tr_TR": "Dosya uzantılarını yönet",
-        "uk_UA": "Керувати типами файлів",
-        "zh_CN": "管理文件扩展名",
-        "zh_TW": "管理檔案類型"
+        "ar_SA": "_ملف",
+        "de_DE": "_Datei",
+        "el_GR": "_Αρχείο",
+        "en_US": "_File",
+        "es_ES": "_Archivo",
+        "fr_FR": "_Fichier",
+        "he_IL": "_קובץ",
+        "it_IT": "_Archivio",
+        "ja_JP": "ファイル(_F)",
+        "ko_KR": "파일(_F)",
+        "no_NO": "_Fil",
+        "pl_PL": "_Plik",
+        "pt_BR": "_Arquivo",
+        "ru_RU": "_Файл",
+        "sv_SE": "_Arkiv",
+        "th_TH": "ไฟล์",
+        "tr_TR": "_Dosya",
+        "uk_UA": "_Файл",
+        "zh_CN": "文件(_F)",
+        "zh_TW": "檔案(_F)"
       }
     },
     {
-      "ID": "InstallFileTypes",
+      "ID": "LoadApplicationFromFileButton",
       "Translations": {
-        "ar_SA": "تثبيت أنواع الملفات",
-        "de_DE": "Dateitypen installieren",
-        "el_GR": "Εγκαταστήσετε τύπους αρχείων.",
-        "en_US": "Install File Types",
-        "es_ES": "Instalar Tipos de Archivo",
-        "fr_FR": "Installer des Types de Fichiers",
-        "he_IL": "סוגי קבצי התקנה",
-        "it_IT": "Installa i tipi di file",
-        "ja_JP": "ファイル形式をインストール",
-        "ko_KR": "파일 형식 설치",
-        "no_NO": "Installer filtyper",
-        "pl_PL": "Typy plików instalacyjnych",
-        "pt_BR": "Instalar tipos de arquivos",
-        "ru_RU": "Установить типы файлов",
-        "sv_SE": "Installera filtyper",
-        "th_TH": "ติดตั้งประเภทไฟล์",
-        "tr_TR": "Dosya uzantılarını yükle",
-        "uk_UA": "Встановити типи файлів",
-        "zh_CN": "关联文件扩展名",
-        "zh_TW": "安裝檔案類型"
+        "ar_SA": "_تحميل التطبيق...",
+        "de_DE": "_Anwendung laden...",
+        "el_GR": "_Φόρτωση εφαρμογής...",
+        "en_US": "_Load Application...",
+        "es_ES": "_Cargar Aplicación...",
+        "fr_FR": "_Charger l’Application...",
+        "he_IL": "_טען יישום...",
+        "it_IT": "_Carica applicazione...",
+        "ja_JP": "アプリケーションをロード(_L)...",
+        "ko_KR": "앱 불러오기(_L)...",
+        "no_NO": "_Last inn program...",
+        "pl_PL": "_Załaduj aplikację...",
+        "pt_BR": "_Carregar aplicativo...",
+        "ru_RU": "_Загрузить приложение...",
+        "sv_SE": "_Läs in applikation...",
+        "th_TH": "_โหลดแอปพลิเคชัน...",
+        "tr_TR": "_Uygulamayı yükle...",
+        "uk_UA": "_Завантажити застосунок...",
+        "zh_CN": "加载应用程序(_L)...",
+        "zh_TW": "載入應用程式(_L)..."
       }
     },
     {
-      "ID": "UninstallFileTypes",
+      "ID": "LoadUnpackedGameFromFolderButton",
       "Translations": {
-        "ar_SA": "إزالة أنواع الملفات",
-        "de_DE": "Dateitypen deinstallieren",
-        "el_GR": "Απεγκαταστήσετε τύπους αρχείων",
-        "en_US": "Uninstall File Types",
-        "es_ES": "Desinstalar Tipos de Archivo",
-        "fr_FR": "Désinstaller des Types de Fichiers",
-        "he_IL": "סוגי קבצי הסרה",
-        "it_IT": "Disinstalla i tipi di file",
-        "ja_JP": "ファイル形式をアンインストール",
-        "ko_KR": "파일 형식 제거",
-        "no_NO": "Avinstaller filtyper",
-        "pl_PL": "Typy plików dezinstalacyjnych",
-        "pt_BR": "Desinstalar tipos de arquivos",
-        "ru_RU": "Удалить типы файлов",
-        "sv_SE": "Avinstallera filtyper",
-        "th_TH": "ถอนการติดตั้งประเภทไฟล์",
-        "tr_TR": "Dosya uzantılarını kaldır",
-        "uk_UA": "Видалити типи файлів",
-        "zh_CN": "取消关联扩展名",
-        "zh_TW": "移除檔案類型"
+        "ar_SA": "تحميل لُعْبَة غير محزومة...",
+        "de_DE": "_Entpacktes Spiel laden...",
+        "el_GR": "_Φόρτωση Απακετάριστου Παιχνιδιού...",
+        "en_US": "Load _Unpacked Game...",
+        "es_ES": "Cargar Juego _Desempaquetado...",
+        "fr_FR": "Charger un Jeu Décompressé...",
+        "he_IL": "טען משחק _שאינו ארוז...",
+        "it_IT": "Carica gioco _estratto...",
+        "ja_JP": "_展開されたゲームをロード...",
+        "ko_KR": "압축 푼 게임 불러오기(_U)...",
+        "no_NO": "Last inn _upakket spill...",
+        "pl_PL": "Załaduj _rozpakowaną grę...",
+        "pt_BR": "Abrir Jogo _Extraído...",
+        "ru_RU": "Загрузить _распакованную игру...",
+        "sv_SE": "Läs in _uppackat spel...",
+        "th_TH": "โหลดเกมที่แตกไฟล์แล้ว...",
+        "tr_TR": "_Sıkıştırılmamış Oyun Yükle...",
+        "uk_UA": "Завантажити _розпаковану гру...",
+        "zh_CN": "加载解包后的游戏(_U)...",
+        "zh_TW": "載入未封裝的遊戲(_U)..."
+      }
+    },
+    {
+      "ID": "LoadTitleUpdatesAndDLCFromFolderButton",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Updates/DLC laden...",
+        "el_GR": "",
+        "en_US": "Load Updates/DLC...",
+        "es_ES": "Cargar Actualizaciones/DLC...",
+        "fr_FR": "Charger les Mises à Jour/DLC...",
+        "he_IL": "",
+        "it_IT": "Carica aggiornamenti/DLC...",
+        "ja_JP": "",
+        "ko_KR": "업데이트/DLC 불러오기...",
+        "no_NO": "Last inn oppdateringer/DLC...",
+        "pl_PL": "",
+        "pt_BR": "Carregar atualizações/DLC...",
+        "ru_RU": "Загрузить обновления/DLC...",
+        "sv_SE": "Läs in uppdateringar/DLC...",
+        "th_TH": "โหลดอัปเดต/DLC...",
+        "tr_TR": "",
+        "uk_UA": "Завантажити оновлення/DLC...",
+        "zh_CN": "加载更新/DLC...",
+        "zh_TW": "載入更新/DLC..."
+      }
+    },
+    {
+      "ID": "OpenRyuijnxFolderButton",
+      "Translations": {
+        "ar_SA": "‫فتح مجلد Ryujinx",
+        "de_DE": "Ryujinx-Ordner öffnen",
+        "el_GR": "Άνοιγμα Φακέλου Ryujinx",
+        "en_US": "Open Ryujinx Folder",
+        "es_ES": "Abrir Carpeta de Ryujinx",
+        "fr_FR": "Ouvrir le Dossier Ryujinx",
+        "he_IL": "פתח את תיקיית ריוג'ינקס",
+        "it_IT": "Apri la cartella di Ryujinx",
+        "ja_JP": "Ryujinx フォルダを開く",
+        "ko_KR": "Ryujinx 폴더 열기",
+        "no_NO": "Åpne Ryujinx mappe",
+        "pl_PL": "Otwórz folder Ryujinx",
+        "pt_BR": "Abrir Pasta do Ryujinx",
+        "ru_RU": "Открыть папку Ryujinx",
+        "sv_SE": "Öppna Ryujinx-mapp",
+        "th_TH": "เปิดโฟลเดอร์ Ryujinx",
+        "tr_TR": "Ryujinx Klasörünü aç",
+        "uk_UA": "Відкрити теку Ryujinx",
+        "zh_CN": "打开 Ryujinx 系统目录",
+        "zh_TW": "開啟 Ryujinx 資料夾"
+      }
+    },
+    {
+      "ID": "OpenLogsFolderButton",
+      "Translations": {
+        "ar_SA": "فتح مجلد السجلات",
+        "de_DE": "Logs-Ordner öffnen",
+        "el_GR": "Άνοιγμα Φακέλου Καταγραφής",
+        "en_US": "Open Logs Folder",
+        "es_ES": "Abrir Carpeta de Registros",
+        "fr_FR": "Ouvrir le Dossier des Journaux",
+        "he_IL": "פתח את תיקיית קבצי הלוג",
+        "it_IT": "Apri la cartella dei log",
+        "ja_JP": "ログフォルダを開く",
+        "ko_KR": "로그 폴더 열기",
+        "no_NO": "Åpne Logg mappen",
+        "pl_PL": "Otwórz folder plików dziennika zdarzeń",
+        "pt_BR": "Abrir Pasta de _Logs",
+        "ru_RU": "Открыть папку журналов",
+        "sv_SE": "Öppna loggmapp",
+        "th_TH": "เปิดโฟลเดอร์ Logs",
+        "tr_TR": "Logs Klasörünü aç",
+        "uk_UA": "Відкрити теку журналів змін",
+        "zh_CN": "打开日志目录",
+        "zh_TW": "開啟日誌資料夾"
+      }
+    },
+    {
+      "ID": "OpenScreenshotsFolderButton",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Bildschirmfoto-Ordner öffnen",
+        "el_GR": "",
+        "en_US": "Open Screenshots Folder",
+        "es_ES": "Abrir Carpeta de Capturas de Pantalla",
+        "fr_FR": "Ouvrir le Dossier des Captures d’Écran",
+        "he_IL": "",
+        "it_IT": "Apri la cartella degli screenshots",
+        "ja_JP": "",
+        "ko_KR": "스크린샷 폴더 열기",
+        "no_NO": "Åpne Skjermbilde Mappen",
+        "pl_PL": "",
+        "pt_BR": "Abrir Pasta de Capturas de Tela",
+        "ru_RU": "Открыть папку снимков экрана",
+        "sv_SE": "Öppna skärmbildsmappen",
+        "th_TH": "เปิดโฟลเดอร์ที่เก็บภาพหน้าจอ",
+        "tr_TR": "",
+        "uk_UA": "Відкрити теку скріншотів",
+        "zh_CN": "打开截图文件夹",
+        "zh_TW": "開啟螢幕擷取畫面資料夾"
+      }
+    },
+    {
+      "ID": "AssociateFileTypesButton",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Dateitypen zuordnen",
+        "el_GR": "",
+        "en_US": "Associate File Types",
+        "es_ES": "",
+        "fr_FR": "Associer Les Types de Fichiers",
+        "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": "RemoveFileTypeAssociationsButton",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Dateityp-Zuordnungen entfernen",
+        "el_GR": "",
+        "en_US": "Remove File Type Associations",
+        "es_ES": "",
+        "fr_FR": "Dissocier Les Types de Fichiers",
+        "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": "FileTypeAssociationsToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Ordnet unterstützte Dateitypen (NSP, XCI, NCA, NRO, NSO) Ryujinx zu, sodass sie beim Doppelklick im Dateimanager automatisch geöffnet werden. Das Entfernen der Dateityp-Zuordnungen deaktiviert dieses Verhalten.",
+        "el_GR": "",
+        "en_US": "Associates supported file types (NSP, XCI, NCA, NRO, NSO) with Ryujinx so they open automatically when double-clicked in your file manager. Removing file type associations stops this behavior.",
+        "es_ES": "",
+        "fr_FR": "Associe les types de fichiers pris en charge (NSP, XCI, NCA, NRO, NSO) à Ryujinx afin qu’ils s’ouvrent automatiquement par double-clic dans votre gestionnaire de fichiers. Les dissocier désactive ce comportement",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "Связывает поддерживаемые типы файлов (NSP, XCI, NCA, NRO, NSO) с Ryujinx, чтобы они автоматически открывались при двойном щелчке в файловом менеджере. Удаление ассоциаций файлов отключает это поведение.",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "ExitButton",
+      "Translations": {
+        "ar_SA": "_خروج",
+        "de_DE": "_Beenden",
+        "el_GR": "_Έξοδος",
+        "en_US": "_Exit",
+        "es_ES": "_Salir",
+        "fr_FR": "_Quitter",
+        "he_IL": "_יציאה",
+        "it_IT": "_Esci",
+        "ja_JP": "終了(_E)",
+        "ko_KR": "종료(_E)",
+        "no_NO": "_Avslutt",
+        "pl_PL": "_Wyjdź",
+        "pt_BR": "_Sair",
+        "ru_RU": "_Выйти",
+        "sv_SE": "_Avsluta",
+        "th_TH": "_ออก",
+        "tr_TR": "_Çıkış",
+        "uk_UA": "_Вихід",
+        "zh_CN": "退出(_E)",
+        "zh_TW": "結束(_E)"
       }
     }
   ]

assets/Locales/MenuBar_Options.json

@@ -0,0 +1,104 @@
+{
+  "Locales": [
+    {
+      "ID": "OptionsLabel",
+      "Translations": {
+        "ar_SA": "_خيارات",
+        "de_DE": "_Optionen",
+        "el_GR": "_Επιλογές",
+        "en_US": "_Options",
+        "es_ES": "_Opciones",
+        "fr_FR": null,
+        "he_IL": "_אפשרויות",
+        "it_IT": "_Opzioni",
+        "ja_JP": "オプション(_O)",
+        "ko_KR": "옵션(_O)",
+        "no_NO": "_Alternativer",
+        "pl_PL": "_Opcje",
+        "pt_BR": "_Opções",
+        "ru_RU": "_Настройки",
+        "sv_SE": "_Inställningar",
+        "th_TH": "_ตัวเลือก",
+        "tr_TR": "_Seçenekler",
+        "uk_UA": "_Параметри",
+        "zh_CN": "选项(_O)",
+        "zh_TW": "選項(_O)"
+      }
+    },
+    {
+      "ID": "LanguageButton",
+      "Translations": {
+        "ar_SA": "اللغة",
+        "de_DE": "Sprache",
+        "el_GR": "Γλώσσα",
+        "en_US": "Language",
+        "es_ES": "Idioma",
+        "fr_FR": "Langue",
+        "he_IL": "שפה",
+        "it_IT": "Lingua",
+        "ja_JP": "言語",
+        "ko_KR": "언어",
+        "no_NO": "Språk",
+        "pl_PL": "Język",
+        "pt_BR": "Idioma",
+        "ru_RU": "Язык",
+        "sv_SE": "Språk",
+        "th_TH": "ภาษา",
+        "tr_TR": "Dil",
+        "uk_UA": "Мова",
+        "zh_CN": "语言",
+        "zh_TW": "語言"
+      }
+    },
+    {
+      "ID": "UserProfilesButton",
+      "Translations": {
+        "ar_SA": "_ملفات المستخدمين",
+        "de_DE": "_Benutzerprofile",
+        "el_GR": "_Προφίλ Χρηστών",
+        "en_US": "_User Profiles",
+        "es_ES": "_Perfiles de Usuario",
+        "fr_FR": "_Profils d'Utilisateurs",
+        "he_IL": "_פרופילי משתמש",
+        "it_IT": "_Profili utente",
+        "ja_JP": "ユーザプロファイル(_M)",
+        "ko_KR": "사용자 프로필(_M)",
+        "no_NO": "_Brukerprofiler",
+        "pl_PL": "_Profile użytkowników",
+        "pt_BR": "_Perfis de usuário",
+        "ru_RU": "_Профили пользователей",
+        "sv_SE": "_Användarprofiler",
+        "th_TH": "_โปรไฟล์ผู้ใช้งาน",
+        "tr_TR": "_Kullanıcı Profilleri",
+        "uk_UA": "_Профілі користувачів",
+        "zh_CN": "用户配置文件(_M)",
+        "zh_TW": "使用者設定檔(_M)"
+      }
+    },
+    {
+      "ID": "SettingsButton",
+      "Translations": {
+        "ar_SA": "_الإعدادات",
+        "de_DE": "_Einstellungen",
+        "el_GR": "_Ρυθμίσεις",
+        "en_US": "_Settings",
+        "es_ES": "_Configuración",
+        "fr_FR": "_Paramètres",
+        "he_IL": "_הגדרות",
+        "it_IT": "_Impostazioni",
+        "ja_JP": "設定(_S)",
+        "ko_KR": "설정(_S)",
+        "no_NO": "_Innstillinger",
+        "pl_PL": "_Ustawienia",
+        "pt_BR": "_Configurações",
+        "ru_RU": "_Параметры",
+        "sv_SE": "_Inställningar",
+        "th_TH": "_ตั้งค่า",
+        "tr_TR": "_Seçenekler",
+        "uk_UA": "_Налаштування",
+        "zh_CN": "设置(_S)",
+        "zh_TW": "設定(_S)"
+      }
+    }
+  ]
+}

assets/Locales/MenuBar_View.json

@@ -0,0 +1,54 @@
+{
+  "Locales": [
+    {
+      "ID": "ToggleFullscreenButton",
+      "Translations": {
+        "ar_SA": "التبديل إلى وضع ملء الشاشة",
+        "de_DE": "Vollbild",
+        "el_GR": "Λειτουργία Πλήρους Οθόνης",
+        "en_US": "Toggle Fullscreen",
+        "es_ES": "Cambiar a Pantalla Completa.",
+        "fr_FR": "Basculer en Plein Écran",
+        "he_IL": "שנה מצב- מסך מלא",
+        "it_IT": "Schermo intero",
+        "ja_JP": "全画面切り替え",
+        "ko_KR": "전체 화면 전환",
+        "no_NO": "Fullskjermsvisning av/på",
+        "pl_PL": "Przełącz na tryb pełnoekranowy",
+        "pt_BR": "Mudar para Tela Cheia",
+        "ru_RU": "Переключить полноэкранный режим",
+        "sv_SE": "Växla helskärm",
+        "th_TH": "สลับเป็นโหมดเต็มหน้าจอ",
+        "tr_TR": "Tam Ekran Modunu Aç",
+        "uk_UA": "На весь екран",
+        "zh_CN": "切换全屏",
+        "zh_TW": "切換全螢幕模式"
+      }
+    },
+    {
+      "ID": "ShowConsoleButton",
+      "Translations": {
+        "ar_SA": "عرض وحدة التحكم",
+        "de_DE": "Zeige Konsole",
+        "el_GR": "Εμφάνιση Κονσόλας",
+        "en_US": "Show Console",
+        "es_ES": "Mostrar Consola",
+        "fr_FR": "Afficher la Console",
+        "he_IL": "הצג שורת פקודות",
+        "it_IT": "Mostra console",
+        "ja_JP": "コンソールを表示",
+        "ko_KR": "콘솔 표시",
+        "no_NO": "Vis konsoll",
+        "pl_PL": "Pokaż Konsolę",
+        "pt_BR": "Exibir Console",
+        "ru_RU": "Показать консоль",
+        "sv_SE": "Visa konsoll",
+        "th_TH": "แสดง คอนโซล",
+        "tr_TR": "Konsol'u Göster",
+        "uk_UA": "Показати консоль",
+        "zh_CN": "显示控制台",
+        "zh_TW": "顯示控制台"
+      }
+    }
+  ]
+}

assets/Locales/Settings_Interface.json

@@ -0,0 +1,79 @@
+{
+  "Locales": [
+    {
+      "ID": "StartGamesInFullscreenCheckboxLabel",
+      "Translations": {
+        "ar_SA": "ابدأ الألعاب بملء الشاشة",
+        "de_DE": "Spiele im Vollbild starten",
+        "el_GR": "Εκκίνηση Παιχνιδιών σε Πλήρη Οθόνη",
+        "en_US": "Start Games in Fullscreen",
+        "es_ES": "Iniciar Juegos en Pantalla Completa",
+        "fr_FR": "Démarrer les Jeux en Plein Écran",
+        "he_IL": "התחל משחקים במסך מלא",
+        "it_IT": "Avvia i giochi a schermo intero",
+        "ja_JP": "全画面でゲームを開始",
+        "ko_KR": "전체 화면으로 게임 시작",
+        "no_NO": "Start spill i fullskjerm",
+        "pl_PL": "Uruchamiaj gry na pełnym ekranie",
+        "pt_BR": "Iniciar Jogos em Tela Cheia",
+        "ru_RU": "Запускать игры в полноэкранном режиме",
+        "sv_SE": "Starta spel i helskärm",
+        "th_TH": "เริ่มเกมแบบเต็มหน้าจอ",
+        "tr_TR": "Oyunları Tam Ekranda Başlat",
+        "uk_UA": "Запускати ігри в повноекранному режимі",
+        "zh_CN": "全屏启动游戏",
+        "zh_TW": "以全螢幕啟動遊戲"
+      }
+    },
+    {
+      "ID": "StartGamesWithoutUICheckboxLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Benutzeroberfläche beim Spielstart ausblenden",
+        "el_GR": "",
+        "en_US": "Hide UI on Game Start",
+        "es_ES": "Ocultar la Interfaz al Iniciar el Juego",
+        "fr_FR": "Masquer l’Interface au Lancement du Jeu",
+        "he_IL": "",
+        "it_IT": "Nascondi l’interfaccia all’avvio del gioco",
+        "ja_JP": "",
+        "ko_KR": "게임 시작 시 UI 숨기기",
+        "no_NO": "Skjul brukergrensesnitt ved spillstart",
+        "pl_PL": "",
+        "pt_BR": "Ocultar a interface ao iniciar o jogo",
+        "ru_RU": "Скрывать интерфейс при запуске игры",
+        "sv_SE": "Dölj användargränssnitt vid spelstart",
+        "th_TH": "ซ่อน UI เมื่อเริ่มเกม",
+        "tr_TR": "",
+        "uk_UA": "Приховувати інтерфейс під час запуску гри",
+        "zh_CN": "启动游戏时隐藏界面",
+        "zh_TW": "啟動遊戲時隱藏介面"
+      }
+    },
+    {
+      "ID": "StartGamesWithoutUICheckboxLabelToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Blendet die Benutzeroberfläche von Ryujinx automatisch aus, sobald ein Spiel gestartet wird. Während des Spiels kann die Oberfläche mit F4 eingeblendet werden.",
+        "el_GR": "",
+        "en_US": "Automatically hides Ryujinx's UI whenever a game launches. While in-game, press F4 to show the UI.",
+        "es_ES": "",
+        "fr_FR": "Masque automatiquement l'interface de Ryujinx au lancement d'un jeu. En jeu, appuyez sur F4 pour afficher l'interface.",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "Автоматически скрывает интерфейс Ryujinx при запуске игры. Во время игры нажмите F4, чтобы показать интерфейс.",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    }
+  ]
+}

assets/Locales/StatusBar.json

@@ -1,7 +1,32 @@
 {
   "Locales": [
     {
-      "ID": "FirmwareVersion",
+      "ID": "TrimmingXCILabel",
+      "Translations": {
+        "ar_SA": "جاري تقليم: {0}",
+        "de_DE": "Schneide: {0}",
+        "el_GR": "Κόβει το: {0}",
+        "en_US": "Trimming: {0}",
+        "es_ES": "Recortando: {0}",
+        "fr_FR": "Réduction de: {0}",
+        "he_IL": "חיתוך: {0}",
+        "it_IT": "Riduzione di: {0}",
+        "ja_JP": "{0} をトリミング中:",
+        "ko_KR": "{0} 트리밍:",
+        "no_NO": "Trimming av: {0}",
+        "pl_PL": "Przycinanie: {0}",
+        "pt_BR": "Reduzindo: {0}",
+        "ru_RU": "Обрезка: {0}",
+        "sv_SE": "Trimmar: {0}",
+        "th_TH": "กำลังตัด: {0}",
+        "tr_TR": "{0} Kısaltılıyor:",
+        "uk_UA": "Обрізка: {0}",
+        "zh_CN": "正在修剪: {0}",
+        "zh_TW": "正在修剪: {0}"
+      }
+    },
+    {
+      "ID": "FirmwareVersionLabel",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",

assets/Locales/XCITrimmer.json

@@ -0,0 +1,429 @@
+{
+  "Locales": [
+    {
+      "ID": "StatusCountLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI ausgewählt: {0}/{1}",
+        "el_GR": "",
+        "en_US": "XCI Selected: {0}/{1}",
+        "es_ES": "XCI Seleccionados: {0}/{1}",
+        "fr_FR": "XCI Sélectionnés : {0}/{1}",
+        "he_IL": "",
+        "it_IT": "XCI Selezionati: {0}/{1}",
+        "ja_JP": "",
+        "ko_KR": "XCI 선택됨: {0}/{1}",
+        "no_NO": "XCI Valgt: {0}/{1}",
+        "pl_PL": "XCI Wybrane: {0}/{1}",
+        "pt_BR": "XCI Selecionados: {0}/{1}",
+        "ru_RU": "Выбрано XCI: {0}/{1}",
+        "sv_SE": "XCI Valda: {0}/{1}",
+        "th_TH": "XCI เลือกแล้ว: {0}/{1}",
+        "tr_TR": "",
+        "uk_UA": "Вибрано XCI: {0}/{1}",
+        "zh_CN": "XCI 已选: {0}/{1}",
+        "zh_TW": "XCI 已選擇: {0}/{1}"
+      }
+    },
+    {
+      "ID": "StatusCountWithFilterLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "XCI ausgewählt: {0}/{1} (Sichtbar: {2})",
+        "el_GR": "",
+        "en_US": "XCI Selected: {0}/{1} (Displayed: {2})",
+        "es_ES": "XCI Seleccionados: {0}/{1} (Mostrados: {2})",
+        "fr_FR": "XCI Sélectionnés : {0}/{1} (Affichés : {2})",
+        "he_IL": "",
+        "it_IT": "XCI Selezionati: {0}/{1} (Visualizzati: {2})",
+        "ja_JP": "",
+        "ko_KR": "XCI 선택됨: {0}/{1} (표시됨: {2})",
+        "no_NO": "XCI Valgt: {0}/{1} (Vises: {2})",
+        "pl_PL": "XCI Wybrane: {0}/{1} (Wyświetlone: {2})",
+        "pt_BR": "XCI Selecionados: {0}/{1} (Exibidos: {2})",
+        "ru_RU": "Выбрано XCI: {0}/{1} (Отображается: {2})",
+        "sv_SE": "XCI Valda: {0}/{1} (Visas: {2})",
+        "th_TH": "XCI เลือกแล้ว: {0}/{1} (แสดง: {2})",
+        "tr_TR": "",
+        "uk_UA": "Вибрано XCI: {0}/{1} (Відображається: {2})",
+        "zh_CN": "XCI 已选: {0}/{1}（显示: {2}）",
+        "zh_TW": "XCI 已選擇: {0}/{1}（顯示: {2}）"
+      }
+    },
+    {
+      "ID": "StatusTrimmingLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Trimmen: {0}/{1}...",
+        "el_GR": "",
+        "en_US": "Trimming: {0}/{1}...",
+        "es_ES": "Recortando: {0}/{1}...",
+        "fr_FR": "Réduction : {0}/{1}...",
+        "he_IL": "",
+        "it_IT": "Riduzione: {0}/{1}...",
+        "ja_JP": "",
+        "ko_KR": "트리밍: {0}/{1}...",
+        "no_NO": "Trimmer: {0}/{1}...",
+        "pl_PL": "",
+        "pt_BR": "Recortando: {0}/{1}...",
+        "ru_RU": "Обрезка: {0}/{1}...",
+        "sv_SE": "Trimmar: {0}/{1}...",
+        "th_TH": "กำลังตัดแต่ง: {0}/{1}...",
+        "tr_TR": "",
+        "uk_UA": "Обрізання: {0}/{1}...",
+        "zh_CN": "正在修剪：{0}/{1}...",
+        "zh_TW": "正在修剪：{0}/{1}..."
+      }
+    },
+    {
+      "ID": "StatusUntrimmingLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Trimmung von {0} wieder aufheben...",
+        "el_GR": "",
+        "en_US": "Untrimming {0}...",
+        "es_ES": "Deshaciendo el recorte {0}...",
+        "fr_FR": "Restauration de {0}...",
+        "he_IL": "",
+        "it_IT": "Ripristino di {0}...",
+        "ja_JP": "",
+        "ko_KR": "{0} 복원 중...",
+        "no_NO": "Gjenoppretter {0}...",
+        "pl_PL": "",
+        "pt_BR": "Restaurando {0}...",
+        "ru_RU": "Восстановление {0}...",
+        "sv_SE": "Återställer {0}...",
+        "th_TH": "กำลังกู้คืน {0}...",
+        "tr_TR": "",
+        "uk_UA": "Відновлення {0}...",
+        "zh_CN": "正在恢复 {0}...",
+        "zh_TW": "正在還原 {0}..."
+      }
+    },
+    {
+      "ID": "SelectAllButton",
+      "Translations": {
+        "ar_SA": "اختر الكل",
+        "de_DE": "Alles auswählen",
+        "el_GR": "Επιλογή όλων",
+        "en_US": "Select All",
+        "es_ES": "Seleccionar Todo",
+        "fr_FR": "Sélectionner Tout",
+        "he_IL": "בחר הכל",
+        "it_IT": "Seleziona tutto",
+        "ja_JP": "すべて選択",
+        "ko_KR": "모두 선택",
+        "no_NO": "Velg alle",
+        "pl_PL": "Zaznacz wszystko",
+        "pt_BR": "Selecionar tudo",
+        "ru_RU": "Выбрать все",
+        "sv_SE": "Markera alla",
+        "th_TH": "เลือกทั้งหมด",
+        "tr_TR": "Hepsini seç",
+        "uk_UA": "Вибрати все",
+        "zh_CN": "选择全部",
+        "zh_TW": "選擇全部"
+      }
+    },
+    {
+      "ID": "ClearSelectionButton",
+      "Translations": {
+        "ar_SA": "مسح التحديد",
+        "de_DE": "Auswahl aufheben",
+        "el_GR": "Εκκαθάριση επιλογής",
+        "en_US": "Clear Selection",
+        "es_ES": "Borrar selección",
+        "fr_FR": "Effacer la sélection",
+        "he_IL": "נקה בחירה",
+        "it_IT": "Cancella selezione",
+        "ja_JP": "選択をクリア",
+        "ko_KR": "선택 해제",
+        "no_NO": "Fjern utvalg",
+        "pl_PL": "Wyczyść zaznaczenie",
+        "pt_BR": "Limpar seleção",
+        "ru_RU": "Очистить выделение",
+        "sv_SE": "Rensa markering",
+        "th_TH": "ล้างการเลือก",
+        "tr_TR": "Seçimi temizle",
+        "uk_UA": "Очистити вибір",
+        "zh_CN": "清除选择",
+        "zh_TW": "清除選擇"
+      }
+    },
+    {
+      "ID": "TrimmedLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Getrimmt",
+        "el_GR": "",
+        "en_US": "Trimmed",
+        "es_ES": "Recortado",
+        "fr_FR": "Réduit",
+        "he_IL": "",
+        "it_IT": "Dim. ridotta",
+        "ja_JP": "",
+        "ko_KR": "트리밍됨",
+        "no_NO": "Trimmet",
+        "pl_PL": "",
+        "pt_BR": "Reduzido",
+        "ru_RU": "Обрезан",
+        "sv_SE": "Optimerad",
+        "th_TH": "ตัดแต่งแล้ว",
+        "tr_TR": "",
+        "uk_UA": "Обрізані",
+        "zh_CN": "经过瘦身的",
+        "zh_TW": "已修剪"
+      }
+    },
+    {
+      "ID": "UntrimmedLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Ungetrimmt",
+        "el_GR": "",
+        "en_US": "Untrimmed",
+        "es_ES": "Sin Recortar",
+        "fr_FR": "Non Réduit",
+        "he_IL": "",
+        "it_IT": "Dim. originale",
+        "ja_JP": "",
+        "ko_KR": "트리밍되지 않음",
+        "no_NO": "Ikke trimmet",
+        "pl_PL": "",
+        "pt_BR": "Não Reduzido",
+        "ru_RU": "Не обрезан",
+        "sv_SE": "Orörd",
+        "th_TH": "ยังไม่ได้ตัดแต่ง",
+        "tr_TR": "",
+        "uk_UA": "Необрізані",
+        "zh_CN": "没有瘦身的",
+        "zh_TW": "未修剪"
+      }
+    },
+    {
+      "ID": "PartialLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Teilweise",
+        "el_GR": "",
+        "en_US": "Partial",
+        "es_ES": "Parcial",
+        "fr_FR": "Partiel",
+        "he_IL": "",
+        "it_IT": "Parziale",
+        "ja_JP": "",
+        "ko_KR": "일부",
+        "no_NO": "Delvis",
+        "pl_PL": "",
+        "pt_BR": "Parcial",
+        "ru_RU": "Частично",
+        "sv_SE": "Delvis",
+        "th_TH": "ยังไม่สมบูรณ์",
+        "tr_TR": "",
+        "uk_UA": "Часткові",
+        "zh_CN": "分区",
+        "zh_TW": "部分"
+      }
+    },
+    {
+      "ID": "FailedLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Fehlgeschlagen",
+        "el_GR": "",
+        "en_US": "Failed",
+        "es_ES": "Fallido",
+        "fr_FR": "Échoué",
+        "he_IL": "",
+        "it_IT": "Fallito",
+        "ja_JP": "",
+        "ko_KR": "실패",
+        "no_NO": "Mislyktes",
+        "pl_PL": "",
+        "pt_BR": "Falhou",
+        "ru_RU": "Ошибка",
+        "sv_SE": "Misslyckades",
+        "th_TH": "ล้มเหลว",
+        "tr_TR": "",
+        "uk_UA": "Невдача",
+        "zh_CN": "失败",
+        "zh_TW": "失敗"
+      }
+    },
+    {
+      "ID": "UnknownLabel",
+      "Translations": {
+        "ar_SA": "مجهول",
+        "de_DE": "Unbekannt",
+        "el_GR": "Άγνωστο",
+        "en_US": "Unknown",
+        "es_ES": "Desconocido",
+        "fr_FR": "Inconnu",
+        "he_IL": "לא ידוע",
+        "it_IT": "Sconosciuto",
+        "ja_JP": "不明",
+        "ko_KR": "알 수 없음",
+        "no_NO": "Ukjent",
+        "pl_PL": "Nieznany",
+        "pt_BR": "Desconhecido",
+        "ru_RU": "Неизвестно",
+        "sv_SE": "Okänd",
+        "th_TH": "ไม่รู้จัก",
+        "tr_TR": "Bilinmeyen",
+        "uk_UA": "Невідомо",
+        "zh_CN": "未知",
+        "zh_TW": "未知"
+      }
+    },
+    {
+      "ID": "CalculatedSavingsLabel",
+      "Translations": {
+        "ar_SA": null,
+        "de_DE": null,
+        "el_GR": null,
+        "en_US": "{0} MB ({1}%)",
+        "es_ES": null,
+        "fr_FR": "{0} Mo ({1} %)",
+        "he_IL": null,
+        "it_IT": null,
+        "ja_JP": "{0}MB（{1}%）",
+        "ko_KR": "{0}MB ({1}%)",
+        "no_NO": null,
+        "pl_PL": null,
+        "pt_BR": null,
+        "ru_RU": "{0} МБ ({1}%)",
+        "sv_SE": null,
+        "th_TH": null,
+        "tr_TR": null,
+        "uk_UA": "{0} МБ ({1}%)",
+        "zh_CN": "{0} MB（{1}%）",
+        "zh_TW": "{0} MB（{1}%）"
+      }
+    },
+    {
+      "ID": "SavedLabel",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Gespeichert:",
+        "el_GR": "",
+        "en_US": "Saved:",
+        "es_ES": "Ahorrado:",
+        "fr_FR": "Économies :",
+        "he_IL": "",
+        "it_IT": "Risparmiato:",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "Zaoszczędzone:",
+        "pt_BR": "Economizado:",
+        "ru_RU": "Сохранено:",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Збережено:",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "RemainingLabel",
+      "Translations": {
+        "ar_SA": "المتبقية:",
+        "de_DE": "Verbleibend:",
+        "el_GR": "Απομένουν:",
+        "en_US": "Remaining:",
+        "es_ES": "Restante:",
+        "fr_FR": "Restant :",
+        "he_IL": "נותרו:",
+        "it_IT": "Rimanenti:",
+        "ja_JP": "残り:",
+        "ko_KR": "남은:",
+        "no_NO": "Gjenstående:",
+        "pl_PL": "Pozostało:",
+        "pt_BR": "Restante:",
+        "ru_RU": "Осталось:",
+        "sv_SE": "Kvar:",
+        "th_TH": "เหลือ:",
+        "tr_TR": "Kalan:",
+        "uk_UA": "Залишилося:",
+        "zh_CN": "剩余：",
+        "zh_TW": "剩餘："
+      }
+    },
+    {
+      "ID": "MBLabel",
+      "Translations": {
+        "ar_SA": null,
+        "de_DE": null,
+        "el_GR": null,
+        "en_US": "{0} MB",
+        "es_ES": null,
+        "fr_FR": "{0} Mo",
+        "he_IL": null,
+        "it_IT": null,
+        "ja_JP": "{0}MB",
+        "ko_KR": "{0}MB",
+        "no_NO": null,
+        "pl_PL": null,
+        "pt_BR": null,
+        "ru_RU": "{0} МБ",
+        "sv_SE": null,
+        "th_TH": null,
+        "tr_TR": null,
+        "uk_UA": "{0} МБ",
+        "zh_CN": null,
+        "zh_TW": null
+      }
+    },
+    {
+      "ID": "TrimButton",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Trimmen",
+        "el_GR": "",
+        "en_US": "Trim",
+        "es_ES": "Recortar",
+        "fr_FR": "Réduire",
+        "he_IL": "",
+        "it_IT": "Riduci",
+        "ja_JP": "",
+        "ko_KR": "트림",
+        "no_NO": "",
+        "pl_PL": "Przytnij",
+        "pt_BR": "Reduzir",
+        "ru_RU": "Обрезать",
+        "sv_SE": "Trimma",
+        "th_TH": "ตัด",
+        "tr_TR": "Kırp",
+        "uk_UA": "Обрізати",
+        "zh_CN": "瘦身",
+        "zh_TW": "修剪"
+      }
+    },
+    {
+      "ID": "UntrimButton",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "Trimmen aufheben",
+        "el_GR": "",
+        "en_US": "Untrim",
+        "es_ES": "Desrecortar",
+        "fr_FR": "Dé-Réduire",
+        "he_IL": "",
+        "it_IT": "Ripristina",
+        "ja_JP": "",
+        "ko_KR": "언트림",
+        "no_NO": "Utrim",
+        "pl_PL": "",
+        "pt_BR": "Restaurar",
+        "ru_RU": "Восстановить",
+        "sv_SE": "Avoptimera",
+        "th_TH": "กู้คืน",
+        "tr_TR": "",
+        "uk_UA": "Відновити",
+        "zh_CN": "取消精简",
+        "zh_TW": "反修剪"
+      }
+    }
+  ]
+}

distribution/linux/Ryujinx.sh

@@ -1,23 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 SCRIPT_DIR=$(dirname "$(realpath "$0")")
 
-if [ -f "$SCRIPT_DIR/Ryujinx.Headless.SDL3" ]; then
-    RYUJINX_BIN="Ryujinx.Headless.SDL3"
-fi
-
-if [ -f "$SCRIPT_DIR/Ryujinx" ]; then
-    RYUJINX_BIN="Ryujinx"
-fi
-
-if [ -z "$RYUJINX_BIN" ]; then
-    exit 1
-fi
-
 COMMAND="env LANG=C.UTF-8 DOTNET_EnableAlternateStackCheck=1"
 
 if command -v gamemoderun > /dev/null 2>&1; then
     COMMAND="$COMMAND gamemoderun"
 fi
 
-exec $COMMAND "$SCRIPT_DIR/$RYUJINX_BIN" "$@"
+exec $COMMAND "$SCRIPT_DIR/Ryujinx" "$@"

distribution/linux/app.ryujinx.Ryujinx.desktop

@@ -1,14 +1,12 @@
 [Desktop Entry]
-Version=1.0
+Version=1.5
 Name=Ryujinx
 Type=Application
-Icon=Ryujinx
+Icon=app.ryujinx.Ryujinx
 Exec=Ryujinx.sh %f
-Comment=A Nintendo Switch Emulator
 GenericName=Nintendo Switch Emulator
 Terminal=false
 Categories=Game;Emulator;
 MimeType=application/x-nx-nca;application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
-Keywords=Switch;Nintendo;Emulator;
 StartupWMClass=Ryujinx
 PrefersNonDefaultGPU=true

distribution/linux/appimage/AppRun

@@ -1,3 +0,0 @@
-#!/bin/sh
-CURRENTDIR="$(readlink -f "$(dirname "$0")")"
-exec "$CURRENTDIR"/usr/bin/Ryujinx.sh "$@"

distribution/linux/appimage/app.ryujinx.Ryujinx.appdata.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+	<id>app.ryujinx.Ryujinx</id>
+	<metadata_license>MIT</metadata_license>
+	<project_license>MIT</project_license>
+	<name>Ryujinx</name>
+	<summary>Nintendo Switch 1 emulator written in C#</summary>
+	<description>
+		<p>Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.</p>
+	</description>
+	<launchable type="desktop-id">app.ryujinx.Ryujinx.desktop</launchable>
+	<url type="homepage">https://ryujinx.app/</url>
+	<developer id="app.ryujinx">
+		<name>Ryubing</name>
+	</developer>
+	<screenshots>
+		<screenshot type="default">
+			<image>https://git.ryujinx.app/projects/Ryubing/raw/branch/master/docs/shell.png</image>
+		</screenshot>
+	</screenshots>
+	<provides>
+		<id>app.ryujinx.Ryujinx.desktop</id>
+	</provides>
+	<content_rating type="oars-1.1" />
+</component>

distribution/linux/appimage/build-appimage.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 set -eu
 
 ROOTDIR="$(readlink -f "$(dirname "$0")")"/../../../
@@ -7,20 +7,33 @@ cd "$ROOTDIR"
 BUILDDIR=${BUILDDIR:-publish}
 OUTDIR=${OUTDIR:-publish_appimage}
 
+# AppStream
+
 rm -rf AppDir
-mkdir -p AppDir/usr/bin
+mkdir -p AppDir/usr/lib AppDir/usr/bin
+mkdir -p AppDir/usr/share/metainfo AppDir/usr/share/applications
+mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
 
-cp distribution/linux/Ryujinx.desktop AppDir/Ryujinx.desktop
-cp distribution/linux/appimage/AppRun AppDir/AppRun
-cp distribution/misc/Logo.svg AppDir/Ryujinx.svg
+cp -r "$BUILDDIR"/* AppDir/usr/lib/
 
+cp distribution/linux/appimage/app.ryujinx.Ryujinx.appdata.xml AppDir/usr/share/metainfo/app.ryujinx.Ryujinx.appdata.xml
+cp distribution/linux/app.ryujinx.Ryujinx.desktop AppDir/usr/share/applications/app.ryujinx.Ryujinx.desktop
+cp distribution/misc/Logo.png AppDir/usr/share/icons/hicolor/256x256/apps/app.ryujinx.Ryujinx.png
+ln -s ../lib/Ryujinx AppDir/usr/bin/Ryujinx
 
-cp -r "$BUILDDIR"/* AppDir/usr/bin/
+# AppImage Root
+
+ln -s ./usr/share/applications/app.ryujinx.Ryujinx.desktop AppDir/app.ryujinx.Ryujinx.desktop
+ln -s ./usr/share/icons/hicolor/256x256/apps/app.ryujinx.Ryujinx.png AppDir/.DirIcon
+ln -s ./usr/share/icons/hicolor/256x256/apps/app.ryujinx.Ryujinx.png AppDir/app.ryujinx.Ryujinx.png
+ln -s ./usr/lib/Ryujinx.sh AppDir/AppRun
 
 # Ensure necessary bins are set as executable
 chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx*
 
 mkdir -p "$OUTDIR"
 
+# The "-n" flag removes the appstream checks during build, in case the main website is down.
+# Run "appstreamcli validate --explain AppDir/usr/share/metainfo/app.ryujinx.Ryujinx.appdata.xml" to check manually
 appimagetool --appimage-extract-and-run -n --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
-    AppDir "$OUTDIR"/Ryujinx.AppImage
+    AppDir "$OUTDIR"/Ryujinx.AppImage

distribution/macos/construct_universal_dylib.py

@@ -47,12 +47,14 @@ def get_new_name(
     input_component = str(input_dylib_path).replace(str(input_directory), "")[1:]
     return Path(os.path.join(output_directory, input_component))
 
-def get_archs(dylib_path: Path) -> list[str]:
-    res = subprocess.check_output([LIPO, "-info", str(dylib_path)]).decode("utf-8")
-    if res.startswith("Non-fat file"):
-        return [res.split(":")[-1].strip()]
-    else:
-        return res.split("are:")[-1].strip().split()
+
+def is_fat_file(dylib_path: Path) -> str:
+    res = subprocess.check_output([LIPO, "-info", str(dylib_path.absolute())]).decode(
+        "utf-8"
+    )
+
+    return not res.split("\n")[0].startswith("Non-fat file")
+
 
 def construct_universal_dylib(
     arm64_input_dylib_path: Path, x86_64_input_dylib_path: Path, output_dylib_path: Path
@@ -67,12 +69,11 @@ def construct_universal_dylib(
             os.path.basename(arm64_input_dylib_path.resolve()), output_dylib_path
         )
     else:
-        arm64_archs = get_archs(arm64_input_dylib_path)
-        x86_64_archs = get_archs(x86_64_input_dylib_path) if x86_64_input_dylib_path.exists() else []
-
-        if "arm64" in arm64_archs and "x86_64" in arm64_archs:
-            shutil.copy2(arm64_input_dylib_path, output_dylib_path)
-        elif x86_64_archs:
+        if is_fat_file(arm64_input_dylib_path) or not x86_64_input_dylib_path.exists():
+            with open(output_dylib_path, "wb") as dst:
+                with open(arm64_input_dylib_path, "rb") as src:
+                    dst.write(src.read())
+        else:
             subprocess.check_call(
                 [
                     LIPO,

docs/compatibility.csv

@@ -2667,7 +2667,8 @@
 0100C52011460000,"Sky: Children of the Light",cpu;online-broken,nothing,2023-02-23 10:57:10
 010041C01014E000,"Skybolt Zack",,playable,2021-04-12 18:28:00
 0100A0A00D1AA000,"SKYHILL",,playable,2021-03-05 15:19:11
-0100CCC0002E6000,"Skylanders Imaginators",crash;services,boots,2020-05-30 18:49:18
+010048D000BFC000,"Skylanders Imaginators",,playable,2026-07-02 22:43:30
+0100CCC0002E6000,"Skylanders Imaginators",,playable,2026-07-02 22:43:30
 010021A00ABEE000,"SKYPEACE",,playable,2020-05-29 14:14:30
 0100EA400BF44000,"SkyScrappers",,playable,2020-05-28 22:11:25
 0100F3C00C400000,"SkyTime",slow,ingame,2020-05-30 09:24:51

src/ARMeilleure/CodeGen/CompiledFunction.cs

@@ -8,7 +8,7 @@ namespace ARMeilleure.CodeGen
     /// <summary>
     /// Represents a compiled function.
     /// </summary>
-    readonly struct CompiledFunction
+    public readonly struct CompiledFunction
     {
         /// <summary>
         /// Gets the machine code of the <see cref="CompiledFunction"/>.
@@ -44,10 +44,11 @@ namespace ARMeilleure.CodeGen
         /// <typeparamref name="T"/> pointing to the mapped function.
         /// </summary>
         /// <typeparam name="T">Type of delegate</typeparam>
+        /// <param name="jitCache">The jit cache to map the function into</param>
         /// <returns>A delegate of type <typeparamref name="T"/> pointing to the mapped function</returns>
-        public T Map<T>()
+        public T Map<T>(JitCache jitCache)
         {
-            return MapWithPointer<T>(out _);
+            return MapWithPointer<T>(jitCache, out _);
         }
 
         /// <summary>
@@ -55,11 +56,12 @@ namespace ARMeilleure.CodeGen
         /// <typeparamref name="T"/> pointing to the mapped function.
         /// </summary>
         /// <typeparam name="T">Type of delegate</typeparam>
+        /// <param name="jitCache">The jit cache to map the function into</param>
         /// <param name="codePointer">Pointer to the function code in memory</param>
         /// <returns>A delegate of type <typeparamref name="T"/> pointing to the mapped function</returns>
-        public T MapWithPointer<T>(out nint codePointer)
+        public T MapWithPointer<T>(JitCache jitCache, out nint codePointer)
         {
-            codePointer = JitCache.Map(this);
+            codePointer = jitCache.Map(this);
 
             return Marshal.GetDelegateForFunctionPointer<T>(codePointer);
         }

src/ARMeilleure/CodeGen/Linking/RelocEntry.cs

@@ -3,7 +3,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Represents a relocation.
     /// </summary>
-    readonly struct RelocEntry
+    public readonly struct RelocEntry
     {
         public const int Stride = 13; // Bytes.
 

src/ARMeilleure/CodeGen/Linking/RelocInfo.cs

@@ -5,7 +5,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Represents relocation information about a <see cref="CompiledFunction"/>.
     /// </summary>
-    readonly struct RelocInfo
+    public readonly struct RelocInfo
     {
         /// <summary>
         /// Gets an empty <see cref="RelocInfo"/>.

src/ARMeilleure/CodeGen/Linking/Symbol.cs

@@ -5,7 +5,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Represents a symbol.
     /// </summary>
-    readonly struct Symbol
+    public readonly struct Symbol
     {
         private readonly ulong _value;
 

src/ARMeilleure/CodeGen/Linking/SymbolType.cs

@@ -3,7 +3,7 @@ namespace ARMeilleure.CodeGen.Linking
     /// <summary>
     /// Types of <see cref="Symbol"/>.
     /// </summary>
-    enum SymbolType : byte
+    public enum SymbolType : byte
     {
         /// <summary>
         /// Refers to nothing, i.e no symbol.

src/ARMeilleure/CodeGen/Unwinding/UnwindInfo.cs

@@ -1,6 +1,6 @@
 namespace ARMeilleure.CodeGen.Unwinding
 {
-    struct UnwindInfo
+    public struct UnwindInfo
     {
         public const int Stride = 4; // Bytes.
 

src/ARMeilleure/CodeGen/Unwinding/UnwindPseudoOp.cs

@@ -1,6 +1,6 @@
 namespace ARMeilleure.CodeGen.Unwinding
 {
-    enum UnwindPseudoOp
+    public enum UnwindPseudoOp
     {
         PushReg = 0,
         SetFrame = 1,

src/ARMeilleure/CodeGen/Unwinding/UnwindPushEntry.cs

@@ -1,6 +1,6 @@
 namespace ARMeilleure.CodeGen.Unwinding
 {
-    struct UnwindPushEntry
+    public struct UnwindPushEntry
     {
         public const int Stride = 16; // Bytes.
 

src/ARMeilleure/Common/AddressTableLevel.cs

@@ -6,7 +6,7 @@ namespace ARMeilleure.Common
     public readonly struct AddressTableLevel
     {
         /// <summary>
-        /// Gets the index of the <see cref="Level"/> in the guest address.
+        /// Gets the index of the <see cref="Index"/> in the guest address.
         /// </summary>
         public int Index { get; }
 

src/ARMeilleure/Common/AddressTablePresets.cs

@@ -19,46 +19,22 @@ namespace ARMeilleure.Common
                 new( 7,  8),
                 new( 1,  6)
         ];
-
-        private static readonly AddressTableLevel[] _levels64BitSparseTiny =
+        
+        private static readonly AddressTableLevel[] _monoSparse64Bit =
         [
-            new( 11, 28),
-                new( 2, 9)
+            new( 2, 37)
         ];
 
-        private static readonly AddressTableLevel[] _levels32BitSparseTiny =
+        private static readonly AddressTableLevel[] _monoSparse32Bit =
         [
-            new( 10, 22),
-                new( 1, 9)
+            new( 1, 31)
         ];
-
-        private static readonly AddressTableLevel[] _levels64BitSparseGiant =
-        [
-            new( 38, 1),
-                new( 2, 36)
-        ];
-
-        private static readonly AddressTableLevel[] _levels32BitSparseGiant =
-        [
-            new( 31, 1),
-                new( 1, 30)
-        ];
-
-        //high power will run worse on DDR3 systems and some DDR4 systems due to the higher ram utilization
-        //low power will never run worse than non-sparse, but for most systems it won't be necessary
-        //high power is always used, but I've left low power in here for future reference
-        public static AddressTableLevel[] GetArmPreset(bool for64Bits, bool sparse, bool lowPower = false)
+        
+        public static AddressTableLevel[] GetArmPreset(bool for64Bits, bool sparse)
         {
             if (sparse)
             {
-                if (lowPower)
-                {
-                    return for64Bits ? _levels64BitSparseTiny : _levels32BitSparseTiny;
-                }
-                else
-                {
-                    return for64Bits ? _levels64BitSparseGiant : _levels32BitSparseGiant;
-                }
+                return for64Bits ? _monoSparse64Bit : _monoSparse32Bit;
             }
             else
             {

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

@@ -5,7 +5,7 @@ using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
 using ARMeilleure.Translation;
 using ARMeilleure.Translation.PTC;
-
+using System.Linq;
 using static ARMeilleure.Instructions.InstEmitHelper;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 
@@ -238,7 +238,7 @@ namespace ARMeilleure.Instructions
             }
             else if (table.Sparse)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
                 // Deliberately attempts to avoid branches.
 
                 Operand tableBase = !context.HasPtc ?
@@ -247,18 +247,15 @@ namespace ARMeilleure.Instructions
 
                 hostAddress = tableBase;
 
-                for (int i = 0; i < table.Levels.Length; i++)
-                {
-                    AddressTableLevel level = table.Levels[i];
-                    int clearBits = 64 - (level.Index + level.Length);
+                AddressTableLevel level = table.Levels.Last();
+                int clearBits = 64 - (level.Index + level.Length);
 
-                    Operand index = context.ShiftLeft(
-                        context.ShiftRightUI(context.ShiftLeft(guestAddress, Const(clearBits)), Const(clearBits + level.Index)),
-                        Const(3)
-                    );
+                Operand index = context.ShiftLeft(
+                    context.ShiftRightUI(context.ShiftLeft(guestAddress, Const(clearBits)), Const(clearBits + level.Index)),
+                    Const(3)
+                );
 
-                    hostAddress = context.Load(OperandType.I64, context.Add(hostAddress, index));
-                }
+                hostAddress = context.Load(OperandType.I64, context.Add(hostAddress, index));
             }
             else
             {

src/ARMeilleure/Memory/ReservedRegion.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace ARMeilleure.Memory
 {
-    public class ReservedRegion
+    public class ReservedRegion : IDisposable
     {
         public const int DefaultGranularity = 65536; // Mapping granularity in Windows.
 

src/ARMeilleure/Signal/TestMethods.cs

@@ -1,5 +1,6 @@
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Translation;
+using ARMeilleure.Translation.Cache;
 using System.Runtime.InteropServices;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 
@@ -17,7 +18,7 @@ namespace ARMeilleure.Signal
         public delegate int DebugThreadLocalMapGetOrReserve(int threadId, int initialState);
         public delegate void DebugNativeWriteLoop(nint nativeWriteLoopPtr, nint writePtr);
 
-        public static DebugPartialUnmap GenerateDebugPartialUnmap()
+        public static DebugPartialUnmap GenerateDebugPartialUnmap(JitCache jitCache)
         {
             EmitterContext context = new();
 
@@ -31,10 +32,10 @@ namespace ARMeilleure.Signal
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugPartialUnmap>();
+            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugPartialUnmap>(jitCache);
         }
 
-        public static DebugThreadLocalMapGetOrReserve GenerateDebugThreadLocalMapGetOrReserve(nint structPtr)
+        public static DebugThreadLocalMapGetOrReserve GenerateDebugThreadLocalMapGetOrReserve(JitCache jitCache, nint structPtr)
         {
             EmitterContext context = new();
 
@@ -48,10 +49,10 @@ namespace ARMeilleure.Signal
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugThreadLocalMapGetOrReserve>();
+            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugThreadLocalMapGetOrReserve>(jitCache);
         }
 
-        public static DebugNativeWriteLoop GenerateDebugNativeWriteLoop()
+        public static DebugNativeWriteLoop GenerateDebugNativeWriteLoop(JitCache jitCache)
         {
             EmitterContext context = new();
 
@@ -77,7 +78,7 @@ namespace ARMeilleure.Signal
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.None, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugNativeWriteLoop>();
+            return Compiler.Compile(cfg, argTypes, OperandType.None, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DebugNativeWriteLoop>(jitCache);
         }
     }
 }

src/ARMeilleure/Translation/Cache/CacheEntry.cs

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace ARMeilleure.Translation.Cache
 {
-    readonly struct CacheEntry : IComparable<CacheEntry>
+    public readonly struct CacheEntry : IComparable<CacheEntry>
     {
         public int Offset { get; }
         public int Size { get; }

src/ARMeilleure/Translation/Cache/CacheMemoryAllocator.cs

@@ -22,12 +22,31 @@ namespace ARMeilleure.Translation.Cache
                 return Offset.CompareTo(other.Offset);
             }
         }
+        
+        private readonly int _regionSize;
+        private int _regionCount;
 
         private readonly List<MemoryBlock> _blocks = [];
 
-        public CacheMemoryAllocator(int capacity)
+        public CacheMemoryAllocator(int regionSize, int initialRegionCount = 1)
         {
-            _blocks.Add(new MemoryBlock(0, capacity));
+            _regionCount = 0;
+            _regionSize = regionSize;
+            
+            for (; initialRegionCount > 0; initialRegionCount--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
+        }
+
+        public void AddNewBlocks(int count)
+        {
+            for (; count > 0; count--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
         }
 
         public int Allocate(int size)
@@ -65,13 +84,14 @@ namespace ARMeilleure.Translation.Cache
             {
                 index = ~index;
             }
+            
+            int endOffs = block.Offset + block.Size;
 
-            if (index < _blocks.Count)
+            // Don't merge blocks from different allocations
+            if (index < _blocks.Count && endOffs % _regionSize != 0)
             {
                 MemoryBlock next = _blocks[index];
 
-                int endOffs = block.Offset + block.Size;
-
                 if (next.Offset == endOffs)
                 {
                     block = new MemoryBlock(block.Offset, block.Size + next.Size);
@@ -79,7 +99,8 @@ namespace ARMeilleure.Translation.Cache
                 }
             }
 
-            if (index > 0)
+            // Don't merge blocks from different allocations
+            if (index > 0 && block.Offset % _regionSize != 0)
             {
                 MemoryBlock prev = _blocks[index - 1];
 

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -14,62 +14,35 @@ using System.Threading;
 
 namespace ARMeilleure.Translation.Cache
 {
-    static partial class JitCache
+    public partial class JitCache : IDisposable
     {
         private static readonly int _pageSize = (int)MemoryBlock.GetPageSize();
         private static readonly int _pageMask = _pageSize - 1;
 
         private const int CodeAlignment = 4; // Bytes.
-        private const int CacheSize = 256 * 1024 * 1024;
+        private const uint CacheSize = 256 * 1024 * 1024;
 
-        private static JitCacheInvalidation _jitCacheInvalidator;
+        private readonly JitCacheInvalidation _jitCacheInvalidator;
 
-        private static readonly List<CacheMemoryAllocator> _cacheAllocators = [];
+        private readonly CacheMemoryAllocator _cacheAllocator;
 
-        private static readonly List<CacheEntry> _cacheEntries = [];
+        private readonly List<CacheEntry> _cacheEntries = [];
 
-        private static readonly Lock _lock = new();
-        private static bool _initialized;
+        private readonly Lock _lock = new();
 
-        private static readonly List<ReservedRegion> _jitRegions = [];
-        private static int _activeRegionIndex = 0;
+        private readonly List<ReservedRegion> _jitRegions = [];
 
         [SupportedOSPlatform("windows")]
         [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
+        private static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
 
-        public static void Initialize(IJitMemoryAllocator allocator)
+        public JitCache(IJitMemoryAllocator allocator)
         {
             lock (_lock)
             {
-                if (_initialized)
-                {
-                    if (OperatingSystem.IsWindows())
-                    {
-                        JitUnwindWindows.RemoveFunctionTableHandler(
-                            _jitRegions[0].Pointer);
-                    }
+                _jitRegions.Add(new(allocator, CacheSize));
 
-                    for (int i = 0; i < _jitRegions.Count; i++)
-                    {
-                        _jitRegions[i].Dispose();
-                    }
-
-                    _jitRegions.Clear();
-                    _cacheAllocators.Clear();
-                }
-                else
-                {
-                    _initialized = true;
-                }
-
-                _activeRegionIndex = 0;
-
-                ReservedRegion firstRegion = new(allocator, CacheSize);
-                _jitRegions.Add(firstRegion);
-
-                CacheMemoryAllocator firstCacheAllocator = new(CacheSize);
-                _cacheAllocators.Add(firstCacheAllocator);
+                _cacheAllocator = new((int)CacheSize);
 
                 if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                 {
@@ -79,23 +52,20 @@ namespace ARMeilleure.Translation.Cache
                 if (OperatingSystem.IsWindows())
                 {
                     JitUnwindWindows.InstallFunctionTableHandler(
-                        firstRegion.Pointer, CacheSize, firstRegion.Pointer + Allocate(_pageSize)
+                        this, _jitRegions[0].Pointer, CacheSize, _jitRegions[0].Pointer + Allocate(_pageSize)
                     );
                 }
             }
         }
 
-        public static nint Map(CompiledFunction func)
+        public nint Map(CompiledFunction func)
         {
             byte[] code = func.Code;
 
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
                 int funcOffset = Allocate(code.Length);
-                ReservedRegion targetRegion = _jitRegions[_activeRegionIndex];
-                nint funcPtr = targetRegion.Pointer + funcOffset;
+                nint funcPtr = GetFunctionPtr(funcOffset);
 
                 if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                 {
@@ -109,9 +79,9 @@ namespace ARMeilleure.Translation.Cache
                 }
                 else
                 {
-                    ReprotectAsWritable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsWritable(funcOffset, code.Length);
                     Marshal.Copy(code, 0, funcPtr, code.Length);
-                    ReprotectAsExecutable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsExecutable(funcOffset, code.Length);
 
                     if (OperatingSystem.IsWindows() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                     {
@@ -129,25 +99,24 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        public static void Unmap(nint pointer)
+        public void Unmap(nint pointer)
         {
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
-                foreach (ReservedRegion region in _jitRegions)
+                for (int i = 0; i < _jitRegions.Count; i++)
                 {
-                    if (pointer.ToInt64() < region.Pointer.ToInt64() ||
-                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
+                    ReservedRegion jitRegion = _jitRegions[i];
+                    if (pointer.ToInt64() < jitRegion.Pointer.ToInt64() ||
+                        pointer.ToInt64() >= (jitRegion.Pointer + (nint)CacheSize).ToInt64())
                     {
                         continue;
                     }
 
-                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64());
+                    int funcOffset = (int)(pointer.ToInt64() - jitRegion.Pointer.ToInt64() + i * CacheSize);
 
                     if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                     {
-                        _cacheAllocators[_activeRegionIndex].Free(funcOffset, AlignCodeSize(entry.Size));
+                        _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
                         _cacheEntries.RemoveAt(entryIndex);
                     }
 
@@ -156,53 +125,67 @@ namespace ARMeilleure.Translation.Cache
             }
         }
 
-        private static void ReprotectAsWritable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsWritable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
+            int regionStart = (offset % (int)CacheSize) & ~_pageMask;
+            int regionEnd = endOffs % (int)CacheSize == 0
+                ? (((int)CacheSize) + _pageMask) & ~_pageMask
+                : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            GetRegion(offset).Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static void ReprotectAsExecutable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsExecutable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
+            int regionStart = (offset % (int)CacheSize) & ~_pageMask;
+            int regionEnd = endOffs % (int)CacheSize == 0
+                ? (((int)CacheSize) + _pageMask) & ~_pageMask
+                : ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            GetRegion(offset).Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static int Allocate(int codeSize)
+        private int Allocate(int codeSize)
         {
             codeSize = AlignCodeSize(codeSize);
 
-            int allocOffset = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
+            int allocOffset = _cacheAllocator.Allocate(codeSize);
 
             if (allocOffset >= 0)
             {
-                _jitRegions[_activeRegionIndex].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
+                GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
                 return allocOffset;
             }
 
-            int exhaustedRegion = _activeRegionIndex;
+            _cacheAllocator.AddNewBlocks(1);
             ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
+            
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache of size {(_jitRegions.Count * CacheSize).Bytes()} exhausted, creating new Cache Region ({((_jitRegions.Count + 1) * CacheSize).Bytes()} Total Allocation).");
+
             _jitRegions.Add(newRegion);
-            _activeRegionIndex = _jitRegions.Count - 1;
-
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {_activeRegionIndex} ({((long)(_activeRegionIndex + 1) * CacheSize).Bytes()} Total Allocation).");
-
-            _cacheAllocators.Add(new CacheMemoryAllocator(CacheSize));
-
-            int allocOffsetNew = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
-            if (allocOffsetNew < 0)
+            
+            allocOffset = _cacheAllocator.Allocate(codeSize);
+            if (allocOffset < 0)
             {
                 throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
             }
 
-            newRegion.ExpandIfNeeded((ulong)allocOffsetNew + (ulong)codeSize);
-            return allocOffsetNew;
+            GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
+            return allocOffset;
+        }
+
+        private nint GetFunctionPtr(int offset)
+        {
+            return GetRegion(offset).Pointer + (offset % (int)CacheSize);
+        }
+
+        private ReservedRegion GetRegion(int offset)
+        {
+            int index = offset / (int)CacheSize;
+
+            return _jitRegions[index];
         }
 
         private static int AlignCodeSize(int codeSize)
@@ -210,7 +193,7 @@ namespace ARMeilleure.Translation.Cache
             return checked(codeSize + (CodeAlignment - 1)) & ~(CodeAlignment - 1);
         }
 
-        private static void Add(int offset, int size, UnwindInfo unwindInfo)
+        private void Add(int offset, int size, UnwindInfo unwindInfo)
         {
             CacheEntry entry = new(offset, size, unwindInfo);
 
@@ -224,25 +207,22 @@ namespace ARMeilleure.Translation.Cache
             _cacheEntries.Insert(index, entry);
         }
 
-        public static bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
+        public bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
         {
             lock (_lock)
             {
-                foreach (ReservedRegion _ in _jitRegions)
+                int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));
+
+                if (index < 0)
                 {
-                    int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));
+                    index = ~index - 1;
+                }
 
-                    if (index < 0)
-                    {
-                        index = ~index - 1;
-                    }
-
-                    if (index >= 0)
-                    {
-                        entry = _cacheEntries[index];
-                        entryIndex = index;
-                        return true;
-                    }
+                if (index >= 0)
+                {
+                    entry = _cacheEntries[index];
+                    entryIndex = index;
+                    return true;
                 }
             }
 
@@ -250,5 +230,18 @@ namespace ARMeilleure.Translation.Cache
             entryIndex = 0;
             return false;
         }
+
+        public void Dispose()
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                JitUnwindWindows.RemoveFunctionTableHandler(_jitRegions[0].Pointer);
+            }
+
+            foreach (ReservedRegion jitRegion in _jitRegions)
+            {
+                jitRegion.Dispose();
+            }
+        }
     }
 }

src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs

@@ -2,6 +2,8 @@
 
 using ARMeilleure.CodeGen.Unwinding;
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
@@ -26,6 +28,29 @@ namespace ARMeilleure.Translation.Cache
             public byte FrameRegister;
             public unsafe fixed ushort UnwindCodes[MaxUnwindCodesArraySize];
         }
+        
+        private unsafe struct InternalFunctionHandler
+        {
+            public InternalFunctionHandler(JitCache jitCache, nint workBufferPtr)
+            {
+                _jitCache = jitCache;
+                
+                _runtimeFunction = (RuntimeFunction*)workBufferPtr;
+
+                _unwindInfo = (UnwindInfo*)(workBufferPtr + _sizeOfRuntimeFunction);
+            }
+
+            readonly JitCache _jitCache;
+
+            readonly RuntimeFunction* _runtimeFunction;
+
+            readonly UnwindInfo* _unwindInfo;
+            
+            public RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
+            {
+                return JitUnwindWindows.FunctionTableHandler(_jitCache, _runtimeFunction, _unwindInfo,  controlPc,  context);
+            }
+        }
 
         private enum UnwindOp
         {
@@ -59,27 +84,28 @@ namespace ARMeilleure.Translation.Cache
 
         private static GetRuntimeFunctionCallback _getRuntimeFunctionCallback;
 
-        private static int _sizeOfRuntimeFunction;
+        private static readonly int _sizeOfRuntimeFunction;
+        
+        private static readonly ConcurrentDictionary<ulong, InternalFunctionHandler> _functionTableHandlers = new();
 
-        private unsafe static RuntimeFunction* _runtimeFunction;
+        static JitUnwindWindows()
+        {
+            _sizeOfRuntimeFunction = Marshal.SizeOf<RuntimeFunction>();
+        }
 
-        private unsafe static UnwindInfo* _unwindInfo;
-
-        public static void InstallFunctionTableHandler(nint codeCachePointer, uint codeCacheLength, nint workBufferPtr)
+        public static void InstallFunctionTableHandler(JitCache jitCache, nint codeCachePointer, uint codeCacheLength, nint workBufferPtr)
         {
             ulong codeCachePtr = (ulong)codeCachePointer.ToInt64();
 
-            _sizeOfRuntimeFunction = Marshal.SizeOf<RuntimeFunction>();
-
             bool result;
 
+            InternalFunctionHandler handler;
+
             unsafe
             {
-                _runtimeFunction = (RuntimeFunction*)workBufferPtr;
+                handler =  new InternalFunctionHandler(jitCache, workBufferPtr);
 
-                _unwindInfo = (UnwindInfo*)(workBufferPtr + _sizeOfRuntimeFunction);
-
-                _getRuntimeFunctionCallback = new GetRuntimeFunctionCallback(FunctionTableHandler);
+                _getRuntimeFunctionCallback = handler.FunctionTableHandler;
 
                 result = RtlInstallFunctionTableCallback(
                     codeCachePtr | 3,
@@ -94,6 +120,8 @@ namespace ARMeilleure.Translation.Cache
             {
                 throw new InvalidOperationException("Failure installing function table callback.");
             }
+
+            _functionTableHandlers.TryAdd(codeCachePtr, handler);
         }
 
         public static void RemoveFunctionTableHandler(nint codeCachePointer)
@@ -111,24 +139,26 @@ namespace ARMeilleure.Translation.Cache
             {
                 throw new InvalidOperationException("Failure removing function table callback.");
             }
+            
+            _functionTableHandlers.Remove(codeCachePtr, out _);
         }
 
-        private static unsafe RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
+        private static unsafe RuntimeFunction* FunctionTableHandler(JitCache jitCache, RuntimeFunction* runtimeFunction, UnwindInfo* unwindInfo, ulong controlPc, nint context)
         {
             int offset = (int)((long)controlPc - context.ToInt64());
 
-            if (!JitCache.TryFind(offset, out CacheEntry funcEntry, out _))
+            if (!jitCache.TryFind(offset, out CacheEntry funcEntry, out _))
             {
                 return null; // Not found.
             }
 
-            CodeGen.Unwinding.UnwindInfo unwindInfo = funcEntry.UnwindInfo;
+            CodeGen.Unwinding.UnwindInfo funcUnwindInfo = funcEntry.UnwindInfo;
 
             int codeIndex = 0;
 
-            for (int index = unwindInfo.PushEntries.Length - 1; index >= 0; index--)
+            for (int index = funcUnwindInfo.PushEntries.Length - 1; index >= 0; index--)
             {
-                UnwindPushEntry entry = unwindInfo.PushEntries[index];
+                UnwindPushEntry entry = funcUnwindInfo.PushEntries[index];
 
                 switch (entry.PseudoOp)
                 {
@@ -140,14 +170,14 @@ namespace ARMeilleure.Translation.Cache
 
                             if (stackOffset <= 0xFFFF0)
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128, entry.PrologOffset, entry.RegIndex);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset / 16);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128, entry.PrologOffset, entry.RegIndex);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset / 16);
                             }
                             else
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128Far, entry.PrologOffset, entry.RegIndex);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 0);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 16);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.SaveXmm128Far, entry.PrologOffset, entry.RegIndex);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 0);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(stackOffset >> 16);
                             }
 
                             break;
@@ -161,18 +191,18 @@ namespace ARMeilleure.Translation.Cache
 
                             if (allocSize <= 128)
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocSmall, entry.PrologOffset, (allocSize / 8) - 1);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocSmall, entry.PrologOffset, (allocSize / 8) - 1);
                             }
                             else if (allocSize <= 0x7FFF8)
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 0);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize / 8);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 0);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize / 8);
                             }
                             else
                             {
-                                _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 1);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 0);
-                                _unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 16);
+                                unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.AllocLarge, entry.PrologOffset, 1);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 0);
+                                unwindInfo->UnwindCodes[codeIndex++] = (ushort)(allocSize >> 16);
                             }
 
                             break;
@@ -180,7 +210,7 @@ namespace ARMeilleure.Translation.Cache
 
                     case UnwindPseudoOp.PushReg:
                         {
-                            _unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.PushNonvol, entry.PrologOffset, entry.RegIndex);
+                            unwindInfo->UnwindCodes[codeIndex++] = PackUnwindOp(UnwindOp.PushNonvol, entry.PrologOffset, entry.RegIndex);
 
                             break;
                         }
@@ -192,16 +222,16 @@ namespace ARMeilleure.Translation.Cache
 
             Debug.Assert(codeIndex <= MaxUnwindCodesArraySize);
 
-            _unwindInfo->VersionAndFlags = 1; // Flags: The function has no handler.
-            _unwindInfo->SizeOfProlog = (byte)unwindInfo.PrologSize;
-            _unwindInfo->CountOfUnwindCodes = (byte)codeIndex;
-            _unwindInfo->FrameRegister = 0;
+            unwindInfo->VersionAndFlags = 1; // Flags: The function has no handler.
+            unwindInfo->SizeOfProlog = (byte)funcUnwindInfo.PrologSize;
+            unwindInfo->CountOfUnwindCodes = (byte)codeIndex;
+            unwindInfo->FrameRegister = 0;
 
-            _runtimeFunction->BeginAddress = (uint)funcEntry.Offset;
-            _runtimeFunction->EndAddress = (uint)(funcEntry.Offset + funcEntry.Size);
-            _runtimeFunction->UnwindData = (uint)_sizeOfRuntimeFunction;
+            runtimeFunction->BeginAddress = (uint)funcEntry.Offset;
+            runtimeFunction->EndAddress = (uint)(funcEntry.Offset + funcEntry.Size);
+            runtimeFunction->UnwindData = (uint)_sizeOfRuntimeFunction;
 
-            return _runtimeFunction;
+            return runtimeFunction;
         }
 
         private static ushort PackUnwindOp(UnwindOp op, int prologOffset, int opInfo)

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -4,6 +4,7 @@ using ARMeilleure.CodeGen.Unwinding;
 using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.State;
+using ARMeilleure.Translation.Cache;
 using Humanizer;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
@@ -33,7 +34,7 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 7010; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7018; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";
@@ -50,6 +51,8 @@ namespace ARMeilleure.Translation.PTC
         private const CompressionLevel SaveCompressionLevel = CompressionLevel.Fastest;
 
         public PtcProfiler Profiler { get; }
+        
+        private readonly JitCache _jitCache;
 
         // Carriers.
         private MemoryStream _infosStream;
@@ -81,7 +84,7 @@ namespace ARMeilleure.Translation.PTC
         private volatile int _translateTotalCount;
         public event Action<PtcLoadingState, int, int> PtcStateChanged;
 
-        public Ptc()
+        public Ptc(JitCache jitCache)
         {
             Profiler = new PtcProfiler(this);
 
@@ -92,6 +95,8 @@ namespace ARMeilleure.Translation.PTC
 
             _waitEvent = new ManualResetEvent(true);
 
+            _jitCache = jitCache;
+
             _disposed = false;
 
             TitleIdText = TitleIdTextDefault;
@@ -782,7 +787,7 @@ namespace ARMeilleure.Translation.PTC
             return new UnwindInfo(pushEntries, prologueSize);
         }
 
-        private static TranslatedFunction FastTranslate(
+        private TranslatedFunction FastTranslate(
             byte[] code,
             Counter<uint> callCounter,
             ulong guestSize,
@@ -790,7 +795,7 @@ namespace ARMeilleure.Translation.PTC
             bool highCq)
         {
             CompiledFunction cFunc = new(code, unwindInfo, RelocInfo.Empty);
-            GuestFunction gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
+            GuestFunction gFunc = cFunc.MapWithPointer<GuestFunction>(_jitCache, out nint gFuncPointer);
 
             return new TranslatedFunction(gFunc, gFuncPointer, callCounter, guestSize, highCq);
         }

src/ARMeilleure/Translation/Translator.cs

@@ -24,6 +24,7 @@ namespace ARMeilleure.Translation
         private readonly IJitMemoryAllocator _allocator;
         private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
 
+        public readonly JitCache JitCache;
         private readonly Ptc _ptc;
 
         internal TranslatorCache<TranslatedFunction> Functions { get; }
@@ -43,16 +44,17 @@ namespace ARMeilleure.Translation
 
             _oldFuncs = new ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>>();
 
-            _ptc = new Ptc();
+            JitCache = new JitCache(allocator);
+            
+            _ptc = new Ptc(JitCache);
 
             Queue = new TranslatorQueue();
 
-            JitCache.Initialize(allocator);
 
             CountTable = new EntryTable<uint>();
             Functions = new TranslatorCache<TranslatedFunction>();
             FunctionTable = functionTable;
-            Stubs = new TranslatorStubs(FunctionTable);
+            Stubs = new TranslatorStubs(JitCache, FunctionTable);
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
         }
@@ -167,6 +169,7 @@ namespace ARMeilleure.Translation
                 }
 
                 ClearJitCache();
+                JitCache.Dispose();
 
                 Stubs.Dispose();
                 FunctionTable.Dispose();
@@ -305,7 +308,7 @@ namespace ARMeilleure.Translation
                 _ptc.WriteCompiledFunction(address, funcSize, hash, highCq, compiledFunc);
             }
 
-            GuestFunction func = compiledFunc.MapWithPointer<GuestFunction>(out nint funcPointer);
+            GuestFunction func = compiledFunc.MapWithPointer<GuestFunction>(JitCache, out nint funcPointer);
 
             Allocators.ResetAll();
 

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -14,6 +14,8 @@ namespace ARMeilleure.Translation
     /// </summary>
     class TranslatorStubs : IDisposable
     {
+        private readonly JitCache _jitCache;
+        
         private readonly Lazy<nint> _slowDispatchStub;
 
         private bool _disposed;
@@ -83,11 +85,14 @@ namespace ARMeilleure.Translation
         /// Initializes a new instance of the <see cref="TranslatorStubs"/> class with the specified
         /// <see cref="Translator"/> instance.
         /// </summary>
+        /// <param name="jitCache">Jit cache to map functions in</param>
         /// <param name="functionTable">Function table used to store pointers to the functions that the guest code will call</param>
         /// <exception cref="ArgumentNullException"><paramref name="translator"/> is null</exception>
-        public TranslatorStubs(IAddressTable<ulong> functionTable)
+        public TranslatorStubs(JitCache jitCache, IAddressTable<ulong> functionTable)
         {
             ArgumentNullException.ThrowIfNull(functionTable);
+            
+            _jitCache = jitCache;
 
             _functionTable = functionTable;
             _slowDispatchStub = new(GenerateSlowDispatchStub, isThreadSafe: true);
@@ -115,12 +120,12 @@ namespace ARMeilleure.Translation
             {
                 if (_dispatchStub.IsValueCreated)
                 {
-                    JitCache.Unmap(_dispatchStub.Value);
+                    _jitCache.Unmap(_dispatchStub.Value);
                 }
 
                 if (_dispatchLoop.IsValueCreated)
                 {
-                    JitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
+                    _jitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
                 }
 
                 _disposed = true;
@@ -156,7 +161,7 @@ namespace ARMeilleure.Translation
             context.BranchIfTrue(lblFallback, masked);
 
             Operand index = default;
-            Operand page = Const((long)_functionTable.Base);
+            Operand page = Const(_functionTable.Base);
 
             for (int i = 0; i < _functionTable.Levels.Length; i++)
             {
@@ -188,7 +193,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.I64;
             OperandType[] argTypes = [OperandType.I64];
 
-            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>(_jitCache);
 
             return Marshal.GetFunctionPointerForDelegate(func);
         }
@@ -213,7 +218,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.I64;
             OperandType[] argTypes = [OperandType.I64];
 
-            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>(_jitCache);
 
             return Marshal.GetFunctionPointerForDelegate(func);
         }
@@ -290,7 +295,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.None;
             OperandType[] argTypes = [OperandType.I64, OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DispatcherFunction>();
+            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DispatcherFunction>(_jitCache);
         }
 
         /// <summary>
@@ -314,7 +319,7 @@ namespace ARMeilleure.Translation
             OperandType retType = OperandType.I64;
             OperandType[] argTypes = [OperandType.I64, OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<WrapperFunction>();
+            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<WrapperFunction>(_jitCache);
         }
     }
 }

src/ARMeilleure/Translation/TranslatorTestMethods.cs

@@ -1,6 +1,7 @@
 using ARMeilleure.CodeGen.X86;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
+using ARMeilleure.Translation.Cache;
 using System;
 using System.Runtime.InteropServices;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
@@ -59,7 +60,7 @@ namespace ARMeilleure.Translation
             return context.VectorExtract(OperandType.I32, vec, 0);
         }
 
-        public static FpFlagsPInvokeTest GenerateFpFlagsPInvokeTest()
+        public static FpFlagsPInvokeTest GenerateFpFlagsPInvokeTest(JitCache jitCache)
         {
             EmitterContext context = new();
 
@@ -141,7 +142,7 @@ namespace ARMeilleure.Translation
 
             OperandType[] argTypes = [OperandType.I64];
 
-            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<FpFlagsPInvokeTest>();
+            return Compiler.Compile(cfg, argTypes, OperandType.I32, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<FpFlagsPInvokeTest>(jitCache);
         }
     }
 }

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -128,7 +128,7 @@ namespace Ryujinx.BuildValidationTasks
 
                 using (StreamWriter sw = new(path))
                 {
-                    sw.Write(jsonString);
+                    sw.Write($"{jsonString}\n");
                 }
             }
 

src/Ryujinx.Common/Configuration/Hid/AssignedInputDevice.cs

@@ -0,0 +1,11 @@
+namespace Ryujinx.Common.Configuration.Hid
+{
+    public class AssignedInputDevice
+    {
+        public AssignedInputDeviceType Type { get; set; }
+
+        public string Id { get; set; }
+
+        public string ProfileName { get; set; }
+    }
+}

src/Ryujinx.Common/Configuration/Hid/AssignedInputDeviceType.cs

@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration.Hid
+{
+    [JsonConverter(typeof(JsonStringEnumConverter<AssignedInputDeviceType>))]
+    public enum AssignedInputDeviceType
+    {
+        Keyboard,
+        Controller,
+    }
+}

src/Ryujinx.Common/Configuration/Hid/InputConfig.cs

@@ -36,6 +36,12 @@ namespace Ryujinx.Common.Configuration.Hid
         /// </summary>
         public PlayerIndex PlayerIndex { get; set; }
 
+        /// <summary>
+        /// Allow a keyboard configuration to temporarily promote to a connected gamepad,
+        /// while preserving the existing keyboard fallback path when that gamepad disappears.
+        /// </summary>
+        public bool EnableDynamicGamepadSwap { get; set; }
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)

src/Ryujinx.Common/Configuration/Hid/Keyboard/StandardKeyboardInputConfig.cs

@@ -1,4 +1,4 @@
 namespace Ryujinx.Common.Configuration.Hid.Keyboard
 {
-    public class StandardKeyboardInputConfig : GenericKeyboardInputConfig<Key> { }
+    public class StandardKeyboardInputConfig : GenericKeyboardInputConfig<PhysicalKey> { }
 }

src/Ryujinx.Common/Configuration/Hid/PhysicalKey.cs

@@ -0,0 +1,142 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration.Hid
+{
+    [JsonConverter(typeof(JsonStringEnumConverter<PhysicalKey>))]
+    public enum PhysicalKey
+    {
+        Unknown,
+        ShiftLeft,
+        ShiftRight,
+        ControlLeft,
+        ControlRight,
+        AltLeft,
+        AltRight,
+        WinLeft,
+        WinRight,
+        Menu,
+        F1,
+        F2,
+        F3,
+        F4,
+        F5,
+        F6,
+        F7,
+        F8,
+        F9,
+        F10,
+        F11,
+        F12,
+        F13,
+        F14,
+        F15,
+        F16,
+        F17,
+        F18,
+        F19,
+        F20,
+        F21,
+        F22,
+        F23,
+        F24,
+        F25,
+        F26,
+        F27,
+        F28,
+        F29,
+        F30,
+        F31,
+        F32,
+        F33,
+        F34,
+        F35,
+        Up,
+        Down,
+        Left,
+        Right,
+        Enter,
+        Escape,
+        Space,
+        Tab,
+        BackSpace,
+        Insert,
+        Delete,
+        PageUp,
+        PageDown,
+        Home,
+        End,
+        CapsLock,
+        ScrollLock,
+        PrintScreen,
+        Pause,
+        NumLock,
+        Clear,
+        Keypad0,
+        Keypad1,
+        Keypad2,
+        Keypad3,
+        Keypad4,
+        Keypad5,
+        Keypad6,
+        Keypad7,
+        Keypad8,
+        Keypad9,
+        KeypadDivide,
+        KeypadMultiply,
+        KeypadSubtract,
+        KeypadAdd,
+        KeypadDecimal,
+        KeypadEnter,
+        A,
+        B,
+        C,
+        D,
+        E,
+        F,
+        G,
+        H,
+        I,
+        J,
+        K,
+        L,
+        M,
+        N,
+        O,
+        P,
+        Q,
+        R,
+        S,
+        T,
+        U,
+        V,
+        W,
+        X,
+        Y,
+        Z,
+        Number0,
+        Number1,
+        Number2,
+        Number3,
+        Number4,
+        Number5,
+        Number6,
+        Number7,
+        Number8,
+        Number9,
+        Tilde,
+        Grave,
+        Minus,
+        Plus,
+        BracketLeft,
+        BracketRight,
+        Semicolon,
+        Quote,
+        Comma,
+        Period,
+        Slash,
+        BackSlash,
+        Unbound,
+
+        Count,
+    }
+}

src/Ryujinx.Common/Configuration/Hid/PlayerInputAssignment.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Ryujinx.Common.Configuration.Hid
+{
+    public class PlayerInputAssignment
+    {
+        public PlayerIndex PlayerIndex { get; set; }
+
+        public bool EnableDynamicInputSwap { get; set; }
+
+        public List<AssignedInputDevice> Devices { get; set; } = [];
+    }
+}

src/Ryujinx.Common/Configuration/Hid/PlayerInputAssignmentHelper.cs

@@ -0,0 +1,166 @@
+using Ryujinx.Common.Configuration.Hid.Keyboard;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ryujinx.Common.Configuration.Hid
+{
+    public static class PlayerInputAssignmentHelper
+    {
+        public static AssignedInputDevice CreatePrimaryDevice(InputConfig inputConfig)
+        {
+            if (inputConfig == null || string.IsNullOrWhiteSpace(inputConfig.Id))
+            {
+                return null;
+            }
+
+            return new AssignedInputDevice
+            {
+                Type = inputConfig is StandardKeyboardInputConfig
+                    ? AssignedInputDeviceType.Keyboard
+                    : AssignedInputDeviceType.Controller,
+                Id = inputConfig.Id,
+            };
+        }
+
+        public static PlayerInputAssignment Normalize(PlayerInputAssignment assignment, AssignedInputDevice preferredDevice = null)
+        {
+            if (assignment == null)
+            {
+                return null;
+            }
+
+            PlayerInputAssignment normalized = new()
+            {
+                PlayerIndex = assignment.PlayerIndex,
+                EnableDynamicInputSwap = assignment.EnableDynamicInputSwap,
+            };
+
+            List<AssignedInputDevice> distinctDevices = Deduplicate(assignment.Devices);
+
+            if (assignment.EnableDynamicInputSwap)
+            {
+                normalized.Devices.AddRange(distinctDevices.Select(Clone));
+                return normalized;
+            }
+
+            AssignedInputDevice primaryDevice = SelectPrimaryDevice(distinctDevices, preferredDevice) ?? Clone(preferredDevice);
+
+            if (primaryDevice != null)
+            {
+                normalized.Devices.Add(Clone(primaryDevice));
+            }
+
+            return normalized;
+        }
+
+        public static bool AreEquivalent(
+            PlayerInputAssignment left,
+            PlayerInputAssignment right,
+            AssignedInputDevice leftPreferredDevice = null,
+            AssignedInputDevice rightPreferredDevice = null)
+        {
+            if (left == null || right == null)
+            {
+                return left == right;
+            }
+
+            PlayerInputAssignment normalizedLeft = Normalize(left, leftPreferredDevice);
+            PlayerInputAssignment normalizedRight = Normalize(right, rightPreferredDevice);
+
+            if (normalizedLeft.EnableDynamicInputSwap != normalizedRight.EnableDynamicInputSwap)
+            {
+                return false;
+            }
+
+            List<(AssignedInputDeviceType Type, string Id, string ProfileName)> leftDevices = normalizedLeft.Devices
+                .Select(device => (Type: device.Type, Id: device.Id, ProfileName: device.ProfileName ?? string.Empty))
+                .OrderBy(device => device.Type)
+                .ThenBy(device => device.Id, StringComparer.Ordinal)
+                .ThenBy(device => device.ProfileName, StringComparer.Ordinal)
+                .ToList();
+
+            List<(AssignedInputDeviceType Type, string Id, string ProfileName)> rightDevices = normalizedRight.Devices
+                .Select(device => (Type: device.Type, Id: device.Id, ProfileName: device.ProfileName ?? string.Empty))
+                .OrderBy(device => device.Type)
+                .ThenBy(device => device.Id, StringComparer.Ordinal)
+                .ThenBy(device => device.ProfileName, StringComparer.Ordinal)
+                .ToList();
+
+            return leftDevices.SequenceEqual(rightDevices);
+        }
+
+        private static List<AssignedInputDevice> Deduplicate(IEnumerable<AssignedInputDevice> devices)
+        {
+            List<AssignedInputDevice> result = [];
+
+            if (devices == null)
+            {
+                return result;
+            }
+
+            foreach (AssignedInputDevice device in devices)
+            {
+                if (device == null || string.IsNullOrWhiteSpace(device.Id))
+                {
+                    continue;
+                }
+
+                int existingIndex = result.FindIndex(existing =>
+                    existing.Type == device.Type &&
+                    string.Equals(existing.Id, device.Id, StringComparison.Ordinal));
+
+                if (existingIndex == -1)
+                {
+                    result.Add(Clone(device));
+                    continue;
+                }
+
+                if (!string.IsNullOrWhiteSpace(device.ProfileName) ||
+                    string.IsNullOrWhiteSpace(result[existingIndex].ProfileName))
+                {
+                    result[existingIndex].ProfileName = device.ProfileName;
+                }
+            }
+
+            return result;
+        }
+
+        private static AssignedInputDevice SelectPrimaryDevice(List<AssignedInputDevice> devices, AssignedInputDevice preferredDevice)
+        {
+            if (devices == null || devices.Count == 0)
+            {
+                return null;
+            }
+
+            if (preferredDevice != null)
+            {
+                AssignedInputDevice matchedDevice = devices.FirstOrDefault(device =>
+                    device.Type == preferredDevice.Type &&
+                    string.Equals(device.Id, preferredDevice.Id, StringComparison.Ordinal));
+
+                if (matchedDevice != null)
+                {
+                    return matchedDevice;
+                }
+            }
+
+            return devices[0];
+        }
+
+        private static AssignedInputDevice Clone(AssignedInputDevice device)
+        {
+            if (device == null)
+            {
+                return null;
+            }
+
+            return new AssignedInputDevice
+            {
+                Type = device.Type,
+                Id = device.Id,
+                ProfileName = device.ProfileName,
+            };
+        }
+    }
+}

src/Ryujinx.Common/Helpers/FileAssociationHelper.cs

@@ -24,6 +24,9 @@ namespace Ryujinx.Common.Helper
 
         public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows());
 
+        // NOTE: On macOS, users have a more robust file association system (via Right-Click > Get Info > "Open with:" > Ryujinx > "Change All...)
+        // Custom file association isn't strictly necessary and will not provide any additional benefit to macOS users.
+
         public static bool AreMimeTypesRegistered
         {
             get
@@ -38,8 +41,6 @@ namespace Ryujinx.Common.Helper
                     return AreMimeTypesRegisteredWindows();
                 }
 
-                // TODO: Add macOS support.
-
                 return false;
             }
         }
@@ -173,8 +174,6 @@ namespace Ryujinx.Common.Helper
                 return InstallWindowsMimeTypes();
             }
 
-            // TODO: Add macOS support.
-
             return false;
         }
 
@@ -190,8 +189,6 @@ namespace Ryujinx.Common.Helper
                 return InstallWindowsMimeTypes(true);
             }
 
-            // TODO: Add macOS support.
-
             return false;
         }
     }

src/Ryujinx.Common/TitleIDs.cs

@@ -17,6 +17,7 @@ namespace Ryujinx.Common
                           //Dragon Quest Franchise
             "010008900705c000", // Dragon Quest Builders
             "010042000a986000", // Dragon Quest Builders 2
+            "010021701c45e000", // Dragon Quest VII Reimagined Demo
             
                           //Fire Emblem Franchise
             "0100a6301214e000", // Fire Emblem Engage
@@ -33,7 +34,6 @@ namespace Ryujinx.Common
             "01007e3006dda000", // Kirby Star Allies
             "01003fb00c5a8000", // Super Kirby Clash
             
-            
                           //The Zelda Franchise
             "01000b900d8b0000", // Cadence of Hyrule
             "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
@@ -43,8 +43,7 @@ namespace Ryujinx.Common
             "01002da013484000", // The Legend of Zelda: Skyward Sword HD
             "0100f2c0115b6000", // The Legend of Zelda: Tears of the Kingdom
             "01008cf01baac000", // The Legend of Zelda: Echoes of Wisdom
-            
-
+                
                           //Luigi Franchise
             "010048701995e000", // Luigi's Mansion 2 HD
             "0100dca0064a6000", // Luigi's Mansion 3
@@ -75,16 +74,13 @@ namespace Ryujinx.Common
             "010049900f546002", // Super Mario 3D All-Stars | Super Mario Sunshine
             "010049900f546003", // Super Mario 3D All-Stars | Super Mario Galaxy
             "010028600ebda000", // Super Mario 3D World + Bowser's Fury
-            "010049900F546001", // Super Mario 64
             "0100ea80032ea000", // Super Mario Bros. U Deluxe
             "010015100b514000", // Super Mario Bros. Wonder
-            "010049900F546003", // Super Mario Galaxy
             "01009b90006dc000", // Super Mario Maker 2
             "0100000000010000", // SUPER MARIO ODYSSEY
             "010036b0034e4000", // Super Mario Party
             "0100965017338000", // Super Mario Party Jamboree
             "0100bc0018138000", // Super Mario RPG
-            "010049900F546002", // Super Mario Sunshine
             "0100a3900c3e2000", // Paper Mario: The Origami King
             "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
             "01009cC022b96000", // Super Mario Galaxy
@@ -147,7 +143,9 @@ namespace Ryujinx.Common
             "0100c1f0051b6000", // Donkey Kong Country: Tropical Freeze
             "0100ed000d390000", // Dr. Kawashima's Brain Training
             "010067b017588000", // Endless Ocean Luminous
+            "01003da010e8a000", // Miitopia
             "01006b5012b32000", // Part Time UFO
+            "0100107027310000", // Rhythm Heave Groove: Starter Demo
             "0100704000B3A000", // Snipperclips
             "01006a800016e000", // Super Smash Bros. Ultimate
             "0100a9400c9c2000", // Tokyo Mirage Sessions #FE Encore
@@ -175,7 +173,7 @@ namespace Ryujinx.Common
             "01004ad014bf0000", // Sonic Frontiers
             "01009aa000faa000", // Sonic Mania
             "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
-            "01005ea01c0fc001", // ^
+            "01005ea01c0fc001", // ^ TODO: (Needs to be differentiated like 3D All Stars)
             "01006e001823c000", // Sonic Racing: CrossWorlds
             "010064b0242be000", // Sonic Racing: CrossWorlds - Demo
 
@@ -198,6 +196,7 @@ namespace Ryujinx.Common
             "0100744001588000", // Cars 3: Driven to Win
             "0100b41013c82000", // Cruis'n Blast
             "010085900337e000", // Death Squared
+            "0100a0d022a68000", // DELTARUNE
             "01001b300b9be000", // Diablo III: Eternal Collection
             "010027400cdc6000", // Divinity Original 2 - Definitive Edition
             "01008c8012920000", // Dying Light Platinum Edition
@@ -210,6 +209,8 @@ namespace Ryujinx.Common
             "010013c00e930000", // Hollow Knight: Silksong
             "010085500130a000", // Lego City: Undercover
             "010073c01af34000", // LEGO Horizon Adventures
+            "0100653026dde000", // MARVEL Cosmic Invasion Demo
+            "0100419014456000", // Mary Skelter Finale
             "0100d71004694000", // Minecraft
             "01007430037f6000", // Monopoly
             "0100853015e86000", // No Man's Sky
@@ -230,6 +231,8 @@ namespace Ryujinx.Common
             "01008d100d43e000", // Saints Row IV
             "0100de600beee000", // Saints Row: The Third - The Full Package
             "01001180021fa000", // Shovel Knight: Specter of Torment
+            "0100ccc0002e6000", // Skylanders Imaginators (US)
+            "010048d000bfc000", // Skylanders Imaginators (EU)
             "010079f00671c000", // Sparkle 2: Evo
             "010077b00e046000", // Spyro: Reignited Trilogy
             "0100e1D01eb2e000", // Squeakross: Home Squeak Home

src/Ryujinx.Cpu/AddressTable.cs

@@ -81,12 +81,13 @@ namespace ARMeilleure.Common
 
         private bool _disposed;
         private TEntry** _table;
+        private TEntry* _sparseTable;
         private readonly List<AddressTablePage> _pages;
         private TEntry _fill;
 
-        private readonly MemoryBlock _sparseFill;
-        private readonly SparseMemoryBlock _fillBottomLevel;
-        private readonly TEntry* _fillBottomLevelPtr;
+        private MemoryBlock _sparseFill;
+        private SparseMemoryBlock _fillBottomLevel;
+        private TEntry* _fillBottomLevelPtr;
 
         private readonly List<TableSparseBlock> _sparseReserved;
         private readonly ReaderWriterLockSlim _sparseLock;
@@ -122,16 +123,23 @@ namespace ARMeilleure.Common
             {
                 ObjectDisposedException.ThrowIf(_disposed, this);
 
-                lock (_pages)
+                if (Sparse)
                 {
-                    return (nint)GetRootPage();
+                    return (nint)_sparseTable;
+                }
+                else
+                {
+                    lock (_pages)
+                    {
+                        return (nint)GetRootPage();
+                    }
                 }
             }
         }
 
         /// <summary>
         /// Constructs a new instance of the <see cref="AddressTable{TEntry}"/> class with the specified list of
-        /// <see cref="Level"/>.
+        /// <see cref="AddressTableLevel"/>.
         /// </summary>
         /// <param name="levels">Levels for the address table</param>
         /// <param name="sparse">True if the bottom page should be sparsely mapped</param>
@@ -156,18 +164,8 @@ namespace ARMeilleure.Common
             if (sparse)
             {
                 // If the address table is sparse, allocate a fill block
-
-                _sparseFill = new MemoryBlock(268435456ul, MemoryAllocationFlags.Mirrorable); //low Power TC uses size: 65536ul
-
-                ulong bottomLevelSize = (1ul << levels.Last().Length) * (ulong)sizeof(TEntry);
-
-                _fillBottomLevel = new SparseMemoryBlock(bottomLevelSize, null, _sparseFill);
-                _fillBottomLevelPtr = (TEntry*)_fillBottomLevel.Block.Pointer;
-
                 _sparseReserved = [];
                 _sparseLock = new ReaderWriterLockSlim();
-
-                _sparseBlockSize = bottomLevelSize;
             }
         }
 
@@ -209,13 +207,24 @@ namespace ARMeilleure.Common
         public void SignalCodeRange(ulong address, ulong size)
         {
             AddressTableLevel bottom = Levels.Last();
-            ulong bottomLevelEntries = 1ul << bottom.Length;
-
-            ulong entryIndex = address >> bottom.Index;
+            
             ulong entries = size >> bottom.Index;
-            entries += entryIndex - BitUtils.AlignDown(entryIndex, bottomLevelEntries);
+            
+            if (Sparse)
+            {
+                ulong bottomLevelSize = (ulong)BitUtils.Pow2RoundUp((int)entries) * (ulong)sizeof(TEntry);
+                
+                _sparseFill = new MemoryBlock(bottomLevelSize, MemoryAllocationFlags.Mirrorable);
 
-            _sparseBlockSize = Math.Max(_sparseBlockSize, BitUtils.AlignUp(entries, bottomLevelEntries) * (ulong)sizeof(TEntry));
+                _fillBottomLevel = new SparseMemoryBlock(bottomLevelSize, null, _sparseFill);
+                _fillBottomLevelPtr = (TEntry*)_fillBottomLevel.Block.Pointer;
+
+                _sparseBlockSize = bottomLevelSize;
+                
+                _sparseTable = (TEntry*)Allocate((int)entries, Fill, leaf: true);
+
+                _sparseTable -= Levels.Last().GetValue(address);
+            }
         }
 
         /// <inheritdoc/>
@@ -234,15 +243,26 @@ namespace ARMeilleure.Common
                 throw new ArgumentException($"Address 0x{address:X} is not mapped onto the table.", nameof(address));
             }
 
-            lock (_pages)
+            if (Sparse)
             {
-                TEntry* page = GetPage(address);
+                long index = Levels.Last().GetValue(address);
+                
+                EnsureMapped((nint)(_sparseTable + index));
+                
+                return ref _sparseTable[index];
+            }
+            else
+            {
+                lock (_pages)
+                {
+                    TEntry* page = GetPage(address);
 
-                long index = Levels[^1].GetValue(address);
+                    long index = Levels.Last().GetValue(address);
 
-                EnsureMapped((nint)(page + index));
+                    EnsureMapped((nint)(page + index));
 
-                return ref page[index];
+                    return ref page[index];
+                }
             }
         }
 

src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.State;
+using Ryujinx.Common.Logging;
 using Ryujinx.Cpu.AppleHv.Arm;
 using Ryujinx.Memory.Tracking;
 using System;
@@ -17,9 +18,7 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 uint currentEl = Pstate & ~((uint)ExceptionLevel.PstateMask);
                 if (currentEl == (uint)ExceptionLevel.EL1h)
-                {
                     return _impl.ElrEl1;
-                }
                 return _impl.Pc;
             }
         }
@@ -69,9 +68,7 @@ namespace Ryujinx.Cpu.AppleHv
             set
             {
                 if (value)
-                {
                     throw new NotSupportedException();
-                }
             }
         }
 
@@ -82,11 +79,13 @@ namespace Ryujinx.Cpu.AppleHv
         private readonly IHvExecutionContext _shadowContext;
         private IHvExecutionContext _impl;
         private int _shouldStep;
-
         private readonly ExceptionCallbacks _exceptionCallbacks;
-
         private int _interruptRequested;
 
+        // GPU Sync control
+        private int _syncCounter;
+        private int _strongSyncCounter;
+
         public HvExecutionContext(ICounter counter, ExceptionCallbacks exceptionCallbacks)
         {
             _counter = counter;
@@ -108,38 +107,17 @@ namespace Ryujinx.Cpu.AppleHv
         /// <inheritdoc/>
         public void SetV(int index, V128 value) => _impl.SetV(index, value);
 
-        private void InterruptHandler()
-        {
-            _exceptionCallbacks.InterruptCallback?.Invoke(this);
-        }
-
-        private void BreakHandler(ulong address, int imm)
-        {
-            _exceptionCallbacks.BreakCallback?.Invoke(this, address, imm);
-        }
-
-        private void StepHandler()
-        {
-            _exceptionCallbacks.StepCallback?.Invoke(this);
-        }
-
-        private void SupervisorCallHandler(ulong address, int imm)
-        {
-            _exceptionCallbacks.SupervisorCallback?.Invoke(this, address, imm);
-        }
-
-        private void UndefinedHandler(ulong address, int opCode)
-        {
-            _exceptionCallbacks.UndefinedCallback?.Invoke(this, address, opCode);
-        }
+        private void InterruptHandler() => _exceptionCallbacks.InterruptCallback?.Invoke(this);
+        private void BreakHandler(ulong address, int imm) => _exceptionCallbacks.BreakCallback?.Invoke(this, address, imm);
+        private void StepHandler() => _exceptionCallbacks.StepCallback?.Invoke(this);
+        private void SupervisorCallHandler(ulong address, int imm) => _exceptionCallbacks.SupervisorCallback?.Invoke(this, address, imm);
+        private void UndefinedHandler(ulong address, int opCode) => _exceptionCallbacks.UndefinedCallback?.Invoke(this, address, opCode);
 
         /// <inheritdoc/>
         public void RequestInterrupt()
         {
             if (Interlocked.Exchange(ref _interruptRequested, 1) == 0 && _impl is HvExecutionContextVcpu impl)
-            {
                 impl.RequestInterrupt();
-            }
         }
 
         private bool GetAndClearInterruptRequested()
@@ -161,13 +139,9 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 uint currentEl = Pstate & ~((uint)ExceptionLevel.PstateMask);
                 if (currentEl == (uint)ExceptionLevel.EL1h)
-                {
                     _impl.ElrEl1 = value;
-                }
                 else
-                {
                     _impl.Pc = value;
-                }
             }
         }
 
@@ -181,9 +155,11 @@ namespace Ryujinx.Cpu.AppleHv
         public unsafe void Execute(HvMemoryManager memoryManager, ulong address)
         {
             HvVcpu vcpu = HvVcpuPool.Instance.Create(memoryManager.AddressSpace, _shadowContext, SwapContext);
-
             HvApi.hv_vcpu_set_reg(vcpu.Handle, HvReg.PC, address).ThrowOnError();
 
+            _syncCounter = 0;
+            _strongSyncCounter = 0;
+
             while (Running)
             {
                 if (Interlocked.CompareExchange(ref _shouldStep, 0, 1) == 1)
@@ -192,16 +168,23 @@ namespace Ryujinx.Cpu.AppleHv
                     if (currentEl == (uint)ExceptionLevel.EL1h)
                     {
                         HvApi.hv_vcpu_get_sys_reg(vcpu.Handle, HvSysReg.SPSR_EL1, out ulong spsr).ThrowOnError();
-                        spsr |= (1 << 21);
+                        spsr |= (1U << 21);
                         HvApi.hv_vcpu_set_sys_reg(vcpu.Handle, HvSysReg.SPSR_EL1, spsr);
                     }
                     else
                     {
-                        Pstate |= (1 << 21);
+                        Pstate |= (1U << 21);
                     }
                     HvApi.hv_vcpu_set_sys_reg(vcpu.Handle, HvSysReg.MDSCR_EL1, 1);
                 }
 
+                // Adaptive GPU synchronization to prevent 0 FPS
+                if (++_syncCounter % 12 == 0)
+                {
+                    TryGpuSync();
+                    _syncCounter = 0;
+                }
+
                 HvApi.hv_vcpu_run(vcpu.Handle).ThrowOnError();
 
                 HvExitReason reason = vcpu.ExitInfo->Reason;
@@ -212,9 +195,7 @@ namespace Ryujinx.Cpu.AppleHv
                     ExceptionClass hvEc = (ExceptionClass)(hvEsr >> 26);
 
                     if (hvEc != ExceptionClass.HvcAarch64)
-                    {
                         throw new Exception($"Unhandled exception from guest kernel with ESR 0x{hvEsr:X} ({hvEc}).");
-                    }
 
                     address = SynchronousException(memoryManager, ref vcpu);
                     HvApi.hv_vcpu_set_reg(vcpu.Handle, HvReg.PC, address).ThrowOnError();
@@ -245,10 +226,31 @@ namespace Ryujinx.Cpu.AppleHv
             HvVcpuPool.Instance.Destroy(vcpu, SwapContext);
         }
 
+        // TryGpuSync() is called periodically in the main Execute() loop. The "syncing" value can be tuned based on gameplay results.
+        // This feature it to be followed-up and further completed in a future PR.
+        private void TryGpuSync()
+        {
+            try
+            {
+                Thread.Yield();
+
+                if (++_strongSyncCounter % 6 == 0)
+                {
+                    Thread.Yield();
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_strongSyncCounter % 100 == 0)
+                {
+                    Logger.Warning?.Print(LogClass.Gpu, $"[AppleHv] GPU sync issue: {ex.Message}");
+                }
+            }
+        }
+
         private ulong SynchronousException(HvMemoryManager memoryManager, ref HvVcpu vcpu)
         {
             ulong vcpuHandle = vcpu.Handle;
-
             HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.ELR_EL1, out ulong elr).ThrowOnError();
             HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.ESR_EL1, out ulong esr).ThrowOnError();
 
@@ -259,16 +261,20 @@ namespace Ryujinx.Cpu.AppleHv
                 case ExceptionClass.DataAbortLowerEl:
                     DataAbort(memoryManager.Tracking, vcpuHandle, (uint)esr);
                     break;
+
                 case ExceptionClass.TrappedMsrMrsSystem:
                     InstructionTrap((uint)esr);
                     HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.ELR_EL1, elr + 4UL).ThrowOnError();
                     break;
+
                 case ExceptionClass.SvcAarch64:
                     ReturnToPool(vcpu);
                     ushort id = (ushort)esr;
                     SupervisorCallHandler(elr - 4UL, id);
+                    Thread.Yield(); // MoltenVK causes extremely frequent SVC exits, and HVF handles them in a busy loop. Hypervisor.Framework accelerates the guest CPU, and without periodic yielding/flushing, MoltenVK's presentation queue can starve, causing permanent 0 FPS deadlock.
                     vcpu = RentFromPool(memoryManager.AddressSpace, vcpu);
                     break;
+
                 case ExceptionClass.SoftwareStepLowerEl:
                     HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, out ulong spsr).ThrowOnError();
                     spsr &= ~((ulong)(1 << 21));
@@ -278,21 +284,23 @@ namespace Ryujinx.Cpu.AppleHv
                     StepHandler();
                     vcpu = RentFromPool(memoryManager.AddressSpace, vcpu);
                     break;
+
                 case ExceptionClass.BrkAarch64:
                     ReturnToPool(vcpu);
                     BreakHandler(elr, (ushort)esr);
                     vcpu = RentFromPool(memoryManager.AddressSpace, vcpu);
                     break;
+
                 default:
                     throw new Exception($"Unhandled guest exception {ec}.");
             }
 
             // Make sure we will continue running at EL0.
             if (memoryManager.AddressSpace.GetAndClearUserTlbInvalidationPending())
-            {
+
                 // TODO: Invalidate only the range that was modified?
                 return HvAddressSpace.KernelRegionTlbiEretAddress;
-            }
+
             return HvAddressSpace.KernelRegionEretAddress;
         }
 
@@ -305,7 +313,6 @@ namespace Ryujinx.Cpu.AppleHv
             if (farValid)
             {
                 HvApi.hv_vcpu_get_sys_reg(vcpu, HvSysReg.FAR_EL1, out ulong far).ThrowOnError();
-
                 ulong size = 1UL << accessSizeLog2;
 
                 if (!tracking.VirtualMemoryEvent(far, size, write))
@@ -349,9 +356,7 @@ namespace Ryujinx.Cpu.AppleHv
         private void WriteRt(uint rt, ulong value)
         {
             if (rt < 31)
-            {
                 SetX((int)rt, value);
-            }
         }
 
         private void ReturnToPool(HvVcpu vcpu)
@@ -369,8 +374,6 @@ namespace Ryujinx.Cpu.AppleHv
             _impl = newContext;
         }
 
-        public void Dispose()
-        {
-        }
+        public void Dispose() { }
     }
 }

src/Ryujinx.Cpu/AppleHv/HvExecutionContextVcpu.cs

@@ -1,5 +1,7 @@
 using ARMeilleure.State;
+using Ryujinx.Common.Logging;
 using Ryujinx.Memory;
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Threading;
@@ -14,8 +16,31 @@ namespace Ryujinx.Cpu.AppleHv
         private static readonly SetSimdFpReg _setSimdFpReg;
         private static readonly nint _setSimdFpRegNativePtr;
 
+        public static bool AggressiveMode { get; set; } = false;
+        private bool _earlyBootPhase = true;
+
         public ulong ThreadUid { get; set; }
 
+        private readonly ulong[] _x = new ulong[32];
+        private readonly V128[] _v = new V128[32];
+
+        private ulong _pc;
+        private ulong _elrEl1;
+        private ulong _esrEl1;
+        private ulong _tpidrEl0;
+        private ulong _tpidrroEl0;
+        private ulong _fpcr;
+        private ulong _fpsr;
+        private ulong _pstateRaw;
+
+        private long _fallbackCount;
+        private long _lastWarningTicks;
+        private const long WarningCooldownTicks = 500_000_000; // 0.5 seconds
+
+        private readonly ulong _vcpu;
+        private int _interruptRequested;
+        private readonly object _registerLock = new object();
+
         static HvExecutionContextVcpu()
         {
             // .NET does not support passing vectors by value, so we need to pass a pointer and use a native
@@ -33,155 +58,293 @@ namespace Ryujinx.Cpu.AppleHv
             }
         }
 
+        public HvExecutionContextVcpu(ulong vcpu)
+        {
+            _vcpu = vcpu;
+            Reset();
+        }
+
+        public void Reset()
+        {
+            lock (_registerLock)
+            {
+                _pstateRaw = 0x80000000UL;
+                _pc = 0;
+                _elrEl1 = 0;
+                _esrEl1 = 0;
+                _tpidrEl0 = 0;
+                _tpidrroEl0 = 0;
+                _fpcr = 0;
+                _fpsr = 0;
+
+                Array.Clear(_x, 0, _x.Length);
+                Array.Clear(_v, 0, _v.Length);
+
+                _fallbackCount = 0;
+                _lastWarningTicks = 0;
+                _interruptRequested = 0;
+                _earlyBootPhase = true;
+            }
+        }
+
+        private void LogHvWarning(string operation, string regName, string extra = "")
+        {
+            if (AggressiveMode) return;
+
+            long now = DateTime.UtcNow.Ticks;
+            if (now - _lastWarningTicks <= WarningCooldownTicks) return;
+
+            string msg = $"[AppleHv] BadArgument on {operation} {regName} | PC=0x{_pc:X16}";
+            if (!string.IsNullOrEmpty(extra)) msg += $" | {extra}";
+            msg += $" | Total: {Interlocked.Read(ref _fallbackCount)}";
+
+            Logger.Warning?.Print(LogClass.Cpu, msg);
+            _lastWarningTicks = now;
+        }
+
         public ulong Pc
         {
-            get
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.PC, out ulong pc).ThrowOnError();
-                return pc;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.PC, value).ThrowOnError();
-            }
+            get { lock (_registerLock) return GetRegCached(HvReg.PC, ref _pc, "PC"); }
+            set { lock (_registerLock) SetRegCached(HvReg.PC, value, ref _pc, "PC"); }
         }
 
         public ulong ElrEl1
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.ELR_EL1, out ulong elr).ThrowOnError();
-                return elr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.ELR_EL1, value).ThrowOnError();
-            }
+            get { lock (_registerLock) return GetSysRegCached(HvSysReg.ELR_EL1, ref _elrEl1, "ELR_EL1"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.ELR_EL1, value, ref _elrEl1, "ELR_EL1"); }
         }
 
         public ulong EsrEl1
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.ESR_EL1, out ulong esr).ThrowOnError();
-                return esr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.ESR_EL1, value).ThrowOnError();
-            }
+            get { lock (_registerLock) return GetSysRegCached(HvSysReg.ESR_EL1, ref _esrEl1, "ESR_EL1"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.ESR_EL1, value, ref _esrEl1, "ESR_EL1"); }
         }
 
         public long TpidrEl0
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.TPIDR_EL0, out ulong tpidrEl0).ThrowOnError();
-                return (long)tpidrEl0;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.TPIDR_EL0, (ulong)value).ThrowOnError();
-            }
+            get { lock (_registerLock) return (long)GetSysRegCached(HvSysReg.TPIDR_EL0, ref _tpidrEl0, "TPIDR_EL0"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.TPIDR_EL0, (ulong)value, ref _tpidrEl0, "TPIDR_EL0"); }
         }
 
         public long TpidrroEl0
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.TPIDRRO_EL0, out ulong tpidrroEl0).ThrowOnError();
-                return (long)tpidrroEl0;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.TPIDRRO_EL0, (ulong)value).ThrowOnError();
-            }
+            get { lock (_registerLock) return (long)GetSysRegCached(HvSysReg.TPIDRRO_EL0, ref _tpidrroEl0, "TPIDRRO_EL0"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.TPIDRRO_EL0, (ulong)value, ref _tpidrroEl0, "TPIDRRO_EL0"); }
         }
 
         public uint Pstate
         {
             get
             {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.CPSR, out ulong cpsr).ThrowOnError();
-                return (uint)cpsr;
+                lock (_registerLock)
+                {
+                    HvResult res = HvApi.hv_vcpu_get_reg(_vcpu, HvReg.CPSR, out ulong val);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("Get", "CPSR (Pstate)");
+                        return (uint)_pstateRaw;
+                    }
+                    res.ThrowOnError();
+                    _pstateRaw = val;
+                    return (uint)val;
+                }
             }
             set
             {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.CPSR, (ulong)value).ThrowOnError();
+                lock (_registerLock)
+                {
+                    HvResult res = HvApi.hv_vcpu_set_reg(_vcpu, HvReg.CPSR, value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("Set", "CPSR (Pstate)", $"value=0x{value:X}");
+                    }
+                    else res.ThrowOnError();
+                    _pstateRaw = value;
+                }
             }
         }
 
         public uint Fpcr
         {
-            get
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.FPCR, out ulong fpcr).ThrowOnError();
-                return (uint)fpcr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.FPCR, (ulong)value).ThrowOnError();
-            }
+            get { lock (_registerLock) return (uint)GetRegCached(HvReg.FPCR, ref _fpcr, "FPCR"); }
+            set { lock (_registerLock) SetRegCached(HvReg.FPCR, value, ref _fpcr, "FPCR"); }
         }
 
         public uint Fpsr
         {
-            get
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.FPSR, out ulong fpsr).ThrowOnError();
-                return (uint)fpsr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.FPSR, (ulong)value).ThrowOnError();
-            }
-        }
-
-        private readonly ulong _vcpu;
-        private int _interruptRequested;
-
-        public HvExecutionContextVcpu(ulong vcpu)
-        {
-            _vcpu = vcpu;
+            get { lock (_registerLock) return (uint)GetRegCached(HvReg.FPSR, ref _fpsr, "FPSR"); }
+            set { lock (_registerLock) SetRegCached(HvReg.FPSR, value, ref _fpsr, "FPSR"); }
         }
 
         public ulong GetX(int index)
         {
-            if (index == 31)
+            lock (_registerLock)
             {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.SP_EL0, out ulong value).ThrowOnError();
-                return value;
-            }
-            else
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.X0 + (uint)index, out ulong value).ThrowOnError();
-                return value;
+                ulong value;
+                string regName = index == 31 ? "SP_EL0" : $"X{index}";
+
+                if (index == 31)
+                {
+                    HvResult res = HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.SP_EL0, out value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("GetX", regName);
+                        return _x[31];
+                    }
+                    res.ThrowOnError();
+                    return _x[31] = value;
+                }
+
+                if ((uint)index > 30) return 0;
+
+                if (index == 0 && _earlyBootPhase && _pc == 0)
+                {
+                    return _x[0];
+                }
+
+                HvResult resX = HvApi.hv_vcpu_get_reg(_vcpu, HvReg.X0 + (uint)index, out value);
+                if (resX == HvResult.BadArgument)
+                {
+                    Interlocked.Increment(ref _fallbackCount);
+                    LogHvWarning("GetX", regName);
+                    return _x[index];
+                }
+                resX.ThrowOnError();
+                return _x[index] = value;
             }
         }
 
         public void SetX(int index, ulong value)
         {
-            if (index == 31)
+            lock (_registerLock)
             {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.SP_EL0, value).ThrowOnError();
-            }
-            else
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.X0 + (uint)index, value).ThrowOnError();
+                string regName = index == 31 ? "SP_EL0" : $"X{index}";
+
+                if (index == 31)
+                {
+                    HvResult res = HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.SP_EL0, value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("SetX", regName, $"value=0x{value:X16}");
+                        _x[31] = value;
+                        return;
+                    }
+                    res.ThrowOnError();
+                    _x[31] = value;
+                }
+                else if ((uint)index <= 30)
+                {
+                    HvResult res = HvApi.hv_vcpu_set_reg(_vcpu, HvReg.X0 + (uint)index, value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("SetX", regName, $"value=0x{value:X16}");
+                        _x[index] = value;
+                        return;
+                    }
+                    res.ThrowOnError();
+                    _x[index] = value;
+                }
             }
         }
 
         public V128 GetV(int index)
         {
-            HvApi.hv_vcpu_get_simd_fp_reg(_vcpu, HvSimdFPReg.Q0 + (uint)index, out HvSimdFPUchar16 value).ThrowOnError();
-            return new V128(value.Low, value.High);
+            lock (_registerLock)
+            {
+                if ((uint)index > 31) return default;
+
+                HvResult res = HvApi.hv_vcpu_get_simd_fp_reg(_vcpu, HvSimdFPReg.Q0 + (uint)index, out HvSimdFPUchar16 val);
+                if (res == HvResult.BadArgument)
+                {
+                    Interlocked.Increment(ref _fallbackCount);
+                    LogHvWarning("GetV", $"Q{index}");
+                    return _v[index];
+                }
+                res.ThrowOnError();
+                return _v[index] = new V128(val.Low, val.High);
+            }
         }
 
         public void SetV(int index, V128 value)
         {
-            _setSimdFpReg(_vcpu, HvSimdFPReg.Q0 + (uint)index, value, _setSimdFpRegNativePtr).ThrowOnError();
+            lock (_registerLock)
+            {
+                if ((uint)index > 31) return;
+
+                HvResult res = _setSimdFpReg(_vcpu, HvSimdFPReg.Q0 + (uint)index, value, _setSimdFpRegNativePtr);
+                if (res == HvResult.BadArgument)
+                {
+                    Interlocked.Increment(ref _fallbackCount);
+                    LogHvWarning("SetV", $"Q{index}");
+                    _v[index] = value;
+                    return;
+                }
+                res.ThrowOnError();
+                _v[index] = value;
+            }
         }
 
+        private ulong GetRegCached(HvReg reg, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_get_reg(_vcpu, reg, out ulong val);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("GetReg", name);
+                return cached;
+            }
+            res.ThrowOnError();
+            return cached = val;
+        }
+
+        private void SetRegCached(HvReg reg, ulong value, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_set_reg(_vcpu, reg, value);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("SetReg", name, $"value=0x{value:X16}");
+                cached = value;
+                return;
+            }
+            res.ThrowOnError();
+            cached = value;
+        }
+
+        private ulong GetSysRegCached(HvSysReg reg, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_get_sys_reg(_vcpu, reg, out ulong val);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("GetSysReg", name);
+                return cached;
+            }
+            res.ThrowOnError();
+            return cached = val;
+        }
+
+        private void SetSysRegCached(HvSysReg reg, ulong value, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_set_sys_reg(_vcpu, reg, value);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("SetSysReg", name, $"value=0x{value:X16}");
+                cached = value;
+                return;
+            }
+            res.ThrowOnError();
+            cached = value;
+        }
+
+        public long GetFallbackCount() => Interlocked.Read(ref _fallbackCount);
+
         public void RequestInterrupt()
         {
             if (Interlocked.Exchange(ref _interruptRequested, 1) == 0)

src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/InstEmitFlow.cs

@@ -3,6 +3,7 @@ using Ryujinx.Cpu.LightningJit.CodeGen;
 using Ryujinx.Cpu.LightningJit.CodeGen.Arm64;
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 
@@ -189,7 +190,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
             }
             else if (inlineLookup)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
 
                 Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
 
@@ -203,18 +204,15 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64
                 // Index into the table.
                 asm.Mov(rn, tableBase);
 
-                for (int i = 0; i < funcTable.Levels.Length; i++)
-                {
-                    AddressTableLevel level = funcTable.Levels[i];
-                    asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
-                    asm.Lsl(indexReg, indexReg, Const(3));
+                AddressTableLevel level = funcTable.Levels.Last();
+                asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
+                asm.Lsl(indexReg, indexReg, Const(3));
 
-                    // Index into the page.
-                    asm.Add(rn, rn, indexReg);
+                // Index into the page.
+                asm.Add(rn, rn, indexReg);
 
-                    // Load the page address.
-                    asm.LdrRiUn(rn, rn, 0);
-                }
+                // Load the page address.
+                asm.LdrRiUn(rn, rn, 0);
 
                 if (tempGuestAddress != -1)
                 {

src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/InstEmitSystem.cs

@@ -3,6 +3,7 @@ using Ryujinx.Cpu.LightningJit.CodeGen;
 using Ryujinx.Cpu.LightningJit.CodeGen.Arm64;
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -355,7 +356,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
             }
             else if (inlineLookup)
             {
-                // Inline table lookup. Only enabled when the sparse function table is enabled with 2 levels.
+                // Inline table lookup. Only enabled when the sparse function table is enabled with 1 level.
 
                 Operand indexReg = Register(NextFreeRegister(tempRegister + 1, tempGuestAddress));
 
@@ -369,18 +370,15 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64
                 // Index into the table.
                 asm.Mov(rn, tableBase);
 
-                for (int i = 0; i < funcTable.Levels.Length; i++)
-                {
-                    AddressTableLevel level = funcTable.Levels[i];
-                    asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
-                    asm.Lsl(indexReg, indexReg, Const(3));
+                AddressTableLevel level = funcTable.Levels.Last();
+                asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
+                asm.Lsl(indexReg, indexReg, Const(3));
 
-                    // Index into the page.
-                    asm.Add(rn, rn, indexReg);
+                // Index into the page.
+                asm.Add(rn, rn, indexReg);
 
-                    // Load the page address.
-                    asm.LdrRiUn(rn, rn, 0);
-                }
+                // Load the page address.
+                asm.LdrRiUn(rn, rn, 0);
 
                 if (tempGuestAddress != -1)
                 {

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

@@ -23,12 +23,31 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 return Offset.CompareTo(other.Offset);
             }
         }
+        
+        private readonly int _regionSize;
+        private int _regionCount;
 
         private readonly List<MemoryBlock> _blocks = [];
 
-        public CacheMemoryAllocator(int capacity)
+        public CacheMemoryAllocator(int regionSize, int initialRegionCount = 1)
         {
-            _blocks.Add(new MemoryBlock(0, capacity));
+            _regionCount = 0;
+            _regionSize = regionSize;
+            
+            for (; initialRegionCount > 0; initialRegionCount--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
+        }
+        
+        public void AddNewBlocks(int count)
+        {
+            for (; count > 0; count--)
+            {
+                _blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
+                _regionCount++;
+            }
         }
 
         public int Allocate(int size)
@@ -100,13 +119,14 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             {
                 index = ~index;
             }
+            
+            int endOffs = block.Offset + block.Size;
 
-            if (index < _blocks.Count)
+            // Don't merge blocks from different allocations
+            if (index < _blocks.Count && endOffs % _regionSize != 0)
             {
                 MemoryBlock next = _blocks[index];
 
-                int endOffs = block.Offset + block.Size;
-
                 if (next.Offset == endOffs)
                 {
                     block = new MemoryBlock(block.Offset, block.Size + next.Size);
@@ -114,7 +134,8 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 }
             }
 
-            if (index > 0)
+            // Don't merge blocks from different allocations
+            if (index > 0 && block.Offset % _regionSize != 0)
             {
                 MemoryBlock prev = _blocks[index - 1];
 

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

@@ -11,76 +11,45 @@ using System.Threading;
 
 namespace Ryujinx.Cpu.LightningJit.Cache
 {
-    static partial class JitCache
+    partial class JitCache : IDisposable
     {
         private static readonly int _pageSize = (int)MemoryBlock.GetPageSize();
         private static readonly int _pageMask = _pageSize - 1;
 
         private const int CodeAlignment = 4; // Bytes.
-        // TODO: JIT Cache size should be application dependent, not global.
-        private const int CacheSize = 1024 * (1024 * 1024); // Megabytes * Size of Megabytes (since its in bytes).
+        private const uint CacheSize = 256 * 1024 * 1024; // Megabytes * Size of Megabytes (since its in bytes).
 
-        private static JitCacheInvalidation _jitCacheInvalidator;
+        private readonly JitCacheInvalidation _jitCacheInvalidator;
 
-        private static CacheMemoryAllocator _cacheAllocator;
+        private readonly  CacheMemoryAllocator _cacheAllocator;
 
-        private static readonly List<CacheEntry> _cacheEntries = [];
+        private readonly List<CacheEntry> _cacheEntries = [];
 
-        private static readonly Lock _lock = new();
-        private static bool _initialized;
-        private static readonly List<ReservedRegion> _jitRegions = [];
-        private static int _activeRegionIndex = 0;
-
-        [SupportedOSPlatform("windows")]
-        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
+        private readonly Lock _lock = new();
         
-        [SupportedOSPlatform("macos")]
-        [LibraryImport("libSystem.dylib", EntryPoint = "sys_icache_invalidate")]
-        internal static partial void SysICacheInvalidate(nint start, nuint len);
+        private readonly List<ReservedRegion> _jitRegions = [];
 
-        [SupportedOSPlatform("linux")]
-        [LibraryImport("libgcc_s.so.1", EntryPoint = "__clear_cache")]
-        internal static partial void ClearCache(nint begin, nint end);
-
-        public static void Initialize(IJitMemoryAllocator allocator)
+        public JitCache(IJitMemoryAllocator allocator)
         {
-            if (_initialized)
-            {
-                return;
-            }
-
             lock (_lock)
             {
-                if (_initialized)
-                {
-                    return;
-                }
-
-                ReservedRegion firstRegion = new(allocator, CacheSize);
-                _jitRegions.Add(firstRegion);
-                _activeRegionIndex = 0;
-
+                _jitRegions.Add(new(allocator, CacheSize));
+                
+                _cacheAllocator = new CacheMemoryAllocator((int)CacheSize);
+                
                 if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                 {
                     _jitCacheInvalidator = new JitCacheInvalidation(allocator);
                 }
-
-                _cacheAllocator = new CacheMemoryAllocator(CacheSize);
-
-                _initialized = true;
             }
         }
 
-        public unsafe static nint Map(ReadOnlySpan<byte> code)
+        public nint Map(ReadOnlySpan<byte> code)
         {
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
                 int funcOffset = Allocate(code.Length);
-                ReservedRegion targetRegion = _jitRegions[_activeRegionIndex];
-                nint funcPtr = targetRegion.Pointer + funcOffset;
+                nint funcPtr = GetFunctionPtr(funcOffset);
 
                 if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                 {
@@ -94,9 +63,9 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 }
                 else
                 {
-                    ReprotectAsWritable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsWritable(funcOffset, code.Length);
                     Marshal.Copy(code.ToArray(), 0, funcPtr, code.Length);
-                    ReprotectAsExecutable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsExecutable(funcOffset, code.Length);
 
                     _jitCacheInvalidator?.Invalidate(funcPtr, (ulong)code.Length);
                 }
@@ -107,21 +76,20 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             }
         }
 
-        public static void Unmap(nint pointer)
+        public void Unmap(nint pointer)
         {
             lock (_lock)
             {
-                Debug.Assert(_initialized);
-
-                foreach (ReservedRegion region in _jitRegions)
+                for (int i = 0; i < _jitRegions.Count; i++)
                 {
+                    ReservedRegion region = _jitRegions[i];
                     if (pointer.ToInt64() < region.Pointer.ToInt64() ||
-                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
+                        pointer.ToInt64() >= (region.Pointer + (nint)CacheSize).ToInt64())
                     {
                         continue;
                     }
 
-                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64());
+                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64() + i * CacheSize);
 
                     if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                     {
@@ -134,59 +102,63 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             }
         }
 
-        private static void ReprotectAsWritable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsWritable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
+            int regionStart = (offset % (int)CacheSize) & ~_pageMask;
+            int regionEnd = ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            GetRegion(offset).Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static void ReprotectAsExecutable(ReservedRegion region, int offset, int size)
+        private void ReprotectAsExecutable(int offset, int size)
         {
             int endOffs = offset + size;
-            int regionStart = offset & ~_pageMask;
-            int regionEnd = (endOffs + _pageMask) & ~_pageMask;
+            int regionStart = (offset % (int)CacheSize) & ~_pageMask;
+            int regionEnd = ((endOffs % (int)CacheSize) + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            GetRegion(offset).Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static int Allocate(int codeSize)
+        private int Allocate(int codeSize)
         {
             codeSize = AlignCodeSize(codeSize);
+            
+            int allocOffset = _cacheAllocator.Allocate(codeSize); 
 
-            for (int i = _activeRegionIndex; i < _jitRegions.Count; i++)
+            if (allocOffset >= 0)
             {
-                int allocOffset = _cacheAllocator.Allocate(codeSize);
-
-                if (allocOffset >= 0)
-                {
-                    _jitRegions[i].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-                    _activeRegionIndex = i;
-                    return allocOffset;
-                }
+                GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
+                return allocOffset;
             }
-
-            int exhaustedRegion = _activeRegionIndex;
+            
+            _cacheAllocator.AddNewBlocks(1);
             ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
+            
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache of size {(_jitRegions.Count * CacheSize).Bytes()} exhausted, creating new Cache Region ({((_jitRegions.Count + 1) * CacheSize).Bytes()} Total Allocation).");
+
             _jitRegions.Add(newRegion);
-            _activeRegionIndex = _jitRegions.Count - 1;
 
-            int newRegionNumber = _activeRegionIndex;
-
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
-
-            _cacheAllocator = new CacheMemoryAllocator(CacheSize);
-
-            int allocOffsetNew = _cacheAllocator.Allocate(codeSize);
-            if (allocOffsetNew < 0)
+            allocOffset = _cacheAllocator.Allocate(codeSize);
+            if (allocOffset < 0)
             {
                 throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
             }
 
-            newRegion.ExpandIfNeeded((ulong)allocOffsetNew + (ulong)codeSize);
-            return allocOffsetNew;
+            GetRegion(allocOffset).ExpandIfNeeded((ulong)(allocOffset % (int)CacheSize) + (ulong)codeSize);
+            return allocOffset;
+        }
+        
+        private nint GetFunctionPtr(int offset)
+        {
+            return GetRegion(offset).Pointer + (offset % (int)CacheSize);
+        }
+
+        private ReservedRegion GetRegion(int offset)
+        {
+            int index = offset / (int)CacheSize;
+
+            return _jitRegions[index];
         }
 
         private static int AlignCodeSize(int codeSize)
@@ -194,7 +166,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             return checked(codeSize + (CodeAlignment - 1)) & ~(CodeAlignment - 1);
         }
 
-        private static void Add(int offset, int size)
+        private void Add(int offset, int size)
         {
             CacheEntry entry = new(offset, size);
 
@@ -208,7 +180,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             _cacheEntries.Insert(index, entry);
         }
 
-        public static bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
+        public bool TryFind(int offset, out CacheEntry entry, out int entryIndex)
         {
             lock (_lock)
             {
@@ -231,5 +203,13 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             entryIndex = 0;
             return false;
         }
+        
+        public void Dispose()
+        {
+            foreach (ReservedRegion jitRegion in _jitRegions)
+            {
+                jitRegion.Dispose();
+            }
+        }
     }
 }

src/Ryujinx.Cpu/LightningJit/Translator.cs

@@ -19,6 +19,7 @@ namespace Ryujinx.Cpu.LightningJit
         private static bool IsNoWxPlatform => false;
 
         private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
+        private readonly JitCache _jitCache;
         private readonly NoWxCache _noWxCache;
         private bool _disposed;
 
@@ -39,12 +40,12 @@ namespace Ryujinx.Cpu.LightningJit
             }
             else
             {
-                JitCache.Initialize(new JitMemoryAllocator(forJit: true));
+                _jitCache = new(new JitMemoryAllocator(forJit: true));
             }
 
             Functions = new TranslatorCache<TranslatedFunction>();
             FunctionTable = functionTable;
-            Stubs = new TranslatorStubs(FunctionTable, _noWxCache);
+            Stubs = new TranslatorStubs(_jitCache, FunctionTable, _noWxCache);
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
 
@@ -100,7 +101,7 @@ namespace Ryujinx.Cpu.LightningJit
 
                 if (oldFunc != func)
                 {
-                    JitCache.Unmap(func.FuncPointer);
+                    _jitCache.Unmap(func.FuncPointer);
                     func = oldFunc;
                 }
 
@@ -121,7 +122,7 @@ namespace Ryujinx.Cpu.LightningJit
         private TranslatedFunction Translate(ulong address, ExecutionMode mode)
         {
             CompiledFunction func = Compile(address, mode);
-            nint funcPointer = JitCache.Map(func.Code);
+            nint funcPointer = _jitCache.Map(func.Code);
 
             return new TranslatedFunction(funcPointer, (ulong)func.GuestCodeLength);
         }
@@ -164,14 +165,14 @@ namespace Ryujinx.Cpu.LightningJit
 
             foreach (TranslatedFunction func in functions)
             {
-                JitCache.Unmap(func.FuncPointer);
+                _jitCache.Unmap(func.FuncPointer);
             }
 
             Functions.Clear();
 
             while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> kv))
             {
-                JitCache.Unmap(kv.Value.FuncPointer);
+                _jitCache.Unmap(kv.Value.FuncPointer);
             }
         }
 
@@ -188,6 +189,7 @@ namespace Ryujinx.Cpu.LightningJit
                     else
                     {
                         ClearJitCache();
+                        _jitCache.Dispose();
                     }
 
                     Stubs.Dispose();

src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs

@@ -19,6 +19,8 @@ namespace Ryujinx.Cpu.LightningJit
     {
         private delegate ulong GetFunctionAddressDelegate(nint framePointer, ulong address);
 
+        private readonly JitCache _jitCache;
+        
         private readonly Lazy<nint> _slowDispatchStub;
 
         private bool _disposed;
@@ -76,13 +78,16 @@ namespace Ryujinx.Cpu.LightningJit
         /// Initializes a new instance of the <see cref="TranslatorStubs"/> class with the specified
         /// <see cref="Translator"/> instance.
         /// </summary>
+        /// <param name="jitCache">Jit cache to map functions in</param>
         /// <param name="functionTable">Function table used to store pointers to the functions that the guest code will call</param>
         /// <param name="noWxCache">Cache used on platforms that enforce W^X, otherwise should be null</param>
         /// <exception cref="ArgumentNullException"><paramref name="translator"/> is null</exception>
-        public TranslatorStubs(IAddressTable<ulong> functionTable, NoWxCache noWxCache)
+        public TranslatorStubs(JitCache jitCache, IAddressTable<ulong> functionTable, NoWxCache noWxCache)
         {
             ArgumentNullException.ThrowIfNull(functionTable);
 
+            _jitCache = jitCache;
+
             _functionTable = functionTable;
             _noWxCache = noWxCache;
             _getFunctionAddressRef = NativeInterface.GetFunctionAddress;
@@ -113,12 +118,12 @@ namespace Ryujinx.Cpu.LightningJit
                 {
                     if (_dispatchStub.IsValueCreated)
                     {
-                        JitCache.Unmap(_dispatchStub.Value);
+                        _jitCache.Unmap(_dispatchStub.Value);
                     }
 
                     if (_dispatchLoop.IsValueCreated)
                     {
-                        JitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
+                        _jitCache.Unmap(Marshal.GetFunctionPointerForDelegate(_dispatchLoop.Value));
                     }
                 }
 
@@ -363,7 +368,7 @@ namespace Ryujinx.Cpu.LightningJit
             }
             else
             {
-                return JitCache.Map(code);
+                return _jitCache.Map(code);
             }
         }
 

src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs

@@ -53,7 +53,7 @@ namespace Ryujinx.Cpu.Signal
         public SignalHandlerRangeArray Ranges;
     }
 
-    static class NativeSignalHandler
+    public static class NativeSignalHandler
     {
         private static readonly nint _handlerConfig;
         private static nint _signalHandlerPtr;

src/Ryujinx.Graphics.Nvdec.Vp9/Decoder.cs

@@ -11,6 +11,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
         public bool IsHardwareAccelerated => false;
 
         private readonly MemoryAllocator _allocator = new();
+        private byte[] _lastSegmentMap = [];
+        private int _lastSegmentMapMiRows;
+        private int _lastSegmentMapMiCols;
 
         public ISurface CreateSurface(int width, int height)
         {
@@ -106,7 +109,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
 
             cm.AllocTileWorkerData(_allocator, tileCols, tileRows, maxThreads);
             cm.AllocContextBuffers(_allocator, output.Width, output.Height);
+
             cm.InitContextBuffers();
+            LoadSegmentMap(ref cm, ref pictureInfo);
             cm.SetupSegmentationDequant();
             cm.SetupScaleFactors();
 
@@ -153,6 +158,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
                 }
             }
 
+            SaveSegmentMap(ref cm);
             cm.GetMvs(mvsOut);
 
             cm.FreeTileWorkerData(_allocator);
@@ -161,6 +167,52 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
             return true;
         }
 
+        private void LoadSegmentMap(ref Vp9Common cm, ref Vp9PictureInfo pictureInfo)
+        {
+            int mapLength = cm.MiRows * cm.MiCols;
+            if (mapLength == 0 || cm.LastFrameSegMap.IsNull)
+            {
+                return;
+            }
+
+            bool reset =
+                pictureInfo.IsKeyFrame ||
+                pictureInfo.IntraOnly ||
+                _lastSegmentMapMiRows != cm.MiRows ||
+                _lastSegmentMapMiCols != cm.MiCols;
+
+            if (_lastSegmentMap.Length != mapLength)
+            {
+                _lastSegmentMap = new byte[mapLength];
+            }
+            else if (reset)
+            {
+                Array.Clear(_lastSegmentMap);
+            }
+
+            _lastSegmentMapMiRows = cm.MiRows;
+            _lastSegmentMapMiCols = cm.MiCols;
+            _lastSegmentMap.CopyTo(cm.LastFrameSegMap.AsSpan());
+        }
+
+        private void SaveSegmentMap(ref Vp9Common cm)
+        {
+            int mapLength = cm.MiRows * cm.MiCols;
+            if (!cm.Seg.Enabled || mapLength == 0 || cm.CurrentFrameSegMap.IsNull)
+            {
+                return;
+            }
+
+            if (_lastSegmentMap.Length != mapLength)
+            {
+                _lastSegmentMap = new byte[mapLength];
+            }
+
+            cm.CurrentFrameSegMap.AsSpan()[..mapLength].CopyTo(_lastSegmentMap);
+            _lastSegmentMapMiRows = cm.MiRows;
+            _lastSegmentMapMiCols = cm.MiCols;
+        }
+
         public void Dispose()
         {
             _allocator.Dispose();

src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Common.cs

@@ -1088,6 +1088,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types
 
         public void GetMvs(Span<Vp9MvRef> mvs)
         {
+            if (FrameIsIntraOnly())
+            {
+                mvs.Clear();
+                return;
+            }
+
             if (mvs.Length > CurFrameMvs.Length)
             {
                 throw new ArgumentException(

src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs

@@ -53,6 +53,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
                 IsKeyFrame = Flags.HasFlag(FrameFlags.IsKeyFrame),
                 IntraOnly = Flags.HasFlag(FrameFlags.IntraOnly),
                 UsePrevInFindMvRefs =
+                    !Flags.HasFlag(FrameFlags.IsKeyFrame) &&
                     !Flags.HasFlag(FrameFlags.ErrorResilientMode) &&
                     !Flags.HasFlag(FrameFlags.FrameSizeChanged) &&
                     !Flags.HasFlag(FrameFlags.IntraOnly) &&

src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs

@@ -16,15 +16,15 @@ namespace Ryujinx.Graphics.Vulkan
         {
             DescriptorSetLayout[] layouts = new DescriptorSetLayout[setDescriptors.Count];
             bool[] updateAfterBindFlags = new bool[setDescriptors.Count];
-            
+
             bool isMoltenVk = gd.IsMoltenVk;
-            
+
             for (int setIndex = 0; setIndex < setDescriptors.Count; setIndex++)
             {
                 ResourceDescriptorCollection rdc = setDescriptors[setIndex];
 
                 ResourceStages activeStages = ResourceStages.None;
-                
+
                 if (isMoltenVk)
                 {
                     for (int descIndex = 0; descIndex < rdc.Descriptors.Count; descIndex++)
@@ -48,7 +48,7 @@ namespace Ryujinx.Graphics.Vulkan
                         // causes invalid resource errors, allow the binding on all active stages as workaround.
                         // https://github.com/KhronosGroup/MoltenVK/issues/1870
                         stages = activeStages;
-                    }   
+                    }
 
                     layoutBindings[descIndex] = new DescriptorSetLayoutBinding
                     {

src/Ryujinx.Graphics.Vulkan/PipelineState.cs

@@ -588,8 +588,10 @@ namespace Ryujinx.Graphics.Vulkan
                 dynamicStates[5] = DynamicState.StencilReference;
                 dynamicStates[6] = DynamicState.BlendConstants;
 
-                if (supportsExtDynamicState)
+                if (supportsExtDynamicState && (gd.SupportsMTL31 || !gd.IsMoltenVk))
                 {
+                    // Requires Metal 3.1 and new MoltenVK, however extended dynamic states extension is not
+                    // available on older versions of MVK, so we can safely check only OS version.
                     dynamicStates[dynamicStatesCount++] = DynamicState.VertexInputBindingStrideExt;
                 }
 

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -51,8 +51,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" />
-    <PackageReference Include="shaderc.net" />
+    <PackageReference Include="Silk.NET.Shaderc" ExcludeAssets="native" />
     <PackageReference Include="Silk.NET.Vulkan" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />

src/Ryujinx.Graphics.Vulkan/Shader.cs

@@ -1,22 +1,17 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
-using shaderc;
+using Silk.NET.Shaderc;
 using Silk.NET.Vulkan;
 using System;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Result = shaderc.Result;
 
 namespace Ryujinx.Graphics.Vulkan
 {
     class Shader : IDisposable
     {
-        // The shaderc.net dependency's Options constructor and dispose are not thread safe.
-        // Take this lock when using them.
-        private static readonly Lock _shaderOptionsLock = new();
-
         private static readonly nint _ptrMainEntryPointName = Marshal.StringToHGlobalAnsi("main");
 
         private readonly Vk _api;
@@ -75,38 +70,33 @@ namespace Ryujinx.Graphics.Vulkan
 
         private unsafe static byte[] GlslToSpirv(string glsl, ShaderStage stage)
         {
-            Options options;
+            Shaderc api = Shaderc.GetApi();
+            Compiler* compiler = api.CompilerInitialize();
+            CompileOptions* options = api.CompileOptionsInitialize();
 
-            lock (_shaderOptionsLock)
+            api.CompileOptionsSetSourceLanguage(options, SourceLanguage.Glsl);
+            api.CompileOptionsSetTargetSpirv(options, SpirvVersion.Shaderc15);
+            api.CompileOptionsSetTargetEnv(options, TargetEnv.Vulkan, Vk.Version12);
+
+            CompilationResult* scr = api.CompileIntoSpv(compiler, glsl, (nuint)glsl.Length, GetShaderCShaderStage(stage), "Ryu", "main", options);
+
+            CompilationStatus status = api.ResultGetCompilationStatus(scr);
+
+            if (status != CompilationStatus.Success)
             {
-                options = new Options(false)
-                {
-                    SourceLanguage = SourceLanguage.Glsl,
-                    TargetSpirVVersion = new SpirVVersion(1, 5),
-                };
-            }
-
-            options.SetTargetEnvironment(TargetEnvironment.Vulkan, EnvironmentVersion.Vulkan_1_2);
-            Compiler compiler = new(options);
-            Result scr = compiler.Compile(glsl, "Ryu", GetShaderCShaderStage(stage));
-
-            lock (_shaderOptionsLock)
-            {
-                options.Dispose();
-            }
-
-            if (scr.Status != Status.Success)
-            {
-                Logger.Error?.Print(LogClass.Gpu, $"Shader compilation error: {scr.Status} {scr.ErrorMessage}");
+                Logger.Error?.Print(LogClass.Gpu, $"Shader compilation error: {status} {api.ResultGetErrorMessageS(scr)}");
 
                 return null;
             }
 
-            Span<byte> spirvBytes = new((void*)scr.CodePointer, (int)scr.CodeLength);
+            Span<byte> spirvBytes = new(api.ResultGetBytes(scr), (int)api.ResultGetLength(scr));
 
-            byte[] code = new byte[(scr.CodeLength + 3) & ~3];
+            byte[] code = new byte[(spirvBytes.Length + 3) & ~3];
 
-            spirvBytes.CopyTo(code.AsSpan()[..(int)scr.CodeLength]);
+            spirvBytes.CopyTo(code.AsSpan()[..spirvBytes.Length]);
+
+            api.CompilerRelease(compiler);
+            api.CompileOptionsRelease(options);
 
             return code;
         }

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -98,6 +98,7 @@ namespace Ryujinx.Graphics.Vulkan
         internal bool IsIntelArc { get; private set; }
         internal bool IsQualcommProprietary { get; private set; }
         internal bool IsMoltenVk { get; private set; }
+        internal bool SupportsMTL31 { get; private set; }
         internal bool IsTBDR { get; private set; }
         internal bool IsSharedMemory { get; private set; }
 
@@ -123,6 +124,8 @@ namespace Ryujinx.Graphics.Vulkan
             // Any device running on MacOS is using MoltenVK, even Intel and AMD vendors.
             if (IsMoltenVk = OperatingSystem.IsMacOS())
                 MVKInitialization.Initialize();
+
+            SupportsMTL31 = OperatingSystem.IsMacOSVersionAtLeast(14);
         }
 
         public static VulkanRenderer Create(
@@ -436,7 +439,7 @@ namespace Ryujinx.Graphics.Vulkan
                 features2.Features.MultiViewport && !(IsMoltenVk && Vendor == Vendor.Amd), // Workaround for AMD on MoltenVK issue
                 featuresRobustness2.NullDescriptor || IsMoltenVk,
                 supportsPushDescriptors,
-                IsMoltenVk ? 16 : propertiesPushDescriptor.MaxPushDescriptors, // In case an old version of MoltenVK is used, apply a limit to prevent vertex explosions.
+                IsMoltenVk ? 16 : propertiesPushDescriptor.MaxPushDescriptors, // Prevents vertex explosions on MoltenVK.
                 featuresPrimitiveTopologyListRestart.PrimitiveTopologyListRestart,
                 featuresPrimitiveTopologyListRestart.PrimitiveTopologyPatchListRestart,
                 supportsTransformFeedback,

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs

@@ -443,6 +443,7 @@ namespace Ryujinx.HLE.HOS.Applets
                     if ((newCalc.Flags & KeyboardCalcFlags.SetInputText) != 0)
                     {
                         _textValue = newCalc.InputText;
+                        _cursorBegin = _textValue.Length;
                         updateText = true;
 
                         Logger.Debug?.Print(LogClass.ServiceAm, $"Input text set to {_textValue}");

src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs

@@ -689,13 +689,26 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             return context.Pstate & 0xFF0FFE20;
         }
 
+        private const long ContextCacheDurationTicks = 800_000; // ~0.8ms cache lifetime
+
+        private ThreadContext _cachedContext;
+        private long _contextCacheTimestamp;
+        private bool _hasValidContextCache;
+
         private ThreadContext GetCurrentContext()
         {
+            var now = DateTime.UtcNow.Ticks;
+
+            // Cache hit
+            if (_hasValidContextCache && (now - _contextCacheTimestamp) < ContextCacheDurationTicks)
+            {
+                return _cachedContext;
+            }
+
             const int MaxRegistersAArch32 = 15;
             const int MaxFpuRegistersAArch32 = 16;
 
             ThreadContext context = new();
-            
             Span<ulong> registersSpan = context.Registers.AsSpan();
             Span<V128> fpuRegistersSpan = context.FpuRegisters.AsSpan();
 
@@ -705,12 +718,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 {
                     registersSpan[i] = Context.GetX(i);
                 }
-
                 for (int i = 0; i < fpuRegistersSpan.Length; i++)
                 {
                     fpuRegistersSpan[i] = Context.GetV(i);
                 }
-
                 context.Fp = Context.GetX(29);
                 context.Lr = Context.GetX(30);
                 context.Sp = Context.GetX(31);
@@ -724,12 +735,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 {
                     registersSpan[i] = (uint)Context.GetX(i);
                 }
-
                 for (int i = 0; i < MaxFpuRegistersAArch32; i++)
                 {
                     fpuRegistersSpan[i] = Context.GetV(i);
                 }
-
                 context.Pc = (uint)Context.Pc;
                 context.Pstate = GetPsr(Context);
                 context.Tpidr = (uint)Context.TpidrroEl0;
@@ -738,6 +747,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             context.Fpcr = (uint)Context.Fpcr;
             context.Fpsr = (uint)Context.Fpsr;
 
+            // Update cache
+            _cachedContext = context;
+            _contextCacheTimestamp = now;
+            _hasValidContextCache = true;
+
             return context;
         }
 

src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         private readonly bool[] _supportedPlayers;
         private VibrationValue _neutralVibrationValue = new()
         {
-            AmplitudeLow = 0f,
+            AmplitudeLow = 0.01f,
             FrequencyLow = 160f,
             AmplitudeHigh = 0f,
             FrequencyHigh = 320f,

src/Ryujinx.HLE/HOS/Services/Notification/INotificationSystemEventAccessor.cs

@@ -11,7 +11,11 @@ namespace Ryujinx.HLE.HOS.Services.Notification
 
         private readonly KEvent _getNotificationSendingNotifierEvent;
         private int _getNotificationSendingNotifierEventHandle;
-        public INotificationSystemEventAccessor(ServiceCtx context) { }
+
+        public INotificationSystemEventAccessor(ServiceCtx context)
+        {
+            _getNotificationSendingNotifierEvent = new KEvent(context.Device.System.KernelContext);
+        }
 
         [CommandCmif(0)] // 9.0.0+
         // GetNotificationSendingNotifier() -> nn::notification::server::INotificationSystemEventAccessor

src/Ryujinx.HLE/HOS/Services/Sdb/Pl/ISharedFontManager.cs

@@ -103,8 +103,12 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl
                 loadedCount++;
             }
 
+            // The first return value is a boolean "fonts_are_loaded" flag (u8), not a count.
+            // Some titles (e.g. newer SDK builds) validate it strictly against 1, so writing
+            // the font count here (e.g. 6) makes them reject the result and spin re-opening pl:u.
+            context.ResponseData.Write(1);
             context.ResponseData.Write(loadedCount);
-            context.ResponseData.Write((int)SharedFontType.Count);
+            // context.ResponseData.Write((int)SharedFontType.Count);
 
             return ResultCode.Success;
         }

src/Ryujinx.Horizon/MmNv/Ipc/Request.cs

@@ -16,10 +16,9 @@ namespace Ryujinx.Horizon.MmNv.Ipc
         public Result InitializeOld(Module module, uint fgmPriority, uint autoClearEvent)
         {
             bool isAutoClearEvent = autoClearEvent != 0;
+            uint requestId = Register(module, fgmPriority, isAutoClearEvent);
 
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module, fgmPriority, isAutoClearEvent });
-
-            Register(module, fgmPriority, isAutoClearEvent);
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Initialized module={module} requestId={requestId} autoClearEvent={isAutoClearEvent}");
 
             return Result.Success;
         }
@@ -27,41 +26,48 @@ namespace Ryujinx.Horizon.MmNv.Ipc
         [CmifCommand(1)]
         public Result FinalizeOld(Module module)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module });
-
             lock (_sessionList)
             {
-                _sessionList.Remove(GetSessionByModule(module));
+                Session session = GetSessionByModule(module);
+
+                if (session != null)
+                {
+                    _sessionList.Remove(session);
+                }
             }
 
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Finalized module={module}");
+
             return Result.Success;
         }
 
         [CmifCommand(2)]
-        public Result SetAndWaitOld(Module module, uint clockRateMin, int clockRateMax)
+        public Result SetAndWaitOld(Module module, uint clockRateMin, uint timeout)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module, clockRateMin, clockRateMax });
+            uint actualClockRate;
 
             lock (_sessionList)
             {
-                GetSessionByModule(module)?.SetAndWait(clockRateMin, clockRateMax);
+                Session session = GetSessionByModule(module) ?? RegisterSession(module, false);
+                ApplyClockRequest(session, clockRateMin, timeout);
+                actualClockRate = GetEffectiveClockRate(module);
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"SetAndWait module={module} requested={clockRateMin} actual={actualClockRate} timeout={timeout}");
+
             return Result.Success;
         }
 
         [CmifCommand(3)]
         public Result GetOld(out uint clockRateActual, Module module)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module });
-
             lock (_sessionList)
             {
-                Session session = GetSessionByModule(module);
-
-                clockRateActual = session == null ? 0 : session.ClockRateMin;
+                clockRateActual = GetEffectiveClockRate(module);
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"Get module={module} actual={clockRateActual}");
+
             return Result.Success;
         }
 
@@ -70,51 +76,76 @@ namespace Ryujinx.Horizon.MmNv.Ipc
         {
             bool isAutoClearEvent = autoClearEvent != 0;
 
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { module, fgmPriority, isAutoClearEvent });
-
             requestId = Register(module, fgmPriority, isAutoClearEvent);
 
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Initialized module={module} requestId={requestId} autoClearEvent={isAutoClearEvent}");
+
             return Result.Success;
         }
 
         [CmifCommand(5)]
         public Result Finalize(uint requestId)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { requestId });
-
             lock (_sessionList)
             {
-                _sessionList.Remove(GetSessionById(requestId));
+                Session session = GetSessionById(requestId);
+
+                if (session != null)
+                {
+                    _sessionList.Remove(session);
+                }
             }
 
+            Logger.Info?.PrintMsg(LogClass.ServiceMm, $"Finalized requestId={requestId}");
+
             return Result.Success;
         }
 
         [CmifCommand(6)]
-        public Result SetAndWait(uint requestId, uint clockRateMin, int clockRateMax)
+        public Result SetAndWait(uint requestId, uint clockRateMin, uint timeout)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { requestId, clockRateMin, clockRateMax });
+            uint actualClockRate = 0;
+            Module? module = null;
 
             lock (_sessionList)
             {
-                GetSessionById(requestId)?.SetAndWait(clockRateMin, clockRateMax);
+                Session session = GetSessionById(requestId);
+
+                if (session != null)
+                {
+                    module = session.Module;
+                    ApplyClockRequest(session, clockRateMin, timeout);
+                    actualClockRate = GetEffectiveClockRate(session.Module);
+                }
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"SetAndWait requestId={requestId} module={module?.ToString() ?? "<missing>"} requested={clockRateMin} actual={actualClockRate} timeout={timeout}");
+
             return Result.Success;
         }
 
         [CmifCommand(7)]
         public Result Get(out uint clockRateActual, uint requestId)
         {
-            Logger.Stub?.PrintStub(LogClass.ServiceMm, new { requestId });
+            Module? module = null;
 
             lock (_sessionList)
             {
                 Session session = GetSessionById(requestId);
 
-                clockRateActual = session == null ? 0 : session.ClockRateMin;
+                if (session == null)
+                {
+                    clockRateActual = 0;
+                }
+                else
+                {
+                    module = session.Module;
+                    clockRateActual = GetEffectiveClockRate(session.Module);
+                }
             }
 
+            Logger.Trace?.PrintMsg(LogClass.ServiceMm, $"Get requestId={requestId} module={module?.ToString() ?? "<missing>"} actual={clockRateActual}");
+
             return Result.Success;
         }
 
@@ -149,12 +180,51 @@ namespace Ryujinx.Horizon.MmNv.Ipc
             lock (_sessionList)
             {
                 // Nintendo ignores the fgm priority as the other services were deprecated.
-                Session session = new(_uniqueId++, module, isAutoClearEvent);
-
-                _sessionList.Add(session);
+                Session session = RegisterSession(module, isAutoClearEvent);
 
                 return session.Id;
             }
         }
+
+        private Session RegisterSession(Module module, bool isAutoClearEvent)
+        {
+            Session session = new(_uniqueId++, module, isAutoClearEvent);
+
+            _sessionList.Add(session);
+
+            return session;
+        }
+
+        private void ApplyClockRequest(Session session, uint requestedClockRate, uint timeout)
+        {
+            if (IsClockRateSentinel(requestedClockRate))
+            {
+                session.ClearRequest(timeout);
+            }
+            else
+            {
+                session.SetAndWait(requestedClockRate, timeout);
+            }
+        }
+
+        private uint GetEffectiveClockRate(Module module)
+        {
+            uint clockRate = 0;
+
+            foreach (Session session in _sessionList)
+            {
+                if (session.Module == module && session.HasActiveRequest && session.RequestedClockRate > clockRate)
+                {
+                    clockRate = session.RequestedClockRate;
+                }
+            }
+
+            return clockRate;
+        }
+
+        private static bool IsClockRateSentinel(uint clockRate)
+        {
+            return clockRate == 0 || unchecked((int)clockRate) < 0;
+        }
     }
 }

src/Ryujinx.Horizon/Sdk/MmNv/IRequest.cs

@@ -7,11 +7,11 @@ namespace Ryujinx.Horizon.Sdk.MmNv
     {
         Result InitializeOld(Module module, uint fgmPriority, uint autoClearEvent);
         Result FinalizeOld(Module module);
-        Result SetAndWaitOld(Module module, uint clockRateMin, int clockRateMax);
+        Result SetAndWaitOld(Module module, uint clockRateMin, uint timeout);
         Result GetOld(out uint clockRateActual, Module module);
         Result Initialize(out uint requestId, Module module, uint fgmPriority, uint autoClearEvent);
         Result Finalize(uint requestId);
-        Result SetAndWait(uint requestId, uint clockRateMin, int clockRateMax);
+        Result SetAndWait(uint requestId, uint clockRateMin, uint timeout);
         Result Get(out uint clockRateActual, uint requestId);
     }
 }

src/Ryujinx.Horizon/Sdk/MmNv/Session.cs

@@ -5,22 +5,32 @@ namespace Ryujinx.Horizon.Sdk.MmNv
         public Module Module { get; }
         public uint Id { get; }
         public bool IsAutoClearEvent { get; }
-        public uint ClockRateMin { get; private set; }
-        public int ClockRateMax { get; private set; }
+        public uint RequestedClockRate { get; private set; }
+        public uint LastTimeout { get; private set; }
+        public bool HasActiveRequest { get; private set; }
 
         public Session(uint id, Module module, bool isAutoClearEvent)
         {
             Module = module;
             Id = id;
             IsAutoClearEvent = isAutoClearEvent;
-            ClockRateMin = 0;
-            ClockRateMax = -1;
+            RequestedClockRate = 0;
+            LastTimeout = uint.MaxValue;
+            HasActiveRequest = false;
         }
 
-        public void SetAndWait(uint clockRateMin, int clockRateMax)
+        public void SetAndWait(uint clockRate, uint timeout)
         {
-            ClockRateMin = clockRateMin;
-            ClockRateMax = clockRateMax;
+            RequestedClockRate = clockRate;
+            LastTimeout = timeout;
+            HasActiveRequest = true;
+        }
+
+        public void ClearRequest(uint timeout)
+        {
+            RequestedClockRate = 0;
+            LastTimeout = timeout;
+            HasActiveRequest = false;
         }
     }
 }

src/Ryujinx.Input.SDL3/NpadHdRumble.cs

@@ -13,84 +13,98 @@ namespace Ryujinx.Input.SDL3
     {
         private readonly SDL_hid_device* _hidHandle;
         
+        private byte[] _buffer;
+        private static ushort _vendor;
+        private static ushort _product;
+        
         private int _globalCount;
         private ulong _lastWriteTicks;
 
         private NpadHdRumble(SDL_hid_device* hidHandle)
         {
             _hidHandle = hidHandle;
+            InitializeDevice();
         }
 
         public static NpadHdRumble Create(SDL_Gamepad* gamepadHandle)
         {
-            ushort vendor = SDL_GetGamepadVendor(gamepadHandle);
-            if (vendor != 0x057e)
+            _vendor = SDL_GetGamepadVendor(gamepadHandle);
+            if (!Enum.IsDefined(typeof(HDRumbleSupportedVendor), _vendor))
             {
                 return null;
             }
 
-            ushort product = SDL_GetGamepadProduct(gamepadHandle);
-            if (!Enum.IsDefined(typeof(HDRumbleSupported), product))
+            _product = SDL_GetGamepadProduct(gamepadHandle);
+            if (!Enum.IsDefined(typeof(HDRumbleSupportedProduct), _product))
             {
                 return null;
             }
 
-            return new NpadHdRumble(SDL_hid_open(vendor, product, 0));
+            int serialNumber = 0;
+            string serial = SDL_GetGamepadSerial(gamepadHandle);
+            if (serial is not null)
+            {
+                int.TryParse(serial, out serialNumber);
+            }
+            
+            return new NpadHdRumble(SDL_hid_open(_vendor, _product, serialNumber));
         }
 
         // Some of the code was translated from https://github.com/MIZUSHIKI/JoyShockLibrary-plus-HDRumble
-        private bool WriteHdRumble(
-            int encLeftLowFreq, int encLeftLowAmp,
-            int encLeftHighFreq, int encLeftHighAmp,
-            int encRightLowFreq, int encRightLowAmp,
-            int encRightHighFreq, int encRightHighAmp)
+        private bool WriteNintendoHdRumble(VibrationValue left, VibrationValue right)
         {
-            byte[] buf = new byte[10];
-
-            buf[0] = 0x10;
-            buf[1] = (byte)((++_globalCount) & 0xF);
-
-            buf[2] = (byte)(encLeftHighFreq & 0xFF);
-            buf[3] = (byte)(encLeftHighAmp + ((encLeftHighFreq >> 8) & 0xFF));
-            buf[4] = (byte)(encLeftLowFreq + ((encLeftLowAmp >> 8) & 0xFF));
-            buf[5] = (byte)(encLeftLowAmp & 0xFF);
-
-            buf[6] = (byte)(encRightHighFreq & 0xFF);
-            buf[7] = (byte)(encRightHighAmp + ((encRightHighFreq >> 8) & 0xFF));
-            buf[8] = (byte)(encRightLowFreq + ((encRightLowAmp >> 8) & 0xFF));
-            buf[9] = (byte)(encRightLowAmp & 0xFF);
-
+            int leftLowAmp = EncodeLowAmp(left.AmplitudeLow);
+            int leftLowFreq = EncodeLowFreq(left.FrequencyLow) + (leftLowAmp >> 8);
+            int leftHighFreq = EncodeHighFreq(left.FrequencyHigh);
+            int leftHighAmp = EncodeHighAmp(left.AmplitudeHigh) + (leftHighFreq >> 8);
+                
+            int rightLowAmp = EncodeLowAmp(right.AmplitudeLow);
+            int rightLowFreq = EncodeLowFreq(right.FrequencyLow) + (rightLowAmp >> 8);
+            int rightHighFreq = EncodeHighFreq(right.FrequencyHigh);
+            int rightHighAmp = EncodeHighAmp(right.AmplitudeHigh) + (rightHighFreq >> 8);
+            
+            _buffer[0] = 0x10;
+            _buffer[1] = (byte)((_globalCount++) & 0xF);
+            
+            // Left LRA
+            _buffer[2] = (byte)(leftLowFreq & 0xFF);
+            _buffer[3] = (byte)(leftHighAmp & 0xFF);
+            _buffer[4] = (byte)(leftHighFreq & 0xFF);
+            _buffer[5] = (byte)(leftLowAmp & 0xFF);
+            
+            // Right LRA
+            _buffer[6] = (byte)(rightLowFreq & 0xFF);
+            _buffer[7] = (byte)(rightHighAmp & 0xFF);
+            _buffer[8] = (byte)(rightHighFreq & 0xFF);
+            _buffer[9] = (byte)(rightLowAmp & 0xFF);
+            
             if (_globalCount > 0xF)
             {
                 _globalCount = 0x0;
             }
-
-            fixed (byte* ptr = buf)
+            
+            fixed (byte* ptr = _buffer)
             {
-                if (SendHDRumble(ptr, (nuint)buf.Length) >= 0)
+                if (SendHdRumble(ptr, (nuint)_buffer.Length) >= 0)
                 {
                     return true;
                 }
                 
-                if (!String.IsNullOrEmpty(SDL_GetError()))
-                {
-                    Logger.Error?.PrintMsg(LogClass.Hid, SDL_GetError());
-                    SDL_ClearError();
-                }
-                return false;
+                Logger.Error?.PrintMsg(LogClass.Hid, SDL_GetError());
+                SDL_ClearError();
             }
+            
+            return false;
         }
 
         private static int EncodeLowFreq(float lowFreq)
         {
-            float lf = Math.Clamp(lowFreq, 40.875885f, 626.286133f);
-            return (int) Math.Round(32 * Math.Log2(lf * 0.1f) - 0x40);
+            return (int)Math.Clamp(32 * Math.Log2(lowFreq * 0.1f) - 0x40, 81.75177f, 1252.572266f);
         }
 
         private static int EncodeHighFreq(float highFreq)
         {
-            float hf = Math.Clamp(highFreq, 81.75177f, 1252.572266f);
-            return (int) Math.Round((32 * Math.Log2(hf * 0.1f) - 0x60) * 4);
+            return (int)Math.Clamp(32 * Math.Log2(highFreq * 0.1f) - 0x60, 81.75177f, 1252.572266f);
         }
 
         private static int EncodeLowAmp(float rawAmp)
@@ -98,23 +112,20 @@ namespace Ryujinx.Input.SDL3
             double encodedAmp = 0;
 
             if (rawAmp is > 0 and < 0.012f)
-            {
                 encodedAmp = 1;
-            }
+            
             else if (rawAmp is >= 0.012f and < 0.112f)
-            {
                 encodedAmp = 4 * Math.Log2(rawAmp * 110f);
-            }
+            
             else if (rawAmp is >= 0.112f and < 0.225f)
-            {
                 encodedAmp = 16 * Math.Log2(rawAmp * 17f);
-            }
+            
             else if (rawAmp is >= 0.225f and <= 1f)
-            {
                 encodedAmp = 32 * Math.Log2(rawAmp * 8.7f);
-            }
-
-            return (int)Math.Floor(encodedAmp / 2.0) + 64;
+            
+            encodedAmp = Math.Round((encodedAmp / 2.0) + 64.0);
+            encodedAmp = Math.Clamp(encodedAmp, 0.0, 100.2867);
+            return (int)Math.Round(encodedAmp);
         }
 
         private static int EncodeHighAmp(float rawAmp)
@@ -122,82 +133,156 @@ namespace Ryujinx.Input.SDL3
             double encodedAmp = 0;
 
             if (rawAmp is > 0 and < 0.012f)
-            {
                 encodedAmp = 1;
-            }
+            
             else if (rawAmp is >= 0.012f and < 0.112f)
-            {
                 encodedAmp = 4 * Math.Log2(rawAmp * 110f);
-            }
+            
             else if (rawAmp is >= 0.112f and < 0.225f)
-            {
                 encodedAmp = 16 * Math.Log2(rawAmp * 17f);
-            }
+            
             else if (rawAmp is >= 0.225f and <= 1f)
-            {
                 encodedAmp = 32 * Math.Log2(rawAmp * 8.7f);
-            }
-
-            return (int) Math.Round(encodedAmp * 2);
+            
+            encodedAmp = Math.Round(encodedAmp / 2.0);
+            encodedAmp = Math.Clamp(encodedAmp, 0.0, 100.2867);
+            return (int)encodedAmp;
         }
 
         public bool HdRumble(VibrationValue left, VibrationValue right)
         {
-            return WriteHdRumble(EncodeLowFreq(left.FrequencyLow),
-                EncodeLowAmp(left.AmplitudeLow),
-                EncodeHighFreq(left.FrequencyHigh),
-                EncodeHighAmp(left.AmplitudeHigh),
-                EncodeLowFreq(right.FrequencyLow),
-                EncodeLowAmp(right.AmplitudeLow),
-                EncodeHighFreq(right.FrequencyHigh),
-                EncodeHighAmp(right.AmplitudeHigh));
+            if(_product is (ushort) HDRumbleSupportedProduct.ProController
+               or (ushort) HDRumbleSupportedProduct.JoyconLeft
+               or (ushort) HDRumbleSupportedProduct.JoyconRight
+               or (ushort) HDRumbleSupportedProduct.JoyconPair
+               or (ushort) HDRumbleSupportedProduct.JoyconGrip)
+            {
+                return WriteNintendoHdRumble(left, right);
+            }
+
+            return false;
         }
 
-        private int SendHDRumble(byte* data, nuint length)
+        private int SendHdRumble(byte* data, nuint length)
         {
             int result = 0;
             ulong currentTicks = SDL_GetTicks();
 
             // Ditch rumble if we haven't hit the poll-rate yet.
-            // TODO: figure out a better way to do this
-            // While the polling check makes the rumble accurate, it also causes it to miss signals.
-            if ((currentTicks - _lastWriteTicks) < 8) // https://docs.handheldlegend.com/s/progcc-3/doc/lag-comparison-aAR1mV3JLX
+            if ((currentTicks - _lastWriteTicks) <= GetPollRate())
             {
                 return result;
             }
             
-            SDL_LockJoysticks();
+            result = SDL_hid_write(_hidHandle, data, length);
+            if (result >= 0)
             {
-                // Fun fact: Mario Kart 8 Deluxe sends rumble packets
-                // where the amplitude is zero, but the frequency isn't.
-                result = SDL_hid_write(_hidHandle, data, length);
-                if (result >= 0)
-                {
-                    _lastWriteTicks = currentTicks;
-                }
+                _lastWriteTicks = currentTicks;
             }
-            SDL_UnlockJoysticks();
             
             return result;
         }
 
+        private void InitializeDevice()
+        {
+            if (_vendor is (ushort)HDRumbleSupportedVendor.Nintendo)
+            {
+                _buffer = new byte[10];
+                byte[] init = new byte[64];
+
+                // Pro Controller and Charge Grip
+                if (_product 
+                    is (ushort)HDRumbleSupportedProduct.ProController 
+                    or (ushort)HDRumbleSupportedProduct.JoyconGrip)
+                {
+                    SDL_LockJoysticks();
+                    fixed (byte* ptr = init)
+                    {
+                        init[0] = 0x80;
+                        init[1] = 0x05; // Allow bluetooth timeout TODO: use 0x04 to force USB only (toggle?)
+                        SDL_hid_write(_hidHandle, ptr, 64);
+                    }
+                    SDL_UnlockJoysticks();
+                
+                    return;
+                }
+            
+                // Joycons
+                if (_product 
+                    is (ushort)HDRumbleSupportedProduct.JoyconLeft 
+                    or (ushort)HDRumbleSupportedProduct.JoyconRight
+                    or (ushort)HDRumbleSupportedProduct.JoyconPair)
+                {
+                
+                    SDL_LockJoysticks();
+                    fixed (byte* ptr = init)
+                    {
+                        // we could write data to the controller here (see above)
+                    }
+                    SDL_UnlockJoysticks();
+                    
+                    return;
+                }
+            }
+        }
+        
+        private ulong GetPollRate()
+        {
+            ulong pollRate = 0;
+            if (_vendor is (ushort)HDRumbleSupportedVendor.Nintendo)
+            {
+                // https://docs.handheldlegend.com/s/progcc-3/doc/lag-comparison-aAR1mV3JLX
+                pollRate = (ulong) 16.67;
+                if (_product is (ushort)HDRumbleSupportedProduct.ProController
+                    && SDL_hid_get_device_info(_hidHandle)->bus_type == SDL_hid_bus_type.SDL_HID_API_BUS_USB)
+                {
+                    pollRate = (ulong) 8.33;
+                }
+            }
+            
+            return pollRate;
+        }
+
         public void Dispose()
         {
+            GC.SuppressFinalize(this);
             SDL_hid_close(_hidHandle);
         }
     }
 
-    public enum HDRumbleSupported : ushort
+    public enum HDRumbleSupportedVendor : ushort
     {
-        JoyConLeft = 0x2006,
-        JoyConRight = 0x2007,
+        Nintendo = 0x057e,
+        Valve = 0x28de,
+        Sony = 0x054c
+    }
+
+    public enum HDRumbleSupportedProduct : ushort
+    {
+        // TODO: Currently, HD Rumble only supports the Pro Controller and JoyCons.
+        //       We need to initialize and report to each device differently.
+        
+        // Nintendo Switch: 0x057e
+        JoyconLeft = 0x2006,
+        JoyconRight = 0x2007,
         JoyconPair = 0x2008,
         ProController = 0x2009,
         JoyconGrip = 0x200e,
+        
+        // Nintendo Switch 2: 0x057e
         Joycon2Right = 0x2066,
         Joycon2Left = 0x2067,
         Joycon2Pair = 0x2068,
         Switch2ProController = 0x2069,
-        GamecubeController = 0x2073
+        GamecubeController = 0x2073,
+        
+        // Valve Steam Family: 0x28de
+        // https://github.com/libsdl-org/SDL/issues/9148
+        SteamDeck = 0x11ff,
+        SteamDeckVirtualDevice = 0x1205,
+        SteamController = 0x1106,
+        
+        // PlayStation Dualsense: 0x054c
+        Dualsense = 0x0ce6
     }
 }

src/Ryujinx.Input.SDL3/SDL3Gamepad.cs

@@ -155,9 +155,7 @@ namespace Ryujinx.Input.SDL3
                 result |= GamepadFeaturesFlag.Led;
             }
             SDL_UnlockProperties(propID);
-
-            // NOTE: Do not call SDL_DestroyProperties here. These properties are owned
-            // internally by SDL and are freed when SDL_CloseGamepad is called (in Dispose).
+            SDL_DestroyProperties(propID);
 
             return result;
         }
@@ -165,6 +163,9 @@ namespace Ryujinx.Input.SDL3
         public string Id { get; }
         public string Name { get; }
 
+        // Expose vendor id for higher-fidelity device detection in UI
+        public ushort VendorId => _gamepadHandle != null ? SDL_GetGamepadVendor(_gamepadHandle) : (ushort)0;
+
         public bool IsConnected => SDL_GamepadConnected(_gamepadHandle);
 
         protected virtual void Dispose(bool disposing)
@@ -274,7 +275,7 @@ namespace Ryujinx.Input.SDL3
             {
                 _configuration = (StandardControllerInputConfig)configuration;
 
-                if ((Features & GamepadFeaturesFlag.Led) != 0 && _configuration.Led.EnableLed)
+                if ((Features & GamepadFeaturesFlag.Led) != 0 && _configuration.Led?.EnableLed == true)
                 {
                     if (_configuration.Led.TurnOffLed)
                         (this as IGamepad).ClearLed();

src/Ryujinx.Input.SDL3/SDL3GamepadDriver.cs

@@ -331,18 +331,28 @@ namespace Ryujinx.Input.SDL3
 
         public IEnumerable<IGamepad> GetGamepads()
         {
-            string[] ids;
-            lock (_lock)
+            lock (_gamepadsIds)
             {
-                ids = _gamepadsIds.Values
-                    .Concat(_joyConsIds.Values)
-                    .Concat(_linkedJoyConsIds.Values)
-                    .ToArray();
+                foreach (var gamepad in _gamepadsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
             }
 
-            foreach (string id in ids)
+            lock (_joyConsIds)
             {
-                yield return GetGamepad(id);
+                foreach (var gamepad in _joyConsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
+            }
+            
+            lock (_linkedJoyConsIds)
+            {
+                foreach (var gamepad in _linkedJoyConsIds)
+                {
+                    yield return GetGamepad(gamepad.Value);
+                }
             }
         }
     }

src/Ryujinx.Input.SDL3/SDL3Keyboard.cs

@@ -9,25 +9,15 @@ using System.Runtime.CompilerServices;
 using System.Threading;
 using SDL;
 using static SDL.SDL3;
-
-using ConfigKey = Ryujinx.Common.Configuration.Hid.Key;
+using ConfigPhysicalKey = Ryujinx.Common.Configuration.Hid.PhysicalKey;
 
 namespace Ryujinx.Input.SDL3
 {
     class SDL3Keyboard : IKeyboard
     {
-        private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, Key From)
-        {
-            public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not Key.Unbound;
-        }
-
         private readonly Lock _userMappingLock = new();
-
-#pragma warning disable IDE0052 // Remove unread private member
-        private readonly SDL3KeyboardDriver _driver;
-#pragma warning restore IDE0052
         private StandardKeyboardInputConfig _configuration;
-        private readonly List<ButtonMappingEntry> _buttonsUserMapping;
+        private readonly List<KeyboardInputMappingHelper.KeyboardButtonMapping> _buttonsUserMapping;
 
 
         private static readonly SDL_Keycode[] _keysDriverMapping =
@@ -172,9 +162,8 @@ namespace Ryujinx.Input.SDL3
             SDL_Keycode.SDLK_0
         ];
 
-        public SDL3Keyboard(SDL3KeyboardDriver driver, string id, string name)
+        public SDL3Keyboard(string id, string name)
         {
-            _driver = driver;
             Id = id;
             Name = name;
             _buttonsUserMapping = [];
@@ -196,9 +185,9 @@ namespace Ryujinx.Input.SDL3
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private unsafe static int ToSDL3Scancode(Key key)
+        private unsafe static int ToSDL3Scancode(ConfigPhysicalKey key)
         {
-            if (key is >= Key.Unknown and <= Key.Menu)
+            if (key is >= ConfigPhysicalKey.Unknown and <= ConfigPhysicalKey.Menu)
             {
                 return -1;
             }
@@ -206,18 +195,18 @@ namespace Ryujinx.Input.SDL3
             return (int)SDL_GetScancodeFromKey(_keysDriverMapping[(int)key], null);
         }
 
-        private static SDL_Keymod GetKeyboardModifierMask(Key key)
+        private static SDL_Keymod GetKeyboardModifierMask(ConfigPhysicalKey key)
         {
             return key switch
             {
-                Key.ShiftLeft => SDL_Keymod.SDL_KMOD_LSHIFT,
-                Key.ShiftRight => SDL_Keymod.SDL_KMOD_RSHIFT,
-                Key.ControlLeft => SDL_Keymod.SDL_KMOD_LCTRL,
-                Key.ControlRight => SDL_Keymod.SDL_KMOD_RCTRL,
-                Key.AltLeft => SDL_Keymod.SDL_KMOD_LALT,
-                Key.AltRight => SDL_Keymod.SDL_KMOD_RALT,
-                Key.WinLeft => SDL_Keymod.SDL_KMOD_LGUI,
-                Key.WinRight => SDL_Keymod.SDL_KMOD_RGUI,
+                ConfigPhysicalKey.ShiftLeft => SDL_Keymod.SDL_KMOD_LSHIFT,
+                ConfigPhysicalKey.ShiftRight => SDL_Keymod.SDL_KMOD_RSHIFT,
+                ConfigPhysicalKey.ControlLeft => SDL_Keymod.SDL_KMOD_LCTRL,
+                ConfigPhysicalKey.ControlRight => SDL_Keymod.SDL_KMOD_RCTRL,
+                ConfigPhysicalKey.AltLeft => SDL_Keymod.SDL_KMOD_LALT,
+                ConfigPhysicalKey.AltRight => SDL_Keymod.SDL_KMOD_RALT,
+                ConfigPhysicalKey.WinLeft => SDL_Keymod.SDL_KMOD_LGUI,
+                ConfigPhysicalKey.WinRight => SDL_Keymod.SDL_KMOD_RGUI,
                 // NOTE: Menu key isn't supported by SDL3.
                 _ => SDL_Keymod.SDL_KMOD_NONE
             };
@@ -233,9 +222,9 @@ namespace Ryujinx.Input.SDL3
                 rawKeyboardState = SDL_GetKeyboardState(null);
             }
 
-            bool[] keysState = new bool[(int)Key.Count];
+            bool[] keysState = new bool[(int)ConfigPhysicalKey.Count];
 
-            for (Key key = 0; key < Key.Count; key++)
+            for (ConfigPhysicalKey key = 0; key < ConfigPhysicalKey.Count; key++)
             {
                 int index = ToSDL3Scancode(key);
                 if (index == -1)
@@ -265,36 +254,6 @@ namespace Ryujinx.Input.SDL3
             return value * ConvertRate;
         }
 
-        private static (short, short) GetStickValues(ref KeyboardStateSnapshot snapshot, JoyconConfigKeyboardStick<ConfigKey> stickConfig)
-        {
-            short stickX = 0;
-            short stickY = 0;
-
-            if (snapshot.IsPressed((Key)stickConfig.StickUp))
-            {
-                stickY += 1;
-            }
-
-            if (snapshot.IsPressed((Key)stickConfig.StickDown))
-            {
-                stickY -= 1;
-            }
-
-            if (snapshot.IsPressed((Key)stickConfig.StickRight))
-            {
-                stickX += 1;
-            }
-
-            if (snapshot.IsPressed((Key)stickConfig.StickLeft))
-            {
-                stickX -= 1;
-            }
-
-            Vector2 stick = Vector2.Normalize(new Vector2(stickX, stickY));
-
-            return ((short)(stick.X * short.MaxValue), (short)(stick.Y * short.MaxValue));
-        }
-
         public GamepadStateSnapshot GetMappedStateSnapshot()
         {
             KeyboardStateSnapshot rawState = GetKeyboardStateSnapshot();
@@ -307,9 +266,9 @@ namespace Ryujinx.Input.SDL3
                     return result;
                 }
 
-                foreach (ButtonMappingEntry entry in _buttonsUserMapping)
+                foreach (KeyboardInputMappingHelper.KeyboardButtonMapping entry in _buttonsUserMapping)
                 {
-                    if (entry.From == Key.Unknown || entry.From == Key.Unbound || entry.To == GamepadButtonInputId.Unbound)
+                    if (!entry.IsValid)
                     {
                         continue;
                     }
@@ -321,8 +280,8 @@ namespace Ryujinx.Input.SDL3
                     }
                 }
 
-                (short leftStickX, short leftStickY) = GetStickValues(ref rawState, _configuration.LeftJoyconStick);
-                (short rightStickX, short rightStickY) = GetStickValues(ref rawState, _configuration.RightJoyconStick);
+                (short leftStickX, short leftStickY) = KeyboardInputMappingHelper.GetStickValues(ref rawState, _configuration.LeftJoyconStick);
+                (short rightStickX, short rightStickY) = KeyboardInputMappingHelper.GetStickValues(ref rawState, _configuration.RightJoyconStick);
 
                 result.SetStick(StickInputId.Left, ConvertRawStickValue(leftStickX), ConvertRawStickValue(leftStickY));
                 result.SetStick(StickInputId.Right, ConvertRawStickValue(rightStickX), ConvertRawStickValue(rightStickY));
@@ -358,38 +317,15 @@ namespace Ryujinx.Input.SDL3
             {
                 _configuration = (StandardKeyboardInputConfig)configuration;
 
-                // First clear the buttons mapping
                 _buttonsUserMapping.Clear();
 
-                // Then configure left joycon
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick, (Key)_configuration.LeftJoyconStick.StickButton));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp, (Key)_configuration.LeftJoycon.DpadUp));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadDown, (Key)_configuration.LeftJoycon.DpadDown));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadLeft, (Key)_configuration.LeftJoycon.DpadLeft));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadRight, (Key)_configuration.LeftJoycon.DpadRight));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Minus, (Key)_configuration.LeftJoycon.ButtonMinus));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftShoulder, (Key)_configuration.LeftJoycon.ButtonL));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftTrigger, (Key)_configuration.LeftJoycon.ButtonZl));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger0, (Key)_configuration.LeftJoycon.ButtonSr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger0, (Key)_configuration.LeftJoycon.ButtonSl));
-
-                // Finally configure right joycon
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightStick, (Key)_configuration.RightJoyconStick.StickButton));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.A, (Key)_configuration.RightJoycon.ButtonA));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.B, (Key)_configuration.RightJoycon.ButtonB));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.X, (Key)_configuration.RightJoycon.ButtonX));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Y, (Key)_configuration.RightJoycon.ButtonY));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Plus, (Key)_configuration.RightJoycon.ButtonPlus));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightShoulder, (Key)_configuration.RightJoycon.ButtonR));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger, (Key)_configuration.RightJoycon.ButtonZr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1, (Key)_configuration.RightJoycon.ButtonSr));
-                _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1, (Key)_configuration.RightJoycon.ButtonSl));
+                _buttonsUserMapping.AddRange(KeyboardInputMappingHelper.BuildButtonMappings(_configuration));
             }
         }
 
         public void SetLed(uint packedRgb)
         {
-            Logger.Info?.Print(LogClass.UI, "SetLed called on an SDL3Keyboard");
+            Logger.Debug?.Print(LogClass.UI, "SetLed called on an SDL3Keyboard");
         }
 
         public void SetTriggerThreshold(float triggerThreshold)

src/Ryujinx.Input.SDL3/SDLKeyboardDriver.cs

@@ -50,7 +50,7 @@ namespace Ryujinx.Input.SDL3
                 return null;
             }
 
-            return new SDL3Keyboard(this, _keyboardIdentifers[0], "All keyboards");
+            return new SDL3Keyboard(_keyboardIdentifers[0], "All keyboards");
         }
 
         public IEnumerable<IGamepad> GetGamepads()

src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs

@@ -1,3 +1,5 @@
+using Ryujinx.Common.Logging;
+
 namespace Ryujinx.Input.Assigner
 {
     /// <summary>
@@ -8,22 +10,40 @@ namespace Ryujinx.Input.Assigner
         private readonly IKeyboard _keyboard;
 
         private KeyboardStateSnapshot _keyboardState;
+        private Button? _pressedButton;
 
         public KeyboardKeyAssigner(IKeyboard keyboard)
         {
             _keyboard = keyboard;
         }
 
-        public void Initialize() { }
+        public void Initialize()
+        {
+            _pressedButton = null;
+        }
 
         public void ReadInput()
         {
             _keyboardState = _keyboard.GetKeyboardStateSnapshot();
+
+            if (_pressedButton is null)
+            {
+                Button? buttonFromState = GetPressedButtonFromState();
+                Button? buttonFromBufferedPress = buttonFromState is null ? GetPressedButtonFromBufferedPress() : null;
+
+                _pressedButton = buttonFromState ?? buttonFromBufferedPress;
+            }
+
+            if (_pressedButton is not null)
+            {
+                string source = _pressedButton.HasValue && GetPressedButtonFromState() is not null ? "state" : "buffered-press";
+                Logger.Debug?.Print(LogClass.UI, $"Keyboard assigner registered key={_pressedButton.Value.AsHidType<Key>()}, source={source}, cancelPressed={ShouldCancel()}");
+            }
         }
 
         public bool IsAnyButtonPressed()
         {
-            return GetPressedButton() is not null;
+            return _pressedButton is not null;
         }
 
         public bool ShouldCancel()
@@ -33,18 +53,53 @@ namespace Ryujinx.Input.Assigner
 
         public Button? GetPressedButton()
         {
-            Button? keyPressed = null;
+            return !ShouldCancel() ? _pressedButton : null;
+        }
+
+        private Button? GetPressedButtonFromState()
+        {
+            Key aliasedKey = GetAliasedPressedKey();
+
+            if (aliasedKey != Key.Unknown)
+            {
+                return new Button(aliasedKey);
+            }
 
             for (Key key = Key.Unknown; key < Key.Count; key++)
             {
                 if (_keyboardState.IsPressed(key))
                 {
-                    keyPressed = new(key);
-                    break;
+                    return new Button(key);
                 }
             }
 
-            return !ShouldCancel() ? keyPressed : null;
+            return null;
+        }
+
+        private Button? GetPressedButtonFromBufferedPress()
+        {
+            return _keyboard.TryConsumePressedKey(out Key key) ? new Button(key) : null;
+        }
+
+        private Key GetAliasedPressedKey()
+        {
+            // On some layouts (for example AltGr on Windows), Right Alt is reported as Ctrl+Alt.
+            // Prefer AltRight in that case so the binding reflects the physical key used.
+            if (_keyboardState.IsPressed(Key.ControlLeft) && _keyboardState.IsPressed(Key.AltRight))
+            {
+                return Key.AltRight;
+            }
+
+            // On some Copilot keyboards, the key in the right-control position is reported as
+            // ShiftLeft+Win+F23. Prefer ControlRight so the binding reflects that physical key.
+            if (_keyboardState.IsPressed(Key.ShiftLeft) &&
+                _keyboardState.IsPressed(Key.F23) &&
+                (_keyboardState.IsPressed(Key.WinLeft) || _keyboardState.IsPressed(Key.WinRight)))
+            {
+                return Key.ControlRight;
+            }
+
+            return Key.Unknown;
         }
     }
 }

src/Ryujinx.Input/HLE/NpadController.cs

@@ -1,13 +1,20 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Configuration.Hid.Controller.Motion;
+using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
+using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Hid;
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Text.Json;
 using CemuHookClient = Ryujinx.Input.Motion.CemuHook.Client;
 using ConfigControllerType = Ryujinx.Common.Configuration.Hid.ControllerType;
 
@@ -15,6 +22,9 @@ namespace Ryujinx.Input.HLE
 {
     public class NpadController : IDisposable
     {
+        private const string KeyboardString = "keyboard";
+        private const string ControllerString = "controller";
+
         private class HLEButtonMappingEntry
         {
             public readonly GamepadButtonInputId DriverInputId;
@@ -210,14 +220,40 @@ namespace Ryujinx.Input.HLE
         private MotionInput _rightMotionInput;
 
         private IGamepad _gamepad;
+        private IGamepad _keyboardGamepad;
+        private IGamepad _controllerGamepad;
+        private readonly List<IGamepad> _assignedControllerGamepads = [];
+        private readonly List<StandardControllerInputConfig> _assignedControllerConfigs = [];
         private InputConfig _config;
+        private InputConfig _activeConfig;
+        private StandardKeyboardInputConfig _keyboardConfig;
+        private StandardControllerInputConfig _controllerConfig;
+        private GamepadStateSnapshot _previousKeyboardState;
+        private readonly List<GamepadStateSnapshot> _previousControllerStates = [];
+        private DynamicInputSource _activeInputSource;
+        private PlayerInputAssignment _playerInputAssignment;
+        private bool _singleUsesKeyboardDriver;
+        private IGamepadDriver _keyboardDriver;
+        private IGamepadDriver _controllerDriver;
+        private int _activeControllerIndex = -1;
 
         public IGamepadDriver GamepadDriver { get; private set; }
         public GamepadStateSnapshot State { get; private set; }
+        public InputConfig ActiveConfig => _activeConfig;
 
         public string Id { get; private set; }
 
+        public bool IsAvailable => _gamepad != null || _keyboardGamepad != null || _assignedControllerGamepads.Count > 0;
+
         private readonly CemuHookClient _cemuHookClient;
+        private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
+
+        private enum DynamicInputSource
+        {
+            None,
+            Keyboard,
+            Controller,
+        }
 
         public NpadController(CemuHookClient cemuHookClient)
         {
@@ -226,29 +262,114 @@ namespace Ryujinx.Input.HLE
             _cemuHookClient = cemuHookClient;
         }
 
-        public bool UpdateDriverConfiguration(IGamepadDriver gamepadDriver, InputConfig config)
+        public bool MatchesDriverConfiguration(InputConfig config, PlayerInputAssignment playerInputAssignment)
         {
-            GamepadDriver = gamepadDriver;
+            if (_config?.EnableDynamicGamepadSwap != config.EnableDynamicGamepadSwap)
+            {
+                return false;
+            }
 
-            _gamepad?.Dispose();
+            if (playerInputAssignment?.EnableDynamicInputSwap == true)
+            {
+                if (_playerInputAssignment == null || _playerInputAssignment.EnableDynamicInputSwap != playerInputAssignment.EnableDynamicInputSwap)
+                {
+                    return false;
+                }
 
-            Id = config.Id;
-            _gamepad = GamepadDriver.GetGamepad(Id);
+                return PlayerInputAssignmentHelper.AreEquivalent(_playerInputAssignment, playerInputAssignment);
+            }
+
+            return _singleUsesKeyboardDriver == (config is StandardKeyboardInputConfig) &&
+                   Id == config.Id;
+        }
+
+        public bool UpdateDriverConfiguration(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, InputConfig config, PlayerInputAssignment playerInputAssignment)
+        {
+            _keyboardDriver = keyboardDriver;
+            _controllerDriver = gamepadDriver;
+            _playerInputAssignment = playerInputAssignment;
+
+            DisposeOpenedGamepads();
+
+            _gamepad = null;
+            _keyboardGamepad = null;
+            _controllerGamepad = null;
+            _assignedControllerGamepads.Clear();
+            _assignedControllerConfigs.Clear();
+            _previousKeyboardState = default;
+            _previousControllerStates.Clear();
+            _activeInputSource = DynamicInputSource.None;
+            _activeControllerIndex = -1;
+
+            if (playerInputAssignment?.EnableDynamicInputSwap == true)
+            {
+                ConfigureDynamicGamepads(keyboardDriver, gamepadDriver, config);
+            }
+            else
+            {
+                _singleUsesKeyboardDriver = config is StandardKeyboardInputConfig;
+                GamepadDriver = _singleUsesKeyboardDriver ? keyboardDriver : gamepadDriver;
+                Id = config.Id;
+                _gamepad = OpenSingleGamepad(GamepadDriver, config.Id, _singleUsesKeyboardDriver);
+            }
 
             UpdateUserConfiguration(config);
 
-            return _gamepad != null;
+            return IsAvailable;
         }
 
         public void UpdateUserConfiguration(InputConfig config)
         {
+            InputConfig oldConfig = _config;
+
+            if (_playerInputAssignment?.EnableDynamicInputSwap == true)
+            {
+                StandardControllerInputConfig oldControllerConfig = _controllerConfig;
+
+                _config = config;
+                UpdateDynamicConfigurations(config);
+
+                if (_controllerConfig?.Motion == null)
+                {
+                    _leftMotionInput = null;
+                    _rightMotionInput = null;
+                }
+                else if (NeedsMotionInputUpdate(oldControllerConfig, _controllerConfig))
+                {
+                    UpdateMotionInput(_controllerConfig.Motion);
+                }
+
+                if (_keyboardConfig != null)
+                {
+                    _keyboardGamepad?.SetConfiguration(_keyboardConfig);
+                }
+
+                for (int i = 0; i < _assignedControllerGamepads.Count; i++)
+                {
+                    StandardControllerInputConfig assignedControllerConfig = i < _assignedControllerConfigs.Count
+                        ? _assignedControllerConfigs[i]
+                        : _controllerConfig;
+
+                    if (assignedControllerConfig != null)
+                    {
+                        _assignedControllerGamepads[i].SetConfiguration(assignedControllerConfig);
+                    }
+                }
+
+                UpdateActiveGamepad();
+                return;
+            }
+
+            _config = config;
+
             if (config is StandardControllerInputConfig controllerConfig)
             {
-                bool needsMotionInputUpdate = _config is not StandardControllerInputConfig oldControllerConfig ||
-                    ((oldControllerConfig.Motion.EnableMotion != controllerConfig.Motion.EnableMotion) &&
-                    (oldControllerConfig.Motion.MotionBackend != controllerConfig.Motion.MotionBackend));
-
-                if (needsMotionInputUpdate)
+                if (controllerConfig.Motion == null)
+                {
+                    _leftMotionInput = null;
+                    _rightMotionInput = null;
+                }
+                else if (NeedsMotionInputUpdate(oldConfig as StandardControllerInputConfig, controllerConfig))
                 {
                     UpdateMotionInput(controllerConfig.Motion);
                 }
@@ -257,15 +378,23 @@ namespace Ryujinx.Input.HLE
             {
                 // Non-controller doesn't have motions.
                 _leftMotionInput = null;
+                _rightMotionInput = null;
             }
 
-            _config = config;
+            _activeConfig = config;
 
             _gamepad?.SetConfiguration(config);
         }
 
         private void UpdateMotionInput(MotionConfigController motionConfig)
         {
+            if (motionConfig == null)
+            {
+                _leftMotionInput = null;
+                _rightMotionInput = null;
+                return;
+            }
+
             if (motionConfig.MotionBackend != MotionInputBackendType.CemuHook)
             {
                 _leftMotionInput = new MotionInput();
@@ -278,72 +407,50 @@ namespace Ryujinx.Input.HLE
             }
         }
 
+        private bool NeedsMotionInputUpdate(StandardControllerInputConfig oldConfig, StandardControllerInputConfig newConfig)
+        {
+            if (newConfig?.Motion == null)
+            {
+                return false;
+            }
+
+            bool motionWasDisabled = oldConfig?.Motion == null;
+            bool leftMotionMissing = _leftMotionInput == null;
+            bool isJoyconPairNeedingRightMotion = newConfig.ControllerType == ConfigControllerType.JoyconPair && _rightMotionInput == null;
+            bool motionEnabledChanged = !motionWasDisabled && oldConfig?.Motion?.EnableMotion != newConfig.Motion.EnableMotion;
+            bool motionBackendChanged = !motionWasDisabled && oldConfig?.Motion?.MotionBackend != newConfig.Motion.MotionBackend;
+
+            return motionWasDisabled ||
+                   leftMotionMissing ||
+                   isJoyconPairNeedingRightMotion ||
+                   motionEnabledChanged ||
+                   motionBackendChanged;
+        }
+
         public void Update()
         {
+            if (_playerInputAssignment?.EnableDynamicInputSwap == true)
+            {
+                UpdateDynamic();
+                return;
+            }
+
             // _gamepad may be altered by other threads
             IGamepad gamepad = _gamepad;
 
             if (gamepad != null && GamepadDriver != null)
             {
                 State = gamepad.GetMappedStateSnapshot();
+                _activeConfig = _config;
 
-                if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
+                if (_activeConfig is StandardControllerInputConfig controllerConfig && controllerConfig.Motion?.EnableMotion == true)
                 {
-                    if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
-                    {
-                        if ((gamepad.Features & GamepadFeaturesFlag.Motion) != 0)
-                        {
-                            Vector3 accelerometer = gamepad.GetMotionData(MotionInputId.Accelerometer);
-                            Vector3 gyroscope = gamepad.GetMotionData(MotionInputId.Gyroscope);
-
-                            accelerometer = new Vector3(accelerometer.X, -accelerometer.Z, accelerometer.Y);
-                            gyroscope = new Vector3(gyroscope.X, -gyroscope.Z, gyroscope.Y);
-
-                            _leftMotionInput.Update(accelerometer, gyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
-
-                            if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
-                            {
-                                if (gamepad.Id == "JoyConPair")
-                                {
-                                    Vector3 rightAccelerometer = gamepad.GetMotionData(MotionInputId.SecondAccelerometer);
-                                    Vector3 rightGyroscope = gamepad.GetMotionData(MotionInputId.SecondGyroscope);
-
-                                    rightAccelerometer = new Vector3(rightAccelerometer.X, -rightAccelerometer.Z, rightAccelerometer.Y);
-                                    rightGyroscope = new Vector3(rightGyroscope.X, -rightGyroscope.Z, rightGyroscope.Y);
-
-                                    _rightMotionInput.Update(rightAccelerometer, rightGyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
-                                }
-                                else
-                                {
-                                    _rightMotionInput = _leftMotionInput;
-                                }
-                            }
-                        }
-                    }
-                    else if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.CemuHook && controllerConfig.Motion is CemuHookMotionConfigController cemuControllerConfig)
-                    {
-                        int clientId = (int)controllerConfig.PlayerIndex;
-
-                        // First of all ensure we are registered
-                        _cemuHookClient.RegisterClient(clientId, cemuControllerConfig.DsuServerHost, cemuControllerConfig.DsuServerPort);
-
-                        // Then request and retrieve the data
-                        _cemuHookClient.RequestData(clientId, cemuControllerConfig.Slot);
-                        _cemuHookClient.TryGetData(clientId, cemuControllerConfig.Slot, out _leftMotionInput);
-
-                        if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
-                        {
-                            if (!cemuControllerConfig.MirrorInput)
-                            {
-                                _cemuHookClient.RequestData(clientId, cemuControllerConfig.AltSlot);
-                                _cemuHookClient.TryGetData(clientId, cemuControllerConfig.AltSlot, out _rightMotionInput);
-                            }
-                            else
-                            {
-                                _rightMotionInput = _leftMotionInput;
-                            }
-                        }
-                    }
+                    UpdateControllerMotion(gamepad, controllerConfig);
+                }
+                else
+                {
+                    _leftMotionInput = null;
+                    _rightMotionInput = null;
                 }
             }
             else
@@ -368,7 +475,7 @@ namespace Ryujinx.Input.HLE
                 }
             }
 
-            if (_gamepad is IKeyboard)
+            if (_activeConfig is StandardKeyboardInputConfig)
             {
                 (float leftAxisX, float leftAxisY) = State.GetStick(StickInputId.Left);
                 (float rightAxisX, float rightAxisY) = State.GetStick(StickInputId.Right);
@@ -385,7 +492,7 @@ namespace Ryujinx.Input.HLE
                     Dy = ClampAxis(rightAxisY),
                 };
             }
-            else if (_config is StandardControllerInputConfig controllerConfig)
+            else if (_activeConfig is StandardControllerInputConfig controllerConfig)
             {
                 (float leftAxisX, float leftAxisY) = State.GetStick(StickInputId.Left);
                 (float rightAxisX, float rightAxisY) = State.GetStick(StickInputId.Right);
@@ -506,9 +613,12 @@ namespace Ryujinx.Input.HLE
             return value;
         }
 
-        public static KeyboardInput GetHLEKeyboardInput(IGamepadDriver KeyboardDriver)
+        public static KeyboardInput GetHLEKeyboardInput(IGamepadDriver keyboardDriver)
         {
-            IKeyboard keyboard = KeyboardDriver.GetGamepad("0") as IKeyboard;
+            if (keyboardDriver.GetGamepad("0") is not IKeyboard keyboard)
+            {
+                return default;
+            }
 
             KeyboardStateSnapshot keyboardState = keyboard.GetKeyboardStateSnapshot();
 
@@ -540,7 +650,7 @@ namespace Ryujinx.Input.HLE
         {
             if (disposing)
             {
-                _gamepad?.Dispose();
+                DisposeOpenedGamepads();
             }
         }
 
@@ -554,37 +664,567 @@ namespace Ryujinx.Input.HLE
         {
             if (queue.TryDequeue(out (VibrationValue, VibrationValue) dualVibrationValue))
             {
-                if (_config is not StandardControllerInputConfig controllerConfig ||
-                    !controllerConfig.Rumble.EnableRumble)
+                if (_controllerConfig is StandardControllerInputConfig dynamicControllerConfig &&
+                    _playerInputAssignment?.EnableDynamicInputSwap == true &&
+                    dynamicControllerConfig.Rumble?.EnableRumble == true)
                 {
-                    return;
+                    ApplyRumble(_controllerGamepad ?? _assignedControllerGamepads.FirstOrDefault(), dynamicControllerConfig, dualVibrationValue);
                 }
-                
-                VibrationValue leftVibrationValue = dualVibrationValue.Item1;
-                VibrationValue rightVibrationValue = dualVibrationValue.Item2;
-                
-                leftVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
-                leftVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
-                rightVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
-                rightVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
-                
-                if (!controllerConfig.Rumble.UseHDRumble || _gamepad?.HDRumble(leftVibrationValue, rightVibrationValue) == false)
+                else if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Rumble?.EnableRumble == true)
                 {
-                    float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15)));
-                    float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85)));
-                    _gamepad?.Rumble(low, high, 0xFFFFFFFF);
+                    ApplyRumble(_gamepad, controllerConfig, dualVibrationValue);
                 }
-                
-                Logger.Debug?.Print(LogClass.Hid, $"Effect for {controllerConfig.PlayerIndex} " + 
-                    // Value=value/multiplier * multiplier (result)
-                    $"L.low.amp={leftVibrationValue.AmplitudeLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.AmplitudeLow}), " +
-                    $"L.high.amp={leftVibrationValue.AmplitudeHigh / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.AmplitudeHigh}), " +
-                    $"L.low.freq={leftVibrationValue.FrequencyLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.FrequencyLow}), " +
-                    $"L.high.freq={leftVibrationValue.FrequencyHigh / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.FrequencyHigh}), " +
-                    $"R.low.amp={rightVibrationValue.AmplitudeLow / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.AmplitudeLow}), " +
-                    $"R.high.amp={rightVibrationValue.AmplitudeHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.AmplitudeHigh}), " +
-                    $"R.low.freq={rightVibrationValue.FrequencyLow / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.FrequencyLow}), " +
-                    $"R.high.freq={rightVibrationValue.FrequencyHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.FrequencyHigh})");
+            }
+        }
+
+        public bool HasAssignedControllerId(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                return false;
+            }
+
+            if (_playerInputAssignment?.EnableDynamicInputSwap == true)
+            {
+                return _assignedControllerGamepads.Any(gamepad => gamepad?.Id == id);
+            }
+
+            return Id == id;
+        }
+
+        private void ApplyRumble(IGamepad gamepad, StandardControllerInputConfig controllerConfig, (VibrationValue, VibrationValue) dualVibrationValue)
+        {
+            if (gamepad == null)
+            {
+                return;
+            }
+
+            VibrationValue leftVibrationValue = dualVibrationValue.Item1;
+            VibrationValue rightVibrationValue = dualVibrationValue.Item2;
+            
+            float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15) * controllerConfig.Rumble.StrongRumble));
+            float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85) * controllerConfig.Rumble.WeakRumble));
+
+            leftVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
+            leftVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
+            rightVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
+            rightVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
+
+            if (!controllerConfig.Rumble.UseHDRumble || !gamepad.HDRumble(leftVibrationValue, rightVibrationValue))
+            {
+                gamepad.Rumble(low, high, 0xFFFFFFFF);
+            }
+
+            Logger.Debug?.Print(LogClass.Hid, $"Effect for {controllerConfig.PlayerIndex} " +
+                // Value=value/multiplier * multiplier (result)
+                $"L.low.amp={leftVibrationValue.AmplitudeLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.AmplitudeLow}), " +
+                $"L.high.amp={leftVibrationValue.AmplitudeHigh / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.AmplitudeHigh}), " +
+                $"L.low.freq={leftVibrationValue.FrequencyLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.FrequencyLow}), " +
+                $"L.high.freq={leftVibrationValue.FrequencyHigh / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.FrequencyHigh}), " +
+                $"R.low.amp={rightVibrationValue.AmplitudeLow / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.AmplitudeLow}), " +
+                $"R.high.amp={rightVibrationValue.AmplitudeHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.AmplitudeHigh}), " +
+                $"R.low.freq={rightVibrationValue.FrequencyLow / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.FrequencyLow}), " +
+                $"R.high.freq={rightVibrationValue.FrequencyHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.FrequencyHigh})");
+        }
+
+        private void ConfigureDynamicGamepads(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, InputConfig config)
+        {
+            AssignedInputDevice assignedKeyboard = _playerInputAssignment?.Devices.FirstOrDefault(device => device.Type == AssignedInputDeviceType.Keyboard);
+
+            if (!string.IsNullOrEmpty(assignedKeyboard?.Id))
+            {
+                _keyboardGamepad = OpenSingleGamepad(keyboardDriver, assignedKeyboard.Id, true);
+            }
+
+            foreach (AssignedInputDevice assignedController in ResolveDynamicControllerAssignments(gamepadDriver, config))
+            {
+                IGamepad controllerGamepad = OpenSingleGamepad(gamepadDriver, assignedController.Id, false);
+
+                if (controllerGamepad != null)
+                {
+                    _assignedControllerGamepads.Add(controllerGamepad);
+                    _assignedControllerConfigs.Add(null);
+                    _previousControllerStates.Add(default);
+                }
+            }
+
+            _controllerGamepad = _assignedControllerGamepads.FirstOrDefault();
+            GamepadDriver = null;
+            Id = _assignedControllerGamepads.FirstOrDefault()?.Id ?? config.Id;
+        }
+
+        private IEnumerable<AssignedInputDevice> ResolveDynamicControllerAssignments(IGamepadDriver gamepadDriver, InputConfig config)
+        {
+            if (gamepadDriver == null)
+            {
+                yield break;
+            }
+
+            List<AssignedInputDevice> assignedControllers = _playerInputAssignment?.Devices
+                .Where(device => device.Type == AssignedInputDeviceType.Controller)
+                .ToList() ?? [];
+
+            if (_playerInputAssignment?.EnableDynamicInputSwap == true)
+            {
+                foreach (AssignedInputDevice assignedController in assignedControllers)
+                {
+                    for (int index = 0; index < gamepadDriver.GamepadsIds.Length; index++)
+                    {
+                        string gamepadId = gamepadDriver.GamepadsIds[index];
+                        if (string.Equals(gamepadId, assignedController.Id, StringComparison.Ordinal))
+                        {
+                            yield return assignedController;
+                            break;
+                        }
+                    }
+                }
+
+                yield break;
+            }
+
+            if (config is StandardControllerInputConfig)
+            {
+                for (int index = 0; index < gamepadDriver.GamepadsIds.Length; index++)
+                {
+                    string gamepadId = gamepadDriver.GamepadsIds[index];
+                    if (string.Equals(gamepadId, config.Id, StringComparison.Ordinal))
+                    {
+                        yield return new AssignedInputDevice
+                        {
+                            Type = AssignedInputDeviceType.Controller, Id = gamepadId,
+                        };
+                        yield break;
+                    }
+                }
+            }
+
+            if (!gamepadDriver.GamepadsIds.IsEmpty)
+            {
+                yield return new AssignedInputDevice
+                {
+                    Type = AssignedInputDeviceType.Controller,
+                    Id = gamepadDriver.GamepadsIds[0],
+                };
+            }
+        }
+
+        private static IGamepad OpenSingleGamepad(IGamepadDriver driver, string id, bool keyboard)
+        {
+            if (driver == null || string.IsNullOrEmpty(id))
+            {
+                return null;
+            }
+
+            if (keyboard && driver is IKeyboardModeDriver keyboardModeDriver)
+            {
+                return keyboardModeDriver.GetKeyboard(id, KeyboardInputMode.Physical);
+            }
+
+            return driver.GetGamepad(id);
+        }
+
+        private void UpdateDynamicConfigurations(InputConfig config)
+        {
+            if (config is StandardKeyboardInputConfig keyboardConfig)
+            {
+                AssignedInputDevice assignedKeyboard = _playerInputAssignment?.Devices.FirstOrDefault(device => device.Type == AssignedInputDeviceType.Keyboard);
+
+                _keyboardConfig = ResolveKeyboardConfiguration(assignedKeyboard, keyboardConfig, _keyboardGamepad);
+
+                _assignedControllerConfigs.Clear();
+
+                foreach (IGamepad controllerGamepad in _assignedControllerGamepads)
+                {
+                    AssignedInputDevice assignedController = _playerInputAssignment?.Devices.FirstOrDefault(device =>
+                        device.Type == AssignedInputDeviceType.Controller &&
+                        device.Id == controllerGamepad.Id);
+
+                    _assignedControllerConfigs.Add(ResolveControllerConfiguration(assignedController, keyboardConfig, controllerGamepad));
+                }
+
+                _controllerConfig = _assignedControllerConfigs.FirstOrDefault();
+            }
+            else if (config is StandardControllerInputConfig controllerConfig)
+            {
+                _assignedControllerConfigs.Clear();
+
+                foreach (IGamepad controllerGamepad in _assignedControllerGamepads)
+                {
+                    AssignedInputDevice assignedController = _playerInputAssignment?.Devices.FirstOrDefault(device =>
+                        device.Type == AssignedInputDeviceType.Controller &&
+                        device.Id == controllerGamepad.Id);
+
+                    _assignedControllerConfigs.Add(ResolveControllerConfiguration(assignedController, controllerConfig, controllerGamepad));
+                }
+
+                _controllerConfig = _assignedControllerConfigs.FirstOrDefault() ?? controllerConfig;
+
+                if (_keyboardGamepad != null)
+                {
+                    AssignedInputDevice assignedKeyboard = _playerInputAssignment?.Devices.FirstOrDefault(device => device.Type == AssignedInputDeviceType.Keyboard);
+
+                    _keyboardConfig = ResolveKeyboardConfiguration(assignedKeyboard, controllerConfig, _keyboardGamepad);
+                }
+                else
+                {
+                    _keyboardConfig = null;
+                }
+            }
+        }
+
+        private StandardKeyboardInputConfig ResolveKeyboardConfiguration(AssignedInputDevice assignedKeyboard, InputConfig baseConfig, IGamepad keyboardGamepad)
+        {
+            if (keyboardGamepad == null)
+            {
+                return null;
+            }
+
+            if (TryLoadAssignedProfile<StandardKeyboardInputConfig>(assignedKeyboard, KeyboardString, keyboardGamepad, baseConfig, out StandardKeyboardInputConfig profileConfig))
+            {
+                return profileConfig;
+            }
+
+            if (baseConfig is StandardKeyboardInputConfig keyboardBaseConfig)
+            {
+                StandardKeyboardInputConfig clonedConfig = CloneConfig(keyboardBaseConfig);
+
+                if (clonedConfig != null)
+                {
+                    clonedConfig.Id = keyboardGamepad.Id;
+                    clonedConfig.Name = keyboardGamepad.Name;
+                    clonedConfig.PlayerIndex = baseConfig.PlayerIndex;
+                    clonedConfig.EnableDynamicGamepadSwap = true;
+                    return clonedConfig;
+                }
+            }
+
+            StandardKeyboardInputConfig defaultConfig = InputConfigDefaults.CreateDefaultKeyboardConfiguration(
+                keyboardGamepad.Id,
+                keyboardGamepad.Name,
+                baseConfig.ControllerType,
+                baseConfig.PlayerIndex);
+            defaultConfig.EnableDynamicGamepadSwap = true;
+            return defaultConfig;
+        }
+
+        private StandardControllerInputConfig ResolveControllerConfiguration(AssignedInputDevice assignedController, InputConfig baseConfig, IGamepad controllerGamepad)
+        {
+            if (controllerGamepad == null)
+            {
+                return null;
+            }
+
+            if (TryLoadAssignedProfile<StandardControllerInputConfig>(assignedController, ControllerString, controllerGamepad, baseConfig, out StandardControllerInputConfig profileConfig))
+            {
+                return profileConfig;
+            }
+
+            if (baseConfig is StandardControllerInputConfig controllerBaseConfig)
+            {
+                StandardControllerInputConfig clonedConfig = CloneConfig(controllerBaseConfig);
+
+                if (clonedConfig != null)
+                {
+                    clonedConfig.Id = controllerGamepad.Id;
+                    clonedConfig.Name = controllerGamepad.Name;
+                    clonedConfig.PlayerIndex = baseConfig.PlayerIndex;
+                    clonedConfig.EnableDynamicGamepadSwap = true;
+                    return clonedConfig;
+                }
+            }
+
+            StandardControllerInputConfig defaultConfig = InputConfigDefaults.CreateDefaultControllerConfiguration(
+                controllerGamepad.Id,
+                controllerGamepad.Name,
+                baseConfig.ControllerType,
+                baseConfig.PlayerIndex,
+                controllerGamepad.Name?.Contains("Nintendo") == true);
+            defaultConfig.EnableDynamicGamepadSwap = true;
+            return defaultConfig;
+        }
+
+        private static T CloneConfig<T>(T config) where T : InputConfig
+        {
+            return JsonHelper.Deserialize(
+                JsonHelper.Serialize(config, _serializerContext.InputConfig),
+                _serializerContext.InputConfig) as T;
+        }
+
+        private static bool TryLoadAssignedProfile<T>(AssignedInputDevice assignedDevice, string profileDirectory, IGamepad gamepad, InputConfig baseConfig, out T config)
+            where T : InputConfig
+        {
+            config = null;
+
+            if (string.IsNullOrWhiteSpace(assignedDevice?.ProfileName))
+            {
+                return false;
+            }
+
+            string path = Path.Combine(AppDataManager.ProfilesDirPath, profileDirectory, assignedDevice.ProfileName + ".json");
+
+            if (!File.Exists(path))
+            {
+                return false;
+            }
+
+            try
+            {
+                config = JsonHelper.DeserializeFromFile(path, _serializerContext.InputConfig) as T;
+            }
+            catch (JsonException)
+            {
+                return false;
+            }
+            catch (InvalidOperationException)
+            {
+                return false;
+            }
+
+            if (config == null)
+            {
+                return false;
+            }
+
+            config.Id = gamepad.Id;
+            config.Name = gamepad.Name;
+            config.PlayerIndex = baseConfig.PlayerIndex;
+            config.EnableDynamicGamepadSwap = true;
+            return true;
+        }
+
+        private void UpdateDynamic()
+        {
+            GamepadStateSnapshot keyboardState = _keyboardGamepad?.GetMappedStateSnapshot() ?? default;
+            bool keyboardHasInput = _keyboardGamepad != null && HasInput(keyboardState);
+            bool keyboardNewInput = _keyboardGamepad != null && HasNewInput(keyboardState, _previousKeyboardState);
+            int controllerWithNewInput = -1;
+            int controllerWithHeldInput = -1;
+
+            // Note: dynamic swap is "last input wins", so we scan every assigned controller
+            // and promote whichever one most recently produced a meaningful state change.
+            for (int i = 0; i < _assignedControllerGamepads.Count; i++)
+            {
+                IGamepad controllerGamepad = _assignedControllerGamepads[i];
+                GamepadStateSnapshot controllerState = controllerGamepad?.GetMappedStateSnapshot() ?? default;
+
+                if (HasNewInput(controllerState, _previousControllerStates[i]))
+                {
+                    controllerWithNewInput = i;
+                }
+
+                if (controllerWithHeldInput == -1 && HasInput(controllerState))
+                {
+                    controllerWithHeldInput = i;
+                }
+
+                _previousControllerStates[i] = controllerState;
+            }
+
+            if (keyboardNewInput && controllerWithNewInput == -1)
+            {
+                _activeInputSource = DynamicInputSource.Keyboard;
+            }
+            else if (controllerWithNewInput != -1 && !keyboardNewInput)
+            {
+                _activeInputSource = DynamicInputSource.Controller;
+                _activeControllerIndex = controllerWithNewInput;
+            }
+            else if (_activeInputSource == DynamicInputSource.Keyboard && !keyboardHasInput && controllerWithHeldInput != -1)
+            {
+                _activeInputSource = DynamicInputSource.Controller;
+                _activeControllerIndex = controllerWithHeldInput;
+            }
+            else if (_activeInputSource == DynamicInputSource.Controller && controllerWithHeldInput == -1 && keyboardHasInput)
+            {
+                _activeInputSource = DynamicInputSource.Keyboard;
+            }
+            else if (_activeInputSource == DynamicInputSource.None)
+            {
+                _activeInputSource = _config switch
+                {
+                    StandardKeyboardInputConfig when _keyboardGamepad != null => DynamicInputSource.Keyboard,
+                    StandardControllerInputConfig when _assignedControllerGamepads.Count > 0 => DynamicInputSource.Controller,
+                    _ when keyboardHasInput => DynamicInputSource.Keyboard,
+                    _ when controllerWithHeldInput != -1 => DynamicInputSource.Controller,
+                    _ when _keyboardGamepad != null => DynamicInputSource.Keyboard,
+                    _ when _assignedControllerGamepads.Count > 0 => DynamicInputSource.Controller,
+                    _ => DynamicInputSource.None,
+                };
+
+                if (_activeInputSource == DynamicInputSource.Controller)
+                {
+                    _activeControllerIndex = controllerWithHeldInput != -1 ? controllerWithHeldInput : 0;
+                }
+            }
+
+            UpdateActiveGamepad();
+
+            State = _activeInputSource switch
+            {
+                DynamicInputSource.Keyboard => keyboardState,
+                DynamicInputSource.Controller when _activeControllerIndex >= 0 && _activeControllerIndex < _previousControllerStates.Count => _previousControllerStates[_activeControllerIndex],
+                _ => default,
+            };
+
+            if (_activeConfig is StandardControllerInputConfig controllerConfig && _controllerGamepad != null && _activeInputSource == DynamicInputSource.Controller)
+            {
+                UpdateControllerMotion(_controllerGamepad, controllerConfig);
+            }
+            else
+            {
+                _leftMotionInput = null;
+                _rightMotionInput = null;
+            }
+
+            _previousKeyboardState = keyboardState;
+        }
+
+        private void UpdateActiveGamepad()
+        {
+            (_gamepad, _activeConfig, GamepadDriver) = _activeInputSource switch
+            {
+                DynamicInputSource.Keyboard => (_keyboardGamepad, _keyboardConfig, _keyboardDriver),
+                DynamicInputSource.Controller =>
+                (
+                    _activeControllerIndex >= 0 && _activeControllerIndex < _assignedControllerGamepads.Count
+                        ? _assignedControllerGamepads[_activeControllerIndex]
+                        : _assignedControllerGamepads.FirstOrDefault(),
+                    _activeControllerIndex >= 0 && _activeControllerIndex < _assignedControllerConfigs.Count
+                        ? _assignedControllerConfigs[_activeControllerIndex]
+                        : _assignedControllerConfigs.FirstOrDefault(),
+                    _controllerDriver
+                ),
+                _ => ((IGamepad)null, (InputConfig)null, (IGamepadDriver)null)
+            };
+
+            _controllerGamepad = _gamepad;
+        }
+
+        private void UpdateControllerMotion(IGamepad gamepad, StandardControllerInputConfig controllerConfig)
+        {
+            if (gamepad == null || controllerConfig?.Motion == null || !controllerConfig.Motion.EnableMotion)
+            {
+                _leftMotionInput = null;
+                _rightMotionInput = null;
+                return;
+            }
+
+            if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
+            {
+                if ((gamepad.Features & GamepadFeaturesFlag.Motion) != 0)
+                {
+                    _leftMotionInput ??= new MotionInput();
+                    _rightMotionInput ??= new MotionInput();
+
+                    Vector3 accelerometer = gamepad.GetMotionData(MotionInputId.Accelerometer);
+                    Vector3 gyroscope = gamepad.GetMotionData(MotionInputId.Gyroscope);
+
+                    accelerometer = new Vector3(accelerometer.X, -accelerometer.Z, accelerometer.Y);
+                    gyroscope = new Vector3(gyroscope.X, -gyroscope.Z, gyroscope.Y);
+
+                    _leftMotionInput.Update(accelerometer, gyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
+
+                    if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
+                    {
+                        if (gamepad.Id == "JoyConPair")
+                        {
+                            Vector3 rightAccelerometer = gamepad.GetMotionData(MotionInputId.SecondAccelerometer);
+                            Vector3 rightGyroscope = gamepad.GetMotionData(MotionInputId.SecondGyroscope);
+
+                            rightAccelerometer = new Vector3(rightAccelerometer.X, -rightAccelerometer.Z, rightAccelerometer.Y);
+                            rightGyroscope = new Vector3(rightGyroscope.X, -rightGyroscope.Z, rightGyroscope.Y);
+
+                            _rightMotionInput.Update(rightAccelerometer, rightGyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
+                        }
+                        else
+                        {
+                            _rightMotionInput = _leftMotionInput;
+                        }
+                    }
+                }
+                else
+                {
+                    _leftMotionInput = null;
+                    _rightMotionInput = null;
+                }
+            }
+            else if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.CemuHook && controllerConfig.Motion is CemuHookMotionConfigController cemuControllerConfig)
+            {
+                int clientId = (int)controllerConfig.PlayerIndex;
+
+                _cemuHookClient.RegisterClient(clientId, cemuControllerConfig.DsuServerHost, cemuControllerConfig.DsuServerPort);
+                _cemuHookClient.RequestData(clientId, cemuControllerConfig.Slot);
+                _cemuHookClient.TryGetData(clientId, cemuControllerConfig.Slot, out _leftMotionInput);
+
+                if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
+                {
+                    if (!cemuControllerConfig.MirrorInput)
+                    {
+                        _cemuHookClient.RequestData(clientId, cemuControllerConfig.AltSlot);
+                        _cemuHookClient.TryGetData(clientId, cemuControllerConfig.AltSlot, out _rightMotionInput);
+                    }
+                    else
+                    {
+                        _rightMotionInput = _leftMotionInput;
+                    }
+                }
+            }
+        }
+
+        private static bool HasInput(GamepadStateSnapshot state)
+        {
+            for (GamepadButtonInputId inputId = GamepadButtonInputId.A; inputId < GamepadButtonInputId.Count; inputId++)
+            {
+                if (state.IsPressed(inputId))
+                {
+                    return true;
+                }
+            }
+
+            return StickIsActive(state.GetStick(StickInputId.Left)) || StickIsActive(state.GetStick(StickInputId.Right));
+        }
+
+        private static bool HasNewInput(GamepadStateSnapshot current, GamepadStateSnapshot previous)
+        {
+            for (GamepadButtonInputId inputId = GamepadButtonInputId.A; inputId < GamepadButtonInputId.Count; inputId++)
+            {
+                if (current.IsPressed(inputId) && !previous.IsPressed(inputId))
+                {
+                    return true;
+                }
+            }
+
+            return StickBecameActive(current.GetStick(StickInputId.Left), previous.GetStick(StickInputId.Left)) ||
+                   StickBecameActive(current.GetStick(StickInputId.Right), previous.GetStick(StickInputId.Right));
+        }
+
+        private static bool StickIsActive((float X, float Y) stick)
+        {
+            const float Threshold = 0.2f;
+
+            return MathF.Abs(stick.X) > Threshold || MathF.Abs(stick.Y) > Threshold;
+        }
+
+        private static bool StickBecameActive((float X, float Y) current, (float X, float Y) previous)
+        {
+            bool currentActive = StickIsActive(current);
+            bool previousActive = StickIsActive(previous);
+
+            return currentActive && (!previousActive || MathF.Abs(current.X - previous.X) > 0.1f || MathF.Abs(current.Y - previous.Y) > 0.1f);
+        }
+
+        private void DisposeOpenedGamepads()
+        {
+            if (!ReferenceEquals(_gamepad, _keyboardGamepad) && !_assignedControllerGamepads.Contains(_gamepad))
+            {
+                _gamepad?.Dispose();
+            }
+
+            _keyboardGamepad?.Dispose();
+
+            foreach (IGamepad controllerGamepad in _assignedControllerGamepads.Distinct())
+            {
+                controllerGamepad?.Dispose();
             }
         }
     }

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Input.HLE
 
         private readonly Lock _lock = new();
 
-        private bool _blockInputUpdates;
+        private int _inputUpdateBlockCount;
 
         private const int MaxControllers = 9;
 
@@ -36,6 +36,8 @@ namespace Ryujinx.Input.HLE
         private bool _isDisposed;
 
         private List<InputConfig> _inputConfig;
+        private List<InputConfig> _requestedInputConfig;
+        private List<PlayerInputAssignment> _playerInputAssignments;
         private bool _enableKeyboard;
         private bool _enableMouse;
         private Switch _device;
@@ -52,6 +54,8 @@ namespace Ryujinx.Input.HLE
             _gamepadDriver = gamepadDriver;
             _mouseDriver = mouseDriver;
             _inputConfig = [];
+            _requestedInputConfig = [];
+            _playerInputAssignments = [];
 
             _gamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
             _gamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
@@ -76,62 +80,114 @@ namespace Ryujinx.Input.HLE
 
         private void HandleOnGamepadDisconnected(string obj)
         {
-            // Force input reload
+            List<InputConfig> requestedInputConfig;
+            List<PlayerInputAssignment> playerInputAssignments;
+            bool enableKeyboard;
+            bool enableMouse;
+
             lock (_lock)
             {
                 // Forcibly disconnect any controllers with this ID.
                 for (int i = 0; i < _controllers.Length; i++)
                 {
-                    if (_controllers[i]?.Id == obj)
+                    if (_controllers[i]?.HasAssignedControllerId(obj) == true)
                     {
                         _controllers[i]?.Dispose();
                         _controllers[i] = null;
                     }
                 }
 
-                ReloadConfiguration(_inputConfig, _enableKeyboard, _enableMouse);
+                requestedInputConfig = _requestedInputConfig;
+                playerInputAssignments = _playerInputAssignments;
+                enableKeyboard = _enableKeyboard;
+                enableMouse = _enableMouse;
             }
+
+            // Force input reload.
+            ReloadConfiguration(requestedInputConfig, playerInputAssignments, enableKeyboard, enableMouse);
         }
 
         private void HandleOnGamepadConnected(string id)
         {
+            List<InputConfig> requestedInputConfig;
+            List<PlayerInputAssignment> playerInputAssignments;
+            bool enableKeyboard;
+            bool enableMouse;
+
+            lock (_lock)
+            {
+                for (int i = 0; i < _controllers.Length; i++)
+                {
+                    if (_controllers[i] != null && PlayerHasAssignedControllerId((PlayerIndex)i, id))
+                    {
+                        _controllers[i]?.Dispose();
+                        _controllers[i] = null;
+                    }
+                }
+
+                requestedInputConfig = _requestedInputConfig;
+                playerInputAssignments = _playerInputAssignments;
+                enableKeyboard = _enableKeyboard;
+                enableMouse = _enableMouse;
+            }
+
             // Force input reload
-            ReloadConfiguration(_inputConfig, _enableKeyboard, _enableMouse);
+            ReloadConfiguration(requestedInputConfig, playerInputAssignments, enableKeyboard, enableMouse);
+        }
+
+        private bool PlayerHasAssignedControllerId(PlayerIndex playerIndex, string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                return false;
+            }
+
+            InputConfig inputConfig = _requestedInputConfig.FirstOrDefault(config => (int)config.PlayerIndex == (int)playerIndex);
+
+            if (inputConfig == null)
+            {
+                return false;
+            }
+
+            PlayerInputAssignment playerInputAssignment = GetPlayerInputAssignment(inputConfig);
+
+            return playerInputAssignment.EnableDynamicInputSwap &&
+                playerInputAssignment.Devices.Any(device =>
+                    device.Type == AssignedInputDeviceType.Controller &&
+                    string.Equals(device.Id, id, StringComparison.Ordinal));
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private bool DriverConfigurationUpdate(ref NpadController controller, InputConfig config)
+        private bool DriverConfigurationUpdate(ref NpadController controller, InputConfig config, PlayerInputAssignment playerInputAssignment)
         {
-            IGamepadDriver targetDriver = _gamepadDriver;
+            Debug.Assert(_keyboardDriver != null, "Keyboard driver is not initialized!");
+            Debug.Assert(_gamepadDriver != null, "Gamepad driver is not initialized!");
 
-            if (config is StandardControllerInputConfig)
+            if (!controller.MatchesDriverConfiguration(config, playerInputAssignment))
             {
-                targetDriver = _gamepadDriver;
-            }
-            else if (config is StandardKeyboardInputConfig)
-            {
-                targetDriver = _keyboardDriver;
+                return controller.UpdateDriverConfiguration(_keyboardDriver, _gamepadDriver, config, playerInputAssignment);
             }
 
-            Debug.Assert(targetDriver != null, "Unknown input configuration!");
-
-            if (controller.GamepadDriver != targetDriver || controller.Id != config.Id)
-            {
-                return controller.UpdateDriverConfiguration(targetDriver, config);
-            }
-
-            return controller.GamepadDriver != null;
+            return controller.IsAvailable;
         }
 
         public void ReloadConfiguration(List<InputConfig> inputConfig, bool enableKeyboard, bool enableMouse)
+        {
+            ReloadConfiguration(inputConfig, [], enableKeyboard, enableMouse);
+        }
+
+        public void ReloadConfiguration(List<InputConfig> inputConfig, List<PlayerInputAssignment> playerInputAssignments, bool enableKeyboard, bool enableMouse)
         {
             lock (_lock)
             {
+                _requestedInputConfig = inputConfig?.ToList() ?? [];
+                _playerInputAssignments = playerInputAssignments?.ToList() ?? [];
+
                 NpadController[] oldControllers = _controllers.ToArray();
 
                 List<InputConfig> validInputs = [];
 
-                foreach (InputConfig inputConfigEntry in inputConfig)
+                foreach (InputConfig inputConfigEntry in _requestedInputConfig)
                 {
                     NpadController controller;
                     int index = (int)inputConfigEntry.PlayerIndex;
@@ -147,7 +203,19 @@ namespace Ryujinx.Input.HLE
                         controller = new(_cemuHookClient);
                     }
 
-                    bool isValid = DriverConfigurationUpdate(ref controller, inputConfigEntry);
+                    InputConfig activeConfig = inputConfigEntry;
+                    PlayerInputAssignment playerInputAssignment = GetPlayerInputAssignment(inputConfigEntry);
+
+                    bool isValid = DriverConfigurationUpdate(ref controller, activeConfig, playerInputAssignment);
+
+                    if (!isValid &&
+                        !playerInputAssignment.EnableDynamicInputSwap &&
+                        inputConfigEntry is StandardControllerInputConfig &&
+                        TryGetKeyboardFallback(inputConfigEntry, out StandardKeyboardInputConfig fallbackConfig))
+                    {
+                        activeConfig = fallbackConfig;
+                        isValid = DriverConfigurationUpdate(ref controller, activeConfig, playerInputAssignment);
+                    }
 
                     if (!isValid)
                     {
@@ -157,7 +225,7 @@ namespace Ryujinx.Input.HLE
                     else
                     {
                         _controllers[index] = controller;
-                        validInputs.Add(inputConfigEntry);
+                        validInputs.Add(activeConfig);
                     }
                 }
 
@@ -169,7 +237,7 @@ namespace Ryujinx.Input.HLE
                     oldControllers[i] = null;
                 }
 
-                _inputConfig = inputConfig;
+                _inputConfig = validInputs;
                 _enableKeyboard = enableKeyboard;
                 _enableMouse = enableMouse;
 
@@ -177,16 +245,108 @@ namespace Ryujinx.Input.HLE
             }
         }
 
+        private PlayerInputAssignment GetPlayerInputAssignment(InputConfig inputConfig)
+        {
+            PlayerInputAssignment playerInputAssignment = _playerInputAssignments.FirstOrDefault(assignment => assignment.PlayerIndex == inputConfig.PlayerIndex);
+
+            if (playerInputAssignment != null)
+            {
+                PlayerInputAssignment normalizedAssignment = PlayerInputAssignmentHelper.Normalize(
+                    playerInputAssignment,
+                    PlayerInputAssignmentHelper.CreatePrimaryDevice(inputConfig));
+
+                if (normalizedAssignment.EnableDynamicInputSwap || normalizedAssignment.Devices.Count > 0)
+                {
+                    return normalizedAssignment;
+                }
+            }
+
+            // Note: older configs only know about a single saved device per player,
+            // so we synthesize a routing entry here until the user saves explicit assignments.
+            playerInputAssignment = new PlayerInputAssignment
+            {
+                PlayerIndex = inputConfig.PlayerIndex,
+                EnableDynamicInputSwap = inputConfig.EnableDynamicGamepadSwap,
+            };
+
+            AssignedInputDevice primaryDevice = PlayerInputAssignmentHelper.CreatePrimaryDevice(inputConfig);
+
+            if (primaryDevice != null)
+            {
+                playerInputAssignment.Devices.Add(primaryDevice);
+            }
+
+            if (playerInputAssignment.EnableDynamicInputSwap && inputConfig is StandardControllerInputConfig)
+            {
+                string keyboardId = _keyboardDriver.GamepadsIds.IsEmpty ? null : _keyboardDriver.GamepadsIds[0];
+
+                if (!string.IsNullOrWhiteSpace(keyboardId))
+                {
+                    playerInputAssignment.Devices.Add(new AssignedInputDevice
+                    {
+                        Type = AssignedInputDeviceType.Keyboard,
+                        Id = keyboardId,
+                    });
+                }
+            }
+
+            return playerInputAssignment;
+        }
+
+        private bool TryGetKeyboardFallback(InputConfig inputConfig, out StandardKeyboardInputConfig fallbackConfig)
+        {
+            fallbackConfig = null;
+
+            ReadOnlySpan<string> keyboardIds = _keyboardDriver.GamepadsIds;
+
+            if (keyboardIds.IsEmpty)
+            {
+                return false;
+            }
+
+            string keyboardId = keyboardIds[0];
+
+            using IGamepad keyboard = _keyboardDriver.GetGamepad(keyboardId);
+
+            if (keyboard == null)
+            {
+                return false;
+            }
+
+            fallbackConfig = InputConfigDefaults.CreateDefaultKeyboardConfiguration(
+                keyboardId,
+                keyboard.Name,
+                inputConfig.ControllerType,
+                inputConfig.PlayerIndex);
+
+            fallbackConfig.EnableDynamicGamepadSwap = inputConfig.EnableDynamicGamepadSwap;
+
+            return true;
+        }
+
+        private void ClearInputDriverStates()
+        {
+            foreach (InputConfig inputConfig in _inputConfig)
+            {
+                _controllers[(int)inputConfig.PlayerIndex]?.GamepadDriver?.Clear();
+            }
+        }
+
         public void UnblockInputUpdates()
         {
             lock (_lock)
             {
-                foreach (InputConfig inputConfig in _inputConfig)
+                if (_inputUpdateBlockCount == 0)
                 {
-                    _controllers[(int)inputConfig.PlayerIndex]?.GamepadDriver?.Clear();
+                    return;
                 }
 
-                _blockInputUpdates = false;
+                _inputUpdateBlockCount--;
+
+                if (_inputUpdateBlockCount == 0)
+                {
+                    ClearInputDriverStates();
+                }
             }
         }
 
@@ -195,7 +355,7 @@ namespace Ryujinx.Input.HLE
             get
             {
                 lock (_lock)
-                    return _blockInputUpdates;
+                    return _inputUpdateBlockCount > 0;
             }
         }
 
@@ -203,16 +363,21 @@ namespace Ryujinx.Input.HLE
         {
             lock (_lock)
             {
-                _blockInputUpdates = true;
+                _inputUpdateBlockCount++;
             }
         }
 
         public void Initialize(Switch device, List<InputConfig> inputConfig, bool enableKeyboard, bool enableMouse)
+        {
+            Initialize(device, inputConfig, [], enableKeyboard, enableMouse);
+        }
+
+        public void Initialize(Switch device, List<InputConfig> inputConfig, List<PlayerInputAssignment> playerInputAssignments, bool enableKeyboard, bool enableMouse)
         {
             _device = device;
             _device.Configuration.RefreshInputConfig = RefreshInputConfigForHLE;
 
-            ReloadConfiguration(inputConfig, enableKeyboard, enableMouse);
+            ReloadConfiguration(inputConfig, playerInputAssignments, enableKeyboard, enableMouse);
         }
 
         public void Update(float aspectRatio = 1)
@@ -235,9 +400,9 @@ namespace Ryujinx.Input.HLE
                     bool isJoyconPair = false;
 
                     // Do we allow input updates and is a controller connected?
-                    if (!_blockInputUpdates && controller != null)
+                    if (_inputUpdateBlockCount == 0 && controller != null)
                     {
-                        DriverConfigurationUpdate(ref controller, inputConfig);
+                        DriverConfigurationUpdate(ref controller, inputConfig, GetPlayerInputAssignment(inputConfig));
 
                         controller.UpdateUserConfiguration(inputConfig);
                         controller.Update();
@@ -273,7 +438,7 @@ namespace Ryujinx.Input.HLE
                     }
                 }
 
-                if (!_blockInputUpdates && _enableKeyboard)
+                if (_inputUpdateBlockCount == 0 && _enableKeyboard)
                 {
                     hleKeyboardInput = NpadController.GetHLEKeyboardInput(_keyboardDriver);
                 }
@@ -334,11 +499,13 @@ namespace Ryujinx.Input.HLE
             }
         }
 
-        internal InputConfig GetPlayerInputConfigByIndex(int index)
+        public InputConfig GetPlayerInputConfigByIndex(int index)
         {
             lock (_lock)
             {
-                return _inputConfig.FirstOrDefault(x => x.PlayerIndex == (Common.Configuration.Hid.PlayerIndex)index);
+                NpadController controller = _controllers[index];
+
+                return controller?.ActiveConfig ?? _inputConfig.FirstOrDefault(x => x.PlayerIndex == (Common.Configuration.Hid.PlayerIndex)index);
             }
         }