The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 07:21:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Boot: Preserve CODE value in setting.txt if it already matches the region

Browse Source 
This is a part of fixing https://bugs.dolphin-emu.org/issues/11930.
This commit is contained in:
JosJuice 2020-03-16 15:19:08 +01:00
parent c86832849a
commit 36c92294df
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Core/Core/Boot/Boot_BS2Emu.cpp
View File

@ -242,6 +242,30 @@ bool CBoot::EmulatedBS2_GC(const DiscIO::VolumeDisc& volume)
return RunApploader(/*is_wii*/ false, volume); return RunApploader(/*is_wii*/ false, volume);
} }
static DiscIO::Region CodeRegion(char c)
{
switch (c)
{
case 'J': // Japan
case 'T': // Taiwan
return DiscIO::Region::NTSC_J;
case 'B': // Brazil
case 'M': // Middle East
case 'R': // Argentina
case 'S': // ???
case 'U': // USA
case 'W': // ???
return DiscIO::Region::NTSC_U;
case 'A': // Australia
case 'E': // Europe
return DiscIO::Region::PAL;
case 'K': // Korea
return DiscIO::Region::NTSC_K;
default:
return DiscIO::Region::Unknown;
}
}
bool CBoot::SetupWiiMemory(IOS::HLE::IOSC::ConsoleType console_type) bool CBoot::SetupWiiMemory(IOS::HLE::IOSC::ConsoleType console_type)
{ {
static const std::map<DiscIO::Region, const RegionSetting> region_settings = { static const std::map<DiscIO::Region, const RegionSetting> region_settings = {
@ -267,11 +291,25 @@ bool CBoot::SetupWiiMemory(IOS::HLE::IOSC::ConsoleType console_type)
{ {
gen.SetBytes(std::move(data)); gen.SetBytes(std::move(data));
serno = gen.GetValue("SERNO"); serno = gen.GetValue("SERNO");
bool region_matches = false;
if (SConfig::GetInstance().bOverrideRegionSettings) if (SConfig::GetInstance().bOverrideRegionSettings)
{
region_matches = true;
}
else
{
const std::string code = gen.GetValue("CODE");
if (code.size() >= 2 && CodeRegion(code[1]) == SConfig::GetInstance().m_region)
region_matches = true;
}
if (region_matches)
{ {
region_setting = RegionSetting{gen.GetValue("AREA"), gen.GetValue("VIDEO"), region_setting = RegionSetting{gen.GetValue("AREA"), gen.GetValue("VIDEO"),
gen.GetValue("GAME"), gen.GetValue("CODE")}; gen.GetValue("GAME"), gen.GetValue("CODE")};
} }
gen.Reset(); gen.Reset();
} }
} }