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

Avoid rom merge conflicts (using MAME policy on renaming)

This commit is contained in:
Barry Harris 2013-04-01 10:08:56 +00:00
parent 9c95b7f447
commit 04bcf02bf5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10024,7 +10024,7 @@ static struct BurnRomInfo Sf2ceuab5RomDesc[] = {
{ "15.bin", 0x080000, 0x8c08c9bd, BRF_OPT }, { "15.bin", 0x080000, 0x8c08c9bd, BRF_OPT },
{ "23.bin", 0x080000, 0xf613febd, BRF_OPT }, { "23.bin", 0x080000, 0xf613febd, BRF_OPT },
{ "16.bin", 0x080000, 0xf23b588b, BRF_OPT }, { "16.bin", 0x080000, 0xf23b588b, BRF_OPT },
{ "24.bin", 0x080000, 0xb4f16226, BRF_OPT }, { "24(__sf2ceuab5).bin", 0x080000, 0xb4f16226, BRF_OPT },
}; };
STD_ROM_PICK(Sf2ceuab5) STD_ROM_PICK(Sf2ceuab5)
@ -10114,7 +10114,7 @@ static struct BurnRomInfo Sf2ceucblRomDesc[] = {
{ "15.bin", 0x080000, 0x8c08c9bd, BRF_OPT }, { "15.bin", 0x080000, 0x8c08c9bd, BRF_OPT },
{ "23.bin", 0x080000, 0xf613febd, BRF_OPT }, { "23.bin", 0x080000, 0xf613febd, BRF_OPT },
{ "16.bin", 0x080000, 0xf23b588b, BRF_OPT }, { "16.bin", 0x080000, 0xf23b588b, BRF_OPT },
{ "24.bin", 0x080000, 0xb4f16226, BRF_OPT }, { "24(__sf2ceucbl).bin", 0x080000, 0xb4f16226, BRF_OPT },
}; };
STD_ROM_PICK(Sf2ceucbl) STD_ROM_PICK(Sf2ceucbl)

2
src/burn/drv/capcom/d_cps2.cpp
View File

@ -10096,7 +10096,7 @@ static struct BurnRomInfo Hsf2daRomDesc[] = {
{ "hs2.01", 0x020000, 0xc1a13786, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG }, { "hs2.01", 0x020000, 0xc1a13786, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
{ "hs2.02", 0x020000, 0x2d8794aa, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG }, { "hs2.02", 0x020000, 0x2d8794aa, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
{ "hs2.11m", 0x400000, 0x5cb00496, CPS2_QSND | BRF_SND }, { "hs2(__hsf2da).11m", 0x400000, 0x5cb00496, CPS2_QSND | BRF_SND },
{ "hs2.12m", 0x400000, 0x8f298007, CPS2_QSND | BRF_SND }, { "hs2.12m", 0x400000, 0x8f298007, CPS2_QSND | BRF_SND },
}; };