From 66042d7c9af6eab885b72adeff55fba1a01cf514 Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Fri, 8 Nov 2024 07:07:41 -0800
Subject: mac_cdrom, ibm5170_cdrom: new CD-ROM dumps (#12891)

* mac_cdrom, ibm5170_cdrom: new CD-ROM dumps

New working software list items (ibm5170_cdrom)
-----------------------------------------------
My First Math Adventure: Adding and Subtracting [chungy]
Ultimate Solitaire [chungy]

New NOT WORKING software list items (ibm5170_cdrom)
---------------------------------------------------
Multimedia Middle School Grammar [chungy]
Mavis Beacon Teaches Typing Special Edition 10 [chungy]

New working software list items (mac_cdrom)
-------------------------------------------
My First Math Adventure: Adding and Subtracting [chungy]

* ibm5170_cdrom: Note a true color bug for Mavis Beacon
---
 hash/ibm5170_cdrom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 hash/mac_cdrom.xml     | 12 +++++++++++
 2 files changed, 68 insertions(+)

diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml
index bec412662d9..64b3a590216 100644
--- a/hash/ibm5170_cdrom.xml
+++ b/hash/ibm5170_cdrom.xml
@@ -5023,6 +5023,34 @@ https://www.pcgamingwiki.com/wiki/The_Adventures_of_Lomax
 		</part>
 	</software>
 
+	<!-- Windows 95/NT4 -->
+	<software name="mfma_addsub">
+		<description>My First Math Adventure: Adding and Subtracting</description>
+		<year>1998</year>
+		<publisher>Global Software Publishing</publisher>
+		<info name="developer" value="Dorling Kindersley" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="my first math adventure - adding and subtracting" sha1="860fe59ec122aff801de2c724e40a5f0045f88be" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- Windows 3.1/95 -->
+	<!-- Program fails to launch properly on ct486/Win95 -->
+	<software name="mmmsgram" supported="no">
+		<description>Multimedia Middle School Grammar</description>
+		<year>1995</year>
+		<publisher>Pro One</publisher>
+		<info name="developer" value="Sofsource" />
+		<info name="language" value="English" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="multimedia middle school grammar" sha1="cc38cae6e47ddebbbffa3e57bd3fbcedac5ed1fe" />
+			</diskarea>
+		</part>
+	</software>
+
 	<!-- "CDROM not ISO9660 or High Sierra" when trying to DIR it -->
 	<software name="monkisl3" supported="no">
 		<description>The Curse of Monkey Island</description>
@@ -5127,6 +5155,21 @@ The Curse of Monkey Island (Windows 95 demo version)
 		</part>
 	</software>
 
+	<!-- Windows 95/98/NT4 -->
+	<!-- Graphical corruption on svga_s3 (true color bug?), sound not working properly on sblaster_16 -->
+	<software name="mvsbcn10" supported="no">
+		<description>Mavis Beacon Teaches Typing Special Edition 10</description>
+		<year>1999</year>
+		<publisher>Brøderbund</publisher>
+		<info name="developer" value="The Learning Company" />
+		<info name="language" value="English" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="mavis beacon teaches typing special edition 10" sha1="5e37dd988b0e0696c3b466c46d8ec471cbc3c5f2" />
+			</diskarea>
+		</part>
+	</software>
+
 	<!-- Windows 3.1 -->
 	<!-- 386DX 33 MHz -->
 	<!-- Later "Masterpiece Edition" known to exist (has 3rd tab for help on status bar) -->
@@ -6595,6 +6638,19 @@ Unemulated optional [Gravis Gamepad], [Gravis Gamepad Pro], [Gravis Grip 4-playe
 		</part>
 	</software>
 
+	<!-- Windows 95/98 -->
+	<software name="ultsolitaire">
+		<description>Ultimate Solitaire</description>
+		<year>2003</year>
+		<publisher>ValuSoft</publisher>
+		<info name="developer" value="ValuSoft" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="ultimate solitaire" sha1="fb3b20a6cefabd2f11ca799de7f43aa9bfab439f" />
+			</diskarea>
+		</part>
+	</software>
+
 	<!-- Windows 3.1 -->
 	<!-- Disc label: Cyberplasm_ -->
 	<!-- TODO: gfx shift issue on 256 color mode -->
diff --git a/hash/mac_cdrom.xml b/hash/mac_cdrom.xml
index 96cbedf49d9..f9746295ab0 100644
--- a/hash/mac_cdrom.xml
+++ b/hash/mac_cdrom.xml
@@ -182,6 +182,18 @@ PPC750 - PowerPC 750 (G3) CPU
 			</diskarea>
 		</part>
 	</software>
+	<!-- Mac OS 7.0.1-9.x -->
+	<software name="mfma_addsub">
+		<description>My First Math Adventure: Adding and Subtracting</description>
+		<year>1998</year>
+		<publisher>Global Software Publishing</publisher>
+		<info name="developer" value="Dorling Kindersley" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="my first math adventure - adding and subtracting" sha1="860fe59ec122aff801de2c724e40a5f0045f88be" />
+			</diskarea>
+		</part>
+	</software>
 	<software name="pwrmaccd">
 		<description>Power Macintosh 6100/7100/8100 CD (System Software 7.1.2P) (US English)</description>
 		<year>1994</year>
-- 
cgit v1.2.3