Merge branch 'patch-1' of https://github.com/Jhynjhiruu/citra into Jhynjhiruu-patch-1

This commit is contained in:
B3n30 2019-08-11 13:21:16 +02:00
commit aabc2144bf

View file

@ -53,6 +53,12 @@ SMDH::GameRegion SMDH::GetRegion() const {
return GameRegion::RegionFree; return GameRegion::RegionFree;
} }
constexpr u32 taiwan_and_china =
(1 << static_cast<u32>(GameRegion::Taiwan)) | (1 << static_cast<u32>(GameRegion::China));
if (region_lockout == taiwan_and_china) {
return GameRegion::Taiwan;
} // hack to fix TWN games that support CHN consoles
constexpr u32 REGION_COUNT = 7; constexpr u32 REGION_COUNT = 7;
u32 region = 0; u32 region = 0;
for (; region < REGION_COUNT; ++region) { for (; region < REGION_COUNT; ++region) {