Skip to content

Commit 1c0e44f

Browse files
RobbbertRobbbert
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # scripts/genie.lua # src/devices/cpu/cosmac/cosmac.cpp # src/mame/layout/elf2.lay # src/mame/netronics/elf.cpp # src/mame/netronics/elf.h
2 parents 2c56d03 + d246968 commit 1c0e44f

File tree

121 files changed

+7357
-4066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+7357
-4066
lines changed

‎docs/source/initialsetup/compilingmame.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ above in All Platforms.
353353
Emscripten Javascript and HTML
354354
------------------------------
355355

356-
First, download and install Emscripten 2.0.25 or later by following the
356+
First, download and install Emscripten 3.1.35 or later by following the
357357
instructions at the `official site <https://emscripten.org/docs/getting_started/downloads.html>`_.
358358

359359
Once Emscripten has been installed, it should be possible to compile MAME

‎hash/amiga_cd.xml

+18
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,24 @@ Editor and HD Install untested
123123
</part>
124124
</software>
125125

126+
<software name="wendetta" supported="no">
127+
<!-- "A1200/A4000 CD32" on cover art -->
128+
<!-- http://redump.org/disc/106519/ -->
129+
<description>Wendetta 2175 (Europe)</description>
130+
<year>1996</year>
131+
<publisher>Skills</publisher>
132+
<notes><![CDATA[
133+
[Lisa] Uses SPRESx for intro credits text
134+
[Lisa] heavy graphic corruptions in ship select and gameplay
135+
]]></notes>
136+
<info name="developer" value="Vortex Design" />
137+
<part name="cdrom" interface="cdrom">
138+
<diskarea name="cdrom">
139+
<disk name="wendetta_2175_(europe)" sha1="c7a4e4c9cc2acbe6b561bf2230c22529d6592e8c"/>
140+
</diskarea>
141+
</part>
142+
</software>
143+
126144
<!-- !Collections -->
127145

128146
<software name="17bitph4" supported="no">

‎hash/amiga_hardware.xml

+67-35
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,65 @@ license:CC0-1.0
1818
</part>
1919
</software>
2020

21-
<software name="a590">
22-
<!-- For Epson SCSI (P/N: 312711-01) -->
23-
<description>A590 Setup Disk 1.1 (SCSI Harddisk)</description>
21+
<!-- For use with Epson XT drives -->
22+
<software name="a590_epson">
23+
<description>A590 Setup Disk 1.1 (Epson Hard Disk)</description>
2424
<year>1989</year>
2525
<publisher>Commodore</publisher>
2626
<part name="flop1" interface="floppy_3_5">
27-
<feature name="part_id" value="A590 Setup Disk 1.1 (SCSI Harddisk)" />
2827
<dataarea name="flop" size="901120">
29-
<rom name="317734-01_a590_scsi.adf" size="901120" crc="a560a938" sha1="9c6136c6580779a948cd1c0b50cb229512af415c"/>
28+
<rom name="317734-01_a590_epson.adf" size="901120" crc="a560a938" sha1="9c6136c6580779a948cd1c0b50cb229512af415c" />
3029
</dataarea>
3130
</part>
3231
</software>
3332

34-
<software name="a590_wd" cloneof="a590">
35-
<!-- Earlier version P/N: 317734-02? -->
36-
<!-- For WD93028-X-A (P/N: 312711-03) -->
37-
<!-- Cylinders 782 (615), Heads 2 (4), Sectors/Track 27, Precomp 784, LZone 781, Bytes/Sector 512 -->
38-
<description>A590 Setup Disk 1.23 (Western Digital Harddisk)</description>
33+
<!-- For use with Western Digital XT drives -->
34+
<!-- Modified "Drive definitions" file -->
35+
<software name="a590_wd17" cloneof="a590_epson">
36+
<description>A590 Setup Disk 1.7 (Western Digital Hard Disk)</description>
37+
<year>1989</year>
38+
<publisher>Commodore</publisher>
39+
<part name="flop1" interface="floppy_3_5">
40+
<dataarea name="flop" size="901120">
41+
<rom name="317734-02_a590_wd.adf" size="901120" crc="8337cc98" sha1="fd9f80cf6f18bc97161e867bde55724193cd2802" status="baddump" />
42+
</dataarea>
43+
</part>
44+
</software>
45+
46+
<!-- For use with Western Digital XT drives -->
47+
<software name="a590_wd123" cloneof="a590_epson">
48+
<description>A590 Setup Disk 1.23 (Western Digital Hard Disk)</description>
3949
<year>1990</year>
4050
<publisher>Commodore</publisher>
4151
<part name="flop1" interface="floppy_3_5">
42-
<feature name="part_id" value="A590 Setup Disk 1.23 (Western Digital Harddisk)" />
4352
<dataarea name="flop" size="901120">
44-
<rom name="317734-03_a590_wd.adf" size="901120" crc="a88fda41" sha1="7424f8645e1903e3e4ec8bb824186868319be1f3"/>
53+
<rom name="317734-03_a590_wd.adf" size="901120" crc="a88fda41" sha1="7424f8645e1903e3e4ec8bb824186868319be1f3" />
4554
</dataarea>
4655
</part>
4756
</software>
4857

