diff options
author | R. Belmont <rb6502@users.noreply.github.com> | 2018-09-04 12:10:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-04 12:10:19 -0400 |
commit | 618c4d7165a6f66e392ae533fbba82de13f42e23 (patch) | |
tree | 8a11a75b322107735016f982d7d64041131636bc | |
parent | de24e3bfdcd160b348aba60aa43333b1e411a706 (diff) | |
parent | 06c48cee0c462109b4b701348dfbb64c87d769bc (diff) |
Merge pull request #3955 from DavidHaywood/040918
small fixes
-rw-r--r-- | src/mame/drivers/lastduel.cpp | 51 | ||||
-rw-r--r-- | src/mame/drivers/stv.cpp | 1 |
2 files changed, 46 insertions, 6 deletions
diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp index 03eaf8d5eca..3891a3271e5 100644 --- a/src/mame/drivers/lastduel.cpp +++ b/src/mame/drivers/lastduel.cpp @@ -320,11 +320,11 @@ static INPUT_PORTS_START( madgear ) PORT_DIPSETTING( 0x0030, "Upright One Player" ) PORT_DIPSETTING( 0x0000, "Upright Two Players" ) PORT_DIPSETTING( 0x0010, DEF_STR( Cocktail ) ) -/* PORT_DIPSETTING( 0x0020, "Upright One Player" ) */ + PORT_DIPSETTING( 0x0020, "Upright One Player (duplicate)" ) PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0040, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, "Background Music" ) PORT_DIPLOCATION("SW1:8") + PORT_DIPNAME( 0x0080, 0x0080, "Demo Music" ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0080, DEF_STR( On ) ) PORT_BIT( 0x7f00, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -341,7 +341,7 @@ static INPUT_PORTS_START( madgear ) PORT_DIPSETTING( 0x0300, DEF_STR( 5C_3C ) ) PORT_DIPSETTING( 0x0600, DEF_STR( 3C_2C ) ) PORT_DIPSETTING( 0x0f00, DEF_STR( 1C_1C ) ) -// PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0000, "1 Coin / 1 Credit (duplicate)" ) PORT_DIPSETTING( 0x0800, DEF_STR( 2C_3C ) ) PORT_DIPSETTING( 0x0e00, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0d00, DEF_STR( 1C_3C ) ) @@ -395,6 +395,45 @@ static INPUT_PORTS_START( madgear ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE1 ) INPUT_PORTS_END +// TODO, verify that there is no 'very difficult' in game code, this is based on test mode +static INPUT_PORTS_START( leds2011 ) + PORT_INCLUDE( madgear ) + + PORT_MODIFY("DSW1") + PORT_DIPNAME( 0x000c, 0x000c, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:3,4") + PORT_DIPSETTING( 0x0008, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Difficult ) ) + PORT_DIPSETTING( 0x0000, "Normal (duplicate)" ) +INPUT_PORTS_END + +// A number of the dips are inverted +// TODO: verify the difficulty dips, this is based on Test Mode +static INPUT_PORTS_START( leds2011p ) + PORT_INCLUDE( madgear ) + + PORT_MODIFY("DSW1") + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( No ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) ) + // This isn't a simple On / Off Flipscreen. The game code is buggy and it uses edge trigger logic rather than level based, so it always boots unflipped but changing it while running flips it + PORT_DIPNAME( 0x0002, 0x0002, "Flip Screen (Edge Trigger)" ) PORT_DIPLOCATION("SW1:2") + PORT_DIPSETTING( 0x0002, "Position 0 ('Off')" ) + PORT_DIPSETTING( 0x0000, "Position 1 ('On')" ) + PORT_DIPNAME( 0x000c, 0x0008, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:3,4") + PORT_DIPSETTING( 0x000c, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Difficult ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Very_Difficult ) ) + PORT_DIPNAME( 0x0040, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7") + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0000, "Demo Music" ) PORT_DIPLOCATION("SW1:8") + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) +INPUT_PORTS_END + + /******************************************************************************/ static const gfx_layout sprite_layout = @@ -932,6 +971,6 @@ GAME( 1989, madgear, 0, madgear, madgear, lastduel_state, empty_init, GAME( 1989, madgearj, madgear, madgear, madgear, lastduel_state, empty_init, ROT270, "Capcom", "Mad Gear (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, ledstorm, madgear, madgear, madgear, lastduel_state, empty_init, ROT270, "Capcom", "Led Storm (US)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, leds2011, 0, madgear, madgear, lastduel_state, empty_init, ROT270, "Capcom", "Led Storm Rally 2011 (World)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, leds2011u, leds2011, madgear, madgear, lastduel_state, empty_init, ROT270, "Capcom", "Led Storm Rally 2011 (US)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, leds2011p, leds2011, madgear, madgear, lastduel_state, empty_init, ROT270, "Capcom", "Led Storm Rally 2011 (US, prototype 12)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, leds2011, 0, madgear, leds2011, lastduel_state, empty_init, ROT270, "Capcom", "Led Storm Rally 2011 (World)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, leds2011u, leds2011, madgear, leds2011, lastduel_state, empty_init, ROT270, "Capcom", "Led Storm Rally 2011 (US)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, leds2011p, leds2011, madgear, leds2011p,lastduel_state, empty_init, ROT270, "Capcom", "Led Storm Rally 2011 (US, prototype 12)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 74be7f00983..a0eb6832903 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -2764,6 +2764,7 @@ ROM_END ROM_START( znpwfvt ) STV_BIOS + ROM_DEFAULT_BIOS( "tw" ) // only runs with Taiwanese BIOS ROMs ROM_REGION32_BE( 0x3000000, "cart", ROMREGION_ERASE00 ) /* SH2 code */ ROM_LOAD16_BYTE( "epr20408.13", 0x0000001, 0x0100000, CRC(1d62fcf6) SHA1(3651261aa755da27b11462f2705311b7c639a687) ) // good |