From 0b45ada2d3c26ea993d20b724a36c965d65767f9 Mon Sep 17 00:00:00 2001 From: MasaGratoR Date: Sat, 12 Jul 2025 09:39:06 +0200 Subject: [PATCH 1/2] Cover new Chinese IDs and Brazilian Portuguese --- nx/source/runtime/nacp.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/nx/source/runtime/nacp.c b/nx/source/runtime/nacp.c index 6d31c5291..2fdb8e5d1 100644 --- a/nx/source/runtime/nacp.c +++ b/nx/source/runtime/nacp.c @@ -7,22 +7,25 @@ #include "services/set.h" #include "nacp.h" -static u32 g_nacpLanguageTable[15] = { - [SetLanguage_JA] = 2, - [SetLanguage_ENUS] = 0, - [SetLanguage_ENGB] = 1, - [SetLanguage_FR] = 3, - [SetLanguage_DE] = 4, - [SetLanguage_ES419] = 5, - [SetLanguage_ES] = 6, - [SetLanguage_IT] = 7, - [SetLanguage_NL] = 8, - [SetLanguage_FRCA] = 9, - [SetLanguage_PT] = 10, - [SetLanguage_RU] = 11, - [SetLanguage_KO] = 12, - [SetLanguage_ZHTW] = 13, - [SetLanguage_ZHCN] = 14, +static u32 g_nacpLanguageTable[18] = { + [SetLanguage_JA] = 2, + [SetLanguage_ENUS] = 0, + [SetLanguage_ENGB] = 1, + [SetLanguage_FR] = 3, + [SetLanguage_DE] = 4, + [SetLanguage_ES419] = 5, + [SetLanguage_ES] = 6, + [SetLanguage_IT] = 7, + [SetLanguage_NL] = 8, + [SetLanguage_FRCA] = 9, + [SetLanguage_PT] = 10, + [SetLanguage_RU] = 11, + [SetLanguage_KO] = 12, + [SetLanguage_ZHTW] = 13, + [SetLanguage_ZHHANT] = 13, + [SetLanguage_ZHCN] = 14, + [SetLanguage_ZHHANS] = 14, + [SetLanguage_PTBR] = 15 }; //Official sw uses nsam for this, but since that's a privileged service, use set-service instead for compatibility with newer system-versions. @@ -49,7 +52,7 @@ Result nacpGetLanguageEntry(NacpStruct* nacp, NacpLanguageEntry** langentry) { if (Language < 0) rc = MAKERESULT(Module_Libnx, LibnxError_BadInput); - if (R_SUCCEEDED(rc) && Language >= 15) + if (R_SUCCEEDED(rc) && Language >= 18) Language = SetLanguage_ENUS;//Use ENUS for unsupported system languages. setExit(); From d060c448269e13d0784485f8e713b487aff4cb7a Mon Sep 17 00:00:00 2001 From: MasaGratoR Date: Sat, 12 Jul 2025 19:05:22 +0200 Subject: [PATCH 2/2] Fix indentation --- nx/source/runtime/nacp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nx/source/runtime/nacp.c b/nx/source/runtime/nacp.c index 2fdb8e5d1..29842e564 100644 --- a/nx/source/runtime/nacp.c +++ b/nx/source/runtime/nacp.c @@ -22,10 +22,10 @@ static u32 g_nacpLanguageTable[18] = { [SetLanguage_RU] = 11, [SetLanguage_KO] = 12, [SetLanguage_ZHTW] = 13, - [SetLanguage_ZHHANT] = 13, + [SetLanguage_ZHHANT] = 13, [SetLanguage_ZHCN] = 14, - [SetLanguage_ZHHANS] = 14, - [SetLanguage_PTBR] = 15 + [SetLanguage_ZHHANS] = 14, + [SetLanguage_PTBR] = 15 }; //Official sw uses nsam for this, but since that's a privileged service, use set-service instead for compatibility with newer system-versions.