49-
<software name="a590_seagate" cloneof="a590">
50-
<description>A590 Setup Disk 1.23 (Seagate Harddisk)</description>
51-
<year>1988</year>
58+
<!-- For use with Seagate XT drives -->
59+
<software name="a590_seagate" cloneof="a590_epson">
60+
<description>A590 Setup Disk 1.23 (Seagate Hard Disk)</description>
61+
<year>1990</year>
5262
<publisher>Commodore</publisher>
5363
<part name="flop1" interface="floppy_3_5">
5464
<dataarea name="flop" size="901120">
55-
<rom name="317734-04.adf" size="901120" crc="7f1623a7" sha1="1f3e20206eb83f60745e19538de3123089c8da24"/>
65+
<rom name="317734-04_a590_seagate.adf" size="901120" crc="7f1623a7" sha1="1f3e20206eb83f60745e19538de3123089c8da24" />
66+
</dataarea>
67+
</part>
68+
</software>
69+
70+
<!-- Missing: 317734-05 A590 Setup Disk (Western Digital Hard Disk) -->
71+
72+
<!-- For use with SCSI drives -->
73+
<software name="a590_scsi">
74+
<description>A590 Setup Disk (SCSI Hard Disk)</description>
75+
<year>1991</year>
76+
<publisher>Commodore</publisher>
77+
<part name="flop1" interface="floppy_3_5">
78+
<dataarea name="flop" size="901120">
79+
<rom name="317734-06_a590_scsi.adf" size="901120" status="nodump" />
5680
</dataarea>
5781
</part>
5882
</software>
@@ -62,9 +86,8 @@ license:CC0-1.0
6286
<year>1990</year>
6387
<publisher>Commodore</publisher>
6488
<part name="flop1" interface="floppy_3_5">
65-
<feature name="part_id" value="A590 RAM Test Software" />
6689
<dataarea name="flop" size="901120">
67-
<rom name="317830-01_a590_ram_test.adf" size="901120" crc="6583d1d0" sha1="7779b825b8555956d341ff7e909ab71d89e2321c"/>
90+
<rom name="317830-01_a590_ram_test.adf" size="901120" crc="6583d1d0" sha1="7779b825b8555956d341ff7e909ab71d89e2321c" />
6891
</dataarea>
6992
</part>
7093
</software>
@@ -74,35 +97,47 @@ license:CC0-1.0
7497
<year>1988</year>
7598
<publisher>Commodore</publisher>
7699
<part name="flop1" interface="floppy_3_5">
77-
<feature name="part_id" value="A2024 JumpStart" />
78100
<dataarea name="flop" size="901120">
79-
<rom name="317809-01_a2024_jumpstart.adf" size="901120" crc="dad46588" sha1="30c2c1f1d98bd008b2c67f3b23480181935d4b01"/>
101+
<rom name="317809-01_a2024_jumpstart.adf" size="901120" crc="dad46588" sha1="30c2c1f1d98bd008b2c67f3b23480181935d4b01" />
102+
</dataarea>
103+
</part>
104+
</software>
105+
106+
<!-- Missing: 317806-01 A2091 Setup Disk (referenced in the service manual) -->
107+
<!-- Missing: 317806-02 A2091 Setup Disk (if it exists) -->
108+
109+
<!-- Modified "Drive definitions" file -->
110+
<software name="a2091_127">
111+
<description>A2091 Setup Disk 1.27</description>
112+
<year>1990</year>
113+
<publisher>Commodore</publisher>
114+
<part name="flop1" interface="floppy_3_5">
115+
<dataarea name="flop" size="901120">
116+
<rom name="317806-03_a2091_setup.adf" size="901120" crc="1ec584cf" sha1="d3de14c860d56679e645d28ef5b30d54ec95cc07" status="baddump" />
80117
</dataarea>
81118
</part>
82119
</software>
83120

