Merge remote-tracking branch 'upstream/master'

Robbbert · Apr 19, 2024 · 650474c · 650474c
2 parents 8a49da0 + 7559701
commit 650474c
Show file tree

Hide file tree

Showing 18 changed files with 1,309 additions and 1,053 deletions.
diff --git a/hash/gameking.xml b/hash/gameking.xml
@@ -342,7 +342,7 @@ S1: is on some carts directly connected to VCC
 	</software>
 
 	<software name="mc_4v06" supported="partial">
-		<description>4 in 1 - Three Battles + Light Sword + Risker + Metal Deform (512KB cartridge)</description>
+		<description>4 in 1 - Three Battles + Light Sword + Risker + Metal Deform (512KB cartridge, set 1)</description>
 		<year>200?</year>
 		<publisher>TimeTop</publisher>
 		<part name="cart" interface="gameking_cart">
@@ -353,6 +353,17 @@ S1: is on some carts directly connected to VCC
 	</software>
 
 	<software name="mc_4v06a" cloneof="mc_4v06" supported="partial">
+		<description>4 in 1 - Three Battles + Light Sword + Risker + Metal Deform (512KB cartridge, set 2)</description>
+		<year>200?</year>
+		<publisher>TimeTop</publisher>
+		<part name="cart" interface="gameking_cart">
+			<dataarea name="rom" size="0x080000">
+				<rom name="gk_4in1_threebattles_lightsword_risker_metaldeform_512kb_set2.bin" size="0x080000" crc="6becf602" sha1="02f90d5d4609fe7005e2f357bb76d84ea50c9100"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mc_4v06b" cloneof="mc_4v06" supported="partial">
 		<description>4 in 1 - Three Battles + Light Sword + Risker + Metal Deform (1MB cartridge)</description>
 		<year>200?</year>
 		<publisher>TimeTop</publisher>

diff --git a/hash/gameking3.xml b/hash/gameking3.xml
@@ -50,7 +50,9 @@ see gameking.xml for information about cartridge types
 		<part name="cart" interface="gameking_cart">
 			<feature name="pcb" value="2007D / APR 23 05 / REV:1.0"/>
 			<dataarea name="rom" size="524288">
-				<rom name="panzer.gk3" size="524288" crc="54c7389e" sha1="1fe26d743ad02b466d045aa53706b13c8be2fe2e"/>
+				<rom name="panzer.gk3" size="524288" crc="52d24c9e" sha1="c6d0aed0b6bf3ff5f8f31973a8e347fe7ceeb52f"/>
+				<!-- in the ROM below address 0xc0a8 has been flipped from 0xff to 0xbf, this is in an unused fill area and likely just bitrot -->
+				<!-- <rom name="panzer.gk3" size="524288" crc="54c7389e" sha1="1fe26d743ad02b466d045aa53706b13c8be2fe2e"/> -->
 			</dataarea>
 		</part>
 	</software>
@@ -88,4 +90,26 @@ see gameking.xml for information about cartridge types
 		</part>
 	</software>
 
+	<software name="diamond" supported="partial">
+		<description>Diamond</description>
+		<year>200?</year>
+		<publisher>TimeTop</publisher>
+		<part name="cart" interface="gameking_cart">
+			<dataarea name="rom" size="524288">
+				<rom name="diamond.gk3" size="524288" crc="9b968d49" sha1="ce3de488ebb65ba9802670ea1558761d5aadb7f9"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="hemic" supported="partial">
+		<description>Hemic Battle</description>
+		<year>200?</year>
+		<publisher>TimeTop</publisher>
+		<part name="cart" interface="gameking_cart">
+			<dataarea name="rom" size="524288">
+				<rom name="hemicbattle.gk3" size="524288" crc="87465984" sha1="60032e52e3ef56be739ce0f6180891a44b68380d"/>
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff --git a/src/mame/galaxian/galaxian.cpp b/src/mame/galaxian/galaxian.cpp
@@ -12504,6 +12504,23 @@ ROM_START( bongo )
 	ROM_LOAD( "b-clr.bin",  0x0000, 0x0020, CRC(c4761ada) SHA1(067d12b2d3635ffa6337ed234ba42717447bea00) )
 ROM_END
 
