From 08d0b98988af1ff0991d660911b4a400980676d5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 5 Oct 2018 17:48:59 +0200 Subject: DiscIO: Merge RegionSwitchGC and RegionSwitchWii --- Source/Core/DiscIO/VolumeGC.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index f844d329c8..71506e8393 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -95,7 +95,7 @@ Country VolumeGC::GetCountry(const Partition& partition) const if (region == Region::NTSC_J && (country == 'E' || country == 'K' || country == 'W')) return Country::Korea; - if (RegionSwitchGC(country) != region) + if (RegionSwitch(country, Platform::GameCubeDisc) != region) return TypicalCountryForRegion(region); return CountrySwitch(country); -- cgit v1.2.3 From 57d05293fd11748a7a533ad81a1b61e85e4daca6 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 5 Oct 2018 20:14:23 +0200 Subject: DiscIO: Move the Korean GC mess out of VolumeGC --- Source/Core/DiscIO/VolumeGC.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 71506e8393..c984d60f9d 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(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 (RegionSwitch(country, Platform::GameCubeDisc) != region) + if (RegionSwitch(country, Platform::GameCubeDisc, region) != region) return TypicalCountryForRegion(region); - return CountrySwitch(country); + return CountrySwitch(country, Platform::GameCubeDisc, region); } std::string VolumeGC::GetMakerID(const Partition& partition) const -- cgit v1.2.3 From f834ef1dfede5b1f010314810845c97715eabae7 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 8 Oct 2018 13:51:21 +0200 Subject: DiscIO: Rename RegionSwitch/CountrySwitch Callers don't need to know that these functions are implemented with a switch statement. --- Source/Core/DiscIO/VolumeGC.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index c984d60f9d..1275fcfb78 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -87,10 +87,10 @@ Country VolumeGC::GetCountry(const Partition& partition) const const u8 country = ReadSwapped(3, partition).value_or(0); const Region region = GetRegion(); - if (RegionSwitch(country, Platform::GameCubeDisc, region) != region) + if (CountryCodeToRegion(country, Platform::GameCubeDisc, region) != region) return TypicalCountryForRegion(region); - return CountrySwitch(country, Platform::GameCubeDisc, region); + return CountryCodeToCountry(country, Platform::GameCubeDisc, region); } std::string VolumeGC::GetMakerID(const Partition& partition) const -- cgit v1.2.3