added 12-in-1 mapper to carthw

[picodrive.git] / Pico / Cart.c

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