From 4a6fc8d5e54de36eeeebd7263554e591d09b758c Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Mon, 28 Jul 2008 16:22:20 +0000 Subject: Region classes go bye-bye. --- src/mame/drivers/fcombat.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/mame/drivers/fcombat.c') diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index 6f14b81fdd1..d3c64ca45ff 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -187,7 +187,7 @@ static READ8_HANDLER(e300_r) int wx=(tx+fcombat_sh)/16; int wy=(ty*2+fcombat_sv)/16; - return memory_region(machine, RGNCLASS_USER, "user2")[wx*32*16+wy]; + return memory_region(machine, "user2")[wx*32*16+wy]; } static WRITE8_HANDLER(ee00_w) @@ -329,8 +329,8 @@ static DRIVER_INIT( fcombat ) /* make a temporary copy of the character data */ src = temp; - dst = memory_region(machine, RGNCLASS_GFX, "gfx1"); - length = memory_region_length(machine, RGNCLASS_GFX, "gfx1"); + dst = memory_region(machine, "gfx1"); + length = memory_region_length(machine, "gfx1"); memcpy(src, dst, length); /* decode the characters */ @@ -347,8 +347,8 @@ static DRIVER_INIT( fcombat ) /* make a temporary copy of the sprite data */ src = temp; - dst = memory_region(machine, RGNCLASS_GFX, "gfx2"); - length = memory_region_length(machine, RGNCLASS_GFX, "gfx2"); + dst = memory_region(machine, "gfx2"); + length = memory_region_length(machine, "gfx2"); memcpy(src, dst, length); /* decode the sprites */ @@ -368,8 +368,8 @@ static DRIVER_INIT( fcombat ) /* make a temporary copy of the character data */ src = temp; - dst = memory_region(machine, RGNCLASS_GFX, "gfx3"); - length = memory_region_length(machine, RGNCLASS_GFX, "gfx3"); + dst = memory_region(machine, "gfx3"); + length = memory_region_length(machine, "gfx3"); memcpy(src, dst, length); /* decode the characters */ @@ -387,8 +387,8 @@ static DRIVER_INIT( fcombat ) } src = temp; - dst = memory_region(machine, RGNCLASS_USER, "user1"); - length = memory_region_length(machine, RGNCLASS_USER, "user1"); + dst = memory_region(machine, "user1"); + length = memory_region_length(machine, "user1"); memcpy(src, dst, length); for (oldaddr = 0; oldaddr < 32; oldaddr++) @@ -399,8 +399,8 @@ static DRIVER_INIT( fcombat ) src = temp; - dst = memory_region(machine, RGNCLASS_USER, "user2"); - length = memory_region_length(machine, RGNCLASS_USER, "user2"); + dst = memory_region(machine, "user2"); + length = memory_region_length(machine, "user2"); memcpy(src, dst, length); for (oldaddr = 0; oldaddr < 32; oldaddr++) @@ -413,31 +413,31 @@ static DRIVER_INIT( fcombat ) } ROM_START( fcombat ) - ROM_REGION( 0x10000, RGNCLASS_CPU, "main", 0 ) + ROM_REGION( 0x10000, "main", 0 ) ROM_LOAD( "fcombat2.t9", 0x0000, 0x4000, CRC(30cb0c14) SHA1(8b5b6a4efaca2f138709184725e9e0e0b9cfc4c7) ) ROM_LOAD( "fcombat3.10t", 0x4000, 0x4000, CRC(e8511da0) SHA1(bab5c9244c970b97c025381c37ad372aa3b5cddf) ) - ROM_REGION( 0x10000, RGNCLASS_CPU, "audio", 0 ) /* 64k for the second CPU */ + ROM_REGION( 0x10000, "audio", 0 ) /* 64k for the second CPU */ ROM_LOAD( "fcombat1.t5", 0x0000, 0x4000, CRC(a0cc1216) SHA1(3a8963ffde2ff4a3f428369133f94bb37717cae5) ) - ROM_REGION( 0x02000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE ) + ROM_REGION( 0x02000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "fcombat7.l11", 0x00000, 0x2000, BAD_DUMP CRC(54e978ef) SHA1(834f428f8d3e6b2cd865db8d2a0e069484a98316) ) /* fg chars */ - ROM_REGION( 0x0c000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE ) + ROM_REGION( 0x0c000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "fcombat8.d10", 0x00000, 0x4000, CRC(e810941e) SHA1(19ae85af0bf245caf3afe10d65e618cfb47d33c2) ) /* sprites */ ROM_LOAD( "fcombat9.d11", 0x04000, 0x4000, CRC(f95988e6) SHA1(25876652decca7ec1e9b37a16536c15ca2d1cb12) ) ROM_LOAD( "fcomba10.d12", 0x08000, 0x4000, CRC(908f154c) SHA1(b3761ee60d4a5ea36376759875105d23c57b4bf2) ) - ROM_REGION( 0x04000, RGNCLASS_GFX, "gfx3", ROMREGION_DISPOSE ) + ROM_REGION( 0x04000, "gfx3", ROMREGION_DISPOSE ) ROM_LOAD( "fcombat6.f3", 0x00000, 0x4000, CRC(97282729) SHA1(72db0593551c2d15631341bf621b96013b46ce72) ) - ROM_REGION( 0x04000, RGNCLASS_USER, "user1", 0 ) + ROM_REGION( 0x04000, "user1", 0 ) ROM_LOAD( "fcombat5.l3", 0x00000, 0x4000, CRC(96194ca7) SHA1(087d6ac8f93f087cb5e378dbe9a8cfcffa2cdddc) ) /* bg data */ - ROM_REGION( 0x04000, RGNCLASS_USER, "user2", 0 ) + ROM_REGION( 0x04000, "user2", 0 ) ROM_LOAD( "fcombat4.p3", 0x00000, 0x4000, CRC(efe098ab) SHA1(fe64a5e9170835d242368109b1b221b0f8090e7e) ) /* terrain info */ - ROM_REGION( 0x0420, RGNCLASS_PROMS, "proms", 0 ) + ROM_REGION( 0x0420, "proms", 0 ) ROM_LOAD( "fcprom_a.c2", 0x0000, 0x0020, CRC(7ac480f0) SHA1(f491fe4da19d8c037e3733a5836de35cc438907e) ) /* palette */ ROM_LOAD( "fcprom_d.k12", 0x0020, 0x0100, CRC(9a348250) SHA1(faf8db4c42adee07795d06bea20704f8c51090ff) ) /* fg char lookup table */ ROM_LOAD( "fcprom_b.c4", 0x0120, 0x0100, CRC(ac9049f6) SHA1(57aa5b5df3e181bad76149745a422c3dd1edad49) ) /* sprite lookup table */ -- cgit v1.2.3