+ROM_START( bongoa )
+	ROM_REGION( 0x6000, "maincpu", 0 )
+	ROM_LOAD( "1-2532.bin", 0x0000, 0x1000, CRC(ebcc50bb) SHA1(6d9deb561c3eb3e21abeda3180a29d21a2848e07) )
+	ROM_LOAD( "2-2532.bin", 0x1000, 0x1000, CRC(a19da662) SHA1(a2674392d489c5e5eeb9abc51572a37cc6045220) )
+	ROM_LOAD( "3-2532.bin", 0x2000, 0x1000, CRC(684db826) SHA1(753d9f0f9e1d047d567f47a9890f99ee72531b6e) )
+	ROM_LOAD( "4-2532.bin", 0x3000, 0x1000, CRC(f80372d2) SHA1(078e2c8b947103c168c0c85430f8ebc9d09f8ba7) )
+	ROM_LOAD( "5-2532.bin", 0x4000, 0x1000, BAD_DUMP CRC(fc92eade) SHA1(f4012a1c4631388a3e8109a8381bc4084ddc8757) ) // Bad on this set, taken from 'bongo'
+	ROM_LOAD( "6-2532.bin", 0x5000, 0x1000, CRC(561d9e5d) SHA1(68d7fab3cfb5b3360fe8064c70bf21bb1341032f) )
+
+	ROM_REGION( 0x2000, "gfx1", 0 )
+	ROM_LOAD( "2732.hj",    0x0000, 0x1000, CRC(fc79d103) SHA1(dac1152221ebdc4cd9bf353b4cc5d45021ca5d9e) )
+	ROM_LOAD( "2732.kl",    0x1000, 0x1000, CRC(94d17bf3) SHA1(2a70968249946de52c5a4cfabafbbf4ecda844a8) )
+
+	ROM_REGION( 0x0020, "proms", 0 )
+	ROM_LOAD( "82s123.6l",  0x0000, 0x0020, CRC(c5f12bc3) SHA1(b746ba06b596d4227fdc730a23bdf495f84e6a72) )
+ROM_END
+
 
 /*
 
@@ -16477,7 +16494,9 @@ GAME( 1980, galactica2,  moonal2,  mooncrst,   moonal2,    galaxian_state, init_
 
 // Larger romspace, interrupt enable moved
 GAME( 198?, thepitm,     thepit,   thepitm,    thepitm,    galaxian_state, init_mooncrsu,   ROT90,  "bootleg (KZH)", "The Pit (bootleg on Moon Quasar hardware)", MACHINE_SUPPORTS_SAVE ) // on an original MQ-2FJ PCB, even if the memory map appears closer to Moon Cresta
-GAME( 1983, bongo,       0,        bongo,      bongo,      galaxian_state, init_kong,       ROT90,  "Jetsoft",       "Bongo", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, bongo,       0,        bongo,      bongo,      galaxian_state, init_kong,       ROT90,  "Jetsoft",       "Bongo (set 1)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1983, bongoa,      bongo,    bongo,      bongo,      galaxian_state, init_kong,       ROT90,  "Jetsoft",       "Bongo (set 2)",                             MACHINE_SUPPORTS_SAVE ) // on an original Namco PCB
+
 
 // Crazy Kong & Bagman bootlegs on galaxian/mooncrst hardware
 GAME( 1981, ckongg,      ckong,    ckongg,     ckongg,     galaxian_state, init_ckongs,     ROT90,  "bootleg",       "Crazy Kong (bootleg on Galaxian hardware)",                   MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )

diff --git a/src/mame/mame.lst b/src/mame/mame.lst
@@ -18486,6 +18486,7 @@ blkhole                         // TDS (Tokyo Denshi Sekkei) & MINTS
 bmxstunts                       // (c) 1985 Jetsoft
 bomber                          //
 bongo                           // (c) 1983 Jetsoft
+bongoa                          // (c) 1983 Jetsoft
 calipso                         // (c) 1982 Tago
 catacomb                        // 1982 MTM Games
 checkman                        // (c) 1982 Zilec-Zenitone