diff --git a/src/burn/drv/capcom/cps2_crpt.cpp b/src/burn/drv/capcom/cps2_crpt.cpp index 6c0ea16d3..f87cdccba 100644 --- a/src/burn/drv/capcom/cps2_crpt.cpp +++ b/src/burn/drv/capcom/cps2_crpt.cpp @@ -816,7 +816,7 @@ static const struct game_keys keys_table[] = { "ssf2tu", { 0x94fa8902,0x4c77143f }, 0x400000 }, // 0838 0007 2000 btst #7,$2000 { "ssf2tur1", { 0x94fa8902,0x4c77143f }, 0x400000 }, // 0838 0007 2000 btst #7,$2000 { "ssf2xj", { 0x942a5702,0x05ac140e }, 0x400000 }, // 0838 0007 2000 btst #7,$2000 - { "ssf2xjr", { 0x943c2b02,0x7acd1422 }, 0x400000 }, // 0838 0007 2000 btst #7,$2000 // curious, not the usual Japan key on the rent version + { "ssf2xjr", { 0x943c2b02,0x7acd1422 }, 0x400000 }, // 0838 0007 2000 btst #7,$2000 // curious, not the usual Japan key on the rent version { "xmcota", { 0x3bc6eda4,0x97f80251 }, 0x100000 }, // 0C80 1972 0301 cmpi.l #$19720301,D0 { "xmcotar1", { 0x3bc6eda4,0x97f80251 }, 0x100000 }, // 0C80 1972 0301 cmpi.l #$19720301,D0 { "xmcotau", { 0x32a57ecd,0x98016f4b }, 0x100000 }, // 0C80 1972 0301 cmpi.l #$19720301,D0 @@ -870,7 +870,7 @@ static const struct game_keys keys_table[] = { "nwarrb", { 0x17c67109,0xb7362a20 }, 0x180000 }, // 0838 0000 6160 btst #0,$6160 { "nwarra", { 0x4e940d0c,0x39b861a4 }, 0x180000 }, // 0838 0000 6160 btst #0,$6160 { "vhuntj", { 0x1135b2c3,0xa4e9d7f2 }, 0x180000 }, // 0838 0000 6160 btst #0,$6160 - { "vhuntjr1s", { 0x1135b2c3,0xa4e9d7f2 }, 0x180000 }, // 0838 0000 6160 btst #0,$6160 + { "vhuntjr1s", { 0x1135b2c3,0xa4e9d7f2 }, 0x180000 }, // 0838 0000 6160 btst #0,$6160 { "vhuntjr1", { 0x1135b2c3,0xa4e9d7f2 }, 0x180000 }, // 0838 0000 6160 btst #0,$6160 { "vhuntjr2", { 0x1135b2c3,0xa4e9d7f2 }, 0x180000 }, // 0838 0000 6160 btst #0,$6160 { "sfa", { 0x0f895d6e,0xc4273a1b }, 0x080000 }, // 0C80 0564 2194 cmpi.l #$05642194,D0 @@ -887,10 +887,11 @@ static const struct game_keys keys_table[] = { "sfzhr1", { 0x876b0e39,0x5ca24fd1 }, 0x080000 }, // 0C80 0564 2194 cmpi.l #$05642194,D0 { "sfzb", { 0xef415bd3,0x7a92c680 }, 0x080000 }, // 0C80 0564 2194 cmpi.l #$05642194,D0 { "sfzbr1", { 0xef415bd3,0x7a92c680 }, 0x080000 }, // 0C80 0564 2194 cmpi.l #$05642194,D0 - { "mmancp2u", { 0x054893fa,0x94642525 }, 0x100000 }, // 0C80 0564 2194 cmpi.l #$05642194,D0 + { "mmancp2u", { 0x054893fa,0x94642525 }, 0x100000 }, // 0C80 0564 2194 cmpi.l #$05642194,D0 { "rmancp2j", { 0x07215501,0x37fa32d0 }, 0x100000 }, // 0C80 0564 2194 cmpi.l #$05642194,D0 { "19xx", { 0x0e07181f,0x5fd0f080 }, 0x200000 }, // 0C81 0095 1101 cmpi.l #$00951101,D1 { "19xxa", { 0xcce74cf5,0xb7da3711 }, 0x200000 }, // 0C81 0095 1101 cmpi.l #$00951101,D1 + { "19xxar1", { 0xcce74cf5,0xb7da3711 }, 0x200000 }, // 0C81 0095 1101 cmpi.l #$00951101,D1 { "19xxj", { 0x00115df8,0x000ff87e }, 0x200000 }, // 0C81 0095 1101 cmpi.l #$00951101,D1 { "19xxjr1", { 0x00115df8,0x000ff87e }, 0x200000 }, // 0C81 0095 1101 cmpi.l #$00951101,D1 { "19xxjr2", { 0x00115df8,0x000ff87e }, 0x200000 }, // 0C81 0095 1101 cmpi.l #$00951101,D1 diff --git a/src/burn/drv/capcom/d_cps2.cpp b/src/burn/drv/capcom/d_cps2.cpp index 55137dd11..ba6323891 100644 --- a/src/burn/drv/capcom/d_cps2.cpp +++ b/src/burn/drv/capcom/d_cps2.cpp @@ -854,6 +854,31 @@ STD_ROM_PICK(Ninexx) STD_ROM_FN(Ninexx) static struct BurnRomInfo NinexxaRomDesc[] = { + { "09xa.03b", 0x080000, 0x2e994897, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, /* Yes it's actually 09xa, that's not a typo */ + { "09xa.04b", 0x080000, 0x6364d001, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, /* Yes it's actually 09xa, that's not a typo */ + { "09xa.05b", 0x080000, 0x00c1949b, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, /* Yes it's actually 09xa, that's not a typo */ + { "09xa.06b", 0x080000, 0x363c1f6e, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, /* Yes it's actually 09xa, that's not a typo */ + { "19xa.07", 0x080000, 0x61c0296c, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, /* This one was different, it actually was 19xa */ + + { "19x.13m", 0x080000, 0x427aeb18, CPS2_GFX | BRF_GRA }, + { "19x.15m", 0x080000, 0x63bdbf54, CPS2_GFX | BRF_GRA }, + { "19x.17m", 0x080000, 0x2dfe18b5, CPS2_GFX | BRF_GRA }, + { "19x.19m", 0x080000, 0xcbef9579, CPS2_GFX | BRF_GRA }, + { "19x.14m", 0x200000, 0xe916967c, CPS2_GFX | BRF_GRA }, + { "19x.16m", 0x200000, 0x6e75f3db, CPS2_GFX | BRF_GRA }, + { "19x.18m", 0x200000, 0x2213e798, CPS2_GFX | BRF_GRA }, + { "19x.20m", 0x200000, 0xab9d5b96, CPS2_GFX | BRF_GRA }, + + { "19x.01", 0x020000, 0xef55195e, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG }, + + { "19x.11m", 0x200000, 0xd38beef3, CPS2_QSND | BRF_SND }, + { "19x.12m", 0x200000, 0xd47c96e2, CPS2_QSND | BRF_SND }, +}; + +STD_ROM_PICK(Ninexxa) +STD_ROM_FN(Ninexxa) + +static struct BurnRomInfo Ninexxar1RomDesc[] = { { "19xa.03", 0x080000, 0x0c20fd50, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, { "19xa.04", 0x080000, 0x1fc37508, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, { "19xa.05", 0x080000, 0x6c9cc4ed, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, @@ -875,8 +900,8 @@ static struct BurnRomInfo NinexxaRomDesc[] = { { "19x.12m", 0x200000, 0xd47c96e2, CPS2_QSND | BRF_SND }, }; -STD_ROM_PICK(Ninexxa) -STD_ROM_FN(Ninexxa) +STD_ROM_PICK(Ninexxar1) +STD_ROM_FN(Ninexxar1) static struct BurnRomInfo NinexxbRomDesc[] = { { "19xb.03a", 0x080000, 0x341bdf4a, CPS2_PRG_68K | BRF_ESS | BRF_PRG }, @@ -7478,7 +7503,7 @@ struct BurnDriver BurnDrvCps19xx = { struct BurnDriver BurnDrvCps19xxa = { "19xxa", "19xx", NULL, NULL, "1995", - "19XX - the war against destiny (951207 Asia)\0", NULL, "Capcom", "CPS2", + "19XX - the war against destiny (960104 Asia)\0", NULL, "Capcom", "CPS2", NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_CAPCOM_CPS2, GBF_VERSHOOT, FBF_19XX, NULL, NinexxaRomInfo, NinexxaRomName, NULL, NULL, NineXXInputInfo, NULL, @@ -7486,6 +7511,16 @@ struct BurnDriver BurnDrvCps19xxa = { &CpsRecalcPal, 0x1000, 224, 384, 3, 4 }; +struct BurnDriver BurnDrvCps19xxar1 = { + "19xxar1", "19xx", NULL, NULL, "1995", + "19XX - the war against destiny (951207 Asia)\0", NULL, "Capcom", "CPS2", + NULL, NULL, NULL, NULL, + BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_CAPCOM_CPS2, GBF_VERSHOOT, FBF_19XX, + NULL, Ninexxar1RomInfo, Ninexxar1RomName, NULL, NULL, NineXXInputInfo, NULL, + Cps2Init, DrvExit, Cps2Frame, CpsRedraw, CpsAreaScan, + &CpsRecalcPal, 0x1000, 224, 384, 3, 4 +}; + struct BurnDriver BurnDrvCps19xxb = { "19xxb", "19xx", NULL, NULL, "1995", "19XX - the war against destiny (951218 Brazil)\0", NULL, "Capcom", "CPS2",