diff options
| author | Mat M <mathew1800@gmail.com> | 2018-10-12 10:25:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 10:25:45 -0400 |
| commit | b3cd6158fcdf62b2e2add10b4b23b5b20f857be5 (patch) | |
| tree | b8898e1010281542c1c31241f3de1d839f6cf5b7 /Source/Core/DiscIO/VolumeWii.cpp | |
| parent | 6e40955a8a40e87ebf3476d0b3323b3b4284579f (diff) | |
| parent | f834ef1dfede5b1f010314810845c97715eabae7 (diff) | |
Merge pull request #7471 from JosJuice/country-region-switch
DiscIO: Improve RegionSwitch/CountrySwitch
Diffstat (limited to 'Source/Core/DiscIO/VolumeWii.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWii.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp index 73e5b290b7..29d822fca9 100644 --- a/Source/Core/DiscIO/VolumeWii.cpp +++ b/Source/Core/DiscIO/VolumeWii.cpp @@ -290,13 +290,13 @@ Region VolumeWii::GetRegion() const Country VolumeWii::GetCountry(const Partition& partition) const { // The 0 that we use as a default value is mapped to Country::Unknown and Region::Unknown - u8 country_byte = ReadSwapped<u8>(3, partition).value_or(0); + const u8 country_byte = ReadSwapped<u8>(3, partition).value_or(0); const Region region = GetRegion(); - if (RegionSwitchWii(country_byte) != region) + if (CountryCodeToRegion(country_byte, Platform::WiiDisc, region) != region) return TypicalCountryForRegion(region); - return CountrySwitch(country_byte); + return CountryCodeToCountry(country_byte, Platform::WiiDisc, region); } std::string VolumeWii::GetMakerID(const Partition& partition) const |