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

Avoid rom merge conflict in sf2hunghsi (using MAME convention)

This commit is contained in:
Barry Harris 2013-08-10 09:55:07 +00:00
parent c81a60a818
commit a5b7436f65
1 changed files with 2 additions and 2 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

@ -9176,8 +9176,8 @@ STD_ROM_PICK(Sf2dongb)
STD_ROM_FN(Sf2dongb)
static struct BurnRomInfo Sf2hunghsiRomDesc[] = {
{ "23", 0x0080000, 0x5cf63a9e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "22", 0x0080000, 0x3ed72bca, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "23(__sf2hunghsi)", 0x0080000, 0x5cf63a9e, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "22(__sf2hunghsi)", 0x0080000, 0x3ed72bca, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "s92_21a.bin", 0x0080000, 0x925a7877, BRF_ESS | BRF_PRG | CPS1_68K_PROGRAM_NO_BYTESWAP },
{ "s92_01.bin", 0x080000, 0x03b0d852, BRF_GRA | CPS1_TILES },