diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index fc4b0ced1d..5a177678de 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -157,16 +157,21 @@ static void cdvdNVM(u8* buffer, int offset, size_t bytes, bool read) if (!fp.IsOpened()) throw Exception::CannotCreateStream(fname); - u8 zero[1024] = {0}; + u8 zero[1024] = { 0 }; fp.Write(zero, sizeof(zero)); - //Write NVM ILink area with dummy data (Age of Empires 2) + // Write NVM ILink area with dummy data (Age of Empires 2) + // Also write language data defaulting to English (Guitar Hero 2) NVMLayout* nvmLayout = getNvmLayout(); - u8 ILinkID_Data[8] = {0x00, 0xAC, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x86}; + u8 ILinkID_Data[8] = { 0x00, 0xAC, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x86 }; + u8 Language_Data[8] = { 0x30, 0x21, 0x80, 0x00, 0x00, 0x70, 0x00, 0x00 }; fp.Seek(*(s32*)(((u8*)nvmLayout) + offsetof(NVMLayout, ilinkId))); fp.Write(ILinkID_Data, sizeof(ILinkID_Data)); + + fp.Seek(*(s32*)(((u8*)nvmLayout) + offsetof(NVMLayout, config1)) + 0x10); + fp.Write(Language_Data, sizeof(Language_Data)); } wxFFile fp(fname, L"r+b"); diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp index 5b9563b263..29d19eb49f 100644 --- a/pcsx2/R5900OpcodeImpl.cpp +++ b/pcsx2/R5900OpcodeImpl.cpp @@ -943,7 +943,7 @@ void SYSCALL() DevCon.Warning("Set GS CRTC configuration. %s %s (%s)",mode.c_str(), inter, field); } break; - case Syscall::GetOSParamConfig: + case Syscall::GetOsdConfigParam: if(g_SkipBiosHack) { u8* pointer = (u8*)PSM(cpuRegs.GPR.n.a0.UL[0]); @@ -964,7 +964,7 @@ void SYSCALL() return; } break; - case Syscall::GetOSParamConfig2: + case Syscall::GetOsdConfigParam2: if (g_SkipBiosHack) { u8* pointer = (u8*)PSM(cpuRegs.GPR.n.a0.UL[0]); diff --git a/pcsx2/R5900OpcodeTables.h b/pcsx2/R5900OpcodeTables.h index 95db746c69..35c0e8b35e 100644 --- a/pcsx2/R5900OpcodeTables.h +++ b/pcsx2/R5900OpcodeTables.h @@ -21,8 +21,8 @@ enum Syscall : u8 { SetGsCrt = 2, SetVTLBRefillHandler = 13, - GetOSParamConfig = 75, - GetOSParamConfig2 = 111, + GetOsdConfigParam = 75, + GetOsdConfigParam2 = 111, sysPrintOut = 117, sceSifSetDma = 119, Deci2Call = 124