From 8cf1780417bf8296f90a4db21708aa0919839faf Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 26 Nov 2023 17:03:55 +0100 Subject: [PATCH] Add missing language/region values to nn::erreula and nn::swkbd (#336) * nn:erreula: add missing LangType values * nn::swkbd: fix swapped LangType values and add missing RegionType values * nn:swkbd: Add documentation about LanguageType --- include/nn/erreula/erreula_cpp.h | 16 +++++++++++++--- include/nn/swkbd/swkbd_cpp.h | 21 ++++++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/include/nn/erreula/erreula_cpp.h b/include/nn/erreula/erreula_cpp.h index 14dc09b9..ddb88fdc 100644 --- a/include/nn/erreula/erreula_cpp.h +++ b/include/nn/erreula/erreula_cpp.h @@ -41,9 +41,19 @@ enum class ErrorType enum class LangType { - Japanese = 0, - English = 1, - // TODO: More languages + Japanese = 0, + English = 1, + French = 2, + German = 3, + Italian = 4, + Spanish = 5, + SimplifiedChinese = 6, + Korean = 7, + Dutch = 8, + Portuguese = 9, + Russian = 10, + TraditionalChinese = 11, + Invalid = 12, }; enum class RegionType diff --git a/include/nn/swkbd/swkbd_cpp.h b/include/nn/swkbd/swkbd_cpp.h index 98456e70..a0260c52 100644 --- a/include/nn/swkbd/swkbd_cpp.h +++ b/include/nn/swkbd/swkbd_cpp.h @@ -44,20 +44,33 @@ enum class ControllerType DrcGamepad = 4, }; +//! If the LanguageType and RegionType are not compatible, the LanguageType will be set to English, unless the RegionType is set to "Japan," in which case the LanguageType will be set to Japanese. enum class LanguageType { + //! Must be used in combination with RegionType::Japan Japanese = 0, + //! Must be used in combination with RegionType::USA or RegionType::Europe English = 1, + //! Must be used in combination with RegionType::USA or RegionType::Europe French = 2, + //! Must be used in combination with RegionType::Europe German = 3, + //! Must be used in combination with RegionType::Europe Italian = 4, + //! Must be used in combination with RegionType::USA or RegionType::Europe Spanish = 5, - TraditionalChinese = 6, + //! Must be used in combination with RegionType::China + SimplifiedChinese = 6, + //! Must be used in combination with RegionType::Korea Korean = 7, + //! Must be used in combination with RegionType::Europe Dutch = 8, + //! Must be used in combination with RegionType::USA or RegionType::Europe Portuguese = 9, + //! Must be used in combination with RegionType::Europe Russian = 10, - SimplifiedChinese = 11, + //! Must be used in combination with RegionType::Taiwan + TraditionalChinese = 11, Invalid = 12, }; @@ -66,7 +79,9 @@ enum class RegionType Japan = 0, USA = 1, Europe = 2, - //! TODO: find more region types + China = 3, + Korea = 4, + Taiwan = 5, }; enum class State