Remove color_prom parameter from PALETTE_INIT. Added code where

necessary to fetch the color_prom directly. Made PALETTE_INIT
into just another basic callback with an overridable palette_init()
in the driver_device, and support for arbitrary member functions via
MCFG_PALETTE_INIT_OVERRIDE.

src/emu/driver.c

@@ -58,7 +58,6 @@ driver_device::driver_device(const machine_config &mconfig, device_type type, co
 	  m_generic_paletteram_32(*this, "paletteram"),
 	  m_generic_paletteram2_32(*this, "paletteram2"),
 	  m_system(NULL),
-	  m_palette_init(NULL),
 	  m_latch_clear_value(0),
 	  m_flip_screen_x(0),
 	  m_flip_screen_y(0)
@@ -119,18 +118,6 @@ void driver_device::static_set_callback(device_t &device, callback_type type, dr
 }
 
 
-//-------------------------------------------------
-//  static_set_palette_init - set the legacy
-//  palette init callback in the device
-//  configuration
-//-------------------------------------------------
-
-void driver_device::static_set_palette_init(device_t &device, palette_init_func callback)
-{
-	downcast<driver_device &>(device).m_palette_init = callback;
-}
-
-
 //-------------------------------------------------
 //  driver_start - default implementation which
 //  does nothing
@@ -161,6 +148,16 @@ void driver_device::sound_start()
 }
 
 
+//-------------------------------------------------
+//  palette_init - default implementation which
+//  does nothing
+//-------------------------------------------------
+
+void driver_device::palette_init()
+{
+}
+
+
 //-------------------------------------------------
 //  video_start - default implementation which
 //  calls to the legacy video_start function
@@ -259,8 +256,10 @@ void driver_device::device_start()
 	image_postdevice_init(machine());
 
 	// call palette_init if present
-	if (m_palette_init != NULL)
-		(*m_palette_init)(machine(), machine().region("proms")->base());
+	if (!m_callbacks[CB_PALETTE_INIT].isnull())
+		m_callbacks[CB_PALETTE_INIT]();
+	else
+		palette_init();
 
 	// start the various pieces
 	driver_start();

src/emu/driver.h

@@ -81,7 +81,10 @@
 
 // core video callbacks
 #define MCFG_PALETTE_INIT(_func) \
