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: 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.xml | 1305 ------------------------------------------- hash/c64_flop_clcracked.xml | 5 + hash/c64_flop_misc.xml | 864 ++++++++++++++++++++++++++++ hash/c64_flop_orig.xml | 458 +++++++++++++++ src/mame/drivers/c64.cpp | 10 +- 5 files changed, 1335 insertions(+), 1307 deletions(-) delete mode 100644 hash/c64_flop.xml create mode 100644 hash/c64_flop_clcracked.xml create mode 100644 hash/c64_flop_misc.xml create mode 100644 hash/c64_flop_orig.xml diff --git a/hash/c64_flop.xml b/hash/c64_flop.xml deleted file mode 100644 index 84bf2c59ab3..00000000000 --- a/hash/c64_flop.xml +++ /dev/null @@ -1,1305 +0,0 @@ - - - - - - - - Little Knight Arthur - 1986 - Pasi Hytönen - - - - - - - - - - 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 - Electronic Arts - - - - - - - - - - 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 - Tasc - - - - - - - - - - - - - - - - - - - Green Beret - 1986 - Ocean - - - - - - - - - - Impossible Mission - 1984 - Epyx - - - - - - - - - - Jack the Nipper - 1986 - Gremlin Graphics - - - - - - - - - - - - JingleDisk - Holiday Musical Story with Computer Animation - 1985 - Thoughtware - - - - - - - - - - - - Metal Dust - 2012 - Protovision - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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?? - Rex-Datentechnik - - - - - - - - - - - - SuperBase 64 (Fin) - 1983 - Precision - - - - - - - - - - SpeakEasy - 1983 - Personal Peripheral Products - - - - - - - - - - - - - KÄTS-opetuslevy 1 (Fin) - 1989 - Koulun erityispalvelu - - - - - - - - - - - KÄTS-opetuslevy 2 (Fin) - 1989 - Koulun erityispalvelu - - - - - - - - - - - Kertolasku (Fin) - 1986 - Koulun erityispalvelu - - - - - - - - - - - LRS-harjoitus (Fin) - 1988 - Koulun erityispalvelu - - - - - - - - - - - Opin kirjoittamaan (Fin) - 1985 - Koulun erityispalvelu - - - - - - - - - - - Opin lukemaan 1 (Fin) - 1985 - Koulun erityispalvelu - - - - - - - - - - - Opin lukemaan 2 (Fin) - 1985 - Koulun erityispalvelu - - - - - - - - - - - PS-English (Fin) - 1986 - Koulun erityispalvelu - - - - - - - - - - - PS-Memory (Fin) - 1989 - Koulun erityispalvelu - - - - - - - - - - - Puhuva venttipeli (Fin) - 1986 - Koulun erityispalvelu - - - - - - - - - - - Vähennyslasku (Fin) - 1986 - Koulun erityispalvelu - - - - - - - - - - - Valmiusharjoituksia 1 (Fin) - 198? - Koulun erityispalvelu - - - - - - - - - - - Yhteenlasku (Fin) - 198? - Koulun erityispalvelu - - - - - - - - - - - Get Ready for Number with BJ Bear - 1984 - Commodore - - - - - - - - - - - - Elektra Glide - 1986 - Mastertronic - - - - - - - - - - - - KoalaPainter (Light Pen) - 1984 - Koala Technologies - - - - - - - - - - - - - Commodore 1541 Floppy Disk Drive Test/Demo Disk - 198? - Commodore - - - - - - - - - - - Commodore VIC-1541 Test/Demo - 198? - Commodore - - - - - - - - - - Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt) - 1984 - Commodore - - - - - - - - - - Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt 2) - 1985 - Commodore - - - - - - - - - - Commodore Model 1541 Test/Demo-Diskette - 198? - Commodore - - - - - - - - - - Commodore 1764 RAM Expansion Utility Disk - 1987 - Commodore - - - - - - - - - - - - - - - - - - Commodore 1351 Mouse Utility Disk - 1986 - Commodore - - - - - - - - - - - - - - - - - - SFX Sound Expander Test/Demo Disk - 1985 - Commodore - - - - - - - - - - - - SFX Sound Expander (MIDI) - 1987 - Music Sales - - - - - - - - - - - Commodore Modem 300 Test/Demo Diskette - 198? - Commodore - - - - - - - - - - - - - - - - Commodore Modem 1200 Test/Demo Diskette - 198? - Commodore - - - - - - - - - - - - - - - - C-64 Demodiskette - 198? - Commodore - - - - - - - - - - - Commodore C-64 Disk Bonus Pack - 198? - Commodore - - - - - - - - - - Commodore SX-64 Test/Demo Disk - 198? - Commodore - - - - - - - - - - Magic Voice Demo Disk - 198? - Commodore - - - - - - - - - - - Tools for the Commodore 1520 Plotter - 198? - Commodore - - - - - - - - - - - - - - - - - - - - - - CMD SwiftLink - 1990 - CMD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CMD Turbo232 - 1997 - CMD - - - - - - - - - - - - Contiki Desktop OS 1.0 - 2003 - Contiki Project - - - - - - - - - - - Commodore 64 CP/M Cartridge Boot Disk - 1982 - Commodore - - - - - - - - - - - Commodore 64 CP/M Cartridge Boot Disk (Alt) - 1982 - Commodore - - - - - - - - - - - Commodore 64 CP/M Cartridge Boot Disk (Alt 2) - 1982 - Commodore - - - - - - - - - - - - GeckOS/A65 (v2.0) - 1999 - André Fachat - - - - - - - - - - - LUnix Next Generation (v0.21) - 2004 - LNG-Project - - - - - - - - - - - LUnix Next Generation (v0.21, REU) - 2004 - LNG-Project - - - - - - - - - - - - - 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? - The Music Software Exchange - - - - - - - - - - - Oberheim Matrix 6/6R Patches - 198? - Oberheim - - - - - - - - - - - Super Sequencer - 1984 - Sonus - - - - - - - - - - - Music 64 - 198? - Novel International - - - - - - - - - - - - CMK 49 Computer Musical Keyboard - 198? - Siel - - - - - - - - - - - - - - C64 Emulator Test Suite (v2.15) - 1997 - Wolfgang Lorenz - - - - - - - - - - - - - - - - - - - - - - - - - - Versatile Commodore Emulator testprogs - 2014 - VICE Team - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Second Reality - 1997 - Smash Designs & The Obsessed Maniacs - - - - - - - - - - - - - - - - - - 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_misc.xml b/hash/c64_flop_misc.xml new file mode 100644 index 00000000000..e116cb2bf2d --- /dev/null +++ b/hash/c64_flop_misc.xml @@ -0,0 +1,864 @@ + + + + + + + + Little Knight Arthur + 1986 + Pasi Hytönen + + + + + + + + + + Bill Budge: Pinball Construction Set + 1983 + Electronic Arts + + + + + + + + + + The Final ChessCard + 1990 + Tasc + + + + + + + + + + + + + + + + + + + + JingleDisk - Holiday Musical Story with Computer Animation + 1985 + Thoughtware + + + + + + + + + + + + Metal Dust + 2012 + Protovision + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Goliath-Prommer (Ger) + 19?? + Rex-Datentechnik + + + + + + + + + + + + SpeakEasy + 1983 + Personal Peripheral Products + + + + + + + + + + + + + KÄTS-opetuslevy 1 (Fin) + 1989 + Koulun erityispalvelu + + + + + + + + + + + KÄTS-opetuslevy 2 (Fin) + 1989 + Koulun erityispalvelu + + + + + + + + + + + Kertolasku (Fin) + 1986 + Koulun erityispalvelu + + + + + + + + + + + LRS-harjoitus (Fin) + 1988 + Koulun erityispalvelu + + + + + + + + + + + Opin kirjoittamaan (Fin) + 1985 + Koulun erityispalvelu + + + + + + + + + + + Opin lukemaan 1 (Fin) + 1985 + Koulun erityispalvelu + + + + + + + + + + + Opin lukemaan 2 (Fin) + 1985 + Koulun erityispalvelu + + + + + + + + + + + PS-English (Fin) + 1986 + Koulun erityispalvelu + + + + + + + + + + + PS-Memory (Fin) + 1989 + Koulun erityispalvelu + + + + + + + + + + + Puhuva venttipeli (Fin) + 1986 + Koulun erityispalvelu + + + + + + + + + + + Vähennyslasku (Fin) + 1986 + Koulun erityispalvelu + + + + + + + + + + + Valmiusharjoituksia 1 (Fin) + 198? + Koulun erityispalvelu + + + + + + + + + + + Yhteenlasku (Fin) + 198? + Koulun erityispalvelu + + + + + + + + + + + Get Ready for Number with BJ Bear + 1984 + Commodore + + + + + + + + + + + + + Commodore 1541 Floppy Disk Drive Test/Demo Disk + 198? + Commodore + + + + + + + + + + + Commodore VIC-1541 Test/Demo + 198? + Commodore + + + + + + + + + + Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt) + 1984 + Commodore + + + + + + + + + + Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt 2) + 1985 + Commodore + + + + + + + + + + Commodore Model 1541 Test/Demo-Diskette + 198? + Commodore + + + + + + + + + + Commodore 1764 RAM Expansion Utility Disk + 1987 + Commodore + + + + + + + + + + + + + + + + + + Commodore 1351 Mouse Utility Disk + 1986 + Commodore + + + + + + + + + + + + + + + + + + SFX Sound Expander Test/Demo Disk + 1985 + Commodore + + + + + + + + + + + + SFX Sound Expander (MIDI) + 1987 + Music Sales + + + + + + + + + + + Commodore Modem 300 Test/Demo Diskette + 198? + Commodore + + + + + + + + + + + + + + + + Commodore Modem 1200 Test/Demo Diskette + 198? + Commodore + + + + + + + + + + + + + + + + C-64 Demodiskette + 198? + Commodore + + + + + + + + + + + Commodore C-64 Disk Bonus Pack + 198? + Commodore + + + + + + + + + + Commodore SX-64 Test/Demo Disk + 198? + Commodore + + + + + + + + + + Magic Voice Demo Disk + 198? + Commodore + + + + + + + + + + + Tools for the Commodore 1520 Plotter + 198? + Commodore + + + + + + + + + + + + + + + + + + + + + + CMD SwiftLink + 1990 + CMD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CMD Turbo232 + 1997 + CMD + + + + + + + + + + + + Contiki Desktop OS 1.0 + 2003 + Contiki Project + + + + + + + + + + + Commodore 64 CP/M Cartridge Boot Disk + 1982 + Commodore + + + + + + + + + + + Commodore 64 CP/M Cartridge Boot Disk (Alt) + 1982 + Commodore + + + + + + + + + + + Commodore 64 CP/M Cartridge Boot Disk (Alt 2) + 1982 + Commodore + + + + + + + + + + + + GeckOS/A65 (v2.0) + 1999 + André Fachat + + + + + + + + + + + LUnix Next Generation (v0.21) + 2004 + LNG-Project + + + + + + + + + + + LUnix Next Generation (v0.21, REU) + 2004 + LNG-Project + + + + + + + + + + + + + Midi Utilities 02 + 198? + The Music Software Exchange + + + + + + + + + + + Oberheim Matrix 6/6R Patches + 198? + Oberheim + + + + + + + + + + + Music 64 + 198? + Novel International + + + + + + + + + + + + CMK 49 Computer Musical Keyboard + 198? + Siel + + + + + + + + + + + + + + C64 Emulator Test Suite (v2.15) + 1997 + Wolfgang Lorenz + + + + + + + + + + + + + + + + + + + + + + + + + + Versatile Commodore Emulator testprogs + 2014 + VICE Team + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Second Reality + 1997 + Smash Designs & The Obsessed Maniacs + + + + + + + + + + + + + + + + + + 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"); -- cgit v1.2.3