Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/finalburnneo/FBNeo
Browse files Browse the repository at this point in the history
  • Loading branch information
@dinkc64
dinkc64 committed Dec 6, 2023
2 parents 24ca05b + b216879 commit e887305
Show file tree
Hide file tree
Showing 9 changed files with 8,559 additions and 7,286 deletions.
3 changes: 3 additions & 0 deletions src/burn/drv/capcom/cps.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2310,6 +2310,9 @@ INT32 CpsInit()
INT32 Cps2Init()
{
Cps = 2;
BurnDrvGetVisibleSize(&nCpsScreenWidth, &nCpsScreenHeight);
nCpsGlobalXOffset = (nCpsScreenWidth-384)>>1;
nCpsGlobalYOffset = (nCpsScreenHeight-224)>>1;

if (CpsGetROMs(false)) {
return 1;
Expand Down
4 changes: 2 additions & 2 deletions src/burn/drv/capcom/cps_scr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ INT32 Cps2Scr1Draw(UINT8 *Base, INT32 sx, INT32 sy)
INT32 ix, iy;
INT32 nFirstY, nLastY;
INT32 nKnowBlank = -1; // The tile we know is blank
INT32 nXTile = (Cps2Turbo) ? 52 : 48; // 48*8 = 384, 52*8 = 416
INT32 nXTile = nCpsScreenWidth>>3; // 48*8 = 384, 52*8 = 416

ix = (sx >> 3) + 1;
sx &= 7;
Expand Down Expand Up @@ -201,7 +201,7 @@ INT32 Cps2Scr3Draw(UINT8 *Base, INT32 sx, INT32 sy)
INT32 ix, iy;
INT32 nFirstY, nLastY;
INT32 nKnowBlank = -1; // The tile we know is blank
INT32 nXTile = (Cps2Turbo) ? 13 : 12; // 12*32 = 384, 13*32 = 416
INT32 nXTile = nCpsScreenWidth>>5; // 12*32 = 384, 13*32 = 416

ix = (sx >> 5) + 1;
sx &= 31;
Expand Down
2 changes: 1 addition & 1 deletion src/burn/drv/capcom/cpsrd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ INT32 Cps2rRender()
INT32 y;
struct CpsrLineInfo *pli;
if (CpsrBase==NULL) return 1;
nXTiles = (Cps2Turbo) ? 26 : 24;
nXTiles = nCpsScreenWidth>>4; // 24*16 = 384, 26*16 = 416

nKnowBlank = -1; // We don't know which tile is blank yet

Expand Down
2,942 changes: 1,972 additions & 970 deletions src/burn/drv/capcom/d_cps1.cpp
View file

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/burn/drv/capcom/d_cps2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11579,11 +11579,6 @@ static INT32 Cps2TurboInit()
BurnSampleSetRoute(i + 0x40, BURN_SND_SAMPLE_ROUTE_2, 0.10, BURN_SND_ROUTE_RIGHT);
}

nCpsScreenWidth = 416;
nCpsScreenHeight = 234;
nCpsGlobalXOffset = 16;
nCpsGlobalYOffset = 5;

return Cps2Init();
}

Expand Down
316 changes: 172 additions & 144 deletions src/burn/drv/galaxian/d_galaxian.cpp
View file

Large diffs are not rendered by default.

