Merge remote-tracking branch 'upstream/master'

# Conflicts: # src/emu/inpttype.ipp
Robbbert · Feb 20, 2024 · 6c0f240 · 6c0f240
2 parents 2dc21d9 + 56374ed
commit 6c0f240
Show file tree

Hide file tree

Showing 189 changed files with 6,006 additions and 1,646 deletions.
diff --git a/docs/source/usingmame/defaultkeys.rst b/docs/source/usingmame/defaultkeys.rst
@@ -141,9 +141,6 @@ and saving/loading save states.
     state.
 **Left Shift+F6**
     Create a quick save state.
-**Left Ctrl+F6**
-    Decrease Prescaling.
-    (*SDL MAME only*)
 **F7**
     Load a save state. You will be prompted to press a key or select from the
     menu to determine which save state you wish to load.
@@ -154,15 +151,18 @@ and saving/loading save states.
     save or load.*
 **Left Shift+F7**
     Load a quick save state.
-**Left Ctrl+F7**
-    Increase Prescaling.
-    (*SDL MAME only*)
 **F8**
     Decrease frame skipping on the fly.
 **Left Shift+F8**
     Toggle cheat mode. (if started with “-cheat”)
+**Left Alt+F8**
+    Decrease Prescaling.
+    (*SDL MAME only*)
 **F9**
     Increase frame skipping on the fly.
+**Left Alt+F9**
+    Increase Prescaling.
+    (*SDL MAME only*)
 **F10**
     Toggle speed throttling.
 **Left Alt+F10**
@@ -185,14 +185,9 @@ and saving/loading save states.
     Begin recording AVI video.
 **Left Alt+F12**
     Take HLSL Rendered Snapshot.
