Version 10.2 released. See readme.md file for details.

Makefile

@@ -15,7 +15,7 @@ include $(DEVKITARM)/ds_rules
 
 export TARGET		:=	ColecoDS
 export TOPDIR		:=	$(CURDIR)
-export VERSION		:=  10.1
+export VERSION		:=  10.2
 
 ICON 		:= -b $(CURDIR)/logo.bmp "ColecoDS $(VERSION);wavemotion-dave;https://github.com/wavemotion-dave/ColecoDS" 
 

arm9/source/colecoDS.h

@@ -15,7 +15,7 @@
 #include <string.h>
 #include "C24XX.h"
 
-#define VERSIONCLDS "V10.1"
+#define VERSIONCLDS "V10.2"
 
 extern u32 debug[0x10];
 

arm9/source/colecogeneric.c

@@ -1420,8 +1420,18 @@ void SetDefaultGameConfig(void)
 	// --------------------------------------------------------------------------
 	if (file_crc == 0xef25af90) myConfig.cvMode = CV_MODE_NOSGM; // Super DK Prototype - ignore any SGM/Adam Writes (this disables SGM)
 	if (file_crc == 0xc2e7f0e0) myConfig.cvMode = CV_MODE_NOSGM; // Super DK JR Prototype - ignore any SGM/Adam Writes (this disables SGM)
+    if (file_crc == 0x846faf14) myConfig.cvMode = CV_MODE_NOSGM; // Cavern Fighter - ignore any SGM/Adam Writes (this disables SGM)    
 
     if (file_crc == 0x987491ce) myConfig.memWipe = 1;    // The Heist for Colecovision is touchy about RAM (known issue with game) so force clear
+
+	// --------------------------------------------------------------------------
+	// And a few games that are known to use the Super Cart boards...
+	// --------------------------------------------------------------------------
+    if (file_crc == 0x30d337e4) myConfig.cvMode = CV_MODE_SUPERCART;
+    if (file_crc == 0x6831ad48) myConfig.cvMode = CV_MODE_SUPERCART;
+    if (file_crc == 0xbdae4248) myConfig.cvMode = CV_MODE_SUPERCART;
+    if (file_crc == 0x80586cc5) myConfig.cvMode = CV_MODE_SUPERCART;
+    if (file_crc == 0x6c8113c1) myConfig.cvMode = CV_MODE_SUPERCART;
 
     // -----------------------------------------------------------
     // If we are DS-PHAT or DS-LITE running on slower CPU, we 

arm9/source/colecomngt.c

@@ -800,20 +800,11 @@ u8 loadrom(const char *filename, u8 * ptr)
 // --------------------------------------------------------------------------
 __attribute__ ((noinline)) void SetupSGM(void)
 {
-    if (adam_mode) return;                          // ADAM has it's own setup handler
+    if (adam_mode) return;                          // ADAM has its own setup handler
     if (myConfig.cvMode == CV_MODE_NOSGM) return;   // There are a couple of games were we don't want to enable the SGM. Most notably Super DK won't play with SGM emulation.
 
     sgm_enable = (Port53 & 0x01) ? true:false;  // Port 53 lowest bit dictates SGM memory support enable.
 
-    // ----------------------------------------------------------------
-    // The first time we enable the SGM expansion RAM, we clear it out
-    // ----------------------------------------------------------------
-    if (sgm_enable && bFirstSGMEnable)
-    {
-        memset(RAM_Memory+0x2000, 0x00, 0x6000);
-        bFirstSGMEnable = false;
-    }
-
     // ------------------------------------------------------
     // And Port 60 will tell us if we want to swap out the
     // lower 8K bios for more RAM (total of 32K RAM for SGM)
@@ -831,13 +822,21 @@ __attribute__ ((noinline)) void SetupSGM(void)
     }
     else
     {
-      sgm_enable = true;    // Force this if someone disabled the BIOS.... based on reading some comments in the AA forum...
       if (sgm_low_addr != 0x0000)
       {
-          MemoryMap[0] = RAM_Memory + 0x0000;
           sgm_low_addr = 0x0000;
+          MemoryMap[0] = RAM_Memory + 0x0000;
       }
     }
+
+    // ----------------------------------------------------------------
+    // The first time we enable the SGM expansion RAM, we clear it out
+    // ----------------------------------------------------------------
+    if (sgm_enable && bFirstSGMEnable)
+    {
+        memset(RAM_Memory+0x2000, 0x00, 0x6000);
+        bFirstSGMEnable = false;
+    }    
 }