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

Improvements for wofh, playable now, no sound (I don't think it uses q-sound)

This commit is contained in:
Barry Harris 2012-04-14 20:29:01 +00:00
parent 972b474a22
commit 2b8898144d
4 changed files with 129 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/burn/drv/capcom/cps.h
View File

@ -84,6 +84,7 @@ INT32 Cps2LoadTilesSIM(UINT8 *Tile,INT32 nStart);
#define HACK_B_3 28
#define HACK_B_4 29
#define HACK_B_5 30
#define HACK_B_6 31
#define GFXTYPE_SPRITES (1<<0)
#define GFXTYPE_SCROLL1 (1<<1)
@ -333,6 +334,7 @@ INT32 CpsObjGet();
INT32 FcrashObjGet();
INT32 KodbObjGet();
INT32 DinopicObjGet();
INT32 WofhObjGet();
void CpsObjDrawInit();
INT32 Cps1ObjDraw(INT32 nLevelFrom,INT32 nLevelTo);
INT32 Cps2ObjDraw(INT32 nLevelFrom,INT32 nLevelTo);

28
src/burn/drv/capcom/cps_config.cpp
View File

@ -1689,5 +1689,33 @@ void SetCpsBId(INT32 CpsBId, INT32 bStars)
}
return;
}
case HACK_B_6: {
CpsBID[0] = 0x00;
CpsBID[1] = 0x00;
CpsBID[2] = 0x00;
CpsMProt[0] = 0x00;
CpsMProt[1] = 0x00;
CpsMProt[2] = 0x00;
CpsMProt[3] = 0x00;
nCpsLcReg = 0x60;
MaskAddr[0] = 0x66;
MaskAddr[1] = 0x68;
MaskAddr[2] = 0x6c;
MaskAddr[3] = 0x6e;
nCpsPalCtrlReg = 0x6a;
CpsLayEn[1] = 0x02;
CpsLayEn[2] = 0x04;
CpsLayEn[3] = 0x08;
if (bStars) {
CpsLayEn[4] = 0x30;
CpsLayEn[5] = 0x30;
}
return;
}
}
}

55
src/burn/drv/capcom/cps_obj.cpp
View File

