diff --git a/src/burn/drv/konami/d_88games.cpp b/src/burn/drv/konami/d_88games.cpp index 9bd2e550e..dccfb47d4 100644 --- a/src/burn/drv/konami/d_88games.cpp +++ b/src/burn/drv/konami/d_88games.cpp @@ -280,13 +280,13 @@ static void games88_set_lines(INT32 lines) INT32 nBank = 0x10000 + (lines & 0x07) * 0x2000; - konamiMapMemory(DrvKonROM + nBank, 0x0000, 0x0fff, KON_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x0000, 0x0fff, MAP_ROM); if (lines & 8) { - konamiMapMemory(DrvPalRAM, 0x1000, 0x1fff, KON_RAM); + konamiMapMemory(DrvPalRAM, 0x1000, 0x1fff, MAP_RAM); } else { - konamiMapMemory(DrvKonROM + nBank + 0x1000, 0x1000, 0x1fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x0000, 0x1000, 0x1fff, KON_WRITE); // unmap writes + konamiMapMemory(DrvKonROM + nBank + 0x1000, 0x1000, 0x1fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x0000, 0x1000, 0x1fff, MAP_WRITE); // unmap writes } videobank = lines & 0x10; @@ -440,10 +440,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvPalRAM + 0x0000, 0x1000, 0x1fff, KON_RAM); - konamiMapMemory(DrvKonRAM, 0x2000, 0x2fff, KON_RAM); - konamiMapMemory(DrvNVRAM, 0x3000, 0x37ff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x8000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvPalRAM + 0x0000, 0x1000, 0x1fff, MAP_RAM); + konamiMapMemory(DrvKonRAM, 0x2000, 0x2fff, MAP_RAM); + konamiMapMemory(DrvNVRAM, 0x3000, 0x37ff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x8000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(games88_main_write); konamiSetReadHandler(games88_main_read); konamiSetlinesCallback(games88_set_lines); diff --git a/src/burn/drv/konami/d_blockhl.cpp b/src/burn/drv/konami/d_blockhl.cpp index bcdc8f7ea..011417d20 100644 --- a/src/burn/drv/konami/d_blockhl.cpp +++ b/src/burn/drv/konami/d_blockhl.cpp @@ -214,12 +214,12 @@ static void blockhl_set_lines(INT32 lines) { INT32 nBank = (lines & 0x03) * 0x2000; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); if (~lines & 0x20) { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); } K052109RMRDLine = lines & 0x40; @@ -327,10 +327,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, KON_RAM); - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x00000, 0x6000, 0x7fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x00000, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(blockhl_main_write); konamiSetReadHandler(blockhl_main_read); konamiSetlinesCallback(blockhl_set_lines); diff --git a/src/burn/drv/konami/d_crimfght.cpp b/src/burn/drv/konami/d_crimfght.cpp index 550e0ece5..2bbeb6903 100644 --- a/src/burn/drv/konami/d_crimfght.cpp +++ b/src/burn/drv/konami/d_crimfght.cpp @@ -252,9 +252,9 @@ static void set_ram_bank(INT32 data) nDrvRamBank[0] = data; if (data & 0x20) { - konamiMapMemory(DrvPalRAM, 0x0000, 0x03ff, KON_RAM); + konamiMapMemory(DrvPalRAM, 0x0000, 0x03ff, MAP_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, MAP_RAM); } } @@ -377,7 +377,7 @@ static void crimfght_set_lines(INT32 lines) INT32 nBank = 0x10000 + ((lines & 0x0f) * 0x2000); - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); } static void K052109Callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *flipx, INT32 *) @@ -492,10 +492,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, KON_RAM); - konamiMapMemory(DrvKonRAM, 0x0400, 0x1fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, MAP_RAM); + konamiMapMemory(DrvKonRAM, 0x0400, 0x1fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(crimfght_main_write); konamiSetReadHandler(crimfght_main_read); konamiSetlinesCallback(crimfght_set_lines); diff --git a/src/burn/drv/konami/d_gberet.cpp b/src/burn/drv/konami/d_gberet.cpp index ff3f4016d..19b0eae8c 100644 --- a/src/burn/drv/konami/d_gberet.cpp +++ b/src/burn/drv/konami/d_gberet.cpp @@ -15,7 +15,7 @@ static UINT8 nmi_enable, irq_enable; static UINT16 gberetb_scroll; static UINT8 flipscreen; static UINT8 gberet_spritebank; -static INT32 mrgoemon_bank; +static INT32 mrgoemon_bank; static UINT8 soundlatch; static INT32 game_type = 0; // 0 gberet / rushatck, 1 gberetb, 2 mrgoemon diff --git a/src/burn/drv/konami/d_gbusters.cpp b/src/burn/drv/konami/d_gbusters.cpp index f663a3e64..880c2beef 100644 --- a/src/burn/drv/konami/d_gbusters.cpp +++ b/src/burn/drv/konami/d_gbusters.cpp @@ -148,9 +148,9 @@ static void set_ram_bank(INT32 data) nDrvRamBank[0] = data; if (~data & 0x01) { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); } } @@ -272,7 +272,7 @@ static void gbusters_set_lines(INT32 lines) nDrvKonamiBank[1] = lines; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); } static void DrvK007232VolCallback(INT32 v) @@ -386,10 +386,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, KON_RAM); - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(gbusters_main_write); konamiSetReadHandler(gbusters_main_read); konamiSetlinesCallback(gbusters_set_lines); diff --git a/src/burn/drv/konami/d_hcastle.cpp b/src/burn/drv/konami/d_hcastle.cpp index 83fbe6c78..0c1ca1d81 100644 --- a/src/burn/drv/konami/d_hcastle.cpp +++ b/src/burn/drv/konami/d_hcastle.cpp @@ -160,7 +160,7 @@ static void bankswitch(INT32 data) *nDrvKonBank = data & 0x0f; INT32 bankaddress = *nDrvKonBank * 0x2000; - konamiMapMemory(DrvKonROM + 0x10000 + bankaddress, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + bankaddress, 0x6000, 0x7fff, MAP_ROM); } static void playfield_write(INT32 address, INT32 data, UINT8 *ctrl, UINT8 *spr, UINT8 *buf) @@ -473,15 +473,15 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM0, 0x0000, 0x00ff, KON_ROM); //020-03f - konamiMapMemory(DrvKonRAM1, 0x0200, 0x02ff, KON_ROM); //220-23f - konamiMapMemory(DrvPalRAM, 0x0600, 0x1fff, KON_RAM); - konamiMapMemory(DrvPf1RAM, 0x2000, 0x2fff, KON_RAM); - konamiMapMemory(DrvSprRAM1, 0x3000, 0x3fff, KON_RAM); - konamiMapMemory(DrvPf2RAM, 0x4000, 0x4fff, KON_RAM); - konamiMapMemory(DrvSprRAM2, 0x5000, 0x5fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); - konamiMapMemory(DrvKonROM, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM0, 0x0000, 0x00ff, MAP_ROM); //020-03f + konamiMapMemory(DrvKonRAM1, 0x0200, 0x02ff, MAP_ROM); //220-23f + konamiMapMemory(DrvPalRAM, 0x0600, 0x1fff, MAP_RAM); + konamiMapMemory(DrvPf1RAM, 0x2000, 0x2fff, MAP_RAM); + konamiMapMemory(DrvSprRAM1, 0x3000, 0x3fff, MAP_RAM); + konamiMapMemory(DrvPf2RAM, 0x4000, 0x4fff, MAP_RAM); + konamiMapMemory(DrvSprRAM2, 0x5000, 0x5fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(hcastle_write); konamiSetReadHandler(hcastle_read); konamiClose(); diff --git a/src/burn/drv/konami/d_parodius.cpp b/src/burn/drv/konami/d_parodius.cpp index 55f747875..c27207625 100644 --- a/src/burn/drv/konami/d_parodius.cpp +++ b/src/burn/drv/konami/d_parodius.cpp @@ -326,7 +326,7 @@ static void parodius_set_lines(INT32 lines) { nDrvRomBank[0] = lines; - konamiMapMemory(DrvKonROM + 0x10000 + ((~lines & 0x0f) * 0x4000), 0x6000, 0x9fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + ((~lines & 0x0f) * 0x4000), 0x6000, 0x9fff, MAP_ROM); } static INT32 DrvDoReset() @@ -416,9 +416,9 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x9fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x0a000, 0xa000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x9fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x0a000, 0xa000, 0xffff, MAP_ROM); konamiSetWriteHandler(parodius_main_write); konamiSetReadHandler(parodius_main_read); konamiSetlinesCallback(parodius_set_lines); diff --git a/src/burn/drv/konami/d_simpsons.cpp b/src/burn/drv/konami/d_simpsons.cpp index 6dc06942a..dd974db3d 100644 --- a/src/burn/drv/konami/d_simpsons.cpp +++ b/src/burn/drv/konami/d_simpsons.cpp @@ -316,7 +316,7 @@ static void simpsons_set_lines(INT32 lines) INT32 nBank = (lines & 0x3f) * 0x2000; - konamiMapMemory(DrvKonROM + 0x10000 + nBank, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + nBank, 0x6000, 0x7fff, MAP_ROM); } static void K052109Callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *, INT32 *) @@ -457,9 +457,9 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x5fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x5fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(simpsons_main_write); konamiSetReadHandler(simpsons_main_read); konamiSetlinesCallback(simpsons_set_lines); diff --git a/src/burn/drv/konami/d_surpratk.cpp b/src/burn/drv/konami/d_surpratk.cpp index f1a89b654..fcb4bd4e6 100644 --- a/src/burn/drv/konami/d_surpratk.cpp +++ b/src/burn/drv/konami/d_surpratk.cpp @@ -264,7 +264,7 @@ static void K053245Callback(INT32 *code, INT32 *color, INT32 *priority) static void supratk_set_lines(INT32 lines) { nDrvRomBank[0] = lines; - konamiMapMemory(DrvKonROM + 0x10000 + ((lines & 0x1f) * 0x2000), 0x2000, 0x3fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + ((lines & 0x1f) * 0x2000), 0x2000, 0x3fff, MAP_ROM); } static void DrvYM2151IRQHandler(INT32 nStatus) @@ -346,9 +346,9 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x2000, 0x3fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x2000, 0x3fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(supratk_write); konamiSetReadHandler(supratk_read); konamiSetlinesCallback(supratk_set_lines); diff --git a/src/burn/drv/konami/d_thunderx.cpp b/src/burn/drv/konami/d_thunderx.cpp index 85e31308f..2cea64b5b 100644 --- a/src/burn/drv/konami/d_thunderx.cpp +++ b/src/burn/drv/konami/d_thunderx.cpp @@ -326,14 +326,14 @@ static void scontra_bankswitch(INT32 data) layer_priority = data & 0x80; if (~data & 0x10) { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); } INT32 nBank = 0x10000 + (data & 0x0f) * 0x2000; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); } static void thunderx_videobank(INT32 data) @@ -342,15 +342,15 @@ static void thunderx_videobank(INT32 data) layer_priority = data & 0x08; if (data & 0x01) { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); } else if (data & 0x10) { if (thunderx_1f98_data & 2) { - konamiMapMemory(pmcram + 0x800, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(pmcram + 0x800, 0x5800, 0x5fff, MAP_RAM); } else { - konamiMapMemory(pmcram, 0x5800, 0x5fff, KON_RAM); // junk? + konamiMapMemory(pmcram, 0x5800, 0x5fff, MAP_RAM); // junk? } } else { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); } } @@ -505,7 +505,7 @@ static void thunderx_set_lines(INT32 lines) INT32 nBank = 0x10000 + (((lines & 0x0f) ^ 0x08) * 0x2000); if (nBank >= 0x28000) nBank -= 0x20000; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); } static INT32 DrvDoReset() @@ -658,10 +658,10 @@ static INT32 DrvInit(INT32 type) konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, KON_RAM); - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(scontra_main_write); konamiSetReadHandler(scontra_main_read); konamiSetlinesCallback(thunderx_set_lines); diff --git a/src/burn/drv/konami/d_timeplt.cpp b/src/burn/drv/konami/d_timeplt.cpp index 544c07892..8efd4239b 100644 --- a/src/burn/drv/konami/d_timeplt.cpp +++ b/src/burn/drv/konami/d_timeplt.cpp @@ -515,29 +515,29 @@ static INT32 DrvInit(INT32 game) ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x5fff, ZET_ROM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x5fff, MAP_ROM); if (game_select >= 3) { - ZetMapMemory(DrvZ80RAM0 + 0x0800,0x6000, 0x67ff, ZET_RAM); + ZetMapMemory(DrvZ80RAM0 + 0x0800,0x6000, 0x67ff, MAP_RAM); } - ZetMapMemory(DrvColRAM, 0xa000, 0xa3ff, ZET_RAM); - ZetMapMemory(DrvVidRAM, 0xa400, 0xa7ff, ZET_RAM); - ZetMapMemory(DrvZ80RAM0, 0xa800, 0xafff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb000, 0xb0ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb100, 0xb1ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb200, 0xb2ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb300, 0xb3ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb400, 0xb4ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb500, 0xb5ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb600, 0xb6ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb700, 0xb7ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb800, 0xb8ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb900, 0xb9ff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xba00, 0xbaff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xbb00, 0xbbff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbc00, 0xbcff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbd00, 0xbdff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbe00, 0xbeff, ZET_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbf00, 0xbfff, ZET_RAM); + ZetMapMemory(DrvColRAM, 0xa000, 0xa3ff, MAP_RAM); + ZetMapMemory(DrvVidRAM, 0xa400, 0xa7ff, MAP_RAM); + ZetMapMemory(DrvZ80RAM0, 0xa800, 0xafff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb000, 0xb0ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb100, 0xb1ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb200, 0xb2ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb300, 0xb3ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb400, 0xb4ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb500, 0xb5ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb600, 0xb6ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb700, 0xb7ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb800, 0xb8ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb900, 0xb9ff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xba00, 0xbaff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xbb00, 0xbbff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbc00, 0xbcff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbd00, 0xbdff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbe00, 0xbeff, MAP_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbf00, 0xbfff, MAP_RAM); ZetSetWriteHandler(timeplt_main_write); ZetSetReadHandler(timeplt_main_read); ZetClose(); diff --git a/src/burn/drv/konami/d_vendetta.cpp b/src/burn/drv/konami/d_vendetta.cpp index e127cee2d..fa25ea27a 100644 --- a/src/burn/drv/konami/d_vendetta.cpp +++ b/src/burn/drv/konami/d_vendetta.cpp @@ -499,7 +499,7 @@ static void vendetta_set_lines(INT32 lines) nDrvBank[0] = lines; if (lines < 0x1c) { - konamiMapMemory(DrvKonROM + 0x10000 + (lines * 0x2000), 0x0000 | bankoffset, 0x1fff | bankoffset, KON_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + (lines * 0x2000), 0x0000 | bankoffset, 0x1fff | bankoffset, MAP_ROM); } } @@ -644,9 +644,9 @@ static INT32 DrvInit(INT32 nGame) konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x0000, 0x1fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x0000, 0x1fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(esckids_main_write); konamiSetReadHandler(esckids_main_read); konamiSetlinesCallback(vendetta_set_lines); @@ -665,9 +665,9 @@ static INT32 DrvInit(INT32 nGame) konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonROM + 0x10000, 0x0000, 0x1fff, KON_ROM); - konamiMapMemory(DrvKonRAM, 0x2000, 0x3fff, KON_RAM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x10000, 0x0000, 0x1fff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x2000, 0x3fff, MAP_RAM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); konamiSetWriteHandler(vendetta_main_write); konamiSetReadHandler(vendetta_main_read); konamiSetlinesCallback(vendetta_set_lines);