Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release0239' into rel239
Browse files Browse the repository at this point in the history
  • Loading branch information
@mahlemiut
mahlemiut committed Dec 26, 2021
2 parents d5b00cc + c25e62f commit 96df054
Show file tree
Hide file tree
Showing 323 changed files with 8,511 additions and 40,169 deletions.
4 changes: 2 additions & 2 deletions docs/source/initialsetup/compilingmame.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ above in All Platforms.
Emscripten Javascript and HTML
------------------------------

First, download and install Emscripten 1.37.29 or later by following the
instructions at the `official site <https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html>`_.
First, download and install Emscripten 2.0.25 or later by following the
instructions at the `official site <https://emscripten.org/docs/getting_started/downloads.html>`_.

Once Emscripten has been installed, it should be possible to compile MAME
out-of-the-box using Emscripten’s **emmake** tool. Because a full MAME
Expand Down
26 changes: 13 additions & 13 deletions hash/apple2_flop_orig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16940,7 +16940,7 @@ license:CC0
Apple SuperDrive (G7287), will not work due to
incompatibilities created by the copy protection. -->
<!--"Troll Sports Math" is a 1991 educational program developed by Millicent Sabater, Gregory Truex, Thomas Whiting, and Toby Shack, and distributed by Troll Associates. This version is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or an Apple //e or Apple ][+ with an Apple UniDisk 3.5-inch drive (A2M2053) and a Liron or other compatible drive controller card. Other 3.5-inch drives, such as the AppleDisk 3.5 (A2M0106) or Apple SuperDrive (G7287), will not work due to incompatibilities created by the copy protection.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296307">
Expand All @@ -16957,7 +16957,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card. -->
<!--"Where in Europe is Carmen Sandiego?" is a 1988 educational game developed by Ken Bull, Gene Portwood, Lauren Elliott, Leila Bronstein, Don Albrecht, Katherine Bird, Susan Meyers, and Louis Ewens, and distributed by Broderbund Software. This version is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296763">
Expand All @@ -16974,7 +16974,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card. -->
<!--"The Playroom" is a 1989 educational game developed by Leslie Grimm, Dennis Caswell, Lynn Kirkpatrick, D. Buttlaire, and D. Albrecht, and distributed by Broderbund Software. This is version 1.0. This version is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296725">
Expand All @@ -16991,7 +16991,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card. -->
<!--"SuperPrint!" is a 1987 graphics program developed by Joel Fried, Susan Swanson, Ken Grey, Lester Humphreys, Kim Looney, and David Shearer, and distributed by Pelican Software. This is version 1.4. This version is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296709">
Expand All @@ -17008,7 +17008,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card. -->
<!--"Rampage" is a 1988 action game ported to the Apple II by Ken Hurley, J. David Koch, Kelly Flock, Steve Imes, and Alex Edelstein, and distributed by Activision. This version is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1312568">
Expand Down Expand Up @@ -17201,7 +17201,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or 128K Apple //e with a compatible drive controller card. -->
<!--"Bank Street Writer Plus" is a 1989 productivity program developed by Gordon Riggs and distributed by Broderbund Software. This version is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or 128K Apple //e with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296168">
Expand Down Expand Up @@ -17234,7 +17234,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or an Apple //e or 64K Apple ][+ and a compatible drive controller card. -->
<!--"Grammar Gremlins" is a 1987 educational program developed by Santa Barbara Softworks and distributed by Davidson and Associates. This version is dated 05.01.87. It is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or an Apple //e or 64K Apple ][+ and a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296190">
Expand All @@ -17251,7 +17251,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card. -->
<!--"Beagle Write" is a 1989 productivity program developed by Kevin Harvey, Alex Perelberg, and Mark Munz, and distributed by Beagle Bros. This is version 3.2. It is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or a 128K Apple //e with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296189">
Expand All @@ -17268,7 +17268,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or an Apple //e or 64K Apple ][+ and a compatible drive controller card. -->
<!--"Design Your Own Home: Interior Design" is a 1986 productivity program developed by Don Fudge and distributed by Abracadata. This is version 2. It is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or an Apple //e or 64K Apple ][+ and a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1328956">
Expand Down Expand Up @@ -17308,7 +17308,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, Apple //e or 64K Apple ][+ with a compatible drive controller card. -->
<!--"Arithmetic Critters" is a 1986 educational program developed and distributed by MECC. This is version 1.0. It is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, Apple //e or 64K Apple ][+ with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1345310">
Expand All @@ -17325,7 +17325,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, Apple //e or 64K Apple ][+ with a compatible drive controller card. -->
<!--"Clock Works" is a 1986 educational program developed and distributed by MECC. This is version 1.0. It is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, Apple //e or 64K Apple ][+ with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1345302">
Expand All @@ -17342,7 +17342,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires an Apple IIgs, Apple //c+, or 128K Apple //e with a compatible drive controller card. -->
<!--"Backyard Birds" is a 1989 educational program developed by Hassan Kaganda, John Persoon, Larry Phenow, Diane Portner, and James L. Thompson, and distributed by MECC. This is version 1.0. It is distributed on a single 3.5-inch (800K) disk. It requires an Apple IIgs, Apple //c+, or 128K Apple //e with a compatible drive controller card.-->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->
<!-- Image updated December 14th, 2021 to fix incorrect header information -->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1345386">
Expand Down Expand Up @@ -18389,7 +18389,7 @@ license:CC0
<sharedfeat name="compatibility" value="A2E,A2EE,A2C,A2GS"/>
<!-- It requires a Apple IIgs, //c+, 128K //e, or 128K enhanced Apple //e with a compatible drive controller card. -->
<!--"Spell It Plus!" is a 1989 educational program developed by Faye Schwartz, Cathy Johnson, Kevin Burley, and Carol Carpenter, and distributed by Davidson and Associates. It requires a Apple IIgs, //c+, 128K //e, or 128K enhanced Apple //e with a compatible drive controller card.-->

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1296218">
<rom name="spell it plus 800k.woz" size="1296218" crc="12943fe4" sha1="fc672aaaaacb195229719107eaaaf36b6feb127d" />
Expand Down
26 changes: 14 additions & 12 deletions hash/c64_cart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1837,15 +1837,16 @@ license:CC0
</software>

