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

Samus_HandleScrewAttackSpeedBoostingPals reads bad addr (Fixes #18)

Browse Source
This commit is contained in:
Snesrev
2023-03-11 17:53:53 +01:00
parent bcc7572392
commit 72f5bf5795
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sm_91.c
View File

@@ -2709,7 +2709,7 @@ LABEL_18:
uint16 v1 = *(uint16 *)RomPtr_91(R36 + special_samus_palette_frame); uint16 v1 = *(uint16 *)RomPtr_91(R36 + special_samus_palette_frame);
CopyToSamusSuitPalette(v1); CopyToSamusSuitPalette(v1);
uint16 v2 = special_samus_palette_frame + 2; uint16 v2 = special_samus_palette_frame + 2;
if (!sign16(special_samus_palette_frame - 10)) if (special_samus_palette_frame >= 10)
v2 = 0; v2 = 0;
special_samus_palette_frame = v2; special_samus_palette_frame = v2;
return 1; return 1;
@@ -2725,10 +2725,13 @@ LABEL_10:
if (!special_samus_palette_timer || v3) { if (!special_samus_palette_timer || v3) {
special_samus_palette_timer = 4; special_samus_palette_timer = 4;
R36 = kSamusPal_SpeedBoost[samus_suit_palette_index >> 1]; R36 = kSamusPal_SpeedBoost[samus_suit_palette_index >> 1];
// Bugfix: The original game can do an out of bounds read here.
if (special_samus_palette_frame > 6)
special_samus_palette_frame = 6;
uint16 v4 = *(uint16 *)RomPtr_91(R36 + special_samus_palette_frame); uint16 v4 = *(uint16 *)RomPtr_91(R36 + special_samus_palette_frame);
CopyToSamusSuitPalette(v4); CopyToSamusSuitPalette(v4);
uint16 v5 = special_samus_palette_frame + 2; uint16 v5 = special_samus_palette_frame + 2;
if (!sign16(special_samus_palette_frame - 6)) if (special_samus_palette_frame >= 6)
v5 = 6; v5 = 6;
special_samus_palette_frame = v5; special_samus_palette_frame = v5;
} }

4
src/sm_cpu_infra.c
View File

@@ -314,6 +314,10 @@ uint32 PatchBugs(uint32 mode, uint32 addr) {
g_cpu->mf = 0; g_cpu->mf = 0;
return 0xA497CE; return 0xA497CE;
} }
} else if (FixBugHook(0x91DA89)) {
// Samus_HandleScrewAttackSpeedBoostingPals reads OOB
if (special_samus_palette_frame > 6)
special_samus_palette_frame = 6;
} }
return 0; return 0;