Merge pull request #7471 from JosJuice/country-region-switch

DiscIO: Improve RegionSwitch/CountrySwitch

1 files changed, 2 insertions, 10 deletions

diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index f844d329c8..1275fcfb78 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -87,18 +87,10 @@ Country VolumeGC::GetCountry(const Partition& partition) const
   const u8 country = ReadSwapped<u8>(3, partition).value_or(0);
   const Region region = GetRegion();
 
-  // Korean GC releases use NTSC-J.
-  // E is normally used for America, but it's also used for English-language Korean GC releases.
-  // K is used by games that are in the Korean language.
-  // W means Taiwan for Wii games, but on the GC, it's used for English-language Korean releases.
-  // (There doesn't seem to be any pattern to which of E and W is used for Korean GC releases.)
-  if (region == Region::NTSC_J && (country == 'E' || country == 'K' || country == 'W'))
-    return Country::Korea;
-
-  if (RegionSwitchGC(country) != region)
+  if (CountryCodeToRegion(country, Platform::GameCubeDisc, region) != region)
     return TypicalCountryForRegion(region);
 
-  return CountrySwitch(country);
+  return CountryCodeToCountry(country, Platform::GameCubeDisc, region);
 }
 
 std::string VolumeGC::GetMakerID(const Partition& partition) const