From c11eab0669da2d10954b89b4dfc01538724b1ec9 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Thu, 2 Jul 2020 21:10:11 -0700 Subject: [PATCH] return rollback crash prevention to conditional blacklist --- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp index ed550bcc1c..102f29fd77 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp @@ -934,7 +934,6 @@ void CEXISlippi::prepareGeckoList() {0x800198a4, true}, // Binary/PerformanceLagReduction.bin {0x80019620, true}, // Binary/PerformanceLagReduction.bin {0x801A5054, true}, // Binary/PerformanceLagReduction.bin - {0x80023ffc, true}, // Binary/GameMusicOn.bin + Binary/GameMusicOff.bin {0x80397878, true}, // Binary/OsReportPrintOnCrash.bin {0x801A4DA0, true}, // Binary/LagReduction/PD.bin {0x801A4DB4, true}, // Binary/LagReduction/PD.bin @@ -989,8 +988,6 @@ void CEXISlippi::prepareGeckoList() {0x80376304, true}, // Online/Core/Hacks/ForceNoVideoAssert.asm {0x80321d70, true}, // Online/Core/Hacks/PreventCharacterCrowdChants.asm {0x80019608, true}, // Online/Core/Hacks/PreventPadAlarmDuringRollback.asm - {0x80023FFC, true}, // Online/Core/PreventFileAlarms/MuteMusic.asm - {0x8038add0, true}, // Online/Core/PreventFileAlarms/PreventMusicAlarm.asm {0x8038D224, true}, // Online/Core/Sound/AssignSoundInstanceId.asm {0x80088224, true}, // Online/Core/Sound/NoDestroyVoice.asm {0x800882B0, true}, // Online/Core/Sound/NoDestroyVoice2.asm @@ -1012,7 +1009,8 @@ void CEXISlippi::prepareGeckoList() // Some codes should only be blacklisted when not displaying rollbacks, these are codes // that are required for things to not break when using Slippi savestates. Perhaps this // should be handled by actually applying these codes in the playback ASM instead? not sure - blacklist[0x8038add0] = true; // PreventMusicAlarm + blacklist[0x8038add0] = true; // Online/Core/PreventFileAlarms/PreventMusicAlarm.asm + blacklist[0x80023FFC] = true; // Online/Core/PreventFileAlarms/MuteMusic.asm } geckoList.clear();