Merge pull request #8245 from JosJuice/volumeverifier-wii-menu-region

Fix VolumeVerifier considering Wii Menu WADs to have wrong region
dolphin-emu · Jul 22, 2019 · 136264d · 136264d
2 parents 26c1ea3 + 0b11f15
commit 136264d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp
@@ -150,6 +150,9 @@ Region CountryCodeToRegion(u8 country_code, Platform platform, Region expected_r
 {
   switch (country_code)
   {
+  case '\2':
+    return expected_region;  // Wii Menu (same title ID for all regions)
+
   case 'J':
     return Region::NTSC_J;
 

diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp
@@ -562,7 +562,11 @@ void VolumeVerifier::CheckMisc()
   }
   else
   {
-    const char country_code = game_id_encrypted[3];
+    char country_code;
+    if (IsDisc(m_volume.GetVolumeType()))
+      country_code = game_id_encrypted[3];
+    else
+      country_code = static_cast<char>(m_volume.GetTitleID().value_or(0) & 0xff);
     if (CountryCodeToRegion(country_code, platform, region) != region)
     {
       AddProblem(Severity::Medium,