summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Michaël Banaan Ananas <happppp@users.noreply.github.com>2014-04-06 19:32:48 +0000
committer Michaël Banaan Ananas <happppp@users.noreply.github.com>2014-04-06 19:32:48 +0000
commitf167bd74a41b464d8a09fc8eab76f94cba60ceed (patch)
treea21feea3138b97e6d7564027eabfc88fa3de5161 /src
parent4f0314ace4f56cafd26b9e4ecda09e45be6e102d (diff)
fix palette regression
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/halleys.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 8a58f802db0..3345fc56f9d 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -253,7 +253,8 @@ public:
DECLARE_READ8_MEMBER(blitter_r);
DECLARE_WRITE8_MEMBER(blitter_w);
DECLARE_READ8_MEMBER(collision_id_r);
- DECLARE_WRITE8_MEMBER(halleys_paletteram_IIRRGGBB_w);
+ DECLARE_READ8_MEMBER(paletteram_r);
+ DECLARE_WRITE8_MEMBER(paletteram_w);
DECLARE_READ8_MEMBER(zero_r);
DECLARE_READ8_MEMBER(debug_r);
DECLARE_READ8_MEMBER(vector_r);
@@ -1221,7 +1222,12 @@ void halleys_state::halleys_decode_rgb(UINT32 *r, UINT32 *g, UINT32 *b, int addr
*b = prom_6330[0x40 + (bit0|bit1|bit2|bit3|bit4)];
}
-WRITE8_MEMBER(halleys_state::halleys_paletteram_IIRRGGBB_w)
+READ8_MEMBER(halleys_state::paletteram_r)
+{
+ return m_paletteram[offset];
+}
+
+WRITE8_MEMBER(halleys_state::paletteram_w)
{
UINT32 d, r, g, b, i, j;
UINT32 *pal_ptr = m_internal_palette;
@@ -1691,7 +1697,7 @@ static ADDRESS_MAP_START( halleys_map, AS_PROGRAM, 8, halleys_state )
AM_RANGE(0xff9c, 0xff9c) AM_WRITE(firq_ack_w)
AM_RANGE(0xff00, 0xffbf) AM_RAM AM_SHARE("io_ram") // I/O write fall-through
- AM_RANGE(0xffc0, 0xffdf) AM_RAM_WRITE(halleys_paletteram_IIRRGGBB_w)
+ AM_RANGE(0xffc0, 0xffdf) AM_READWRITE(paletteram_r, paletteram_w)
AM_RANGE(0xffe0, 0xffff) AM_READ(vector_r)
ADDRESS_MAP_END