diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c index 8faf80c5b3e..455259430ab 100644 --- a/src/emu/sound/namco.c +++ b/src/emu/sound/namco.c @@ -118,7 +118,7 @@ static int build_decoded_waveform(struct namco_sound *chip, const char *region) namco_wavedata = rgnbase; /* 20pacgal has waves in RAM but old sound system */ - if (namco_wavedata == NULL && chip->num_voices != 3) + if (rgnbase == NULL && chip->num_voices != 3) { chip->wave_size = 1; size = 32 * 16; /* 32 samples, 16 waveforms */ diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c index 5e2db08259d..50d4db5952f 100644 --- a/src/emu/sound/vlm5030.c +++ b/src/emu/sound/vlm5030.c @@ -633,13 +633,14 @@ if( chip->interp_step != 1) /* speech_rom == 0 -> use sampling data mode */ static void *vlm5030_start(const char *tag, int sndindex, int clock, const void *config) { + const struct VLM5030interface defintrf = { 0 }; int emulation_rate; struct vlm5030_info *chip; chip = auto_malloc(sizeof(*chip)); memset(chip, 0, sizeof(*chip)); - chip->intf = config; + chip->intf = (config != NULL) ? config : &defintrf; emulation_rate = clock / 440; diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index f0b054e6070..c80886c19c5 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -3407,7 +3407,7 @@ static DRIVER_INIT( deco222 ) if (machine->config->cpu[2].type != CPU_DUMMY) sound_cpu = 2; /* bits 5 and 6 of the opcodes are swapped */ - rom = memory_region(machine, "main"+sound_cpu); + rom = memory_region(machine, "audio"); decrypt = auto_malloc(0x8000); memory_set_decrypted_region(sound_cpu, 0x8000, 0xffff, decrypt); diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 2acde7ff775..e1e9f93a3af 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -1797,7 +1797,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( konami_sound_1x_ay8910 ) /* 2nd CPU to drive sound */ - MDRV_CPU_ADD("sound", Z80, KONAMI_SOUND_CLOCK/8) + MDRV_CPU_ADD("audio", Z80, KONAMI_SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(frogger_sound_map,0) MDRV_CPU_IO_MAP(frogger_sound_portmap,0) @@ -1817,7 +1817,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( konami_sound_2x_ay8910 ) /* 2nd CPU to drive sound */ - MDRV_CPU_ADD("sound", Z80, KONAMI_SOUND_CLOCK/8) + MDRV_CPU_ADD("audio", Z80, KONAMI_SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(konami_sound_map,0) MDRV_CPU_IO_MAP(konami_sound_portmap,0) @@ -2102,7 +2102,7 @@ static MACHINE_DRIVER_START( sfx ) MDRV_CPU_PROGRAM_MAP(sfx_map,0) /* 3rd CPU for the sample player */ - MDRV_CPU_ADD("audio", Z80, KONAMI_SOUND_CLOCK/8) + MDRV_CPU_ADD("audio2", Z80, KONAMI_SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sfx_sample_map,0) MDRV_CPU_IO_MAP(sfx_sample_portmap,0) diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c index 5ac87290f6d..902a5c8726e 100644 --- a/src/mame/drivers/galdrvr.c +++ b/src/mame/drivers/galdrvr.c @@ -3860,7 +3860,7 @@ ROM_START( frogger ) ROM_LOAD( "frogger.27", 0x1000, 0x1000, CRC(b6e6fcc3) SHA1(5e8692f2b0c7f4b3642b3ee6670e1c3b20029cdc) ) ROM_LOAD( "frsm3.7", 0x2000, 0x1000, CRC(aca22ae0) SHA1(5a99060ea2506a3ac7d61ca5876ce5cb3e493565) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "frogger.608", 0x0000, 0x0800, CRC(e8ab0256) SHA1(f090afcfacf5f13cdfa0dfda8e3feb868c6ce8bc) ) ROM_LOAD( "frogger.609", 0x0800, 0x0800, CRC(7380a48f) SHA1(75582a94b696062cbdb66a4c5cf0bc0bb94f81ee) ) ROM_LOAD( "frogger.610", 0x1000, 0x0800, CRC(31d7eb27) SHA1(2e1d34ae4da385fd7cac94707d25eeddf4604e1a) ) @@ -3879,7 +3879,7 @@ ROM_START( frogseg1 ) ROM_LOAD( "frogger.27", 0x1000, 0x1000, CRC(b6e6fcc3) SHA1(5e8692f2b0c7f4b3642b3ee6670e1c3b20029cdc) ) ROM_LOAD( "frogger.34", 0x2000, 0x1000, CRC(ed866bab) SHA1(24e1bbde44eb5480b7a0570fa0dc1de388cb95ba) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "frogger.608", 0x0000, 0x0800, CRC(e8ab0256) SHA1(f090afcfacf5f13cdfa0dfda8e3feb868c6ce8bc) ) ROM_LOAD( "frogger.609", 0x0800, 0x0800, CRC(7380a48f) SHA1(75582a94b696062cbdb66a4c5cf0bc0bb94f81ee) ) ROM_LOAD( "frogger.610", 0x1000, 0x0800, CRC(31d7eb27) SHA1(2e1d34ae4da385fd7cac94707d25eeddf4604e1a) ) @@ -3899,7 +3899,7 @@ ROM_START( frogseg2 ) ROM_LOAD( "frogger.ic7", 0x2000, 0x1000, CRC(dd251066) SHA1(4612e1fe1ab7182a277140b1a1976cc17e0746a5) ) ROM_LOAD( "frogger.ic8", 0x3000, 0x1000, CRC(bf293a02) SHA1(be94e9f5caa74c3de6fd95bd20928f4a9c514227) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "frogger.608", 0x0000, 0x0800, CRC(e8ab0256) SHA1(f090afcfacf5f13cdfa0dfda8e3feb868c6ce8bc) ) ROM_LOAD( "frogger.609", 0x0800, 0x0800, CRC(7380a48f) SHA1(75582a94b696062cbdb66a4c5cf0bc0bb94f81ee) ) ROM_LOAD( "frogger.610", 0x1000, 0x0800, CRC(31d7eb27) SHA1(2e1d34ae4da385fd7cac94707d25eeddf4604e1a) ) @@ -3919,7 +3919,7 @@ ROM_START( froggrmc ) ROM_LOAD( "epr-1033.33", 0x2000, 0x1000, CRC(bc1d6fbc) SHA1(c9c040418f0bf7b7fce599592f806e7aaf448c3d) ) ROM_LOAD( "epr-1034.34", 0x3000, 0x1000, CRC(9efe7399) SHA1(77355160169db256f45286e60ebf6a406527d346) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "epr-1082.42", 0x0000, 0x1000, CRC(802843c2) SHA1(059b26ddf1cdc8076d160b872f9d50b97af7f316) ) ROM_LOAD( "epr-1035.43", 0x1000, 0x0800, CRC(14e74148) SHA1(0023394e971f191c41ff20b47835f1dafb924d15) ) @@ -3940,7 +3940,7 @@ ROM_START( froggers ) ROM_LOAD( "vid_j2.bin", 0x2000, 0x0800, CRC(fbdfbe74) SHA1(48d5d1247d09eaea2a9a29f4ed6543d0411597aa) ) ROM_LOAD( "vid_l2.bin", 0x2800, 0x0800, CRC(8a4389e1) SHA1(b2c74afb93927dac0d8bb24e02e0b2a069f2d3c8) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "frogger.608", 0x0000, 0x0800, CRC(e8ab0256) SHA1(f090afcfacf5f13cdfa0dfda8e3feb868c6ce8bc) ) ROM_LOAD( "frogger.609", 0x0800, 0x0800, CRC(7380a48f) SHA1(75582a94b696062cbdb66a4c5cf0bc0bb94f81ee) ) ROM_LOAD( "frogger.610", 0x1000, 0x0800, CRC(31d7eb27) SHA1(2e1d34ae4da385fd7cac94707d25eeddf4604e1a) ) @@ -3959,7 +3959,7 @@ ROM_START( frogf ) ROM_LOAD( "7.bin", 0x1000, 0x1000, CRC(3087bb4b) SHA1(3fe1f68a2ad12b1cadba89d99afe574cf5342d81) ) ROM_LOAD( "8.bin", 0x2000, 0x1000, CRC(c3869d12) SHA1(7bd95c12fc1fe1a3cfc0140b64cf76fa57aa3fb4) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "frogger.608", 0x0000, 0x0800, CRC(e8ab0256) SHA1(f090afcfacf5f13cdfa0dfda8e3feb868c6ce8bc) ) ROM_LOAD( "frogger.609", 0x0800, 0x0800, CRC(7380a48f) SHA1(75582a94b696062cbdb66a4c5cf0bc0bb94f81ee) ) ROM_LOAD( "frogger.610", 0x1000, 0x0800, CRC(31d7eb27) SHA1(2e1d34ae4da385fd7cac94707d25eeddf4604e1a) ) @@ -3999,7 +3999,7 @@ ROM_START( turtles ) ROM_LOAD( "turt_vid.2h", 0x3000, 0x1000, CRC(9e71696c) SHA1(3dcdf5dc601c875fc9d8b9a46e3ef588e7478e0d) ) ROM_LOAD( "turt_vid.2j", 0x4000, 0x1000, CRC(fcd49fef) SHA1(bb1e91b2e6d4b5a861bf37907ef6b198328d8d83) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "turt_snd.5c", 0x0000, 0x1000, CRC(f0c30f9a) SHA1(5621f336e9be8acf986a34bbb8855ed5d45c28ef) ) ROM_LOAD( "turt_snd.5d", 0x1000, 0x1000, CRC(af5fc43c) SHA1(8a49c55feba094b07380615cf0b6f0878c25a260) ) @@ -4019,7 +4019,7 @@ ROM_START( turpin ) ROM_LOAD( "turt_vid.2h", 0x3000, 0x1000, CRC(9e71696c) SHA1(3dcdf5dc601c875fc9d8b9a46e3ef588e7478e0d) ) ROM_LOAD( "m5", 0x4000, 0x1000, CRC(7d2600f2) SHA1(1a9bdf63b50419c6e0d9c401c3dcf29d5b459fa6) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "turt_snd.5c", 0x0000, 0x1000, CRC(f0c30f9a) SHA1(5621f336e9be8acf986a34bbb8855ed5d45c28ef) ) ROM_LOAD( "turt_snd.5d", 0x1000, 0x1000, CRC(af5fc43c) SHA1(8a49c55feba094b07380615cf0b6f0878c25a260) ) @@ -4039,7 +4039,7 @@ ROM_START( 600 ) ROM_LOAD( "600_vid.2h", 0x3000, 0x1000, CRC(a92ef056) SHA1(c319d41a3345b84670fe9110f78332c1cfe1e163) ) ROM_LOAD( "600_vid.2j", 0x4000, 0x1000, CRC(6dadd72d) SHA1(5602b5ebb2c287f72a5ce873b4e3dfd19b8412a0) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "600_snd.5c", 0x0000, 0x1000, CRC(1773c68e) SHA1(cc4aa3a98e85bc6300f8c1ee1a0448071d7c6dfa) ) ROM_LOAD( "600_snd.5d", 0x1000, 0x1000, CRC(a311b998) SHA1(39af321b8c3f211ed6d083a2aba4fbc8af11c9e8) ) @@ -4059,7 +4059,7 @@ ROM_START( amidar ) ROM_LOAD( "amidar.2f", 0x2000, 0x1000, CRC(3656be6f) SHA1(9d652f66bedcf17a6453c0e0ead30bfd7ea0bd0a) ) ROM_LOAD( "amidar.2h", 0x3000, 0x1000, CRC(1be170bd) SHA1(c047bc393b297c0d47668a5f6f4870e3fac937ef) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "amidar.5c", 0x0000, 0x1000, CRC(c4b66ae4) SHA1(9d09dbde4019f7be3abe0815b0e06d542c01c255) ) ROM_LOAD( "amidar.5d", 0x1000, 0x1000, CRC(806785af) SHA1(c8c85e3a6a204feccd7859b4527bd649e96134b4) ) @@ -4079,7 +4079,7 @@ ROM_START( amidaru ) ROM_LOAD( "amidarus.2h", 0x3000, 0x1000, CRC(051d1c7f) SHA1(3cfa0f728a5c27da0a3fe2579ad226129ccde232) ) ROM_LOAD( "amidarus.2j", 0x4000, 0x1000, CRC(351f00d5) SHA1(6659357f40f888b21be00826246200fd3a8a88ce) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "amidarus.5c", 0x0000, 0x1000, CRC(8ca7b750) SHA1(4f4c2915503b85abe141d717fd254ee10c9da99e) ) ROM_LOAD( "amidarus.5d", 0x1000, 0x1000, CRC(9b5bdc0a) SHA1(84d953618c8bf510d23b42232a856ac55f1baff5) ) @@ -4099,7 +4099,7 @@ ROM_START( amidaro ) ROM_LOAD( "110.2h", 0x3000, 0x1000, CRC(ba149a93) SHA1(9ef1d27f0780612be0ea2be94c3a2c781a4924c8) ) ROM_LOAD( "111.2j", 0x4000, 0x1000, CRC(20d01c2e) SHA1(e09437ff440f04036d5ec74b355e97bbbbfefb95) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "amidarus.5c", 0x0000, 0x1000, CRC(8ca7b750) SHA1(4f4c2915503b85abe141d717fd254ee10c9da99e) ) ROM_LOAD( "amidarus.5d", 0x1000, 0x1000, CRC(9b5bdc0a) SHA1(84d953618c8bf510d23b42232a856ac55f1baff5) ) @@ -4118,7 +4118,7 @@ ROM_START( amidarb ) ROM_LOAD( "3.2j", 0x2000, 0x1000, CRC(b0860e31) SHA1(8fb92b0e71c826a509a8f712553de0f4a636286f) ) ROM_LOAD( "4.2m", 0x3000, 0x1000, CRC(4a4086c9) SHA1(6f309b67dc68e06e6eb1d3ee2ae75afe253a4ce3) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "8.11d", 0x0000, 0x1000, CRC(8ca7b750) SHA1(4f4c2915503b85abe141d717fd254ee10c9da99e) ) ROM_LOAD( "9.9d", 0x1000, 0x1000, CRC(9b5bdc0a) SHA1(84d953618c8bf510d23b42232a856ac55f1baff5) ) @@ -4137,7 +4137,7 @@ ROM_START( amigo ) ROM_LOAD( "2732.a3", 0x2000, 0x1000, CRC(e9d3dc76) SHA1(627c6068c65985175388aec43ac2a4248b004c97) ) ROM_LOAD( "2732.a4", 0x3000, 0x1000, CRC(4a4086c9) SHA1(6f309b67dc68e06e6eb1d3ee2ae75afe253a4ce3) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "amidarus.5c", 0x0000, 0x1000, CRC(8ca7b750) SHA1(4f4c2915503b85abe141d717fd254ee10c9da99e) ) ROM_LOAD( "amidarus.5d", 0x1000, 0x1000, CRC(9b5bdc0a) SHA1(84d953618c8bf510d23b42232a856ac55f1baff5) ) @@ -4160,7 +4160,7 @@ ROM_START( amidars ) ROM_LOAD( "am2m", 0x3000, 0x0800, CRC(1d7109e9) SHA1(e0d24475547bbe5a94b45be6abefb84ad84d2534) ) ROM_LOAD( "am2p", 0x3800, 0x0800, CRC(c9163ac6) SHA1(46d757180426b71c827d14a35824a248f2c787b6) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "amidarus.5c", 0x0000, 0x1000, CRC(8ca7b750) SHA1(4f4c2915503b85abe141d717fd254ee10c9da99e) ) ROM_LOAD( "amidarus.5d", 0x1000, 0x1000, CRC(9b5bdc0a) SHA1(84d953618c8bf510d23b42232a856ac55f1baff5) ) @@ -4182,7 +4182,7 @@ ROM_START( theend ) ROM_LOAD( "ic17_5t.bin", 0x2000, 0x0800, CRC(434a8f68) SHA1(3c8c099c7865997d475c096f1b1c93d88ab21543) ) ROM_LOAD( "ic18_6t.bin", 0x2800, 0x0800, CRC(dc4cc786) SHA1(3311361a1eb29715aa41d61fbb3563014bd9eeb1) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ic56_1.bin", 0x0000, 0x0800, CRC(7a141f29) SHA1(ca483943971c8fc7f5775a8a7cc6ddd331d48170) ) ROM_LOAD( "ic55_2.bin", 0x0800, 0x0800, CRC(218497c1) SHA1(3e080621f2e83909a6f304a2d960a080bccbbdc2) ) @@ -4203,7 +4203,7 @@ ROM_START( theends ) ROM_LOAD( "ic17", 0x2000, 0x0800, CRC(af067b7f) SHA1(855c6ddf29fbfea004c7143fe29064abf53801ad) ) ROM_LOAD( "ic18", 0x2800, 0x0800, CRC(a0411b93) SHA1(d644968758a1b73d13e09b24d24bfec82276e8f4) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ic56", 0x0000, 0x0800, CRC(3b2c2f70) SHA1(bcccdacacfc9a3b5f1412dfba6bb0046d283bccc) ) ROM_LOAD( "ic55", 0x0800, 0x0800, CRC(e0429e50) SHA1(27678fc3172cbca3ae1eae96e9d8a62561d5ce40) ) @@ -4227,7 +4227,7 @@ ROM_START( scramble ) ROM_LOAD( "s7.2m", 0x3000, 0x0800, CRC(0bb49470) SHA1(05a6fe3010c2136284ca76352dac147797c79778) ) ROM_LOAD( "s8.2p", 0x3800, 0x0800, CRC(6a5740e5) SHA1(e3b09141cee26857d626412e9d1a0e759469b97a) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ot1.5c", 0x0000, 0x0800, CRC(bcd297f0) SHA1(8ed78487d76fd0a917ab7b258937a46e2cd9800c) ) ROM_LOAD( "ot2.5d", 0x0800, 0x0800, CRC(de7912da) SHA1(8558b4eff5d7e63029b325edef9914feda5834c3) ) ROM_LOAD( "ot3.5e", 0x1000, 0x0800, CRC(ba2fa933) SHA1(1f976d8595706730e29f93027e7ab4620075c078) ) @@ -4251,7 +4251,7 @@ ROM_START( scrambls ) ROM_LOAD( "2m", 0x3000, 0x0800, CRC(ea26c35c) SHA1(a2f3380982d93a022f46756f974fd16c4cd617de) ) ROM_LOAD( "2p", 0x3800, 0x0800, CRC(94d8f5e3) SHA1(f3a9c4d1d91836476fcad87ea0d243dde7171e0a) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ot1.5c", 0x0000, 0x0800, CRC(bcd297f0) SHA1(8ed78487d76fd0a917ab7b258937a46e2cd9800c) ) ROM_LOAD( "ot2.5d", 0x0800, 0x0800, CRC(de7912da) SHA1(8558b4eff5d7e63029b325edef9914feda5834c3) ) ROM_LOAD( "ot3.5e", 0x1000, 0x0800, CRC(ba2fa933) SHA1(1f976d8595706730e29f93027e7ab4620075c078) ) @@ -4275,7 +4275,7 @@ ROM_START( strfbomb ) ROM_LOAD( "7.2m", 0x3000, 0x0800, CRC(0feb0192) SHA1(45a44bde3bf1483abf95fe1d1d5066bfcb1736df) ) ROM_LOAD( "8.2p", 0x3800, 0x0800, CRC(280a6142) SHA1(f17625b91eaaffa36a433be32e4e80651d94b3b9) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ot1.5c", 0x0000, 0x0800, CRC(bcd297f0) SHA1(8ed78487d76fd0a917ab7b258937a46e2cd9800c) ) ROM_LOAD( "ot2.5d", 0x0800, 0x0800, CRC(de7912da) SHA1(8558b4eff5d7e63029b325edef9914feda5834c3) ) ROM_LOAD( "ot3.5e", 0x1000, 0x0800, CRC(ba2fa933) SHA1(1f976d8595706730e29f93027e7ab4620075c078) ) @@ -4317,7 +4317,7 @@ ROM_START( atlantis ) ROM_LOAD( "2j", 0x2000, 0x0800, CRC(45f7cf34) SHA1(d1e0e0be6dec377b684625bdfdc5a3a8af847492) ) ROM_LOAD( "2l", 0x2800, 0x0800, CRC(f335b96b) SHA1(17daa6d9bc916081f3c6cbdfe5b4960177dc7c9b) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ot1.5c", 0x0000, 0x0800, CRC(bcd297f0) SHA1(8ed78487d76fd0a917ab7b258937a46e2cd9800c) ) ROM_LOAD( "ot2.5d", 0x0800, 0x0800, CRC(de7912da) SHA1(8558b4eff5d7e63029b325edef9914feda5834c3) ) ROM_LOAD( "ot3.5e", 0x1000, 0x0800, CRC(ba2fa933) SHA1(1f976d8595706730e29f93027e7ab4620075c078) ) @@ -4341,7 +4341,7 @@ ROM_START( atlants2 ) ROM_LOAD( "rom7", 0x3000, 0x0800, CRC(a50bf8d5) SHA1(5bca98e1c0838d27ec66bf4b906877977b212b6d) ) ROM_LOAD( "rom8", 0x3800, 0x0800, CRC(d2c5c984) SHA1(a9432f9aff8a2f5ca1d347443efc008a177d8ae0) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ot1.5c", 0x0000, 0x0800, CRC(bcd297f0) SHA1(8ed78487d76fd0a917ab7b258937a46e2cd9800c) ) ROM_LOAD( "ot2.5d", 0x0800, 0x0800, CRC(de7912da) SHA1(8558b4eff5d7e63029b325edef9914feda5834c3) ) ROM_LOAD( "ot3.5e", 0x1000, 0x0800, CRC(ba2fa933) SHA1(1f976d8595706730e29f93027e7ab4620075c078) ) @@ -4364,7 +4364,7 @@ ROM_START( scorpion ) ROM_LOAD( "5.2k", 0x6000, 0x0800, CRC(952f78f2) SHA1(9562037b104fc1852c2d2650209a77ffce2cb90e) ) ROM_CONTINUE( 0x5800, 0x0800 ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "32_a4.7c", 0x0000, 0x1000, CRC(361b8a36) SHA1(550ac5f721aaa9fea5f6d63ba590d6b367525c23) ) ROM_LOAD( "32_a5.7d", 0x1000, 0x1000, CRC(addecdd4) SHA1(ba28f1d9c7c6b5e8ecef56a4b3f64be13fc10d43) ) @@ -4391,7 +4391,7 @@ ROM_START( scrpiona ) ROM_LOAD( "scor_k2.bin", 0x5800, 0x0800, BAD_DUMP CRC(42ec34d8) SHA1(b358d10a96490f325420b992e8e03bb3884e415a) ) ROM_LOAD( "scor_l2.bin", 0x6000, 0x0800, BAD_DUMP CRC(6623da33) SHA1(99110005d00c80d674bde5d21608f50b85ee488c) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "32_a4.7c", 0x0000, 0x1000, CRC(361b8a36) SHA1(550ac5f721aaa9fea5f6d63ba590d6b367525c23) ) ROM_LOAD( "32_a5.7d", 0x1000, 0x1000, CRC(addecdd4) SHA1(ba28f1d9c7c6b5e8ecef56a4b3f64be13fc10d43) ) @@ -4417,7 +4417,7 @@ ROM_START( scrpionb ) ROM_LOAD( "ic113.2k", 0x6000, 0x0800, CRC(e4ad299a) SHA1(712cab86eadeba9e859f7bae98eb289f00d2e217) ) ROM_CONTINUE( 0x5800, 0x0800 ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "32_a4.7c", 0x0000, 0x1000, CRC(361b8a36) SHA1(550ac5f721aaa9fea5f6d63ba590d6b367525c23) ) // missing in this dump ROM_LOAD( "ic13.7d", 0x1000, 0x1000, CRC(addecdd4) SHA1(ba28f1d9c7c6b5e8ecef56a4b3f64be13fc10d43) ) @@ -4467,11 +4467,11 @@ ROM_START( sfx ) ROM_LOAD( "24.1g", 0xc000, 0x1000, CRC(e6d7dc74) SHA1(c1e6d9598fb837775ee6550fea3cd4910572615e) ) ROM_LOAD( "5.1h", 0xd000, 0x1000, CRC(d1e8d390) SHA1(f8fe9f69e6500fbcf25f8151c1070d9a1a20a38c) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "5.5j", 0x0000, 0x1000, CRC(59028fb6) SHA1(94105b5b03c81a948a409f7ea20312bb9c79c150) ) ROM_LOAD( "6.6j", 0x1000, 0x1000, CRC(5427670f) SHA1(ffc3f7186d0319f0fd7ed25eb97bb0db7bc107c6) ) - ROM_REGION( 0x10000, "audio", 0 ) + ROM_REGION( 0x10000, "audio2", 0 ) ROM_LOAD( "1.1j", 0x0000, 0x1000, CRC(2f172c58) SHA1(4706d55fcfad4d5a87d96a0a0187f59997ef9720) ) ROM_LOAD( "2.2j", 0x1000, 0x1000, CRC(a6ad2f6b) SHA1(14d1a93e507c349b14a1b26408cce23f089fa33c) ) ROM_LOAD( "3.3j", 0x2000, 0x1000, CRC(fa1274fa) SHA1(e98cb602b265b209eaa4a9b3972e47c869ff863b) ) @@ -4498,11 +4498,11 @@ ROM_START( skelagon ) ROM_LOAD( "35.bin", 0xd000, 0x1000, CRC(5b2a0158) SHA1(66d2fb05a8daaa86bb547b4860d5bf27b4359326) ) ROM_LOAD( "36.bin", 0xe000, 0x1000, BAD_DUMP CRC(f53ead29) SHA1(f8957b0c0558acc005f418adbfeb66d1d562c9ac) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "5.5j", 0x0000, 0x1000, CRC(59028fb6) SHA1(94105b5b03c81a948a409f7ea20312bb9c79c150) ) ROM_LOAD( "6.6j", 0x1000, 0x1000, CRC(5427670f) SHA1(ffc3f7186d0319f0fd7ed25eb97bb0db7bc107c6) ) - ROM_REGION( 0x10000, "audio", 0 ) + ROM_REGION( 0x10000, "audio2", 0 ) ROM_LOAD( "1.1j", 0x0000, 0x1000, CRC(2f172c58) SHA1(4706d55fcfad4d5a87d96a0a0187f59997ef9720) ) ROM_LOAD( "2.2j", 0x1000, 0x1000, CRC(a6ad2f6b) SHA1(14d1a93e507c349b14a1b26408cce23f089fa33c) ) ROM_LOAD( "3.3j", 0x2000, 0x1000, CRC(fa1274fa) SHA1(e98cb602b265b209eaa4a9b3972e47c869ff863b) ) @@ -4540,13 +4540,13 @@ ROM_START( monsterz ) ROM_LOAD( "b-5e.g1", 0xc000, 0x1000, CRC(b2788ab9) SHA1(eb1a6b41f4c7a243481bfccf2b068ce1bc292366) ) ROM_LOAD( "b-6e.h1", 0xd000, 0x1000, CRC(77d7aa8d) SHA1(62aaf582ba55f7b21f6cf13b4fb6c2c54bb729f5) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "a-1e.k1", 0x0000, 0x1000, CRC(b88ba44e) SHA1(85c141fb411d541b1e20412f5fefd18395f635ae) ) ROM_LOAD( "a-2.k2", 0x1000, 0x1000, CRC(8913c94e) SHA1(6c4fe065217a234d45761f8ad4d2c4e7078a0abd) ) ROM_LOAD( "a-3e.k3", 0x2000, 0x1000, CRC(a8fa5095) SHA1(5cabe5497a79a0c43e78a84ae87c824af60a2a3f) ) ROM_LOAD( "a-4.k4", 0x3000, 0x1000, CRC(93f81317) SHA1(167708be94cb9a47290067a20bc5ff6f018b93b6) ) - ROM_REGION( 0x10000, "audio", 0 ) + ROM_REGION( 0x10000, "audio2", 0 ) ROM_LOAD( "a-5e.k5", 0x0000, 0x1000, CRC(b5bcdb4e) SHA1(db0965e5636e0f4e9cd4f4a7d808c413ecf733db) ) ROM_LOAD( "a-6.k6", 0x1000, 0x1000, CRC(24832b2e) SHA1(2a67888e86ce1a3182303e841513ba2a07977359) ) ROM_LOAD( "a-7e.k7", 0x2000, 0x1000, CRC(20ebea81) SHA1(473c688365b256d8593663ff95768f4a5bb1289d) ) @@ -4572,7 +4572,7 @@ ROM_START( scobra ) ROM_LOAD( "epr1269.2j", 0x4000, 0x1000, CRC(e1f8a801) SHA1(2add8270352d6596052d3ff22c891ceccaa92071) ) ROM_LOAD( "2l", 0x5000, 0x1000, CRC(d52affde) SHA1(5681771ed51d504bdcc2999fcbf926a30b137828) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "5c", 0x0000, 0x0800, CRC(d4346959) SHA1(5eab4505beb69a5bdd88b23db60e1193371250cf) ) ROM_LOAD( "5d", 0x0800, 0x0800, CRC(cc025d95) SHA1(2b0784c4d05c466e0b7648f16e14f34393d792c3) ) ROM_LOAD( "5e", 0x1000, 0x0800, CRC(1628c53f) SHA1(ec79a73e4a2d7373454b227dd7eff255f1cc60cc) ) @@ -4594,7 +4594,7 @@ ROM_START( scobras ) ROM_LOAD( "scobra2j.bin", 0x4000, 0x1000, CRC(0d8f6b6e) SHA1(0ca0096cd55cdb87d14cb7f4c7c7b853ec1661c7) ) ROM_LOAD( "scobra2l.bin", 0x5000, 0x1000, CRC(6f80f3a9) SHA1(817d212454c5eb16c5d7471d2ccefc4f8708d57f) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "epr1275.5c", 0x0000, 0x0800, CRC(deeb0dd3) SHA1(b815a586f05361b75078d58f1fddfdb36f9d8fae) ) ROM_LOAD( "epr1276.5d", 0x0800, 0x0800, CRC(872c1a74) SHA1(20f05bf398ad2690f5ba4e4158ad62aeec226413) ) ROM_LOAD( "epr1277.5e", 0x1000, 0x0800, CRC(ccd7a110) SHA1(5a247e360530be0f94c90fcc7d0ce628d460449f) ) @@ -4616,7 +4616,7 @@ ROM_START( scobrase ) ROM_LOAD( "epr1269.2j", 0x4000, 0x1000, CRC(e1f8a801) SHA1(2add8270352d6596052d3ff22c891ceccaa92071) ) ROM_LOAD( "epr1270.2l", 0x5000, 0x1000, CRC(f7709710) SHA1(dff9ae72ba00a98d4f5acdd6d506e3d7add6b2c6) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "epr1275.5c", 0x0000, 0x0800, CRC(deeb0dd3) SHA1(b815a586f05361b75078d58f1fddfdb36f9d8fae) ) ROM_LOAD( "epr1276.5d", 0x0800, 0x0800, CRC(872c1a74) SHA1(20f05bf398ad2690f5ba4e4158ad62aeec226413) ) ROM_LOAD( "epr1277.5e", 0x1000, 0x0800, CRC(ccd7a110) SHA1(5a247e360530be0f94c90fcc7d0ce628d460449f) ) @@ -4639,7 +4639,7 @@ ROM_START( scobrab ) ROM_LOAD( "scobra2j.bin", 0x4000, 0x1000, CRC(0d8f6b6e) SHA1(0ca0096cd55cdb87d14cb7f4c7c7b853ec1661c7) ) ROM_LOAD( "scobra2l.bin", 0x5000, 0x1000, CRC(6f80f3a9) SHA1(817d212454c5eb16c5d7471d2ccefc4f8708d57f) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "snd_5c.bin", 0x0000, 0x0800, CRC(deeb0dd3) SHA1(b815a586f05361b75078d58f1fddfdb36f9d8fae) ) ROM_LOAD( "snd_5d.bin", 0x0800, 0x0800, CRC(872c1a74) SHA1(20f05bf398ad2690f5ba4e4158ad62aeec226413) ) ROM_LOAD( "snd_5e.bin", 0x1000, 0x0800, CRC(ccd7a110) SHA1(5a247e360530be0f94c90fcc7d0ce628d460449f) ) @@ -4663,7 +4663,7 @@ ROM_START( losttomb ) ROM_LOAD( "2l", 0x5000, 0x1000, CRC(c7d2e608) SHA1(8aabecabd1dcd6833fb581e4571d71a680e6563a) ) ROM_LOAD( "2m", 0x6000, 0x1000, CRC(bc4bc5b1) SHA1(95ffa72e57d1da10ddeda4d9333c9e0a2fb33e82) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "5c", 0x0000, 0x0800, CRC(b899be2a) SHA1(9b343a682531255104db61177a43ad933c3af34e) ) ROM_LOAD( "5d", 0x0800, 0x0800, CRC(6907af31) SHA1(8496c8db5342129d81381eec196facbca45bca77) ) @@ -4685,7 +4685,7 @@ ROM_START( losttmbh ) ROM_LOAD( "2l", 0x5000, 0x1000, CRC(c7d2e608) SHA1(8aabecabd1dcd6833fb581e4571d71a680e6563a) ) ROM_LOAD( "2m", 0x6000, 0x1000, CRC(bc4bc5b1) SHA1(95ffa72e57d1da10ddeda4d9333c9e0a2fb33e82) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "5c", 0x0000, 0x0800, CRC(b899be2a) SHA1(9b343a682531255104db61177a43ad933c3af34e) ) ROM_LOAD( "5d", 0x0800, 0x0800, CRC(6907af31) SHA1(8496c8db5342129d81381eec196facbca45bca77) ) @@ -4706,7 +4706,7 @@ ROM_START( armorcar ) ROM_LOAD( "cpu.2h", 0x3000, 0x1000, CRC(61278dbb) SHA1(e12cd6c499af75f77e549499093fe6d2e8eddb1d) ) ROM_LOAD( "cpu.2j", 0x4000, 0x1000, CRC(fb158d8c) SHA1(efa70e92c56678d4a404a96c72cfee317b15648c) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "sound.5c", 0x0000, 0x0800, CRC(54ee7753) SHA1(3ebfa2cadf33acb4d24aa50cfa4713355cc780a3) ) ROM_LOAD( "sound.5d", 0x0800, 0x0800, CRC(5218fec0) SHA1(c8f84f1e6aafc544e5acf48b245e8b1edb63211e) ) @@ -4726,7 +4726,7 @@ ROM_START( armorca2 ) ROM_LOAD( "2h", 0x3000, 0x1000, CRC(72af7b37) SHA1(c9cd0a0a3e34fc7b12822f75eb511f0850703f55) ) ROM_LOAD( "2j", 0x4000, 0x1000, CRC(e6b0dd7f) SHA1(98292fea03bff028ba924a49f0bfa49377018860) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "sound.5c", 0x0000, 0x0800, CRC(54ee7753) SHA1(3ebfa2cadf33acb4d24aa50cfa4713355cc780a3) ) ROM_LOAD( "sound.5d", 0x0800, 0x0800, CRC(5218fec0) SHA1(c8f84f1e6aafc544e5acf48b245e8b1edb63211e) ) @@ -4748,7 +4748,7 @@ ROM_START( tazmania ) ROM_LOAD( "2j.cpu", 0x4000, 0x1000, CRC(6e197271) SHA1(231141a95e4dcb54d8bbee346825702e52824c42) ) ROM_LOAD( "2k.cpu", 0x5000, 0x1000, CRC(a1eb453b) SHA1(50ddfd1dd8cc8c2cde97e52d4ef90e6d10e27a53) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "rom0.snd", 0x0000, 0x0800, CRC(b8d741f1) SHA1(a1bb8a1e0d6b34111f05c539c8e92fffacf5aa5c) ) ROM_REGION( 0x1000, "gfx1", ROMREGION_DISPOSE ) @@ -4767,7 +4767,7 @@ ROM_START( anteater ) ROM_LOAD( "ra1-2f", 0x2000, 0x1000, CRC(2f7c1fe5) SHA1(4cea7e66a85766a9cf9846bb5bc1ca4e6ee1f4e2) ) ROM_LOAD( "ra1-2h", 0x3000, 0x1000, CRC(ae8a5da3) SHA1(1893d8293b25431d080b89f5b0874440d14e8d17) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "ra4-5c", 0x0000, 0x0800, CRC(87300b4f) SHA1(b81b685ac1d353ff1cd40b876a7478b87b85e7a9) ) ROM_LOAD( "ra4-5d", 0x0800, 0x0800, CRC(af4e5ffe) SHA1(62717a233cf9f58267af4a9e1c80479b373ab317) ) @@ -4785,7 +4785,7 @@ ROM_START( spdcoin ) ROM_LOAD( "spdcoin.2c", 0x0000, 0x1000, CRC(65cf1e49) SHA1(a4570f0d7868fcdd378de3fd9e5346780afcf427) ) ROM_LOAD( "spdcoin.2e", 0x1000, 0x1000, CRC(1ee59232) SHA1(b58c1de69d33cf80432012b9b6d8b1e3d8b00662) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "spdcoin.5c", 0x0000, 0x0800, CRC(b4cf64b7) SHA1(a95d94be2e374b78b4ba49b6931f0c214ff9d033) ) ROM_LOAD( "spdcoin.5d", 0x0800, 0x0800, CRC(92304df0) SHA1(01471bf7cbea0090933a253b1b46f80c8f240df5) ) @@ -4808,7 +4808,7 @@ ROM_START( superbon ) ROM_LOAD( "2l.cpu", 0x5000, 0x1000, CRC(e9dcecbd) SHA1(ec61cec2b66c041872a2ca29cf724a89c73fc9a3) ) ROM_LOAD( "2m.cpu", 0x6000, 0x1000, CRC(3ed0337e) SHA1(975b93aee851867e335614419aa6db16fbf8063f) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "5c", 0x0000, 0x0800, CRC(b899be2a) SHA1(9b343a682531255104db61177a43ad933c3af34e) ) ROM_LOAD( "5d.snd", 0x0800, 0x0800, CRC(80640a04) SHA1(83f2bafcfa5737441194d3058a76b2582317cfcb) ) @@ -4835,7 +4835,7 @@ ROM_START( calipso ) ROM_LOAD( "calipso.2j", 0x4000, 0x1000, CRC(fcbd7b9e) SHA1(5cc1edcc8b9867bb7849c8d97d1096bb6464f562) ) ROM_LOAD( "calipso.2l", 0x5000, 0x1000, CRC(f7630cab) SHA1(482ee91cccd8a7c5768a1d6a9772d797769fe2dc) ) - ROM_REGION( 0x10000, "sound", 0 ) /* 64k for sound code */ + ROM_REGION( 0x10000, "audio", 0 ) /* 64k for sound code */ ROM_LOAD( "calipso.5c", 0x0000, 0x0800, CRC(9cbc65ab) SHA1(b4ce04d18f9536c0ddd2f9c15edda75570e750e5) ) ROM_LOAD( "calipso.5d", 0x0800, 0x0800, CRC(a225ee3b) SHA1(dba111f89851c69fb6fce16219cb2b0cb3294c15) ) @@ -4855,7 +4855,7 @@ ROM_START( moonwar ) ROM_LOAD( "mw2.2f", 0x2000, 0x1000, CRC(4fd8ba4b) SHA1(3da784267a96d05f66b00626a22cb3f06211d202) ) ROM_LOAD( "mw2.2h", 0x3000, 0x1000, CRC(56879f0d) SHA1(d1e9932863aebc5761e71fca8d24f3c400e1250d) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "mw2.5c", 0x0000, 0x0800, CRC(c26231eb) SHA1(5b19edfaefe1a535059311d067ea53405879d627) ) ROM_LOAD( "mw2.5d", 0x0800, 0x0800, CRC(bb48a646) SHA1(cf51202d16b03bbed12ff24501be68683f28c992) ) @@ -4874,7 +4874,7 @@ ROM_START( moonwara ) ROM_LOAD( "2f", 0x2000, 0x1000, CRC(378931b8) SHA1(663f1eea9b0e8dc38de818df66c5211dac41c33b) ) ROM_LOAD( "2h", 0x3000, 0x1000, CRC(031dbc2c) SHA1(5f2ca8b8763398bf161ee0c2c748a12d36cb40ec) ) - ROM_REGION( 0x10000, "sound", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "mw2.5c", 0x0000, 0x0800, CRC(c26231eb) SHA1(5b19edfaefe1a535059311d067ea53405879d627) ) ROM_LOAD( "mw2.5d", 0x0800, 0x0800, CRC(bb48a646) SHA1(cf51202d16b03bbed12ff24501be68683f28c992) ) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index ae75881307a..7a79fbf37c0 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -1342,7 +1342,7 @@ static MACHINE_DRIVER_START( pteacher ) MDRV_CPU_PROGRAM_MAP(pteacher_readmem,pteacher_writemem) MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */ - MDRV_CPU_ADD("sound", UPD7807, 9000000) /* 9MHz ? */ + MDRV_CPU_ADD("audio", UPD7807, 9000000) /* 9MHz ? */ MDRV_CPU_CONFIG(upd_config) MDRV_CPU_PROGRAM_MAP(pteacher_upd7807_readmem,pteacher_upd7807_writemem) MDRV_CPU_IO_MAP(pteacher_upd7807_readport,pteacher_upd7807_writeport) @@ -1383,7 +1383,7 @@ static MACHINE_DRIVER_START( mjkinjas ) MDRV_IMPORT_FROM(pteacher) - MDRV_CPU_REPLACE("sound", UPD7807, 11000000) /* 11MHz ? */ + MDRV_CPU_REPLACE("audio", UPD7807, 11000000) /* 11MHz ? */ MACHINE_DRIVER_END static MACHINE_DRIVER_START( lemnangl ) @@ -1601,7 +1601,7 @@ ROM_START( mjkojink ) ROM_LOAD( "x83j01.16e", 0x010000, 0xc000, CRC(91f90376) SHA1(d452f538f4a1b774640ced49f0ab2784b112e8ba) ) ROM_CONTINUE( 0x00c000, 0x4000 ) - ROM_REGION( 0x40000, "sound", 0) /* uPD7807 code */ + ROM_REGION( 0x40000, "audio", 0) /* uPD7807 code */ ROM_LOAD( "x83b02.9g", 0x00000, 0x40000, CRC(46a11578) SHA1(4ff7797808610b4bb0550be71acc49bbd8556fad) ) ROM_REGION( 0x100000, "gfx1", ROMREGION_DISPOSE ) @@ -1629,7 +1629,7 @@ ROM_START( vitaminc ) ROM_LOAD( "x90e01.bin", 0x010000, 0xc000, CRC(bc982525) SHA1(30f5e9ab27f799b895a3d979109e331603d94249) ) ROM_CONTINUE( 0x00c000, 0x4000 ) - ROM_REGION( 0x40000, "sound", 0) /* uPD7807 code */ + ROM_REGION( 0x40000, "audio", 0) /* uPD7807 code */ ROM_LOAD( "x90a02.bin", 0x00000, 0x40000, CRC(811f540a) SHA1(21993e99835a8995da28c24565b8e5dcc7aeb23e) ) ROM_REGION( 0x100000, "gfx1", ROMREGION_DISPOSE ) @@ -1657,7 +1657,7 @@ ROM_START( mjyougo ) ROM_LOAD( "x91c01.bin", 0x010000, 0xc000, CRC(e28e8c21) SHA1(8039d764fb48269f0cab549c5a8861c05ecb1ef1) ) ROM_CONTINUE( 0x00c000, 0x4000 ) - ROM_REGION( 0x40000, "sound", 0) /* uPD7807 code */ + ROM_REGION( 0x40000, "audio", 0) /* uPD7807 code */ ROM_LOAD( "x91a02.bin", 0x00000, 0x40000, CRC(995b1399) SHA1(262f3d7ccffdaa578466d390d790f89186b3c993) ) ROM_REGION( 0x100000, "gfx1", ROMREGION_DISPOSE ) @@ -1685,7 +1685,7 @@ ROM_START( mjkinjas ) ROM_LOAD( "x07c01.bin", 0x010000, 0xc000, CRC(e6534904) SHA1(59c092f0369fc893763ad4b96551e0b4c2430a6a) ) ROM_CONTINUE( 0x00c000, 0x4000 ) - ROM_REGION( 0x40000, "sound", 0) /* uPD7807 code */ + ROM_REGION( 0x40000, "audio", 0) /* uPD7807 code */ ROM_LOAD( "x07a02.bin", 0x00000, 0x40000, CRC(31396a5b) SHA1(c444f0a651da70c050a4c69bd09c31fc80dbf1de) ) ROM_REGION( 0x200000, "gfx1", ROMREGION_DISPOSE ) @@ -1713,7 +1713,7 @@ ROM_START( jogakuen ) ROM_LOAD( "a01.bin", 0x010000, 0xc000, CRC(a189490a) SHA1(0d9f6389d4b16c3b885cdc8be20b19db25812aad) ) ROM_CONTINUE( 0x00c000, 0x4000 ) - ROM_REGION( 0x40000, "sound", 0) /* uPD7807 code */ + ROM_REGION( 0x40000, "audio", 0) /* uPD7807 code */ ROM_LOAD( "a02.bin", 0x00000, 0x40000, CRC(033add6c) SHA1(fc6b9333722228ba4270b1ba520e32e624b251c2) ) ROM_REGION( 0x200000, "gfx1", ROMREGION_DISPOSE ) @@ -1742,7 +1742,7 @@ ROM_START( lemnangl ) ROM_LOAD( "x02_d01.16e", 0x010000, 0xc000, CRC(4c2fae05) SHA1(86516399bd1eb1565b446dfa0f9a974bde6f9af2) ) ROM_CONTINUE( 0x00c000, 0x4000 ) - ROM_REGION( 0x40000, "sound", 0) /* uPD7807 code */ + ROM_REGION( 0x40000, "audio", 0) /* uPD7807 code */ ROM_LOAD( "x02a02.9g", 0x00000, 0x40000, CRC(e9aa8c80) SHA1(6db1345e20d53d8c69cebcac3b2a973fbcaa0e63) ) ROM_REGION( 0x100000, "gfx1", ROMREGION_DISPOSE ) @@ -1770,7 +1770,7 @@ ROM_START( mjikaga ) ROM_LOAD( "m15a01.bin", 0x010000, 0xc000, CRC(938cc4fb) SHA1(f979c6eee0b72bf53be8c7ebbc4e1dc05bd447d4) ) ROM_CONTINUE( 0x00c000, 0x4000 ) - ROM_REGION( 0x40000, "sound", 0) /* uPD7807 code */ + ROM_REGION( 0x40000, "audio", 0) /* uPD7807 code */ ROM_LOAD( "m15a02.bin", 0x00000, 0x40000, CRC(375933dd) SHA1(e813f02e53dc892714cd0e81301606600b72535c) ) ROM_REGION( 0x100000, "gfx1", ROMREGION_DISPOSE ) diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 03cb01dab36..c35ea95d867 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -2105,7 +2105,7 @@ static DRIVER_INIT( samplebank ) { kaneko16_unscramble_tiles(machine, "gfx2"); kaneko16_unscramble_tiles(machine, "gfx3"); - kaneko16_expand_sample_banks(machine, "ok1"); + kaneko16_expand_sample_banks(machine, "oki1"); } diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 811df76a08d..202622e54d3 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -3738,10 +3738,10 @@ void rodland_rom_decode(int cpu) } -static void rodlandj_gfx_unmangle(int region) +static void rodlandj_gfx_unmangle(const char *region) { - UINT8 *rom = memory_region(Machine, "gfx1"+region); - int size = memory_region_length(Machine, "gfx1"+region); + UINT8 *rom = memory_region(Machine, region); + int size = memory_region_length(Machine, region); UINT8 *buffer; int i; @@ -3770,10 +3770,10 @@ static void rodlandj_gfx_unmangle(int region) free(buffer); } -static void jitsupro_gfx_unmangle(int region) +static void jitsupro_gfx_unmangle(const char *region) { - UINT8 *rom = memory_region(Machine, "gfx1"+region); - int size = memory_region_length(Machine, "gfx1"+region); + UINT8 *rom = memory_region(Machine, region); + int size = memory_region_length(Machine, region); UINT8 *buffer; int i; @@ -3923,8 +3923,8 @@ static DRIVER_INIT( jitsupro ) astyanax_rom_decode(0); // Code - jitsupro_gfx_unmangle(0); // Gfx - jitsupro_gfx_unmangle(3); + jitsupro_gfx_unmangle("gfx1"); // Gfx + jitsupro_gfx_unmangle("gfx4"); RAM[0x436/2] = 0x4e71; // protection RAM[0x438/2] = 0x4e71; // @@ -3961,8 +3961,8 @@ static DRIVER_INIT( rodland ) static DRIVER_INIT( rodlandj ) { - rodlandj_gfx_unmangle(0); - rodlandj_gfx_unmangle(3); + rodlandj_gfx_unmangle("gfx1"); + rodlandj_gfx_unmangle("gfx4"); astyanax_rom_decode(0); } diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 7e98e77af46..54a0bde270f 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -198,7 +198,7 @@ INPUT_PORTS_END static const gfx_layout tiles8x8_layout = { 8,8, - RGN_FRAC(1,1), + 0x1000*8/(16*8), 2, { 0, 1 }, { 0, 2, 4, 6, 8, 10, 12, 14 }, diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 1b784874d93..6ee91fdd219 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1087,7 +1087,7 @@ static MACHINE_DRIVER_START( ss23 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("left", "right") - MDRV_SOUND_ADD("namco", C352, 14745600) + MDRV_SOUND_ADD("c352", C352, 14745600) MDRV_SOUND_ROUTE(0, "right", 1.00) MDRV_SOUND_ROUTE(1, "left", 1.00) MDRV_SOUND_ROUTE(2, "right", 1.00) diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index c87d9638fdd..d796cd2385e 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -5022,7 +5022,7 @@ ROM_START( vandyke ) ROM_LOAD16_BYTE( "vdk-1.16", 0x00000, 0x20000, CRC(c1d01c59) SHA1(04a7fd31ca4d87d078070390660edf08bf1d96b5) ) ROM_LOAD16_BYTE( "vdk-2.15", 0x00001, 0x20000, CRC(9d741cc2) SHA1(2d101044fba5fc5b7d63869a0a053c42fdc2598b) ) - ROM_REGION(0x10000, "cpu1", 0 ) /* 64k for sound cpu code */ + ROM_REGION(0x10000, "audio", 0 ) /* 64k for sound cpu code */ ROM_LOAD( "vdk-4.127", 0x00000, 0x10000, CRC(eba544f0) SHA1(36f6d048d15a392542a9220a244d8a7049aaff8b) ) ROM_REGION( 0x010000, "gfx1", ROMREGION_DISPOSE ) @@ -5055,7 +5055,7 @@ ROM_START( vandyjal ) ROM_LOAD16_BYTE( "vdk-1.16", 0x00000, 0x20000, CRC(c1d01c59) SHA1(04a7fd31ca4d87d078070390660edf08bf1d96b5) ) ROM_LOAD16_BYTE( "jaleco2.15", 0x00001, 0x20000, CRC(170e4d2e) SHA1(6009d19d30e345fea93e039d165061e2b20ff058) ) - ROM_REGION(0x10000, "cpu1", 0 ) /* 64k for sound cpu code */ + ROM_REGION(0x10000, "audio", 0 ) /* 64k for sound cpu code */ ROM_LOAD( "vdk-4.127", 0x00000, 0x10000, CRC(eba544f0) SHA1(36f6d048d15a392542a9220a244d8a7049aaff8b) ) ROM_REGION( 0x010000, "gfx1", ROMREGION_DISPOSE ) @@ -5088,7 +5088,7 @@ ROM_START( vandyja2 ) ROM_LOAD16_BYTE( "vdk-even.16", 0x00000, 0x20000, CRC(cde05a84) SHA1(dab5981d7dad9abe86cfe011da8ca0b11d484a3f) ) /* Hand written labels, dated 2/12 */ ROM_LOAD16_BYTE( "vdk-odd.15", 0x00001, 0x20000, CRC(0f6fea40) SHA1(3acbe72c251d51b028d8c66274263a2b39b042ea) ) - ROM_REGION(0x10000, "cpu1", 0 ) /* 64k for sound cpu code */ + ROM_REGION(0x10000, "audio", 0 ) /* 64k for sound cpu code */ ROM_LOAD( "vdk-4.127", 0x00000, 0x10000, CRC(eba544f0) SHA1(36f6d048d15a392542a9220a244d8a7049aaff8b) ) ROM_REGION( 0x010000, "gfx1", ROMREGION_DISPOSE ) @@ -5223,7 +5223,7 @@ ROM_START( mustang ) ROM_LOAD16_BYTE( "2.bin", 0x00000, 0x20000, CRC(bd9f7c89) SHA1(a0af46a8ff82b90bece2515e1bd74e7a7ddf5379) ) ROM_LOAD16_BYTE( "3.bin", 0x00001, 0x20000, CRC(0eec36a5) SHA1(c549fbcd3e2741a6d0f2633ded6a85909d37f633) ) - ROM_REGION(0x10000, "cpu1", 0 ) /* 64k for sound cpu code */ + ROM_REGION(0x10000, "audio", 0 ) /* 64k for sound cpu code */ ROM_LOAD( "90058-7", 0x00000, 0x10000, CRC(920a93c8) SHA1(7660ca419e2fd98848ae7f5994994eaed023151e) ) ROM_REGION( 0x020000, "gfx1", ROMREGION_DISPOSE ) @@ -5254,7 +5254,7 @@ ROM_START( mustangs ) ROM_LOAD16_BYTE( "90058-2", 0x00000, 0x20000, CRC(833aa458) SHA1(a9924f7044397e3a36c674b064173ffae80a79ec) ) ROM_LOAD16_BYTE( "90058-3", 0x00001, 0x20000, CRC(e4b80f06) SHA1(ce589cebb5ea85c89eb44796b821a4bd0c44b9a8) ) - ROM_REGION(0x10000, "cpu1", 0 ) /* 64k for sound cpu code */ + ROM_REGION(0x10000, "audio", 0 ) /* 64k for sound cpu code */ ROM_LOAD( "90058-7", 0x00000, 0x10000, CRC(920a93c8) SHA1(7660ca419e2fd98848ae7f5994994eaed023151e) ) ROM_REGION( 0x020000, "gfx1", ROMREGION_DISPOSE ) @@ -5319,7 +5319,7 @@ ROM_START( acrobatm ) ROM_LOAD( "07_ic42.bin", 0x000000, 0x100000, CRC(5672bdaa) SHA1(5401a104d72904de19b73125451767bc63d36809) ) /* Sprites */ ROM_LOAD( "08_ic29.bin", 0x100000, 0x080000, CRC(b4c0ace3) SHA1(5d638781d588cfbf4025d002d5a2309049fe1ee5) ) - ROM_REGION( 0x10000, "cpu1", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "04_ic74.bin", 0x00000, 0x10000, CRC(176905fb) SHA1(135a184f44bedd93b293b9124fa0bd725e0ee93b) ) ROM_REGION( 0xa0000, "oki1", 0 ) /* OKIM6295 samples */ @@ -5356,7 +5356,7 @@ ROM_START( bioship ) ROM_LOAD16_BYTE( "8.ic27", 0x00000, 0x10000, CRC(75a46fea) SHA1(3d78cfc482b42779bb5aedb722c4a39cbc71bd10) ) ROM_LOAD16_BYTE( "9.ic26", 0x00001, 0x10000, CRC(d91448ee) SHA1(7f84ca3605edcab4bf226dab8dd7218cd5c3e5a4) ) - ROM_REGION( 0x10000, "cpu1", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "6.ic120", 0x00000, 0x10000, CRC(5f39a980) SHA1(2a440f86685249f9c317634cad8cdedc8a8f1491) ) ROM_REGION(0xa0000, "oki1", 0 ) /* Oki sample data */ @@ -5394,7 +5394,7 @@ ROM_START( sbsgomo ) ROM_LOAD16_BYTE( "8.ic27", 0x00000, 0x10000, CRC(75a46fea) SHA1(3d78cfc482b42779bb5aedb722c4a39cbc71bd10) ) ROM_LOAD16_BYTE( "9.ic26", 0x00001, 0x10000, CRC(d91448ee) SHA1(7f84ca3605edcab4bf226dab8dd7218cd5c3e5a4) ) - ROM_REGION( 0x10000, "cpu1", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "6.ic120", 0x00000, 0x10000, CRC(5f39a980) SHA1(2a440f86685249f9c317634cad8cdedc8a8f1491) ) ROM_REGION(0xa0000, "oki1", 0 ) /* Oki sample data */ @@ -5416,7 +5416,7 @@ ROM_START( blkheart ) ROM_LOAD16_BYTE( "blkhrt.7", 0x00000, 0x20000, CRC(5bd248c0) SHA1(0649f4f8682404aeb3fc80643fcabc2d7836bb23) ) ROM_LOAD16_BYTE( "blkhrt.6", 0x00001, 0x20000, CRC(6449e50d) SHA1(d8cd126d921c95478346da96c20da01212395d77) ) - ROM_REGION( 0x10000, "cpu1", 0 ) /* Code for (unknown?) CPU */ + ROM_REGION( 0x10000, "audio", 0 ) /* Code for (unknown?) CPU */ ROM_LOAD( "4.bin", 0x00000, 0x10000, CRC(7cefa295) SHA1(408f46613b3620cee31dec43281688d231b47ddd) ) ROM_REGION( 0x020000, "gfx1", ROMREGION_DISPOSE ) @@ -5446,7 +5446,7 @@ ROM_START( blkhearj ) ROM_LOAD16_BYTE( "7.bin", 0x00000, 0x20000, CRC(e0a5c667) SHA1(3ef39b2dc1f7ffdddf586f0b3080ecd1f362ec37) ) ROM_LOAD16_BYTE( "6.bin", 0x00001, 0x20000, CRC(7cce45e8) SHA1(72491e30d1f9be2eede21fdde5a7484d4f65cfbf) ) - ROM_REGION( 0x10000, "cpu1", 0 ) /* Code for (unknown?) CPU */ + ROM_REGION( 0x10000, "audio", 0 ) /* Code for (unknown?) CPU */ ROM_LOAD( "4.bin", 0x00000, 0x10000, CRC(7cefa295) SHA1(408f46613b3620cee31dec43281688d231b47ddd) ) ROM_REGION( 0x020000, "gfx1", ROMREGION_DISPOSE ) @@ -5485,7 +5485,7 @@ ROM_START( tdragon ) ROM_REGION( 0x100000, "gfx3", ROMREGION_DISPOSE ) ROM_LOAD16_WORD_SWAP( "91070.4", 0x000000, 0x100000, CRC(3eedc2fe) SHA1(9f48986c231a8fbc07f2b39b2017d1e967b2ed3c) ) /* Sprites */ - ROM_REGION( 0x010000, "cpu1", 0 ) /* Code for (unknown?) CPU */ + ROM_REGION( 0x010000, "audio", 0 ) /* Code for (unknown?) CPU */ ROM_LOAD( "91070.1", 0x00000, 0x10000, CRC(bf493d74) SHA1(6f8f5eff4b71fb6cabda10075cfa88a3f607859e) ) ROM_REGION( 0x0a0000, "oki1", 0 ) /* OKIM6295 samples */ @@ -5515,7 +5515,7 @@ ROM_START( tdragon1 ) ROM_REGION( 0x100000, "gfx3", ROMREGION_DISPOSE ) ROM_LOAD16_WORD_SWAP( "91070.4", 0x000000, 0x100000, CRC(3eedc2fe) SHA1(9f48986c231a8fbc07f2b39b2017d1e967b2ed3c) ) /* Sprites */ - ROM_REGION( 0x010000, "cpu1", 0 ) /* Code for (unknown?) CPU */ + ROM_REGION( 0x010000, "audio", 0 ) /* Code for (unknown?) CPU */ ROM_LOAD( "91070.1", 0x00000, 0x10000, CRC(bf493d74) SHA1(6f8f5eff4b71fb6cabda10075cfa88a3f607859e) ) ROM_REGION( 0x0a0000, "oki1", 0 ) /* OKIM6295 samples */ @@ -5682,7 +5682,7 @@ ROM_START( strahl ) ROM_REGION( 0x80000, "gfx4", ROMREGION_DISPOSE ) ROM_LOAD( "str6b1w1.776", 0x000000, 0x80000, CRC(bb1bb155) SHA1(83a02e89180e15f0e7817e0e92b4bf4e209bb69a) ) /* Tiles */ - ROM_REGION( 0x10000, "cpu1", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "strahl-4.66", 0x00000, 0x10000, CRC(60a799c4) SHA1(8ade3cf827a389f7cb4080957dc4d67077ea4166) ) ROM_REGION( 0xa0000, "oki1", 0 ) /* Oki sample data */ @@ -5713,7 +5713,7 @@ ROM_START( strahla ) ROM_REGION( 0x80000, "gfx4", ROMREGION_DISPOSE ) ROM_LOAD( "str6b1w1.776", 0x000000, 0x80000, CRC(bb1bb155) SHA1(83a02e89180e15f0e7817e0e92b4bf4e209bb69a) ) /* Tiles */ - ROM_REGION( 0x10000, "cpu1", 0 ) + ROM_REGION( 0x10000, "audio", 0 ) ROM_LOAD( "strahl-4.66", 0x00000, 0x10000, CRC(60a799c4) SHA1(8ade3cf827a389f7cb4080957dc4d67077ea4166) ) ROM_REGION( 0xa0000, "oki1", 0 ) /* Oki sample data */ @@ -5730,7 +5730,7 @@ ROM_START( hachamf ) ROM_LOAD16_BYTE( "hmf_07.rom", 0x00000, 0x20000, CRC(9d847c31) SHA1(1d370d8db9cadadb9c2cb213e32f681947d81b7f) ) ROM_LOAD16_BYTE( "hmf_06.rom", 0x00001, 0x20000, CRC(de6408a0) SHA1(2df77fecd44d2d8b0444abd4545923213ed76b2d) ) - ROM_REGION( 0x10000, "cpu1", 0 ) /* unknown - sound cpu ?????? */ + ROM_REGION( 0x10000, "audio", 0 ) /* unknown - sound cpu ?????? */ ROM_LOAD( "hmf_01.rom", 0x00000, 0x10000, CRC(9e6f48fc) SHA1(aeb5bfecc025b5478f6de874792fc0f7f54932be) ) ROM_REGION( 0x020000, "gfx1", ROMREGION_DISPOSE ) @@ -5756,7 +5756,7 @@ ROM_START( macross ) ROM_REGION( 0x80000, "main", 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "921a03", 0x00000, 0x80000, CRC(33318d55) SHA1(c99f85e09bd334dc8ce138b08cbed2331b0d67dd) ) - ROM_REGION( 0x10000, "cpu1", 0 ) /* sound program (unknown CPU) */ + ROM_REGION( 0x10000, "audio", 0 ) /* sound program (unknown CPU) */ ROM_LOAD( "921a02", 0x00000, 0x10000, CRC(77c082c7) SHA1(be07aa14d0116f830f98e11a19f1debb48a5230e) ) ROM_REGION( 0x020000, "gfx1", ROMREGION_DISPOSE ) @@ -5797,7 +5797,7 @@ ROM_START( gunnail ) ROM_LOAD16_BYTE( "3e.bin", 0x00000, 0x40000, CRC(61d985b2) SHA1(96daca603f18accb47f98a3e584b2c84fc5a2ca4) ) ROM_LOAD16_BYTE( "3o.bin", 0x00001, 0x40000, CRC(f114e89c) SHA1(a12f5278167f446bb5277e87289c41b5aa365c86) ) - ROM_REGION( 0x10000, "cpu1", 0 ) /* Code for (unknown?) CPU */ + ROM_REGION( 0x10000, "audio", 0 ) /* Code for (unknown?) CPU */ ROM_LOAD( "92077_2.bin", 0x00000, 0x10000, CRC(cd4e55f8) SHA1(92182767ca0ec37ec4949bd1a88c2efdcdcb60ed) ) ROM_REGION( 0x020000, "gfx1", ROMREGION_DISPOSE ) diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c index 99facdf2843..194b2c783a9 100644 --- a/src/mame/drivers/quizpani.c +++ b/src/mame/drivers/quizpani.c @@ -243,7 +243,7 @@ GFXDECODE_END static MACHINE_RESET( quizpani ) { - NMK112_init(0, "oki1", "oki2"); + NMK112_init(0, "oki", "oki"); } static MACHINE_DRIVER_START( quizpani ) diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index ca1d748fda8..27308f9b95f 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -208,7 +208,7 @@ VIDEO_START( bwing ) fill_srxlat(srxlat); - fgdata = memory_region(machine, "user1"); + fgdata = memory_region(machine, "gpu"); bgdata = fgdata + 0x1000; for (i=0; i<4; i++) srbase[i] = fgdata + i * 0x2000; diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c index 0cbded863d0..ac9bb9c8bf1 100644 --- a/src/mame/video/nbmj8891.c +++ b/src/mame/video/nbmj8891.c @@ -494,7 +494,7 @@ static void nbmj8891_gfxdraw(running_machine *machine) ******************************************************************************/ VIDEO_START( nbmj8891_1layer ) { - UINT8 *CLUT = memory_region(machine, "user1"); + UINT8 *CLUT = memory_region(machine, "protection"); int i; int width = video_screen_get_width(machine->primary_screen); int height = video_screen_get_height(machine->primary_screen);