summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/mame/drivers/powerins.c5
-rw-r--r--src/mame/drivers/sslam.c6
-rw-r--r--src/mame/includes/powerins.h1
-rw-r--r--src/mame/includes/sslam.h1
-rw-r--r--src/mame/video/powerins.c22
-rw-r--r--src/mame/video/sslam.c18
6 files changed, 7 insertions, 46 deletions
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index f8d65e9d4a9..183e4b1bd72 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -81,7 +81,7 @@ static ADDRESS_MAP_START( powerins_map, AS_PROGRAM, 16, powerins_state )
AM_RANGE(0x100018, 0x100019) AM_WRITE(powerins_tilebank_w) // Tiles Banking (VRAM 0)
AM_RANGE(0x10001e, 0x10001f) AM_WRITE(powerins_soundlatch_w) // Sound Latch
AM_RANGE(0x100030, 0x100031) AM_WRITE(powerins_okibank_w) // Sound
- AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE(powerins_paletteram16_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x120000, 0x120fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") // Palette
AM_RANGE(0x130000, 0x130007) AM_RAM AM_SHARE("vctrl_0") // VRAM 0 Control
AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE(powerins_vram_0_w) AM_SHARE("vram_0") // VRAM 0
AM_RANGE(0x170000, 0x170fff) AM_RAM_WRITE(powerins_vram_1_w) AM_SHARE("vram_1") // VRAM 1
@@ -102,7 +102,7 @@ static ADDRESS_MAP_START( powerina_map, AS_PROGRAM, 16, powerins_state )
AM_RANGE(0x10001e, 0x10001f) AM_WRITENOP // Sound Latch, NOPed since there is no sound cpu
AM_RANGE(0x100030, 0x100031) AM_WRITE(powerins_okibank_w) // Sound
AM_RANGE(0x10003e, 0x10003f) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) // (used by powerina)
- AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE(powerins_paletteram16_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x120000, 0x120fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") // Palette
AM_RANGE(0x130000, 0x130007) AM_RAM AM_SHARE("vctrl_0") // VRAM 0 Control
AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE(powerins_vram_0_w) AM_SHARE("vram_0") // VRAM 0
AM_RANGE(0x170000, 0x170fff) AM_RAM_WRITE(powerins_vram_1_w) AM_SHARE("vram_1") // VRAM 1
@@ -356,6 +356,7 @@ static MACHINE_CONFIG_START( powerins, powerins_state )
MCFG_GFXDECODE_ADD("gfxdecode", powerins)
MCFG_PALETTE_ADD("palette", 2048)
+ MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
/* sound hardware */
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index aa18844b867..e3742b367b4 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -383,7 +383,7 @@ static ADDRESS_MAP_START( sslam_program_map, AS_PROGRAM, 16, sslam_state )
AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE(sslam_tx_tileram_w) AM_SHARE("tx_tileram")
AM_RANGE(0x110000, 0x11000d) AM_RAM AM_SHARE("regs")
AM_RANGE(0x200000, 0x200001) AM_WRITENOP
- AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(sslam_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x280fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
AM_RANGE(0x201000, 0x201fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x304000, 0x304001) AM_WRITENOP
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("IN0")
@@ -406,7 +406,7 @@ static ADDRESS_MAP_START( powerbls_map, AS_PROGRAM, 16, sslam_state )
AM_RANGE(0x110000, 0x11000d) AM_RAM AM_SHARE("regs")
AM_RANGE(0x200000, 0x200001) AM_WRITENOP
AM_RANGE(0x201000, 0x201fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x280000, 0x2803ff) AM_RAM_WRITE(sslam_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x2803ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("IN0")
AM_RANGE(0x300012, 0x300013) AM_READ_PORT("IN1")
AM_RANGE(0x300014, 0x300015) AM_READ_PORT("IN2")
@@ -715,6 +715,7 @@ static MACHINE_CONFIG_START( sslam, sslam_state )
MCFG_GFXDECODE_ADD("gfxdecode", sslam)
MCFG_PALETTE_ADD("palette", 0x800)
+ MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
MCFG_VIDEO_START_OVERRIDE(sslam_state,sslam)
@@ -745,6 +746,7 @@ static MACHINE_CONFIG_START( powerbls, sslam_state )
MCFG_GFXDECODE_ADD("gfxdecode", powerbls)
MCFG_PALETTE_ADD("palette", 0x200)
+ MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
MCFG_VIDEO_START_OVERRIDE(sslam_state,powerbls)
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index ff2b9cc433a..960b906f4ee 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -39,7 +39,6 @@ public:
DECLARE_READ8_MEMBER(powerinb_fake_ym2203_r);
DECLARE_WRITE16_MEMBER(powerins_flipscreen_w);
DECLARE_WRITE16_MEMBER(powerins_tilebank_w);
- DECLARE_WRITE16_MEMBER(powerins_paletteram16_w);
DECLARE_WRITE16_MEMBER(powerins_vram_0_w);
DECLARE_WRITE16_MEMBER(powerins_vram_1_w);
TILE_GET_INFO_MEMBER(get_tile_info_0);
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index 16c0b055f93..65905076ac8 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -43,7 +43,6 @@ public:
DECLARE_READ8_MEMBER(playmark_snd_command_r);
DECLARE_WRITE8_MEMBER(playmark_oki_w);
DECLARE_WRITE8_MEMBER(playmark_snd_control_w);
- DECLARE_WRITE16_MEMBER(sslam_paletteram_w);
DECLARE_WRITE16_MEMBER(sslam_tx_tileram_w);
DECLARE_WRITE16_MEMBER(sslam_md_tileram_w);
DECLARE_WRITE16_MEMBER(sslam_bg_tileram_w);
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index 54bbb5d0399..d0520fe3c5d 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -67,28 +67,6 @@ WRITE16_MEMBER(powerins_state::powerins_tilebank_w)
-/***************************************************************************
-
- Palette
-
-***************************************************************************/
-
-
-WRITE16_MEMBER(powerins_state::powerins_paletteram16_w)
-{
- /* byte 0 byte 1 */
- /* RRRR GGGG BBBB RGBx */
- /* 4321 4321 4321 000x */
-
- UINT16 newword = COMBINE_DATA(&m_generic_paletteram_16[offset]);
-
- int r = ((newword >> 11) & 0x1E ) | ((newword >> 3) & 0x01);
- int g = ((newword >> 7) & 0x1E ) | ((newword >> 2) & 0x01);
- int b = ((newword >> 3) & 0x1E ) | ((newword >> 1) & 0x01);
-
- m_palette->set_pen_color( offset, pal5bit(r),pal5bit(g),pal5bit(b) );
-}
-
/***************************************************************************
diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c
index f0468f0e392..18d780f1e16 100644
--- a/src/mame/video/sslam.c
+++ b/src/mame/video/sslam.c
@@ -4,24 +4,6 @@
#include "includes/sslam.h"
-WRITE16_MEMBER(sslam_state::sslam_paletteram_w)
-{
- int r, g, b, val;
-
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
-
- val = m_generic_paletteram_16[offset];
- r = (val >> 11) & 0x1e;
- g = (val >> 7) & 0x1e;
- b = (val >> 3) & 0x1e;
-
- r |= ((val & 0x08) >> 3);
- g |= ((val & 0x04) >> 2);
- b |= ((val & 0x02) >> 1);
-
- m_palette->set_pen_color(offset, pal5bit(r), pal5bit(g), pal5bit(b));
-}
-
void sslam_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
gfx_element *gfx = m_gfxdecode->gfx(0);