From 3cf56535ef529e8e98f359f7d957cf618e99689f Mon Sep 17 00:00:00 2001
From: Firehawke <34792592+Firehawke@users.noreply.github.com>
Date: Sun, 8 Dec 2019 18:53:21 -0700
Subject: [PATCH] Split C64 disk softlist similarly to Apple II. (#6018)
* Split C64 disk softlist similarly to Apple II.
* Fix C64 softlist naming per proposal, split G64 images off to _orig per mnaberez information. (nw)
---
hash/c64_flop_clcracked.xml | 5 +
hash/{c64_flop.xml => c64_flop_misc.xml} | 443 +---------------------
hash/c64_flop_orig.xml | 458 +++++++++++++++++++++++
src/mame/drivers/c64.cpp | 10 +-
4 files changed, 472 insertions(+), 444 deletions(-)
create mode 100644 hash/c64_flop_clcracked.xml
rename hash/{c64_flop.xml => c64_flop_misc.xml} (64%)
create mode 100644 hash/c64_flop_orig.xml
diff --git a/hash/c64_flop_clcracked.xml b/hash/c64_flop_clcracked.xml
new file mode 100644
index 00000000000..219ad894050
--- /dev/null
+++ b/hash/c64_flop_clcracked.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/hash/c64_flop.xml b/hash/c64_flop_misc.xml
similarity index 64%
rename from hash/c64_flop.xml
rename to hash/c64_flop_misc.xml
index 84bf2c59ab3..e116cb2bf2d 100644
--- a/hash/c64_flop.xml
+++ b/hash/c64_flop_misc.xml
@@ -1,6 +1,6 @@
-
+
@@ -16,41 +16,6 @@
-
- Aztec Challenge
- 1983
- Cosmi
-
-
-
-
-
-
-
-
-
- Barbarian: The Ultimate Warrior
- 1988
- Melbourne House
-
-
-
-
-
-
-
-
- Basil: The Great Mouse Detective
- 1987
- Gremlin Graphics
-
-
-
-
-
-
-
-
Bill Budge: Pinball Construction Set
1983
@@ -63,92 +28,6 @@
-
- Bionic Commando
- 1988
- Capcom
-
-
-
-
-
-
-
-
-
- Boulder Dash
- 1984
- First Star
-
-
-
-
-
-
-
-
-
- Bounty Bob Strikes Back! (v1.2)
- 1985
- Big Five
-
-
-
-
-
-
-
-
-
-
-
-
-
- Buddy System 64 v10
- 1992
- Chris Miller
-
-
-
-
-
-
-
-
-
- Commando
- 1985
- Elite
-
-
-
-
-
-
-
-
-
- Defender of the Crown
- 1987
- Cinemaware
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
The Final ChessCard
1990
@@ -170,43 +49,6 @@
-
- Green Beret
- 1986
- Ocean
-
-
-
-
-
-
-
-
-
- Impossible Mission
- 1984
- Epyx
-
-
-
-
-
-
-
-
-
- Jack the Nipper
- 1986
- Gremlin Graphics
-
-
-
-
-
-
-
-
-
JingleDisk - Holiday Musical Story with Computer Animation
@@ -258,200 +100,10 @@
-
- Miami Vice
- 1986
- Ocean
-
-
-
-
-
-
-
-
-
-
- M.U.L.E.
- 1983
- Electronic Arts
-
-
-
-
-
-
-
-
-
- Rambo: First Blood Part II
- 1985
- Ocean
-
-
-
-
-
-
-
-
-
-
- Rambo: First Blood Part II (NTSC)
- 1985
- Thunder Mountain
-
-
-
-
-
-
-
-
-
-
- Rambo III
- 1988
- Ocean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Rambo III (NTSC)
- 1989
- Taito
-
-
-
-
-
-
-
-
-
-
- Street Hassle
- 1987
- Melbourne House
-
-
-
-
-
-
-
-
-
- Strip Poker
- 1984
- Artworx
-
-
-
-
-
-
-
-
-
- Terramex
- 1988
- Grand Slam
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Turbo Out Run
- 1989
- U.S. Gold
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Game Set and Match
- 1987
- Ocean
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BASIC-kääntäjä (Fin)
- 1984
- Amersoft
-
-
-
-
-
-
-
-
Goliath-Prommer (Ger)
19??
@@ -466,18 +118,6 @@
-
- SuperBase 64 (Fin)
- 1983
- Precision
-
-
-
-
-
-
-
-
SpeakEasy
1983
@@ -675,34 +315,6 @@
-
-
- Elektra Glide
- 1986
- Mastertronic
-
-
-
-
-
-
-
-
-
-
-
- KoalaPainter (Light Pen)
- 1984
- Koala Technologies
-
-
-
-
-
-
-
-
-
@@ -1107,46 +719,6 @@
-
- MIDI 8+
- 1984
- Passport Designs
-
-
-
-
-
-
-
-
-
-
-
- Caged Artist's FB and DX Editor/Librarian
- 198?
- Dr T
-
-
-
-
-
-
-
-
-
-
- Lexicon LXP-1 Visual Editor/Librarian
- 1988
- Leaping Lizards
-
-
-
-
-
-
-
-
-
Midi Utilities 02
198?
@@ -1173,19 +745,6 @@
-
- Super Sequencer
- 1984
- Sonus
-
-
-
-
-
-
-
-
-
Music 64
198?
diff --git a/hash/c64_flop_orig.xml b/hash/c64_flop_orig.xml
new file mode 100644
index 00000000000..f601f4cdbad
--- /dev/null
+++ b/hash/c64_flop_orig.xml
@@ -0,0 +1,458 @@
+
+
+
+
+
+
+
+ Aztec Challenge
+ 1983
+ Cosmi
+
+
+
+
+
+
+
+
+
+ Barbarian: The Ultimate Warrior
+ 1988
+ Melbourne House
+
+
+
+
+
+
+
+
+ Basil: The Great Mouse Detective
+ 1987
+ Gremlin Graphics
+
+
+
+
+
+
+
+
+
+ Bionic Commando
+ 1988
+ Capcom
+
+
+
+
+
+
+
+
+
+ Boulder Dash
+ 1984
+ First Star
+
+
+
+
+
+
+
+
+
+ Bounty Bob Strikes Back! (v1.2)
+ 1985
+ Big Five
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Buddy System 64 v10
+ 1992
+ Chris Miller
+
+
+
+
+
+
+
+
+
+ Commando
+ 1985
+ Elite
+
+
+
+
+
+
+
+
+
+ Defender of the Crown
+ 1987
+ Cinemaware
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Green Beret
+ 1986
+ Ocean
+
+
+
+
+
+
+
+
+
+ Impossible Mission
+ 1984
+ Epyx
+
+
+
+
+
+
+
+
+
+ Jack the Nipper
+ 1986
+ Gremlin Graphics
+
+
+
+
+
+
+
+
+
+
+ Miami Vice
+ 1986
+ Ocean
+
+
+
+
+
+
+
+
+
+
+ M.U.L.E.
+ 1983
+ Electronic Arts
+
+
+
+
+
+
+
+
+
+ Rambo: First Blood Part II
+ 1985
+ Ocean
+
+
+
+
+
+
+
+
+
+
+ Rambo: First Blood Part II (NTSC)
+ 1985
+ Thunder Mountain
+
+
+
+
+
+
+
+
+
+
+ Rambo III
+ 1988
+ Ocean
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rambo III (NTSC)
+ 1989
+ Taito
+
+
+
+
+
+
+
+
+
+
+ Street Hassle
+ 1987
+ Melbourne House
+
+
+
+
+
+
+
+
+
+ Strip Poker
+ 1984
+ Artworx
+
+
+
+
+
+
+
+
+
+ Terramex
+ 1988
+ Grand Slam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Turbo Out Run
+ 1989
+ U.S. Gold
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Game Set and Match
+ 1987
+ Ocean
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BASIC-kääntäjä (Fin)
+ 1984
+ Amersoft
+
+
+
+
+
+
+
+
+
+ SuperBase 64 (Fin)
+ 1983
+ Precision
+
+
+
+
+
+
+
+
+
+
+
+
+ Elektra Glide
+ 1986
+ Mastertronic
+
+
+
+
+
+
+
+
+
+
+
+ KoalaPainter (Light Pen)
+ 1984
+ Koala Technologies
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MIDI 8+
+ 1984
+ Passport Designs
+
+
+
+
+
+
+
+
+
+
+
+ Caged Artist's FB and DX Editor/Librarian
+ 198?
+ Dr T
+
+
+
+
+
+
+
+
+
+
+ Lexicon LXP-1 Visual Editor/Librarian
+ 1988
+ Leaping Lizards
+
+
+
+
+
+
+
+
+
+
+ Super Sequencer
+ 1984
+ Sonus
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index 60a969ea667..7847994757c 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -1540,7 +1540,10 @@ void c64_state::ntsc(machine_config &config)
SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10").set_filter("NTSC");
SOFTWARE_LIST(config, "cart_list_c64").set_original("c64_cart").set_filter("NTSC");
SOFTWARE_LIST(config, "cass_list").set_original("c64_cass").set_filter("NTSC");
- SOFTWARE_LIST(config, "flop_list").set_original("c64_flop").set_filter("NTSC");
+ // disk softlist split into originals, cleanly cracked, and misc (homebrew and defaced cracks)
+ SOFTWARE_LIST(config, "flop525_orig").set_original("c64_flop_orig").set_filter("NTSC");
+ SOFTWARE_LIST(config, "flop525_clean").set_compatible("c64_flop_clcracked").set_filter("NTSC");
+ SOFTWARE_LIST(config, "flop525_misc").set_compatible("c64_flop_misc").set_filter("NTSC");
// internal ram
RAM(config, RAM_TAG).set_default_size("64K");
@@ -1711,7 +1714,10 @@ void c64_state::pal(machine_config &config)
SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10").set_filter("PAL");
SOFTWARE_LIST(config, "cart_list_c64").set_original("c64_cart").set_filter("PAL");
SOFTWARE_LIST(config, "cass_list").set_original("c64_cass").set_filter("PAL");
- SOFTWARE_LIST(config, "flop_list").set_original("c64_flop").set_filter("PAL");
+ // disk softlist split into originals, cleanly cracked, and misc (homebrew and defaced cracks)
+ SOFTWARE_LIST(config, "flop525_orig").set_original("c64_flop_orig").set_filter("PAL");
+ SOFTWARE_LIST(config, "flop525_clean").set_compatible("c64_flop_clcracked").set_filter("PAL");
+ SOFTWARE_LIST(config, "flop525_misc").set_compatible("c64_flop_misc").set_filter("PAL");
// internal ram
RAM(config, RAM_TAG).set_default_size("64K");