From 29458b2c6e60aeee054f707c50d1691af201f2f2 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Mon, 18 Jul 2022 19:12:36 -0600
Subject: [PATCH] update core

---
 mupen64plus-core/src/device/r4300/interrupt.c | 2 +-
 mupen64plus-core/src/main/main.c              | 4 +++-
 mupen64plus-core/src/main/rom.c               | 9 ---------
 mupen64plus-core/src/main/rom.h               | 9 +++++++++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/mupen64plus-core/src/device/r4300/interrupt.c b/mupen64plus-core/src/device/r4300/interrupt.c
index b613ade..6a7e2a5 100644
--- a/mupen64plus-core/src/device/r4300/interrupt.c
+++ b/mupen64plus-core/src/device/r4300/interrupt.c
@@ -121,7 +121,7 @@ unsigned int add_random_interrupt_time(struct r4300_core* r4300)
 #else
         value = rand();
 #endif
-        return value % 0x40;
+        return value % 0x100;
     } else
         return 0;
 }
diff --git a/mupen64plus-core/src/main/main.c b/mupen64plus-core/src/main/main.c
index e30b518..2690ac0 100644
--- a/mupen64plus-core/src/main/main.c
+++ b/mupen64plus-core/src/main/main.c
@@ -1525,13 +1525,15 @@ m64p_error main_run(void)
     else
         disable_extra_mem = ConfigGetParamInt(g_CoreConfig, "DisableExtraMem");
 
-
     rdram_size = (disable_extra_mem == 0) ? 0x800000 : 0x400000;
 
     si_dma_duration = ConfigGetParamInt(g_CoreConfig, "SiDmaDuration");
     if (si_dma_duration < 0)
         si_dma_duration = ROM_SETTINGS.sidmaduration;
 
+    if (si_dma_duration != DEFAULT_SI_DMA_DURATION)
+        randomize_interrupt = 0; // Disable interrupt randomness if a specific SI DMA is set
+
     rsp_delay_time = ROM_SETTINGS.rspdelaytime;
 
     uint32_t count_per_op; //UNUSED
diff --git a/mupen64plus-core/src/main/rom.c b/mupen64plus-core/src/main/rom.c
index 12eea5b..89fac54 100644
--- a/mupen64plus-core/src/main/rom.c
+++ b/mupen64plus-core/src/main/rom.c
@@ -46,15 +46,6 @@
 
 #define CHUNKSIZE 1024*128 /* Read files 128KB at a time. */
 
-/* by default, extra mem is enabled */
-enum { DEFAULT_DISABLE_EXTRA_MEM = 0 };
-/* Default SI DMA duration */
-enum { DEFAULT_SI_DMA_DURATION = 0x3000 };
-/* Default AI DMA modifier */
-enum { DEFAULT_AI_DMA_MODIFIER = 100 };
-/* Default RSP delay time */
-enum { DEFAULT_RSP_DELAY_TIME = 2000 };
-
 static romdatabase_entry* ini_search_by_md5(md5_byte_t* md5);
 
 static _romdatabase g_romdatabase;
diff --git a/mupen64plus-core/src/main/rom.h b/mupen64plus-core/src/main/rom.h
index 0470f39..4e38dd5 100644
--- a/mupen64plus-core/src/main/rom.h
+++ b/mupen64plus-core/src/main/rom.h
@@ -133,6 +133,15 @@ typedef struct
 #define ROMDATABASE_ENTRY_AIDMAMODIFIER BIT(13)
 #define ROMDATABASE_ENTRY_RSPDELAYTIME  BIT(14)
 
+/* by default, extra mem is enabled */
+enum { DEFAULT_DISABLE_EXTRA_MEM = 0 };
+/* Default SI DMA duration */
+enum { DEFAULT_SI_DMA_DURATION = 4000 };
+/* Default AI DMA modifier */
+enum { DEFAULT_AI_DMA_MODIFIER = 100 };
+/* Default RSP delay time */
+enum { DEFAULT_RSP_DELAY_TIME = 2000 };
+
 typedef struct _romdatabase_search
 {
     romdatabase_entry entry;