From 55d9a4f2c2414fdc85b2c7bba7d15f1351ee5e73 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 1 Mar 2014 17:46:50 +0000
Subject: [PATCH] few more (nw)

---
 src/mame/drivers/cubeqst.c  | 37 ++++++++++++++++---------------------
 src/mame/drivers/mappy.c    |  4 ++--
 src/mame/drivers/nova2001.c |  6 +++---
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 228d77e1f78..fc92f7c2318 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -62,7 +62,6 @@ public:
 	virtual void machine_start();
 	virtual void machine_reset();
 	virtual void video_start();
-	DECLARE_PALETTE_INIT(cubeqst);
 	UINT32 screen_update_cubeqst(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	INTERRUPT_GEN_MEMBER(vblank);
 	TIMER_CALLBACK_MEMBER(delayed_bank_swap);
@@ -94,26 +93,6 @@ void cubeqst_state::video_start()
 	m_depth_buffer = auto_alloc_array(machine(), UINT8, 512);
 }
 
-/* TODO: Use resistor values */
-PALETTE_INIT_MEMBER(cubeqst_state, cubeqst)
-{
-	int i;
-
-	m_colormap = auto_alloc_array(machine(), rgb_t, 65536);
-	for (i = 0; i < 65536; ++i)
-	{
-		UINT8 a, r, g, b, y;
-
-		a = (i >> 3) & 1;
-		b = (i >> 0) & 7;
-		g = (i >> 4) & 7;
-		r = (i >> 8) & 7;
-		y = ((i >> 12) & 0xf) * 2;
-
-		m_colormap[i] = rgb_t(a ? 0 : 255, y*r, y*g, y*b);
-	}
-}
-
 WRITE16_MEMBER(cubeqst_state::palette_w)
 {
 	m_screen->update_now();
@@ -454,6 +433,22 @@ ADDRESS_MAP_END
 
 void cubeqst_state::machine_start()
 {
+	/* TODO: Use resistor values */
+	int i;
+
+	m_colormap = auto_alloc_array(machine(), rgb_t, 65536);
+	for (i = 0; i < 65536; ++i)
+	{
+		UINT8 a, r, g, b, y;
+
+		a = (i >> 3) & 1;
+		b = (i >> 0) & 7;
+		g = (i >> 4) & 7;
+		r = (i >> 8) & 7;
+		y = ((i >> 12) & 0xf) * 2;
+
+		m_colormap[i] = rgb_t(a ? 0 : 255, y*r, y*g, y*b);
+	}
 }
 
 void cubeqst_state::machine_reset()
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 85e6acb7a51..659cc65972d 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1879,8 +1879,8 @@ static MACHINE_CONFIG_DERIVED( todruaga, digdug2 )
 
 	/* video hardware */
 	MCFG_GFXDECODE_MODIFY("gfxdecode", todruaga)
-	MCFG_DEVICE_REMOVE("palette")
-	MCFG_PALETTE_ADD("palette", 64*4+64*16)
+	MCFG_PALETTE_MODIFY("palette")
+	MCFG_PALETTE_ENTRIES(64*4+64*16)
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_START( motos, mappy_state )
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 22a7977392d..f1d02bcd903 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -203,7 +203,7 @@ static ADDRESS_MAP_START( ninjakun_cpu1_map, AS_PROGRAM, 8, nova2001_state )
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_SHARE("fg_videoram")
 	AM_RANGE(0xc800, 0xcfff) AM_READWRITE(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_SHARE("bg_videoram")
 	AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("spriteram")
-	AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("paletteram")
+	AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("palette")
 	AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_SHARE("share1")
 	AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_SHARE("share2")
 ADDRESS_MAP_END
@@ -222,7 +222,7 @@ static ADDRESS_MAP_START( ninjakun_cpu2_map, AS_PROGRAM, 8, nova2001_state )
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_SHARE("fg_videoram")
 	AM_RANGE(0xc800, 0xcfff) AM_READWRITE(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_SHARE("bg_videoram")
 	AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("spriteram")
-	AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("paletteram")
+	AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("palette")
 	AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_SHARE("share2") /* swapped wrt CPU1 */
 	AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_SHARE("share1") /* swapped wrt CPU1 */
 ADDRESS_MAP_END
@@ -258,7 +258,7 @@ static ADDRESS_MAP_START( raiders5_cpu1_map, AS_PROGRAM, 8, nova2001_state )
 	AM_RANGE(0xc001, 0xc001) AM_DEVREAD("ay1", ay8910_device, data_r)
 	AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("ay2", ay8910_device, address_data_w)
 	AM_RANGE(0xc003, 0xc003) AM_DEVREAD("ay2", ay8910_device, data_r)
-	AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("paletteram")
+	AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("palette")
 	AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1")
 ADDRESS_MAP_END