Merge branch 'master' into feature/zip-support

1 files changed, 9 insertions, 4 deletions

diff --git a/src/NDS.cpp b/src/NDS.cpp
index 8cd7f93..823d39a 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -493,7 +493,7 @@ void Reset()
         printf("ARM7 BIOS loaded\n");
         fclose(f);
     }
-    
+
 #ifdef JIT_ENABLED
     ARMJIT::Reset();
 #endif
@@ -1137,7 +1137,9 @@ void MapSharedWRAM(u8 val)
     if (val == WRAMCnt)
         return;
 
+#ifdef JIT_ENABLED
     ARMJIT_Memory::RemapSWRAM();
+#endif
 
     WRAMCnt = val;
 
@@ -1268,6 +1270,9 @@ bool HaltInterrupted(u32 cpu)
     if (IF[cpu] & IE[cpu])
         return true;
 
+    if ((ConsoleType == 1) && cpu && (IF2 & IE2))
+        return true;
+
     return false;
 }
 
@@ -1813,14 +1818,14 @@ void debug(u32 param)
     }
     fclose(shit);*/
     FILE*
-    /*shit = fopen("debug/dump9.bin", "wb");
+    shit = fopen("debug/dump9.bin", "wb");
     for (u32 i = 0x02000000; i < 0x04000000; i+=4)
     {
         u32 val = DSi::ARM9Read32(i);
         fwrite(&val, 4, 1, shit);
     }
-    fclose(shit);*/
-    shit = fopen("debug/dump7_2.bin", "wb");
+    fclose(shit);
+    shit = fopen("debug/dump7.bin", "wb");
     for (u32 i = 0x02000000; i < 0x04000000; i+=4)
     {
         u32 val = DSi::ARM7Read32(i);