Skip to content

Cover new Chinese and Brazilian Portuguese language IDs for nacpGetLanguageEntry #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 13, 2025
Merged

Cover new Chinese and Brazilian Portuguese language IDs for nacpGetLanguageEntry #684

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b45ada
Cover new Chinese IDs and Brazilian Portuguese
masagrator Jul 12, 2025
d060c44
Fix indentation
masagrator Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions nx/source/runtime/nacp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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();
Expand Down