Merge branch 'master' of https://github.com/finalburnneo/FBNeo
This commit is contained in:
commit
7bbc5cf01b
|
@ -239,6 +239,8 @@ static INT32 DrvDoReset()
|
||||||
soundlatch = 0;
|
soundlatch = 0;
|
||||||
background_image = 0;
|
background_image = 0;
|
||||||
|
|
||||||
|
HiscoreReset();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -661,7 +663,7 @@ struct BurnDriver BurnDrvBombjack = {
|
||||||
"bombjack", NULL, NULL, NULL, "1984",
|
"bombjack", NULL, NULL, NULL, "1984",
|
||||||
"Bomb Jack (set 1)\0", NULL, "Tehkan", "Miscellaneous",
|
"Bomb Jack (set 1)\0", NULL, "Tehkan", "Miscellaneous",
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
|
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
|
||||||
NULL, bombjackRomInfo, bombjackRomName, NULL, NULL, NULL, NULL, BombjackInputInfo, BombjackDIPInfo,
|
NULL, bombjackRomInfo, bombjackRomName, NULL, NULL, NULL, NULL, BombjackInputInfo, BombjackDIPInfo,
|
||||||
BombjackInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x80,
|
BombjackInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x80,
|
||||||
224, 256, 3, 4
|
224, 256, 3, 4
|
||||||
|
@ -701,7 +703,7 @@ struct BurnDriver BurnDrvBombjack2 = {
|
||||||
"bombjack2", "bombjack", NULL, NULL, "1984",
|
"bombjack2", "bombjack", NULL, NULL, "1984",
|
||||||
"Bomb Jack (set 2)\0", NULL, "Tehkan", "Miscellaneous",
|
"Bomb Jack (set 2)\0", NULL, "Tehkan", "Miscellaneous",
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
|
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
|
||||||
NULL, bombjack2RomInfo, bombjack2RomName, NULL, NULL, NULL, NULL, BombjackInputInfo, BombjackDIPInfo,
|
NULL, bombjack2RomInfo, bombjack2RomName, NULL, NULL, NULL, NULL, BombjackInputInfo, BombjackDIPInfo,
|
||||||
BombjackInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x80,
|
BombjackInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x80,
|
||||||
224, 256, 3, 4
|
224, 256, 3, 4
|
||||||
|
@ -739,7 +741,7 @@ struct BurnDriver BurnDrvBombjackt = {
|
||||||
"bombjackt", "bombjack", NULL, NULL, "1984",
|
"bombjackt", "bombjack", NULL, NULL, "1984",
|
||||||
"Bomb Jack (Tecfri, Spain)\0", NULL, "Tehkan (Tecfri licence)", "Miscellaneous",
|
"Bomb Jack (Tecfri, Spain)\0", NULL, "Tehkan (Tecfri licence)", "Miscellaneous",
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
|
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
|
||||||
NULL, bombjacktRomInfo, bombjacktRomName, NULL, NULL, NULL, NULL, BombjackInputInfo, BombjackDIPInfo,
|
NULL, bombjacktRomInfo, bombjacktRomName, NULL, NULL, NULL, NULL, BombjackInputInfo, BombjackDIPInfo,
|
||||||
BombjacktInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x80,
|
BombjacktInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x80,
|
||||||
224, 256, 3, 4
|
224, 256, 3, 4
|
||||||
|
|
|
@ -4152,6 +4152,8 @@ static INT32 BjtwinDoReset()
|
||||||
NMK112Reset();
|
NMK112Reset();
|
||||||
MSM6295SetInitialBanks(2);
|
MSM6295SetInitialBanks(2);
|
||||||
|
|
||||||
|
HiscoreReset();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8456,7 +8458,7 @@ struct BurnDriver BurnDrvBjtwin = {
|
||||||
"bjtwin", NULL, NULL, NULL, "1993",
|
"bjtwin", NULL, NULL, NULL, "1993",
|
||||||
"Bombjack Twin (set 1)\0", NULL, "NMK", "NMK16",
|
"Bombjack Twin (set 1)\0", NULL, "NMK", "NMK16",
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
||||||
NULL, bjtwinRomInfo, bjtwinRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
NULL, bjtwinRomInfo, bjtwinRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
||||||
BjtwinGameInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
BjtwinGameInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
||||||
224, 384, 3, 4
|
224, 384, 3, 4
|
||||||
|
@ -8490,7 +8492,7 @@ struct BurnDriver BurnDrvBjtwina = {
|
||||||
"bjtwina", "bjtwin", NULL, NULL, "1993",
|
"bjtwina", "bjtwin", NULL, NULL, "1993",
|
||||||
"Bombjack Twin (set 2)\0", NULL, "NMK", "NMK16",
|
"Bombjack Twin (set 2)\0", NULL, "NMK", "NMK16",
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
||||||
NULL, bjtwinaRomInfo, bjtwinaRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
NULL, bjtwinaRomInfo, bjtwinaRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
||||||
BjtwinGameInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
BjtwinGameInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
||||||
224, 384, 3, 4
|
224, 384, 3, 4
|
||||||
|
@ -8557,7 +8559,7 @@ struct BurnDriver BurnDrvBjtwinp = {
|
||||||
"bjtwinp", "bjtwin", NULL, NULL, "1993",
|
"bjtwinp", "bjtwin", NULL, NULL, "1993",
|
||||||
"Bombjack Twin (prototype? with adult pictures, set 1)\0", NULL, "NMK", "NMK16",
|
"Bombjack Twin (prototype? with adult pictures, set 1)\0", NULL, "NMK", "NMK16",
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
||||||
NULL, bjtwinpRomInfo, bjtwinpRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
NULL, bjtwinpRomInfo, bjtwinpRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
||||||
BjtwinpInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
BjtwinpInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
||||||
224, 384, 3, 4
|
224, 384, 3, 4
|
||||||
|
@ -8626,7 +8628,7 @@ struct BurnDriver BurnDrvBjtwinpa = {
|
||||||
"bjtwinpa", "bjtwin", NULL, NULL, "1993",
|
"bjtwinpa", "bjtwin", NULL, NULL, "1993",
|
||||||
"Bombjack Twin (prototype? with adult pictures, set 2)\0", NULL, "NMK", "NMK16",
|
"Bombjack Twin (prototype? with adult pictures, set 2)\0", NULL, "NMK", "NMK16",
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0,
|
||||||
NULL, bjtwinpaRomInfo, bjtwinpaRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
NULL, bjtwinpaRomInfo, bjtwinpaRomName, NULL, NULL, NULL, NULL, CommonInputInfo, BjtwinDIPInfo,
|
||||||
BjtwinpaInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
BjtwinpaInit, BjtwinExit, BjtwinFrame, BjtwinDraw, DrvScan, NULL, 0x400,
|
||||||
224, 384, 3, 4
|
224, 384, 3, 4
|
||||||
|
|
Loading…
Reference in New Issue