ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finallap1-3, fix dips

This commit is contained in:
dinkc64 2024-09-25 01:09:31 -04:00
parent 3c308fee20
commit f1e6d27b6e
1 changed files with 81 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/burn/drv/pst90s/d_namcos2.cpp
View File

@ -134,8 +134,10 @@ static UINT8 DrvJoy2[8];
static UINT8 DrvJoy3[8];
static UINT8 DrvJoy4[8];
static UINT8 DrvInputs[4];
static UINT8 DrvDips[2];
static UINT8 DrvDips[4];
static UINT8 DrvReset;
static UINT8 mcuBmask;
static UINT8 mcuHmask;
static INT16 DrvAnalogPort0 = 0;
static INT16 DrvAnalogPort1 = 0;
@ -328,10 +330,29 @@ static struct BurnInputInfo FourtraxInputList[] = {
{"Service", BIT_DIGITAL, DrvJoy2 + 7, "service" },
{"Dip A", BIT_DIPSWITCH, DrvDips + 0, "dip" },
{"Debug", BIT_DIPSWITCH, DrvDips + 1, "dip" },
{"Dip B", BIT_DIPSWITCH, DrvDips + 2, "dip" },
{"Dip H", BIT_DIPSWITCH, DrvDips + 3, "dip" },
};
STDINPUTINFO(Fourtrax)
static struct BurnInputInfo FinallapInputList[] = {
{"P1 Coin", BIT_DIGITAL, DrvJoy2 + 5, "p1 coin" },
A("Steering", BIT_ANALOG_REL, &DrvAnalogPort0, "p1 x-axis"),
A("Brake", BIT_ANALOG_REL, &DrvAnalogPort1, "p1 fire 1"),
A("Accelerator", BIT_ANALOG_REL, &DrvAnalogPort2, "p1 fire 2"),
{"P1 Gear", BIT_DIGITAL, DrvJoy3 + 5, "p1 fire 3" },
{"Reset", BIT_DIGITAL, &DrvReset, "reset" },
{"Service", BIT_DIGITAL, DrvJoy2 + 7, "service" },
{"Dip A", BIT_DIPSWITCH, DrvDips + 0, "dip" },
{"Debug", BIT_DIPSWITCH, DrvDips + 1, "dip" },
{"Dip B", BIT_DIPSWITCH, DrvDips + 2, "dip" },
{"Dip H", BIT_DIPSWITCH, DrvDips + 3, "dip" },
};
STDINPUTINFO(Finallap)
static struct BurnDIPInfo DefaultDIPList[]=
{
DIP_OFFSET(0x14)
@ -349,7 +370,42 @@ static struct BurnDIPInfo DefaultDIPList[]=
STDDIPINFO(Default)
static struct BurnDIPInfo FourtraxDIPList[]= // finallap*, suzuka*
static struct BurnDIPInfo FinallapDIPList[]= // finallap 1-3
{
DIP_OFFSET(0x07)
{0x00, 0xff, 0xff, 0xff, NULL },
{0x01, 0xff, 0xff, 0xff, NULL },
{0x02, 0xff, 0xff, 0x02, NULL },
{0x03, 0xff, 0xff, 0x8a, NULL },
{0 , 0xfe, 0 , 2, "Video Display" },
{0x00, 0x01, 0x01, 0x01, "Normal" },
{0x00, 0x01, 0x01, 0x00, "Frozen" },
{0 , 0xfe, 0 , 2, "Service Mode" },
{0x01, 0x01, 0x40, 0x40, "Off" },
{0x01, 0x01, 0x40, 0x00, "On" },
{0 , 0xfe, 0 , 2, "Car Type(A)" }, // mcub port (see mcuBmask)
{0x02, 0x01, 0x02, 0x02, "McLaren/Williams" },
{0x02, 0x01, 0x02, 0x00, "Lotus/March" },
{0 , 0xfe, 0 , 2, "Automatic Car Select" }, // mcuh port (see mcuHmask)
{0x03, 0x01, 0x02, 0x02, "No" },
{0x03, 0x01, 0x02, 0x00, "Yes" },
{0 , 0xfe, 0 , 2, "Enable Onscreen Diagnostics" },
{0x03, 0x01, 0x08, 0x08, "No" },
{0x03, 0x01, 0x08, 0x00, "Yes" },
{0 , 0xfe, 0 , 2, "Car Type(B)" },
{0x03, 0x01, 0x80, 0x00, "McLaren/March" },
{0x03, 0x01, 0x80, 0x80, "Williams/Lotus" },
};
STDDIPINFO(Finallap)
static struct BurnDIPInfo FourtraxDIPList[]= // & suzuka*
{
DIP_OFFSET(0x08)
{0x00, 0xff, 0xff, 0xff, NULL },
@ -1163,7 +1219,7 @@ static UINT8 namcos2_mcu_read(UINT16 address)
return 0;
case 0x0001:
return DrvInputs[0]; // mcub
return (DrvInputs[0] & ~mcuBmask) | (DrvDips[2] & mcuBmask); // mcub
case 0x0002:
return (DrvInputs[1] & ~0x40) | (DrvDips[1] & 0x40); // mcuc
@ -1172,7 +1228,7 @@ static UINT8 namcos2_mcu_read(UINT16 address)
return mcu_port_d_r();
case 0x0007:
return DrvInputs[2]; // mcuh
return (DrvInputs[2] & ~mcuHmask) | (DrvDips[3] & mcuHmask); // mcuh
case 0x0010:
return mcu_analog_ctrl_read();
@ -1434,6 +1490,9 @@ static void namcos2_sound_init()
static void namcos2_mcu_init()
{
mcuBmask = 0x00;
mcuHmask = 0x00;
m6805Init(1, 1 << 16);
m6805Open(0);
// m6805MapMemory(DrvMCURAM + 0x0100, 0x0100, 0x01ff, MAP_RAM);
@ -2092,6 +2151,9 @@ static INT32 FinallapInit()
namcos2_sound_init();
namcos2_mcu_init();
mcuBmask = 0x02; // DrvDips[2]
mcuHmask = 0x02 | 0x08 | 0x80; // DrvDips[3]
GenericTilesInit();
is_finallap = 1;
@ -2137,6 +2199,9 @@ static INT32 Finalap2Init()
SekClose();
mcuBmask = 0x02; // DrvDips[2]
mcuHmask = 0x02 | 0x08 | 0x80; // DrvDips[3]
GenericTilesInit();
has_shift = 1;
@ -6762,7 +6827,7 @@ struct BurnDriver BurnDrvFinallap = {
"Final Lap (Rev E)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING, 2, HARDWARE_MISC_PRE90S, GBF_RACING, 0,
NULL, finallapRomInfo, finallapRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finallapRomInfo, finallapRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
FinallapInit, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -6813,7 +6878,7 @@ struct BurnDriver BurnDrvFinallapd = {
"Final Lap (Rev D)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_PRE90S, GBF_RACING, 0,
NULL, finallapdRomInfo, finallapdRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finallapdRomInfo, finallapdRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
FinallapInit, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -6864,7 +6929,7 @@ struct BurnDriver BurnDrvFinallapc = {
"Final Lap (Rev C)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_PRE90S, GBF_RACING, 0,
NULL, finallapcRomInfo, finallapcRomName, NULL, NULL, NULL, NULL, DefaultInputInfo, DefaultDIPInfo, //FinallapInputInfo, FinallapDIPInfo,
NULL, finallapcRomInfo, finallapcRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
FinallapInit, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -6915,7 +6980,7 @@ struct BurnDriver BurnDrvFinallapjc = {
"Final Lap (Japan, Rev C)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_PRE90S, GBF_RACING, 0,
NULL, finallapjcRomInfo, finallapjcRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finallapjcRomInfo, finallapjcRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
FinallapInit, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -6966,7 +7031,7 @@ struct BurnDriver BurnDrvFinallapjb = {
"Final Lap (Japan, Rev B)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_PRE90S, GBF_RACING, 0,
NULL, finallapjbRomInfo, finallapjbRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finallapjbRomInfo, finallapjbRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
FinallapInit, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -7027,7 +7092,7 @@ struct BurnDriver BurnDrvFinalap2 = {
"Final Lap 2\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0,
NULL, finalap2RomInfo, finalap2RomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finalap2RomInfo, finalap2RomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
Finalap2Init, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -7088,7 +7153,7 @@ struct BurnDriver BurnDrvFinalap2j = {
"Final Lap 2 (Japan)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0,
NULL, finalap2jRomInfo, finalap2jRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finalap2jRomInfo, finalap2jRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
Finalap2Init, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -7151,7 +7216,7 @@ struct BurnDriver BurnDrvFinalap3 = {
"Final Lap 3 (World, Rev C)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0,
NULL, finalap3RomInfo, finalap3RomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finalap3RomInfo, finalap3RomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
Finalap2Init, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -7216,7 +7281,7 @@ struct BurnDriver BurnDrvFinalap3a = {
"Final Lap 3 (World, set 2)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0,
NULL, finalap3aRomInfo, finalap3aRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finalap3aRomInfo, finalap3aRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
Finalap2Init, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -7279,7 +7344,7 @@ struct BurnDriver BurnDrvFinalap3j = {
"Final Lap 3 (Japan)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0,
NULL, finalap3jRomInfo, finalap3jRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finalap3jRomInfo, finalap3jRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
Finalap2Init, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -7342,7 +7407,7 @@ struct BurnDriver BurnDrvFinalap3jc = {
"Final Lap 3 (Japan, Rev C)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0,
NULL, finalap3jcRomInfo, finalap3jcRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finalap3jcRomInfo, finalap3jcRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
Finalap2Init, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};
@ -7405,7 +7470,7 @@ struct BurnDriver BurnDrvFinalap3bl = {
"Final Lap 3 (bootleg)\0", "Imperfect graphics", "Namco", "System 2",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0,
NULL, finalap3blRomInfo, finalap3blRomName, NULL, NULL, NULL, NULL, FourtraxInputInfo, FourtraxDIPInfo,
NULL, finalap3blRomInfo, finalap3blRomName, NULL, NULL, NULL, NULL, FinallapInputInfo, FinallapDIPInfo,
Finalap2Init, Namcos2Exit, DrvFrame, FinallapDraw, DrvScan, &DrvRecalc, 0x4000,
288, 224, 4, 3
};