From 12bc38285f31e416590e8604286632f3bc0c7916 Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Sun, 21 May 2017 21:43:36 +0200 Subject: emupal: Don't hardcode color PROM region name, add error handling --- src/emu/emupal.cpp | 49 +++++++++++++++++++++++++------------------ src/emu/emupal.h | 5 ++++- src/mame/drivers/aeroboto.cpp | 2 +- src/mame/drivers/arkanoid.cpp | 6 +++--- src/mame/drivers/chinsan.cpp | 2 +- src/mame/drivers/commando.cpp | 2 +- src/mame/drivers/exprraid.cpp | 2 +- src/mame/drivers/exzisus.cpp | 2 +- src/mame/drivers/flower.cpp | 2 +- src/mame/drivers/freekick.cpp | 4 ++-- src/mame/drivers/goindol.cpp | 2 +- src/mame/drivers/hexion.cpp | 2 +- src/mame/drivers/hnayayoi.cpp | 2 +- src/mame/drivers/holeland.cpp | 4 ++-- src/mame/drivers/ichiban.cpp | 2 +- src/mame/drivers/kyugo.cpp | 2 +- src/mame/drivers/lasso.cpp | 2 +- src/mame/drivers/lsasquad.cpp | 4 ++-- src/mame/drivers/m63.cpp | 2 +- src/mame/drivers/mexico86.cpp | 2 +- src/mame/drivers/mjkjidai.cpp | 2 +- src/mame/drivers/mjsister.cpp | 2 +- src/mame/drivers/ppmast93.cpp | 2 +- src/mame/drivers/pturn.cpp | 2 +- src/mame/drivers/rmhaihai.cpp | 2 +- src/mame/drivers/sauro.cpp | 2 +- src/mame/drivers/shangkid.cpp | 2 +- src/mame/drivers/slapfght.cpp | 6 +++--- src/mame/drivers/snk.cpp | 6 +++--- src/mame/drivers/tsamurai.cpp | 6 +++--- src/mame/drivers/vastar.cpp | 2 +- 31 files changed, 73 insertions(+), 61 deletions(-) diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp index 90ba40713cb..4062b0f74f7 100644 --- a/src/emu/emupal.cpp +++ b/src/emu/emupal.cpp @@ -28,6 +28,7 @@ palette_device::palette_device(const machine_config &mconfig, const char *tag, d m_membits_supplied(false), m_endianness(), m_endianness_supplied(false), + m_prom_region(*this, finder_base::DUMMY_TAG), m_init(palette_init_delegate()), m_raw_to_rgb(raw_to_rgb_converter()) { @@ -90,6 +91,12 @@ void palette_device::static_enable_hilights(device_t &device) } +void palette_device::static_set_prom_region(device_t &device, const char *region) +{ + downcast(device).m_prom_region.set_tag(region); +} + + //************************************************************************** // GENERIC WRITE HANDLERS @@ -393,35 +400,37 @@ void palette_device::palette_init_3bit_bgr(palette_device &palette) void palette_device::palette_init_RRRRGGGGBBBB_proms(palette_device &palette) { - const u8 *color_prom = machine().root_device().memregion("proms")->base(); - int i; + if (!m_prom_region.found()) + throw emu_fatalerror("Unable to find color PROM region '%s'.", m_prom_region.finder_tag()); + + const u8 *colors = m_prom_region->base(); - for (i = 0; i < palette.entries(); i++) + for (int i = 0; i < palette.entries(); i++) { - int bit0,bit1,bit2,bit3,r,g,b; + int bit0, bit1, bit2, bit3; // red component - bit0 = (color_prom[i] >> 0) & 0x01; - bit1 = (color_prom[i] >> 1) & 0x01; - bit2 = (color_prom[i] >> 2) & 0x01; - bit3 = (color_prom[i] >> 3) & 0x01; - r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; + bit0 = (colors[i] >> 0) & 0x01; + bit1 = (colors[i] >> 1) & 0x01; + bit2 = (colors[i] >> 2) & 0x01; + bit3 = (colors[i] >> 3) & 0x01; + int r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; // green component - bit0 = (color_prom[i + palette.entries()] >> 0) & 0x01; - bit1 = (color_prom[i + palette.entries()] >> 1) & 0x01; - bit2 = (color_prom[i + palette.entries()] >> 2) & 0x01; - bit3 = (color_prom[i + palette.entries()] >> 3) & 0x01; - g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; + bit0 = (colors[i + palette.entries()] >> 0) & 0x01; + bit1 = (colors[i + palette.entries()] >> 1) & 0x01; + bit2 = (colors[i + palette.entries()] >> 2) & 0x01; + bit3 = (colors[i + palette.entries()] >> 3) & 0x01; + int g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; // blue component - bit0 = (color_prom[i + 2*palette.entries()] >> 0) & 0x01; - bit1 = (color_prom[i + 2*palette.entries()] >> 1) & 0x01; - bit2 = (color_prom[i + 2*palette.entries()] >> 2) & 0x01; - bit3 = (color_prom[i + 2*palette.entries()] >> 3) & 0x01; - b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; + bit0 = (colors[i + 2*palette.entries()] >> 0) & 0x01; + bit1 = (colors[i + 2*palette.entries()] >> 1) & 0x01; + bit2 = (colors[i + 2*palette.entries()] >> 2) & 0x01; + bit3 = (colors[i + 2*palette.entries()] >> 3) & 0x01; + int b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - palette.set_pen_color(i,rgb_t(r,g,b)); + palette.set_pen_color(i, rgb_t(r,g,b)); } } diff --git a/src/emu/emupal.h b/src/emu/emupal.h index fe8a9b084b9..2a8d8228328 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -268,8 +268,9 @@ // other standard palettes -#define MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS(_tag, _entries) \ +#define MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS(_tag, _region, _entries) \ MCFG_PALETTE_ADD(_tag, _entries) \ + palette_device::static_set_prom_region(*device, "^" _region); \ palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_RRRRGGGGBBBB_proms), downcast(device))); // not implemented yet @@ -371,6 +372,7 @@ public: static void static_set_indirect_entries(device_t &device, u32 entries); static void static_enable_shadows(device_t &device); static void static_enable_hilights(device_t &device); + static void static_set_prom_region(device_t &device, const char *region); // palette RAM accessors memory_array &basemem() { return m_paletteram; } @@ -438,6 +440,7 @@ private: bool m_membits_supplied; // true if membits forced in static config endianness_t m_endianness; // endianness of palette RAM, if different from native bool m_endianness_supplied; // true if endianness forced in static config + optional_memory_region m_prom_region; // region where the color PROMs are palette_init_delegate m_init; // palette RAM diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp index ea0f5ffce98..a03cb297dd4 100644 --- a/src/mame/drivers/aeroboto.cpp +++ b/src/mame/drivers/aeroboto.cpp @@ -259,7 +259,7 @@ static MACHINE_CONFIG_START( formatz ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", aeroboto) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp index 408e038bb8c..40c1389306e 100644 --- a/src/mame/drivers/arkanoid.cpp +++ b/src/mame/drivers/arkanoid.cpp @@ -1361,7 +1361,7 @@ static MACHINE_CONFIG_START( arkanoid ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", arkanoid) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 512) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1410,7 +1410,7 @@ static MACHINE_CONFIG_START( hexa ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", hexa) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1452,7 +1452,7 @@ static MACHINE_CONFIG_START( brixian ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", arkanoid) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 512) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp index 3a366764cee..ede13c5398b 100644 --- a/src/mame/drivers/chinsan.cpp +++ b/src/mame/drivers/chinsan.cpp @@ -519,7 +519,7 @@ static MACHINE_CONFIG_START( chinsan ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinsan) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp index 4b1c92056b7..d4983d4c695 100644 --- a/src/mame/drivers/commando.cpp +++ b/src/mame/drivers/commando.cpp @@ -272,7 +272,7 @@ static MACHINE_CONFIG_START( commando ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", commando) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_BUFFERED_SPRITERAM8_ADD("spriteram") diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp index b3b3e2685da..9464fa86ae9 100644 --- a/src/mame/drivers/exprraid.cpp +++ b/src/mame/drivers/exprraid.cpp @@ -523,7 +523,7 @@ static MACHINE_CONFIG_START( exprraid ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", exprraid) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index 5f13dc2cdc4..24d509f3b68 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -255,7 +255,7 @@ static MACHINE_CONFIG_START( exzisus ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", exzisus) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 1024) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 1024) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index 8e5d9de2f03..517170571c7 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -382,7 +382,7 @@ static MACHINE_CONFIG_START( flower ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", flower) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MACHINE_CONFIG_END diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index e1223c2e3f0..0b2631af29a 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -723,7 +723,7 @@ static MACHINE_CONFIG_START( omega ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", freekick) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x200) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x200) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -756,7 +756,7 @@ static MACHINE_CONFIG_START( base ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", freekick) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x200) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x200) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp index f5989b52587..49fc53ea039 100644 --- a/src/mame/drivers/goindol.cpp +++ b/src/mame/drivers/goindol.cpp @@ -255,7 +255,7 @@ static MACHINE_CONFIG_START( goindol ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", goindol) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp index 6af765a64a1..b25592522e8 100644 --- a/src/mame/drivers/hexion.cpp +++ b/src/mame/drivers/hexion.cpp @@ -261,7 +261,7 @@ static MACHINE_CONFIG_START( hexion ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", hexion) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp index 7054fa664d4..d80111e02ad 100644 --- a/src/mame/drivers/hnayayoi.cpp +++ b/src/mame/drivers/hnayayoi.cpp @@ -555,7 +555,7 @@ static MACHINE_CONFIG_START( hnayayoi ) MCFG_SCREEN_UPDATE_DRIVER(hnayayoi_state, screen_update_hnayayoi) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp index 9f2181304a7..64041b7d235 100644 --- a/src/mame/drivers/holeland.cpp +++ b/src/mame/drivers/holeland.cpp @@ -288,7 +288,7 @@ static MACHINE_CONFIG_START( holeland ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", holeland) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(holeland_state,holeland) /* sound hardware */ @@ -365,7 +365,7 @@ static MACHINE_CONFIG_START( crzrally ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", crzrally) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(holeland_state,crzrally) /* sound hardware */ diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp index 43fe1b3449f..903eef5634d 100644 --- a/src/mame/drivers/ichiban.cpp +++ b/src/mame/drivers/ichiban.cpp @@ -133,7 +133,7 @@ static MACHINE_CONFIG_START( ichibanjyan ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ichibanjyan) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 512) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp index 51a605bfa17..6b40bfd7cc9 100644 --- a/src/mame/drivers/kyugo.cpp +++ b/src/mame/drivers/kyugo.cpp @@ -544,7 +544,7 @@ static MACHINE_CONFIG_START( kyugo_base ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", kyugo) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index 68168d4a4b2..c391fdcc18d 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -586,7 +586,7 @@ static MACHINE_CONFIG_DERIVED( pinbo, base ) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", pinbo) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(lasso_state,pinbo) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_chameleo) diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index 93809d7a60d..6495270af3f 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -590,7 +590,7 @@ static MACHINE_CONFIG_START( lsasquad ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", lsasquad) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 512) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -646,7 +646,7 @@ static MACHINE_CONFIG_START( daikaiju ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", lsasquad) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 512) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index 126e820ff15..f1f3e809424 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -824,7 +824,7 @@ static MACHINE_CONFIG_START( fghtbskt ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", fghtbskt) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(m63_state,m63) /* sound hardware */ diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp index 2079685a432..1c5f8d90461 100644 --- a/src/mame/drivers/mexico86.cpp +++ b/src/mame/drivers/mexico86.cpp @@ -456,7 +456,7 @@ static MACHINE_CONFIG_START( mexico86 ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", mexico86) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index 9a0f8ce44d6..54ad75f204a 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -320,7 +320,7 @@ static MACHINE_CONFIG_START( mjkjidai ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", mjkjidai) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x100) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp index 3ef65322117..d65d7c57d40 100644 --- a/src/mame/drivers/mjsister.cpp +++ b/src/mame/drivers/mjsister.cpp @@ -501,7 +501,7 @@ static MACHINE_CONFIG_START( mjsister ) MCFG_SCREEN_UPDATE_DRIVER(mjsister_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp index 9d6cf7b7661..17b319e10ec 100644 --- a/src/mame/drivers/ppmast93.cpp +++ b/src/mame/drivers/ppmast93.cpp @@ -383,7 +383,7 @@ static MACHINE_CONFIG_START( ppmast93 ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ppmast93) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x100) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp index 5dfe05c42d6..a7bb4628411 100644 --- a/src/mame/drivers/pturn.cpp +++ b/src/mame/drivers/pturn.cpp @@ -516,7 +516,7 @@ static MACHINE_CONFIG_START( pturn ) MCFG_SCREEN_UPDATE_DRIVER(pturn_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x100) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) MCFG_GFXDECODE_ADD("gfxdecode", "palette", pturn) diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index 1130b570d8d..082123d23df 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -492,7 +492,7 @@ static MACHINE_CONFIG_START( rmhaihai ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", rmhaihai) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x100) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index d4a0a64c0d0..adb1f7d2b15 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -460,7 +460,7 @@ static MACHINE_CONFIG_START( tecfri ) MCFG_SCREEN_VISIBLE_AREA(1 * 8, 31 * 8 - 1, 2 * 8, 30 * 8 - 1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 1024) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 1024) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index 6102a5e5827..a351a801723 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -379,7 +379,7 @@ static MACHINE_CONFIG_START( chinhero ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinhero) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(shangkid_state,shangkid) /* sound hardware */ diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index c5c5bb753b6..8f6f10397e6 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -952,7 +952,7 @@ static MACHINE_CONFIG_START( perfrman ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", perfrman) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(slapfght_state, perfrman) /* sound hardware */ @@ -999,7 +999,7 @@ static MACHINE_CONFIG_START( tigerh ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapfght) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(slapfght_state, slapfight) /* sound hardware */ @@ -1064,7 +1064,7 @@ static MACHINE_CONFIG_START( slapfigh ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapfght) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(slapfght_state, slapfight) /* sound hardware */ diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index 36e7e3d05a3..5f4323211db 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -3881,7 +3881,7 @@ static MACHINE_CONFIG_START( ikari ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ikari) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x400) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_VIDEO_START_OVERRIDE(snk_state,ikari) @@ -3940,7 +3940,7 @@ static MACHINE_CONFIG_START( bermudat ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", gwar) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x400) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_VIDEO_START_OVERRIDE(snk_state,gwar) /* sound hardware */ @@ -4038,7 +4038,7 @@ static MACHINE_CONFIG_START( tdfever ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", tdfever) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 0x400) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_VIDEO_START_OVERRIDE(snk_state,tdfever) diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 757ef186d49..1b98bfcd4cb 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -732,7 +732,7 @@ static MACHINE_CONFIG_START( tsamurai ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(tsamurai_state,tsamurai) /* sound hardware */ @@ -773,7 +773,7 @@ static MACHINE_CONFIG_START( vsgongf ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(tsamurai_state,vsgongf) /* sound hardware */ @@ -821,7 +821,7 @@ static MACHINE_CONFIG_START( m660 ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(tsamurai_state,m660) /* sound hardware */ diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp index db3d13b8d97..de2ec1c4445 100644 --- a/src/mame/drivers/vastar.cpp +++ b/src/mame/drivers/vastar.cpp @@ -450,7 +450,7 @@ static MACHINE_CONFIG_START( vastar ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", vastar) - MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", 256) + MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") -- cgit v1.2.3