-	driver_device::static_set_palette_init(*owner, PALETTE_INIT_NAME(_func)); \
+	driver_device::static_set_callback(*owner, driver_device::CB_PALETTE_INIT, PALETTE_INIT_NAME(_func)); \
+
+#define MCFG_PALETTE_INIT_OVERRIDE(_class, _func) \
+	driver_device::static_set_callback(*owner, driver_device::CB_PALETTE_INIT, driver_callback_delegate(&_class::_func, #_class "::" #_func, downcast<_class *>(&config.root_device())));
 
 #define MCFG_VIDEO_START(_func) \
 	driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_START, VIDEO_START_NAME(_func)); \
@@ -97,12 +100,50 @@
 
 
 
+//**************************************************************************
+//  OTHER MACROS
+//**************************************************************************
+
+// macros to wrap legacy callbacks
+#define MACHINE_START_NAME(name)	machine_start_##name
+#define MACHINE_START(name)			void MACHINE_START_NAME(name)(running_machine &machine)
+#define MACHINE_START_CALL(name)	MACHINE_START_NAME(name)(machine)
+
+#define MACHINE_RESET_NAME(name)	machine_reset_##name
+#define MACHINE_RESET(name)			void MACHINE_RESET_NAME(name)(running_machine &machine)
+#define MACHINE_RESET_CALL(name)	MACHINE_RESET_NAME(name)(machine)
+
+#define SOUND_START_NAME(name)		sound_start_##name
+#define SOUND_START(name)			void SOUND_START_NAME(name)(running_machine &machine)
+#define SOUND_START_CALL(name)		SOUND_START_NAME(name)(machine)
+
+#define SOUND_RESET_NAME(name)		sound_reset_##name
+#define SOUND_RESET(name)			void SOUND_RESET_NAME(name)(running_machine &machine)
+#define SOUND_RESET_CALL(name)		SOUND_RESET_NAME(name)(machine)
+
+#define PALETTE_INIT_NAME(name)		palette_init_##name
+#define PALETTE_INIT(name)			void PALETTE_INIT_NAME(name)(running_machine &machine)
+#define PALETTE_INIT_CALL(name)		PALETTE_INIT_NAME(name)(machine)
+
+#define VIDEO_START_NAME(name)		video_start_##name
+#define VIDEO_START(name)			void VIDEO_START_NAME(name)(running_machine &machine)
+#define VIDEO_START_CALL(name)		VIDEO_START_NAME(name)(machine)
+
+#define VIDEO_RESET_NAME(name)		video_reset_##name
+#define VIDEO_RESET(name)			void VIDEO_RESET_NAME(name)(running_machine &machine)
+#define VIDEO_RESET_CALL(name)		VIDEO_RESET_NAME(name)(machine)
+
+
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
 
 typedef delegate<void ()> driver_callback_delegate;
 
+// legacy callback functions
+typedef void   (*legacy_callback_func)(running_machine &machine);
+
 
 // ======================> driver_device
 
@@ -124,6 +165,7 @@ public:
 		CB_MACHINE_RESET,
 		CB_SOUND_START,
 		CB_SOUND_RESET,
+		CB_PALETTE_INIT,
 		CB_VIDEO_START,
 		CB_VIDEO_RESET,
 		CB_COUNT
@@ -133,7 +175,6 @@ public:
 	static void static_set_game(device_t &device, const game_driver &game);
 	static void static_set_callback(device_t &device, callback_type type, legacy_callback_func callback);
 	static void static_set_callback(device_t &device, callback_type type, driver_callback_delegate callback);
-	static void static_set_palette_init(device_t &device, palette_init_func callback);
 
 	// generic helpers
 	template<class _DriverClass, void (_DriverClass::*_Function)()>
@@ -317,6 +358,7 @@ protected:
 	virtual void driver_start();
 	virtual void machine_start();
 	virtual void sound_start();
+	virtual void palette_init();
 	virtual void video_start();
 
 	// helpers called at reset
@@ -354,7 +396,6 @@ private:
 
 	// internal state
 	const game_driver *		m_system;					// pointer to the game driver
-	palette_init_func		m_palette_init;				// one-time palette init callback
 	driver_callback_delegate m_callbacks[CB_COUNT];		// start/reset callbacks
 	legacy_callback_func 	m_legacy_callbacks[CB_COUNT]; // legacy start/reset callbacks
 

src/emu/machine.h

@@ -110,37 +110,6 @@ const int DEBUG_FLAG_OSD_ENABLED	= 0x00001000;		// The OSD debugger is enabled
 //  MACROS
 //**************************************************************************
 
-// macros to wrap legacy callbacks
-#define MACHINE_START_NAME(name)	machine_start_##name
-#define MACHINE_START(name)			void MACHINE_START_NAME(name)(running_machine &machine)
-#define MACHINE_START_CALL(name)	MACHINE_START_NAME(name)(machine)
-
-#define MACHINE_RESET_NAME(name)	machine_reset_##name
-#define MACHINE_RESET(name)			void MACHINE_RESET_NAME(name)(running_machine &machine)
-#define MACHINE_RESET_CALL(name)	MACHINE_RESET_NAME(name)(machine)
-
-#define SOUND_START_NAME(name)		sound_start_##name
-#define SOUND_START(name)			void SOUND_START_NAME(name)(running_machine &machine)
-#define SOUND_START_CALL(name)		SOUND_START_NAME(name)(machine)
-
-#define SOUND_RESET_NAME(name)		sound_reset_##name
-#define SOUND_RESET(name)			void SOUND_RESET_NAME(name)(running_machine &machine)
-#define SOUND_RESET_CALL(name)		SOUND_RESET_NAME(name)(machine)
-
-#define VIDEO_START_NAME(name)		video_start_##name
-#define VIDEO_START(name)			void VIDEO_START_NAME(name)(running_machine &machine)
-#define VIDEO_START_CALL(name)		VIDEO_START_NAME(name)(machine)
-
-#define VIDEO_RESET_NAME(name)		video_reset_##name
-#define VIDEO_RESET(name)			void VIDEO_RESET_NAME(name)(running_machine &machine)
-#define VIDEO_RESET_CALL(name)		VIDEO_RESET_NAME(name)(machine)
-
-#define PALETTE_INIT_NAME(name)		palette_init_##name
-#define PALETTE_INIT(name)			void PALETTE_INIT_NAME(name)(running_machine &machine, const UINT8 *color_prom)
-#define PALETTE_INIT_CALL(name)		PALETTE_INIT_NAME(name)(machine, color_prom)
-
-
-
 // NULL versions
 #define machine_start_0 			NULL
 #define machine_reset_0 			NULL
@@ -191,12 +160,6 @@ typedef struct _debugcpu_private debugcpu_private;
 typedef struct _generic_machine_private generic_machine_private;
 
 
-// legacy callback functions
-typedef void   (*legacy_callback_func)(running_machine &machine);
-typedef void   (*palette_init_func)(running_machine &machine, const UINT8 *color_prom);
-
-
-
 // ======================> memory_region
 
 // memory region object; should eventually be renamed memory_region

src/emu/video/generic.c

@@ -160,6 +160,7 @@ PALETTE_INIT( monochrome_green )
 
 PALETTE_INIT( RRRR_GGGG_BBBB )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/emu/video/psx.c

@@ -3703,7 +3703,12 @@ MACHINE_CONFIG_FRAGMENT( psxgpu )
 	((screen_device *)device)->register_vblank_callback(vblank_state_delegate(FUNC(psxgpu_device::vblank), (psxgpu_device *) owner));
 
 	MCFG_PALETTE_LENGTH( 65536 )
-	driver_device::static_set_palette_init(*owner->owner(), PALETTE_INIT_NAME(psx)); // MCFG_PALETTE_INIT( psx )
+	{
+		device_t *original_owner = owner;
+		owner = owner->owner();
+		MCFG_PALETTE_INIT(psx)
+		owner = original_owner;
+	}
 MACHINE_CONFIG_END
 
 //-------------------------------------------------

src/mame/drivers/5clown.c

@@ -537,6 +537,7 @@ static SCREEN_UPDATE_IND16( fclown )
 
 static PALETTE_INIT( fclown )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*
     7654 3210
     ---- ---x   RED component.

src/mame/drivers/albazc.c

@@ -40,6 +40,7 @@ public:
 
 static PALETTE_INIT( hanaroku )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	int r, g, b;
 

src/mame/drivers/amaticmg.c

@@ -413,6 +413,7 @@ static SCREEN_UPDATE_IND16( amaticmg )
 
 static PALETTE_INIT( amaticmg )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int	bit0, bit1, bit2 , r, g, b;
 	int	i;
 
@@ -439,6 +440,7 @@ static PALETTE_INIT( amaticmg )
 
 static PALETTE_INIT( amaticmg3 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int	r, g, b;
 	int	i;
 

src/mame/drivers/aristmk4.c

@@ -1587,6 +1587,7 @@ static const ppi8255_interface ppi8255_intf1 =
 /* same as Casino Winner HW */
 static PALETTE_INIT( aristmk4 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0;i < machine.total_colors();i++)

src/mame/drivers/avt.c

@@ -531,6 +531,7 @@ static SCREEN_UPDATE_IND16( avt )
 
 static PALETTE_INIT( avt )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*  prom bits
     7654 3210
     ---- ---x   Intensity?.

src/mame/drivers/blitz.c

@@ -364,6 +364,7 @@ static SCREEN_UPDATE_IND16( megadpkr )
 
 static PALETTE_INIT( megadpkr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*
     This hardware has a feature called BLUE KILLER.
     Using the original intensity line, the PCB has a bridge

src/mame/drivers/cardline.c

@@ -186,6 +186,7 @@ GFXDECODE_END
 
 static PALETTE_INIT(cardline)
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i,r,g,b,data;
 	int bit0,bit1,bit2;
 	for (i = 0;i < machine.total_colors();i++)

src/mame/drivers/carrera.c

@@ -283,6 +283,7 @@ static const ay8910_interface ay8910_config =
 
 static PALETTE_INIT(carrera)
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int br_bit0, br_bit1, bit0, bit1, r, g, b;
 	int	i;
 

src/mame/drivers/caswin.c

@@ -274,6 +274,7 @@ static const ay8910_interface ay8910_config =
 
 static PALETTE_INIT( caswin )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int	bit0, bit1, bit2 , r, g, b;
 	int	i;
 

src/mame/drivers/chanbara.c

@@ -88,6 +88,7 @@ public:
 
 static PALETTE_INIT( chanbara )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i, red, green, blue;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/drivers/cntsteer.c

@@ -84,6 +84,7 @@ public:
 
 static PALETTE_INIT( zerotrgt )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	for (i = 0; i < machine.total_colors(); i++)
 	{

src/mame/drivers/corona.c

@@ -353,6 +353,7 @@ public:
 
 static PALETTE_INIT( winner )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int bit6, bit7, bit0, bit1, r, g, b;
 	int i;
 

src/mame/drivers/cyclemb.c

@@ -101,6 +101,7 @@ public:
 
 static PALETTE_INIT( cyclemb )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i,r,g,b,val;
 	int bit0,bit1,bit2;
 

src/mame/drivers/dacholer.c

@@ -606,6 +606,7 @@ static MACHINE_RESET( dacholer )
 /* guess: use the same resistor values as Crazy Climber (needs checking on the real HW) */
 static PALETTE_INIT( dacholer )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };
 	double weights_rg[3], weights_b[2];

src/mame/drivers/ddayjlc.c

@@ -486,6 +486,7 @@ static MACHINE_RESET( ddayjlc )
 
 static PALETTE_INIT( ddayjlc )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i,r,g,b,val;
 	int bit0,bit1,bit2;
 

src/mame/drivers/dmndrby.c

@@ -444,6 +444,7 @@ wouldnt like to say its the most effective way though...
 // copied from elsewhere. surely incorrect
 static PALETTE_INIT( dmnderby )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };
 	double rweights[3], gweights[3], bweights[2];

src/mame/drivers/drw80pkr.c

@@ -347,6 +347,7 @@ static SCREEN_UPDATE_IND16( drw80pkr )
 
 static PALETTE_INIT( drw80pkr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int j;
 
 	for (j = 0; j < machine.total_colors(); j++)

src/mame/drivers/esh.c

@@ -224,6 +224,7 @@ INPUT_PORTS_END
 
 static PALETTE_INIT( esh )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* Oddly enough, the top 4 bits of each byte is 0 */

src/mame/drivers/ettrivia.c

@@ -215,6 +215,7 @@ static TILE_GET_INFO( get_tile_info_fg )
 
 static PALETTE_INIT( ettrivia )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances[2] = { 270, 130 };
 	double weights[2];
 	int i;

src/mame/drivers/fgoal.c

@@ -47,6 +47,7 @@ static int intensity(int bits)
 
 static PALETTE_INIT( fgoal )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* for B/W screens PCB can be jumpered to use lower half of PROM */

src/mame/drivers/fortecar.c

@@ -372,6 +372,7 @@ static SCREEN_UPDATE_IND16(fortecar)
 
 static PALETTE_INIT( fortecar )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /* Video resistors...
 
 O1 (LS374) R1K  RED

src/mame/drivers/goldnpkr.c

@@ -1049,6 +1049,7 @@ static SCREEN_UPDATE_IND16( goldnpkr )
 
 static PALETTE_INIT( goldnpkr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*  prom bits
     7654 3210
     ---- ---x   red component.
@@ -1092,6 +1093,7 @@ static PALETTE_INIT( goldnpkr )
 
 static PALETTE_INIT( witchcrd )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*
     This hardware has a feature called BLUE KILLER.
     Using the original intensity line, the PCB has a bridge
@@ -1139,6 +1141,7 @@ static PALETTE_INIT( witchcrd )
 
 static PALETTE_INIT( wcrdxtnd )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*
     Using the original intensity line, the PCB has a bridge
     that allow (as default) turn the background dark blue.

src/mame/drivers/istellar.c

@@ -274,6 +274,7 @@ INPUT_PORTS_END
 
 static PALETTE_INIT( istellar )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* Oddly enough, the top 4 bits of each byte is 0 */

src/mame/drivers/jangou.c

@@ -89,6 +89,7 @@ public:
 /* guess: use the same resistor values as Crazy Climber (needs checking on the real HW) */
 static PALETTE_INIT( jangou )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };
 	double weights_rg[3], weights_b[2];

src/mame/drivers/jantotsu.c

@@ -200,6 +200,7 @@ WRITE8_MEMBER(jantotsu_state::bankaddr_w)
 
 static PALETTE_INIT( jantotsu )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int	bit0, bit1, bit2, r, g, b;
 	int	i;
 

src/mame/drivers/jollyjgr.c

@@ -402,6 +402,7 @@ INPUT_PORTS_END
 
 static PALETTE_INIT( jollyjgr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* tilemap / sprites palette */

src/mame/drivers/kingdrby.c

@@ -954,6 +954,7 @@ static const ym2203_interface cowrace_ym2203_interface =
 
 static PALETTE_INIT(kingdrby)
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int	bit0, bit1, bit2 , r, g, b;
 	int	i;
 

src/mame/drivers/koikoi.c

@@ -87,6 +87,7 @@ static TILE_GET_INFO( get_tile_info )
 
 static PALETTE_INIT( koikoi )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/drivers/looping.c

@@ -145,6 +145,7 @@ public:
 
 static PALETTE_INIT( looping )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances[3] = { 1000, 470, 220 };
 	double rweights[3], gweights[3], bweights[2];
 	int i;

src/mame/drivers/m63.c

@@ -180,6 +180,7 @@ public:
 
 static PALETTE_INIT( m63 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < 256; i++)

src/mame/drivers/marinedt.c

@@ -445,6 +445,7 @@ GFXDECODE_END
 
 static PALETTE_INIT( marinedt )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i,r,b,g;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/drivers/meijinsn.c

@@ -248,6 +248,7 @@ static VIDEO_START(meijinsn)
 
 static PALETTE_INIT( meijinsn )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	static const int resistances_b[2]  = { 470, 220 };
 	static const int resistances_rg[3] = { 1000, 470, 220 };

src/mame/drivers/miniboy7.c

@@ -219,6 +219,7 @@ static SCREEN_UPDATE_IND16( miniboy7 )
 
 static PALETTE_INIT( miniboy7 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*  FIXME... Can't get the correct palette.
     sometimes RGB bits are inverted, disregarding the 4th bit.
 

src/mame/drivers/mirax.c

@@ -130,6 +130,7 @@ public:
 
 static PALETTE_INIT( mirax )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0;i < machine.total_colors();i++)

src/mame/drivers/mogura.c

@@ -32,6 +32,7 @@ public:
 
 static PALETTE_INIT( mogura )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i, j;
 
 	j = 0;

src/mame/drivers/mpu4vid.c

@@ -2112,6 +2112,7 @@ GFXDECODE_END
 
 static PALETTE_INIT( dealem )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i, len;
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };

src/mame/drivers/murogmbl.c

@@ -51,6 +51,7 @@ public:
 
 static PALETTE_INIT( murogmbl )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int	bit0, bit1, bit2 , r, g, b;
 	int	i;
 

src/mame/drivers/nightgal.c

@@ -250,6 +250,7 @@ WRITE8_MEMBER(nightgal_state::sexygal_nsc_true_blitter_w)
 /* guess: use the same resistor values as Crazy Climber (needs checking on the real HW) */
 static PALETTE_INIT( nightgal )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };
 	double weights_rg[3], weights_b[2];

src/mame/drivers/olibochu.c

@@ -87,6 +87,7 @@ public:
 
 static PALETTE_INIT( olibochu )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/drivers/panicr.c

@@ -93,6 +93,7 @@ public:
 
 static PALETTE_INIT( panicr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/drivers/peplus.c

@@ -700,6 +700,7 @@ static SCREEN_UPDATE_IND16( peplus )
 
 static PALETTE_INIT( peplus )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*  prom bits
     7654 3210
     ---- -xxx   red component.

src/mame/drivers/poo.c

@@ -291,6 +291,7 @@ GFXDECODE_END
 
 static PALETTE_INIT( unclepoo )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i,r,g,b,val;
 	int bit0,bit1,bit2;
 

src/mame/drivers/progolf.c

@@ -388,6 +388,7 @@ static const mc6845_interface mc6845_intf =
 
 static PALETTE_INIT( progolf )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0;i < machine.total_colors();i++)

src/mame/drivers/quizo.c

@@ -51,6 +51,7 @@ static const UINT8 rombankLookup[]={ 2, 3, 4, 4, 4, 4, 4, 5, 0, 1};
 
 static PALETTE_INIT(quizo)
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	for (i = 0;i < 16;i++)
 	{

src/mame/drivers/roul.c

@@ -88,6 +88,7 @@ public:
 
 static PALETTE_INIT( roul )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int bit6, bit7, bit0, bit1, r, g, b;
 	int i;
 

src/mame/drivers/sbowling.c

@@ -342,6 +342,7 @@ GFXDECODE_END
 
 static PALETTE_INIT( sbowling )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	static const int resistances_rg[3] = { 470, 270, 100 };

src/mame/drivers/shougi.c

@@ -133,6 +133,7 @@ public:
 
 static PALETTE_INIT( shougi )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	static const int resistances_b[2]  = { 470, 220 };
 	static const int resistances_rg[3] = { 1000, 470, 220 };

src/mame/drivers/skyarmy.c

@@ -87,6 +87,7 @@ WRITE8_MEMBER(skyarmy_state::skyarmy_colorram_w)
 
 static PALETTE_INIT( skyarmy )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0;i < 32;i++)

src/mame/drivers/sub.c

@@ -386,6 +386,7 @@ GFXDECODE_END
 
 static PALETTE_INIT( sub )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	UINT8* lookup = machine.region("proms2")->base();
 

src/mame/drivers/subsino.c

@@ -548,6 +548,7 @@ static SCREEN_UPDATE_IND16( stisub_reels )
 
 static PALETTE_INIT( subsino_2proms )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i,r,g,b,val;
 	int bit0,bit1,bit2;
 
@@ -574,6 +575,7 @@ static PALETTE_INIT( subsino_2proms )
 
 static PALETTE_INIT( subsino_3proms )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i,r,g,b,val;
 	int bit0,bit1,bit2;
 

src/mame/drivers/supdrapo.c

@@ -126,6 +126,7 @@ static SCREEN_UPDATE_IND16( supdrapo )
 /*Maybe bit 2 & 3 of the second color prom are intensity bits? */
 static PALETTE_INIT( sdpoker )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int	bit0, bit1, bit2 , r, g, b;
 	int	i;
 

src/mame/drivers/superdq.c

@@ -82,6 +82,7 @@ static SCREEN_UPDATE_IND16( superdq )
 
 static PALETTE_INIT( superdq )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	static const int resistances[3] = { 820, 390, 200 };
 	double rweights[3], gweights[3], bweights[2];

src/mame/drivers/tankbust.c

@@ -115,6 +115,7 @@ READ8_MEMBER(tankbust_state::debug_output_area_r)
 
 static PALETTE_INIT( tankbust )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < 128; i++)

