From 1b3d98e1ec13db91df38c0b7ab20beea9491fcad Mon Sep 17 00:00:00 2001 From: Brian Troha Date: Thu, 4 Aug 2011 05:56:00 +0000 Subject: [PATCH] taito_l.c: Added dipswitch locations to all the games in the driver [Brian Troha] --- src/mame/drivers/taito_l.c | 423 +++++++++++++------------------------ 1 file changed, 148 insertions(+), 275 deletions(-) diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index e10088a598c..9f67ffe7447 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -955,28 +955,20 @@ ADDRESS_MAP_END static INPUT_PORTS_START( fhawk ) PORT_START("DSWA") - TAITO_MACHINE_COCKTAIL - TAITO_COINAGE_WORLD + TAITO_MACHINE_COCKTAIL_LOC(SW1) + TAITO_COINAGE_WORLD_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // all in manual - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) /* Listed as Unused */ + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) /* Listed as Unused */ + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x30, "3" ) PORT_DIPSETTING( 0x20, "4" ) PORT_DIPSETTING( 0x10, "5" ) PORT_DIPSETTING( 0x00, "6" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) /* Listed as Unused */ + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) /* Listed as Unused */ PORT_START("IN0") TAITO_JOY_UDLR_2_BUTTONS( 1 ) @@ -991,30 +983,28 @@ static INPUT_PORTS_START( fhawkj ) PORT_INCLUDE( fhawk ) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_OLD + TAITO_COINAGE_JAPAN_OLD_LOC(SW1) INPUT_PORTS_END static INPUT_PORTS_START( raimais ) PORT_START("DSWA") - TAITO_MACHINE_COCKTAIL - TAITO_COINAGE_WORLD + TAITO_MACHINE_COCKTAIL_LOC(SW1) + TAITO_COINAGE_WORLD_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x08, "80k and 160k" ) PORT_DIPSETTING( 0x0c, "80k only" ) PORT_DIPSETTING( 0x04, "160k only" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x30, "3" ) PORT_DIPSETTING( 0x20, "4" ) PORT_DIPSETTING( 0x10, "5" ) PORT_DIPSETTING( 0x00, "6" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Allow_Continue ) ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1032,32 +1022,30 @@ static INPUT_PORTS_START( raimaisj ) PORT_INCLUDE( raimais ) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_OLD + TAITO_COINAGE_JAPAN_OLD_LOC(SW1) INPUT_PORTS_END static INPUT_PORTS_START( champwr ) PORT_START("DSWA") - TAITO_MACHINE_NO_COCKTAIL // all 2 in manual - TAITO_COINAGE_WORLD + TAITO_MACHINE_NO_COCKTAIL_LOC(SW1) // all 2 in manual + TAITO_COINAGE_WORLD_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x0c, 0x0c, "Time" ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPNAME( 0x0c, 0x0c, "Time" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x08, "2 minutes" ) PORT_DIPSETTING( 0x0c, "3 minutes" ) PORT_DIPSETTING( 0x04, "4 minutes" ) PORT_DIPSETTING( 0x00, "5 minutes" ) - PORT_DIPNAME( 0x30, 0x30, "'1 minute' Lasts:" ) + PORT_DIPNAME( 0x30, 0x30, "'1 minute' Lasts:" ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x00, "30 sec" ) PORT_DIPSETTING( 0x10, "40 sec" ) PORT_DIPSETTING( 0x30, "50 sec" ) PORT_DIPSETTING( 0x20, "60 sec" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) /* Listed as Unused */ PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) @@ -1094,39 +1082,31 @@ static INPUT_PORTS_START( champwrj ) PORT_INCLUDE( champwr ) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_OLD + TAITO_COINAGE_JAPAN_OLD_LOC(SW1) INPUT_PORTS_END static INPUT_PORTS_START( champwru ) PORT_INCLUDE( champwr ) PORT_MODIFY("DSWA") - TAITO_COINAGE_US + TAITO_COINAGE_US_LOC(SW1) INPUT_PORTS_END static INPUT_PORTS_START( kurikint ) PORT_START("DSWA") - TAITO_MACHINE_COCKTAIL - TAITO_COINAGE_WORLD + TAITO_MACHINE_COCKTAIL_LOC(SW1) + TAITO_COINAGE_WORLD_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "Bosses' messages" ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) /* Listed as Unused */ + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) /* Listed as Unused */ + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW2:5" ) /* Listed as Unused */ + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW2:6" ) /* Listed as Unused */ + PORT_DIPNAME( 0x40, 0x40, "Bosses' messages" ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, "5 Times" ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1143,84 +1123,78 @@ static INPUT_PORTS_START( kurikintj ) PORT_INCLUDE( kurikint ) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_OLD + TAITO_COINAGE_JAPAN_OLD_LOC(SW1) INPUT_PORTS_END static INPUT_PORTS_START( kurikinta ) PORT_INCLUDE( kurikint ) PORT_MODIFY("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) + PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") /* Oposite of most Taito settings. IE: Off "means" off */ PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_WORLD + TAITO_COINAGE_WORLD_LOC(SW1) PORT_MODIFY("DSWB") - PORT_DIPNAME( 0x01, 0x01, "Level Select (Cheat)") + PORT_DIPNAME( 0x01, 0x01, "Level Select (Cheat)") PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "Invulnerability (Cheat)") + PORT_DIPNAME( 0x02, 0x02, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW2:2") PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x08, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0c, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x04, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "Bosses' messages" ) + PORT_DIPNAME( 0x20, 0x20, "Bosses' messages" ) PORT_DIPLOCATION("SW2:6") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x20, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "Slow Motion (Cheat)") + PORT_DIPNAME( 0x80, 0x80, "Slow Motion (Cheat)") PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END static INPUT_PORTS_START( puzznic ) PORT_START("DSWA") - TAITO_MACHINE_COCKTAIL - /* There is no Coin B in the Manuals */ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) + TAITO_MACHINE_COCKTAIL_LOC(SW1) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,6") PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:7" ) /* There is no Coin B in the Manual */ + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" ) /* There is no Coin B in the Manual */ PORT_START("DSWB") - /* Difficulty controls the Timer Speed (how many seconds are there in a minute) */ - TAITO_DIFFICULTY - PORT_DIPNAME( 0x0c, 0x0c, "Retries" ) + TAITO_DIFFICULTY_LOC(SW2) /* Difficulty controls the Timer Speed (how many seconds are there in a minute) */ + PORT_DIPNAME( 0x0c, 0x0c, "Retries" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x00, "0" ) PORT_DIPSETTING( 0x04, "1" ) PORT_DIPSETTING( 0x0c, "2" ) PORT_DIPSETTING( 0x08, "3" ) - PORT_DIPNAME( 0x10, 0x10, "Bombs" ) + PORT_DIPNAME( 0x10, 0x10, "Bombs" ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, "0" ) PORT_DIPSETTING( 0x00, "2" ) - PORT_DIPNAME( 0x20, 0x20, "Girls" ) + PORT_DIPNAME( 0x20, 0x20, "Girls" ) PORT_DIPLOCATION("SW2:6") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x20, DEF_STR( Yes ) ) - PORT_DIPNAME( 0xc0, 0xc0, "Terms of Replay" ) + PORT_DIPNAME( 0xc0, 0xc0, "Terms of Replay" ) PORT_DIPLOCATION("SW2:7,8") PORT_DIPSETTING( 0x40, "Stage one step back/Timer continuous" ) PORT_DIPSETTING( 0xc0, "Stage reset to start/Timer continuous" ) PORT_DIPSETTING( 0x80, "Stage reset to start/Timer reset to start" ) @@ -1259,31 +1233,25 @@ INPUT_PORTS_END static INPUT_PORTS_START( plotting ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, "Play Mode" ) + PORT_DIPNAME( 0x01, 0x01, "Play Mode" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x00, "1 Player" ) PORT_DIPSETTING( 0x01, "2 Player" ) - TAITO_DSWA_BITS_1_TO_3 - TAITO_COINAGE_WORLD + TAITO_DSWA_BITS_1_TO_3_LOC(SW1) + TAITO_COINAGE_WORLD_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x30, 0x30, "Wild Blocks" ) /* Number of allowed misses */ + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) /* Listed as Unused and "Must Remain Off" */ + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) /* Listed as Unused and "Must Remain Off" */ + PORT_DIPNAME( 0x30, 0x30, "Wild Blocks" ) PORT_DIPLOCATION("SW2:5,6") /* Number of allowed misses */ PORT_DIPSETTING( 0x20, "1" ) PORT_DIPSETTING( 0x30, "2" ) PORT_DIPSETTING( 0x10, "3" ) PORT_DIPSETTING( 0x00, "4" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x80, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) /* Listed as Unused and "Must Remain Off" */ PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1308,29 +1276,23 @@ INPUT_PORTS_END static INPUT_PORTS_START( palamed ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_DSWA_BITS_1_TO_3 - TAITO_COINAGE_JAPAN_NEW + TAITO_MACHINE_NO_COCKTAIL_LOC(SW1) + TAITO_COINAGE_JAPAN_NEW_LOC(SW1) PORT_START("DSWB") - /* Difficulty controls how fast the dice lines fall*/ - TAITO_DIFFICULTY - PORT_DIPNAME( 0x0c, 0x0c, "Games for VS Victory" ) + TAITO_DIFFICULTY_LOC(SW2) /* Difficulty controls how fast the dice lines fall*/ + PORT_DIPNAME( 0x0c, 0x0c, "Games for VS Victory" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x08, "1 Game" ) PORT_DIPSETTING( 0x0c, "2 Games" ) PORT_DIPSETTING( 0x04, "3 Games" ) PORT_DIPSETTING( 0x00, "4 Games" ) - PORT_DIPNAME( 0x30, 0x30, "Dice Appear at" ) + PORT_DIPNAME( 0x30, 0x30, "Dice Appear at" ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x20, "500 Lines" ) PORT_DIPSETTING( 0x30, "1000 Lines" ) PORT_DIPSETTING( 0x10, "2000 Lines" ) PORT_DIPSETTING( 0x00, "3000 Lines" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) ) /* Listed as "Unused" */ - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "Versus Mode" ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) /* Listed as "Unused" */ + PORT_DIPNAME( 0x80, 0x80, "Versus Mode" ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) @@ -1367,35 +1329,21 @@ INPUT_PORTS_END static INPUT_PORTS_START( cachat ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) + PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:1" ) + PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") /* Oposite of most Taito settings. IE: Off "means" off */ PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - TAITO_DSWA_BITS_2_TO_3 - TAITO_COINAGE_JAPAN_NEW + TAITO_DSWA_BITS_2_TO_3_LOC(SW1) + TAITO_COINAGE_JAPAN_NEW_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1430,35 +1378,21 @@ INPUT_PORTS_END static INPUT_PORTS_START( tubeit ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) + PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:1" ) + PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") /* Oposite of most Taito settings. IE: Off "means" off */ PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - TAITO_DSWA_BITS_2_TO_3 - TAITO_COINAGE_WORLD + TAITO_DSWA_BITS_2_TO_3_LOC(SW1) + TAITO_COINAGE_WORLD_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1493,30 +1427,30 @@ INPUT_PORTS_END static INPUT_PORTS_START( horshoes ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, "Beer Frame Message" ) + PORT_DIPNAME( 0x01, 0x01, "Beer Frame Message" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x01, "Break Time" ) PORT_DIPSETTING( 0x00, "Beer Frame" ) - TAITO_DSWA_BITS_1_TO_3 - TAITO_COINAGE_US /* According to the "United States Version" manual listing */ + TAITO_DSWA_BITS_1_TO_3_LOC(SW1) + TAITO_COINAGE_US_LOC(SW1) /* According to the "United States Version" manual listing */ PORT_START("DSWB") /* Not for sure, the CPU seems to play better when set to Hardest */ - TAITO_DIFFICULTY - PORT_DIPNAME( 0x0c, 0x0c, "Time" ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPNAME( 0x0c, 0x0c, "Time" ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x08, "20 sec" ) PORT_DIPSETTING( 0x0c, "30 sec" ) PORT_DIPSETTING( 0x04, "40 sec" ) PORT_DIPSETTING( 0x00, "60 sec" ) - PORT_DIPNAME( 0x10, 0x10, "Innings" ) + PORT_DIPNAME( 0x10, 0x10, "Innings" ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, "3 per Credit" ) PORT_DIPSETTING( 0x00, "9 per Credit" ) - PORT_DIPNAME( 0x20, 0x20, "Bonus Advantage" ) + PORT_DIPNAME( 0x20, 0x20, "Bonus Advantage" ) PORT_DIPLOCATION("SW2:6") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "Scoring Speed" ) + PORT_DIPNAME( 0x40, 0x40, "Scoring Speed" ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "Fast" ) - PORT_DIPNAME( 0x80, 0x80, "Grip/Angle Select" ) + PORT_DIPNAME( 0x80, 0x80, "Grip/Angle Select" ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, "2 Buttons" ) PORT_DIPSETTING( 0x00, "1 Button" ) @@ -1549,14 +1483,14 @@ INPUT_PORTS_END static INPUT_PORTS_START( plgirls ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coinage ) ) + PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:3" ) + PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:4,5,6") /* Manual shows same coinage as Play Girls 2 */ PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x18, DEF_STR( 2C_1C ) ) @@ -1565,32 +1499,17 @@ static INPUT_PORTS_START( plgirls ) PORT_DIPSETTING( 0x28, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 1C_4C ) ) // PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:7" ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" ) PORT_START("DSWB") - /* Difficulty controls the Ball Speed */ - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "P1+P2 Start to Clear Round (Cheat)" ) + TAITO_DIFFICULTY_LOC(SW2) /* Difficulty controls the Ball Speed */ + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) + PORT_DIPNAME( 0x80, 0x80, "P1+P2 Start to Clear Round (Cheat)" ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1627,17 +1546,15 @@ INPUT_PORTS_END static INPUT_PORTS_START( plgirls2 ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) /* Listed as Not Used */ - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) + PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:1" ) /* Listed as Not Used */ + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, "Coin Mode" ) + PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:3" ) + PORT_DIPNAME( 0x08, 0x08, "Coin Mode" ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x08, "Mode A" ) PORT_DIPSETTING( 0x00, "Mode B" ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:5,6") PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x08) PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x08) PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x08) @@ -1646,7 +1563,7 @@ static INPUT_PORTS_START( plgirls2 ) PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x00) PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x00) PORT_DIPSETTING( 0x20, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x00) - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) + PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:7,8") PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x08) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x08) PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x08) @@ -1655,46 +1572,22 @@ static INPUT_PORTS_START( plgirls2 ) PORT_DIPSETTING( 0x40, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x00) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x00) PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSWA", 0x08, PORTCOND_EQUALS, 0x00) -/* - -Coin 1 is DSW 1, 5&6 - Coin 2 is DSW 1, 7&8 - ------------------------------------ - | | 1cn/1pl |off|off| -Mode A | Coin | 1cn/2pl |on |off| - | | 2cn/1pl |off|on | - | | 2cn/3pl |on |on | ------------------------------------ - | | 1cn/1pl |off|off| -Mode B | Coin | 1cn/4pl |on |off| - | | 3cn/1pl |off|on | - | | 4cn/1pl |on |on | ------------------------------------ - -Mode A corresponds to TAITO_COINAGE_JAPAN_OLD in taitoipt.h - -*/ PORT_START("DSWB") - /* Difficulty controls the number of hits requiered to destroy enemies */ - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, "Time" ) /* Simply listed as "Time", what exactly does it refer to? */ + TAITO_DIFFICULTY_LOC(SW2) /* Difficulty controls the number of hits requiered to destroy enemies */ + PORT_DIPNAME( 0x04, 0x04, "Time" ) PORT_DIPLOCATION("SW2:3") /* Simply listed as "Time", what exactly does it refer to? */ PORT_DIPSETTING( 0x04, "2 Seconds" ) PORT_DIPSETTING( 0x00, "3 Seconds" ) - PORT_DIPNAME( 0x18, 0x18, "Life" ) + PORT_DIPNAME( 0x18, 0x18, "Lives for Joe/Lady/Jack" ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x10, "3/2/3" ) PORT_DIPSETTING( 0x18, "4/3/4" ) PORT_DIPSETTING( 0x08, "5/4/5" ) PORT_DIPSETTING( 0x00, "6/5/6" ) - PORT_DIPNAME( 0x20, 0x20, "Character Speed" ) + PORT_DIPNAME( 0x20, 0x20, "Character Speed" ) PORT_DIPLOCATION("SW2:6") PORT_DIPSETTING( 0x20, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "Fast" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) /* Listed as Not Used */ - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) /* Listed as Not Used */ - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) /* Listed as Not Used */ + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) /* Listed as Not Used */ PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1729,38 +1622,22 @@ INPUT_PORTS_END static INPUT_PORTS_START( cubybop ) PORT_START("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) + PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:1" ) + PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW1:2" ) + PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:3" ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW + TAITO_COINAGE_JAPAN_NEW_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) + PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1795,23 +1672,19 @@ INPUT_PORTS_END static INPUT_PORTS_START( evilston ) PORT_START("DSWA") - TAITO_MACHINE_COCKTAIL - TAITO_COINAGE_WORLD + TAITO_MACHINE_COCKTAIL_LOC(SW1) + TAITO_COINAGE_WORLD_LOC(SW1) PORT_START("DSWB") - TAITO_DIFFICULTY - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) + TAITO_DIFFICULTY_LOC(SW2) + PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x30, "3" ) PORT_DIPSETTING( 0x20, "2" ) PORT_DIPSETTING( 0x10, "1" ) PORT_DIPSETTING( 0x00, "4" ) - PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) + PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SW2:7,8") PORT_DIPSETTING( 0x00, DEF_STR( English ) ) PORT_DIPSETTING( 0x80, DEF_STR( English ) ) PORT_DIPSETTING( 0x40, DEF_STR( English ) )