summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Alex W. Jackson <alex.w.jackson@gmail.com>2014-05-16 06:32:00 +0000
committer Alex W. Jackson <alex.w.jackson@gmail.com>2014-05-16 06:32:00 +0000
commit472fe586775b8c085e48053690566fb222c6df52 (patch)
tree60dca92ccf149dd02cff1b8a0c33a45c76e5d9e1 /src
parentf0efcdced106abeacb89a730dabc0ee70dfcc4e9 (diff)
midas.c: fix (currently unused) gfxdecode layout; rationalize sprite rom loading (nw)
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/midas.c34
-rw-r--r--src/mame/video/neogeo_spr.c17
2 files changed, 24 insertions, 27 deletions
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index f1dbf208f28..0b7c4c43240 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -306,11 +306,9 @@ static const gfx_layout layout16x16x8 =
16,16,
RGN_FRAC(1,1),
8,
- {
- 56,48,40,32,24,16,8,0
- },
- { 0,1,2,3,4,5,6,7, 16*64+0, 6*64+1, 6*64+2, 6*64+3, 6*64+4, 6*64+5, 6*64+6, 6*64+7, },
- { 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64, 8*64, 9*64, 10*64, 11*64, 12*64, 13*64, 14*64, 15*64 },
+ { 56,48,40,32,24,16,8,0 },
+ { 16*64+7,16*64+6,16*64+5,16*64+4,16*64+3,16*64+2,16*64+1,16*64, 7,6,5,4,3,2,1,0 },
+ { STEP16(0, 64) },
16*128
};
@@ -319,7 +317,7 @@ static const gfx_layout layout8x8x8_2 =
8,8,
RGN_FRAC(1,1),
8,
- { 8,9,10,11, 0,1,2,3 },
+ { 8,9,10,11, 0,1,2,3 },
{ (32*2+1)*4, 32*2*4, (48*2+1)*4, 48*2*4, (0+1)*4, 0*4, (16*2+1)*4, 16*2*4 },
{ 0*8*2, 1*8*2, 2*8*2, 3*8*2, 4*8*2, 5*8*2, 6*8*2, 7*8*2 },
32*8*2
@@ -795,10 +793,10 @@ ROM_START( livequiz )
ROM_LOAD( "sub_pic12c508a.u4", 0x000000, 0x000400, CRC(e52ebdc4) SHA1(0f3af66b5ea184e49188e74a873699324a3930f1) )
ROM_REGION( 0x800000, "sprites", 0 )
- ROM_LOAD32_BYTE( "flash.u15", 0x000000, 0x200000, CRC(d6eb56f1) SHA1(52d67bb25dd968c79eccb05159a578516b27e557) )
- ROM_LOAD32_BYTE( "flash.u19", 0x000001, 0x200000, CRC(daa81532) SHA1(9e66bb4639b92c3d76b7918535f55883f22f24b2) )
- ROM_LOAD32_BYTE( "flash.u16", 0x000002, 0x200000, CRC(4c9fd873) SHA1(6e185304ce29771265d3c48b0ef0e840d8bed02d) )
- ROM_LOAD32_BYTE( "flash.u20", 0x000003, 0x200000, CRC(b540a8c7) SHA1(25b9b30c7d5ff1e410ea30580017e45590542561) )
+ ROM_LOAD64_WORD( "flash.u15", 0x000000, 0x200000, CRC(d6eb56f1) SHA1(52d67bb25dd968c79eccb05159a578516b27e557) )
+ ROM_LOAD64_WORD( "flash.u19", 0x000002, 0x200000, CRC(daa81532) SHA1(9e66bb4639b92c3d76b7918535f55883f22f24b2) )
+ ROM_LOAD64_WORD( "flash.u16", 0x000004, 0x200000, CRC(4c9fd873) SHA1(6e185304ce29771265d3c48b0ef0e840d8bed02d) )
+ ROM_LOAD64_WORD( "flash.u20", 0x000006, 0x200000, CRC(b540a8c7) SHA1(25b9b30c7d5ff1e410ea30580017e45590542561) )
ROM_REGION( 0x080000, "tiles", 0 )
ROM_LOAD( "27c4096.u23", 0x000000, 0x080000, CRC(25121de8) SHA1(edf24d87551639b871baf3243b452a4e2ba84107) )
@@ -881,17 +879,17 @@ ROM_START( hammer )
ROM_LOAD16_WORD_SWAP( "p.u22", 0x000000, 0x200000, CRC(687f1596) SHA1(3dc5fb0af1e8c4f3a42ce4aad39635b1111831d8) )
ROM_REGION( 0x1000000, "sprites", 0 )
- ROM_LOAD32_BYTE( "a0l.u44", 0x000000, 0x200000, CRC(b9cafd81) SHA1(24698970d1aea0907e2963c872ce61077f44c3af) )
- ROM_LOAD32_BYTE( "a0h.u46", 0x800000, 0x200000, CRC(f60f188b) SHA1(486f26c473b46efb402662b2f374e361cd7b4284) )
+ ROM_LOAD64_WORD( "a0l.u44", 0x000000, 0x200000, CRC(b9cafd81) SHA1(24698970d1aea0907e2963c872ce61077f44c3af) )
+ ROM_LOAD64_WORD( "a0h.u46", 0x800000, 0x200000, CRC(f60f188b) SHA1(486f26c473b46efb402662b2f374e361cd7b4284) )
- ROM_LOAD32_BYTE( "a1l.u48", 0x000001, 0x200000, CRC(82129cf9) SHA1(6d68e943854bc9e8ea555bf03107dc9e836ca4d9) )
- ROM_LOAD32_BYTE( "a1h.u50", 0x800001, 0x200000, CRC(76897c90) SHA1(aded60d3db834598cd54ad9140eee7be4129cb27) )
+ ROM_LOAD64_WORD( "a1l.u48", 0x000002, 0x200000, CRC(82129cf9) SHA1(6d68e943854bc9e8ea555bf03107dc9e836ca4d9) )
+ ROM_LOAD64_WORD( "a1h.u50", 0x800002, 0x200000, CRC(76897c90) SHA1(aded60d3db834598cd54ad9140eee7be4129cb27) )
- ROM_LOAD32_BYTE( "a2l.u45", 0x000002, 0x200000, CRC(d8086ee5) SHA1(9d5f2b3a0f903a69cfd1108ddf5ea61b571c3fe3) )
- ROM_LOAD32_BYTE( "a2h.u47", 0x800002, 0x200000, CRC(a64aa2df) SHA1(7e4eb049cd6a5971a455488a484f225763921614) )
+ ROM_LOAD64_WORD( "a2l.u45", 0x000004, 0x200000, CRC(d8086ee5) SHA1(9d5f2b3a0f903a69cfd1108ddf5ea61b571c3fe3) )
+ ROM_LOAD64_WORD( "a2h.u47", 0x800004, 0x200000, CRC(a64aa2df) SHA1(7e4eb049cd6a5971a455488a484f225763921614) )
- ROM_LOAD32_BYTE( "a3l.u49", 0x000003, 0x200000, CRC(4e83cf00) SHA1(e66a0b4eae0f46bf36126be3795cfac3ad3d4282) )
- ROM_LOAD32_BYTE( "a3h.u51", 0x800003, 0x200000, CRC(834de39f) SHA1(6e9867180ca20e64f60bad5cad82674ce8f45b7b) )
+ ROM_LOAD64_WORD( "a3l.u49", 0x000006, 0x200000, CRC(4e83cf00) SHA1(e66a0b4eae0f46bf36126be3795cfac3ad3d4282) )
+ ROM_LOAD64_WORD( "a3h.u51", 0x800006, 0x200000, CRC(834de39f) SHA1(6e9867180ca20e64f60bad5cad82674ce8f45b7b) )
ROM_REGION( 0x080000, "tiles", ROMREGION_ERASE00 )
// Use the tiles rom from livequiz (not present in this set) to show some debug text
diff --git a/src/mame/video/neogeo_spr.c b/src/mame/video/neogeo_spr.c
index 1c6453633ca..cefa583a403 100644
--- a/src/mame/video/neogeo_spr.c
+++ b/src/mame/video/neogeo_spr.c
@@ -783,15 +783,14 @@ inline void neosprite_midas_device::draw_pixel(int romaddr, UINT32* dst, pen_t *
const UINT8* src = m_region_sprites->base() + (((romaddr &~0xff)) | (((romaddr&0x8)^0x8)<<4) | ((romaddr & 0xf0) >> 1));
const int x = romaddr & 0x7;
- const UINT8 gfx =
- (((src[0x7] >> x) & 0x01) << 7) |
- (((src[0x3] >> x) & 0x01) << 6) |
- (((src[0x6] >> x) & 0x01) << 5) |
- (((src[0x2] >> x) & 0x01) << 4) |
- (((src[0x5] >> x) & 0x01) << 3) |
- (((src[0x1] >> x) & 0x01) << 2) |
- (((src[0x4] >> x) & 0x01) << 1) |
- (((src[0x0] >> x) & 0x01) << 0);
+ const UINT8 gfx = (((src[0x7] >> x) & 0x01) << 7) |
+ (((src[0x6] >> x) & 0x01) << 6) |
+ (((src[0x5] >> x) & 0x01) << 5) |
+ (((src[0x4] >> x) & 0x01) << 4) |
+ (((src[0x3] >> x) & 0x01) << 3) |
+ (((src[0x2] >> x) & 0x01) << 2) |
+ (((src[0x1] >> x) & 0x01) << 1) |
+ (((src[0x0] >> x) & 0x01) << 0);
if (gfx)
*dst = line_pens[gfx];