diff options
author | Alex W. Jackson <alex.w.jackson@gmail.com> | 2014-11-09 02:32:19 -0500 |
---|---|---|
committer | Alex W. Jackson <alex.w.jackson@gmail.com> | 2014-11-09 02:32:19 -0500 |
commit | 8345d3819400bbfd3a6d54c15d03024813109ff5 (patch) | |
tree | 8263958d5b3f09a35b2cb34c54eff1835433b277 | |
parent | 95d18b04ad67e0025aa8dd5b875968f58541319e (diff) |
First batch of tilemap assert fixes (nw)
-rw-r--r-- | src/mame/drivers/ampoker2.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/batman.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/cninja.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/coinmstr.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/legionna.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/pipedrm.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/sbugger.c | 6 | ||||
-rw-r--r-- | src/mame/video/k054156_k054157_k056832.c | 1 |
8 files changed, 12 insertions, 11 deletions
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index a332dcb5ee6..c4a76ced02d 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -1139,11 +1139,11 @@ static const gfx_layout s2k_charlayout = ******************************/ static GFXDECODE_START( ampoker2 ) - GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 ) + GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 128 ) GFXDECODE_END static GFXDECODE_START( sigma2k ) - GFXDECODE_ENTRY( "gfx1", 0x0000, s2k_charlayout, 0, 16 ) + GFXDECODE_ENTRY( "gfx1", 0x0000, s2k_charlayout, 0, 128 ) GFXDECODE_END /************************* diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index 0ca06b37362..cf43ea1d7cb 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -181,7 +181,7 @@ static const gfx_layout pfmolayout = static GFXDECODE_START( batman ) - GFXDECODE_ENTRY( "gfx3", 0, pfmolayout, 512, 16 ) /* sprites & playfield */ + GFXDECODE_ENTRY( "gfx3", 0, pfmolayout, 512, 32 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 256, 16 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, anlayout, 0, 64 ) /* characters 8x8 */ GFXDECODE_END diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index ac8a9d1dbc5..12ca5acfa40 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -770,7 +770,7 @@ GFXDECODE_END static GFXDECODE_START( mutantf ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 64 ) /* Tiles 16x16 */ - GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 64 ) /* Tiles 16x16 */ + GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 80 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx4", 0, spritelayout, 0, 128 ) /* Sprites 16x16 */ GFXDECODE_ENTRY( "gfx5", 0, spritelayout, 0, 16 ) /* Sprites 16x16 */ GFXDECODE_END diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index fbcf4f64fbe..456db9fc6fd 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -1407,7 +1407,7 @@ static const gfx_layout charlayout = }; static GFXDECODE_START( coinmstr ) - GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) + GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 46*32 ) GFXDECODE_END diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index 9876a12f245..e49d6bb8650 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -1183,7 +1183,7 @@ static const gfx_layout cupsocsb_tilelayout = static GFXDECODE_START( heatbrl_csb ) GFXDECODE_ENTRY( "gfx1", 0, cupsocsb_8x8_tilelayout, 48*16, 16 ) - GFXDECODE_ENTRY( "gfx3", 0, cupsocsb_tilelayout, 0*16, 16 ) + GFXDECODE_ENTRY( "gfx3", 0, cupsocsb_tilelayout, 0*16, 32 ) GFXDECODE_ENTRY( "gfx4", 0, cupsocsb_tilelayout, 32*16, 16 ) /* unused */ GFXDECODE_ENTRY( "gfx2", 0, cupsocsb_spritelayout, 0*16, 8*16 ) GFXDECODE_ENTRY( "gfx5", 0, cupsocsb_tilelayout, 32*16, 16 ) diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 87528507d9d..3ac0cf00653 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -556,8 +556,8 @@ static const gfx_layout splayout = static GFXDECODE_START( pipedrm ) - GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 64 ) - GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0, 64 ) + GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 128 ) + GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0, 128 ) GFXDECODE_ENTRY( "gfx3", 0, splayout, 1024, 32 ) GFXDECODE_END diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index 27301e58c3b..d8ceb8bf13c 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -137,7 +137,7 @@ static const gfx_layout char16layout = }; static GFXDECODE_START( sbugger ) - GFXDECODE_ENTRY( "gfx1", 0, char16layout, 0, 1 ) + GFXDECODE_ENTRY( "gfx1", 0, char16layout, 0, 256 ) GFXDECODE_END @@ -278,5 +278,5 @@ ROM_START( sbuggera ) ROM_LOAD( "spbugger.gfx", 0x0000, 0x1000, CRC(d3f345b5) SHA1(a5082ffc3043352e9b731af95770bdd62fb928bf) ) ROM_END -GAME( 1981, sbugger, 0, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 1)", GAME_NOT_WORKING | GAME_IMPERFECT_COLORS ) -GAME( 1981, sbuggera, sbugger, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 2)", GAME_IMPERFECT_COLORS ) +GAME( 1981, sbugger, 0, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 1)", GAME_NOT_WORKING | GAME_WRONG_COLORS ) +GAME( 1981, sbuggera, sbugger, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 2)", GAME_WRONG_COLORS ) diff --git a/src/mame/video/k054156_k054157_k056832.c b/src/mame/video/k054156_k054157_k056832.c index 573c906bc07..aa696ed05ec 100644 --- a/src/mame/video/k054156_k054157_k056832.c +++ b/src/mame/video/k054156_k054157_k056832.c @@ -2149,6 +2149,7 @@ void k056832_device::create_gfx(const char *gfx_memory_region, int bpp, int big) } m_gfxdecode->gfx(gfx_index)->set_granularity(16); /* override */ + m_gfxdecode->gfx(gfx_index)->set_colors(m_palette->entries() / 16); m_gfx_memory_region = gfx_memory_region; m_gfx_num = gfx_index; |