@ -564,6 +564,61 @@ INT32 DinopicObjGet()
return 0;
}
INT32 WofhObjGet()
{
INT32 i;
UINT8 *pg, *po;
struct ObjFrame* pof;
UINT8* Get = NULL;
pof = of + nGetNext;
pof->nCount = 0;
po = pof->Obj;
pof->nShiftX = -0x40;
pof->nShiftY = -0x10;
Get = CpsRam90 + 0x1000;
if (Get==NULL) return 1;
// Make a copy of all active sprites in the list
for (pg = Get, i = 0; i < nMax; pg += 8, i++) {
UINT16* ps = (UINT16*)pg;
INT32 n, y, x, a;
y = BURN_ENDIAN_SWAP_INT16(ps[-1]);
if (y == 0x8000) { // end of sprite list
break;
}
n = BURN_ENDIAN_SWAP_INT16(ps[0]);
a = BURN_ENDIAN_SWAP_INT16(ps[1]);
x = BURN_ENDIAN_SWAP_INT16(ps[2]);
po[0] = n & 0xff;
po[1] = n >> 8;
po[2] = a & 0xff;
po[3] = a >> 8;
po[4] = x & 0xff;
po[5] = x >> 8;
po[6] = y & 0xff;
po[7] = y >> 8;
pof->nCount++;
po += 8;
}
nGetNext++;
if (nGetNext >= nFrameCount) {
nGetNext = 0;
}
return 0;
}
INT32 FcrashObjDraw(INT32 nLevelFrom,INT32 nLevelTo)
{
INT32 i; UINT16 *ps; INT32 nPsAdd;

84
src/burn/drv/capcom/d_cps1.cpp
View File

@ -3374,12 +3374,23 @@ STDDIPINFO(Wof)
static struct BurnDIPInfo WofhDIPList[]=
{
// Defaults
{0x1b, 0xff, 0xff, 0x08, NULL },
{0x1b, 0xff, 0xff, 0x03, NULL },
{0x1c, 0xff, 0xff, 0x00, NULL },
{0x1d, 0xff, 0xff, 0xff, NULL },
// Dip A
{0 , 0xfe, 0 , 2 , "Play Mode" },
{0x1b, 0x01, 0x03, 0x03, "Normal" },
{0x1b, 0x01, 0x03, 0x00, "Tournament" },
// Dip B
{0 , 0xfe, 0 , 4 , "Coinage" },
{0x1c, 0x01, 0x03, 0x00, "1 Coin 1 Credit" },
{0x1c, 0x01, 0x03, 0x01, "1 Coin 2 Credits" },
{0x1c, 0x01, 0x03, 0x02, "1 Coin 3 Credits" },
{0x1c, 0x01, 0x03, 0x03, "1 Coin 4 Credits" },
// Dip C
{0 , 0xfe, 0 , 2 , "Freeze" },
{0x1b, 0x01, 0x08, 0x08, "Off" },
{0x1b, 0x01, 0x08, 0x00, "On" },
};
STDDIPINFO(Wofh)
@ -10538,7 +10549,7 @@ static const struct GameConfig ConfigTable[] =
{ "wof3sja" , HACK_B_3 , mapper_TK263B, 0, wof_decode },
{ "wofaha" , CPS_B_21_DEF, mapper_TK263B, 0, wof_decode },
{ "wofah" , CPS_B_21_DEF, mapper_TK263B, 0, wof_decode },
{ "wofh" , HACK_B_3 , mapper_TK263B, 0, wof_decode },
{ "wofh" , HACK_B_6 , mapper_TK263B, 0, wof_decode },
{ "wofha" , HACK_B_3 , mapper_TK263B, 0, wof_decode },
{ "wofjh" , CPS_B_21_QS1, mapper_TK263B, 0, wof_decode },
{ "wofsj" , HACK_B_3 , mapper_TK263B, 0, wof_decode },
@ -12604,44 +12615,36 @@ UINT16 __fastcall Wofh135ReadWord(UINT32)
UINT8 __fastcall WofhInputReadByte(UINT32 a)
{
switch (a) {
/* case 0x880000: {
case 0x880000: {
return ~Inp000;
}
case 0x880008: {
return ~Inp018;
case 0x880001: {
return ~Inp001;
}
case 0x88000a: {
return ~Cpi01A;
}
case 0x88000c: {
return ~Cpi01C;
}
case 0x88000e: {
return ~Cpi01E;
}*/
case 0x880006: {
return ~Inp018;
}
case 0x880008: {
case 0x880007: {
return 0xff;
}
case 0x880008: {
return ~Cpi01A;
}
case 0x88000a: {
return 0xff;
return ~Cpi01C;
}
case 0x88000c: {
return 0xff;
return ~Cpi01E;
}
case 0x880e78: {
return ~Cpi01E;
return ~Inp177;
}
default: {
@ -12654,9 +12657,11 @@ UINT8 __fastcall WofhInputReadByte(UINT32 a)
UINT16 __fastcall WofhInputReadWord(UINT32 a)
{
SEK_DEF_READ_WORD(3, a);
switch (a) {
case 0x880000: {
return 0xffff;
return ((~Inp000) << 8) | ~Inp001;
}
case 0x880006: {
@ -12683,6 +12688,7 @@ void __fastcall WofhInputWriteByte(UINT32 a, UINT8 d)
void __fastcall WofhInputWriteWord(UINT32 a, UINT16 d)
{
switch (a) {
default: {
bprintf(PRINT_NORMAL, _T("Input Write word %x, %x\n"), a, d);
}
@ -12694,24 +12700,22 @@ static void WofhCallback()
// Patch protection? check
CpsRom[0xf11ed] = 0x4e;
CpsRom[0xf11ec] = 0x71;
CpsRom[0xf11ef] = 0x4e;
CpsRom[0xf11ee] = 0x71;
// CpsRom[0xf11ef] = 0x4e;
// CpsRom[0xf11ee] = 0x71;
}
static INT32 WofhInit()
{
INT32 nRet = 0;
AmendProgRomCallback = WofhCallback;
Cps1OverrideLayers = 1;
nCps1Layers[0] = 0;
nCps1Layers[1] = 1;
nCps1Layers[2] = 2;
nCps1Layers[3] = 3;
bCpsUpdatePalEveryFrame = 1;
CpsLayer1XOffs = 0xffc0;
// CpsLayer2XOffs = 0xffc0;
// CpsLayer3XOffs = 0xffc0;
CpsLayer2XOffs = 0xffc0;
CpsLayer3XOffs = 0xffc0;
AmendProgRomCallback = WofhCallback;
Cps1ObjGetCallbackFunction = WofhObjGet;
Cps1ObjDrawCallbackFunction = FcrashObjDraw;
nRet = TwelveMhzInit();
@ -14980,11 +14984,11 @@ struct BurnDriverD BurnDrvCpsWofaha = {
&CpsRecalcPal, 0x1000, 384, 224, 4, 3
};
struct BurnDriverD BurnDrvCpsWofh = {
struct BurnDriver BurnDrvCpsWofh = {
"wofh", "wof", NULL, NULL, "1992",
"Sangokushi II: Sanguo Yingxiong Zhuan (Chinese bootleg set 1)\0", NULL, "bootleg", "CPS1 / QSound",
"Sangokushi II: Sanguo Yingxiong Zhuan (Chinese bootleg set 1)\0", "No sound, some sprite priority problems", "bootleg", "CPS1 / QSound",
NULL, NULL, NULL, NULL,
BDF_CLONE | BDF_BOOTLEG, 3, HARDWARE_CAPCOM_CPS1_QSOUND, GBF_SCRFIGHT, 0,
BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 3, HARDWARE_CAPCOM_CPS1_QSOUND, GBF_SCRFIGHT, 0,
NULL, WofhRomInfo, WofhRomName, NULL, NULL, WofhfhInputInfo, WofhDIPInfo,
WofhInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 384, 224, 4, 3