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 #8245 from JosJuice/volumeverifier-wii-menu-region 

Fix VolumeVerifier considering Wii Menu WADs to have wrong region
This commit is contained in:
Anthony 2019-07-22 15:06:07 -07:00 committed by GitHub
parent 26c1ea3221 0b11f15158
commit 136264d340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DiscIO/Enums.cpp
View File

@ -150,6 +150,9 @@ Region CountryCodeToRegion(u8 country_code, Platform platform, Region expected_r
{ {
switch (country_code) switch (country_code)
{ {
case '\2':
return expected_region; // Wii Menu (same title ID for all regions)
case 'J': case 'J':
return Region::NTSC_J; return Region::NTSC_J;

6
Source/Core/DiscIO/VolumeVerifier.cpp
View File

@ -562,7 +562,11 @@ void VolumeVerifier::CheckMisc()
} }
else 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) if (CountryCodeToRegion(country_code, platform, region) != region)
{ {
AddProblem(Severity::Medium, AddProblem(Severity::Medium,