src/mame/drivers/tugboat.c

@@ -51,6 +51,7 @@ public:
     just four 1k resistors. */
 static PALETTE_INIT( tugboat )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 

src/mame/drivers/videopkr.c

@@ -400,6 +400,7 @@ static void count_7dig(unsigned long data, UINT8 index)
 
 static PALETTE_INIT( videopkr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int j;
 
 	for (j = 0; j < machine.total_colors(); j++)
@@ -426,6 +427,7 @@ static PALETTE_INIT( videopkr )
 
 static PALETTE_INIT( babypkr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int j;
 
 	for (j = 0; j < machine.total_colors(); j++)
@@ -456,6 +458,7 @@ static PALETTE_INIT( babypkr )
 
 static PALETTE_INIT( fortune1 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int j;
 
 	for (j = 0; j < machine.total_colors(); j++)

src/mame/drivers/wallc.c

@@ -94,6 +94,7 @@ public:
 
 static PALETTE_INIT( wallc )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	static const int resistances_rg[2] = { 330, 220 };

src/mame/video/1942.c

@@ -26,6 +26,7 @@
 
 PALETTE_INIT( 1942 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	rgb_t palette[256];
 	int i, colorbase;
 

src/mame/video/1943.c

@@ -47,6 +47,7 @@ other 2 bits (output & 0x0c) unknown
 
 PALETTE_INIT( 1943 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/40love.c

@@ -12,6 +12,7 @@
 
 PALETTE_INIT( fortyl )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/alpha68k.c

@@ -383,6 +383,7 @@ SCREEN_UPDATE_IND16( alpha68k_I )
 
 PALETTE_INIT( kyros )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */
@@ -410,6 +411,7 @@ PALETTE_INIT( kyros )
 
 PALETTE_INIT( paddlem )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/ambush.c

@@ -20,6 +20,7 @@
 
 PALETTE_INIT( ambush )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/ampoker2.c

@@ -73,6 +73,7 @@
 
 PALETTE_INIT( ampoker2 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*    - bits -
       76543210
       RRRGGGBB

src/mame/video/appoooh.c

@@ -22,6 +22,7 @@
 
 PALETTE_INIT( appoooh )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)
@@ -60,6 +61,7 @@ PALETTE_INIT( appoooh )
 
 PALETTE_INIT( robowres )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/bagman.c

@@ -44,6 +44,7 @@ WRITE8_MEMBER(bagman_state::bagman_colorram_w)
 ***************************************************************************/
 PALETTE_INIT( bagman )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };

src/mame/video/bankp.c

@@ -35,6 +35,7 @@
 
 PALETTE_INIT( bankp )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/baraduke.c

@@ -17,6 +17,7 @@
 
 PALETTE_INIT( baraduke )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	int bit0,bit1,bit2,bit3,r,g,b;
 

src/mame/video/bking.c

@@ -30,6 +30,7 @@
 
 PALETTE_INIT( bking )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 220, 390, 820 };
 	static const int resistances_b [2] = { 220, 390 };
 	double rweights[3], gweights[3], bweights[2];

src/mame/video/bladestl.c

@@ -5,6 +5,7 @@
 
 PALETTE_INIT( bladestl )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/bogeyman.c

@@ -4,6 +4,7 @@
 
 PALETTE_INIT( bogeyman )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* first 16 colors are RAM */

src/mame/video/bosco.c

@@ -16,6 +16,7 @@
 
 PALETTE_INIT( bosco )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	machine.colortable = colortable_alloc(machine, 32+64);

src/mame/video/brkthru.c

@@ -34,6 +34,7 @@
 
 PALETTE_INIT( brkthru )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/btime.c

@@ -30,6 +30,7 @@
 
 PALETTE_INIT( btime )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 
@@ -80,6 +81,7 @@ PALETTE_INIT( btime )
 
 PALETTE_INIT( lnc )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/calomega.c

@@ -70,6 +70,7 @@ SCREEN_UPDATE_IND16( calomega )
 
 PALETTE_INIT( calomega )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 /*  prom bits
     7654 3210
     ---- ---x   red component.

src/mame/video/carjmbre.c

@@ -32,6 +32,7 @@ static const res_net_info carjmbre_net_info =
 
 PALETTE_INIT( carjmbre )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	rgb_t *rgb;
 
 	rgb = compute_res_net_all(machine, color_prom, &carjmbre_decode_info, &carjmbre_net_info);

src/mame/video/carpolo.c

@@ -66,6 +66,7 @@
 
 PALETTE_INIT( carpolo )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* thanks to Jarek Burczynski for analyzing the circuit */

src/mame/video/cclimber.c

@@ -38,6 +38,7 @@
 ***************************************************************************/
 PALETTE_INIT( cclimber )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };
 	double weights_rg[3], weights_b[2];
@@ -114,6 +115,7 @@ PALETTE_INIT( cclimber )
 
 PALETTE_INIT( swimmer )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < 0x100; i++)
@@ -182,6 +184,7 @@ PALETTE_INIT( swimmer )
 
 PALETTE_INIT( yamato )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* chars - 12 bits RGB */
@@ -249,6 +252,7 @@ PALETTE_INIT( yamato )
 
 PALETTE_INIT( toprollr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < 0xa0; i++)

src/mame/video/centiped.c

@@ -290,6 +290,7 @@ WRITE8_MEMBER(centiped_state::centiped_paletteram_w)
 
 PALETTE_INIT( warlords )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/chaknpop.c

@@ -24,6 +24,7 @@
 
 PALETTE_INIT( chaknpop )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < 1024; i++)

