diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index de3bbba4215..1c319eb7c5a 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -1367,8 +1367,8 @@ static INPUT_PORTS_START( csc ) PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_NAME("RE") PORT_START("IN.9") // hardwired - PORT_CONFNAME( 0x01, 0x00, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) PORT_CONFNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_CONFSETTING( 0x00, DEF_STR( Off ) ) @@ -1379,8 +1379,8 @@ static INPUT_PORTS_START( cscg ) PORT_INCLUDE( csc ) PORT_MODIFY("IN.9") - PORT_CONFNAME( 0x01, 0x01, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) INPUT_PORTS_END @@ -1401,8 +1401,8 @@ static INPUT_PORTS_START( su9g ) PORT_INCLUDE( su9 ) PORT_MODIFY("IN.9") - PORT_CONFNAME( 0x01, 0x01, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) INPUT_PORTS_END @@ -1430,8 +1430,8 @@ static INPUT_PORTS_START( eas ) PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("LV / Pawn") PORT_START("IN.9") // hardwired - PORT_CONFNAME( 0x01, 0x00, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) PORT_CONFNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_CONFSETTING( 0x00, DEF_STR( Off ) ) @@ -1442,8 +1442,8 @@ static INPUT_PORTS_START( easg ) PORT_INCLUDE( eas ) PORT_MODIFY("IN.9") - PORT_CONFNAME( 0x01, 0x01, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) INPUT_PORTS_END @@ -1471,8 +1471,8 @@ static INPUT_PORTS_START( eag ) PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("PB / King") PORT_START("IN.9") // hardwired - PORT_CONFNAME( 0x01, 0x00, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) PORT_CONFNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_CONFSETTING( 0x00, DEF_STR( Off ) ) @@ -1483,8 +1483,8 @@ static INPUT_PORTS_START( eagg ) PORT_INCLUDE( eag ) PORT_MODIFY("IN.9") - PORT_CONFNAME( 0x01, 0x01, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) INPUT_PORTS_END @@ -1530,11 +1530,11 @@ static INPUT_PORTS_START( fexcelv ) PORT_INCLUDE( fexcelb ) PORT_START("IN.9") - PORT_CONFNAME( 0x03, 0x00, "Language" ) PORT_CHANGED_MEMBER(DEVICE_SELF, fidel6502_state, fexcelv_bankswitch, 0) - PORT_CONFSETTING( 0x00, "English" ) - PORT_CONFSETTING( 0x01, "German" ) - PORT_CONFSETTING( 0x02, "French" ) - PORT_CONFSETTING( 0x03, "Spanish" ) + PORT_CONFNAME( 0x03, 0x00, DEF_STR( Language ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, fidel6502_state, fexcelv_bankswitch, 0) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) + PORT_CONFSETTING( 0x01, DEF_STR( German ) ) + PORT_CONFSETTING( 0x02, DEF_STR( French ) ) + PORT_CONFSETTING( 0x03, DEF_STR( Spanish ) ) PORT_BIT(0x7c, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_SPECIAL) PORT_READ_LINE_DEVICE_MEMBER("speech", s14001a_device, busy_r) INPUT_PORTS_END diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index 3e0c2e18ed7..cf8739ad306 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -1424,8 +1424,8 @@ static INPUT_PORTS_START( vsc ) PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_START("IN.10") // hardwired (2 diodes) - PORT_CONFNAME( 0x01, 0x00, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) PORT_CONFNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_CONFSETTING( 0x00, DEF_STR( Off ) ) @@ -1436,8 +1436,8 @@ static INPUT_PORTS_START( vscg ) PORT_INCLUDE( vsc ) PORT_MODIFY("IN.10") - PORT_CONFNAME( 0x01, 0x01, "Language" ) - PORT_CONFSETTING( 0x00, "English" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Language ) ) + PORT_CONFSETTING( 0x00, DEF_STR( English ) ) PORT_CONFSETTING( 0x01, "Other" ) INPUT_PORTS_END diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index f7f478acb8a..46bb4676f32 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -413,7 +413,7 @@ static INPUT_PORTS_START( h2hbaskb ) PORT_START("IN.0") // G0 port IN PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_16WAY PORT_NAME("P1 Pass CW") // clockwise PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_16WAY PORT_NAME("P1 Pass CCW") // counter-clockwise - PORT_CONFNAME( 0x04, 0x04, "Players" ) + PORT_CONFNAME( 0x04, 0x04, DEF_STR( Players ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) @@ -425,7 +425,7 @@ static INPUT_PORTS_START( h2hbaskb ) PORT_START("IN.2") // G2 port IN PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL PORT_16WAY PORT_NAME("P2 Defense Right") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL PORT_16WAY PORT_NAME("P2 Defense Left") - PORT_CONFNAME( 0x04, 0x04, "Skill Level" ) + PORT_CONFNAME( 0x04, 0x04, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) @@ -821,7 +821,7 @@ static INPUT_PORTS_START( funjacks ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) // speaker PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START ) - PORT_CONFNAME( 0x08, 0x00, "Players" ) + PORT_CONFNAME( 0x08, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x08, "2" ) INPUT_PORTS_END @@ -904,8 +904,8 @@ WRITE8_MEMBER(funrlgl_state::write_g) static INPUT_PORTS_START( funrlgl ) PORT_START("IN.0") // port G - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_CONFNAME( 0x04, 0x04, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index 8560fc7eb88..88737aab60c 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -432,11 +432,11 @@ static INPUT_PORTS_START( bambball ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_NAME("Display") PORT_START("IN.3") // D10 port R0x - PORT_CONFNAME( 0x07, 0x01, "Skill Level") + PORT_CONFNAME( 0x07, 0x01, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x02, "2" ) PORT_CONFSETTING( 0x04, "3" ) - PORT_CONFNAME( 0x08, 0x08, "Players" ) + PORT_CONFNAME( 0x08, 0x08, DEF_STR( Players ) ) PORT_CONFSETTING( 0x08, "1" ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END @@ -567,10 +567,10 @@ static INPUT_PORTS_START( bmboxing ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.4") // port D - PORT_CONFNAME( 0x0001, 0x0000, "Players" ) + PORT_CONFNAME( 0x0001, 0x0000, DEF_STR( Players ) ) PORT_CONFSETTING( 0x0000, "1" ) PORT_CONFSETTING( 0x0001, "2" ) - PORT_CONFNAME( 0x0002, 0x0000, "Skill Level" ) + PORT_CONFNAME( 0x0002, 0x0000, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x0000, "1" ) PORT_CONFSETTING( 0x0002, "2" ) PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START ) @@ -1856,10 +1856,10 @@ static INPUT_PORTS_START( pairmtch ) PORT_CONFSETTING( 0x0000, DEF_STR( Off ) ) PORT_CONFSETTING( 0x0040, DEF_STR( On ) ) PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_CONFNAME( 0x0800, 0x0800, "Players" ) + PORT_CONFNAME( 0x0800, 0x0800, DEF_STR( Players ) ) PORT_CONFSETTING( 0x0800, "1" ) PORT_CONFSETTING( 0x0000, "2" ) - PORT_CONFNAME( 0x3000, 0x2000, "Skill Level" ) + PORT_CONFNAME( 0x3000, 0x2000, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x2000, "1" ) PORT_CONFSETTING( 0x1000, "2" ) PORT_CONFSETTING( 0x0000, "3" ) @@ -1966,7 +1966,7 @@ READ16_MEMBER(alnattck_state::input_r) static INPUT_PORTS_START( alnattck ) PORT_START("IN.0") // D7 line D5 - PORT_CONFNAME( 0x20, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x20, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x20, "2" ) @@ -2230,7 +2230,7 @@ static INPUT_PORTS_START( cgalaxn ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_START("IN.1") // R11 port R0x - PORT_CONFNAME( 0x01, 0x01, "Players" ) PORT_CHANGED_MEMBER(DEVICE_SELF, cgalaxn_state, player_switch, nullptr) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Players ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, cgalaxn_state, player_switch, nullptr) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x00, "2" ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -2350,7 +2350,7 @@ READ8_MEMBER(cpacman_state::input_r) static INPUT_PORTS_START( cpacman ) PORT_START("IN.0") // D13 port R0x - PORT_CONFNAME( 0x01, 0x01, "Skill Level" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -2467,7 +2467,7 @@ READ8_MEMBER(cmspacmn_state::input_r) static INPUT_PORTS_START( cmspacmn ) PORT_START("IN.0") // D13 port R0x - PORT_CONFNAME( 0x01, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -2606,7 +2606,7 @@ static INPUT_PORTS_START( sag ) PORT_START("IN.2") // D4 PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_16WAY PORT_NAME("P1 Button 3") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL PORT_16WAY PORT_NAME("P2 Button 1") - PORT_CONFNAME( 0x04, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x04, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x04, "2" ) @@ -2626,7 +2626,7 @@ static INPUT_PORTS_START( sag ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Button 7") PORT_START("FAKE") // shared D3/D5 - PORT_CONFNAME( 0x03, 0x01, "Players" ) + PORT_CONFNAME( 0x03, 0x01, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "Demo" ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x02, "2" ) @@ -2738,10 +2738,10 @@ static INPUT_PORTS_START( egalaxn2 ) PORT_START("IN.3") // D4 port R0x PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_CONFNAME( 0x02, 0x02, "Skill Level" ) + PORT_CONFNAME( 0x02, 0x02, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x02, "1" ) PORT_CONFSETTING( 0x00, "2" ) - PORT_CONFNAME( 0x0c, 0x00, "Players" ) + PORT_CONFNAME( 0x0c, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x08, "0 (Demo)" ) // for Demo mode: need to hold down Fire button at power-on PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x04, "2" ) @@ -2822,10 +2822,10 @@ static INPUT_PORTS_START( epacman2 ) PORT_START("IN.3") // D4 port R0x PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_CONFNAME( 0x02, 0x02, "Skill Level" ) + PORT_CONFNAME( 0x02, 0x02, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x02, "2" ) - PORT_CONFNAME( 0x0c, 0x04, "Players" ) + PORT_CONFNAME( 0x0c, 0x04, DEF_STR( Players ) ) PORT_CONFSETTING( 0x08, "0 (Demo)" ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) @@ -2971,13 +2971,13 @@ static INPUT_PORTS_START( eturtles ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) PORT_START("IN.4") // D5 INT0/1 - PORT_CONFNAME( 0x01, 0x01, "Skill Level" ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x00, "2" ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) PORT_START("IN.5") // D6 INT0/1 - PORT_CONFNAME( 0x03, 0x00, "Players" ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) + PORT_CONFNAME( 0x03, 0x00, DEF_STR( Players ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) PORT_CONFSETTING( 0x02, "0 (Demo)" ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) @@ -3094,11 +3094,11 @@ static INPUT_PORTS_START( estargte ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.4") // D5 INT0/1 - PORT_CONFNAME( 0x01, 0x00, "Players" ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Players ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) PORT_CONFSETTING( 0x00, "0 (Demo)" ) // yes, same value as 1-player, hold the Inviso button at boot to enter demo mode PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) - PORT_CONFNAME( 0x02, 0x02, "Skill Level" ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) + PORT_CONFNAME( 0x02, 0x02, DEF_STR( Difficulty ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, eturtles_state, input_changed, nullptr) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x02, "2" ) @@ -3348,7 +3348,7 @@ static INPUT_PORTS_START( gckong ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_hmcs40_state, single_interrupt_line, (void *)0) PORT_START("IN.5") // port D - PORT_CONFNAME( 0x0010, 0x0000, "Skill Level" ) + PORT_CONFNAME( 0x0010, 0x0000, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x0000, "A" ) PORT_CONFSETTING( 0x0010, "B" ) PORT_BIT( 0xffef, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -4061,7 +4061,7 @@ static INPUT_PORTS_START( vinvader ) PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.1") // port D - PORT_CONFNAME( 0x0002, 0x0000, "Skill Level") + PORT_CONFNAME( 0x0002, 0x0000, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x0000, "1" ) PORT_CONFSETTING( 0x0002, "2" ) PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_BUTTON1 ) diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index 1a0663fe254..5e2f507835c 100644 --- a/src/mame/drivers/hh_melps4.cpp +++ b/src/mame/drivers/hh_melps4.cpp @@ -302,7 +302,7 @@ static INPUT_PORTS_START( cfrogger ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_START("IN.2") // K3 - PORT_CONFNAME( 0x08, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x08, "2" ) diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index d481ccf11e7..07a8d8d3df9 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -2,7 +2,7 @@ // copyright-holders:hap, Sean Riddle, Kevin Horton /*************************************************************************** - GI PIC16xx-driven dedicated handhelds or other simple devices. + GI PIC 16xx-driven dedicated handhelds or other simple devices. known chips: @@ -280,13 +280,13 @@ u16 hh_pic16_state::read_inputs(int columns) /*************************************************************************** Atari Touch Me - * PIC1655A-053 + * PIC 1655A-053 * 2 7seg LEDs + 4 other LEDs, 1-bit sound This is the handheld version of the 1974 arcade game. known revisions: - - Model BH-100 GI C013233 Rev 2 Atari W 1979: PIC1655A-053 + - Model BH-100 GI C013233 Rev 2 Atari W 1979: PIC 1655A-053 - Model BH-100 C013150 Rev 6 Atari 1979: AMI C10745 (custom ASIC) ***************************************************************************/ @@ -403,7 +403,7 @@ MACHINE_CONFIG_END /*************************************************************************** Caprice Pro-Action Baseball (manufactured by Calfax) - * PIC1655A-043 + * PIC 1655A-043 * x ***************************************************************************/ @@ -475,7 +475,7 @@ MACHINE_CONFIG_END /*************************************************************************** GAF Melody Madness - * PIC1655A-094 + * PIC 1655A-094 * 2 lamps under tube, 1-bit sound Melody Madness is a tabletop music memory game, shaped like a jukebox. @@ -590,7 +590,7 @@ MACHINE_CONFIG_END /*************************************************************************** Ideal Maniac, by Ralph Baer - * PIC1655A-036 + * PIC 1655A-036 * 2 7seg LEDs, 1-bit sound Maniac is a reflex game for 2-4 players. There are 4 challenges: @@ -657,10 +657,10 @@ WRITE8_MEMBER(maniac_state::write_c) static INPUT_PORTS_START( maniac ) PORT_START("IN.0") // port A - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // top button, increment clockwise - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // top button, increment clockwise + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) INPUT_PORTS_END static const s16 maniac_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 }; @@ -690,7 +690,7 @@ MACHINE_CONFIG_END /*************************************************************************** Lakeside Le Boom - * PIC1655A-061 + * PIC 1655A-061 * 1 led, 1-bit sound with RC circuit for volume decay This is a tabletop timebomb defusion game. It's shaped like an aerial bomb, @@ -847,7 +847,7 @@ MACHINE_CONFIG_END /*************************************************************************** Tandy Electronic Basketball (model 60-2146) - * PIC1655A-51 + * PIC 1655A-51 * 2 7seg LEDs + 21 other LEDs, 1-bit sound The ROM is nearly identical to hccbaskb, the shell/overlay is the same as @@ -926,7 +926,7 @@ static INPUT_PORTS_START( tbaskb ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_START("IN.5") // port A2 - PORT_CONFNAME( 0x04, 0x04, "Skill Level" ) + PORT_CONFNAME( 0x04, 0x04, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END @@ -956,7 +956,7 @@ MACHINE_CONFIG_END /*************************************************************************** Tiger Electronics Rocket Pinball (model 7-460) - * PIC1650A-110, 69-11397 + * PIC 1650A-110, 69-11397 * 3 7seg LEDs + 44 other LEDs, 1-bit sound known releases: @@ -1073,7 +1073,7 @@ MACHINE_CONFIG_END /*************************************************************************** Tiger Electronics Half Court Computer Basketball (model 7-470) - * PIC1655A(no serial), 69-11557 + * PIC 1655A(no serial), 69-11557 * 2 7seg LEDs + 26 other LEDs, 1-bit sound known releases: @@ -1153,7 +1153,7 @@ static INPUT_PORTS_START( hccbaskb ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_START("IN.5") // port A2 - PORT_CONFNAME( 0x04, 0x04, "Skill Level" ) + PORT_CONFNAME( 0x04, 0x04, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END @@ -1183,16 +1183,16 @@ MACHINE_CONFIG_END /*************************************************************************** Toytronic Football (set 1) - * PIC1655A-033 + * PIC 1655A-033 * 4511 7seg BCD decoder, 7 7seg LEDs + 27 other LEDs, 1-bit sound (no brand) Football (set 2) - * PIC1655-024 + * PIC 1655-024 * rest same as above, 1 less button Hello and welcome to another Mattel Football clone, there are so many of these. - The PIC1655-024 one came from an unbranded handheld, but comparison suggests - that it's the 'prequel' of PIC1655A-033. + The 1655-024 one came from an unbranded handheld, but comparison suggests that + it's the 'prequel' of 1655A-033. ***************************************************************************/ @@ -1277,7 +1277,7 @@ static INPUT_PORTS_START( ttfball ) PORT_START("IN.5") // port A PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Status") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Score") - PORT_CONFNAME( 0x04, 0x04, "Skill Level" ) + PORT_CONFNAME( 0x04, 0x04, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END @@ -1301,7 +1301,7 @@ static INPUT_PORTS_START( ttfballa ) PORT_START("IN.5") // port A PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Status") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Score") - PORT_CONFNAME( 0x04, 0x04, "Skill Level" ) + PORT_CONFNAME( 0x04, 0x04, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x00, "2" ) @@ -1335,7 +1335,7 @@ MACHINE_CONFIG_END /*************************************************************************** U.S. Games Programmable Baseball - * PIC1650A-133 + * PIC 1650A-133 * x known releases: @@ -1411,7 +1411,7 @@ MACHINE_CONFIG_END /*************************************************************************** U.S. Games Football - * PIC1650A-144 + * PIC 1650A-144 * x known releases: @@ -1492,43 +1492,43 @@ MACHINE_CONFIG_END ROM_START( touchme ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655a-053", 0x0000, 0x0400, CRC(f0858f0a) SHA1(53ffe111d43db1c110847590350ef62f02ed5e0e) ) + ROM_LOAD( "pic_1655a-053", 0x0000, 0x0400, CRC(f0858f0a) SHA1(53ffe111d43db1c110847590350ef62f02ed5e0e) ) ROM_END ROM_START( pabball ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655a-043", 0x0000, 0x0400, CRC(43c9b765) SHA1(888a431bab9bcb241c14f33f70863fa2ad89c96b) ) + ROM_LOAD( "pic_1655a-043", 0x0000, 0x0400, CRC(43c9b765) SHA1(888a431bab9bcb241c14f33f70863fa2ad89c96b) ) ROM_END ROM_START( melodym ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655a-094", 0x0000, 0x0400, CRC(6d35bd7b) SHA1(20e326085878f69a9d4ef1651ef4443f27188567) ) + ROM_LOAD( "pic_1655a-094", 0x0000, 0x0400, CRC(6d35bd7b) SHA1(20e326085878f69a9d4ef1651ef4443f27188567) ) ROM_END ROM_START( maniac ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655a-036", 0x0000, 0x0400, CRC(a96f7011) SHA1(e97ae44d3c1e74c7e1024bb0bdab03eecdc9f827) ) + ROM_LOAD( "pic_1655a-036", 0x0000, 0x0400, CRC(a96f7011) SHA1(e97ae44d3c1e74c7e1024bb0bdab03eecdc9f827) ) ROM_END ROM_START( leboom ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655a-061", 0x0000, 0x0400, CRC(5880eea1) SHA1(e3795b347fd5df9de084da36e33f6b70fbc0b0ae) ) + ROM_LOAD( "pic_1655a-061", 0x0000, 0x0400, CRC(5880eea1) SHA1(e3795b347fd5df9de084da36e33f6b70fbc0b0ae) ) ROM_END ROM_START( tbaskb ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655a-051", 0x0000, 0x0400, CRC(92534b40) SHA1(7055e32846c913e68f7d35f279cd537f6325f4f2) ) + ROM_LOAD( "pic_1655a-051", 0x0000, 0x0400, CRC(92534b40) SHA1(7055e32846c913e68f7d35f279cd537f6325f4f2) ) ROM_END ROM_START( rockpin ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1650a-110_69-11397", 0x0000, 0x0400, CRC(d5396e77) SHA1(952feaff70fde53a9eda84c54704520d50749e78) ) + ROM_LOAD( "pic_1650a-110_69-11397", 0x0000, 0x0400, CRC(d5396e77) SHA1(952feaff70fde53a9eda84c54704520d50749e78) ) ROM_END @@ -1540,24 +1540,24 @@ ROM_END ROM_START( ttfball ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655a-033", 0x0000, 0x0400, CRC(2b500501) SHA1(f7fe464663c56e2181a31a1dc5f1f5239df57bed) ) + ROM_LOAD( "pic_1655a-033", 0x0000, 0x0400, CRC(2b500501) SHA1(f7fe464663c56e2181a31a1dc5f1f5239df57bed) ) ROM_END ROM_START( ttfballa ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1655-024", 0x0000, 0x0400, CRC(9091102f) SHA1(ef72759f20b5a99e0366863caad1e26be114263f) ) + ROM_LOAD( "pic_1655-024", 0x0000, 0x0400, CRC(9091102f) SHA1(ef72759f20b5a99e0366863caad1e26be114263f) ) ROM_END ROM_START( uspbball ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1650a-133", 0x0000, 0x0400, CRC(479e98be) SHA1(67437177b059dfa6e01940da26daf997cec96ead) ) + ROM_LOAD( "pic_1650a-133", 0x0000, 0x0400, CRC(479e98be) SHA1(67437177b059dfa6e01940da26daf997cec96ead) ) ROM_END ROM_START( usfball ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "pic1650a-144", 0x0000, 0x0400, CRC(ef3677c9) SHA1(33f89c79e7e090710681dffe09eddaf66b5cb794) ) + ROM_LOAD( "pic_1650a-144", 0x0000, 0x0400, CRC(ef3677c9) SHA1(33f89c79e7e090710681dffe09eddaf66b5cb794) ) ROM_END diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 03cc1cf95a6..c18884b2008 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -500,7 +500,7 @@ static INPUT_PORTS_START( matchnum ) PORT_START("IN.2") // R5 PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_NAME("Change") - PORT_CONFNAME( 0x08, 0x08, "Players" ) + PORT_CONFNAME( 0x08, 0x08, DEF_STR( Players ) ) PORT_CONFSETTING( 0x08, "1" ) PORT_CONFSETTING( 0x00, "2" ) @@ -662,7 +662,7 @@ static INPUT_PORTS_START( mathmagi ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE) PORT_START("IN.5") // R10 - PORT_CONFNAME( 0x01, 0x00, "Players") + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -1217,7 +1217,7 @@ static INPUT_PORTS_START( cqback ) PORT_BIT( 0x02, 0x02, IPT_SPECIAL ) PORT_CONDITION("IN.1", 0x01, EQUALS, 0x00) // run/kick PORT_START("IN.2") // K4 - PORT_CONFNAME( 0x03, 0x02, "Skill Level" ) + PORT_CONFNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x02, "1" ) PORT_CONFSETTING( 0x01, "2" ) @@ -1320,7 +1320,7 @@ READ8_MEMBER(h2hfootb_state::read_k) static INPUT_PORTS_START( h2hfootb ) PORT_START("IN.0") // K1 - PORT_CONFNAME( 0x03, 0x01, "Players" ) + PORT_CONFNAME( 0x03, 0x01, DEF_STR( Players ) ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x02, "2" ) @@ -1329,7 +1329,7 @@ static INPUT_PORTS_START( h2hfootb ) PORT_BIT( 0x02, 0x02, IPT_SPECIAL ) PORT_CONDITION("IN.1", 0x01, EQUALS, 0x00) // run/kick PORT_START("IN.2") // K4 - PORT_CONFNAME( 0x03, 0x01, "Skill Level" ) + PORT_CONFNAME( 0x03, 0x01, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x02, "2" ) @@ -1465,7 +1465,7 @@ static INPUT_PORTS_START( h2hbaseb ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Swing") PORT_START("IN.5") // fake - PORT_CONFNAME( 0x01, 0x00, "Skill Level" ) PORT_CHANGED_MEMBER(DEVICE_SELF, h2hbaseb_state, skill_switch, nullptr) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, h2hbaseb_state, skill_switch, nullptr) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) INPUT_PORTS_END @@ -1572,7 +1572,7 @@ READ8_MEMBER(h2hboxing_state::read_k) static INPUT_PORTS_START( h2hboxing ) PORT_START("IN.0") // R0 - PORT_CONFNAME( 0x01, 0x00, "Players" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -1937,7 +1937,7 @@ READ8_MEMBER(cnbaskb_state::read_k) static INPUT_PORTS_START( cnbaskb ) PORT_START("IN.0") // R0 - PORT_CONFNAME( 0x01, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) // amateur PORT_CONFSETTING( 0x01, "2" ) // professional PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) @@ -2062,7 +2062,7 @@ static INPUT_PORTS_START( cmsport ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Shoot") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Score") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_CONFNAME( 0x08, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) // amateur PORT_CONFSETTING( 0x08, "2" ) // professional INPUT_PORTS_END @@ -2182,7 +2182,7 @@ static INPUT_PORTS_START( cnfball ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Kick") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Score") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Status") - PORT_CONFNAME( 0x08, 0x08, "Skill Level" ) + PORT_CONFNAME( 0x08, 0x08, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x08, "1" ) // college PORT_CONFSETTING( 0x00, "2" ) // professional @@ -2291,7 +2291,7 @@ static INPUT_PORTS_START( cnfball2 ) PORT_CONFSETTING( 0x00, DEF_STR( Off ) ) PORT_CONFSETTING( 0x02, DEF_STR( On ) ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_TOGGLE PORT_NAME("Play Selector") // pass/run - PORT_CONFNAME( 0x08, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) // college PORT_CONFSETTING( 0x08, "2" ) // professional @@ -2446,7 +2446,7 @@ static INPUT_PORTS_START( eleciq ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.6") // R9 - PORT_CONFNAME( 0x01, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) // amateur PORT_CONFSETTING( 0x01, "2" ) // professional PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -2559,7 +2559,7 @@ static INPUT_PORTS_START( esoccer ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL PORT_16WAY PORT_START("IN.2") // R2 - PORT_CONFNAME( 0x03, 0x01, "Players" ) + PORT_CONFNAME( 0x03, 0x01, DEF_STR( Players ) ) PORT_CONFSETTING( 0x01, "1" ) // Auto PORT_CONFSETTING( 0x02, "2" ) // Manual PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) @@ -2674,7 +2674,7 @@ static INPUT_PORTS_START( ebball ) PORT_START("IN.0") // R1 PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Change Up") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Change Sides") - PORT_CONFNAME( 0x04, 0x04, "Players" ) + PORT_CONFNAME( 0x04, 0x04, DEF_STR( Players ) ) PORT_CONFSETTING( 0x04, "1" ) // Auto PORT_CONFSETTING( 0x00, "2" ) // Manual PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -2802,7 +2802,7 @@ READ8_MEMBER(ebball2_state::read_k) static INPUT_PORTS_START( ebball2 ) PORT_START("IN.0") // R3 PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_CONFNAME( 0x02, 0x02, "Players" ) + PORT_CONFNAME( 0x02, 0x02, DEF_STR( Players ) ) PORT_CONFSETTING( 0x02, "1" ) // Auto PORT_CONFSETTING( 0x00, "2" ) // Manual PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Fast Ball") @@ -2972,14 +2972,14 @@ static INPUT_PORTS_START( ebball3 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_NAME("P2 Steal Defense") PORT_START("IN.2") // R2 - PORT_CONFNAME( 0x01, 0x01, "Players" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Players ) ) PORT_CONFSETTING( 0x01, "1" ) // Auto PORT_CONFSETTING( 0x00, "2" ) // Manual PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Bunt") PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.3") // fake - PORT_CONFNAME( 0x01, 0x00, "Skill Level" ) PORT_CHANGED_MEMBER(DEVICE_SELF, ebball3_state, skill_switch, nullptr) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, ebball3_state, skill_switch, nullptr) PORT_CONFSETTING( 0x00, "Amateur" ) PORT_CONFSETTING( 0x01, "Professional" ) INPUT_PORTS_END @@ -3109,7 +3109,7 @@ static INPUT_PORTS_START( esbattle ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Fire 1") // F1 PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Fire 2") // F2 PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL PORT_NAME("P2 Launch") - PORT_CONFNAME( 0x08, 0x08, "Players" ) + PORT_CONFNAME( 0x08, 0x08, DEF_STR( Players ) ) PORT_CONFSETTING( 0x08, "1" ) // Auto PORT_CONFSETTING( 0x00, "2" ) // Manual INPUT_PORTS_END @@ -3199,7 +3199,7 @@ static INPUT_PORTS_START( einvader ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_16WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY - PORT_CONFNAME( 0x08, 0x00, "Skill Level" ) PORT_CHANGED_MEMBER(DEVICE_SELF, einvader_state, skill_switch, nullptr) + PORT_CONFNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, einvader_state, skill_switch, nullptr) PORT_CONFSETTING( 0x00, "Amateur" ) PORT_CONFSETTING( 0x08, "Professional" ) INPUT_PORTS_END @@ -3333,10 +3333,10 @@ static INPUT_PORTS_START( efootb4 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.4") // R4 - PORT_CONFNAME( 0x01, 0x01, "Players" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Players ) ) PORT_CONFSETTING( 0x01, "1" ) // Auto PORT_CONFSETTING( 0x00, "2" ) // Manual - PORT_CONFNAME( 0x02, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x02, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "Amateur" ) PORT_CONFSETTING( 0x02, "Professional" ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Status") @@ -3437,10 +3437,10 @@ READ8_MEMBER(ebaskb2_state::read_k) static INPUT_PORTS_START( ebaskb2 ) PORT_START("IN.0") // R6 - PORT_CONFNAME( 0x01, 0x01, "Skill Level" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x01, "Amateur" ) PORT_CONFSETTING( 0x00, "Professional" ) - PORT_CONFNAME( 0x02, 0x02, "Players" ) + PORT_CONFNAME( 0x02, 0x02, DEF_STR( Players ) ) PORT_CONFSETTING( 0x02, "1" ) // Auto PORT_CONFSETTING( 0x00, "2" ) // Manual PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Shoot") @@ -3574,7 +3574,7 @@ static INPUT_PORTS_START( raisedvl ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.1") // R1 (only bit 0) - PORT_CONFNAME( 0x31, 0x00, "Skill Level" ) PORT_CHANGED_MEMBER(DEVICE_SELF, raisedvl_state, skill_switch, nullptr) + PORT_CONFNAME( 0x31, 0x00, DEF_STR( Difficulty ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, raisedvl_state, skill_switch, nullptr) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x10, "2" ) PORT_CONFSETTING( 0x11, "3" ) @@ -3707,9 +3707,9 @@ static INPUT_PORTS_START( f2pbball ) PORT_START("IN.0") // R4 PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL PORT_NAME("P2 Pick Off") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_CONFNAME( 0x0c, 0x04, "Players" ) + PORT_CONFNAME( 0x0c, 0x04, DEF_STR( Players ) ) PORT_CONFSETTING( 0x04, "1" ) - PORT_CONFSETTING( 0x00, "Practice" ) + PORT_CONFSETTING( 0x00, "Practice" ) // middle switch PORT_CONFSETTING( 0x08, "2" ) PORT_START("IN.1") // R9 @@ -5586,7 +5586,7 @@ static INPUT_PORTS_START( simon ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.3") // R9 - PORT_CONFNAME( 0x0f, 0x02, "Skill Level") + PORT_CONFNAME( 0x0f, 0x02, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x02, "1" ) PORT_CONFSETTING( 0x04, "2" ) PORT_CONFSETTING( 0x08, "3" ) @@ -5695,7 +5695,7 @@ static INPUT_PORTS_START( ssimon ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Red Button") PORT_START("IN.4") // R9 - PORT_CONFNAME( 0x0f, 0x02, "Skill Level") + PORT_CONFNAME( 0x0f, 0x02, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "Head-to-Head" ) // this sets R10 K2, see below PORT_CONFSETTING( 0x02, "1" ) PORT_CONFSETTING( 0x04, "2" ) @@ -7002,7 +7002,7 @@ static INPUT_PORTS_START( tcfball ) PORT_START("IN.2") // R7 PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_CONFNAME( 0x08, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) // college PORT_CONFSETTING( 0x08, "2" ) // professional INPUT_PORTS_END @@ -7576,7 +7576,7 @@ static INPUT_PORTS_START( copycat ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Yellow Button") PORT_START("IN.1") // R5 - PORT_CONFNAME( 0x0f, 0x01, "Skill Level") + PORT_CONFNAME( 0x0f, 0x01, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x02, "2" ) PORT_CONFSETTING( 0x04, "3" ) @@ -7853,7 +7853,7 @@ static INPUT_PORTS_START( ss7in1 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_START("IN.3") // R10 - PORT_CONFNAME( 0x01, 0x00, "Players" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -8021,7 +8021,7 @@ static INPUT_PORTS_START( tbreakup ) PORT_CONFSETTING( 0x04, "5" ) PORT_START("IN.3") // fake - PORT_CONFNAME( 0x01, 0x00, "Skill Level" ) PORT_CHANGED_MEMBER(DEVICE_SELF, tbreakup_state, skill_switch, nullptr) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CHANGED_MEMBER(DEVICE_SELF, tbreakup_state, skill_switch, nullptr) PORT_CONFSETTING( 0x00, "Pro 1" ) PORT_CONFSETTING( 0x01, "Pro 2" ) INPUT_PORTS_END @@ -8283,10 +8283,10 @@ static INPUT_PORTS_START( ssports4 ) PORT_START("IN.2") // R5 PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_CONFNAME( 0x04, 0x00, "Speed" ) - PORT_CONFSETTING( 0x00, "Low" ) - PORT_CONFSETTING( 0x04, "High" ) - PORT_CONFNAME( 0x08, 0x08, "Players" ) + PORT_CONFNAME( 0x04, 0x00, DEF_STR( Difficulty ) ) + PORT_CONFSETTING( 0x00, "1" ) + PORT_CONFSETTING( 0x04, "2" ) + PORT_CONFNAME( 0x08, 0x08, DEF_STR( Players ) ) PORT_CONFSETTING( 0x08, "1" ) PORT_CONFSETTING( 0x00, "2" ) diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index 37a687f640d..43010dfff21 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -336,7 +336,7 @@ static INPUT_PORTS_START( ufombs ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_START("IN.1") // port B - PORT_CONFNAME( 0x07, 0x01, "Skill Level" ) + PORT_CONFNAME( 0x07, 0x01, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x02, "2" ) PORT_CONFSETTING( 0x04, "3" ) @@ -609,10 +609,10 @@ static INPUT_PORTS_START( bmsoccer ) PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.2") // port B - PORT_CONFNAME( 0x01, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) - PORT_CONFNAME( 0x02, 0x00, "Players" ) + PORT_CONFNAME( 0x02, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x02, "2" ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Display/Banana Shoot") @@ -714,7 +714,7 @@ WRITE8_MEMBER(bmsafari_state::speaker_w) static INPUT_PORTS_START( bmsafari ) PORT_START("IN.0") // port A - PORT_CONFNAME( 0x07, 0x04, "Skill Level" ) + PORT_CONFNAME( 0x07, 0x04, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x04, "1" ) PORT_CONFSETTING( 0x02, "2" ) PORT_CONFSETTING( 0x01, "3" ) @@ -865,10 +865,10 @@ static INPUT_PORTS_START( splasfgt ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.4") // port A - PORT_CONFNAME( 0x01, 0x00, "Players" ) + PORT_CONFNAME( 0x01, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x01, "2" ) - PORT_CONFNAME( 0x02, 0x00, "Skill Level" ) + PORT_CONFNAME( 0x02, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x02, "2" ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START ) @@ -1293,7 +1293,7 @@ static INPUT_PORTS_START( efball ) PORT_CONFNAME( 0x01, 0x00, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x00, "Amateur" ) PORT_CONFSETTING( 0x01, "Professional" ) - PORT_CONFNAME( 0x02, 0x02, "Players" ) + PORT_CONFNAME( 0x02, 0x02, DEF_STR( Players ) ) PORT_CONFSETTING( 0x02, "1" ) PORT_CONFSETTING( 0x00, "2" ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("P1 Down-Field") @@ -2020,7 +2020,7 @@ WRITE8_MEMBER(tccombat_state::plate_w) static INPUT_PORTS_START( tccombat ) PORT_START("IN.0") // port A PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) - PORT_CONFNAME( 0x02, 0x02, "Skill Level" ) + PORT_CONFNAME( 0x02, 0x02, DEF_STR( Difficulty ) ) PORT_CONFSETTING( 0x02, "1" ) PORT_CONFSETTING( 0x00, "2" ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY @@ -2154,7 +2154,7 @@ static INPUT_PORTS_START( tmtennis ) PORT_CONFSETTING( 0x001, "Practice" ) PORT_CONFSETTING( 0x100, "Pro 1" ) // -> difficulty_switch PORT_CONFSETTING( 0x000, "Pro 2" ) - PORT_CONFNAME( 0x02, 0x00, "Players" ) + PORT_CONFNAME( 0x02, 0x00, DEF_STR( Players ) ) PORT_CONFSETTING( 0x00, "1" ) PORT_CONFSETTING( 0x02, "2" ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_Q) PORT_NAME("P2 Button 1") @@ -2619,7 +2619,7 @@ static INPUT_PORTS_START( alnchase ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_START("IN.2") // port B - PORT_CONFNAME( 0x01, 0x01, "Players" ) + PORT_CONFNAME( 0x01, 0x01, DEF_STR( Players ) ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x00, "2" ) PORT_CONFNAME( 0x02, 0x00, DEF_STR( Difficulty ) )