X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FCart.c;fp=Pico%2FCart.c;h=6eb7fc7ad4d7ce1942c47215780b5cd0cf88901d;hb=757f8dae1a2e71eb299cfb82269a1b1507da63bf;hp=5e01e9ac51f3e7e79d42d126013c394a6e02fff0;hpb=48df6e9e54f7c11263f5462f960b8cc2ecdc52e4;p=picodrive.git

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 5e01e9a..6eb7fc7 100644
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -640,20 +640,29 @@ void PicoCartDetect(void)
     SRam.eeprom_bit_out= 7;
   }
 
+  // SVP detection
+  else if (name_cmp("Virtua Racing") == 0 ||
+           name_cmp("VIRTUA RACING") == 0)
+  {
+    PicoSVPStartup();
+  }
+
+  // Detect 4-in-1 and 12-in-1
+  else if ((name_cmp("ROBOCOP 3") && Pico.romsize == 0x200000) ||
+    (rom_strcmp(0x160, "FLICKY") && Pico.romsize == 0x200000))
+  {
+    carthw_12in1_startup();
+  }
+
   // Some games malfunction if SRAM is not filled with 0xff
   if (name_cmp("DINO DINI'S SOCCER") == 0 ||
       name_cmp("MICRO MACHINES II") == 0)
+  {
     memset(SRam.data, 0xff, sram_size);
+  }
 
   // Unusual region 'code'
   if (rom_strcmp(0x1f0, "EUROPE") == 0)
     *(int *) (Pico.rom+0x1f0) = 0x20204520;
-
-  // SVP detection
-  if (name_cmp("Virtua Racing") == 0 ||
-      name_cmp("VIRTUA RACING") == 0)
-  {
-    PicoSVPStartup();
-  }
 }