Skip to content

Commit 5d13ae7

Browse files
committed
namcos2: change racing games brake pedal range, and some other small tweaks
1 parent 08d3e6c commit 5d13ae7

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

src/mame/namco/namcos2.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ C102 - Controls CPU access to ROZ Memory Area.
568568
#define M68B09_CPU_CLOCK (MAIN_OSC_CLOCK / 24) /* 2.048MHz clock for 68B09 sound CPU */
569569
#define C65_CPU_CLOCK (MAIN_OSC_CLOCK / 24) /* 2.048MHz clock for 63705 (or 63B05) I/O CPU */
570570
#define C68_CPU_CLOCK (MAIN_OSC_CLOCK / 6) /* 8.192MHz clock for 37450 I/O CPU */
571-
#define YM2151_SOUND_CLOCK XTAL(3'579'545) /* 3.579545MHz FM clock */
571+
#define YM2151_SOUND_CLOCK XTAL(3'579'545) /* 3.579545MHz FM clock */
572572
#define C140_SOUND_CLOCK (MAIN_OSC_CLOCK / 384 / 6) /* 21.333kHz C140 clock (was 8000000/374 or 21.390kHz) */
573573

574574

@@ -1121,11 +1121,11 @@ static INPUT_PORTS_START( finallap )
11211121
PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
11221122
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
11231123
PORT_START("AN5") /* Steering Wheel */ /* sensitivity, delta, min, max */
1124-
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
1124+
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
11251125
PORT_START("AN6") /* Brake Pedal */
1126-
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30)
1126+
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x40) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
11271127
PORT_START("AN7") /* Accelerator Pedal */
1128-
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
1128+
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x80) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
11291129

11301130
PORT_START("MCUH") /* 63B05Z0 - PORT H */
11311131
PORT_DIPNAME( 0x01, 0x01, "PortH 0x01")
@@ -1184,11 +1184,11 @@ static INPUT_PORTS_START( finalap3 )
11841184
PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
11851185
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
11861186
PORT_START("AN5") /* Steering Wheel */ /* sensitivity, delta, min, max */
1187-
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
1187+
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
11881188
PORT_START("AN6") /* Brake Pedal */
1189-
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30)
1189+
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x40) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
11901190
PORT_START("AN7") /* Accelerator Pedal */
1191-
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
1191+
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x80) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
11921192

11931193
PORT_START("MCUH") /* 63B05Z0 - PORT H */
11941194
PORT_DIPNAME( 0x01, 0x01, "PortH 0x01")
@@ -1271,11 +1271,11 @@ static INPUT_PORTS_START( fourtrax )
12711271
PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 6 */
12721272
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
12731273
PORT_START("AN5") /* Steering Wheel 7 */ /* sensitivity, delta, min, max */
1274-
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(75) PORT_KEYDELTA(50)
1274+
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(75) PORT_KEYDELTA(50)
12751275
PORT_START("AN6") /* Brake Pedal 8 */
1276-
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30)
1276+
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x40) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
12771277
PORT_START("AN7") /* Accelerator Pedal 9 */
1278-
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
1278+
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x80) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
12791279

12801280
PORT_START("MCUH") /* 63B05Z0 - PORT H */
12811281
PORT_DIPNAME( 0x01, 0x01, "PortH 0x01")
@@ -1363,11 +1363,11 @@ static INPUT_PORTS_START( suzuka )
13631363
PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
13641364
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
13651365
PORT_START("AN5") /* Steering Wheel */
1366-
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(100)
1366+
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(50) PORT_KEYDELTA(100)
13671367
PORT_START("AN6") /* Brake pedal */
1368-
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(30)
1368+
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x40) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
13691369
PORT_START("AN7") /* Accelerator pedal */
1370-
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
1370+
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x80) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
13711371

13721372
PORT_START("MCUH") /* 63B05Z0 - PORT H */
13731373
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1434,11 +1434,11 @@ static INPUT_PORTS_START( luckywld )
14341434
PORT_START("AN4")
14351435
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
14361436
PORT_START("AN5") /* Steering Wheel */
1437-
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_CODE(INPUT_CODE_INVALID) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
1437+
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_CODE(INPUT_CODE_INVALID) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
14381438
PORT_START("AN6") /* Brake pedal */
1439-
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(30)
1439+
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x40) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
14401440
PORT_START("AN7") /* Accelerator pedal */
1441-
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
1441+
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x80) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
14421442

14431443
PORT_START("MCUH") /* 63B05Z0 - PORT H */
14441444
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1497,7 +1497,7 @@ INPUT_PORTS_END
14971497
static INPUT_PORTS_START( dirtfox )
14981498
PORT_START("MCUB") /* 63B05Z0 - PORT B */
14991499
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Gear Shift Down")
1500-
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Gear Shift Up")
1500+
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Gear Shift Up")
15011501

15021502
NAMCOS2_MCU_PORT_C_DEFAULT
15031503

@@ -1512,11 +1512,11 @@ static INPUT_PORTS_START( dirtfox )
15121512
PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
15131513
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
15141514
PORT_START("AN5") /* Steering Wheel */
1515-
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(70) PORT_KEYDELTA(50)
1515+
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(70) PORT_KEYDELTA(50)
15161516
PORT_START("AN6") /* Brake pedal */
1517-
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_NAME("Brake")
1517+
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x40) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_NAME("Brake")
15181518
PORT_START("AN7") /* Accelerator pedal */
1519-
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_NAME("Accelerator")
1519+
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x80) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_NAME("Accelerator")
15201520

15211521
PORT_START("MCUH") /* 63B05Z0 - PORT H */
15221522
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1736,13 +1736,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos2_state::screen_scanline)
17361736
m_c68->ext_interrupt(ASSERT_LINE);
17371737
}
17381738

1739-
if(scanline == 240)
1739+
if (scanline == 240)
17401740
{
17411741
m_master_intc->vblank_irq_trigger();
17421742
m_slave_intc->vblank_irq_trigger();
17431743
}
17441744

1745-
if(scanline == cur_posirq)
1745+
if (scanline == cur_posirq)
17461746
{
17471747
m_master_intc->pos_irq_trigger();
17481748
m_slave_intc->pos_irq_trigger();

src/mame/namco/namcos2_m.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,15 +373,15 @@ void namcos2_state::namcos2_68k_key_w(offs_t offset, u16 data)
373373
{
374374
if (m_gametype == NAMCOS2_MARVEL_LAND && offset == 5)
375375
{
376-
if (data == 0x615E) m_sendval = true;
376+
if (data == 0x615e) m_sendval = true;
377377
}
378378
if (m_gametype == NAMCOS2_ROLLING_THUNDER_2 && offset == 4)
379379
{
380-
if (data == 0x13EC) m_sendval = true;
380+
if (data == 0x13ec) m_sendval = true;
381381
}
382382
if (m_gametype == NAMCOS2_ROLLING_THUNDER_2 && offset == 7)
383383
{
384-
if (data == 0x13EC) m_sendval = true;
384+
if (data == 0x13ec) m_sendval = true;
385385
}
386386
if (m_gametype == NAMCOS2_MARVEL_LAND && offset == 6)
387387
{

0 commit comments

Comments
 (0)