From 0a9bec0289f70ff3b2968fffe6fa0d8d951eb3e6 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Mon, 5 Jun 2023 01:09:06 +0300
Subject: [PATCH] carthw: more x-in-1 carts

Also regenerate pico/carthw_cfg.c
---
 pico/carthw.cfg   | 10 ++++++++++
 pico/carthw_cfg.c | 28 ++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/pico/carthw.cfg b/pico/carthw.cfg
index ef507949..64e9152c 100644
--- a/pico/carthw.cfg
+++ b/pico/carthw.cfg
@@ -146,6 +146,16 @@ check_str = 0x150, "ALIEN 3"
 check_size_gt = 0x080000
 hw = x_in_1_mapper
 
+[5-in-1 Megadrive Portable]
+check_str = 0x150, "TINY TOON ADVENTURES"
+check_size_gt = 0x080000
+hw = x_in_1_mapper
+
+[40-games-in-1]
+check_str = 0x160, "FS MOONWALKER"
+check_size_gt = 0x080000
+hw = x_in_1_mapper
+
 [Super 15-in-1]
 check_str = 0x150, " SHOVE IT!"
 check_size_gt = 0x020000
diff --git a/pico/carthw_cfg.c b/pico/carthw_cfg.c
index 0de53f7b..94b6d32b 100644
--- a/pico/carthw_cfg.c
+++ b/pico/carthw_cfg.c
@@ -15,6 +15,22 @@ static const char builtin_carthw_cfg[] =
   "check_str=0x100,\"IMA IKUNO\"\n"
   "hw=pico\n"
   "[]\n"
+  "check_str=0x120,\"32X SAMPLE PROGRAM\"\n"
+  "check_str=0x32b74c,\"Bishop Level\"\n"
+  "prop=force_6btn\n"
+  "[]\n"
+  "check_str=0x100,\"SEGA 32X\"\n"
+  "check_str=0x150,\"WWF RAW\"\n"
+  "prop=wwfraw_hack#readsbackdatawrittentohighROMadressesfromcache\n"
+  "[]\n"
+  "check_str=0x100,\"SEGA 32X\"\n"
+  "check_str=0x120,\"BLACKTHORNE\"\n"
+  "prop=blackthorne_hack#readsbackdataoverwrittenby2ndCPUfromcache\n"
+  "[]\n"
+  "check_str=0x100,\"SEGA\"\n"
+  "check_str=0x150,\"MARS CHECK PROGRAM\"\n"
+  "prop=marscheck_hack#readsbackdataoverwrittenbyDMAfromcache\n"
+  "[]\n"
   "check_str=0x120,\"PUGGSY\"\n"
   "prop=no_sram\n"
   "[]\n"
@@ -27,10 +43,6 @@ static const char builtin_carthw_cfg[] =
   "check_str=0x150,\"  HardBall III\"\n"
   "sram_range=0x200000,0x20ffff\n"
   "[]\n"
-  "check_str=0x150,\"32X SAMPLE PROGRAM\"\n"
-  "check_str=0x32b74c,\"Bishop Level\"\n"
-  "prop=force_6btn\n"
-  "[]\n"
   "check_str=0x100,\"SEGA SSF\"\n"
   "hw=ssf2_mapper\n"
   "[]\n"
@@ -66,6 +78,14 @@ static const char builtin_carthw_cfg[] =
   "check_size_gt=0x080000\n"
   "hw=x_in_1_mapper\n"
   "[]\n"
+  "check_str=0x150,\"TINY TOON ADVENTURES\"\n"
+  "check_size_gt=0x080000\n"
+  "hw=x_in_1_mapper\n"
+  "[]\n"
+  "check_str=0x160,\"FS MOONWALKER\"\n"
+  "check_size_gt=0x080000\n"
+  "hw=x_in_1_mapper\n"
+  "[]\n"
   "check_str=0x150,\" SHOVE IT!\"\n"
   "check_size_gt=0x020000\n"
   "hw=x_in_1_mapper\n"
-- 
2.39.2