add missing parantheses & fail miserably at trying to get ghouls and ghouls1 working

This commit is contained in:
dinkc64 2014-08-09 19:35:46 +00:00
parent 0352e8b176
commit 77b8781407
3 changed files with 13 additions and 5 deletions

View File

@ -615,8 +615,8 @@ struct BurnDriver BurnDrvmd_gameto = {
// Ghouls'n Ghosts (Euro, USA, Kor, Rev. A)
static struct BurnRomInfo md_ghoulsRomDesc[] = {
{ "mpr-12605a.ic1", 0x020000, 0xd367c3cc, BRF_PRG | SEGA_MD_ROM_LOAD_NORMAL | SEGA_MD_ROM_OFFS_000000 },
{ "mpr-12606a.ic2", 0x080000, 0xf56444c6, BRF_PRG | SEGA_MD_ROM_LOAD_NORMAL | SEGA_MD_ROM_OFFS_020000 },
{ "mpr-12605a t04.ic1", 0x020000, 0xd367c3cc, BRF_PRG | SEGA_MD_ROM_LOAD16_WORD_SWAP | SEGA_MD_ROM_OFFS_000000 },
{ "mpr-12606a w57.ic2", 0x080000, 0x5291d097, BRF_PRG | SEGA_MD_ROM_LOAD16_WORD_SWAP_CONTINUE_020000_080000 | SEGA_MD_ROM_OFFS_080000 },
};
STD_ROM_PICK(md_ghouls)
@ -634,8 +634,8 @@ struct BurnDriver BurnDrvmd_ghouls = {
// Ghouls'n Ghosts (Euro, USA)
static struct BurnRomInfo md_ghouls1RomDesc[] = {
{ "mpr-12605.ic1", 0x020000, 0x1066c6ab, BRF_PRG | SEGA_MD_ROM_LOAD_NORMAL | SEGA_MD_ROM_OFFS_000000 },
{ "mpr-12606.ic2", 0x080000, 0xceebc56f, BRF_PRG | SEGA_MD_ROM_LOAD_NORMAL | SEGA_MD_ROM_OFFS_020000 },
{ "mpr-12605 t02.ic1", 0x020000, 0x1066c6ab, BRF_PRG | SEGA_MD_ROM_LOAD16_WORD_SWAP | SEGA_MD_ROM_OFFS_000000 },
{ "mpr-12606 r32.ic2", 0x080000, 0xd0be7777, BRF_PRG | SEGA_MD_ROM_LOAD16_WORD_SWAP_CONTINUE_020000_080000 | SEGA_MD_ROM_OFFS_080000 },
};
STD_ROM_PICK(md_ghouls1)

View File

@ -1372,6 +1372,13 @@ static INT32 MegadriveLoadRoms(bool bLoad)
break;
}
case SEGA_MD_ROM_LOAD16_WORD_SWAP_CONTINUE_020000_080000: { // ghouls[1]
nRet = BurnLoadRom(RomMain + Offset, i, 1); if (nRet) return 1;
memmove(RomMain + 0x020000, RomMain + 0x100000, 0x60000); // tried memcpy & memmove just incase...
BurnByteswap(RomMain + Offset, 0x140000);
break;
}
case SEGA_MD_ROM_LOAD16_WORD_SWAP_CONTINUE_040000_100000: {
nRet = BurnLoadRom(RomMain + Offset, i, 1); if (nRet) return 1;
memcpy(RomMain + 0x100000, RomMain + 0x040000, 0x40000);
@ -2208,7 +2215,7 @@ static void SetupCustomCartridgeMappers()
}
if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_KOF99 ||
BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_POKEMON) {
(BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_POKEMON) {
SekOpen(0);
SekMapHandler(7, 0xa13000, 0xa1303f, SM_READ);
SekSetReadByteHandler(7, Kof99A13000ReadByte);

View File

@ -2,6 +2,7 @@
#define SEGA_MD_ROM_LOAD16_WORD_SWAP 0x20
#define SEGA_MD_ROM_LOAD16_BYTE 0x30
#define SEGA_MD_ROM_LOAD16_WORD_SWAP_CONTINUE_040000_100000 0x40
#define SEGA_MD_ROM_LOAD16_WORD_SWAP_CONTINUE_020000_080000 0x50
#define SEGA_MD_ROM_OFFS_000000 0x01
#define SEGA_MD_ROM_OFFS_000001 0x02
#define SEGA_MD_ROM_OFFS_020000 0x03