Rename save delay and always spawn at clock town for pause saves (#456)

1 files changed, 4 insertions, 6 deletions

diff --git a/mm/src/code/z_sram_NES.c b/mm/src/code/z_sram_NES.c
index 86bf9e945..81a9b43e1 100644
--- a/mm/src/code/z_sram_NES.c
+++ b/mm/src/code/z_sram_NES.c
@@ -1996,9 +1996,8 @@ void Sram_UpdateWriteToFlashDefault(SramContext* sramCtx) {
             }
         }
     } else if (OSTIME_TO_TIMER(osGetTime() - sramCtx->startWriteOsTime) >=
-               SECONDS_TO_TIMER(CVarGetInteger(
-                   "gEnhancements.Save.SaveDelay",
-                   0))) { // 2S2H [Port] Some tricks require a save delay so we can't just force it to zero
+               SECONDS_TO_TIMER(CVarGetInteger("gEnhancements.Save.DisableSaveDelay", 0) ? 0 : 2)) {
+        // 2S2H [Port] Some tricks require a save delay so we can't just force it to zero
         // Finished status is hardcoded to 2 seconds instead of when the task finishes
         sramCtx->status = 0;
     }
@@ -2037,9 +2036,8 @@ void Sram_UpdateWriteToFlashOwlSave(SramContext* sramCtx) {
             }
         }
     } else if (OSTIME_TO_TIMER(osGetTime() - sramCtx->startWriteOsTime) >=
-               SECONDS_TO_TIMER(CVarGetInteger(
-                   "gEnhancements.Save.SaveDelay",
-                   0))) { // 2S2H [Port] Some tricks require a save delay so we can't just force it to zero
+               SECONDS_TO_TIMER(CVarGetInteger("gEnhancements.Save.DisableSaveDelay", 0) ? 0 : 2)) {
+        // 2S2H [Port] Some tricks require a save delay so we can't just force it to zero
         // Finished status is hardcoded to 2 seconds instead of when the task finishes
         sramCtx->status = 0;
         memset(sramCtx->saveBuf, 0, SAVE_BUFFER_SIZE);