From 8baafcc523e7a191dcefd3e8458e0f113541b1b6 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 28 Oct 2018 10:33:16 +0100 Subject: Accurate region detection for NAND titles --- Source/Core/DiscIO/VolumeWad.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWad.cpp') diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index c274181695..7d927ae73d 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -84,11 +84,15 @@ Country VolumeWAD::GetCountry(const Partition& partition) const if (!m_tmd.IsValid()) return Country::Unknown; - u8 country_code = static_cast(m_tmd.GetTitleId() & 0xff); - if (country_code == 2) // SYSMENU + const u8 country_byte = static_cast(m_tmd.GetTitleId() & 0xff); + if (country_byte == 2) // SYSMENU return TypicalCountryForRegion(GetSysMenuRegion(m_tmd.GetTitleVersion())); - return CountryCodeToCountry(country_code, Platform::WiiWAD); + const Region region = GetRegion(); + if (CountryCodeToRegion(country_byte, Platform::WiiWAD, region) != region) + return TypicalCountryForRegion(region); + + return CountryCodeToCountry(country_byte, Platform::WiiWAD, region); } const IOS::ES::TMDReader& VolumeWAD::GetTMD(const Partition& partition) const -- cgit v1.2.3