From 6183053ecc3fb6d357b5f06bcc92197fc7e8405d Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 11 Nov 2024 15:22:58 +0100 Subject: [PATCH] dakkochn: actually mark unknown dsw as unknown --- src/mame/sega/system1.cpp | 125 +++++++++++++++----------------------- 1 file changed, 48 insertions(+), 77 deletions(-) diff --git a/src/mame/sega/system1.cpp b/src/mame/sega/system1.cpp index d888acc6cb8..fc273ec3704 100644 --- a/src/mame/sega/system1.cpp +++ b/src/mame/sega/system1.cpp @@ -996,7 +996,7 @@ static INPUT_PORTS_START( starjacks ) PORT_INCLUDE( starjack ) PORT_MODIFY("SWB") - PORT_DIPNAME( 0x08, 0x08, "Ship" ) PORT_DIPLOCATION("SWB:4") + PORT_DIPNAME( 0x08, 0x08, "Ship" ) PORT_DIPLOCATION("SWB:4") PORT_DIPSETTING( 0x08, DEF_STR( Single ) ) PORT_DIPSETTING( 0x00, "Multi" ) PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SWB:5,6") @@ -1024,7 +1024,7 @@ static INPUT_PORTS_START( regulus ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) INPUT_PORTS_END -// Same as 'regulus', but no DEF_STR( Allow_Continue ) Dip Switch +// Same as 'regulus', but no Allow Continue Dip Switch static INPUT_PORTS_START( reguluso ) PORT_INCLUDE( regulus ) @@ -1228,7 +1228,7 @@ static INPUT_PORTS_START( wmatch ) PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWB:2") PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x0c, 0x0c, "Time" ) PORT_DIPLOCATION("SWB:3,4") + PORT_DIPNAME( 0x0c, 0x0c, "Time" ) PORT_DIPLOCATION("SWB:3,4") PORT_DIPSETTING( 0x0c, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x08, "Fast" ) PORT_DIPSETTING( 0x04, "Faster" ) @@ -1297,7 +1297,7 @@ static INPUT_PORTS_START( pitfall2 ) PORT_DIPNAME( 0x20, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SWB:6") PORT_DIPSETTING( 0x20, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x40, 0x40, "Time" ) PORT_DIPLOCATION("SWB:7") + PORT_DIPNAME( 0x40, 0x40, "Time" ) PORT_DIPLOCATION("SWB:7") PORT_DIPSETTING( 0x00, "2 Minutes" ) PORT_DIPSETTING( 0x40, "3 Minutes" ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SWB:8" ) @@ -1495,18 +1495,10 @@ static INPUT_PORTS_START( brain ) PORT_DIPSETTING( 0x08, "4" ) PORT_DIPSETTING( 0x04, "5" ) PORT_DIPSETTING( 0x00, DEF_STR( Infinite ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:5") - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:6") - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:7") - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:8") - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SWB:5" ) + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SWB:6" ) + PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SWB:7" ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SWB:8" ) INPUT_PORTS_END static INPUT_PORTS_START( gardia ) @@ -1529,8 +1521,7 @@ static INPUT_PORTS_START( gardia ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWB:7") PORT_DIPSETTING( 0x40, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) - // Manual states "Always On" - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:8") + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:8") // Manual states "Always On" PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END @@ -1611,6 +1602,7 @@ static INPUT_PORTS_START( wbdeluxe ) PORT_MODIFY("P1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // Has to be 0 otherwise the game resets if you die after level 1. + PORT_MODIFY("SWB") PORT_DIPNAME( 0x80, 0x00, "Energy Consumption" ) PORT_DIPLOCATION("SWB:8") PORT_DIPSETTING( 0x00, "Slow" ) @@ -1629,21 +1621,13 @@ static INPUT_PORTS_START( wboyu ) PORT_DIPSETTING( 0x06, "3" ) PORT_DIPSETTING( 0x04, "4" ) PORT_DIPSETTING( 0x02, "5" ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:4") - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:5") - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:6") - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SWB:4" ) + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SWB:5" ) + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SWB:6" ) PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWB:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:8") - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SWB:8" ) PORT_MODIFY("SWB") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWA:1,2,3") @@ -1655,16 +1639,12 @@ static INPUT_PORTS_START( wboyu ) PORT_DIPSETTING( 0x02, DEF_STR( 2C_2C ) ) PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWA:4") - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SWA:4" ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SWA:5") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWA:6") - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0xc0, 0xc0, "Mode" ) PORT_DIPLOCATION("SWA:7,8") + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SWA:6" ) + PORT_DIPNAME( 0xc0, 0xc0, "Mode" ) PORT_DIPLOCATION("SWA:7,8") PORT_DIPSETTING( 0xc0, "Normal Game" ) PORT_DIPSETTING( 0x80, DEF_STR( Free_Play ) ) PORT_DIPSETTING( 0x40, "Test Mode" ) @@ -1675,12 +1655,12 @@ static INPUT_PORTS_START( nob ) PORT_INCLUDE( system1_generic ) PORT_MODIFY("P1") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) // shot - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) // fly + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) // shot + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) // fly PORT_MODIFY("P2") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL // shot - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL // fly + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL // shot + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL // fly PORT_MODIFY("SWA") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2") @@ -2018,18 +1998,10 @@ static INPUT_PORTS_START( tokisens ) PORT_DIPSETTING( 0x08, "2" ) PORT_DIPSETTING( 0x0c, "3" ) PORT_DIPSETTING( 0x04, "4" ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:5") - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:6") - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:7") - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:8") - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SWB:5" ) + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SWB:6" ) + PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SWB:7" ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SWB:8" ) INPUT_PORTS_END static INPUT_PORTS_START( tokisensa ) @@ -2059,12 +2031,10 @@ static INPUT_PORTS_START( wbml ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWB:6") PORT_DIPSETTING( 0x20, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) - PORT_DIPNAME( 0x40, 0x40, "Test Mode" ) PORT_DIPLOCATION("SWB:7") + PORT_DIPNAME( 0x40, 0x40, "Test Mode" ) PORT_DIPLOCATION("SWB:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPLOCATION("SWB:8") - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SWB:8" ) INPUT_PORTS_END static INPUT_PORTS_START( dakkochn ) @@ -2082,26 +2052,27 @@ static INPUT_PORTS_START( dakkochn ) // TODO: Dip-Switches PORT_MODIFY("SWA") - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWB:2") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SWB:3,4") - PORT_DIPSETTING( 0x04, "3" ) - PORT_DIPSETTING( 0x0c, "4" ) - PORT_DIPSETTING( 0x08, "5" ) - // 0x00 gives 4 lives - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SWB:5") - PORT_DIPSETTING( 0x10, "30000 100000 200000" ) - PORT_DIPSETTING( 0x00, "50000 150000 250000" ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWB:6") - PORT_DIPSETTING( 0x20, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) - PORT_DIPNAME( 0x40, 0x40, "Test Mode" ) PORT_DIPLOCATION("SWB:7") - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:8") - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWB:1,2") + PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_4C ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SWB:3" ) + PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SWB:4" ) + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SWB:5" ) + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SWB:6" ) + PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SWB:7" ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SWB:8" ) + + PORT_MODIFY("SWB") + PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SWA:1" ) + PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SWA:2" ) + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SWA:3" ) + PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SWA:4" ) + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SWA:5" ) + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SWA:6" ) + PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SWA:7" ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SWA:8" ) PORT_START("KEY0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )