From 99287b26e08649e7413c5dc46ec75c243e8ace37 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Fri, 16 Jun 2023 21:54:33 +0200 Subject: [PATCH] New clones marked not working ----------------------------- Black Knight (L-2) [Quench] - taito/taito_o.cpp: updated dip switches according to manual [hammy] --- src/mame/mame.lst | 1 + src/mame/pinball/s7.cpp | 16 +++++++ src/mame/taito/taito_o.cpp | 95 ++++++++++++++------------------------ 3 files changed, 51 insertions(+), 61 deletions(-) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 844ae1f604b..ad4a42d28e2 100755 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -36405,6 +36405,7 @@ scrpn_t1 // @source:pinball/s7.cpp barra_l1 // bk_f4 // +bk_l2 // bk_l3 // bk_l4 // csmic_l1 // diff --git a/src/mame/pinball/s7.cpp b/src/mame/pinball/s7.cpp index 02ea1ef558e..284232ebb05 100644 --- a/src/mame/pinball/s7.cpp +++ b/src/mame/pinball/s7.cpp @@ -788,6 +788,21 @@ ROM_START(bk_l3) ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(6d454c0e) SHA1(21640b9ed3bdbae8bf27629891f355304e467c64)) ROM_END +ROM_START(bk_l2) + ROM_REGION(0x3000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD("bk_rev2.ic26", 0x0800, 0x0800, CRC(703b61e1) SHA1(32013d72d70ed0bfca5eb10769471966c07dba09) ) + ROM_LOAD("bk_rev2.ic14", 0x1000, 0x0800, CRC(30d87653) SHA1(2b1b927dfbd7c9ddcea2732e0d4e82c236499338) ) + ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) ) + ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) ) + + ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF) + ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(c7e229bf) SHA1(3b2ab41031f507963af828639f1690dc350737af)) + ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(411bc92f) SHA1(6c8d26fd13ed5eeba5cc40886d39c65a64beb377)) + ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(fc985005) SHA1(9df4ad12cf98a5a92b8f933e6b6788a292c8776b)) + ROM_LOAD("speech4.532", 0x3000, 0x1000, CRC(f36f12e5) SHA1(24fb192ad029cd35c08f4899b76d527776a4895b)) + ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(6d454c0e) SHA1(21640b9ed3bdbae8bf27629891f355304e467c64)) +ROM_END + /*----------------------------------- / Cosmic Gunfight (#502) /-----------------------------------*/ @@ -1102,6 +1117,7 @@ ROM_END GAME( 1980, bk_l4, 0, s7, bk, s7_state, empty_init, ROT0, "Williams", "Black Knight (L-4)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) GAME( 1980, bk_f4, bk_l4, s7, bk, s7_state, empty_init, ROT0, "Williams", "Black Knight (L-4, French speech)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) GAME( 1980, bk_l3, bk_l4, s7, bk, s7_state, empty_init, ROT0, "Williams", "Black Knight (L-3)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) +GAME( 1980, bk_l2, bk_l4, s7, bk, s7_state, empty_init, ROT0, "Williams", "Black Knight (L-2)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) GAME( 1980, csmic_l1, 0, s7, csmic, s7_state, empty_init, ROT0, "Williams", "Cosmic Gunfight (L-1)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) GAME( 1981, jngld_l2, 0, s7, jngld, s7_state, empty_init, ROT0, "Williams", "Jungle Lord (L-2)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) GAME( 1981, jngld_l1, jngld_l2, s7, jngld, s7_state, empty_init, ROT0, "Williams", "Jungle Lord (L-1)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/taito_o.cpp b/src/mame/taito/taito_o.cpp index 558c69c392f..7295449c5c8 100644 --- a/src/mame/taito/taito_o.cpp +++ b/src/mame/taito/taito_o.cpp @@ -25,7 +25,6 @@ TODO: - inputs (coins) - NVRAM - sprite priorities -- dips - interrupts (sources) - valid levels 4,5,6(hop empty?) *****************************************************************/ @@ -61,9 +60,6 @@ public: void parentj(machine_config &config); -protected: - virtual void machine_start() override; - private: // devices required_device m_maincpu; @@ -216,58 +212,39 @@ static INPUT_PORTS_START( parentj ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + // dip descriptions and defaults taken from dip sheet PORT_START("DSWA") - PORT_DIPNAME(0x0001, 0x00, "DSWA 0") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x01, DEF_STR( On ) ) - PORT_DIPNAME(0x0002, 0x00, "DSWA 1") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - PORT_DIPNAME(0x0004, 0x00, "DSWA 2") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x04, DEF_STR( On ) ) - PORT_DIPNAME(0x0008, 0x00, "DSWA 3") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - PORT_DIPNAME(0x0010, 0x00, "DSWA 4") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x010, DEF_STR( On ) ) - PORT_DIPNAME(0x0020, 0x00, "DSWA 5") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x020, DEF_STR( On ) ) - PORT_DIPNAME(0x0040, 0x00, "DSWA 6") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x040, DEF_STR( On ) ) - PORT_DIPNAME(0x0080, 0x00, "DSWA 7") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x080, DEF_STR( On ) ) - - PORT_START("DSWB") - PORT_DIPNAME(0x0001, 0x00, "Credits at start") - PORT_DIPSETTING( 0x00, "500" ) - PORT_DIPSETTING( 0x01, "0" ) - PORT_DIPNAME(0x0002, 0x00, "DSWB 1") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - PORT_DIPNAME(0x0004, 0x00, "DSWB 2") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x04, DEF_STR( On ) ) - PORT_DIPNAME(0x0008, 0x00, "DSWB 3") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - PORT_DIPNAME(0x0010, 0x00, "DSWB 4") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x010, DEF_STR( On ) ) - PORT_DIPNAME(0x0020, 0x00, "DSWB 5") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x020, DEF_STR( On ) ) - PORT_DIPNAME(0x0040, 0x00, "DSWB 6") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x040, DEF_STR( On ) ) - PORT_DIPNAME(0x0080, 0x00, "DSWB 7") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x080, DEF_STR( On ) ) + PORT_DIPNAME(0x80, 0x80, "Credit") PORT_DIPLOCATION("DSWA:1") + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) + PORT_DIPNAME(0x40, 0x00, "Player Character") PORT_DIPLOCATION("DSWA:2") + PORT_DIPSETTING( 0x40, "A" ) + PORT_DIPSETTING( 0x00, "B" ) + PORT_DIPNAME(0x20, 0x20, "Card Character") PORT_DIPLOCATION("DSWA:3") + PORT_DIPSETTING( 0x20, "A" ) + PORT_DIPSETTING( 0x00, "B" ) + PORT_DIPNAME(0x18, 0x18, "Max Bet") PORT_DIPLOCATION("DSWA:4,5") + PORT_DIPSETTING( 0x18, "50" ) + PORT_DIPSETTING( 0x10, "30" ) + PORT_DIPSETTING( 0x08, "20" ) + PORT_DIPSETTING( 0x00, "10" ) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "DSWA:6" ) // always off according to dip sheet + PORT_DIPNAME(0x02, 0x02, "Key Up / Clear") PORT_DIPLOCATION("DSWA:7") + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME(0x01, 0x00, "Credits at start") PORT_DIPLOCATION("DSWA:8") + PORT_DIPSETTING( 0x00, "500" ) + PORT_DIPSETTING( 0x01, "0" ) + PORT_START("DSWB") // not used according to the dip sheet + PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "DSWB:1" ) + PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "DSWB:2" ) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "DSWB:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "DSWB:4" ) + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "DSWB:5" ) + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "DSWB:6" ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "DSWB:7" ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "DSWB:8" ) INPUT_PORTS_END // unknown sources ... @@ -282,10 +259,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(taitoo_state::interrupt) m_maincpu->set_input_line(5, HOLD_LINE); } -void taitoo_state::machine_start() -{ -} - void taitoo_state::parentj(machine_config &config) { M68000(config, m_maincpu, 12000000); //?? MHz @@ -312,8 +285,8 @@ void taitoo_state::parentj(machine_config &config) SPEAKER(config, "mono").front_center(); ym2203_device &ymsnd(YM2203(config, "ymsnd", 2000000)); // ?? MHz - ymsnd.port_a_read_callback().set_ioport("DSWA"); - ymsnd.port_b_read_callback().set_ioport("DSWB"); + ymsnd.port_a_read_callback().set_ioport("DSWB"); + ymsnd.port_b_read_callback().set_ioport("DSWA"); ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0); } @@ -336,7 +309,7 @@ ROM_START( parentj ) ROM_LOAD( "ampal22v10a-0233.c42", 0x000, 0x2dd, CRC(0c030a81) SHA1(0f8198df2cb046683d2db9ac8e609cdff53083ed) ) ROM_END -} // Anonymous namespace +} // anonymous namespace GAME( 1989, parentj, 0, parentj, parentj, taitoo_state, empty_init, ROT0, "Taito", "Parent Jack (Japan)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )