From 23d787e3700a998b9a49bc41d7422e7056db666c Mon Sep 17 00:00:00 2001 From: Firehawke <34792592+Firehawke@users.noreply.github.com> Date: Sun, 21 Nov 2021 06:29:35 -0700 Subject: [PATCH] Apple softlist update for November 2021 (#8850) Apple II software list support adjustments: * change 'flop525' to 'flop_a2' where 3.5s also in same lists * Add apple2gs_flop_clcracked and make it default for IIgs. New working software list additions (apple2_flop_orig.xml) ---------------------------------------------------------- Wargle! [4am, Firehawke] A Question of Scruples [4am, Firehawke] J-Bird [4am, Firehawke] Star Dance [4am, Firehawke] Disk Organizer (Version 2.6) [4am, Firehawke] Super Disk Copy (Version 3.8) [4am, Firehawke] Nibbles Away ][ (Version C3) [4am, Firehawke] Essential Data Duplicator (Version 4.4) [4am, Firehawke] New working software list additions (apple2_flop_clcracked.xml) --------------------------------------------------------------- Numberball (cleanly cracked) [4am, Firehawke] PFS:File (Version A.00) (cleanly cracked) [4am, Firehawke] --- hash/apple2_flop_clcracked.xml | 30 ++++++- hash/apple2_flop_misc.xml | 2 +- hash/apple2_flop_orig.xml | 135 ++++++++++++++++++++++++++++++- hash/apple2gs_flop_clcracked.xml | 2 +- hash/apple2gs_flop_misc.xml | 2 +- hash/apple2gs_flop_orig.xml | 2 +- src/mame/drivers/apple2.cpp | 8 +- src/mame/drivers/apple2e.cpp | 12 +-- src/mame/drivers/apple2gs.cpp | 11 +-- 9 files changed, 183 insertions(+), 21 deletions(-) diff --git a/hash/apple2_flop_clcracked.xml b/hash/apple2_flop_clcracked.xml index 8720e6e7409..c310b5d9e17 100644 --- a/hash/apple2_flop_clcracked.xml +++ b/hash/apple2_flop_clcracked.xml @@ -4,7 +4,7 @@ license:CC0 --> - + + + + + + + + + + + PFS:File (Version A.00) (cleanly cracked) + 1983 + Software Publishing Corporation + + + + + + + + + + diff --git a/hash/apple2_flop_misc.xml b/hash/apple2_flop_misc.xml index cf4a5c3c168..b956d19d652 100644 --- a/hash/apple2_flop_misc.xml +++ b/hash/apple2_flop_misc.xml @@ -6,7 +6,7 @@ license:CC0 Generated by SLIST 0.2.1 --> - + 40 and 80 Track DOS diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index c4a84947f91..55dd6439e6b 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -4,7 +4,7 @@ license:CC0 --> - + Agent USA @@ -17980,4 +17980,137 @@ license:CC0 + + Wargle! + 1982 + Hayden Book Company + + + + + + + + + + + + + + A Question of Scruples + 1987 + Leisure Genius + + + + + + + + + + + + + + + + + + + J-Bird + 1983 + Orion Software + + + + + + + + + + + + + + Star Dance + 1981 + United Software of America + + + + + + + + + + + + + + Disk Organizer (Version 2.6) + 1982 + Sensible Software + + + + + + + + + + + + + + Super Disk Copy (Version 3.8) + 1981 + Sensible Software + + + + + + + + + + + + + + Nibbles Away ][ (Version C3) + 1983 + COMPUTER:applications + + + + + + + + + + + + + + Essential Data Duplicator (Version 4.4) + 1986 + Utilico Microware + + + + + + + + + + + + diff --git a/hash/apple2gs_flop_clcracked.xml b/hash/apple2gs_flop_clcracked.xml index 614c96fc3bf..d09cb1fd0ad 100644 --- a/hash/apple2gs_flop_clcracked.xml +++ b/hash/apple2gs_flop_clcracked.xml @@ -4,7 +4,7 @@ license:CC0 --> - + 4th & Inches (cleanly cracked) diff --git a/hash/apple2gs_flop_misc.xml b/hash/apple2gs_flop_misc.xml index c0a7026456b..524b89e4945 100644 --- a/hash/apple2gs_flop_misc.xml +++ b/hash/apple2gs_flop_misc.xml @@ -5,7 +5,7 @@ license:CC0 Generated by SLIST 0.1 --> - + First Letters & Words diff --git a/hash/apple2gs_flop_orig.xml b/hash/apple2gs_flop_orig.xml index 169964ef020..d58adae75ca 100644 --- a/hash/apple2gs_flop_orig.xml +++ b/hash/apple2gs_flop_orig.xml @@ -4,7 +4,7 @@ license:CC0 --> - + Rastan diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 6020af74499..f3449541fa7 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -1440,9 +1440,9 @@ void apple2_state::apple2_common(machine_config &config) A2BUS_SLOT(config, "sl7", m_a2bus, apple2_cards, nullptr); /* Set up the softlists: clean cracks priority, originals second, others last */ - SOFTWARE_LIST(config, "flop525_clean").set_original("apple2_flop_clcracked"); - SOFTWARE_LIST(config, "flop525_orig").set_compatible("apple2_flop_orig").set_filter("A2"); - SOFTWARE_LIST(config, "flop525_misc").set_compatible("apple2_flop_misc"); + SOFTWARE_LIST(config, "flop_a2_clean").set_original("apple2_flop_clcracked"); + SOFTWARE_LIST(config, "flop_a2_orig").set_compatible("apple2_flop_orig").set_filter("A2"); + SOFTWARE_LIST(config, "flop_a2_misc").set_compatible("apple2_flop_misc"); SOFTWARE_LIST(config, "cass_list").set_original("apple2_cass"); //MCFG_SOFTWARE_LIST_ADD("cass_list", "apple2_cass") @@ -1462,7 +1462,7 @@ void apple2_state::apple2(machine_config &config) void apple2_state::apple2p(machine_config &config) { apple2_common(config); - subdevice("flop525_orig")->set_filter("A2P"); // Filter list to compatible disks for this machine. + subdevice("flop_a2_orig")->set_filter("A2P"); // Filter list to compatible disks for this machine. /* internal ram */ RAM(config, RAM_TAG).set_default_size("48K").set_extra_options("16K,32K,48K").set_default_value(0x00); } diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index aa6eb6eb452..d0827ef01f1 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -4980,9 +4980,9 @@ void apple2e_state::apple2e(machine_config &config) /* softlist config for baseline A2E By default, filter lists where possible to compatible disks for A2E */ - SOFTWARE_LIST(config, "flop525_clean").set_original("apple2_flop_clcracked"); - SOFTWARE_LIST(config, "flop525_orig").set_compatible("apple2_flop_orig").set_filter("A2E"); - SOFTWARE_LIST(config, "flop525_misc").set_compatible("apple2_flop_misc"); + SOFTWARE_LIST(config, "flop_a2_clean").set_original("apple2_flop_clcracked"); + SOFTWARE_LIST(config, "flop_a2_orig").set_compatible("apple2_flop_orig").set_filter("A2E"); + SOFTWARE_LIST(config, "flop_a2_misc").set_compatible("apple2_flop_misc"); CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED); @@ -5008,7 +5008,7 @@ void apple2e_state::mprof3(machine_config &config) void apple2e_state::apple2ee(machine_config &config) { apple2e(config); - subdevice("flop525_orig")->set_filter("A2EE"); // Filter list to compatible disks for this machine. + subdevice("flop_a2_orig")->set_filter("A2EE"); // Filter list to compatible disks for this machine. M65C02(config.replace(), m_maincpu, 1021800); m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2e_map); @@ -5055,7 +5055,7 @@ void apple2e_state::apple2ep(machine_config &config) void apple2e_state::apple2c(machine_config &config) { apple2ee(config); - subdevice("flop525_orig")->set_filter("A2C"); // Filter list to compatible disks for this machine. + subdevice("flop_a2_orig")->set_filter("A2C"); // Filter list to compatible disks for this machine. M65C02(config.replace(), m_maincpu, 1021800); m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2c_map); @@ -5350,7 +5350,7 @@ void apple2e_state::cec(machine_config &config) A2BUS_DISKIING(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus); - SOFTWARE_LIST(config, "flop525_cec").set_original("cecflop"); + SOFTWARE_LIST(config, "flop_cec").set_original("cecflop"); // there is no aux slot, the "aux" side of the //e is used for additional ROM config.device_remove("aux"); diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 87602c4e688..968eff0c08f 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -5035,11 +5035,12 @@ void apple2gs_state::apple2gs(machine_config &config) applefdintf_device::add_35(config, m_floppy[2]); applefdintf_device::add_35(config, m_floppy[3]); - SOFTWARE_LIST(config, "flop35_list").set_original("apple2gs_flop_orig"); // Until we have clean cracks, use this as the default - SOFTWARE_LIST(config, "flop35_misc").set_compatible("apple2gs_flop_misc"); // Legacy software list pre-June 2021 and defaced cracks - SOFTWARE_LIST(config, "flop525_clean").set_compatible("apple2_flop_clcracked"); // No filter on clean cracks yet. - SOFTWARE_LIST(config, "flop525_orig").set_compatible("apple2_flop_orig").set_filter("A2GS"); // Filter list to compatible disks for this machine. - SOFTWARE_LIST(config, "flop525_misc").set_compatible("apple2_flop_misc"); + SOFTWARE_LIST(config, "flop_gs_clean").set_original("apple2gs_flop_clcracked"); // GS-specific cleanly cracked disks + SOFTWARE_LIST(config, "flop_gs_orig").set_compatible("apple2gs_flop_orig"); // Original disks for GS + SOFTWARE_LIST(config, "flop_gs_misc").set_compatible("apple2gs_flop_misc"); // Legacy software list pre-June 2021 and defaced cracks + SOFTWARE_LIST(config, "flop_a2_clean").set_compatible("apple2_flop_clcracked"); // Apple II series cleanly cracked + SOFTWARE_LIST(config, "flop_a2_orig").set_compatible("apple2_flop_orig").set_filter("A2GS"); // Filter list to compatible disks for this machine. + SOFTWARE_LIST(config, "flop_a2_misc").set_compatible("apple2_flop_misc"); } void apple2gs_state::apple2gsr1(machine_config &config)