summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author mooglyguy <therealmogminer@gmail.com>2018-09-07 19:58:20 +0200
committer mooglyguy <therealmogminer@gmail.com>2018-09-07 19:59:01 +0200
commit50fab6c310dc754d775d02c3f5c9da62189678b6 (patch)
treef606befda6835125f8752e7d283c898d49e81429
parent325e13472666764179f7acdfde867934a3e3debd (diff)
Fix most palette-related asserts, nw
-rw-r--r--src/mame/drivers/a7800.cpp6
-rw-r--r--src/mame/drivers/ddragon.cpp6
-rw-r--r--src/mame/drivers/goupil.cpp2
-rw-r--r--src/mame/drivers/peplus.cpp2
-rw-r--r--src/mame/drivers/royalmah.cpp4
-rw-r--r--src/mame/drivers/taito_h.cpp14
-rw-r--r--src/mame/drivers/wardner.cpp2
7 files changed, 19 insertions, 17 deletions
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index 16673069c22..1fcf3609db3 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -553,7 +553,7 @@ upon display type.
rgb_t(0xA1,0x8F,0x1A), rgb_t(0xB2,0xA0,0x2B), rgb_t(0xC3,0xB1,0x3C), rgb_t(0xD4,0xC2,0x4D), \
rgb_t(0xE5,0xD3,0x5E), rgb_t(0xF6,0xE4,0x6F), rgb_t(0xFF,0xF5,0x82), rgb_t(0xFF,0xFF,0x96 )
-static const rgb_t a7800_palette[256*3] =
+static const rgb_t a7800_palette[256] =
{
NTSC_GREY,
NTSC_GOLD,
@@ -573,7 +573,7 @@ static const rgb_t a7800_palette[256*3] =
NTSC_LIGHT_ORANGE
};
-static const rgb_t a7800p_palette[256*3] =
+static const rgb_t a7800p_palette[256] =
{
NTSC_GREY,
NTSC_ORANGE_GREEN,
@@ -1387,7 +1387,7 @@ MACHINE_CONFIG_START(a7800_state::a7800_ntsc)
MCFG_SCREEN_UPDATE_DEVICE("maria", atari_maria_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(a7800_palette) / 3)
+ MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(a7800_palette))
MCFG_PALETTE_INIT_OWNER(a7800_state, a7800)
MCFG_DEVICE_ADD("maria", ATARI_MARIA, 0)
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index 47dee4db4dd..b3ee1b13082 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -966,7 +966,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon)
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
- MCFG_PALETTE_ADD("palette", 384)
+ MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1038,7 +1038,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809)
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
- MCFG_PALETTE_ADD("palette", 384)
+ MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1091,7 +1091,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2)
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
- MCFG_PALETTE_ADD("palette", 384)
+ MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index 8b092ed4124..5a62a95acc2 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -597,7 +597,7 @@ void goupil_g2_state::goupil_g2(machine_config &config)
m_screen->set_size((80*8), (24*(8+4)));
m_screen->set_visarea(0, (80*8)-1, 0, (24*(8+4))-1);
- PALETTE(config, m_palette, 2);
+ PALETTE(config, m_palette, 3);
m_palette->set_init("palette", FUNC(palette_device::palette_init_monochrome_highlight));
mc6845_device &crtc(MC6845(config, "crtc", 14.318181_MHz_XTAL / 8));
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index 769ccd0ffb8..167bd15f6e0 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -380,7 +380,7 @@ void peplus_state::load_superdata(const char *bank_name)
WRITE8_MEMBER(peplus_state::bgcolor_w)
{
- for (int i = 0; i < m_palette->entries(); i++)
+ for (int i = 0; i < m_palette->entries() / 16; i++)
{
/* red component */
int bit0 = (~data >> 0) & 0x01;
diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp
index 6c8e6349bbc..ea8342151da 100644
--- a/src/mame/drivers/royalmah.cpp
+++ b/src/mame/drivers/royalmah.cpp
@@ -3484,7 +3484,7 @@ MACHINE_CONFIG_START(royalmah_state::royalmah)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* video hardware */
- MCFG_PALETTE_ADD("palette", 16*2)
+ MCFG_PALETTE_ADD("palette", 16*4)
MCFG_PALETTE_INIT_OWNER(royalmah_state,royalmah)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4885,7 +4885,7 @@ ROM_START( mjsiyoub )
ROM_LOAD( "1.1k", 0x00000, 0x8000, CRC(a1083321) SHA1(b36772e90be60270234df16cf92d87f8d950190d) )
ROM_LOAD( "2.1g", 0x08000, 0x4000, CRC(cfe5de1d) SHA1(4acf9a752aa3c02b0889b0b49d3744359fa24460) )
- ROM_REGION( 0x40000, "proms", 0 )
+ ROM_REGION( 0x20, "proms", 0 )
ROM_LOAD( "color.bpr", 0x00, 0x20, CRC(d21367e5) SHA1(b28321ac8f99abfebe2ef4da0c751cefe9f3f3b6) )
ROM_END
diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp
index d85e7cd93fa..74af09f8b44 100644
--- a/src/mame/drivers/taito_h.cpp
+++ b/src/mame/drivers/taito_h.cpp
@@ -674,8 +674,8 @@ MACHINE_CONFIG_START(taitoh_state::syvalion)
MCFG_SCREEN_UPDATE_DRIVER(taitoh_state, screen_update_syvalion)
MCFG_SCREEN_PALETTE("palette")
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_syvalion)
- MCFG_PALETTE_ADD("palette", 33*16)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_syvalion)
+ MCFG_PALETTE_ADD(m_palette, 33*16)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_DEVICE_ADD("tc0080vco", TC0080VCO, 0)
@@ -730,8 +730,8 @@ MACHINE_CONFIG_START(taitoh_state::recordbr)
MCFG_SCREEN_UPDATE_DRIVER(taitoh_state, screen_update_recordbr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_recordbr)
- MCFG_PALETTE_ADD("palette", 32*16)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_recordbr)
+ MCFG_PALETTE_ADD(m_palette, 32*16)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_DEVICE_ADD("tc0080vco", TC0080VCO, 0)
@@ -762,6 +762,8 @@ MACHINE_CONFIG_START(taitoh_state::tetristh)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(tetristh_map)
+
+ m_palette->set_entries(0x800/2);
MACHINE_CONFIG_END
@@ -795,8 +797,8 @@ MACHINE_CONFIG_START(taitoh_state::dleague)
MCFG_SCREEN_UPDATE_DRIVER(taitoh_state, screen_update_dleague)
MCFG_SCREEN_PALETTE("palette")
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dleague)
- MCFG_PALETTE_ADD("palette", 33*16)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_dleague)
+ MCFG_PALETTE_ADD(m_palette, 33*16)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_DEVICE_ADD("tc0080vco", TC0080VCO, 0)
diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp
index e33e66a4364..61161389ea1 100644
--- a/src/mame/drivers/wardner.cpp
+++ b/src/mame/drivers/wardner.cpp
@@ -432,7 +432,7 @@ MACHINE_CONFIG_START(wardner_state::wardner)
m_screen->set_palette(m_palette);
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wardner)
- MCFG_PALETTE_ADD("palette", 2048)
+ MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_VIDEO_START_OVERRIDE(wardner_state,toaplan0)