emupal: add decoder for xxxxxBBBxGGGxRRR format,

cclimber: small cleanup

Author: happppp

src/emu/emupal.cpp

@@ -168,6 +168,12 @@ palette_device &palette_device::set_format(xbgr_333_t, u32 entries)
 	return *this;
 }
 
+palette_device &palette_device::set_format(xbgr_333_nib_t, u32 entries)
+{
+	set_format(2, &raw_to_rgb_converter::standard_rgb_decoder<3,3,3, 0,4,8>, entries);
+	return *this;
+}
+
 palette_device &palette_device::set_format(xrgb_444_t, u32 entries)
 {
 	set_format(2, &raw_to_rgb_converter::standard_rgb_decoder<4,4,4, 8,4,0>, entries);

src/emu/emupal.h

@@ -210,6 +210,7 @@ class palette_device : public device_t, public device_palette_interface
 	enum xrgb_333_t     { xRGB_333, xxxxxxxRRRGGGBBB };
 	enum xrbg_333_t     { xRBG_333, xxxxxxxRRRBBBGGG };
 	enum xbgr_333_t     { xBGR_333, xxxxxxxBBBGGGRRR };
+	enum xbgr_333_nib_t { xBGR_333_nibble, xxxxxBBBxGGGxRRR };
 	enum xrgb_444_t     { xRGB_444, xxxxRRRRGGGGBBBB };
 	enum xrbg_444_t     { xRBG_444, xxxxRRRRBBBBGGGG };
 	enum xbrg_444_t     { xBRG_444, xxxxBBBBRRRRGGGG };
@@ -297,6 +298,7 @@ class palette_device : public device_t, public device_palette_interface
 	palette_device &set_format(xrgb_333_t, u32 entries);
 	palette_device &set_format(xrbg_333_t, u32 entries);
 	palette_device &set_format(xbgr_333_t, u32 entries);
+	palette_device &set_format(xbgr_333_nib_t, u32 entries);
 	palette_device &set_format(xrgb_444_t, u32 entries);
 	palette_device &set_format(xrbg_444_t, u32 entries);
 	palette_device &set_format(xbrg_444_t, u32 entries);

src/mame/nichibutsu/cclimber.cpp

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Nicola Salmoria
-#ifndef MAME_NICHIBUT_CCLIMBER_H
-#define MAME_NICHIBUT_CCLIMBER_H
+#ifndef MAME_NICHIBUTSU_CCLIMBER_H
+#define MAME_NICHIBUTSU_CCLIMBER_H
 
 #pragma once
 
@@ -52,6 +52,7 @@ class cclimber_state : public driver_device
 protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override { m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); }
+	virtual void video_start() override;
 
 	required_device<cpu_device> m_maincpu;
 	optional_device<cpu_device> m_audiocpu;
@@ -89,7 +90,6 @@ class cclimber_state : public driver_device
 	void cclimber_draw_bigsprite(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void toprollr_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx);
 
-
 private:
 	optional_shared_ptr<uint8_t> m_column_scroll;
 	optional_shared_ptr<uint8_t> m_decrypted_opcodes;
@@ -99,7 +99,6 @@ class cclimber_state : public driver_device
 	uint8_t bagmanf_a000_r();
 	void bagmanf_vblank_irq(int state);
 
-	DECLARE_VIDEO_START(cclimber);
 	void cclimber_palette(palette_device &palette) const;
 
 	uint32_t screen_update_cclimber(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -122,13 +121,15 @@ class swimmer_state : public cclimber_state
 		cclimber_state(mconfig, type, tag),
 		m_swimmer_background_color(*this, "bgcolor"),
 		m_soundlatch(*this, "soundlatch")
-	{}
+	{ }
 
-	void swimmer_root(machine_config &config);
 	void swimmer(machine_config &config);
 	void au(machine_config &config);
 	void guzzler(machine_config &config);
 
+protected:
+	virtual void video_start() override;
+
 private:
 	optional_shared_ptr<uint8_t> m_swimmer_background_color;
 	optional_device<generic_latch_8_device> m_soundlatch;
@@ -145,19 +146,16 @@ class swimmer_state : public cclimber_state
 	void au_map(address_map &map);
 	void guzzler_map(address_map &map);
 
-	static rgb_t au_palette(u32 raw);
-
 	void swimmer_palette(palette_device &palette) const;
 	void swimmer_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element* gfx);
 	uint32_t screen_update_swimmer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void swimmer_set_background_pen();
+	void set_background_pen();
+	void set_sidepen(uint16_t pen) { m_sidepen = pen; }
 	TILE_GET_INFO_MEMBER(swimmer_get_pf_tile_info);
-	DECLARE_VIDEO_START(swimmer);
-	DECLARE_VIDEO_START(au);
 
-	bool m_swimmer_side_background_enabled = false;
-	bool m_swimmer_palettebank = false;
-	int m_swimmer_sidepen = 0x120;
+	bool m_side_background_enabled = false;
+	bool m_palettebank = false;
+	uint16_t m_sidepen = 0;
 
 	static constexpr int SWIMMER_BG_SPLIT = 0x18 * 8;
 };
