ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3515 from booto/wii-region 

DiscIO: Use specified Wii region for discs
This commit is contained in:
Pierre Bourdon 2016-01-20 19:58:58 +01:00
parent f98176f38a 92278886b9
commit a14c07413f
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -160,10 +160,51 @@ IVolume::ECountry CVolumeWiiCrypted::GetCountry() const
if (!m_pReader) if (!m_pReader)
return COUNTRY_UNKNOWN; return COUNTRY_UNKNOWN;
u8 country_code; u8 country_byte;
m_pReader->Read(3, 1, &country_code); if (!m_pReader->Read(3, 1, &country_byte))
{
return COUNTRY_UNKNOWN;
}
return CountrySwitch(country_code); IVolume::ECountry country_value = CountrySwitch(country_byte);
u32 region_code;
if (!ReadSwapped(0x4E000, &region_code, false))
{
return country_value;
}
switch (region_code)
{
case 0:
switch (country_value)
{
case IVolume::COUNTRY_TAIWAN:
return IVolume::COUNTRY_TAIWAN;
default:
return IVolume::COUNTRY_JAPAN;
}
case 1:
return IVolume::COUNTRY_USA;
case 2:
switch (country_value)
{
case IVolume::COUNTRY_FRANCE:
case IVolume::COUNTRY_GERMANY:
case IVolume::COUNTRY_ITALY:
case IVolume::COUNTRY_NETHERLANDS:
case IVolume::COUNTRY_RUSSIA:
case IVolume::COUNTRY_SPAIN:
case IVolume::COUNTRY_AUSTRALIA:
return country_value;
default:
return IVolume::COUNTRY_EUROPE;
}
case 4:
return IVolume::COUNTRY_KOREA;
default:
return country_value;
}
} }
std::string CVolumeWiiCrypted::GetMakerID() const std::string CVolumeWiiCrypted::GetMakerID() const