diff options
Diffstat (limited to 'src/mame/drivers/rainbow.c')
-rw-r--r-- | src/mame/drivers/rainbow.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 4c6eaef1c8a..65ba255673e 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -347,7 +347,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( bankswitch_w ) { - memory_set_bankptr(5, memory_region(machine, RGNCLASS_CPU, "audio") + ((data - 1) & 3) * 0x4000 + 0x10000); + memory_set_bankptr(5, memory_region(machine, "audio") + ((data - 1) & 3) * 0x4000 + 0x10000); } static READ8_HANDLER( jumping_latch_r ) @@ -685,7 +685,7 @@ MACHINE_DRIVER_END ***************************************************************************/ ROM_START( rainbow ) - ROM_REGION( 0x80000, RGNCLASS_CPU, "main", 0 ) + ROM_REGION( 0x80000, "main", 0 ) ROM_LOAD16_BYTE( "b22-10-1.19", 0x00000, 0x10000, CRC(e34a50ca) SHA1(17a92cd7182db1e18000b1ae689758fcfd70fe16) ) ROM_LOAD16_BYTE( "b22-11-1.20", 0x00001, 0x10000, CRC(6a31a093) SHA1(1e99ae47811c0d3774d138dab02ac50bc1b92173) ) ROM_LOAD16_BYTE( "b22-08-1.21", 0x20000, 0x10000, CRC(15d6e17a) SHA1(7b0339180239e75adf1437aee276b652a1bfee51) ) @@ -693,21 +693,21 @@ ROM_START( rainbow ) ROM_LOAD16_BYTE( "b22-03.23", 0x40000, 0x20000, CRC(3ebb0fb8) SHA1(1b41b305623d121255eb70cb992e4d9da13abd82) ) ROM_LOAD16_BYTE( "b22-04.24", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) ) - ROM_REGION( 0x1c000, RGNCLASS_CPU, "audio", 0 ) + ROM_REGION( 0x1c000, "audio", 0 ) ROM_LOAD( "b22-14.43", 0x00000, 0x4000, CRC(113c1a5b) SHA1(effa2adf54a6be78b2d4baf3a47529342fb0d895) ) ROM_CONTINUE( 0x10000, 0xc000 ) - ROM_REGION( 0x80000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE ) + ROM_REGION( 0x80000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "b22-01.2", 0x00000, 0x80000, CRC(b76c9168) SHA1(e924be0c8294b930488bb04583784254a840a52e) ) /* tiles */ - ROM_REGION( 0xa0000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE ) + ROM_REGION( 0xa0000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "b22-01.5", 0x00000, 0x80000, CRC(1b87ecf0) SHA1(37a463184f4064fe0565367236e289d57639614c) ) /* sprites */ ROM_LOAD16_BYTE( "b22-12.7", 0x80000, 0x10000, CRC(67a76dc6) SHA1(626ee684eb3ea859c695ffe03344ccaa442da4af) ) ROM_LOAD16_BYTE( "b22-13.6", 0x80001, 0x10000, CRC(2fda099f) SHA1(a1e27a4497f6733608be924d69d965b19f725b99) ) ROM_END ROM_START( rainbowo ) - ROM_REGION( 0x80000, RGNCLASS_CPU, "main", 0 ) + ROM_REGION( 0x80000, "main", 0 ) ROM_LOAD16_BYTE( "b22-10.19", 0x00000, 0x10000, CRC(3b013495) SHA1(fc89f401a80b9bde174df8a257bb7fad4937c838) ) ROM_LOAD16_BYTE( "b22-11.20", 0x00001, 0x10000, CRC(80041a3d) SHA1(619d71a2bef5fd898a15d37d8016850f832428c3) ) ROM_LOAD16_BYTE( "b22-08.21", 0x20000, 0x10000, CRC(962fb845) SHA1(1c5581e697902ee5cde0fb841ef05eade04a901b) ) @@ -715,21 +715,21 @@ ROM_START( rainbowo ) ROM_LOAD16_BYTE( "b22-03.23", 0x40000, 0x20000, CRC(3ebb0fb8) SHA1(1b41b305623d121255eb70cb992e4d9da13abd82) ) ROM_LOAD16_BYTE( "b22-04.24", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) ) - ROM_REGION( 0x1c000, RGNCLASS_CPU, "audio", 0 ) + ROM_REGION( 0x1c000, "audio", 0 ) ROM_LOAD( "b22-14.43", 0x00000, 0x4000, CRC(113c1a5b) SHA1(effa2adf54a6be78b2d4baf3a47529342fb0d895) ) ROM_CONTINUE( 0x10000, 0xc000 ) - ROM_REGION( 0x80000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE ) + ROM_REGION( 0x80000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "b22-01.2", 0x00000, 0x80000, CRC(b76c9168) SHA1(e924be0c8294b930488bb04583784254a840a52e) ) /* tiles */ - ROM_REGION( 0xa0000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE ) + ROM_REGION( 0xa0000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "b22-01.5", 0x00000, 0x80000, CRC(1b87ecf0) SHA1(37a463184f4064fe0565367236e289d57639614c) ) /* sprites */ ROM_LOAD16_BYTE( "b22-12.7", 0x80000, 0x10000, CRC(67a76dc6) SHA1(626ee684eb3ea859c695ffe03344ccaa442da4af) ) ROM_LOAD16_BYTE( "b22-13.6", 0x80001, 0x10000, CRC(2fda099f) SHA1(a1e27a4497f6733608be924d69d965b19f725b99) ) ROM_END ROM_START( rainbowe ) - ROM_REGION( 0x80000, RGNCLASS_CPU, "main", 0 ) + ROM_REGION( 0x80000, "main", 0 ) ROM_LOAD16_BYTE( "b39-01.19", 0x00000, 0x10000, CRC(50690880) SHA1(88cd8739eaa6e4e5988be225c31d2a6605173d39) ) ROM_LOAD16_BYTE( "b39-02.20", 0x00001, 0x10000, CRC(4dead71f) SHA1(03e9df33fc8fc64d6eeb1c3a763acac00b10c071) ) ROM_LOAD16_BYTE( "b39-03.21", 0x20000, 0x10000, CRC(4a4cb785) SHA1(6ba7de3901a001cbb31713664ccb68b943a5578f) ) @@ -737,21 +737,21 @@ ROM_START( rainbowe ) ROM_LOAD16_BYTE( "b22-03.23", 0x40000, 0x20000, CRC(3ebb0fb8) SHA1(1b41b305623d121255eb70cb992e4d9da13abd82) ) ROM_LOAD16_BYTE( "b22-04.24", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) ) - ROM_REGION( 0x1c000, RGNCLASS_CPU, "audio", 0 ) + ROM_REGION( 0x1c000, "audio", 0 ) ROM_LOAD( "b22-14.43", 0x00000, 0x4000, CRC(113c1a5b) SHA1(effa2adf54a6be78b2d4baf3a47529342fb0d895) ) ROM_CONTINUE( 0x10000, 0xc000 ) - ROM_REGION( 0x80000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE ) + ROM_REGION( 0x80000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "b22-01.2", 0x00000, 0x80000, CRC(b76c9168) SHA1(e924be0c8294b930488bb04583784254a840a52e) ) /* tiles */ - ROM_REGION( 0xa0000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE ) + ROM_REGION( 0xa0000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "b22-01.5", 0x00000, 0x80000, CRC(1b87ecf0) SHA1(37a463184f4064fe0565367236e289d57639614c) ) /* sprites */ ROM_LOAD16_BYTE( "b22-12.7", 0x80000, 0x10000, CRC(67a76dc6) SHA1(626ee684eb3ea859c695ffe03344ccaa442da4af) ) ROM_LOAD16_BYTE( "b22-13.6", 0x80001, 0x10000, CRC(2fda099f) SHA1(a1e27a4497f6733608be924d69d965b19f725b99) ) ROM_END ROM_START( jumping ) - ROM_REGION( 0xa0000, RGNCLASS_CPU, "main", 0 ) + ROM_REGION( 0xa0000, "main", 0 ) ROM_LOAD16_BYTE( "jb1_h4", 0x00000, 0x10000, CRC(3fab6b31) SHA1(57803478949cb62f7eab2ef9be08b13aa2237dbc) ) ROM_LOAD16_BYTE( "jb1_h8", 0x00001, 0x10000, CRC(8c878827) SHA1(4a54a217b7c442305c3ce9298aa36ae225382444) ) ROM_LOAD16_BYTE( "jb1_i4", 0x20000, 0x10000, CRC(443492cf) SHA1(fc3809d784d611df4fd446ca2443eebdf4f0bfd7) ) @@ -760,12 +760,12 @@ ROM_START( jumping ) ROM_LOAD16_BYTE( "b22-04.24", 0x40001, 0x20000, CRC(91625e7f) SHA1(765afd973d9b82bb496b04beca284bf2769d6e6f) ) ROM_LOAD16_BYTE( "jb1_f89", 0x80001, 0x10000, CRC(0810d327) SHA1(fe91ac02e617bde413dc8a20b7cbcaf3e20aeb28) ) /* c-chip substitute */ - ROM_REGION( 0x14000, RGNCLASS_CPU, "audio", 0 ) + ROM_REGION( 0x14000, "audio", 0 ) ROM_LOAD( "jb1_cd67", 0x00000, 0x8000, CRC(8527c00e) SHA1(86e3824caca39aca4ca4df63bb4474adacfc4c53) ) ROM_CONTINUE( 0x10000, 0x4000 ) ROM_CONTINUE( 0x0c000, 0x4000 ) - ROM_REGION( 0x80000, RGNCLASS_GFX, "gfx1", ROMREGION_DISPOSE ) + ROM_REGION( 0x80000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "jb2_ic8", 0x00000, 0x10000, CRC(65b76309) SHA1(1e345726e137f4c56d4bf239651c986fd53a16c3) ) /* tiles */ ROM_LOAD( "jb2_ic7", 0x10000, 0x10000, CRC(43a94283) SHA1(d6a05cbc7b996a8e7f1520563f6fada9a59021a4) ) ROM_LOAD( "jb2_ic10", 0x20000, 0x10000, CRC(e61933fb) SHA1(02bc0e1a7a3ce9e15fb83b28ce8fafb0b8d80ebd) ) @@ -775,7 +775,7 @@ ROM_START( jumping ) ROM_LOAD( "jb2_ic14", 0x60000, 0x10000, CRC(9fdc6c8e) SHA1(ff4e1a98dc982bce2f9d235cac62c7166f477f64) ) ROM_LOAD( "jb2_ic13", 0x70000, 0x10000, CRC(06226492) SHA1(834280ec49e61a0c9c6b6fe2033e1b20bd1bffbf) ) - ROM_REGION( 0xa0000, RGNCLASS_GFX, "gfx2", ROMREGION_DISPOSE ) + ROM_REGION( 0xa0000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "jb2_ic62", 0x00000, 0x10000, CRC(8548db6c) SHA1(675cd301259d5ed16098a38ac58b27b5ccd91264) ) /* sprites */ ROM_LOAD( "jb2_ic61", 0x10000, 0x10000, CRC(37c5923b) SHA1(c83ef45564c56ef62d7019aecbd79dccc671deee) ) ROM_LOAD( "jb2_ic60", 0x20000, 0x08000, CRC(662a2f1e) SHA1(1c5e8b1f0623e64faf9cd60f9653fc5957191a9b) ) @@ -803,8 +803,8 @@ static DRIVER_INIT( rainbowe ) static DRIVER_INIT( jumping ) { - int i, len = memory_region_length(machine, RGNCLASS_GFX, "gfx2"); - UINT8 *rom = memory_region(machine, RGNCLASS_GFX, "gfx2"); + int i, len = memory_region_length(machine, "gfx2"); + UINT8 *rom = memory_region(machine, "gfx2"); /* Sprite colour map is reversed - switch to normal */ |