@@ -171,12 +169,15 @@ class toprollr_state : public cclimber_state
 		m_toprollr_bg_coloram(*this, "bg_coloram"),
 		m_bank1(*this, "bank1"),
 		m_bank1d(*this, "bank1d")
-	{}
+	{ }
 
 	void toprollr(machine_config &config);
 
 	void init_toprollr();
 
+protected:
+	virtual void video_start() override;
+
 private:
 	optional_shared_ptr<uint8_t> m_toprollr_bg_videoram;
 	optional_shared_ptr<uint8_t> m_toprollr_bg_coloram;
@@ -193,18 +194,17 @@ class toprollr_state : public cclimber_state
 	TILE_GET_INFO_MEMBER(toprollr_get_pf_tile_info);
 	TILE_GET_INFO_MEMBER(toprollr_get_bs_tile_info);
 	TILE_GET_INFO_MEMBER(toproller_get_bg_tile_info);
-	DECLARE_VIDEO_START(toprollr);
 
-	tilemap_t *m_toproller_bg_tilemap = nullptr;
-	uint8_t m_toprollr_rombank = 0U;
+	tilemap_t *m_bg_tilemap = nullptr;
+	uint8_t m_rombank = 0;
 };
 
 class yamato_state : public cclimber_state
 {
 public:
 	yamato_state(const machine_config &mconfig, device_type type, const char* tag) :
 		cclimber_state(mconfig, type, tag)
-	{}
+	{ }
 
 	void yamato(machine_config &config);
 
@@ -225,10 +225,10 @@ class yamato_state : public cclimber_state
 	void yamato_palette(palette_device &palette) const;
 	uint32_t screen_update_yamato(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	uint8_t m_yamato_p0 = 0U;
-	uint8_t m_yamato_p1 = 0U;
+	uint8_t m_yamato_p0 = 0;
+	uint8_t m_yamato_p1 = 0;
 
 	static constexpr int YAMATO_SKY_PEN_BASE = 0x60;
 };
 
-#endif // MAME_NICHIBUT_CCLIMBER_H
+#endif // MAME_NICHIBUTSU_CCLIMBER_H

src/mame/nichibutsu/cclimber.h

@@ -3,7 +3,7 @@
 #include "emu.h"
 #include "cclimber.h"
 
-/* set to 1 to fix protection check after bonus round (see notes in pacman.c driver) */
+// set to 1 to fix protection check after bonus round (see notes in pacman.c driver)
 #define CANNONB_HACK    0
 
 void cclimber_state::cclimber_decode(const uint8_t convtable[8][16])
@@ -15,14 +15,14 @@ void cclimber_state::cclimber_decode(const uint8_t convtable[8][16])
 		int i,j;
 		uint8_t src = rom[A];
 
-		/* pick the translation table from bit 0 of the address */
-		/* and from bits 1 7 of the source data */
+		// pick the translation table from bit 0 of the address
+		// and from bits 1 7 of the source data
 		i = (A & 1) | (src & 0x02) | ((src & 0x80) >> 5);
 
-		/* pick the offset in the table from bits 0 2 4 6 of the source data */
+		// pick the offset in the table from bits 0 2 4 6 of the source data
 		j = (src & 0x01) | ((src & 0x04) >> 1) | ((src & 0x10) >> 2) | ((src & 0x40) >> 3);
 
-		/* decode the opcodes */
+		// decode the opcodes
 		m_decrypted_opcodes[A] = (src & 0xaa) | convtable[i][j];
 	}
 }
@@ -31,7 +31,7 @@ void cclimber_state::init_cclimber()
 {
 	static const uint8_t convtable[8][16] =
 	{
-		/* 0xff marks spots which are unused and therefore unknown */
+		// 0xff marks spots which are unused and therefore unknown
 		{ 0x44,0x14,0x54,0x10,0x11,0x41,0x05,0x50,0x51,0x00,0x40,0x55,0x45,0x04,0x01,0x15 },
 		{ 0x44,0x10,0x15,0x55,0x00,0x41,0x40,0x51,0x14,0x45,0x11,0x50,0x01,0x54,0x04,0x05 },
 		{ 0x45,0x10,0x11,0x44,0x05,0x50,0x51,0x04,0x41,0x14,0x15,0x40,0x01,0x54,0x55,0x00 },
@@ -66,7 +66,7 @@ void cclimber_state::init_ckongb()
 {
 	uint8_t *rom = memregion("maincpu")->base();
 
-	for (int A = 0x0000; A < 0x6000; A++) /* all the program ROMs are encrypted */
+	for (int A = 0x0000; A < 0x6000; A++) // all the program ROMs are encrypted
 	{
 		rom[A] = rom[A] ^ 0xf0;
 	}
@@ -88,7 +88,7 @@ void cclimber_state::init_cannonb()
 {
 	uint8_t *rom = memregion("maincpu")->base();
 
-	for (int A = 0x0000; A < 0x1000; A++) /* only first ROM is encrypted */
+	for (int A = 0x0000; A < 0x1000; A++) // only first ROM is encrypted
 	{
 		uint8_t src;
 		int i;