diff --git a/src/emu/emupal.h b/src/emu/emupal.h
index 0e1e8c57eb5..607083b9ec2 100644
--- a/src/emu/emupal.h
+++ b/src/emu/emupal.h
@@ -121,6 +121,7 @@
 
 // data-inverted 3-3-2 formats
 #define PALETTE_FORMAT_BBGGGRRR_inverted raw_to_rgb_converter(1, &raw_to_rgb_converter::inverted_rgb_decoder<3,3,2, 0,3,6>)
+#define PALETTE_FORMAT_RRRGGGBB_inverted raw_to_rgb_converter(1, &raw_to_rgb_converter::inverted_rgb_decoder<3,3,2, 5,2,0>)
 
 // standard 2-2-2-2 formats
 #define PALETTE_FORMAT_BBGGRRII raw_to_rgb_converter(1, &raw_to_rgb_converter::BBGGRRII_decoder)
diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c
index 8f0c64f65a4..089cd521148 100644
--- a/src/mame/drivers/cmmb.c
+++ b/src/mame/drivers/cmmb.c
@@ -70,7 +70,6 @@ public:
 
 	DECLARE_READ8_MEMBER(cmmb_charram_r);
 	DECLARE_WRITE8_MEMBER(cmmb_charram_w);
-	DECLARE_WRITE8_MEMBER(cmmb_paletteram_w);
 	DECLARE_READ8_MEMBER(cmmb_input_r);
 	DECLARE_WRITE8_MEMBER(cmmb_output_w);
 	DECLARE_READ8_MEMBER(kludge_r);
@@ -128,13 +127,6 @@ WRITE8_MEMBER(cmmb_state::cmmb_charram_w)
 	m_gfxdecode->gfx(1)->mark_dirty(offset >> 5);
 }
 
-
-WRITE8_MEMBER(cmmb_state::cmmb_paletteram_w)
-{
-	/* RGB output is inverted */
-	m_palette->write(space, offset, UINT8(~data), mem_mask);
-}
-
 READ8_MEMBER(cmmb_state::cmmb_input_r)
 {
 	//printf("%02x R\n",offset);
@@ -193,7 +185,7 @@ static ADDRESS_MAP_START( cmmb_map, AS_PROGRAM, 8, cmmb_state )
 	AM_RANGE(0x0000, 0x01ff) AM_RAM /* zero page address */
 //  AM_RANGE(0x13c0, 0x13ff) AM_RAM //spriteram
 	AM_RANGE(0x1000, 0x13ff) AM_RAM AM_SHARE("videoram")
-	AM_RANGE(0x2480, 0x249f) AM_RAM_WRITE(cmmb_paletteram_w) AM_SHARE("palette")
+	AM_RANGE(0x2480, 0x249f) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
 	AM_RANGE(0x4000, 0x400f) AM_READWRITE(cmmb_input_r,cmmb_output_w) //i/o
 	AM_RANGE(0x4900, 0x4900) AM_READ(kludge_r)
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
@@ -340,7 +332,7 @@ static MACHINE_CONFIG_START( cmmb, cmmb_state )
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", cmmb)
 
 	MCFG_PALETTE_ADD("palette", 512)
-	MCFG_PALETTE_FORMAT(RRRGGGBB)
+	MCFG_PALETTE_FORMAT(RRRGGGBB_inverted)
 
 	/* sound hardware */
 //  MCFG_SPEAKER_STANDARD_MONO("mono")