Skip to content
Permalink
Browse files

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

Fix VolumeVerifier considering Wii Menu WADs to have wrong region
  • Loading branch information...
Helios747 committed Jul 22, 2019
2 parents 26c1ea3 + 0b11f15 commit 136264d3400403222a0c7ce06bf08c40bedc91b6
Showing with 8 additions and 1 deletion.
  1. +3 −0 Source/Core/DiscIO/Enums.cpp
  2. +5 −1 Source/Core/DiscIO/VolumeVerifier.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;

@@ -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,

0 comments on commit 136264d

Please sign in to comment.
You can’t perform that action at this time.