84-
<software name="a2091">
85-
<!-- From service manual: Install (US): 317806-01, Install (De): 317807-01 (earlier versions?) -->
86-
<!-- Harddisk: 313440-01 SCSI Quantum -->
121+
<software name="a2091_130" cloneof="a2091_127">
87122
<description>A2091 Setup Disk 1.30</description>
88123
<year>1991</year>
89124
<publisher>Commodore</publisher>
90125
<part name="flop1" interface="floppy_3_5">
91-
<feature name="part_id" value="A2091 Setup Disk 1.30" />
92126
<dataarea name="flop" size="901120">
93-
<rom name="317806-04_a2091_setup.adf" size="901120" crc="122c8f93" sha1="603e106c1a44a209171610af8d48bc35ad31c9bc"/>
127+
<rom name="317806-04_a2091_setup.adf" size="901120" crc="122c8f93" sha1="603e106c1a44a209171610af8d48bc35ad31c9bc" />
94128
</dataarea>
95129
</part>
96130
</software>
97131

132+
<!-- Missing: 317807-01 A2091 Setup Disk (De) (referenced in the service manual) -->
133+
98134
<software name="a2058">
99135
<description>A2058 RAM Test Disk</description>
100136
<year>1988</year>
101137
<publisher>Commodore</publisher>
102138
<part name="flop1" interface="floppy_3_5">
103-
<feature name="part_id" value="A2058 RAM Test Disk" />
104139
<dataarea name="flop" size="901120">
105-
<rom name="317719-01_a2058_ram_test.adf" size="901120" crc="5dba7fc3" sha1="76fbce4bef7df0f6042c85376d9bdfd4d4911e74"/>
140+
<rom name="317719-01_a2058_ram_test.adf" size="901120" crc="5dba7fc3" sha1="76fbce4bef7df0f6042c85376d9bdfd4d4911e74" />
106141
</dataarea>
107142
</part>
108143
</software>
@@ -112,9 +147,8 @@ license:CC0-1.0
112147
<year>1990</year>
113148
<publisher>Commodore</publisher>
114149
<part name="flop1" interface="floppy_3_5">
115-
<feature name="part_id" value="A2232 Install" />
116150
<dataarea name="flop" size="901120">
117-
<rom name="317769-01_a2232_install.adf" size="901120" crc="3caa21b7" sha1="24f47f6f88712f046303b8812a598043440a5e6d"/>
151+
<rom name="317769-01_a2232_install.adf" size="901120" crc="3caa21b7" sha1="24f47f6f88712f046303b8812a598043440a5e6d" />
118152
</dataarea>
119153
</part>
120154
</software>
@@ -124,9 +158,8 @@ license:CC0-1.0
124158
<year>1990</year>
125159
<publisher>Commodore</publisher>
126160
<part name="flop1" interface="floppy_3_5">
127-
<feature name="part_id" value="A2300 Genlock Demo" />
128161
<dataarea name="flop" size="901120">
129-
<rom name="317718-02_a2300_genlock_demo.adf" size="901120" crc="464ff0f6" sha1="26b94e8d52d35e2746b74610bb9b65eb2f899297"/>
162+
<rom name="317718-02_a2300_genlock_demo.adf" size="901120" crc="464ff0f6" sha1="26b94e8d52d35e2746b74610bb9b65eb2f899297" />
130163
</dataarea>
131164
</part>
132165
</software>
@@ -136,9 +169,8 @@ license:CC0-1.0
136169
<year>1990</year>
137170
<publisher>Commodore</publisher>
138171
<part name="flop1" interface="floppy_3_5">
139-
<feature name="part_id" value="A2232 Test / Demo" />
140172
<dataarea name="flop" size="901120">
141-
<rom name="317210-01_a2320_test_demo.adf" size="901120" crc="cff98aae" sha1="f46f7de0d908ed68abfd784d84b964cbce7dc503"/>
173+
<rom name="317210-01_a2320_test_demo.adf" size="901120" crc="cff98aae" sha1="f46f7de0d908ed68abfd784d84b964cbce7dc503" />
142174
</dataarea>
143175
</part>
144176
</software>
@@ -150,7 +182,7 @@ license:CC0-1.0
150182
<info name="usage" value="Requires FrameMaster Zorro card and FPU" />
151183
<part name="flop1" interface="floppy_3_5">
152184
<dataarea name="flop" size="901120">
153-
<rom name="rainbow2_diashow.adf" size="901120" crc="201b34eb" sha1="7d8d4e4b58f438d25b32f78106c944f7d264de17"/>
185+
<rom name="rainbow2_diashow.adf" size="901120" crc="201b34eb" sha1="7d8d4e4b58f438d25b32f78106c944f7d264de17" />
154186
</dataarea>
155187
</part>
156188
</software>
@@ -162,7 +194,7 @@ license:CC0-1.0
162194
<info name="usage" value="Requires FrameMaster Zorro card and FPU" />
163195
<part name="flop1" interface="floppy_3_5">
164196
<dataarea name="flop" size="901120">
165-
<rom name="rainbowpainter.adf" size="901120" crc="bda4991f" sha1="4b8d73487fcc92a2f8d21bf24c42ad373c28bc5f"/>
197+
<rom name="rainbowpainter.adf" size="901120" crc="bda4991f" sha1="4b8d73487fcc92a2f8d21bf24c42ad373c28bc5f" />
166198
</dataarea>
167199
</part>
168200
</software>

