From 87f9f63589bd2f2be3d2cfd68e853e196f507c1d Mon Sep 17 00:00:00 2001 From: briantro Date: Fri, 8 Jul 2016 13:13:47 -0500 Subject: [PATCH] new game added: Player's Choice by merit.cpp New Game Added --------------------------------------------- Player's Choice (M4C1) [Blair Quinney, The Dumping Union] --- src/mame/drivers/merit.cpp | 70 +++++++++++++++++++++++++++++++++----- src/mame/mame.lst | 1 + 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index 1c412342ab9..7db3a2c5ee2 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -840,7 +840,7 @@ static INPUT_PORTS_START( mroundup ) // todo: Find were Player 2 "Play" is mappe PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) /* AKA Diagnostics - Seems to reset the game */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_COCKTAIL PORT_CODE(KEYCODE_E) PORT_NAME("P2 Cancel") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_DIPNAME( 0xc0, 0xc0, "Percentage Out" ) + PORT_DIPNAME( 0xc0, 0xc0, "Percentage Out" ) PORT_DIPLOCATION("Special:1,2") /* Pins #52 & #51?? Listed as "Switch Common Ground" */ PORT_DIPSETTING( 0x80, "80%" ) PORT_DIPSETTING( 0x00, "85%" ) /* Duplicate */ PORT_DIPSETTING( 0xc0, "85%" ) @@ -915,6 +915,42 @@ static INPUT_PORTS_START( pitbossb ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END +static INPUT_PORTS_START( mpchoice ) /* pitbossc games but dips like The Round Up */ + PORT_INCLUDE( pitboss ) + + PORT_MODIFY("IN1") /* Pins #57 through #51 of J3 in decending order */ + PORT_DIPNAME( 0xc0, 0xc0, "Percentage Out" ) PORT_DIPLOCATION("Special:1,2") /* Pins #52 & #51?? Listed as "Switch Common Ground" */ + PORT_DIPSETTING( 0x80, "80%" ) + PORT_DIPSETTING( 0x00, "85%" ) /* Duplicate */ + PORT_DIPSETTING( 0xc0, "85%" ) + PORT_DIPSETTING( 0x40, "90%" ) + + PORT_MODIFY("DSW") + PORT_DIPNAME( 0x01, 0x01, "Enable Draw Poker" ) PORT_DIPLOCATION("SW:1") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x01, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, "Enable Acey Deucey" ) PORT_DIPLOCATION("SW:2") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x02, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, "Enable Black Jack" ) PORT_DIPLOCATION("SW:3") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x04, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, "The Dice Game" ) PORT_DIPLOCATION("SW:4") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW:5") + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW:6") + PORT_DIPSETTING( 0x20, "Counter Top" ) + PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) + PORT_DIPNAME( 0xc0, 0x00, "Maximum Bet" ) PORT_DIPLOCATION("SW:7,8") + PORT_DIPSETTING( 0x40, "1" ) + PORT_DIPSETTING( 0xc0, "10" ) + PORT_DIPSETTING( 0x80, "20" ) + PORT_DIPSETTING( 0x00, "50" ) +INPUT_PORTS_END + static INPUT_PORTS_START( casino5 ) PORT_START("IN0") /* Pins #65 through #58 of J3 in decending order */ @@ -1489,9 +1525,9 @@ ROM_END ROM_START( pitbossc ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "m4a1.u5", 0x0000, 0x2000, CRC(f5284472) SHA1(9170b90d06caa382be29feb2f6e80993bba1e07e) ) /* Internal designation: M4A1REV0 */ - ROM_LOAD( "m4a1.u6", 0x2000, 0x2000, CRC(dd8df5fe) SHA1(dab8c1077058263729b2589dd9bf9989ad53be1c) ) /* Games included in this set are: */ - ROM_LOAD( "m4a1.u7", 0x4000, 0x2000, CRC(5fa5d436) SHA1(9f3fd81eae7f378268f3b4af8fd299ffb97d7fb6) ) /* Draw Poker, Blackjack, Acey Deucey & The Dice Game */ + ROM_LOAD( "m4a1_u5.u5", 0x0000, 0x2000, CRC(f5284472) SHA1(9170b90d06caa382be29feb2f6e80993bba1e07e) ) /* Internal designation: M4A1REV0 */ + ROM_LOAD( "m4a1_u6.u6", 0x2000, 0x2000, CRC(dd8df5fe) SHA1(dab8c1077058263729b2589dd9bf9989ad53be1c) ) /* Games included in this set are: */ + ROM_LOAD( "m4a1_u7.u7", 0x4000, 0x2000, CRC(5fa5d436) SHA1(9f3fd81eae7f378268f3b4af8fd299ffb97d7fb6) ) /* Draw Poker, Blackjack, Acey Deucey & The Dice Game */ ROM_REGION( 0x6000, "gfx1", 0 ) ROM_LOAD( "chr2.u39", 0x0000, 0x2000, CRC(f9613e7b) SHA1(1e8cafe142a235d65b43c7e46a79ed4f6272b61c) ) /* Shows: */ @@ -1502,6 +1538,21 @@ ROM_START( pitbossc ) ROM_LOAD( "chr2.u40", 0x0000, 0x2000, CRC(40c94dce) SHA1(86611e3a1048b2a3fffcc0110811656a2d0fc4a5) ) ROM_END +ROM_START( mpchoice ) /* Same games as pitbossc but different dips & can control the payout percentage (like The Round Up below) */ + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "m4c1_u5.u5", 0x0000, 0x2000, CRC(ceb56251) SHA1(2ce7efccbd158ef59928e5501de9617761a93567) ) /* Internal designation: M4C1V0 */ + ROM_LOAD( "m4c1_u6.u6", 0x2000, 0x2000, CRC(b8fe2ec4) SHA1(3846c2d7a1e5c87badc41277395076df13cb6343) ) /* Games included in this set are: */ + ROM_LOAD( "m4c1_u7.u7", 0x4000, 0x2000, CRC(f2b6aff8) SHA1(c5c1a4ba808d9830604bc2399e66b60c56bd6f05) ) /* Draw Poker, Blackjack, Acey Deucey & The Dice Game */ + + ROM_REGION( 0x6000, "gfx1", 0 ) + ROM_LOAD( "chr2.u39", 0x0000, 0x2000, CRC(f9613e7b) SHA1(1e8cafe142a235d65b43c7e46a79ed4f6272b61c) ) /* Shows: */ + ROM_LOAD( "chr2.u38", 0x2000, 0x2000, CRC(7af28902) SHA1(04f685389958d581aaf2c86940d1b8b8cec05d7a) ) /* (c) 1983 Merit industries Philadelphia PA. */ + ROM_LOAD( "chr2.u37", 0x4000, 0x2000, CRC(ea6f0c59) SHA1(f2c0ff99518c2cec3eb1b4042fa3754a702c0e34) ) /* All Rights Reserverd */ + + ROM_REGION( 0x2000, "gfx2", 0 ) + ROM_LOAD( "chr2.u40", 0x0000, 0x2000, CRC(40c94dce) SHA1(86611e3a1048b2a3fffcc0110811656a2d0fc4a5) ) +ROM_END + ROM_START( casino5 ) /* Standard version, the rom set with 3315-02 U5-1 is the "Minnesota" version and is undumped */ ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "3315-02_u5-0.u5", 0x0000, 0x2000, CRC(abe240d8) SHA1(296eb3251dd51147d6984a8c08c3be22e5ed8e86) ) /* Program roms on a CTR-202A daughter card */ @@ -2322,11 +2373,12 @@ DRIVER_INIT_MEMBER(merit_state,dtrvwz5) /* Gambling type games */ -GAME( 1983, pitboss, 0, casino5, pitboss, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-04)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1983, pitbossa, pitboss, pitboss, pitbossa, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-0C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1983, pitbossa1,pitboss, pitboss, pitbossa1,driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-1C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1983, pitbossb, pitboss, pitboss, pitbossa, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-02?)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1983, pitbossc, pitboss, pitboss, pitbossb, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-?)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1983, pitboss, 0, casino5, pitboss, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-04)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1983, pitbossa, pitboss, pitboss, pitbossa, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-0C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1983, pitbossa1,pitboss, pitboss, pitbossa1,driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-1C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1983, pitbossb, pitboss, pitboss, pitbossa, driver_device, 0, ROT0, "Merit", "The Pit Boss (PSB1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1983, pitbossc, pitboss, pitboss, pitbossb, driver_device, 0, ROT0, "Merit", "The Pit Boss (M4A1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1983, mpchoice, 0, pitboss, mpchoice, driver_device, 0, ROT0, "Merit", "Player's Choice (M4C1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) GAME( 1984, casino5, 0, casino5, casino5, driver_device, 0, ROT0, "Merit", "Casino Five (3315-02, U5-0)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 34a96573b1b..00c13097775 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -19707,6 +19707,7 @@ dodgectyc // (c) 1986 Merit dtrvwz5 // (c) 1987 Merit iowapp // (c) 1990 Merit misdraw // (c) 1986 Merit / Big Apple Games +mpchoice // (c) 1986 Merit mroundup // (c) 1984 Merit phrcraze // (c) 1986 Merit phrcrazea // (c) 1986 Merit