src/core/file_sys/control_metadata.cpp

@@ -128,32 +128,25 @@ const LanguageEntry& NACP::GetLanguageEntry() const {
         case Settings::Language::Russian: return Language::Russian;
         case Settings::Language::Spanish: return Language::Spanish;
         case Settings::Language::SpanishLatin: return Language::LatinAmericanSpanish;
-        case Settings::Language::Taiwanese: return Language::TraditionalChinese;
+        case Settings::Language::Taiwanese: return Language::SimplifiedChinese;
         case Settings::Language::Thai: return Language::Thai;
         case Settings::Language::Polish: return Language::Polish;
         default: return Language::AmericanEnglish;
         }
     }();
 
-    const auto index = static_cast<size_t>(language);
+    u32 index = u32(language);
 
-    if (index < language_entries.size() &&
-        !language_entries[index].GetApplicationName().empty()) {
+    if (index < language_entries.size() && !language_entries[index].GetApplicationName().empty()) {
         return language_entries[index];
     }
 
     for (const auto& entry : language_entries) {
-        if (!entry.GetApplicationName().empty()) {
-            return entry;
-        }
+        if (!entry.GetApplicationName().empty())
+          return entry;
     }
 
-    if (!language_entries.empty()) {
-        return language_entries.front();
-    }
-
-    static const LanguageEntry empty_entry{};
-    return empty_entry;
+    return language_entries.at(static_cast<u8>(Language::AmericanEnglish));
 }
 
 std::vector<std::string> NACP::GetApplicationNames() const {

src/hid_core/resources/npad/npad.cpp

@@ -1144,11 +1144,7 @@ NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(u64 aruid,
         npad_id = Core::HID::NpadIdType::Player1;
     }
     const auto npad_index = NpadIdTypeToIndex(npad_id);
-    auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
-        aruid_index = 0;
-    }
+    const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
     return controller_data[aruid_index][npad_index];
 }
 
@@ -1159,11 +1155,7 @@ const NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(
         npad_id = Core::HID::NpadIdType::Player1;
     }
     const auto npad_index = NpadIdTypeToIndex(npad_id);
-    auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
-    if (aruid_index >= AruidIndexMax) {
-        LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
-        aruid_index = 0;
-    }
+    const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
     return controller_data[aruid_index][npad_index];
 }