src/mame/video/champbas.c

@@ -22,6 +22,7 @@
 
 PALETTE_INIT( champbas )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };
 	double rweights[3], gweights[3], bweights[2];
@@ -74,6 +75,7 @@ PALETTE_INIT( champbas )
 
 PALETTE_INIT( exctsccr )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/cheekyms.c

@@ -17,6 +17,7 @@ Functions to emulate the video hardware of the machine.
 
 PALETTE_INIT( cheekyms )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i, j, bit, r, g, b;
 
 	for (i = 0; i < 6; i++)

src/mame/video/circusc.c

@@ -32,6 +32,7 @@
 
 PALETTE_INIT( circusc )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	static const int resistances_rg[3] = { 1000, 470, 220 };
 	static const int resistances_b [2] = { 470, 220 };
 	double rweights[3], gweights[3], bweights[2];

src/mame/video/clshroad.c

@@ -42,6 +42,7 @@ WRITE8_MEMBER(clshroad_state::clshroad_flipscreen_w)
 
 PALETTE_INIT( clshroad )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 	for (i = 0;i < 256;i++)
 		palette_set_color_rgb(machine,i,	pal4bit(color_prom[i + 256 * 0]),
@@ -51,6 +52,7 @@ PALETTE_INIT( clshroad )
 
 PALETTE_INIT( firebatl )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/combatsc.c

@@ -12,6 +12,7 @@
 
 PALETTE_INIT( combatsc )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int pal;
 
 	/* allocate the colortable */
@@ -62,6 +63,7 @@ PALETTE_INIT( combatsc )
 
 PALETTE_INIT( combatscb )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int pal;
 
 	/* allocate the colortable */

src/mame/video/compgolf.c

@@ -11,6 +11,7 @@
 
 PALETTE_INIT( compgolf )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/contra.c

@@ -22,6 +22,7 @@
 
 PALETTE_INIT( contra )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int chip;
 
 	/* allocate the colortable */

src/mame/video/cop01.c

@@ -12,6 +12,7 @@
 
 PALETTE_INIT( cop01 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/cosmic.c

@@ -77,6 +77,7 @@ static pen_t magspot_map_color( running_machine &machine, UINT8 x, UINT8 y )
 
 PALETTE_INIT( panic )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	cosmic_state *state = machine.driver_data<cosmic_state>();
 	int i;
 
@@ -119,6 +120,7 @@ PALETTE_INIT( panic )
 
 PALETTE_INIT( cosmica )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	cosmic_state *state = machine.driver_data<cosmic_state>();
 	int i;
 
@@ -180,6 +182,7 @@ PALETTE_INIT( cosmicg )
 
 PALETTE_INIT( magspot )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	cosmic_state *state = machine.driver_data<cosmic_state>();
 	int i;
 
@@ -214,6 +217,7 @@ PALETTE_INIT( magspot )
 
 PALETTE_INIT( nomnlnd )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	cosmic_state *state = machine.driver_data<cosmic_state>();
 	int i;
 

src/mame/video/cvs.c

@@ -27,6 +27,7 @@
 
 PALETTE_INIT( cvs )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i, attr;
 
 	/* allocate the colortable */

src/mame/video/darkmist.c

@@ -71,6 +71,7 @@ static TILE_GET_INFO( get_txttile_info )
 
 PALETTE_INIT(darkmist)
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/dday.c

@@ -50,6 +50,7 @@ static void start_countdown_timer(running_machine &machine)
 
 PALETTE_INIT( dday )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	palette_set_shadow_factor(machine, 1.0 / 8);

src/mame/video/ddribble.c

@@ -12,6 +12,7 @@
 
 PALETTE_INIT( ddribble )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	/* allocate the colortable */

src/mame/video/dec8.c

@@ -77,6 +77,7 @@ sprites.
 
 PALETTE_INIT( ghostb )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < machine.total_colors(); i++)

src/mame/video/digdug.c

@@ -23,6 +23,7 @@
 
 PALETTE_INIT( digdug )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	machine.colortable = colortable_alloc(machine, 32);

src/mame/video/dkong.c

@@ -201,6 +201,7 @@ static const res_net_info radarscp_grid_net_info =
 
 PALETTE_INIT( dkong2b)
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	dkong_state *state = machine.driver_data<dkong_state>();
 	rgb_t	*rgb;
 	int i;
@@ -231,6 +232,7 @@ PALETTE_INIT( dkong2b)
 #ifdef UNUSED_FUNCTION
 PALETTE_INIT( dkong4b )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	dkong_state *state = machine.driver_data<dkong_state>();
 	int i;
 	int r,g,b;
@@ -270,6 +272,7 @@ PALETTE_INIT( dkong4b )
 
 PALETTE_INIT( radarscp )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	dkong_state *state = machine.driver_data<dkong_state>();
 	int i;
 	int r,g,b;
@@ -334,6 +337,7 @@ PALETTE_INIT( radarscp )
 
 PALETTE_INIT( radarscp1 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	dkong_state *state = machine.driver_data<dkong_state>();
 	int i;
 	int r,g,b;
@@ -434,6 +438,7 @@ PALETTE_INIT( radarscp1 )
 
 PALETTE_INIT( dkong3 )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	dkong_state *state = machine.driver_data<dkong_state>();
 	rgb_t	*rgb;
 

src/mame/video/docastle.c

@@ -31,6 +31,7 @@
 
 PALETTE_INIT( docastle )
 {
+	const UINT8 *color_prom = machine.region("proms")->base();
 	int i;
 
 	for (i = 0; i < 256; i++)