diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index a9b1539b550..e8413411d4b 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -587,51 +587,6 @@ PALETTE_INIT( RRRR_GGGG_BBBB ) -/*************************************************************************** - GENERIC PALETTE READ HANDLERS -***************************************************************************/ - -/*------------------------------------------------- - 8-bit read handlers --------------------------------------------------*/ - -READ8_HANDLER( paletteram_r ) -{ - return paletteram[offset]; -} - -READ8_HANDLER( paletteram_2_r ) -{ - return paletteram_2[offset]; -} - - -/*------------------------------------------------- - 16-bit read handlers --------------------------------------------------*/ - -READ16_HANDLER( paletteram16_word_r ) -{ - return paletteram16[offset]; -} - -READ16_HANDLER( paletteram16_2_word_r ) -{ - return paletteram16_2[offset]; -} - - -/*------------------------------------------------- - 32-bit read handlers --------------------------------------------------*/ - -READ32_HANDLER( paletteram32_r ) -{ - return paletteram32[offset]; -} - - - /*************************************************************************** 3-3-2 RGB PALETTE WRITE HANDLERS ***************************************************************************/ diff --git a/src/emu/video/generic.h b/src/emu/video/generic.h index 8e9376145c2..ff482f5c02d 100644 --- a/src/emu/video/generic.h +++ b/src/emu/video/generic.h @@ -139,14 +139,7 @@ PALETTE_INIT( RRRR_GGGG_BBBB ); -/* ----- generic palette RAM read/write handlers ----- */ - -/* read handlers */ -READ8_HANDLER( paletteram_r ); -READ8_HANDLER( paletteram_2_r ); -READ16_HANDLER( paletteram16_word_r ); -READ16_HANDLER( paletteram16_2_word_r ); -READ32_HANDLER( paletteram32_r ); +/* ----- generic palette RAM write handlers, use MRAx_RAM to read ----- */ /* 3-3-2 RGB palette write handlers */ WRITE8_HANDLER( paletteram_BBGGGRRR_w ); diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index d30679ec7c2..33a6d6f1489 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -96,7 +96,7 @@ static ADDRESS_MAP_START( actfan_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x100000, 0x1007ff) AM_READ(MRA8_RAM) AM_RANGE(0x130000, 0x130003) AM_READ(actfan_control_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(actfan_control_0_r) - AM_RANGE(0x120000, 0x1205ff) AM_READ(paletteram_r) + AM_RANGE(0x120000, 0x1205ff) AM_READ(MRA8_RAM) AM_RANGE(0x1f0000, 0x1f3fff) AM_READ(MRA8_RAM) ADDRESS_MAP_END @@ -118,7 +118,7 @@ static ADDRESS_MAP_START( triothep_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x044000, 0x045fff) AM_READ(actfancr_pf2_data_r) AM_RANGE(0x064000, 0x0647ff) AM_READ(actfancr_pf1_data_r) AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA8_RAM) - AM_RANGE(0x130000, 0x1305ff) AM_READ(paletteram_r) + AM_RANGE(0x130000, 0x1305ff) AM_READ(MRA8_RAM) AM_RANGE(0x140000, 0x140001) AM_READ(MRA8_NOP) /* Value doesn't matter */ AM_RANGE(0x1f0000, 0x1f3fff) AM_READ(MRA8_RAM) AM_RANGE(0x1ff000, 0x1ff001) AM_READ(triothep_control_r) diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index 9f69c6ea7e4..9c60833a9fa 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -35,7 +35,7 @@ static INTERRUPT_GEN( aliens_interrupt ) static READ8_HANDLER( bankedram_r ) { if (palette_selected) - return paletteram_r(offset); + return paletteram[offset]; else return ram[offset]; } diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 520f48bc375..9080927fdbe 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -52,7 +52,7 @@ static ADDRESS_MAP_START( battlnts_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(K007342_r) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_READ(K007420_r) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_READ(K007342_scroll_r) /* Scroll RAM */ - AM_RANGE(0x2400, 0x24ff) AM_READ(paletteram_r) /* Palette */ + AM_RANGE(0x2400, 0x24ff) AM_READ(MRA8_RAM) /* Palette */ AM_RANGE(0x2e00, 0x2e00) AM_READ(input_port_0_r) /* DIPSW #1 */ AM_RANGE(0x2e01, 0x2e01) AM_READ(input_port_4_r) /* 2P controls */ AM_RANGE(0x2e02, 0x2e02) AM_READ(input_port_3_r) /* 1P controls */ diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index e5e875f9b94..179f23324b5 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -107,7 +107,7 @@ static ADDRESS_MAP_START( bladestl_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(K007342_r) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_READ(K007420_r) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_READ(K007342_scroll_r) /* Scroll RAM */ - AM_RANGE(0x2400, 0x245f) AM_READ(paletteram_r) /* Palette */ + AM_RANGE(0x2400, 0x245f) AM_READ(MRA8_RAM) /* Palette */ AM_RANGE(0x2e01, 0x2e01) AM_READ(input_port_3_r) /* 1P controls */ AM_RANGE(0x2e02, 0x2e02) AM_READ(input_port_4_r) /* 2P controls */ AM_RANGE(0x2e03, 0x2e03) AM_READ(input_port_1_r) /* DISPW #2 */ diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index fe9ea0aaba5..ca4dd2f1df4 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -45,7 +45,7 @@ static INTERRUPT_GEN( blockhl_interrupt ) static READ8_HANDLER( bankedram_r ) { if (palette_selected) - return paletteram_r(offset); + return paletteram[offset]; else return ram[offset]; } diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index e02df10d8a0..61e57240d73 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -52,7 +52,7 @@ static WRITE8_HANDLER( bottom9_bankedram1_w ) static READ8_HANDLER( bottom9_bankedram2_r ) { if (K052109_selected) return K052109_051960_r(offset + 0x2000); - else return paletteram_r(offset); + else return paletteram[offset]; } static WRITE8_HANDLER( bottom9_bankedram2_w ) diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index 86d5ee179f5..22e5921ea2c 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -55,7 +55,7 @@ static READ8_HANDLER( bankedram_r ) else if (rambank == 1) { if (offset < 0x800) - return paletteram_r(offset); + return paletteram[offset]; else return 0; } else diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index ff489c8859e..90aada4cda9 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -49,7 +49,7 @@ static WRITE8_HANDLER( chqflag_bankswitch_w ) /* bit 5 = memory bank select */ if (data & 0x20){ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1800, 0x1fff, 0, 0, paletteram_r); /* palette */ + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1800, 0x1fff, 0, 0, MRA8_RAM); /* palette */ memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1800, 0x1fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w); /* palette */ if (K051316_readroms){ memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1000, 0x17ff, 0, 0, K051316_rom_0_r); /* 051316 #1 (ROM test) */ diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index cddcded40d4..c7e55a91521 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -491,7 +491,7 @@ static void crimfght_banking( int lines ) /* bit 5 = select work RAM or palette */ if (lines & 0x20){ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x03ff, 0, 0, paletteram_r); /* palette */ + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x03ff, 0, 0, MRA8_RAM); /* palette */ memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x03ff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w); /* palette */ } else{ diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index a4d43c9a580..182af60920c 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -541,7 +541,7 @@ static ADDRESS_MAP_START( cobra_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0fff) AM_READ(dec8_pf0_data_r) AM_RANGE(0x1000, 0x17ff) AM_READ(dec8_pf1_data_r) AM_RANGE(0x1800, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x31ff) AM_READ(paletteram_r) + AM_RANGE(0x3000, 0x31ff) AM_READ(MRA8_RAM) AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r) /* Player 1 */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r) /* Player 2 */ AM_RANGE(0x3802, 0x3802) AM_READ(input_port_3_r) /* Dip 1 */ @@ -636,8 +636,8 @@ static ADDRESS_MAP_START( gondo_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM) AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) AM_RANGE(0x2000, 0x27ff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x2800, 0x2bff) AM_READ(paletteram_r) - AM_RANGE(0x2c00, 0x2fff) AM_READ(paletteram_2_r) + AM_RANGE(0x2800, 0x2bff) AM_READ(MRA8_RAM) + AM_RANGE(0x2c00, 0x2fff) AM_READ(MRA8_RAM) AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) /* Sprites */ AM_RANGE(0x3800, 0x3800) AM_READ(input_port_7_r) /* Dip 1 */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_8_r) /* Dip 2 */ @@ -672,7 +672,7 @@ static ADDRESS_MAP_START( oscar_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) AM_RANGE(0x2800, 0x2fff) AM_READ(dec8_pf0_data_r) AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) /* Sprites */ - AM_RANGE(0x3800, 0x3bff) AM_READ(paletteram_r) + AM_RANGE(0x3800, 0x3bff) AM_READ(MRA8_RAM) AM_RANGE(0x3c00, 0x3c00) AM_READ(input_port_0_r) AM_RANGE(0x3c01, 0x3c01) AM_READ(input_port_1_r) AM_RANGE(0x3c02, 0x3c02) AM_READ(input_port_2_r) /* VBL & coins */ @@ -716,8 +716,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(paletteram_r) - AM_RANGE(0x1400, 0x17ff) AM_READ(paletteram_2_r) + AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) @@ -735,8 +735,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_BASE(&paletteram) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_BASE(&paletteram_2) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w) @@ -754,8 +754,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(paletteram_r) - AM_RANGE(0x1400, 0x17ff) AM_READ(paletteram_2_r) + AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) @@ -769,8 +769,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w) @@ -784,8 +784,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(paletteram_r) - AM_RANGE(0x1400, 0x17ff) AM_READ(paletteram_2_r) + AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) @@ -801,8 +801,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_BASE(&paletteram) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_BASE(&paletteram_2) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w) @@ -819,8 +819,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(paletteram_r) - AM_RANGE(0x1400, 0x17ff) AM_READ(paletteram_2_r) + AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) @@ -837,8 +837,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w) @@ -856,8 +856,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(paletteram_r) - AM_RANGE(0x1400, 0x17ff) AM_READ(paletteram_2_r) + AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_1_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_0_r) AM_RANGE(0x1803, 0x1803) AM_READ(input_port_2_r) @@ -875,8 +875,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_BASE(&paletteram) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_BASE(&paletteram_2) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w) @@ -893,8 +893,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(paletteram_r) - AM_RANGE(0x1400, 0x17ff) AM_READ(paletteram_2_r) + AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) AM_RANGE(0x1803, 0x1803) AM_READ(input_port_2_r) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_4_r) AM_RANGE(0x1805, 0x1805) AM_READ(input_port_3_r) @@ -907,8 +907,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x180c, 0x180c) AM_WRITE(oscar_sound_w) @@ -923,8 +923,8 @@ static ADDRESS_MAP_START( garyoret_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM) AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) AM_RANGE(0x2000, 0x27ff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x2800, 0x2bff) AM_READ(paletteram_r) - AM_RANGE(0x2c00, 0x2fff) AM_READ(paletteram_2_r) + AM_RANGE(0x2800, 0x2bff) AM_READ(MRA8_RAM) + AM_RANGE(0x2c00, 0x2fff) AM_READ(MRA8_RAM) AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) /* Sprites */ AM_RANGE(0x3800, 0x3800) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_4_r) /* Dip 2 */ diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 7e0bb8d277e..9f150c94022 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -460,7 +460,7 @@ static void ide_interrupt(int state) static ADDRESS_MAP_START( memory_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM // PRG ROM AM_RANGE(0x400000, 0x40ffff) AM_RAM // WORK RAM - AM_RANGE(0x480000, 0x48443f) AM_READWRITE(paletteram32_r, paletteram32_w) // COLOR RAM + AM_RANGE(0x480000, 0x48443f) AM_READWRITE(MRA32_RAM, paletteram32_w) // COLOR RAM AM_BASE(&paletteram32) AM_RANGE(0x500000, 0x57ffff) AM_READWRITE(sndram_r, sndram_w) // SOUND RAM AM_RANGE(0x580000, 0x58003f) AM_READWRITE(K056832_long_r, K056832_long_w) // VIDEO REG (tilemap) diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 5cb1584e5a3..a1fdba993d2 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -35,7 +35,7 @@ static INTERRUPT_GEN( gbusters_interrupt ) static READ8_HANDLER( bankedram_r ) { if (palette_selected) - return paletteram_r(offset); + return paletteram[offset]; else return ram[offset]; } diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index 7ff3ad688ed..b13b7e81a96 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -210,7 +210,7 @@ static ADDRESS_MAP_START( gcpinbal_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) AM_RANGE(0xc00000, 0xc03fff) AM_READ(gcpinbal_tilemaps_word_r) AM_RANGE(0xc80000, 0xc80fff) AM_READ(MRA16_RAM) /* sprite ram */ - AM_RANGE(0xd00000, 0xd00fff) AM_READ(paletteram16_word_r) + AM_RANGE(0xd00000, 0xd00fff) AM_READ(MRA16_RAM) AM_RANGE(0xd80000, 0xd800ff) AM_READ(ioc_r) AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index cfff27152c2..ab4fb1eb9d2 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -455,7 +455,7 @@ WRITE32_HANDLER( lanc_ram_w ) static ADDRESS_MAP_START( gticlub_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_MIRROR(0x80000000) AM_RAM AM_BASE(&work_ram) /* Work RAM */ AM_RANGE(0x74000000, 0x740000ff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_reg_r, K001604_reg_w) - AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(paletteram32_r, paletteram32_w) AM_BASE(&paletteram32) + AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, paletteram32_w) AM_BASE(&paletteram32) AM_RANGE(0x74020000, 0x7403ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_tile_r, K001604_tile_w) AM_RANGE(0x74040000, 0x7407ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_char_r, K001604_char_w) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 5c9222d5af0..dd9a552c38e 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -58,7 +58,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0414, 0x0414) AM_READ(input_port_4_r) /* Dip 2 */ AM_RANGE(0x0415, 0x0415) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x0418, 0x0418) AM_READ(hcastle_gfxbank_r) - AM_RANGE(0x0600, 0x06ff) AM_READ(paletteram_r) + AM_RANGE(0x0600, 0x06ff) AM_READ(MRA8_RAM) AM_RANGE(0x0700, 0x5fff) AM_READ(MRA8_RAM) AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index 723b7acfb2f..b0887238b36 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -62,7 +62,7 @@ static ADDRESS_MAP_START( labyrunr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0a01, 0x0a01) AM_READ(input_port_4_r) AM_RANGE(0x0b00, 0x0b00) AM_READ(input_port_3_r) AM_RANGE(0x0d00, 0x0d1f) AM_READ(K051733_r) /* 051733 (protection) */ - AM_RANGE(0x1000, 0x10ff) AM_READ(paletteram_r) + AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_RAM) AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index a7a4071a2fa..15ffc432938 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -281,7 +281,7 @@ static READ8_HANDLER( le_4800_r ) { if (cur_control2 & 0x10) // RAM enable { - return paletteram_r(offset); + return paletteram[offset]; } else { diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 3c4aad8a0f6..a65168fe3aa 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -88,7 +88,7 @@ static READ8_HANDLER( deco16_io_r ) *************************************/ static ADDRESS_MAP_START( prosport_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0200, 0x021f) AM_READ(paletteram_r) + AM_RANGE(0x0200, 0x021f) AM_READ(MRA8_RAM) AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_RANGE(0x1000, 0x2fff) AM_READ(MRA8_RAM) AM_RANGE(0x8000, 0x800f) AM_READ(deco16_io_r) diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index cdcf22a4d34..05842278306 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -83,7 +83,7 @@ static WRITE8_HANDLER( lkage_sh_nmi_enable_w ) static ADDRESS_MAP_START( lkage, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) AM_WRITE(MWA8_ROM) AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) /* work ram */ - AM_RANGE(0xe800, 0xefff) AM_READ(paletteram_r) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE(&paletteram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE(&paletteram) AM_RANGE(0xf000, 0xf003) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) AM_BASE(&lkage_vreg) /* video registers */ AM_RANGE(0xf060, 0xf060) AM_WRITE(lkage_sound_command_w) AM_RANGE(0xf061, 0xf061) AM_WRITE(MWA8_NOP) diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 622aa0a8a6e..59c17e4fc43 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -218,7 +218,7 @@ static ADDRESS_MAP_START( readmem_A, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080006, 0x080007) AM_READ(dsw_r) AM_RANGE(0x080008, 0x080009) AM_READ(soundlatch2_word_r) /* from sound cpu */ AM_RANGE(0x084000, 0x084fff) AM_READ(MRA16_RAM) - AM_RANGE(0x088000, 0x0887ff) AM_READ(paletteram16_word_r) + AM_RANGE(0x088000, 0x0887ff) AM_READ(MRA16_RAM) AM_RANGE(0x08e000, 0x08ffff) AM_READ(MRA16_RAM) AM_RANGE(0x090000, 0x093fff) AM_READ(MRA16_RAM) AM_RANGE(0x094000, 0x097fff) AM_READ(MRA16_RAM) @@ -306,7 +306,7 @@ static ADDRESS_MAP_START( readmem_B, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_FLAGS( AMEF_ABITS(20) ) AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_RANGE(0x044000, 0x044fff) AM_READ(MRA16_RAM) - AM_RANGE(0x048000, 0x0487ff) AM_READ(paletteram16_word_r) + AM_RANGE(0x048000, 0x0487ff) AM_READ(MRA16_RAM) AM_RANGE(0x04e000, 0x04ffff) AM_READ(MRA16_RAM) AM_RANGE(0x050000, 0x053fff) AM_READ(MRA16_RAM) AM_RANGE(0x054000, 0x057fff) AM_READ(MRA16_RAM) @@ -348,7 +348,7 @@ static ADDRESS_MAP_START( readmem_C, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0e0000, 0x0e3fff) AM_READ(MRA16_RAM) AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(MRA16_RAM) AM_RANGE(0x0f0000, 0x0f3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0f8000, 0x0f87ff) AM_READ(paletteram16_word_r) + AM_RANGE(0x0f8000, 0x0f87ff) AM_READ(MRA16_RAM) AM_RANGE(0x0d8000, 0x0d8001) AM_READ(ip_select_r) AM_RANGE(0x1f0000, 0x1fffff) AM_READ(MRA16_RAM) ADDRESS_MAP_END @@ -385,8 +385,7 @@ static ADDRESS_MAP_START( readmem_D, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0ca000, 0x0cbfff) AM_READ(MRA16_RAM) AM_RANGE(0x0d0000, 0x0d3fff) AM_READ(MRA16_RAM) AM_RANGE(0x0d4000, 0x0d7fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0d8000, 0x0d87ff) AM_READ(paletteram16_word_r) - AM_RANGE(0x0db000, 0x0db7ff) AM_READ(paletteram16_word_r) + AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_READ(MRA16_RAM) AM_RANGE(0x0e0000, 0x0e0001) AM_READ(dsw_r) AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(MRA16_RAM) AM_RANGE(0x0f0000, 0x0f0001) AM_READ(coins_r) /* Coins + P1&P2 Buttons */ @@ -401,8 +400,7 @@ static ADDRESS_MAP_START( writemem_D, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0ca000, 0x0cbfff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_objectram) AM_RANGE(0x0d0000, 0x0d3fff) AM_WRITE(megasys1_scrollram_1_w) AM_BASE(&megasys1_scrollram[1]) AM_RANGE(0x0d4000, 0x0d7fff) AM_WRITE(megasys1_scrollram_2_w) AM_BASE(&megasys1_scrollram[2]) - AM_RANGE(0x0d8000, 0x0d87ff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) - AM_RANGE(0x0db000, 0x0db7ff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0e8000, 0x0ebfff) AM_WRITE(megasys1_scrollram_0_w) AM_BASE(&megasys1_scrollram[0]) AM_RANGE(0x0f8000, 0x0f8001) AM_WRITE(OKIM6295_data_0_lsb_w) // { 0x100000, 0x100001 protection diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index 1bf38374987..9935fc0ed99 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -55,7 +55,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd406, 0xd406) AM_READ(input_port_2_r) AM_RANGE(0xd407, 0xd407) AM_READ(input_port_3_r) - AM_RANGE(0xd800, 0xdbff) AM_READ(paletteram_r) + AM_RANGE(0xd800, 0xdbff) AM_READ(MRA8_RAM) AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) /* text */ AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_BANK1) diff --git a/src/mame/drivers/ninjakid.c b/src/mame/drivers/ninjakid.c index 292754fe2a6..fcfe3f51ae6 100644 --- a/src/mame/drivers/ninjakid.c +++ b/src/mame/drivers/ninjakid.c @@ -96,7 +96,7 @@ static ADDRESS_MAP_START( ninjakid_primary_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa002, 0xa002) AM_READ(ninjakun_io_A002_r) AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) /* tilemaps */ AM_RANGE(0xc800, 0xcfff) AM_READ(ninjakid_bg_videoram_r) - AM_RANGE(0xd800, 0xd9ff) AM_READ(paletteram_r) + AM_RANGE(0xd800, 0xd9ff) AM_READ(MRA8_RAM) AM_SHARE(1) AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) ADDRESS_MAP_END @@ -109,7 +109,7 @@ static ADDRESS_MAP_START( ninjakid_primary_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(ninjakid_fg_videoram_w) AM_BASE(&videoram) AM_RANGE(0xc800, 0xcfff) AM_WRITE(ninjakid_bg_videoram_w) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(&spriteram) AM_SHARE(1) - AM_RANGE(0xd800, 0xd9ff) AM_WRITE(ninjakun_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xd800, 0xd9ff) AM_WRITE(ninjakun_paletteram_w) AM_SHARE(1) AM_BASE(&paletteram) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&shareram) ADDRESS_MAP_END @@ -122,7 +122,7 @@ static ADDRESS_MAP_START( ninjakid_secondary_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa002, 0xa002) AM_READ(ninjakun_io_A002_r) AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) /* tilemaps */ AM_RANGE(0xc800, 0xcfff) AM_READ(ninjakid_bg_videoram_r) - AM_RANGE(0xd800, 0xd9ff) AM_READ(paletteram_r) + AM_RANGE(0xd800, 0xd9ff) AM_READ(MRA8_RAM) AM_SHARE(1) AM_RANGE(0xe000, 0xe7ff) AM_READ(shareram_r) ADDRESS_MAP_END @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( ninjakid_secondary_writemem, ADDRESS_SPACE_PROGRAM, 8 AM_RANGE(0xc000, 0xc7ff) AM_WRITE(ninjakid_fg_videoram_w) AM_RANGE(0xc800, 0xcfff) AM_WRITE(ninjakid_bg_videoram_w) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE(1) - AM_RANGE(0xd800, 0xd9ff) AM_WRITE(ninjakun_paletteram_w) + AM_RANGE(0xd800, 0xd9ff) AM_WRITE(ninjakun_paletteram_w) AM_SHARE(1) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(shareram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 5f5db479396..75f2207d799 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -765,7 +765,7 @@ static WRITE32_HANDLER( lanc2_w ) static ADDRESS_MAP_START( nwktr_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x003fffff) AM_MIRROR(0x80000000) AM_RAM AM_BASE(&work_ram) /* Work RAM */ AM_RANGE(0x74000000, 0x740000ff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_reg_r, K001604_reg_w) - AM_RANGE(0x74010000, 0x74017fff) AM_MIRROR(0x80000000) AM_READWRITE(paletteram32_r, paletteram32_w) AM_BASE(&paletteram32) + AM_RANGE(0x74010000, 0x74017fff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, paletteram32_w) AM_BASE(&paletteram32) AM_RANGE(0x74020000, 0x7403ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_tile_r, K001604_tile_w) AM_RANGE(0x74040000, 0x7407ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_char_r, K001604_char_w) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) diff --git a/src/mame/drivers/omegaf.c b/src/mame/drivers/omegaf.c index 5df6afedbc5..756d16f0104 100644 --- a/src/mame/drivers/omegaf.c +++ b/src/mame/drivers/omegaf.c @@ -399,7 +399,7 @@ static ADDRESS_MAP_START( omegaf_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xcbff) AM_READ(omegaf_bg1_videoram_r) /* BG1 video RAM */ AM_RANGE(0xcc00, 0xcfff) AM_READ(omegaf_bg2_videoram_r) /* BG2 video RAM */ AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) /* FG RAM */ - AM_RANGE(0xd800, 0xdfff) AM_READ(paletteram_r) /* palette RAM */ + AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) /* palette RAM */ AM_RANGE(0xe000, 0xf9ff) AM_READ(MRA8_RAM) /* RAM */ AM_RANGE(0xfa00, 0xffff) AM_READ(MRA8_RAM) /* sprite RAM */ ADDRESS_MAP_END @@ -437,7 +437,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( robokid_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xc7ff) AM_READ(paletteram_r) /* paletrte RAM */ + AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) /* palette RAM */ AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) /* FG RAM */ AM_RANGE(0xd000, 0xd3ff) AM_READ(omegaf_bg2_videoram_r) AM_RANGE(0xd400, 0xd7ff) AM_READ(omegaf_bg1_videoram_r) diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index 3129deb94e0..dc16e09fe71 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -194,7 +194,7 @@ static ADDRESS_MAP_START( opwolf_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0f0000, 0x0f07ff) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_data_r) AM_RANGE(0x0f0802, 0x0f0803) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_status_r) AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) /* RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */ AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */ AM_RANGE(0x3e0000, 0x3e0001) AM_READ(MRA16_NOP) @@ -228,7 +228,7 @@ static ADDRESS_MAP_START( opwolfb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0f0008, 0x0f000b) AM_READ(opwolf_in_r) /* coins and buttons */ AM_RANGE(0x0ff000, 0x0fffff) AM_READ(cchip_r) AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) /* RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */ AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */ AM_RANGE(0x3e0000, 0x3e0001) AM_READ(MRA16_NOP) diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index 5dd14598f27..8484035524a 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -99,7 +99,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x20000f) AM_READ(calendar_r) AM_RANGE(0x300004, 0x300007) AM_READ(othldrby_videoram_r) AM_RANGE(0x30000c, 0x30000d) AM_READ(pip) // vblank? - AM_RANGE(0x400000, 0x400fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x400000, 0x400fff) AM_READ(MRA16_RAM) AM_RANGE(0x600000, 0x600001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x700000, 0x700001) AM_READ(pap) // scanline??? AM_RANGE(0x700004, 0x700005) AM_READ(input_port_0_word_r) diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 85fa43e3026..024a5db7412 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -96,7 +96,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( paradise_readport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_READ(paletteram_r ) // Palette + AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM ) // Palette AM_RANGE(0x2010, 0x2010) AM_READ(OKIM6295_status_0_r ) // OKI 0 AM_RANGE(0x2030, 0x2030) AM_READ(OKIM6295_status_1_r ) // OKI 1 AM_RANGE(0x2020, 0x2020) AM_READ(input_port_0_r ) // DSW 1 diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 67f90e87232..c9594cf5514 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -31,9 +31,9 @@ static READ8_HANDLER( bankedram_r ) if (videobank & 0x01) { if (videobank & 0x04) - return paletteram_r(offset + 0x0800); + return paletteram[offset + 0x0800]; else - return paletteram_r(offset); + return paletteram[offset]; } else return ram[offset]; diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index b56aa0da034..4918536ec64 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -109,14 +109,11 @@ static ADDRESS_MAP_START( rbmk_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x50ffff) AM_RAM AM_RANGE(0x940000, 0x940fff) AM_RAM AM_BASE(&gms_vidram2) AM_RANGE(0x980300, 0x983fff) AM_RAM // 0x2048 words ???, byte access - AM_RANGE(0x900000, 0x900fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) -AM_READ(paletteram16_word_r) AM_BASE(&paletteram16) + AM_RANGE(0x900000, 0x900fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x9c0000, 0x9c0fff) AM_RAM AM_BASE(&gms_vidram) AM_RANGE(0xb00000, 0xb00001) AM_WRITE(eeprom_w) - AM_RANGE(0xC00000, 0xC00001) AM_READ(input_port_0_word_r) -AM_WRITE(gms_write1) - AM_RANGE(0xC08000, 0xC08001) AM_READ(input_port_1_word_r) -AM_WRITE(gms_write2) + AM_RANGE(0xC00000, 0xC00001) AM_READ(input_port_0_word_r) AM_WRITE(gms_write1) + AM_RANGE(0xC08000, 0xC08001) AM_READ(input_port_1_word_r) AM_WRITE(gms_write2) AM_RANGE(0xC10000, 0xC10001) AM_READ(eeprom_r) AM_RANGE(0xC18080, 0xC18081) AM_READ(gms_read) AM_RANGE(0xC20000, 0xC20001) AM_READ(input_port_2_word_r) diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index 04104454d08..0ee7000e92a 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -104,7 +104,7 @@ static ADDRESS_MAP_START( rockrage_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(K007342_r) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_READ(K007420_r) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_READ(K007342_scroll_r) /* Scroll RAM */ - AM_RANGE(0x2400, 0x247f) AM_READ(paletteram_r) /* Palette */ + AM_RANGE(0x2400, 0x247f) AM_READ(MRA8_RAM) /* Palette */ AM_RANGE(0x2e01, 0x2e01) AM_READ(input_port_3_r) /* 1P controls */ AM_RANGE(0x2e02, 0x2e02) AM_READ(input_port_4_r) /* 2P controls */ AM_RANGE(0x2e03, 0x2e03) AM_READ(input_port_1_r) /* DISPW #2 */ diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index ce40eb50387..70663f5ea41 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -87,7 +87,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0300, 0x030f) AM_READ(K053244_r) AM_RANGE(0x0800, 0x0fff) AM_READ(rollerg_K051316_r) AM_RANGE(0x1000, 0x17ff) AM_READ(K053245_r) - AM_RANGE(0x1800, 0x1fff) AM_READ(paletteram_r) + AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) AM_RANGE(0x2000, 0x3aff) AM_READ(MRA8_RAM) AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 3cd262c2f98..1b560e01684 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -803,7 +803,7 @@ static ADDRESS_MAP_START( system16a_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x407fff) AM_MIRROR(0xb88000) AM_READWRITE(MRA16_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) AM_RANGE(0x410000, 0x410fff) AM_MIRROR(0xb8f000) AM_READWRITE(MRA16_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) AM_RANGE(0x440000, 0x4407ff) AM_MIRROR(0x3bf800) AM_RAM AM_BASE(&segaic16_spriteram_0) - AM_RANGE(0x840000, 0x840fff) AM_MIRROR(0x3bf000) AM_READWRITE(paletteram16_word_r, segaic16_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x840000, 0x840fff) AM_MIRROR(0x3bf000) AM_READWRITE(MRA16_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xc40000, 0xc43fff) AM_MIRROR(0x39c000) AM_READWRITE(misc_io_r, misc_io_w) AM_RANGE(0xc60000, 0xc6ffff) AM_READ(watchdog_reset16_r) AM_RANGE(0xc70000, 0xc73fff) AM_MIRROR(0x38c000) AM_RAM AM_BASE(&workram) diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 29c2c188390..4d9e3d867c7 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -44,7 +44,7 @@ static READ8_HANDLER( spy_bankedram1_r ) { if (rambank & 1) { - return paletteram_r(offset); + return paletteram[offset]; } else if (rambank & 2) { diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 5560f145c85..e626d35b779 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -422,7 +422,7 @@ static ADDRESS_MAP_START( mjyuugi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) /* ??? */ AM_RANGE(0x500000, 0x500001) AM_READ(input_port_8_word_r) /* DSW 3-1 */ AM_RANGE(0x500010, 0x500011) AM_READ(input_port_9_word_r) /* DSW 3-2 */ - AM_RANGE(0x700000, 0x7003ff) AM_READ(paletteram16_word_r) + AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) /* ??? */ AM_RANGE(0x900000, 0x900001) AM_READ(srmp2_input_1_r) /* I/O port 1 */ AM_RANGE(0x900002, 0x900003) AM_READ(srmp2_input_2_r) /* I/O port 2 */ diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index 1cb8054a9d1..72b8d99b173 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -811,7 +811,7 @@ static ADDRESS_MAP_START( hardhea2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) // DSW 1 AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 AM_RANGE(0xc080, 0xc080) AM_READ(input_port_4_r ) // vblank? - AM_RANGE(0xc600, 0xc7ff) AM_READ(paletteram_r ) // Palette (Banked??) + AM_RANGE(0xc600, 0xc7ff) AM_READ(MRA8_RAM ) // Palette (Banked??) AM_RANGE(0xc800, 0xdfff) AM_READ(MRA8_BANK2 ) // RAM (Banked?) AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) ADDRESS_MAP_END @@ -971,7 +971,7 @@ static ADDRESS_MAP_START( sparkman_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 AM_RANGE(0xc080, 0xc080) AM_READ(input_port_4_r ) // Buttons AM_RANGE(0xc0a3, 0xc0a3) AM_READ(sparkman_c0a3_r ) // ??? - AM_RANGE(0xc600, 0xc7ff) AM_READ(paletteram_r ) // Palette (Banked??) + AM_RANGE(0xc600, 0xc7ff) AM_READ(MRA8_RAM ) // Palette (Banked??) AM_RANGE(0xc800, 0xdfff) AM_READ(MRA8_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) ADDRESS_MAP_END diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index f82db5300ba..ef9a14e96da 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -500,7 +500,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READWRITE(paletteram_r, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x01ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) @@ -514,7 +514,7 @@ static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READWRITE(paletteram_r, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x01ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) @@ -528,7 +528,7 @@ static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READWRITE(paletteram_r, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x00ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) @@ -543,7 +543,7 @@ static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READWRITE(paletteram_r, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x00ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index 9d33d30621c..2374e0680d5 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -33,9 +33,9 @@ static READ8_HANDLER( bankedram_r ) if (videobank & 0x02) { if (videobank & 0x04) - return paletteram_r(offset + 0x0800); + return paletteram[offset + 0x0800]; else - return paletteram_r(offset); + return paletteram[offset]; } else if (videobank & 0x01) return K053245_r(offset); diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 2879a789c00..db08730561c 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -274,7 +274,7 @@ static ADDRESS_MAP_START( syvalion_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) AM_RANGE(0x300002, 0x300003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x400000, 0x420fff) AM_READ(TC0080VCO_word_r) - AM_RANGE(0x500800, 0x500fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x500800, 0x500fff) AM_READ(MRA16_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( syvalion_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -297,7 +297,7 @@ static ADDRESS_MAP_START( recordbr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) AM_RANGE(0x300002, 0x300003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x400000, 0x420fff) AM_READ(TC0080VCO_word_r) - AM_RANGE(0x500800, 0x500fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x500800, 0x500fff) AM_READ(MRA16_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( recordbr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -319,7 +319,7 @@ static ADDRESS_MAP_START( dleague_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) AM_RANGE(0x300002, 0x300003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x400000, 0x420fff) AM_READ(TC0080VCO_word_r) - AM_RANGE(0x500800, 0x500fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x500800, 0x500fff) AM_READ(MRA16_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( dleague_writemem, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 871d61fe1f5..4c6a46a09aa 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -422,7 +422,7 @@ static ADDRESS_MAP_START( superman_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x9007ff) AM_READ(cchip1_ram_r) AM_RANGE(0x900802, 0x900803) AM_READ(cchip1_ctrl_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(paletteram16_word_r) + AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* video attribute ram */ AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ @@ -450,7 +450,7 @@ static ADDRESS_MAP_START( daisenpu_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x90000f) AM_READ(daisenpu_input_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(paletteram16_word_r) + AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) AM_RANGE(0xd00000, 0xd00fff) AM_READ(MRA16_RAM) /* video attribute ram */ AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ @@ -475,7 +475,7 @@ static ADDRESS_MAP_START( gigandes_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x90000f) AM_READ(daisenpu_input_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(paletteram16_word_r) + AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* video attribute ram */ AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ @@ -500,7 +500,7 @@ static ADDRESS_MAP_START( ballbros_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x90000f) AM_READ(daisenpu_input_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(paletteram16_word_r) + AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* video attribute ram */ AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 069c65a15a4..a025f7298b1 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1558,7 +1558,7 @@ static ADDRESS_MAP_START( bshark_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x110000, 0x113fff) AM_READ(sharedram_r) AM_RANGE(0x400000, 0x40000f) AM_READ(TC0220IOC_halfword_r) AM_RANGE(0x800000, 0x800007) AM_READ(bshark_stick_r) - AM_RANGE(0xa00000, 0xa01fff) AM_READ(paletteram16_word_r) /* palette */ + AM_RANGE(0xa00000, 0xa01fff) AM_READ(MRA16_RAM) /* palette */ AM_RANGE(0xc00000, 0xc00fff) AM_READ(MRA16_RAM) /* spriteram */ AM_RANGE(0xd00000, 0xd0ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0xd20000, 0xd2000f) AM_READ(TC0100SCN_ctrl_word_0_r) @@ -1613,7 +1613,7 @@ static ADDRESS_MAP_START( sci_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_r) AM_RANGE(0x200010, 0x20001f) AM_READ(sci_steer_input_r) AM_RANGE(0x420000, 0x420003) AM_READ(taitoz_sound_r) - AM_RANGE(0x800000, 0x801fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) AM_RANGE(0xa00000, 0xa0ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0xa20000, 0xa2000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM) /* spriteram */ // Raine draws only 0x1000 @@ -1796,7 +1796,7 @@ static ADDRESS_MAP_START( dblaxle_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x40000f) AM_READ(TC0510NIO_halfword_wordswap_r) AM_RANGE(0x400010, 0x40001f) AM_READ(dblaxle_steer_input_r) AM_RANGE(0x620000, 0x620003) AM_READ(taitoz_sound_r) - AM_RANGE(0x800000, 0x801fff) AM_READ(paletteram16_word_r) /* palette */ + AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) /* palette */ AM_RANGE(0xa00000, 0xa0ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0xa30000, 0xa3002f) AM_READ(TC0480SCP_ctrl_word_r) AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM) /* spriteram */ @@ -1842,7 +1842,7 @@ static ADDRESS_MAP_START( racingb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0510NIO_halfword_wordswap_r) AM_RANGE(0x300010, 0x30001f) AM_READ(dblaxle_steer_input_r) AM_RANGE(0x520000, 0x520003) AM_READ(taitoz_sound_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(paletteram16_word_r) /* palette */ + AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) /* palette */ AM_RANGE(0x900000, 0x90ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0x930000, 0x93002f) AM_READ(TC0480SCP_ctrl_word_r) AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM) /* spriteram */ diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index c50ec6b74dd..7811aa06a08 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -374,7 +374,7 @@ static ADDRESS_MAP_START( airsys_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x140000, 0x140001) AM_WRITE(system_control_w) /* Pause the TMS32025 */ AM_RANGE(0x180000, 0x183fff) AM_RAM /* "gradiation ram (0)" */ AM_RANGE(0x184000, 0x187fff) AM_RAM /* "gradiation ram (1)" */ - AM_RANGE(0x188000, 0x18bfff) AM_READWRITE(paletteram16_word_r, airsys_paletteram16_w) AM_BASE(&paletteram16) + AM_RANGE(0x188000, 0x18bfff) AM_READWRITE(MRA16_RAM, airsys_paletteram16_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x820fff) AM_READWRITE(TC0080VCO_word_r, TC0080VCO_word_w) /* tilemaps, sprites */ AM_RANGE(0x908000, 0x90ffff) AM_RAM AM_BASE(&taitoair_line_ram) /* "line ram" */ AM_RANGE(0x910000, 0x91ffff) AM_RAM AM_BASE(&dsp_ram) /* "dsp common ram" (TMS320C25) */ diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index b2e886c773a..f4630bec6b1 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -45,7 +45,7 @@ static UINT8 *ram,*pmcram; static READ8_HANDLER( scontra_bankedram_r ) { if (palette_selected) - return paletteram_r(offset); + return paletteram[offset]; else return ram[offset]; } @@ -76,7 +76,7 @@ static READ8_HANDLER( thunderx_bankedram_r ) } } else - return paletteram_r(offset); + return paletteram[offset]; } static WRITE8_HANDLER( thunderx_bankedram_w ) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 9b52d12badc..4934eec9cd2 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -1353,7 +1353,7 @@ static ADDRESS_MAP_START( tekipaki_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x020000, 0x03ffff) AM_ROM /* extra for Whoopee */ AM_RANGE(0x080000, 0x082fff) AM_RAM - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x140001) AM_WRITE(toaplan2_0_voffs_w) AM_RANGE(0x140004, 0x140007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x140008, 0x140009) AM_WRITE(toaplan2_0_scroll_reg_select_w) @@ -1373,7 +1373,7 @@ static ADDRESS_MAP_START( ghox_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x040001) AM_READ(ghox_p2_h_analog_r) /* Paddle 2 */ AM_RANGE(0x080000, 0x083fff) AM_RAM - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x100000, 0x100001) AM_READ(ghox_p1_h_analog_r) /* Paddle 1 */ AM_RANGE(0x140000, 0x140001) AM_WRITE(toaplan2_0_voffs_w) AM_RANGE(0x140004, 0x140007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ @@ -1414,7 +1414,7 @@ static ADDRESS_MAP_START( dogyuun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /***** The following loctions in 0x50000x are for video controller 2 ******/ AM_RANGE(0x500000, 0x500001) AM_WRITE(toaplan2_1_voffs_w) /* VideoRAM selector/offset */ AM_RANGE(0x500004, 0x500007) AM_READWRITE(toaplan2_1_videoram16_r, toaplan2_1_videoram16_w) /* Tile/Sprite VideoRAM */ @@ -1440,7 +1440,7 @@ static ADDRESS_MAP_START( kbash_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r) /* test bit 8 */ ADDRESS_MAP_END @@ -1465,7 +1465,7 @@ static ADDRESS_MAP_START( kbash2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) ADDRESS_MAP_END @@ -1476,7 +1476,7 @@ static ADDRESS_MAP_START( truxton2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200004, 0x200007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) AM_RANGE(0x200008, 0x200009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x20000c, 0x20000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x300000, 0x300fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x300000, 0x300fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x400000, 0x401fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) AM_RANGE(0x402000, 0x4021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x402200, 0x402fff) AM_RAM @@ -1500,7 +1500,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pipibibs_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x082fff) AM_RAM - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x140001) AM_WRITE(toaplan2_0_voffs_w) AM_RANGE(0x140004, 0x140007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) AM_RANGE(0x140008, 0x140009) AM_WRITE(toaplan2_0_scroll_reg_select_w) @@ -1521,7 +1521,7 @@ static ADDRESS_MAP_START( pipibibi_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x082fff) AM_RAM AM_RANGE(0x083000, 0x0837ff) AM_READWRITE(pipibibi_spriteram16_r, pipibibi_spriteram16_w) /* SpriteRAM */ AM_RANGE(0x083800, 0x087fff) AM_RAM /* SpriteRAM (unused) */ - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x120000, 0x120fff) AM_RAM /* Copy of SpriteRAM ? */ // AM_RANGE(0x13f000, 0x13f001) AM_WRITENOP /* ??? */ AM_RANGE(0x180000, 0x182fff) AM_READWRITE(pipibibi_videoram16_r, pipibibi_videoram16_w) /* TileRAM */ @@ -1564,7 +1564,7 @@ static ADDRESS_MAP_START( fixeight_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) AM_RANGE(0x502000, 0x5021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x503000, 0x5031ff) AM_READWRITE(toaplan2_txscrollram16_r, toaplan2_txscrollram16_w) AM_BASE(&toaplan2_txscrollram16) AM_SIZE(&toaplan2_tx_scroll_vram_size) @@ -1588,7 +1588,7 @@ static ADDRESS_MAP_START( fixeighb_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) AM_RANGE(0x502000, 0x5021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x503000, 0x5031ff) AM_READWRITE(toaplan2_txscrollram16_r, toaplan2_txscrollram16_w) AM_BASE(&toaplan2_txscrollram16) AM_SIZE(&toaplan2_tx_scroll_vram_size) @@ -1620,7 +1620,7 @@ static ADDRESS_MAP_START( vfive_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r) ADDRESS_MAP_END @@ -1649,7 +1649,7 @@ static ADDRESS_MAP_START( batsugun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /***** The following in 0x50000x are for video controller 2 ******/ AM_RANGE(0x500000, 0x500001) AM_WRITE(toaplan2_1_voffs_w) /* VideoRAM selector/offset */ AM_RANGE(0x500004, 0x500007) AM_READWRITE(toaplan2_1_videoram16_r, toaplan2_1_videoram16_w) /* Tile/Sprite VideoRAM */ @@ -1666,7 +1666,7 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x500001) AM_WRITE(YM2151_register_port_0_lsb_w) AM_RANGE(0x500002, 0x500003) AM_READWRITE(YM2151_status_port_0_lsb_r, YM2151_data_port_0_lsb_w) AM_RANGE(0x600000, 0x600001) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) @@ -1699,7 +1699,7 @@ static ADDRESS_MAP_START( mahoudai_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x401000, 0x4017ff) AM_RAM /* Unused PaletteRAM */ AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) AM_RANGE(0x502000, 0x5021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) @@ -1726,7 +1726,7 @@ static ADDRESS_MAP_START( shippumd_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x401000, 0x4017ff) AM_RAM /* Unused PaletteRAM */ AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) AM_RANGE(0x502000, 0x5021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) @@ -1752,7 +1752,7 @@ static ADDRESS_MAP_START( bgaregga_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) AM_RANGE(0x502000, 0x5021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x502200, 0x502fff) AM_RAM @@ -1765,7 +1765,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( batrider_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x200000, 0x201fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) /* Text VideoRAM */ - AM_RANGE(0x202000, 0x202fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) + AM_RANGE(0x202000, 0x202fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) AM_RANGE(0x203000, 0x2031ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x203200, 0x2033ff) AM_READWRITE(toaplan2_txscrollram16_r, toaplan2_txscrollram16_w) AM_BASE(&toaplan2_txscrollram16) AM_SIZE(&toaplan2_tx_scroll_vram_size) AM_RANGE(0x203400, 0x207fff) AM_READWRITE(raizing_tx_gfxram16_r, raizing_tx_gfxram16_w) /* Main RAM actually */ @@ -1796,7 +1796,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bbakraid_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x200000, 0x201fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) /* Text VideoRAM */ - AM_RANGE(0x202000, 0x202fff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) + AM_RANGE(0x202000, 0x202fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) AM_RANGE(0x203000, 0x2031ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x203200, 0x2033ff) AM_READWRITE(toaplan2_txscrollram16_r, toaplan2_txscrollram16_w) AM_BASE(&toaplan2_txscrollram16) AM_SIZE(&toaplan2_tx_scroll_vram_size) AM_RANGE(0x203400, 0x207fff) AM_READWRITE(raizing_tx_gfxram16_r, raizing_tx_gfxram16_w) /* Main RAM actually */ diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index d9dced4b6ff..c247137415a 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -453,7 +453,7 @@ static WRITE8_HANDLER( topspeed_msm5205_stop_w ) static ADDRESS_MAP_START( topspeed_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(sharedram_r) // all shared ?? - AM_RANGE(0x500000, 0x503fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x500000, 0x503fff) AM_READ(MRA16_RAM) AM_RANGE(0x7e0000, 0x7e0001) AM_READ(MRA16_NOP) AM_RANGE(0x7e0002, 0x7e0003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x800000, 0x8003ff) AM_READ(MRA16_RAM) /* raster line color control */ diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index 9bddb9bc228..95f14dfb2c0 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -203,7 +203,7 @@ static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x02ffff) AM_ROM AM_RANGE(0x030000, 0x033fff) AM_RAM /* 68K and DSP shared RAM */ AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x050000, 0x050dff) AM_READWRITE(paletteram16_word_r, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x050000, 0x050dff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x060000, 0x060001) AM_WRITE(twincobr_crtc_reg_sel_w) /* 6845 CRT controller */ AM_RANGE(0x060002, 0x060003) AM_WRITE(twincobr_crtc_data_w) /* 6845 CRT controller */ AM_RANGE(0x070000, 0x070003) AM_WRITE(twincobr_txscroll_w) /* text layer scroll */ diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index d8d4b3a8455..8550442fc62 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -204,7 +204,7 @@ static void vendetta_video_banking( int select ) { if ( select & 1 ) { - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, paletteram_r ); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, MRA8_RAM ); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w ); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x0000, video_banking_base + 0x0fff, 0, 0, K053247_r ); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x0000, video_banking_base + 0x0fff, 0, 0, K053247_w ); diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index 3bf1d7d4d4a..16578ddc6a8 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -73,7 +73,7 @@ static ADDRESS_MAP_START( volfied_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main */ AM_RANGE(0x200000, 0x203fff) AM_READ(PC090OJ_word_0_r) AM_RANGE(0x400000, 0x47ffff) AM_READ(volfied_video_ram_r) - AM_RANGE(0x500000, 0x503fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x500000, 0x503fff) AM_READ(MRA16_RAM) AM_RANGE(0xd00000, 0xd00001) AM_READ(volfied_video_ctrl_r) AM_RANGE(0xe00002, 0xe00003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0xf00000, 0xf007ff) AM_READ(volfied_cchip_ram_r) diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index cf8141209a8..b53881e31f0 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -159,7 +159,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw ) else { memory_set_bankptr(1,&RAM[0x0000]); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x8fff, 0, 0, wardner_sprite_r); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xadff, 0, 0, paletteram_r); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xadff, 0, 0, MRA8_RAM); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xae00, 0xafff, 0, 0, MRA8_BANK2); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xc7ff, 0, 0, MRA8_BANK3); memory_set_bankptr(2, rambase_ae00); diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index ec80d9f83ae..b938d04329a 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -665,7 +665,7 @@ static ADDRESS_MAP_START( wgp_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x501fff) AM_READ(MRA16_RAM) /* unknown/unused */ AM_RANGE(0x502000, 0x517fff) AM_READ(wgp_pivram_word_r) /* piv tilemaps */ AM_RANGE(0x520000, 0x52001f) AM_READ(wgp_piv_ctrl_word_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(paletteram16_word_r) + AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( wgp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index b428d80810e..2b63925624f 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -442,8 +442,8 @@ static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xcbff) AM_READWRITE(gfx1_vram_r, gfx1_vram_w) AM_BASE(&gfx1_vram) AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(gfx1_cram_r, gfx1_cram_w) AM_BASE(&gfx1_cram) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE(&sprite_ram) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(paletteram_r, paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_BASE(&paletteram) - AM_RANGE(0xe800, 0xefff) AM_READWRITE(paletteram_2_r, paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_BASE(&paletteram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_SHARE(1) AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xf180, 0xffff) AM_RAM AM_SHARE(2) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 72dd6d04ffd..ca9b0ac133c 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -311,7 +311,7 @@ static ADDRESS_MAP_START( zr107_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x74000000, 0x74003fff) AM_MIRROR(0x80000000) AM_READWRITE(K056832_ram_long_r, K056832_ram_long_w) AM_RANGE(0x74020000, 0x7402003f) AM_MIRROR(0x80000000) AM_READWRITE(K056832_long_r, K056832_long_w) AM_RANGE(0x74060000, 0x7406003f) AM_MIRROR(0x80000000) AM_READWRITE(ccu_r, ccu_w) - AM_RANGE(0x74080000, 0x74081fff) AM_MIRROR(0x80000000) AM_READWRITE(paletteram32_r, paletteram32_w) AM_BASE(&paletteram32) + AM_RANGE(0x74080000, 0x74081fff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, paletteram32_w) AM_BASE(&paletteram32) AM_RANGE(0x740a0000, 0x740a3fff) AM_MIRROR(0x80000000) AM_READ(K056832_rom_long_r) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) /* 21N 21K 23N 23K */ AM_RANGE(0x78010000, 0x7801ffff) AM_MIRROR(0x80000000) AM_WRITE(cgboard_dsp_shared_w_ppc) @@ -337,7 +337,7 @@ static WRITE32_HANDLER( jetwave_palette_w ) static ADDRESS_MAP_START( jetwave_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_MIRROR(0x80000000) AM_RAM /* Work RAM */ AM_RANGE(0x74000000, 0x740000ff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_reg_r, K001604_reg_w) - AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(paletteram32_r, jetwave_palette_w) AM_BASE(&paletteram32) + AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, jetwave_palette_w) AM_BASE(&paletteram32) AM_RANGE(0x74020000, 0x7403ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_tile_r, K001604_tile_w) AM_RANGE(0x74040000, 0x7407ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_char_r, K001604_char_w) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) /* 21N 21K 23N 23K */ diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index b5f2022f451..79780d48d8d 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -97,7 +97,7 @@ extern int sys18_sound_info[4*2]; extern void sys16_patch_code( int offset, int data ); #define SYS16_MWA16_PALETTERAM sys16_paletteram_w -#define SYS16_MRA16_PALETTERAM paletteram16_word_r +#define SYS16_MRA16_PALETTERAM MRA16_RAM #define SYS16_MRA16_WORKINGRAM MRA16_RAM #define SYS16_MWA16_WORKINGRAM MWA16_RAM diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index af5dfa01ce1..bbfd32a958b 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -1301,7 +1301,7 @@ WRITE8_HANDLER( leland_gated_paletteram_w ) READ8_HANDLER( leland_gated_paletteram_r ) { if (wcol_enable) - return paletteram_r(offset); + return paletteram[offset]; return 0xff; } @@ -1340,7 +1340,7 @@ WRITE8_HANDLER( ataxx_paletteram_and_misc_w ) READ8_HANDLER( ataxx_paletteram_and_misc_r ) { if (wcol_enable) - return paletteram_r(offset); + return paletteram[offset]; else if (offset == 0x7fc || offset == 0x7fd) { int result = xrom_base[0x00000 | xrom1_addr | ((offset & 1) << 16)]; diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index cc3e593daf9..4b0a4006f7e 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -129,7 +129,7 @@ WRITE16_HANDLER( m92_videocontrol_w ) READ16_HANDLER( m92_paletteram_r ) { - return paletteram16_word_r(offset + 0x400 * m92_palette_bank, mem_mask); + return paletteram16[offset + 0x400 * m92_palette_bank]; } WRITE16_HANDLER( m92_paletteram_w ) diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c index dd7966d6f11..12aa4ced849 100644 --- a/src/mame/video/midtunit.c +++ b/src/mame/video/midtunit.c @@ -311,7 +311,7 @@ WRITE16_HANDLER( midxunit_paletteram_w ) READ16_HANDLER( midxunit_paletteram_r ) { - return paletteram16_word_r(offset / 2, 0); + return paletteram16[offset / 2]; } diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index 6e294211054..4ee31339097 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -229,8 +229,8 @@ WRITE8_HANDLER( pang_paletteram_w ) READ8_HANDLER( pang_paletteram_r ) { - if (paletteram_bank) return paletteram_r(offset + 0x800); - return paletteram_r(offset); + if (paletteram_bank) return paletteram[offset + 0x800]; + return paletteram[offset]; } WRITE8_HANDLER( mgakuen_paletteram_w ) @@ -240,7 +240,7 @@ WRITE8_HANDLER( mgakuen_paletteram_w ) READ8_HANDLER( mgakuen_paletteram_r ) { - return paletteram_r(offset); + return paletteram[offset]; } diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c index 13bf7ecbea8..76837c8c1f0 100644 --- a/src/mame/video/simpsons.c +++ b/src/mame/video/simpsons.c @@ -103,7 +103,7 @@ void simpsons_video_banking(int bank) { if (bank & 1) { - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x0fff, 0, 0, paletteram_r); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x0fff, 0, 0, MRA8_RAM); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x0fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w); } else