From 5b95242dae2e5992f9decab92ae519b5fcfa8a36 Mon Sep 17 00:00:00 2001 From: cam900 Date: Wed, 12 Jun 2019 19:58:21 +0900 Subject: mirage.cpp : Simplify gfxdecodes --- src/mame/drivers/mirage.cpp | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index ad8c0927d3c..0a5fc2b446e 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -240,8 +240,8 @@ static const gfx_layout tile_8x8_layout = RGN_FRAC(1,2), 4, { RGN_FRAC(1,2)+8,RGN_FRAC(1,2)+0,RGN_FRAC(0,2)+8,RGN_FRAC(0,2)+0 }, - { 0, 1, 2, 3, 4, 5, 6, 7 }, - { 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16 }, + { STEP8(0,1) }, + { STEP8(0,8*2) }, 8*16 }; @@ -251,27 +251,15 @@ static const gfx_layout tile_16x16_layout = RGN_FRAC(1,2), 4, { RGN_FRAC(1,2)+8,RGN_FRAC(1,2)+0,RGN_FRAC(0,2)+8,RGN_FRAC(0,2)+0 }, - { 256,257,258,259,260,261,262,263,0, 1, 2, 3, 4, 5, 6, 7 }, - { 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16,8*16,9*16,10*16,11*16,12*16,13*16,14*16,15*16 }, + { STEP8(8*2*16,1),STEP8(0,1) }, + { STEP16(0,8*2) }, 32*16 }; -static const gfx_layout spritelayout = -{ - 16,16, - RGN_FRAC(1,1), - 4, - { 24,8,16,0 }, - { 512,513,514,515,516,517,518,519, 0, 1, 2, 3, 4, 5, 6, 7 }, - { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, - 8*32, 9*32,10*32,11*32,12*32,13*32,14*32,15*32}, - 32*32 -}; - static GFXDECODE_START( gfx_mirage ) - GFXDECODE_ENTRY("gfx1", 0, tile_8x8_layout, 0x000, 32) /* Tiles (8x8) */ - GFXDECODE_ENTRY("gfx1", 0, tile_16x16_layout, 0x000, 32) /* Tiles (16x16) */ - GFXDECODE_ENTRY("gfx2", 0, spritelayout, 0x200, 32) /* Sprites (16x16) */ + GFXDECODE_ENTRY("gfx1", 0, tile_8x8_layout, 0x000, 32) /* Tiles (8x8) */ + GFXDECODE_ENTRY("gfx1", 0, tile_16x16_layout, 0x000, 32) /* Tiles (16x16) */ + GFXDECODE_ENTRY("gfx2", 0, tile_16x16_layout, 0x200, 32) /* Sprites (16x16) */ GFXDECODE_END @@ -350,8 +338,8 @@ ROM_START( mirage ) ROM_LOAD( "mbl-00.7a", 0x000000, 0x100000, CRC(2e258b7b) SHA1(2dbd7d16a1eda97ae3de149b67e80e511aa9d0ba) ) ROM_REGION( 0x400000, "gfx2", 0 ) /* Sprites */ - ROM_LOAD16_BYTE( "mbl-01.11a", 0x000001, 0x200000, CRC(895be69a) SHA1(541d8f37fb4cf99312b80a0eb0d729fbbeab5f4f) ) - ROM_LOAD16_BYTE( "mbl-02.12a", 0x000000, 0x200000, CRC(474f6104) SHA1(ff81b32b90192c3d5f27c436a9246aa6caaeeeee) ) + ROM_LOAD( "mbl-01.11a", 0x200000, 0x200000, CRC(895be69a) SHA1(541d8f37fb4cf99312b80a0eb0d729fbbeab5f4f) ) + ROM_LOAD( "mbl-02.12a", 0x000000, 0x200000, CRC(474f6104) SHA1(ff81b32b90192c3d5f27c436a9246aa6caaeeeee) ) ROM_REGION( 0x200000, "oki_bgm_data", 0 ) ROM_LOAD( "mbl-03.10a", 0x000000, 0x200000, CRC(4a599703) SHA1(b49e84faa2d6acca952740d30fc8d1a33ac47e79) ) -- cgit v1.2.3