Skip to content

Commit 0d07644

Browse files
committed
jvs: use XbSymbolDatabase's symbol cache to get JVS_g_pPINS(A|B) directly
1 parent da51747 commit 0d07644

1 file changed

Lines changed: 2 additions & 14 deletions

File tree

src/core/hle/JVS/JVS.cpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -209,35 +209,23 @@ void JVS_Init()
209209
// Determine which version of JVS_SendCommand this title is using and derive the offset
210210
// TODO: Extract this into a function and also locate PINSB
211211
static int JvsSendCommandVersion = -1;
212-
g_pPINSA = nullptr;
213-
g_pPINSB = nullptr;
212+
g_pPINSA = (DWORD*)GetXboxSymbolPointer("JVS_g_pPINSA");
213+
g_pPINSB = (DWORD*)GetXboxSymbolPointer("JVS_g_pPINSB");
214214

215215
auto JvsSendCommandOffset1 = (uintptr_t)GetXboxSymbolPointer("JVS_SendCommand");
216216
auto JvsSendCommandOffset2 = (uintptr_t)GetXboxSymbolPointer("JVS_SendCommand2");
217217
auto JvsSendCommandOffset3 = (uintptr_t)GetXboxSymbolPointer("JVS_SendCommand3");
218218

219219
if (JvsSendCommandOffset1) {
220220
JvsSendCommandVersion = 1;
221-
g_pPINSA = *(DWORD**)(JvsSendCommandOffset1 + 0x2A0);
222-
g_pPINSB = (DWORD*)((DWORD)g_pPINSA - 8);
223221
}
224222

225223
if (JvsSendCommandOffset2) {
226224
JvsSendCommandVersion = 2;
227-
g_pPINSA = *(DWORD**)(JvsSendCommandOffset2 + 0x312);
228-
g_pPINSB = (DWORD*)((DWORD)g_pPINSA - 8);
229225
}
230226

231227
if (JvsSendCommandOffset3) {
232228
JvsSendCommandVersion = 3;
233-
g_pPINSA = *(DWORD**)(JvsSendCommandOffset3 + 0x307);
234-
g_pPINSB = (DWORD*)((DWORD)g_pPINSA - 8);
235-
236-
if ((DWORD)g_pPINSA > XBE_MAX_VA) {
237-
// This was invalid, we must have the other varient of SendCommand3 (SEGABOOT)
238-
g_pPINSA = *(DWORD**)(JvsSendCommandOffset3 + 0x302);
239-
g_pPINSB = (DWORD*)((DWORD)g_pPINSA - 8);
240-
}
241229
}
242230

243231
// Set state to a sane initial default

0 commit comments

Comments
 (0)