<software name="blueprnt">
<description>Blue-Print</description>
<description>Blueprint</description> <!-- spelt 'Blueprint' on cart and 'Blueprint', 'Blue-Print' and 'Blue - - Print' on various game screens -->
<year>1983</year>
<publisher>Commodore</publisher>
<info name="serial" value="C-64612" />
<part name="cart" interface="c64_cart">
<feature name="exrom" value="0" />
<feature name="game" value="0" />
<dataarea name="roml" size="0x4000">
<rom name="blue print (1983)(commodore).80" size="0x4000" crc="b929eb5c" sha1="0acd28c13074ab0af4e6437ae4612cecad5c3133"/>
<rom name="317022-01.u1" size="0x2000" crc="09d33a92" sha1="b836ee02f19067c7e83be8dc882da92480d031ab"/>
<rom name="317023-01.u2" size="0x2000" crc="afbef1dd" sha1="8ca791e866da70983dc521b37b33cba98882da92" offset="0x2000"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -2401,8 +2402,8 @@ license:CC0
<part name="cart" interface="c64_cart">
<feature name="exrom" value="0" />
<feature name="game" value="1" />
<dataarea name="roml" size="0x2000">
<rom name="gridrunner (1983)(hesware).80" size="0x2000" crc="12f36a09" sha1="218625325984ebdef88a5b56bc81bcff229d61db"/>
<dataarea name="roml" size="0x1000">
<rom name="hn462732p.u1" size="0x1000" crc="43b1df18" sha1="7fccb49a2557b50be7244945dd7031e411789089"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -2849,14 +2850,14 @@ license:CC0
</software>

<software name="minfats">
<description>Minnesota Fat's Pool Challenger</description>
<description>Minnesota Fat's Pool Challenger</description> <!-- spelt Minnesota Fats´ Pool Challenger on cart -->
<year>1983</year>
<publisher>HesWare</publisher>
<part name="cart" interface="c64_cart">
<feature name="exrom" value="0" />
<feature name="game" value="1" />
<dataarea name="roml" size="0x2000">
<rom name="minnesota fat's pool challenger (1983)(hesware).80" size="0x2000" crc="7f2d8a46" sha1="44f8f8ee6238829bca8ca2d412b3f238159377a4"/>
<rom name="mfpc.u1" size="0x2000" crc="7f2d8a46" sha1="44f8f8ee6238829bca8ca2d412b3f238159377a4"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -3069,7 +3070,7 @@ license:CC0
<feature name="exrom" value="0" />
<feature name="game" value="1" />
<dataarea name="roml" size="0x2000">
<rom name="omega race (1982)(commodore).80" size="0x2000" crc="b6e99657" sha1="7931433edba8e9ca1ea85b84351cea0760f7aabf"/>
<rom name="m5l2764k.u1" size="0x2000" crc="b6e99657" sha1="7931433edba8e9ca1ea85b84351cea0760f7aabf"/>
</dataarea>
</part>
</software>
Expand All @@ -3096,8 +3097,8 @@ license:CC0
<part name="cart" interface="c64_cart">
<feature name="exrom" value="0" />
<feature name="game" value="0" />
<dataarea name="roml" size="0x4000">
<rom name="paint brush (1983)(hesware).80" size="0x4000" crc="4c880095" sha1="88c0faff4617270d3d6ff0e8084b796abe94f31b"/>
<dataarea name="roml" size="0x1000">
<rom name="hn462532p.u2" size="0x1000" crc="c26dab1a" sha1="5a06123516e31c6e4ca73e621dff76edffd6285a"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -3818,7 +3819,8 @@ license:CC0
<feature name="exrom" value="0" />
<feature name="game" value="0" />
<dataarea name="roml" size="0x4000">
<rom name="story machine (1983)(spinnaker).80" size="0x4000" crc="1a6a8a2d" sha1="4800a7815d91b1703f647140e8578f8e34d0ca20"/>
<rom name="2764.u1" size="0x2000" crc="538a8ebc" sha1="8917f59cea45b3408e0c032ae7edf72266435019"/>
<rom name="2764.u2" size="0x2000" crc="f46075ae" sha1="186565c0d5d0877b5c0e91334899f2ceea7ce435" offset="0x2000"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -5156,8 +5158,8 @@ license:CC0
<part name="cart" interface="c64_cart">
<feature name="exrom" value="0" />
<feature name="game" value="1" />
<dataarea name="roml" size="0x2000">
<rom name="hes mon 64 (1983)(hesware).80" size="0x2000" crc="fdcdc0a4" sha1="1055bd169c0de0b5ff0f351eaad0a0d6a159bd31"/>
<dataarea name="roml" size="0x1000">
<rom name="hesmon.u1" size="0x1000" crc="cc0f6ab4" sha1="0014a7c9cd2343b98d3e6f2a4cfb07b77ae96ac2"/>
</dataarea>
</part>
</software>
Expand Down
Loading

0 comments on commit 96df054

Please sign in to comment.