‎hash/amigaocs_flop.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17160,7 +17160,7 @@ ATK test: OK
1716017160
<year>1994</year>
1716117161
<publisher>Empire Software</publisher>
1716217162
<notes><![CDATA[
17163-
Soccer field background GFX has serious glitches during gameplay, wrong [Blitter] copies
17163+
Soccer field background GFX has serious glitches during gameplay, wrong [Blitter] copies (can't repro, assume fixed)
1716417164
ATK test: OK
1716517165
]]></notes>
1716617166
<info name="usage" value="Sports score card copy-protection at first half time"/>

‎hash/cd32.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license:CC0-1.0
66
<softwarelist name="cd32" description="Commodore Amiga CD32 CD-ROMs">
77

88
<!--
9-
UNDUMPED:
9+
UNDUMPED (possibly outdated, cfr. amigacd.xml):
1010
1111
1001 Girl
1212
Acid Attack Compilation (Guardian, Roadkill, Super Skidmarks)

‎hash/megacd.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4275,7 +4275,7 @@ Requires [disc swap]
42754275
</part>
42764276
</software>
42774277

4278-
<software name="eternalcu">
4278+
<software name="eternalcu" cloneof="eternalc">
42794279
<!-- http://redump.org/disc/2263/
42804280
<rom name="Eternal Champions - Challenge from the Dark Side (USA).cue" size="2813" crc="c12d13d7" />
42814281
<rom name="Eternal Champions - Challenge from the Dark Side (USA) (Track 01).bin" size="155641248" crc="5fd53235" />

‎hash/pc8801_flop.xml

+69-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ Are the following undumped or mistranslated (check also if available in TOSEC)?
5252
- 超番外制服図鑑+ (198905xx) by System House Oh!
5353
- 少女探偵RINNちゃんの事件簿 電脳少女伝説 (19890520) by Agumix
5454
- 小野由美のジャンピングクエスト (198904xx) by Uchuu Kikaku
55-
- ハイバーニア (198904xx) by Heart Denshi
5655
- エントフューラー 妖精誘拐事件 (198904xx) by Zenryutsu & グローサー
5756
- バージン倶楽部 Vol.1 (198903xx) by Pasoket [maybe in jam/jam1??]
5857
- 牧本千幸のメランコリー (198902xx) by Uchuu Kikaku
@@ -145,7 +144,6 @@ Are the following undumped or mistranslated (check also if available in TOSEC)?
145144
- ナナちゃんのスター誕生 (198510xx) by NSI
146145
- バルーンファイト (198510xx) by Hudson
147146
- パズルパニック (198510xx) by SystemSoft
148-
- レッドスタック (198508xx) by Cosmos Computer
149147
- スタコラさっちゃん (198508xx) by CTA
150148
- ゴーゴートレイン (198508xx) by Colpax
151149
- クリティカル・マス (198508xx) by Starcraft
@@ -15801,6 +15799,58 @@ Should be supported by [PC8001mkIISR] too
1580115799
</part>
1580215800
</software>
1580315801

15802+
<software name="hibernia">
15803+
<description>Hibernia</description>
15804+
<year>1989</year>
15805+
<publisher>ハート電子 (Heart Denshi)</publisher>
15806+
<notes><![CDATA[
15807+
Converted to .mfm from original .hfe
15808+
]]></notes>
15809+
<!-- PC8801mk2SR -->
15810+
<info name="release" value="198904xx"/>
15811+
<info name="alt_title" value="ハイバーニア"/>
15812+
15813+
<part name="flop1" interface="floppy_5_25">
15814+
<feature name="part_id" value="Disk A" />
15815+
<dataarea name="flop" size="1085330">
15816+
<rom name="hibernia_disk_a.mfm" size="1085330" crc="067c70b3" sha1="cc52b8199e1df3962f7a86327d266f1fc58397fa"/>
15817+
</dataarea>
15818+
</part>
15819+
15820+
<part name="flop2" interface="floppy_5_25">
15821+
<feature name="part_id" value="Disk B" />
15822+
<dataarea name="flop" size="1101276">
15823+
<rom name="hibernia_disk_b.mfm" size="1101276" crc="1d123a2f" sha1="7485c0bef3c5d9713a25679543b75c7a7019a025"/>
15824+
</dataarea>
15825+
</part>
15826+
</software>
15827+
15828+
<software name="hiberniaa" cloneof="hibernia" supported="no">
15829+
<description>Hibernia (alt .d88 format)</description>
15830+
<year>1989</year>
15831+
<publisher>ハート電子 (Heart Denshi)</publisher>
15832+
<notes><![CDATA[
15833+
[Incorrect layout on track 0 head 1, expected_size=100000, current_size=134400]
15834+
]]></notes>
15835+
<!-- PC8801mk2SR -->
15836+
<info name="release" value="198904xx"/>
15837+
<info name="alt_title" value="ハイバーニア"/>
15838+
15839+
<part name="flop1" interface="floppy_5_25">
15840+
<feature name="part_id" value="Disk A" />
15841+
<dataarea name="flop" size="622624">
15842+
<rom name="hibernia (disk a).d88" size="622624" crc="1289b16d" sha1="e2d5c02523964e2942222aef01c87aed90d26784"/>
15843+
</dataarea>
15844+
</part>
15845+
15846+
<part name="flop2" interface="floppy_5_25">
15847+
<feature name="part_id" value="Disk B" />
15848+
<dataarea name="flop" size="641904">
15849+
<rom name="hibernia (disk b).d88" size="641904" crc="1c51e693" sha1="4aad9aee161e1f4bdbdab546cf3e184ce6663595"/>
15850+
</dataarea>
15851+
</part>
15852+
</software>
15853+
1580415854
<software name="hideger">
1580515855
<description>Hideger</description>
1580615856
<year>1988</year>
@@ -28339,6 +28389,23 @@ ExtractDisk [07]"DiskD " -> "psy-o-blade_07.d88"
2833928389
</part>
2834028390
</software>
2834128391

28392+
<software name="redstack" supported="no">
28393+
<description>Red Stack</description>
28394+
<year>1985</year>
28395+
<publisher>コスモスコンピュータ (Cosmos Computer)</publisher>
28396+
<notes><![CDATA[
28397+
Gameplay is too fast, needs [V1S]
28398+
]]></notes>
28399+
<!-- PC8801 -->
28400+
<info name="release" value="198508xx"/>
28401+
<info name="alt_title" value="レッドスタック"/>
28402+
<part name="flop1" interface="floppy_5_25">
28403+
<dataarea name="flop" size="185008">
28404+
<rom name="red stack.d88" size="185008" crc="c02cada5" sha1="ca5e7bf04b9d815792b200ad92e4fd10ea97a79a" status="baddump"/>
28405+
</dataarea>
28406+
</part>
28407+
</software>
28408+
2834228409
<software name="redwing">
2834328410
<description>Red Wing</description>
2834428411
<year>1987</year>

0 commit comments

Comments
 (0)