-**Insert**
-    Fast forward. While held, runs game with throttling disabled and with the
-    maximum frameskip.
-    (*Windows non-SDL MAME only*)
-**Page Down**
+**Insert** (Windows non-SDL MAME)/**Page Down** (SDL MAME)
     Fast forward. While held, runs game with throttling disabled and with the
     maximum frameskip.
-    (*SDL MAME only*)
 **Left Alt+Enter**
     Toggles between full-screen and windowed mode.
 **Scroll Lock**/**Forward Delete** (Mac Desktop)/**fn-Delete** (Mac Laptop)

diff --git a/docs/source/usingmame/mamemenus.rst b/docs/source/usingmame/mamemenus.rst
@@ -27,7 +27,7 @@ settings.
 
 Emulated system inputs are ignored while menus are displayed.  You can still
 pause or resume the running system while most menus are displayed by pressing
-the **Pause** key or button (**P** on the keyboard by default).
+the **Pause** key or button (**F5** on the keyboard by default).
 
 If you start MAME without specifying a system on the command line, the system
 selection menu will be shown (assuming the

diff --git a/hash/compclr2_flop.xml b/hash/compclr2_flop.xml
@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 -->
-<softwarelist name="compclr2_flop" description="Compucolor II Disk Images">
+<softwarelist name="compclr2_flop" description="Compucolor II disk images">
 
 	<software name="asndware">
 		<description>Action Soundware</description>
@@ -50,7 +50,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="alieninva" cloneof="alieninv">
-		<description>Alien Invasion (v1.4, Alt)</description>
+		<description>Alien Invasion (v1.4, alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -192,7 +192,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="asteroida" cloneof="asteroid">
-		<description>Asteroids (Alt)</description>
+		<description>Asteroids (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -284,7 +284,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="basiclesa" cloneof="basicles">
-		<description>BASIC Lessons (Alt)</description>
+		<description>BASIC Lessons (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -317,7 +317,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="bshipa" cloneof="bship">
-		<description>Battleship (Alt)</description>
+		<description>Battleship (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -361,7 +361,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="blanka" cloneof="blank">
-		<description>Blank (Alt)</description>
+		<description>Blank (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -1279,7 +1279,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="draw2a" cloneof="draw2">
-		<description>Draw 2 (Alt)</description>
+		<description>Draw 2 (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -1436,7 +1436,7 @@ license:CC0-1.0
 
 
 	<software name="fortstra" cloneof="fortstr">
-		<description>FORTRAN Strings Source (Alt)</description>
+		<description>FORTRAN Strings Source (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -1469,7 +1469,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="galaxiana" cloneof="galaxian">
-		<description>Galaxian (Alt)</description>
+		<description>Galaxian (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -1641,7 +1641,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="invadersa" cloneof="invaders">
-		<description>Invaders (Alt)</description>
+		<description>Invaders (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -1746,7 +1746,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="lifea" cloneof="life">
-		<description>Life (Alt)</description>
+		<description>Life (alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -2418,7 +2418,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="strekgea" cloneof="strekge">
-		<description>Star Trek (Graham Epps, v30.8.80, Alt)</description>
+		<description>Star Trek (Graham Epps, v30.8.80, alt)</description>
 		<year>19??</year>
 		<publisher>Graham Epps</publisher>
 		<part name="flop1" interface="floppy_5_25">

diff --git a/hash/digilog320.xml b/hash/digilog320.xml
@@ -3,7 +3,7 @@
 
 <!-- license:CC0-1.0 -->
 
-<softwarelist name="digilog320" description="Digilog 320 Disks">
+<softwarelist name="digilog320" description="Digilog 320 disks">
 
 	<!--
 	Marked bad because it contains extra files not present on the original disk:

diff --git a/hash/ekara_japan.xml b/hash/ekara_japan.xml
@@ -138,7 +138,7 @@ license:CC0-1.0
 	55  *EC0055-ATS  Artist Selection Volume 13 - TUBE
 	56  *EC0056-JPM  J-Pop Mix Volume 24
 	57  *EC0057-ATS  Artist Selection Volume 14 - SMAP
-	58   EC0058-ENK  Enkamichi Volume 8
+	58  *EC0058-ENK  Enkamichi Volume 8
 	59  *EC0059-JPM  J-Pop Mix Volume 25
 
 	60  *EC0060-JPM  J-Pop Mix Volume 26
@@ -866,7 +866,17 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<!-- EC0058-ENK  Enkamichi Volume 8 -->
+	<software name="ec0058">
+		<description>Enkamichi Volume 8 (Japan) (EC0058-ENK)</description>
+		<year>2001</year>
+		<publisher>Takara</publisher>
+		<info name="alt_title" value="演歌道 Vol.8" />
+		<part name="cart" interface="ekara_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="ec0058-enk.u1" size="0x100000" crc="99ff438f" sha1="87e1175f6a9372226112384c2b7f12f17a4e7994"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="ec0059">
 		<description>J-Pop Mix Volume 25 (Japan) (EC0059-JPM)</description>

diff --git a/hash/ekara_japan_d.xml b/hash/ekara_japan_d.xml
@@ -25,9 +25,9 @@ license:CC0-1.0
 	*D-3   DC0003-BHT  Best Hit Volume 9
 	 D-4   DC0004-TPJ  TV Pop Junior Volume 8
 	*D-5   DC0005-TPJ  TV Pop Junior Volume 9
-	 D-6   DC0006-BHT  Best Hit Volume 10
+	*D-6   DC0006-BHT  Best Hit Volume 10
 	 D-7   DC0007-KID  Kids' Song Volume 4 (volumes 1, 2 and 3 are in the main EC series)
-	 D-8   DC0008-BAT  Best Artist (no volume number on cover)
+	*D-8   DC0008-BAT  Best Artist Volume 7
 	 D-9   DC0009-TPJ  TV Pop Junior (no volume number on cover)
 
 	(more? what's the D highest number?)
@@ -92,4 +92,28 @@ license:CC0-1.0
 		</part>
 	</software>
 
+	<software name="dc0006">
+		<description>Dream Cartridge: Best Hit Vol.10 (Japan) (DC0006-BHT)</description>
+		<year>2004</year>
+		<publisher>Takara</publisher>
+		<part name="cart" interface="ekara_cart">
+			<feature name="slot" value="rom_24lc02"/>
+			<dataarea name="rom" size="0x100000">
+				<rom name="dc0006-bht.u1" size="0x100000" crc="62368c46" sha1="fdedb4b81c3b1642eb3a8993cdcf58dbc29f9a03"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="dc0008">
+		<description>Dream Cartridge: Best Artist Vol.7 (Japan) (DC0008-BAT)</description>
+		<year>2004</year>
+		<publisher>Takara</publisher>
+		<part name="cart" interface="ekara_cart">
+			<feature name="slot" value="rom_24lc02"/>
+			<dataarea name="rom" size="0x100000">
+				<rom name="dc0008-bat.u1" size="0x100000" crc="b97472a5" sha1="681990c795094cf83b200c947ed34624d1fc90b3"/>
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff --git a/hash/ekara_japan_sp.xml b/hash/ekara_japan_sp.xml
@@ -30,7 +30,7 @@ license:CC0-1.0
 	*SP-03  'Super Cartridge' SP-03 TV Pop Junior
 	*SP-04  'Super Cartridge' SP-04 Best Hit
 	*SP-05  'Super Cartridge' SP-05 TV Pop Junior
-	 SP-06  'Super Cartridge' SP-06 TV Pop Junior
+	*SP-06  'Super Cartridge' SP-06 TV Pop Junior
 	 SP-07  'Super Cartridge' SP-07 Best Hit
 
 	(more? what's the SP highest number? correct titles for each of these etc.)
@@ -102,4 +102,17 @@ license:CC0-1.0
 		</part>
 	</software>
 
+	<software name="sp06">
+		<description>Super Cartridge: TV Pop Junior (Japan) (SP-06)</description>
+		<year>2004</year>
+		<publisher>Takara</publisher>
+		<info name="alt_title" value="スーパーカートリッジ TVPOPジュニア"/>
+		<part name="cart" interface="ekara_cart">
+			<feature name="slot" value="rom_24c08_epitch"/>
+			<dataarea name="rom" size="0x200000">
+				<rom name="sp06.u1" size="0x200000" crc="b4c4b62d" sha1="5808badf75ad7974bcfc904faf4b6b6d9a0f91f9"/>
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>