moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #180 from wheremyfoodat/timerz

Browse Source 
*Actually* make 3DS report the auto-detected region
This commit is contained in:
wheremyfoodat
2023-08-13 19:50:25 +03:00
committed by GitHub
parent 19278c4561 68bb052618
commit b79df4bc5b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/services/cfg.cpp
View File

@@ -134,7 +134,7 @@ void CFGService::secureInfoGetRegion(u32 messagePointer) {
mem.write32(messagePointer, IPC::responseHeader(0x2, 2, 0)); mem.write32(messagePointer, IPC::responseHeader(0x2, 2, 0));
mem.write32(messagePointer + 4, Result::Success); mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 8, static_cast<u32>(Regions::USA)); // TODO: Detect the game region and report it mem.write32(messagePointer + 8, static_cast<u32>(mem.getConsoleRegion()));
} }
void CFGService::genUniqueConsoleHash(u32 messagePointer) { void CFGService::genUniqueConsoleHash(u32 messagePointer) {
@@ -153,7 +153,16 @@ void CFGService::genUniqueConsoleHash(u32 messagePointer) {
// Used for market restriction-related stuff // Used for market restriction-related stuff
void CFGService::getRegionCanadaUSA(u32 messagePointer) { void CFGService::getRegionCanadaUSA(u32 messagePointer) {
log("CFG::GetRegionCanadaUSA\n"); log("CFG::GetRegionCanadaUSA\n");
const u8 ret = (country == CountryCodes::US || country == CountryCodes::CA) ? 1 : 0; bool regionUSA = mem.getConsoleRegion() == Regions::USA;
u8 ret;
// First, this function checks that the console region is 1 (USA). If not then it instantly returns 0
// Then it checks whether the country is US or Canda. If yes it returns 1, else it returns 0.
if (!regionUSA) {
ret = 0;
} else {
ret = (country == CountryCodes::US || country == CountryCodes::CA) ? 1 : 0;
}
mem.write32(messagePointer, IPC::responseHeader(0x4, 2, 0)); mem.write32(messagePointer, IPC::responseHeader(0x4, 2, 0));
mem.write32(messagePointer + 4, Result::Success); mem.write32(messagePointer + 4, Result::Success);