diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mame/drivers/merit.cpp | 34 | ||||
-rw-r--r-- | src/mame/mame.lst | 3 |
2 files changed, 35 insertions, 2 deletions
diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index 7db3a2c5ee2..329022c7104 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -915,6 +915,22 @@ static INPUT_PORTS_START( pitbossb ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END +static INPUT_PORTS_START( mdchoice ) /* Does one of the dips (1 through 4) control number of Jokers? Currently there are 2 */ + PORT_INCLUDE( pitboss ) + + PORT_MODIFY("DSW") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown) ) PORT_DIPLOCATION("SW:1") + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown) ) PORT_DIPLOCATION("SW:4") + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x30, 0x30, "Coin Lockout" ) PORT_DIPLOCATION("SW:5,6") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x30, "2 Coins" ) + PORT_DIPSETTING( 0x20, "10 Coins" ) +INPUT_PORTS_END + static INPUT_PORTS_START( mpchoice ) /* pitbossc games but dips like The Round Up */ PORT_INCLUDE( pitboss ) @@ -1538,6 +1554,21 @@ ROM_START( pitbossc ) ROM_LOAD( "chr2.u40", 0x0000, 0x2000, CRC(40c94dce) SHA1(86611e3a1048b2a3fffcc0110811656a2d0fc4a5) ) ROM_END +ROM_START( mdchoice ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "e4a1_u5.u5", 0x0000, 0x2000, CRC(bd77f8dc) SHA1(c9c85e3180be30e7a1d37abb6d4e7c777acfda81) ) /* Internal designation: E4A1REV0 */ + ROM_LOAD( "e4a1_u6.u6", 0x2000, 0x2000, CRC(e5219c9a) SHA1(66511f5f9bcd64f3028bbf55a51a1b0db391567c) ) /* Games included in this set are: */ + ROM_LOAD( "e4a1_u7.u7", 0x4000, 0x2000, CRC(9451d8db) SHA1(c2431b25543218fd8bc5a4eb79e8a77690e26c5e) ) /* 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) ) /* (MFG FOR: */ + ROM_LOAD( "chr2.u37", 0x4000, 0x2000, CRC(ea6f0c59) SHA1(f2c0ff99518c2cec3eb1b4042fa3754a702c0e34) ) /* EEI-CVS International */ + + ROM_REGION( 0x2000, "gfx2", 0 ) + 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 */ @@ -2378,7 +2409,8 @@ GAME( 1983, pitbossa, pitboss, pitboss, pitbossa, driver_device, 0, ROT0, " 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( 1983, mdchoice, pitboss, pitboss, mdchoice, driver_device, 0, ROT0, "Merit", "Dealer's Choice (E4A1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) /* Copyright year based on other Pit Boss sets */ +GAME( 1983, mpchoice, pitboss, 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 b9c3e0d2d8d..06fcad2cd1f 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -19737,7 +19737,8 @@ dodgectyc // (c) 1986 Merit dtrvwz5 // (c) 1987 Merit iowapp // (c) 1990 Merit misdraw // (c) 1986 Merit / Big Apple Games -mpchoice // (c) 1986 Merit +mdchoice // (c) 1983 Merit +mpchoice // (c) 1983 Merit mroundup // (c) 1984 Merit phrcraze // (c) 1986 Merit phrcrazea // (c) 1986 Merit |