Skip to content

Commit

Permalink
Merge pull request #3955 from DavidHaywood/040918
Browse files Browse the repository at this point in the history 
small fixes
  • Loading branch information
@rb6502
rb6502 committed Sep 4, 2018
2 parents de24e3b + 06c48ce commit 618c4d7
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 6 deletions.
51 changes: 45 additions & 6 deletions src/mame/drivers/lastduel.cpp
View file
Expand Up @@ -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 )
Expand All @@ -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 ) )
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 )
1 change: 1 addition & 0 deletions src/mame/drivers/stv.cpp
View file
Expand Up @@ -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
Expand Down

0 comments on commit 618c4d7

Please sign in to comment.