12,525 changes: 6,385 additions & 6,140 deletions src/burn/drv/neogeo/d_neogeo.cpp
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/burn/drv/pre90s/d_fastfred.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ struct BurnDriver BurnDrvFlyboyb = {
"flyboyb", "flyboy", NULL, NULL, "1982",
"Fly-Boy (bootleg)\0", NULL, "bootleg", "Miscellaneous",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_ACTION, 0,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_ACTION, 0,
NULL, flyboybRomInfo, flyboybRomName, NULL, NULL, NULL, NULL, CommonInputInfo, FlyboyDIPInfo,
fastfredInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x100,
224, 256, 3, 4
Expand Down Expand Up @@ -1496,7 +1496,7 @@ static INT32 jumpcoasInit()

struct BurnDriver BurnDrvJumpcoas = {
"jumpcoas", NULL, NULL, NULL, "1983",
"Jump Coaster (World)\0", NULL, "Kaneko Elc. Co", "Miscellaneous",
"Jump Coaster (World)\0", NULL, "Kaneko Elc. Co.", "Miscellaneous",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
NULL, jumpcoasRomInfo, jumpcoasRomName, NULL, NULL, NULL, NULL, CommonInputInfo, JumpcoasDIPInfo,
Expand Down Expand Up @@ -1616,7 +1616,7 @@ struct BurnDriver BurnDrvBoggy84 = {
224, 256, 3, 4
};

// Boggy '84 (bootleg)
// Boggy '84 (bootleg, set 1)

static struct BurnRomInfo boggy84bRomDesc[] = {
{ "cpurom1.bin", 0x2000, 0x665266c0, 1 | BRF_PRG | BRF_ESS }, // 0 maincpu
Expand All @@ -1638,9 +1638,9 @@ STD_ROM_FN(boggy84b)

struct BurnDriver BurnDrvBoggy84b = {
"boggy84b", "boggy84", NULL, NULL, "1983",
"Boggy '84 (bootleg)\0", NULL, "bootleg (Eddie's Games)", "Miscellaneous",
"Boggy '84 (bootleg, set 1)\0", NULL, "bootleg (Eddie's Games)", "Miscellaneous",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_PRE90S, GBF_PLATFORM, 0,
NULL, boggy84bRomInfo, boggy84bRomName, NULL, NULL, NULL, NULL, TwoBtnInputInfo, Boggy84DIPInfo,
boggy84bInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x100,
224, 256, 3, 4
Expand Down
38 changes: 19 additions & 19 deletions src/burn/drv/pst90s/d_seta2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4086,12 +4086,12 @@ struct BurnDriverD BurnDrvFuncube4 = {
{ "u21.bin", 0x400000, 0x6f95e466, BRF_GRA }, \
{ "u32.bin", 0x100000, 0xcf0f3017, BRF_SND },

// Guardians / Denjin Makai II Pro (Hack)
// GOTVG 20230927
// Guardians / Denjin Makai II (Pro, Hack)
// GOTVG 20231206

static struct BurnRomInfo grdiandsRomDesc[] = {
{ "u2_ds.bin", 0x080000, 0x35c04add, BRF_ESS | BRF_PRG },
{ "u3_ds.bin", 0x080000, 0x5e4f89ce, BRF_ESS | BRF_PRG },
{ "u2_ds.bin", 0x080000, 0x751225ed, BRF_ESS | BRF_PRG },
{ "u3_ds.bin", 0x080000, 0xda4273e3, BRF_ESS | BRF_PRG },
GRDIANS_COMPONENT
};

Expand All @@ -4100,7 +4100,7 @@ STD_ROM_FN(grdiands)

struct BurnDriver BurnDrvGrdiands = {
"grdiands", "grdians", NULL, NULL, "2023",
"Guardians / Denjin Makai II Pro (Hack)\0", NULL, "hack", "Newer Seta",
"Guardians / Denjin Makai II (Pro, Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 Pro (Hack)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_SETA2, GBF_SCRFIGHT, 0,
NULL, grdiandsRomInfo, grdiandsRomName, NULL, NULL, NULL, NULL, grdiansInputInfo, grdiansDIPInfo,
Expand All @@ -4109,7 +4109,7 @@ struct BurnDriver BurnDrvGrdiands = {
};


// Guardians / Denjin Makai II Evil (Hack)
// Guardians / Denjin Makai II (Evil, Hack)
// GOTVG 20230918

static struct BurnRomInfo grdiansyRomDesc[] = {
Expand All @@ -4123,8 +4123,8 @@ STD_ROM_FN(grdiansy)

struct BurnDriver BurnDrvGrdiansy = {
"grdiansy", "grdians", NULL, NULL, "2023",
"Guardians / Denjin Makai II Evil (Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 Evil (Hack)\0", NULL, NULL, NULL,
"Guardians / Denjin Makai II (Evil, Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 (Evil, Hack)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_SETA2, GBF_SCRFIGHT, 0,
NULL, grdiansyRomInfo, grdiansyRomName, NULL, NULL, NULL, NULL, grdiansInputInfo, grdiansDIPInfo,
grdiansInit, grdiansExit, grdiansFrame, DrvDraw, grdiansScan, &bRecalcPalette, 0x8000,
Expand All @@ -4146,16 +4146,16 @@ STD_ROM_FN(grdiansp)

struct BurnDriver BurnDrvGrdiansp = {
"grdiansp", "grdians", NULL, NULL, "2023",
"Guardians / Denjin Makai II Plus (Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 Plus (Hack)\0", NULL, NULL, NULL,
"Guardians / Denjin Makai II (Plus, Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 (Plus, Hack)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_SETA2, GBF_SCRFIGHT, 0,
NULL, grdianspRomInfo, grdianspRomName, NULL, NULL, NULL, NULL, grdiansInputInfo, grdiansDIPInfo,
grdiansInit, grdiansExit, grdiansFrame, DrvDraw, grdiansScan, &bRecalcPalette, 0x8000,
304, 232, 4, 3
};


// Guardians / Denjin Makai II LBS (Hack)
// Guardians / Denjin Makai II (LBS, Hack)
// GOTVG 20231030

static struct BurnRomInfo grdianslRomDesc[] = {
Expand All @@ -4169,16 +4169,16 @@ STD_ROM_FN(grdiansl)

struct BurnDriver BurnDrvGrdiansl = {
"grdiansl", "grdians", NULL, NULL, "2023",
"Guardians / Denjin Makai II LBS (Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 LBS (Hack)\0", NULL, NULL, NULL,
"Guardians / Denjin Makai II (LBS, Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 (LBS, Hack)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_SETA2, GBF_SCRFIGHT, 0,
NULL, grdianslRomInfo, grdianslRomName, NULL, NULL, NULL, NULL, grdiansInputInfo, grdiansDIPInfo,
grdiansInit, grdiansExit, grdiansFrame, DrvDraw, grdiansScan, &bRecalcPalette, 0x8000,
304, 232, 4, 3
};


// Guardians / Denjin Makai II LBS Super (Hack)
// Guardians / Denjin Makai II (LBS Super, Hack)
// GOTVG 20210419

static struct BurnRomInfo grdianlsRomDesc[] = {
Expand All @@ -4192,16 +4192,16 @@ STD_ROM_FN(grdianls)

struct BurnDriver BurnDrvGrdianls = {
"grdianls", "grdians", NULL, NULL, "2021",
"Guardians / Denjin Makai II LBS Super (Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 LBS Super (Hack)\0", NULL, NULL, NULL,
"Guardians / Denjin Makai II (LBS Super, Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 (LBS Super, Hack)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_SETA2, GBF_SCRFIGHT, 0,
NULL, grdianlsRomInfo, grdianlsRomName, NULL, NULL, NULL, NULL, grdiansInputInfo, grdiansDIPInfo,
grdiansInit, grdiansExit, grdiansFrame, DrvDraw, grdiansScan, &bRecalcPalette, 0x8000,
304, 232, 4, 3
};


// Guardians / Denjin Makai II Reverie (Hack)
// Guardians / Denjin Makai II (Reverie, Hack)
// GOTVG 20220606

static struct BurnRomInfo grdiankeRomDesc[] = {
Expand All @@ -4215,8 +4215,8 @@ STD_ROM_FN(grdianke)

struct BurnDriver BurnDrvGrdianke = {
"grdianke", "grdians", NULL, NULL, "2022",
"Guardians / Denjin Makai II Reverie (Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 Reverie (Hack)\0", NULL, NULL, NULL,
"Guardians / Denjin Makai II (Reverie, Hack)\0", NULL, "hack", "Newer Seta",
L"Guardians\0\u96FB\u795E\u9B54\u584A \uFF29\uFF29 (Reverie, Hack)\0", NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_HACK | BDF_HISCORE_SUPPORTED, 2, HARDWARE_SETA2, GBF_SCRFIGHT, 0,
NULL, grdiankeRomInfo, grdiankeRomName, NULL, NULL, NULL, NULL, grdiansInputInfo, grdiansDIPInfo,
grdiansInit, grdiansExit, grdiansFrame, DrvDraw, grdiansScan, &bRecalcPalette, 0x8000,
Expand Down

0 comments on commit e887305

Please sign in to comment.