panzone/sm-vita
1
0
Fork 0
Code Releases 1 Activity

Orig game reads uninitialized memory in xray

Browse Source
This commit is contained in:
Snesrev
2023-03-06 18:55:05 +01:00
parent 039c663141
commit 4e83a497df
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sm_91.c
View File

@@ -1985,6 +1985,9 @@ void Xray_SetupStage4_Func1(void) { // 0x91CCF1
} }
void Xray_SetupStage4_Func2(void) { // 0x91CD42 void Xray_SetupStage4_Func2(void) { // 0x91CD42
// bug: passing 0xffff to this function is invalid and will read invalid memory.
if (R34 == 0)
return;
unsigned int v2; unsigned int v2;
int16 v3; int16 v3;
unsigned int v7; unsigned int v7;

4
src/sm_cpu_infra.c
View File

@@ -282,6 +282,10 @@ void PatchBugs(uint32 mode, uint32 addr) {
} else if (FixBugHook(0xA7CEB2)) { } else if (FixBugHook(0xA7CEB2)) {
// Phantoon_Main forgots to reload x // Phantoon_Main forgots to reload x
g_cpu->x = cur_enemy_index; g_cpu->x = cur_enemy_index;
} else if (FixBugHook(0x91CD44)) {
// Xray_SetupStage4_Func2 passes a bad value to Xray_HandleXrayedBlock
if (g_cpu->x == 0)
g_cpu->pc = 0xCD52;
} }
} }