piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

DiscIO: Merge RegionSwitchGC and RegionSwitchWii

Browse Source
This commit is contained in:
JosJuice
2018-10-05 17:48:59 +02:00
parent d741c239d2
commit 08d0b98988
5 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DiscIO/VolumeWii.cpp
View File

@ -290,10 +290,10 @@ 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 (RegionSwitch(country_byte, Platform::WiiDisc) != region)
return TypicalCountryForRegion(region);
return CountrySwitch(country_byte);