summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Alex W. Jackson <alex.w.jackson@gmail.com>2015-03-04 13:58:15 -0500
committer Alex W. Jackson <alex.w.jackson@gmail.com>2015-03-04 13:58:15 -0500
commit99d9cd0a1d8d6d61e6e276b3fb9e1113d0f96f00 (patch)
tree84550f0f1751d1c5d0de4cac6d787ace8776321f
parent655bd1ca31ed8825ab8053408ad21d384b6037dc (diff)
srmp2.c: simplify ROM loading/banking (nw)
-rw-r--r--src/mame/drivers/srmp2.c52
1 files changed, 16 insertions, 36 deletions
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 4cc5e40e0c6..24b260e53a5 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -95,7 +95,7 @@ MACHINE_START_MEMBER(srmp2_state,srmp3)
iox.protcheck[2] = 0x1c; iox.protlatch[2] = 0x04;
iox.protcheck[3] = 0x45; iox.protlatch[3] = 0x00;
- membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x8000, 0x2000);
+ membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base(), 0x2000);
}
MACHINE_START_MEMBER(srmp2_state,rmgoldyh)
@@ -110,7 +110,7 @@ MACHINE_START_MEMBER(srmp2_state,rmgoldyh)
iox.protcheck[2] = -1; iox.protlatch[2] = -1;
iox.protcheck[3] = -1; iox.protlatch[3] = -1;
- membank("bank1")->configure_entries(0, 32, memregion("maincpu")->base() + 0x8000, 0x2000);
+ membank("bank1")->configure_entries(0, 32, memregion("maincpu")->base(), 0x2000);
}
/***************************************************************************
@@ -350,17 +350,13 @@ WRITE8_MEMBER(srmp2_state::iox_data_w)
WRITE8_MEMBER(srmp2_state::srmp3_rombank_w)
{
/*
- ---x xxxx : MAIN ROM bank
+ ---- xxxx : MAIN ROM bank
+ ---x ---- : unknown
xxx- ---- : ADPCM ROM bank
*/
m_adpcm_bank = ((data & 0xe0) >> 5);
- // TODO: Check this code (and the corresponding configure_entires),
- // as it seems to be inconsistent with the notes at the head of this function
- if (data & 0x1f)
- membank("bank1")->set_entry(data & 0x0f);
- else
- membank("bank1")->set_entry(8);
+ membank("bank1")->set_entry(data & 0x0f);
}
/**************************************************************************
@@ -503,10 +499,7 @@ WRITE8_MEMBER(srmp2_state::rmgoldyh_rombank_w)
*/
m_adpcm_bank = ((data & 0xe0) >> 5);
- if (data & 0x1f)
- membank("bank1")->set_entry(data & 0x1f);
- else
- membank("bank1")->set_entry(8);
+ membank("bank1")->set_entry(data & 0x1f);
}
static ADDRESS_MAP_START( rmgoldyh_io_map, AS_IO, 8, srmp2_state )
@@ -1130,11 +1123,6 @@ static GFXDECODE_START( srmp3 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_END
-static GFXDECODE_START( rmgoldyh )
- GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
- GFXDECODE_ENTRY( "gfx_ex", 0, charlayout, 0, 32 )
-GFXDECODE_END
-
static MACHINE_CONFIG_START( srmp2, srmp2_state )
@@ -1234,8 +1222,6 @@ static MACHINE_CONFIG_DERIVED( rmgoldyh, srmp3 )
MCFG_CPU_IO_MAP(rmgoldyh_io_map)
MCFG_MACHINE_START_OVERRIDE(srmp2_state,rmgoldyh)
-
- MCFG_GFXDECODE_MODIFY("gfxdecode", rmgoldyh)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mjyuugi, srmp2_state )
@@ -1372,9 +1358,8 @@ ROM_START( srmp2 )
ROM_END
ROM_START( srmp3 )
- ROM_REGION( 0x028000, "maincpu", 0 ) /* 68000 Code */
- ROM_LOAD( "za0-10.bin", 0x000000, 0x008000, CRC(939d126f) SHA1(7a5c7f7fbee8de11a08194d3c8f10a20f8dc2f0a) )
- ROM_CONTINUE( 0x010000, 0x018000 )
+ ROM_REGION( 0x020000, "maincpu", 0 ) /* Z80 Code */
+ ROM_LOAD( "za0-10.bin", 0x000000, 0x020000, CRC(939d126f) SHA1(7a5c7f7fbee8de11a08194d3c8f10a20f8dc2f0a) )
ROM_REGION( 0x400000, "gfx1", 0 ) /* Sprites */
ROM_LOAD16_BYTE( "za0-02.bin", 0x000000, 0x080000, CRC(85691946) SHA1(8b91210b1b6671ba2c9ec6722e5dc40bdf44e4b5) )
@@ -1444,28 +1429,23 @@ CR2032 battery
***************************************************************************/
ROM_START( rmgoldyh )
- ROM_REGION( 0x048000, "maincpu", 0 ) /* 68000 Code */
- ROM_LOAD( "zf0_001_001.u2", 0x000000, 0x008000, CRC(ce5b0ba0) SHA1(c499e7dc0e3ffe783204e930356c91ea228baf62) )
- ROM_CONTINUE( 0x010000, 0x018000 )
- ROM_LOAD( "zf0_002_002.u3", 0x028000, 0x020000, CRC(e2226425) SHA1(36925c68492a3ea4af19d611a455eae688aaab62) )
-
- ROM_REGION( 0x20000, "gfx_ex", ROMREGION_ERASE00 ) /* extra sprite roms */
- /* socket 4 is empty */
- ROM_LOAD16_BYTE( "zf0_3.u72", 0x00001, 0x08000, CRC(771c27a1) SHA1(5c95edcd5e155cbb4448888bba62c98cf8d4b577) )
- ROM_LOAD16_BYTE( "zf0_2.u71", 0x10000, 0x08000, CRC(b0f548e6) SHA1(84e3acb10ae3669bf65bd8c93273acacb5136737) )
- ROM_LOAD16_BYTE( "zf0_1.u70", 0x10001, 0x08000, CRC(78ba5d05) SHA1(21cd5ecbd55a5beaece82c974752dac4281b467a) )
+ ROM_REGION( 0x040000, "maincpu", 0 ) /* Z80 Code */
+ ROM_LOAD( "zf0_001_001.u2", 0x000000, 0x020000, CRC(ce5b0ba0) SHA1(c499e7dc0e3ffe783204e930356c91ea228baf62) )
+ ROM_LOAD( "zf0_002_002.u3", 0x020000, 0x020000, CRC(e2226425) SHA1(36925c68492a3ea4af19d611a455eae688aaab62) )
- ROM_REGION( 0x800000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x800000, "gfx1", ROMREGION_ERASE00 ) /* Sprites */
ROM_LOAD16_BYTE( "za0-02.u51", 0x000000, 0x080000, CRC(85691946) SHA1(8b91210b1b6671ba2c9ec6722e5dc40bdf44e4b5) )
ROM_LOAD16_BYTE( "za0-04.u49", 0x000001, 0x080000, CRC(c06e7a96) SHA1(a2dfb81004ea72bfa21724374eb8533af606a5df) )
ROM_LOAD16_BYTE( "za0-01.u52", 0x100000, 0x080000, CRC(95e0d87c) SHA1(34e6c0a95e63cf092092e27c7ba2f649ebf56507) )
ROM_LOAD16_BYTE( "za0-03.u50", 0x100001, 0x080000, CRC(7c98570e) SHA1(26e28e67bca9954d62d72260370ea872c6058a10) )
- ROM_COPY( "gfx_ex", 0x00000, 0x200000, 0x010000 )
+ /* socket 4 is empty */
+ ROM_LOAD16_BYTE( "zf0_3.u72", 0x200001, 0x008000, CRC(771c27a1) SHA1(5c95edcd5e155cbb4448888bba62c98cf8d4b577) )
ROM_LOAD16_BYTE( "za0-06.u47", 0x400000, 0x080000, CRC(8b874b0a) SHA1(27fe1ccc2938e1703e484e2925a2f073064cf019) )
ROM_LOAD16_BYTE( "za0-08.u45", 0x400001, 0x080000, CRC(3de89d88) SHA1(1e6dabe6aeee6a2613feab26b871c235bf491bfa) )
ROM_LOAD16_BYTE( "za0-05.u48", 0x500000, 0x080000, CRC(80d3b4e6) SHA1(d31d3f904ee8463c1efbb1d106eeb3dc0dc42ab8) )
ROM_LOAD16_BYTE( "za0-07.u46", 0x500001, 0x080000, CRC(39d15129) SHA1(62b71a82cfc39e6dab3175e03eca5ff92e854f13) )
- ROM_COPY( "gfx_ex", 0x10000, 0x600000, 0x010000 )
+ ROM_LOAD16_BYTE( "zf0_2.u71", 0x600000, 0x008000, CRC(b0f548e6) SHA1(84e3acb10ae3669bf65bd8c93273acacb5136737) )
+ ROM_LOAD16_BYTE( "zf0_1.u70", 0x600001, 0x008000, CRC(78ba5d05) SHA1(21cd5ecbd55a5beaece82c974752dac4281b467a) )
ROM_REGION( 0x080000, "adpcm", 0 ) /* Samples */
ROM_LOAD( "za0-11.u16", 0x000000, 0x080000, CRC(2248c23f) SHA1(35591b51bb23dfd7fa81a05026e9ec0789bb0dde) )