summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-07-09 07:10:40 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-07-09 07:10:40 +0000
commit5201d52344024ddc2f3288cf090b9a6ee37bc342 (patch)
treecc333fd344bd72055f1f71ba6bb7df1f3c997ebc /src
parent2577a0b22d7b5d43ea7078e5ff9cfd0ae47a3a69 (diff)
Expanded address maps from 3 to 4. Moved ADDRESS_SPACE_PROGRAM/DATA/IO
constants to cpuintrf, as those names are really only applicable to CPUs. Added new ADDRESS_MAP_0/1/2/3 constants to identify address maps more generically. Updated memory system to be more general about address map handling. Added the concept of default address maps (in addition to the already existing internal memory maps). The difference between internal and default memory maps is that internal memory maps always override everything (including user-specified maps), but default memory maps simply provide a default that can be overridden. Converted the okim6295 sound driver to use address maps for access. By default, it defines a ROM address map that overlays its full region. As a result, the validity checks require all okim6295 regions to be at least 256k, unless you provide your own address map. Updated all regions to meet this requirement. Updated the atarijsa code to use a custom address space for its okim6295 accesses (which are banked on the first half and static on the second half), as an example of configuring a device with a custom address space. For now, attempts to use okim6295_set_bank_base() will still work, though banking for the okim chips should be moved to custom address maps in the drivers eventually. The first time okim6295_set_bank_base() is called, it will install a banked memory handler over the region and use memory_set_bankptr() to change the base on subsequent bank switches. Moved address map validity checks to be run for each device instead of just each CPU.
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpu/drcuml.h2
-rw-r--r--src/emu/cpuintrf.h21
-rw-r--r--src/emu/devintrf.h61
-rw-r--r--src/emu/memory.c30
-rw-r--r--src/emu/memory.h10
-rw-r--r--src/emu/sound/okim6295.c95
-rw-r--r--src/emu/sound/okim6295.h1
-rw-r--r--src/emu/validity.c290
-rw-r--r--src/mame/audio/atarijsa.c63
-rw-r--r--src/mame/drivers/actfancr.c10
-rw-r--r--src/mame/drivers/atarig1.c6
-rw-r--r--src/mame/drivers/atarig42.c14
-rw-r--r--src/mame/drivers/atarigx2.c108
-rw-r--r--src/mame/drivers/batman.c10
-rw-r--r--src/mame/drivers/beathead.c10
-rw-r--r--src/mame/drivers/blockout.c10
-rw-r--r--src/mame/drivers/bloodbro.c8
-rw-r--r--src/mame/drivers/cbuster.c16
-rw-r--r--src/mame/drivers/cninja.c23
-rw-r--r--src/mame/drivers/cowrace.c2
-rw-r--r--src/mame/drivers/cps1.c8
-rw-r--r--src/mame/drivers/crospang.c2
-rw-r--r--src/mame/drivers/darkseal.c20
-rw-r--r--src/mame/drivers/dassault.c6
-rw-r--r--src/mame/drivers/dcon.c2
-rw-r--r--src/mame/drivers/ddenlovr.c2
-rw-r--r--src/mame/drivers/dec0.c48
-rw-r--r--src/mame/drivers/dooyong.c10
-rw-r--r--src/mame/drivers/dunhuang.c2
-rw-r--r--src/mame/drivers/dynduke.c8
-rw-r--r--src/mame/drivers/eprom.c6
-rw-r--r--src/mame/drivers/esd16.c12
-rw-r--r--src/mame/drivers/fitfight.c2
-rw-r--r--src/mame/drivers/funkyjet.c6
-rw-r--r--src/mame/drivers/gaiden.c18
-rw-r--r--src/mame/drivers/goldstar.c6
-rw-r--r--src/mame/drivers/harddriv.c40
-rw-r--r--src/mame/drivers/igs009.c4
-rw-r--r--src/mame/drivers/itech8.c40
-rw-r--r--src/mame/drivers/itgamble.c4
-rw-r--r--src/mame/drivers/klax.c10
-rw-r--r--src/mame/drivers/koftball.c2
-rw-r--r--src/mame/drivers/legionna.c14
-rw-r--r--src/mame/drivers/lemmings.c2
-rw-r--r--src/mame/drivers/madmotor.c4
-rw-r--r--src/mame/drivers/metro.c20
-rw-r--r--src/mame/drivers/missb2.c2
-rw-r--r--src/mame/drivers/nmg5.c4
-rw-r--r--src/mame/drivers/nmk16.c8
-rw-r--r--src/mame/drivers/pass.c2
-rw-r--r--src/mame/drivers/pktgaldx.c6
-rw-r--r--src/mame/drivers/powerbal.c2
-rw-r--r--src/mame/drivers/raiden.c8
-rw-r--r--src/mame/drivers/sengokmj.c2
-rw-r--r--src/mame/drivers/snowbros.c6
-rw-r--r--src/mame/drivers/spbactn.c4
-rw-r--r--src/mame/drivers/stadhero.c2
-rw-r--r--src/mame/drivers/subsino.c8
-rw-r--r--src/mame/drivers/supbtime.c8
-rw-r--r--src/mame/drivers/tatsumi.c4
-rw-r--r--src/mame/drivers/tecmo16.c8
-rw-r--r--src/mame/drivers/toki.c10
-rw-r--r--src/mame/drivers/tumbleb.c4
-rw-r--r--src/mame/drivers/tumblep.c4
-rw-r--r--src/mame/drivers/vaportra.c12
-rw-r--r--src/mame/drivers/vball.c6
-rw-r--r--src/mame/drivers/yunsun16.c4
67 files changed, 669 insertions, 533 deletions
diff --git a/src/emu/cpu/drcuml.h b/src/emu/cpu/drcuml.h
index 172f906d5fb..2fca1928410 100644
--- a/src/emu/cpu/drcuml.h
+++ b/src/emu/cpu/drcuml.h
@@ -15,7 +15,7 @@
#ifndef __DRCUML_H__
#define __DRCUML_H__
-#include "memory.h"
+#include "cpuintrf.h"
#include "drccache.h"
#include <setjmp.h>
diff --git a/src/emu/cpuintrf.h b/src/emu/cpuintrf.h
index ab76e0494d3..009b3bb89d3 100644
--- a/src/emu/cpuintrf.h
+++ b/src/emu/cpuintrf.h
@@ -28,6 +28,15 @@
#define MAX_INPUT_EVENTS 32
+/* alternate address space names for common use */
+enum
+{
+ ADDRESS_SPACE_PROGRAM = ADDRESS_SPACE_0, /* program address space */
+ ADDRESS_SPACE_DATA = ADDRESS_SPACE_1, /* data address space */
+ ADDRESS_SPACE_IO = ADDRESS_SPACE_2 /* I/O address space */
+};
+
+
/* I/O line states */
enum
{
@@ -432,10 +441,14 @@ union _cpuinfo
cpu_string_io_func export_string; /* CPUINFO_FCT_EXPORT_STRING */
int * icount; /* CPUINFO_PTR_INSTRUCTION_COUNTER */
const cpu_state_table * state_table; /* CPUINFO_PTR_STATE_TABLE */
- const addrmap8_token * internal_map8; /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
- const addrmap16_token * internal_map16; /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
- const addrmap32_token * internal_map32; /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
- const addrmap64_token * internal_map64; /* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap8_token * internal_map8; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap16_token * internal_map16; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap32_token * internal_map32; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap64_token * internal_map64; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap8_token * default_map8; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
+ const addrmap16_token * default_map16; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
+ const addrmap32_token * default_map32; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
+ const addrmap64_token * default_map64; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
};
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index 48fe055d5fb..b6cc6313628 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -54,10 +54,22 @@ enum
DEVINFO_INT_ENDIANNESS, /* R/O: either ENDIANNESS_BIG or ENDIANNESS_LITTLE */
DEVINFO_INT_DATABUS_WIDTH, /* R/O: data bus size for each address space (8,16,32,64) */
+ DEVINFO_INT_DATABUS_WIDTH_0 = DEVINFO_INT_DATABUS_WIDTH + 0,
+ DEVINFO_INT_DATABUS_WIDTH_1 = DEVINFO_INT_DATABUS_WIDTH + 1,
+ DEVINFO_INT_DATABUS_WIDTH_2 = DEVINFO_INT_DATABUS_WIDTH + 2,
+ DEVINFO_INT_DATABUS_WIDTH_3 = DEVINFO_INT_DATABUS_WIDTH + 3,
DEVINFO_INT_DATABUS_WIDTH_LAST = DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACES - 1,
DEVINFO_INT_ADDRBUS_WIDTH, /* R/O: address bus size for each address space (12-32) */
+ DEVINFO_INT_ADDRBUS_WIDTH_0 = DEVINFO_INT_ADDRBUS_WIDTH + 0,
+ DEVINFO_INT_ADDRBUS_WIDTH_1 = DEVINFO_INT_ADDRBUS_WIDTH + 1,
+ DEVINFO_INT_ADDRBUS_WIDTH_2 = DEVINFO_INT_ADDRBUS_WIDTH + 2,
+ DEVINFO_INT_ADDRBUS_WIDTH_3 = DEVINFO_INT_ADDRBUS_WIDTH + 3,
DEVINFO_INT_ADDRBUS_WIDTH_LAST = DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACES - 1,
DEVINFO_INT_ADDRBUS_SHIFT, /* R/O: shift applied to addresses each address space (+3 means >>3, -1 means <<1) */
+ DEVINFO_INT_ADDRBUS_SHIFT_0 = DEVINFO_INT_ADDRBUS_SHIFT + 0,
+ DEVINFO_INT_ADDRBUS_SHIFT_1 = DEVINFO_INT_ADDRBUS_SHIFT + 1,
+ DEVINFO_INT_ADDRBUS_SHIFT_2 = DEVINFO_INT_ADDRBUS_SHIFT + 2,
+ DEVINFO_INT_ADDRBUS_SHIFT_3 = DEVINFO_INT_ADDRBUS_SHIFT + 3,
DEVINFO_INT_ADDRBUS_SHIFT_LAST = DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACES - 1,
DEVINFO_INT_CLASS_SPECIFIC = 0x04000, /* R/W: device-specific values start here */
@@ -72,8 +84,19 @@ enum
DEVINFO_PTR_CONTRACT_LIST, /* R/O: pointer to list of supported device contracts */
DEVINFO_PTR_INTERNAL_MEMORY_MAP, /* R/O: const addrmap_token *map */
+ DEVINFO_PTR_INTERNAL_MEMORY_MAP_0 = DEVINFO_PTR_INTERNAL_MEMORY_MAP + 0,
+ DEVINFO_PTR_INTERNAL_MEMORY_MAP_1 = DEVINFO_PTR_INTERNAL_MEMORY_MAP + 1,
+ DEVINFO_PTR_INTERNAL_MEMORY_MAP_2 = DEVINFO_PTR_INTERNAL_MEMORY_MAP + 2,
+ DEVINFO_PTR_INTERNAL_MEMORY_MAP_3 = DEVINFO_PTR_INTERNAL_MEMORY_MAP + 3,
DEVINFO_PTR_INTERNAL_MEMORY_MAP_LAST = DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACES - 1,
+ DEVINFO_PTR_DEFAULT_MEMORY_MAP, /* R/O: const addrmap_token *map */
+ DEVINFO_PTR_DEFAULT_MEMORY_MAP_0 = DEVINFO_PTR_DEFAULT_MEMORY_MAP + 0,
+ DEVINFO_PTR_DEFAULT_MEMORY_MAP_1 = DEVINFO_PTR_DEFAULT_MEMORY_MAP + 1,
+ DEVINFO_PTR_DEFAULT_MEMORY_MAP_2 = DEVINFO_PTR_DEFAULT_MEMORY_MAP + 2,
+ DEVINFO_PTR_DEFAULT_MEMORY_MAP_3 = DEVINFO_PTR_DEFAULT_MEMORY_MAP + 3,
+ DEVINFO_PTR_DEFAULT_MEMORY_MAP_LAST = DEVINFO_PTR_DEFAULT_MEMORY_MAP + ADDRESS_SPACES - 1,
+
DEVINFO_PTR_CLASS_SPECIFIC = 0x14000, /* R/W: device-specific values start here */
DEVINFO_PTR_DEVICE_SPECIFIC = 0x18000, /* R/W: device-specific values start here */
DEVINFO_PTR_LAST = 0x1ffff,
@@ -243,21 +266,29 @@ typedef device_get_info_func device_type;
/* the actual deviceinfo union */
union _deviceinfo
{
- INT64 i; /* generic integers */
- void * p; /* generic pointers */
- genf * f; /* generic function pointers */
- char * s; /* generic strings */
-
- device_start_func start; /* DEVINFO_FCT_START */
- device_stop_func stop; /* DEVINFO_FCT_STOP */
- device_reset_func reset; /* DEVINFO_FCT_RESET */
- device_execute_func execute; /* DEVINFO_FCT_EXECUTE */
- device_validity_check_func validity_check; /* DEVINFO_FCT_VALIDITY_CHECK */
- device_custom_config_func custom_config; /* DEVINFO_FCT_CUSTOM_CONFIG */
- device_nvram_func nvram; /* DEVINFO_FCT_NVRAM */
- const rom_entry * romregion; /* DEVINFO_PTR_ROM_REGION */
- const union _machine_config_token *machine_config;/* DEVINFO_PTR_MACHINE_CONFIG */
- const device_contract * contract_list; /* DEVINFO_PTR_CONTRACT_LIST */
+ INT64 i; /* generic integers */
+ void * p; /* generic pointers */
+ genf * f; /* generic function pointers */
+ char * s; /* generic strings */
+
+ device_start_func start; /* DEVINFO_FCT_START */
+ device_stop_func stop; /* DEVINFO_FCT_STOP */
+ device_reset_func reset; /* DEVINFO_FCT_RESET */
+ device_execute_func execute; /* DEVINFO_FCT_EXECUTE */
+ device_validity_check_func validity_check; /* DEVINFO_FCT_VALIDITY_CHECK */
+ device_custom_config_func custom_config; /* DEVINFO_FCT_CUSTOM_CONFIG */
+ device_nvram_func nvram; /* DEVINFO_FCT_NVRAM */
+ const rom_entry * romregion; /* DEVINFO_PTR_ROM_REGION */
+ const union _machine_config_token *machine_config; /* DEVINFO_PTR_MACHINE_CONFIG */
+ const device_contract * contract_list; /* DEVINFO_PTR_CONTRACT_LIST */
+ const addrmap8_token * internal_map8; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap16_token * internal_map16; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap32_token * internal_map32; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap64_token * internal_map64; /* DEVINFO_PTR_INTERNAL_MEMORY_MAP */
+ const addrmap8_token * default_map8; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
+ const addrmap16_token * default_map16; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
+ const addrmap32_token * default_map32; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
+ const addrmap64_token * default_map64; /* DEVINFO_PTR_DEFAULT_MEMORY_MAP */
};
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 7a868a9ffbb..f2b224cdde4 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -765,6 +765,7 @@ const address_space *memory_find_address_space(const device_config *device, int
address_map *address_map_alloc(const device_config *device, const game_driver *driver, int spacenum)
{
const addrmap_token *internal_map;
+ const addrmap_token *default_map;
address_map *map;
map = alloc_clear_or_die(address_map);
@@ -778,6 +779,11 @@ address_map *address_map_alloc(const device_config *device, const game_driver *d
if (device->address_map[spacenum] != NULL)
map_detokenize(map, driver, device->tag, device->address_map[spacenum]);
+ /* append the default device map (last so it can be overridden) */
+ default_map = (const addrmap_token *)device_get_info_ptr(device, DEVINFO_PTR_DEFAULT_MEMORY_MAP + spacenum);
+ if (default_map != NULL)
+ map_detokenize(map, driver, device->tag, default_map);
+
return map;
}
@@ -1138,6 +1144,24 @@ void memory_set_bankptr(running_machine *machine, int banknum, void *base)
}
+/*-------------------------------------------------
+ memory_find_unused_bank - return the index of
+ an unused bank
+-------------------------------------------------*/
+
+int memory_find_unused_bank(running_machine *machine)
+{
+ memory_private *memdata = machine->memory_data;
+ int banknum;
+
+ for (banknum = STATIC_BANK1; banknum <= MAX_EXPLICIT_BANKS; banknum++)
+ if (!memdata->bankdata[banknum].used)
+ return banknum;
+
+ return -1;
+}
+
+
/***************************************************************************
DYNAMIC ADDRESS SPACE MAPPING
@@ -1600,7 +1624,7 @@ static void memory_init_preflight(running_machine *machine)
/* loop over valid address spaces */
for (space = (address_space *)memdata->spacelist; space != NULL; space = (address_space *)space->next)
{
- int regionsize = (space->spacenum == ADDRESS_SPACE_PROGRAM) ? memory_region_length(space->machine, space->cpu->tag) : 0;
+ int regionsize = (space->spacenum == ADDRESS_SPACE_0) ? memory_region_length(space->machine, space->cpu->tag) : 0;
address_map_entry *entry;
int entrynum;
@@ -1626,7 +1650,7 @@ static void memory_init_preflight(running_machine *machine)
adjust_addresses(space, &entry->bytestart, &entry->byteend, &entry->bytemask, &entry->bytemirror);
/* if this is a ROM handler without a specified region, attach it to the implicit region */
- if (space->spacenum == ADDRESS_SPACE_PROGRAM && HANDLER_IS_ROM(entry->read.generic) && entry->region == NULL)
+ if (space->spacenum == ADDRESS_SPACE_0 && HANDLER_IS_ROM(entry->read.generic) && entry->region == NULL)
{
/* make sure it fits within the memory region before doing so, however */
if (entry->byteend < regionsize)
@@ -2326,7 +2350,7 @@ static int space_needs_backing_store(const address_space *space, const address_m
{
if (handler != STATIC_INVALID &&
(handler < STATIC_BANK1 || handler > STATIC_BANK1 + MAX_BANKS - 1) &&
- (handler != STATIC_ROM || space->spacenum != ADDRESS_SPACE_PROGRAM || entry->addrstart >= memory_region_length(space->machine, space->cpu->tag)) &&
+ (handler != STATIC_ROM || space->spacenum != ADDRESS_SPACE_0 || entry->addrstart >= memory_region_length(space->machine, space->cpu->tag)) &&
handler != STATIC_NOP &&
handler != STATIC_UNMAP)
return TRUE;
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 06661c744de..55ec17a49e3 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -27,9 +27,10 @@
/* address spaces */
enum
{
- ADDRESS_SPACE_PROGRAM = 0, /* program address space */
- ADDRESS_SPACE_DATA, /* data address space */
- ADDRESS_SPACE_IO, /* I/O address space */
+ ADDRESS_SPACE_0, /* first address space */
+ ADDRESS_SPACE_1, /* second address space */
+ ADDRESS_SPACE_2, /* third address space */
+ ADDRESS_SPACE_3, /* fourth address space */
ADDRESS_SPACES /* maximum number of address spaces */
};
@@ -854,6 +855,9 @@ int memory_get_bank(running_machine *machine, int banknum) ATTR_NONNULL(1);
/* set the absolute address of a bank base */
void memory_set_bankptr(running_machine *machine, int banknum, void *base) ATTR_NONNULL(1, 3);
+/* return the index of an unused bank */
+int memory_find_unused_bank(running_machine *machine) ATTR_NONNULL(1);
+
/* ----- dynamic address space mapping ----- */
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index c07028d60ee..c93bcbf297a 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -48,9 +48,10 @@ struct _okim6295_state
{
#define OKIM6295_VOICES 4
struct ADPCMVoice voice[OKIM6295_VOICES];
+ const device_config *device;
INT32 command;
- INT32 bank_offset;
- UINT8 *region_base; /* pointer to the base of the region */
+ INT32 bank_num;
+ INT32 bank_offs;
sound_stream *stream; /* which stream are we playing on? */
UINT32 master_clock; /* master clock frequency */
};
@@ -91,6 +92,11 @@ static int tables_computed = 0;
const okim6295_interface okim6295_interface_pin7high = { 1 };
const okim6295_interface okim6295_interface_pin7low = { 0 };
+/* default address map */
+static ADDRESS_MAP_START( okim6295, 0, 8 )
+ AM_RANGE(0x00000, 0x3ffff) AM_ROM
+ADDRESS_MAP_END
+
INLINE okim6295_state *get_safe_token(const device_config *device)
{
@@ -202,7 +208,7 @@ static void generate_adpcm(okim6295_state *chip, struct ADPCMVoice *voice, INT16
/* if this voice is active */
if (voice->playing)
{
- UINT8 *base = chip->region_base + chip->bank_offset + voice->base_offset;
+ offs_t base = voice->base_offset;
int sample = voice->sample;
int count = voice->count;
@@ -210,7 +216,7 @@ static void generate_adpcm(okim6295_state *chip, struct ADPCMVoice *voice, INT16
while (samples)
{
/* compute the new amplitude and update the current step */
- int nibble = base[sample / 2] >> (((sample & 1) << 2) ^ 4);
+ int nibble = memory_raw_read_byte(chip->device->space[0], base + sample / 2) >> (((sample & 1) << 2) ^ 4);
/* output to the buffer, scaling by the volume */
/* signal in range -2048..2047, volume in range 2..32 => signal * volume / 2 in range -32768..32767 */
@@ -309,14 +315,23 @@ static void adpcm_state_save_register(struct ADPCMVoice *voice, const device_con
state_save_register_device_item(device, index, voice->base_offset);
}
+static STATE_POSTLOAD( okim6295_postload )
+{
+ const device_config *device = (const device_config *)param;
+ okim6295_state *info = get_safe_token(device);
+ okim6295_set_bank_base(device, info->bank_offs);
+}
+
static void okim6295_state_save_register(okim6295_state *info, const device_config *device)
{
int j;
state_save_register_device_item(device, 0, info->command);
- state_save_register_device_item(device, 0, info->bank_offset);
+ state_save_register_device_item(device, 0, info->bank_offs);
for (j = 0; j < OKIM6295_VOICES; j++)
adpcm_state_save_register(&info->voice[j], device, j);
+
+ state_save_register_postload(device->machine, okim6295_postload, (void *)device);
}
@@ -331,16 +346,15 @@ static DEVICE_START( okim6295 )
{
const okim6295_interface *intf = (const okim6295_interface *)device->static_config;
okim6295_state *info = get_safe_token(device);
- int voice;
int divisor = intf->pin7 ? 132 : 165;
+ int voice;
compute_tables();
info->command = -1;
- info->bank_offset = 0;
- info->region_base = device->region;
- if (intf->rgnoverride != NULL)
- info->region_base = memory_region(device->machine, intf->rgnoverride);
+ info->bank_num = -1;
+ info->bank_offs = 0;
+ info->device = device;
info->master_clock = device->clock;
@@ -388,7 +402,24 @@ void okim6295_set_bank_base(const device_config *device, int base)
{
okim6295_state *info = get_safe_token(device);
stream_update(info->stream);
- info->bank_offset = base;
+
+ /* if we are setting a non-zero base, and we have no bank, allocate one */
+ if (info->bank_num == -1 && base != 0)
+ {
+ info->bank_num = memory_find_unused_bank(device->machine);
+ if (info->bank_num == -1)
+ fatalerror("Unable to allocate bank for oki6295 device '%s'", device->tag);
+
+ /* override our memory map with a bank */
+ memory_install_read8_handler(device->space[0], 0x00000, 0x3ffff, 0, 0, SMH_BANK(info->bank_num));
+ }
+
+ /* if we have a bank number, set the base pointer */
+ if (info->bank_num != -1)
+ {
+ info->bank_offs = base;
+ memory_set_bankptr(device->machine, info->bank_num, device->region + base);
+ }
}
@@ -451,8 +482,7 @@ WRITE8_DEVICE_HANDLER( okim6295_w )
if (info->command != -1)
{
int temp = data >> 4, i, start, stop;
- unsigned char *base;
-
+ offs_t base;
/* the manual explicitly says that it's not possible to start multiple voices at the same time */
if (temp != 0 && temp != 1 && temp != 2 && temp != 4 && temp != 8)
@@ -469,9 +499,17 @@ WRITE8_DEVICE_HANDLER( okim6295_w )
struct ADPCMVoice *voice = &info->voice[i];
/* determine the start/stop positions */
- base = &info->region_base[info->bank_offset + info->command * 8];
- start = ((base[0] << 16) + (base[1] << 8) + base[2]) & 0x3ffff;
- stop = ((base[3] << 16) + (base[4] << 8) + base[5]) & 0x3ffff;
+ base = info->command * 8;
+
+ start = memory_raw_read_byte(device->space[0], base + 0) << 16;
+ start |= memory_raw_read_byte(device->space[0], base + 1) << 8;
+ start |= memory_raw_read_byte(device->space[0], base + 2) << 0;
+ start &= 0x3ffff;
+
+ stop = memory_raw_read_byte(device->space[0], base + 3) << 16;
+ stop |= memory_raw_read_byte(device->space[0], base + 4) << 8;
+ stop |= memory_raw_read_byte(device->space[0], base + 5) << 0;
+ stop &= 0x3ffff;
/* set up the voice to play this sample */
if (start < stop)
@@ -543,18 +581,23 @@ DEVICE_GET_INFO( okim6295 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(okim6295_state); break;
-
- /* --- the following bits of info are returned as pointers to data or functions --- */
- case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( okim6295 ); break;
- case DEVINFO_FCT_STOP: /* nothing */ break;
- case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( okim6295 ); break;
+ case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(okim6295_state); break;
+ case DEVINFO_INT_DATABUS_WIDTH_0: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH_0: info->i = 18; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT_0: info->i = 0; break;
+
+ /* --- the following bits of info are returned as pointers to data --- */
+ case DEVINFO_PTR_DEFAULT_MEMORY_MAP_0: info->default_map8 = ADDRESS_MAP_NAME(okim6295);break;
+
+ /* --- the following bits of info are returned as pointers to functions --- */
+ case DEVINFO_FCT_START: info->start = DEVICE_START_NAME( okim6295 ); break;
+ case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME( okim6295 ); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
- case DEVINFO_STR_NAME: strcpy(info->s, "OKI6295"); break;
- case DEVINFO_STR_FAMILY: strcpy(info->s, "OKI ADPCM"); break;
- case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
- case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case DEVINFO_STR_NAME: strcpy(info->s, "OKI6295"); break;
+ case DEVINFO_STR_FAMILY: strcpy(info->s, "OKI ADPCM"); break;
+ case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
+ case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
}
}
diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h
index d9e27938eca..3175066dded 100644
--- a/src/emu/sound/okim6295.h
+++ b/src/emu/sound/okim6295.h
@@ -13,7 +13,6 @@ typedef struct _okim6295_interface okim6295_interface;
struct _okim6295_interface
{
int pin7;
- const char *rgnoverride;
};
extern const okim6295_interface okim6295_interface_pin7high;
diff --git a/src/emu/validity.c b/src/emu/validity.c
index 83517646af8..4a4c8041c1d 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -744,7 +744,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
validate_cpu - validate CPUs and memory maps
-------------------------------------------------*/
-static int validate_cpu(int drivnum, const machine_config *config, const input_port_config *portlist, region_info *rgninfo)
+static int validate_cpu(int drivnum, const machine_config *config)
{
const game_driver *driver = drivers[drivnum];
cpu_validity_check_func cpu_validity_check;
@@ -755,7 +755,6 @@ static int validate_cpu(int drivnum, const machine_config *config, const input_p
for (device = cpu_first(config); device != NULL; device = cpu_next(device))
{
const cpu_config *cpuconfig = (const cpu_config *)device->inline_config;
- int spacenum;
/* check the CPU for incompleteness */
if (device_get_info_fct(device, CPUINFO_FCT_RESET) == NULL ||
@@ -771,160 +770,46 @@ static int validate_cpu(int drivnum, const machine_config *config, const input_p
if (cpu_validity_check != NULL && (*cpu_validity_check)(driver, device->static_config))
error = TRUE;
- /* loop over all address spaces */
- for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
+ /* validate the interrupts */
+ if (cpuconfig->vblank_interrupt != NULL)
{
-#define SPACE_SHIFT(a) ((addr_shift < 0) ? ((a) << -addr_shift) : ((a) >> addr_shift))
-#define SPACE_SHIFT_END(a) ((addr_shift < 0) ? (((a) << -addr_shift) | ((1 << -addr_shift) - 1)) : ((a) >> addr_shift))
- int databus_width = cpu_get_databus_width(device, spacenum);
- int addr_shift = cpu_get_addrbus_shift(device, spacenum);
- int alignunit = databus_width/8;
- address_map_entry *entry;
- address_map *map;
-
- /* construct the maps */
- map = address_map_alloc(device, driver, spacenum);
-
- /* if this is an empty map, just skip it */
- if (map->entrylist == NULL)
+ if (video_screen_count(config) == 0)
{
- address_map_free(map);
- continue;
- }
-
- /* validate the global map parameters */
- if (map->spacenum != spacenum)
- {
- mame_printf_error("%s: %s CPU '%s' space %d has address space %d handlers!\n", driver->source_file, driver->name, device->tag, spacenum, map->spacenum);
- error = TRUE;
- }
- if (map->databits != databus_width)
- {
- mame_printf_error("%s: %s cpu '%s' uses wrong memory handlers for %s space! (width = %d, memory = %08x)\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], databus_width, map->databits);
+ mame_printf_error("%s: %s cpu '%s' has a VBLANK interrupt, but the driver is screenless !\n", driver->source_file, driver->name, device->tag);
error = TRUE;
}
-
- /* loop over entries and look for errors */
- for (entry = map->entrylist; entry != NULL; entry = entry->next)
- {
- UINT32 bytestart = SPACE_SHIFT(entry->addrstart);
- UINT32 byteend = SPACE_SHIFT_END(entry->addrend);
-
- /* look for inverted start/end pairs */
- if (byteend < bytestart)
- {
- mame_printf_error("%s: %s wrong %s memory read handler start = %08x > end = %08x\n", driver->source_file, driver->name, address_space_names[spacenum], entry->addrstart, entry->addrend);
- error = TRUE;
- }
-
- /* look for misaligned entries */
- if ((bytestart & (alignunit - 1)) != 0 || (byteend & (alignunit - 1)) != (alignunit - 1))
- {
- mame_printf_error("%s: %s wrong %s memory read handler start = %08x, end = %08x ALIGN = %d\n", driver->source_file, driver->name, address_space_names[spacenum], entry->addrstart, entry->addrend, alignunit);
- error = TRUE;
- }
-
- /* if this is a program space, auto-assign implicit ROM entries */
- if ((FPTR)entry->read.generic == STATIC_ROM && entry->region == NULL)
- {
- entry->region = device->tag;
- entry->rgnoffs = entry->addrstart;
- }
-
- /* if this entry references a memory region, validate it */
- if (entry->region != NULL && entry->share == 0)
- {
- int rgnnum;
-
- /* loop over entries in the class */
- for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries); rgnnum++)
- {
- /* stop if we hit an empty */
- if (rgninfo->entries[rgnnum].tag == NULL)
- {
- mame_printf_error("%s: %s CPU '%s' %s space memory map entry %X-%X references non-existant region '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->addrstart, entry->addrend, entry->region);
- error = TRUE;
- break;
- }
-
- /* if we hit a match, check against the length */
- if (astring_cmpc(rgninfo->entries[rgnnum].tag, entry->region) == 0)
- {
- offs_t length = rgninfo->entries[rgnnum].length;
- if (entry->rgnoffs + (byteend - bytestart + 1) > length)
- {
- mame_printf_error("%s: %s CPU '%s' %s space memory map entry %X-%X extends beyond region '%s' size (%X)\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->addrstart, entry->addrend, entry->region, length);
- error = TRUE;
- }
- break;
- }
- }
- }
-
- /* make sure all devices exist */
- if (entry->read_devtag != NULL && device_list_find_by_tag(config->devicelist, entry->read_devtag) == NULL)
- {
- mame_printf_error("%s: %s CPU '%s' %s space memory map entry references nonexistant device '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->read_devtag);
- error = TRUE;
- }
- if (entry->write_devtag != NULL && device_list_find_by_tag(config->devicelist, entry->write_devtag) == NULL)
- {
- mame_printf_error("%s: %s CPU '%s' %s space memory map entry references nonexistant device '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->write_devtag);
- error = TRUE;
- }
-
- /* make sure ports exist */
- if (entry->read_porttag != NULL && input_port_by_tag(portlist, entry->read_porttag) == NULL)
- {
- mame_printf_error("%s: %s CPU '%s' %s space memory map entry references nonexistant port tag '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->read_porttag);
- error = TRUE;
- }
- }
-
- /* release the address map */
- address_map_free(map);
-
- /* validate the interrupts */
- if (cpuconfig->vblank_interrupt != NULL)
+ else if (cpuconfig->vblank_interrupt_screen != NULL && cpuconfig->vblank_interrupts_per_frame != 0)
{
- if (video_screen_count(config) == 0)
- {
- mame_printf_error("%s: %s cpu '%s' has a VBLANK interrupt, but the driver is screenless !\n", driver->source_file, driver->name, device->tag);
- error = TRUE;
- }
- else if (cpuconfig->vblank_interrupt_screen != NULL && cpuconfig->vblank_interrupts_per_frame != 0)
- {
- mame_printf_error("%s: %s cpu '%s' has a new VBLANK interrupt handler with >1 interrupts!\n", driver->source_file, driver->name, device->tag);
- error = TRUE;
- }
- else if (cpuconfig->vblank_interrupt_screen != NULL && device_list_find_by_tag(config->devicelist, cpuconfig->vblank_interrupt_screen) == NULL)
- {
- mame_printf_error("%s: %s cpu '%s' VBLANK interrupt with a non-existant screen tag (%s)!\n", driver->source_file, driver->name, device->tag, cpuconfig->vblank_interrupt_screen);
- error = TRUE;
- }
- else if (cpuconfig->vblank_interrupt_screen == NULL && cpuconfig->vblank_interrupts_per_frame == 0)
- {
- mame_printf_error("%s: %s cpu '%s' has a VBLANK interrupt handler with 0 interrupts!\n", driver->source_file, driver->name, device->tag);
- error = TRUE;
- }
- }
- else if (cpuconfig->vblank_interrupts_per_frame != 0)
- {
- mame_printf_error("%s: %s cpu '%s' has no VBLANK interrupt handler but a non-0 interrupt count is given!\n", driver->source_file, driver->name, device->tag);
+ mame_printf_error("%s: %s cpu '%s' has a new VBLANK interrupt handler with >1 interrupts!\n", driver->source_file, driver->name, device->tag);
error = TRUE;
}
-
- if (cpuconfig->timed_interrupt != NULL && cpuconfig->timed_interrupt_period == 0)
+ else if (cpuconfig->vblank_interrupt_screen != NULL && device_list_find_by_tag(config->devicelist, cpuconfig->vblank_interrupt_screen) == NULL)
{
- mame_printf_error("%s: %s cpu '%s' has a timer interrupt handler with 0 period!\n", driver->source_file, driver->name, device->tag);
+ mame_printf_error("%s: %s cpu '%s' VBLANK interrupt with a non-existant screen tag (%s)!\n", driver->source_file, driver->name, device->tag, cpuconfig->vblank_interrupt_screen);
error = TRUE;
}
- else if (cpuconfig->timed_interrupt == NULL && cpuconfig->timed_interrupt_period != 0)
+ else if (cpuconfig->vblank_interrupt_screen == NULL && cpuconfig->vblank_interrupts_per_frame == 0)
{
- mame_printf_error("%s: %s cpu '%s' has a no timer interrupt handler but has a non-0 period given!\n", driver->source_file, driver->name, device->tag);
+ mame_printf_error("%s: %s cpu '%s' has a VBLANK interrupt handler with 0 interrupts!\n", driver->source_file, driver->name, device->tag);
error = TRUE;
}
}
+ else if (cpuconfig->vblank_interrupts_per_frame != 0)
+ {
+ mame_printf_error("%s: %s cpu '%s' has no VBLANK interrupt handler but a non-0 interrupt count is given!\n", driver->source_file, driver->name, device->tag);
+ error = TRUE;
+ }
+
+ if (cpuconfig->timed_interrupt != NULL && cpuconfig->timed_interrupt_period == 0)
+ {
+ mame_printf_error("%s: %s cpu '%s' has a timer interrupt handler with 0 period!\n", driver->source_file, driver->name, device->tag);
+ error = TRUE;
+ }
+ else if (cpuconfig->timed_interrupt == NULL && cpuconfig->timed_interrupt_period != 0)
+ {
+ mame_printf_error("%s: %s cpu '%s' has a no timer interrupt handler but has a non-0 period given!\n", driver->source_file, driver->name, device->tag);
+ error = TRUE;
+ }
}
return error;
@@ -1555,7 +1440,7 @@ static int validate_sound(int drivnum, const machine_config *config)
checks
-------------------------------------------------*/
-static int validate_devices(int drivnum, const machine_config *config)
+static int validate_devices(int drivnum, const machine_config *config, const input_port_config *portlist, region_info *rgninfo)
{
int error = FALSE;
const game_driver *driver = drivers[drivnum];
@@ -1565,6 +1450,7 @@ static int validate_devices(int drivnum, const machine_config *config)
{
device_validity_check_func validity_check = (device_validity_check_func) device_get_info_fct(device, DEVINFO_FCT_VALIDITY_CHECK);
const device_config *scandevice;
+ int spacenum;
/* validate the device tag */
error |= validate_tag(driver, device_get_info_string(device, DEVINFO_STR_NAME), device->tag);
@@ -1580,6 +1466,120 @@ static int validate_devices(int drivnum, const machine_config *config)
/* call the device-specific validity check */
if (validity_check != NULL && (*validity_check)(driver, device))
error = TRUE;
+
+ /* loop over all address spaces */
+ for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
+ {
+#define SPACE_SHIFT(a) ((addr_shift < 0) ? ((a) << -addr_shift) : ((a) >> addr_shift))
+#define SPACE_SHIFT_END(a) ((addr_shift < 0) ? (((a) << -addr_shift) | ((1 << -addr_shift) - 1)) : ((a) >> addr_shift))
+ int databus_width = device_get_databus_width(device, spacenum);
+ int addr_shift = device_get_addrbus_shift(device, spacenum);
+ int alignunit = databus_width/8;
+ address_map_entry *entry;
+ address_map *map;
+
+ /* construct the maps */
+ map = address_map_alloc(device, driver, spacenum);
+
+ /* if this is an empty map, just skip it */
+ if (map->entrylist == NULL)
+ {
+ address_map_free(map);
+ continue;
+ }
+
+ /* validate the global map parameters */
+ if (map->spacenum != spacenum)
+ {
+ mame_printf_error("%s: %s device '%s' space %d has address space %d handlers!\n", driver->source_file, driver->name, device->tag, spacenum, map->spacenum);
+ error = TRUE;
+ }
+ if (map->databits != databus_width)
+ {
+ mame_printf_error("%s: %s device '%s' uses wrong memory handlers for %s space! (width = %d, memory = %08x)\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], databus_width, map->databits);
+ error = TRUE;
+ }
+
+ /* loop over entries and look for errors */
+ for (entry = map->entrylist; entry != NULL; entry = entry->next)
+ {
+ UINT32 bytestart = SPACE_SHIFT(entry->addrstart);
+ UINT32 byteend = SPACE_SHIFT_END(entry->addrend);
+
+ /* look for inverted start/end pairs */
+ if (byteend < bytestart)
+ {
+ mame_printf_error("%s: %s wrong %s memory read handler start = %08x > end = %08x\n", driver->source_file, driver->name, address_space_names[spacenum], entry->addrstart, entry->addrend);
+ error = TRUE;
+ }
+
+ /* look for misaligned entries */
+ if ((bytestart & (alignunit - 1)) != 0 || (byteend & (alignunit - 1)) != (alignunit - 1))
+ {
+ mame_printf_error("%s: %s wrong %s memory read handler start = %08x, end = %08x ALIGN = %d\n", driver->source_file, driver->name, address_space_names[spacenum], entry->addrstart, entry->addrend, alignunit);
+ error = TRUE;
+ }
+
+ /* if this is a program space, auto-assign implicit ROM entries */
+ if ((FPTR)entry->read.generic == STATIC_ROM && entry->region == NULL)
+ {
+ entry->region = device->tag;
+ entry->rgnoffs = entry->addrstart;
+ }
+
+ /* if this entry references a memory region, validate it */
+ if (entry->region != NULL && entry->share == 0)
+ {
+ int rgnnum;
+
+ /* loop over entries in the class */
+ for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo->entries); rgnnum++)
+ {
+ /* stop if we hit an empty */
+ if (rgninfo->entries[rgnnum].tag == NULL)
+ {
+ mame_printf_error("%s: %s device '%s' %s space memory map entry %X-%X references non-existant region '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->addrstart, entry->addrend, entry->region);
+ error = TRUE;
+ break;
+ }
+
+ /* if we hit a match, check against the length */
+ if (astring_cmpc(rgninfo->entries[rgnnum].tag, entry->region) == 0)
+ {
+ offs_t length = rgninfo->entries[rgnnum].length;
+ if (entry->rgnoffs + (byteend - bytestart + 1) > length)
+ {
+ mame_printf_error("%s: %s device '%s' %s space memory map entry %X-%X extends beyond region '%s' size (%X)\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->addrstart, entry->addrend, entry->region, length);
+ error = TRUE;
+ }
+ break;
+ }
+ }
+ }
+
+ /* make sure all devices exist */
+ if (entry->read_devtag != NULL && device_list_find_by_tag(config->devicelist, entry->read_devtag) == NULL)
+ {
+ mame_printf_error("%s: %s device '%s' %s space memory map entry references nonexistant device '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->read_devtag);
+ error = TRUE;
+ }
+ if (entry->write_devtag != NULL && device_list_find_by_tag(config->devicelist, entry->write_devtag) == NULL)
+ {
+ mame_printf_error("%s: %s device '%s' %s space memory map entry references nonexistant device '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->write_devtag);
+ error = TRUE;
+ }
+
+ /* make sure ports exist */
+ if (entry->read_porttag != NULL && input_port_by_tag(portlist, entry->read_porttag) == NULL)
+ {
+ mame_printf_error("%s: %s device '%s' %s space memory map entry references nonexistant port tag '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->read_porttag);
+ error = TRUE;
+ }
+ }
+
+ /* release the address map */
+ address_map_free(map);
+ }
}
return error;
}
@@ -1684,7 +1684,7 @@ int mame_validitychecks(const game_driver *curdriver)
/* validate the CPU information */
cpu_checks -= osd_profiling_ticks();
- error = validate_cpu(drivnum, config, portlist, &rgninfo) || error;
+ error = validate_cpu(drivnum, config) || error;
cpu_checks += osd_profiling_ticks();
/* validate the display */
@@ -1704,7 +1704,7 @@ int mame_validitychecks(const game_driver *curdriver)
/* validate devices */
device_checks -= osd_profiling_ticks();
- error = validate_devices(drivnum, config) || error;
+ error = validate_devices(drivnum, config, portlist, &rgninfo) || error;
device_checks += osd_profiling_ticks();
for (rgnnum = 0; rgnnum < ARRAY_LENGTH(rgninfo.entries); rgnnum++)
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index abd248a539c..a0a236e5adf 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -59,8 +59,6 @@ static const device_config *tms5220;
static const device_config *oki6295;
static const device_config *oki6295_l, *oki6295_r;
-static UINT32 oki6295_bank_base;
-
static UINT8 overall_volume;
static UINT8 pokey_volume;
static UINT8 ym2151_volume;
@@ -79,6 +77,24 @@ static WRITE8_HANDLER( jsa3_io_w );
/*************************************
*
+ * OKI banked address map
+ *
+ *************************************/
+
+static ADDRESS_MAP_START( jsa3_oki_map, 0, 8 )
+ AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK(12)
+ AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(13)
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( jsa3_oki2_map, 0, 8 )
+ AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK(14)
+ AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(15)
+ADDRESS_MAP_END
+
+
+
+/*************************************
+ *
* State save
*
*************************************/
@@ -88,8 +104,6 @@ static void init_save_state(running_machine *machine)
state_save_register_global(machine, speech_data);
state_save_register_global(machine, last_ctl);
- state_save_register_global(machine, oki6295_bank_base);
-
state_save_register_global(machine, overall_volume);
state_save_register_global(machine, pokey_volume);
state_save_register_global(machine, ym2151_volume);
@@ -137,7 +151,7 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
/* initialize JSA III ADPCM */
{
- static const char *const regions[] = { "adpcm", "adcpml", "adpcmr" };
+ static const char *const regions[] = { "adpcm", "adpcml", "adpcmr" };
int rgn;
/* expand the ADPCM data to avoid lots of memcpy's during gameplay */
@@ -145,15 +159,12 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
for (rgn = 0; rgn < ARRAY_LENGTH(regions); rgn++)
{
UINT8 *base = memory_region(machine, regions[rgn]);
- if (base != NULL && memory_region_length(machine, regions[rgn]) >= 0x100000)
+ if (base != NULL && memory_region_length(machine, regions[rgn]) >= 0x80000)
{
- memcpy(&base[0x00000], &base[0x80000], 0x20000);
- memcpy(&base[0x40000], &base[0x80000], 0x20000);
- memcpy(&base[0x80000], &base[0xa0000], 0x20000);
-
- memcpy(&base[0x20000], &base[0xe0000], 0x20000);
- memcpy(&base[0x60000], &base[0xe0000], 0x20000);
- memcpy(&base[0xa0000], &base[0xe0000], 0x20000);
+ int banknum = (rgn != 2) ? 12 : 14;
+ memory_configure_bank(machine, banknum, 0, 2, base + 0x00000, 0x00000);
+ memory_configure_bank(machine, banknum, 2, 2, base + 0x20000, 0x20000);
+ memory_set_bankptr(machine, banknum + 1, base + 0x60000);
}
}
}
@@ -168,7 +179,6 @@ void atarijsa_reset(void)
/* reset the static states */
speech_data = 0;
last_ctl = 0;
- oki6295_bank_base = 0x00000;
overall_volume = 100;
pokey_volume = 100;
ym2151_volume = 100;
@@ -520,8 +530,8 @@ static WRITE8_HANDLER( jsa3_io_w )
*/
/* update the OKI bank */
- oki6295_bank_base = (0x40000 * ((data >> 1) & 1)) | (oki6295_bank_base & 0x80000);
- if (oki6295 != NULL) okim6295_set_bank_base(oki6295, oki6295_bank_base);
+ if (oki6295 != NULL)
+ memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 2) | ((data >> 1) & 1));
/* update the bank */
memcpy(bank_base, &bank_source_data[0x1000 * ((data >> 6) & 3)], 0x1000);
@@ -545,8 +555,8 @@ static WRITE8_HANDLER( jsa3_io_w )
*/
/* update the OKI bank */
- oki6295_bank_base = (0x80000 * ((data >> 4) & 1)) | (oki6295_bank_base & 0x40000);
- if (oki6295 != NULL) okim6295_set_bank_base(oki6295, oki6295_bank_base);
+ if (oki6295 != NULL)
+ memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 1) | ((data >> 3) & 2));
/* update the volumes */
ym2151_volume = ((data >> 1) & 7) * 100 / 7;
@@ -651,8 +661,7 @@ static WRITE8_HANDLER( jsa3s_io_w )
*/
/* update the OKI bank */
- oki6295_bank_base = (0x40000 * ((data >> 1) & 1)) | (oki6295_bank_base & 0x80000);
- okim6295_set_bank_base(devtag_get_device(space->machine, "adpcml"), oki6295_bank_base);
+ memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 2) | ((data >> 1) & 1));
/* update the bank */
memcpy(bank_base, &bank_source_data[0x1000 * ((data >> 6) & 3)], 0x1000);
@@ -677,9 +686,8 @@ static WRITE8_HANDLER( jsa3s_io_w )
*/
/* update the OKI bank */
- oki6295_bank_base = (0x80000 * ((data >> 4) & 1)) | (oki6295_bank_base & 0x40000);
- okim6295_set_bank_base(devtag_get_device(space->machine, "adpcml"), oki6295_bank_base);
- okim6295_set_bank_base(devtag_get_device(space->machine, "adpcmr"), 0x40000 * (data >> 6));
+ memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 1) | ((data >> 3) & 2));
+ memory_set_bank(space->machine, 14, data >> 6);
/* update the volumes */
ym2151_volume = ((data >> 1) & 7) * 100 / 7;
@@ -854,13 +862,16 @@ MACHINE_DRIVER_START( jsa_ii_mono )
MACHINE_DRIVER_END
-/* Used by Batman, Guardians of the 'Hood, Road Riot 4WD */
+/* Used by Batman, Guardians of the 'Hood, Road Riot 4WD, Steel Talons */
MACHINE_DRIVER_START( jsa_iii_mono )
/* basic machine hardware */
MDRV_IMPORT_FROM(jsa_ii_mono)
MDRV_CPU_MODIFY("jsa")
MDRV_CPU_PROGRAM_MAP(atarijsa3_map)
+
+ MDRV_DEVICE_MODIFY("adpcm")
+ MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
MACHINE_DRIVER_END
@@ -875,7 +886,7 @@ MACHINE_DRIVER_START( jsa_iii_mono_noadpcm )
MACHINE_DRIVER_END
-/* Used by Space Lords, Moto Frenzy, Steel Talons, Road Riot's Revenge Rally */
+/* Used by Space Lords, Moto Frenzy, Road Riot's Revenge Rally */
MACHINE_DRIVER_START( jsa_iiis_stereo )
/* basic machine hardware */
@@ -894,10 +905,12 @@ MACHINE_DRIVER_START( jsa_iiis_stereo )
MDRV_SOUND_ADD("adpcml", OKIM6295, JSA_MASTER_CLOCK/3)
MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
MDRV_SOUND_ADD("adpcmr", OKIM6295, JSA_MASTER_CLOCK/3)
MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index abe72eeb114..52129360eb4 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -412,7 +412,7 @@ ROM_START( actfancr )
ROM_LOAD( "13", 0x20000, 0x10000, CRC(c30c37dc) SHA1(0f7a325738eafa85239497e2b97aa51a6f2ffc4d) )
ROM_LOAD( "11", 0x30000, 0x10000, CRC(1f006d9f) SHA1(74bc2d4d022ad7c65be781f974919262cacb4b64) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM sounds */
ROM_LOAD( "18", 0x00000, 0x10000, CRC(5c55b242) SHA1(62ba60b2f02483875da12aefe849f7e2fd137ef1) )
ROM_END
@@ -445,7 +445,7 @@ ROM_START( actfanc1 )
ROM_LOAD( "13", 0x20000, 0x10000, CRC(c30c37dc) SHA1(0f7a325738eafa85239497e2b97aa51a6f2ffc4d) )
ROM_LOAD( "11", 0x30000, 0x10000, CRC(1f006d9f) SHA1(74bc2d4d022ad7c65be781f974919262cacb4b64) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM sounds */
ROM_LOAD( "18", 0x00000, 0x10000, CRC(5c55b242) SHA1(62ba60b2f02483875da12aefe849f7e2fd137ef1) )
ROM_END
@@ -478,7 +478,7 @@ ROM_START( actfancj )
ROM_LOAD( "13", 0x20000, 0x10000, CRC(c30c37dc) SHA1(0f7a325738eafa85239497e2b97aa51a6f2ffc4d) )
ROM_LOAD( "11", 0x30000, 0x10000, CRC(1f006d9f) SHA1(74bc2d4d022ad7c65be781f974919262cacb4b64) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM sounds */
ROM_LOAD( "18", 0x00000, 0x10000, CRC(5c55b242) SHA1(62ba60b2f02483875da12aefe849f7e2fd137ef1) )
ROM_END
@@ -511,7 +511,7 @@ ROM_START( triothep )
ROM_LOAD( "fg-05.bin", 0x20000, 0x10000, CRC(8bb13f05) SHA1(f524cb0a38d0025c93124fc329d913e000155e9b) )
ROM_LOAD( "fg-07.bin", 0x30000, 0x10000, CRC(0d7affc3) SHA1(59f9fbf13216aaf67c7d1ad3a11a1738c4afd9e5) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM sounds */
ROM_LOAD( "fg-17.bin", 0x00000, 0x10000, CRC(f0ab0d05) SHA1(29d3ab513a8d46a1cb70f5333fa56bb787a58288) )
ROM_END
@@ -545,7 +545,7 @@ ROM_START( triothej )
ROM_LOAD( "ff-05.bin", 0x20000, 0x10000, CRC(8bb13f05) SHA1(f524cb0a38d0025c93124fc329d913e000155e9b) )
ROM_LOAD( "ff-07.bin", 0x30000, 0x10000, CRC(0d7affc3) SHA1(59f9fbf13216aaf67c7d1ad3a11a1738c4afd9e5) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM sounds */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM sounds */
ROM_LOAD( "ff-17.bin", 0x00000, 0x10000, CRC(f0ab0d05) SHA1(29d3ab513a8d46a1cb70f5333fa56bb787a58288) )
ROM_END
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 17929b23aba..a95991835a7 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -496,7 +496,7 @@ ROM_START( hydra )
ROM_LOAD16_BYTE( "136079-1015.bin", 0xe0001, 0x10000, CRC(cf7f69fd) SHA1(93866f66ae7f4071abc66bd310bd15847e2a950a) )
ROM_LOAD16_BYTE( "136079-1016.bin", 0xe0000, 0x10000, CRC(61aaf14f) SHA1(946caff64902ebdda991372b54c29bd0a0fa13c3) )
- ROM_REGION( 0x30000, "adpcm", 0 ) /* 192k for ADPCM samples */
+ ROM_REGION( 0x40000, "adpcm", 0 )
ROM_LOAD( "136079-1037.bin", 0x00000, 0x10000, CRC(b974d3d0) SHA1(67ecb17386f4be00c03661de14deff77b8ca85d0) )
ROM_LOAD( "136079-1038.bin", 0x10000, 0x10000, CRC(a2eda15b) SHA1(358888ffdeb3d0e98f59e239de6d7e1f7e15aca2) )
ROM_LOAD( "136079-1039.bin", 0x20000, 0x10000, CRC(eb9eaeb7) SHA1(cd8e076b07588879f1a0e6c0fb9de9889480bebb) )
@@ -556,7 +556,7 @@ ROM_START( hydrap )
ROM_LOAD16_BYTE( "hydmhi7.bin", 0xe0001, 0x10000, CRC(71fc3e43) SHA1(ce6bdd68ed40c2b48d679ece740f0376b2442e2b) )
ROM_LOAD16_BYTE( "hydmlo7.bin", 0xe0000, 0x10000, CRC(7960b0c2) SHA1(56e7d0b48d6afce6a3c1a940fc578a5775abd940) )
- ROM_REGION( 0x30000, "adpcm", 0 ) /* 192k for ADPCM samples */
+ ROM_REGION( 0x40000, "adpcm", 0 )
ROM_LOAD( "136079-1037.bin", 0x00000, 0x10000, BAD_DUMP CRC(b974d3d0) SHA1(67ecb17386f4be00c03661de14deff77b8ca85d0) )
ROM_LOAD( "136079-1038.bin", 0x10000, 0x10000, BAD_DUMP CRC(a2eda15b) SHA1(358888ffdeb3d0e98f59e239de6d7e1f7e15aca2) )
ROM_LOAD( "136079-1039.bin", 0x20000, 0x10000, BAD_DUMP CRC(eb9eaeb7) SHA1(cd8e076b07588879f1a0e6c0fb9de9889480bebb) )
@@ -616,7 +616,7 @@ ROM_START( hydrap2 )
ROM_LOAD16_BYTE( "136079-1015.bin", 0xe0001, 0x10000, NO_DUMP CRC(cf7f69fd) SHA1(93866f66ae7f4071abc66bd310bd15847e2a950a) )
ROM_LOAD16_BYTE( "136079-1016.bin", 0xe0000, 0x10000, NO_DUMP CRC(61aaf14f) SHA1(946caff64902ebdda991372b54c29bd0a0fa13c3) )
- ROM_REGION( 0x30000, "adpcm", 0 ) /* 192k for ADPCM samples */
+ ROM_REGION( 0x40000, "adpcm", 0 )
ROM_LOAD( "136079-1037.bin", 0x00000, 0x10000, NO_DUMP CRC(b974d3d0) SHA1(67ecb17386f4be00c03661de14deff77b8ca85d0) )
ROM_LOAD( "136079-1038.bin", 0x10000, 0x10000, NO_DUMP CRC(a2eda15b) SHA1(358888ffdeb3d0e98f59e239de6d7e1f7e15aca2) )
ROM_LOAD( "136079-1039.bin", 0x20000, 0x10000, NO_DUMP CRC(eb9eaeb7) SHA1(cd8e076b07588879f1a0e6c0fb9de9889480bebb) )
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 183637334ee..dde891bfee4 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -589,11 +589,11 @@ ROM_START( roadriot )
ROM_LOAD16_BYTE( "136089-1032.9s", 0x1c0000, 0x20000, CRC(eca3c595) SHA1(5d067b7c02675b1e6dd3c4046697a16f873f80af) )
ROM_LOAD16_BYTE( "136089-1031.9p", 0x1c0001, 0x20000, CRC(88acdb53) SHA1(5bf2424ee75a25248a8ce38c8605b6780da4e323) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136089-1048.19e", 0x80000, 0x20000, CRC(2db638a7) SHA1(45da8088f7439beacc3056952a4d631d9633efa7) )
- ROM_LOAD( "136089-1049.17e", 0xa0000, 0x20000, CRC(e1dd7f9e) SHA1(6b9a240aa84d210d3052daab6ea26f9cd0e62dc1) )
- ROM_LOAD( "136089-1050.15e", 0xc0000, 0x20000, CRC(64d410bb) SHA1(877bccca7ff37a9dd8294bc1453487a2f516ca7d) )
- ROM_LOAD( "136089-1051.12e", 0xe0000, 0x20000, CRC(bffd01c8) SHA1(f6de000f61ea0c1ddb31ee5301506e5e966638c2) )
+ ROM_REGION( 0x80000, "adpcm", 0 )
+ ROM_LOAD( "136089-1048.19e", 0x00000, 0x20000, CRC(2db638a7) SHA1(45da8088f7439beacc3056952a4d631d9633efa7) )
+ ROM_LOAD( "136089-1049.17e", 0x20000, 0x20000, CRC(e1dd7f9e) SHA1(6b9a240aa84d210d3052daab6ea26f9cd0e62dc1) )
+ ROM_LOAD( "136089-1050.15e", 0x40000, 0x20000, CRC(64d410bb) SHA1(877bccca7ff37a9dd8294bc1453487a2f516ca7d) )
+ ROM_LOAD( "136089-1051.12e", 0x60000, 0x20000, CRC(bffd01c8) SHA1(f6de000f61ea0c1ddb31ee5301506e5e966638c2) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "136089-1001.bin", 0x0000, 0x0200, CRC(5836cb5a) SHA1(2c797f6a1227d6e1fd7a12f99f0254072c8c266e) )
@@ -638,8 +638,8 @@ ROM_START( guardian )
ROM_LOAD16_BYTE( "136092-0067a.9s", 0x500000, 0x80000, CRC(15845fba) SHA1(f7b670a8d48a5e9c261150914a06ef9a938a84e7) )
ROM_LOAD16_BYTE( "136092-0066a.9p", 0x500001, 0x80000, CRC(7130c575) SHA1(b3ea109981a1e5c631705b23dfad4a3a3daf7734) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136092-0010-snd", 0x80000, 0x80000, CRC(bca27f40) SHA1(91a41eac116eb7d9a790abc590eb06328726d1c2) )
+ ROM_REGION( 0x80000, "adpcm", 0 )
+ ROM_LOAD( "136092-0010-snd", 0x00000, 0x80000, CRC(bca27f40) SHA1(91a41eac116eb7d9a790abc590eb06328726d1c2) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "136092-1001.bin", 0x0000, 0x0200, CRC(b3251eeb) SHA1(5e83baa70aaa28f07f32657bf974fd87719972d3) )
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 64e90fe3ef2..28617556fc7 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1470,11 +1470,11 @@ ROM_START( spclords )
ROM_LOAD16_BYTE( "136095.51b", 0x500000, 0x80000, CRC(97541074) SHA1(f9f75bfc4af9587f4a9630ad93d9cd0efd89e4f4) )
ROM_LOAD16_BYTE( "136095.50b", 0x500001, 0x80000, CRC(a1c11ae8) SHA1(53fb2f376aae0aa346f9f911d6d8a73753c67d6e) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
ROM_END
@@ -1511,11 +1511,11 @@ ROM_START( spclordb )
ROM_LOAD16_BYTE( "136095.51b", 0x500000, 0x80000, CRC(97541074) SHA1(f9f75bfc4af9587f4a9630ad93d9cd0efd89e4f4) )
ROM_LOAD16_BYTE( "136095.50b", 0x500001, 0x80000, CRC(a1c11ae8) SHA1(53fb2f376aae0aa346f9f911d6d8a73753c67d6e) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
ROM_END
@@ -1552,11 +1552,11 @@ ROM_START( spclordg )
ROM_LOAD16_BYTE( "136095.51a", 0x500000, 0x80000, CRC(4635c534) SHA1(7261508052e3b17a552b43bc3d4ad7cd2d1f6af9) )
ROM_LOAD16_BYTE( "136095.50a", 0x500001, 0x80000, CRC(94bde47d) SHA1(dde8f0184a2d7e9f7eb961af2d9d016399ec18fc) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, NO_DUMP CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1598,11 +1598,11 @@ ROM_START( spclorda )
ROM_LOAD16_BYTE( "136095.51a", 0x500000, 0x80000, CRC(4635c534) SHA1(7261508052e3b17a552b43bc3d4ad7cd2d1f6af9) )
ROM_LOAD16_BYTE( "136095.50a", 0x500001, 0x80000, CRC(94bde47d) SHA1(dde8f0184a2d7e9f7eb961af2d9d016399ec18fc) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136095.81a", 0x80000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "136095.81a", 0x00000, 0x80000, CRC(212560dd) SHA1(9d90bca5b478050d640b2393c9d3d59a4bd493dd) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, NO_DUMP CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1646,11 +1646,11 @@ ROM_START( motofren )
ROM_LOAD16_BYTE( "motof35t.bin", 0x600000, 0x80000, CRC(74320763) SHA1(9cbf61c51dd96dc3e4a4227f3080766b9482a16a) )
ROM_LOAD16_BYTE( "motof35r.bin", 0x600001, 0x80000, CRC(a7f9df2e) SHA1(c3e0c67081cf8f7b24350abf5a9adbb544ab44a7) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1694,11 +1694,11 @@ ROM_START( motofrmd )
ROM_LOAD16_BYTE( "motof35t.bin", 0x600000, 0x80000, CRC(74320763) SHA1(9cbf61c51dd96dc3e4a4227f3080766b9482a16a) )
ROM_LOAD16_BYTE( "motof35r.bin", 0x600001, 0x80000, CRC(a7f9df2e) SHA1(c3e0c67081cf8f7b24350abf5a9adbb544ab44a7) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1743,11 +1743,11 @@ ROM_START( motofrei )
ROM_LOAD16_BYTE( "motof35t.bin", 0x600000, 0x80000, CRC(74320763) SHA1(9cbf61c51dd96dc3e4a4227f3080766b9482a16a) )
ROM_LOAD16_BYTE( "motof35r.bin", 0x600001, 0x80000, CRC(a7f9df2e) SHA1(c3e0c67081cf8f7b24350abf5a9adbb544ab44a7) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1792,11 +1792,11 @@ ROM_START( motofreg )
ROM_LOAD16_BYTE( "motof35t.bin", 0x600000, 0x80000, CRC(74320763) SHA1(9cbf61c51dd96dc3e4a4227f3080766b9482a16a) )
ROM_LOAD16_BYTE( "motof35r.bin", 0x600001, 0x80000, CRC(a7f9df2e) SHA1(c3e0c67081cf8f7b24350abf5a9adbb544ab44a7) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1841,11 +1841,11 @@ ROM_START( motofmdg )
ROM_LOAD16_BYTE( "motof35t.bin", 0x600000, 0x80000, CRC(74320763) SHA1(9cbf61c51dd96dc3e4a4227f3080766b9482a16a) )
ROM_LOAD16_BYTE( "motof35r.bin", 0x600001, 0x80000, CRC(a7f9df2e) SHA1(c3e0c67081cf8f7b24350abf5a9adbb544ab44a7) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1889,11 +1889,11 @@ ROM_START( motofrft )
ROM_LOAD16_BYTE( "motof35t.bin", 0x600000, 0x80000, CRC(74320763) SHA1(9cbf61c51dd96dc3e4a4227f3080766b9482a16a) )
ROM_LOAD16_BYTE( "motof35r.bin", 0x600001, 0x80000, CRC(a7f9df2e) SHA1(c3e0c67081cf8f7b24350abf5a9adbb544ab44a7) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1937,11 +1937,11 @@ ROM_START( motomdft )
ROM_LOAD16_BYTE( "motof35t.bin", 0x600000, 0x80000, CRC(74320763) SHA1(9cbf61c51dd96dc3e4a4227f3080766b9482a16a) )
ROM_LOAD16_BYTE( "motof35r.bin", 0x600001, 0x80000, CRC(a7f9df2e) SHA1(c3e0c67081cf8f7b24350abf5a9adbb544ab44a7) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "mfadpcm.bin", 0x80000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "mfadpcm.bin", 0x00000, 0x80000, CRC(fde543c4) SHA1(7d36d7f2f30d0ac40da77a36a47488d75474caaf) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "094-001a.bin", 0x0000, 0x0200, CRC(a70ade3f) SHA1(f4a558b17767eed2683c768d1b441e75edcff967) )
@@ -1981,13 +1981,11 @@ ROM_START( rrreveng )
ROM_LOAD16_BYTE( "rrmo4h.bin", 0x400000, 0x80000, CRC(12bf3e11) SHA1(37b1a7fe0b50202030f5c1938b95a449bbd51add) )
ROM_LOAD16_BYTE( "rrmo4l.bin", 0x400001, 0x80000, CRC(a80175f6) SHA1(db621902fdfa99ec532713f4314c6cbb8353a773) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "rralpc0.bin", 0x80000, 0x80000, CRC(1f7b6ecf) SHA1(1787a2e89618e1338d70a54684dbc7d44c5f5559) )
- ROM_LOAD( "rralpc1.bin", 0x80000, 0x80000, CRC(7ccd26d7) SHA1(1a74bdc66482896f5b9795d27383aa993e5fbaa4) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "rralpc0.bin", 0x00000, 0x80000, CRC(1f7b6ecf) SHA1(1787a2e89618e1338d70a54684dbc7d44c5f5559) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "rralpc0.bin", 0x80000, 0x80000, CRC(1f7b6ecf) SHA1(1787a2e89618e1338d70a54684dbc7d44c5f5559) )
- ROM_LOAD( "rralpc1.bin", 0x80000, 0x80000, CRC(7ccd26d7) SHA1(1a74bdc66482896f5b9795d27383aa993e5fbaa4) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "rralpc1.bin", 0x00000, 0x80000, CRC(7ccd26d7) SHA1(1a74bdc66482896f5b9795d27383aa993e5fbaa4) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "rrmoprg1.bin", 0x0000, 0x0200, NO_DUMP )
@@ -2027,13 +2025,11 @@ ROM_START( rrrevenp )
ROM_LOAD16_BYTE( "mo4h.31t", 0x400000, 0x80000, CRC(af6a027e) SHA1(08038bddb6aa7e97f013f9d3e508f5501821e460) )
ROM_LOAD16_BYTE( "mo4l.31r", 0x400001, 0x80000, CRC(9ebc5369) SHA1(ffd8418b328d99aa44fb1aed1db1aa6ac715c644) )
- ROM_REGION( 0x100000, "adpcml", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "rralpc0.bin", 0x80000, 0x80000, CRC(1f7b6ecf) SHA1(1787a2e89618e1338d70a54684dbc7d44c5f5559) )
- ROM_LOAD( "rralpc1.bin", 0x80000, 0x80000, CRC(7ccd26d7) SHA1(1a74bdc66482896f5b9795d27383aa993e5fbaa4) )
+ ROM_REGION( 0x80000, "adpcml", 0 )
+ ROM_LOAD( "rralpc0.bin", 0x00000, 0x80000, CRC(1f7b6ecf) SHA1(1787a2e89618e1338d70a54684dbc7d44c5f5559) )
- ROM_REGION( 0x100000, "adpcmr", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "rralpc0.bin", 0x80000, 0x80000, CRC(1f7b6ecf) SHA1(1787a2e89618e1338d70a54684dbc7d44c5f5559) )
- ROM_LOAD( "rralpc1.bin", 0x80000, 0x80000, CRC(7ccd26d7) SHA1(1a74bdc66482896f5b9795d27383aa993e5fbaa4) )
+ ROM_REGION( 0x80000, "adpcmr", 0 )
+ ROM_LOAD( "rralpc1.bin", 0x00000, 0x80000, CRC(7ccd26d7) SHA1(1a74bdc66482896f5b9795d27383aa993e5fbaa4) )
ROM_REGION( 0x0600, "proms", ROMREGION_DISPOSE ) /* microcode for growth renderer */
ROM_LOAD( "rrmoprg1.bin", 0x0000, 0x0200, NO_DUMP )
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 679125aeae5..c543abb98de 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -302,11 +302,11 @@ ROM_START( batman )
ROM_LOAD( "136085-1021.15c", 0x0c0000, 0x20000, CRC(9c8ef9ba) SHA1(c2540adfc227a654a3f91e2cfdcd98b3a04ae4fb) )
ROM_LOAD( "136085-1025.16c", 0x0e0000, 0x20000, CRC(5d30bcd1) SHA1(817e225511ab98e7575ee512d659c51fcb7716dc) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM */
- ROM_LOAD( "136085-1041.19e", 0x80000, 0x20000, CRC(d97d5dbb) SHA1(7609841c773e3d1ae5a21da81e3387260fd8da41) )
- ROM_LOAD( "136085-1042.17e", 0xa0000, 0x20000, CRC(8c496986) SHA1(07c84c68885e2ab3e81ee92942d6a0f29e4dffa8) )
- ROM_LOAD( "136085-1043.15e", 0xc0000, 0x20000, CRC(51812d3b) SHA1(6748fecef753179a9257c0da5a7b7c9648437208) )
- ROM_LOAD( "136085-1044.12e", 0xe0000, 0x20000, CRC(5e2d7f31) SHA1(737c7204d91f5dd5c9ed0321fc6c0d6194a18f8a) )
+ ROM_REGION( 0x80000, "adpcm", 0 ) /* 1MB for ADPCM */
+ ROM_LOAD( "136085-1041.19e", 0x00000, 0x20000, CRC(d97d5dbb) SHA1(7609841c773e3d1ae5a21da81e3387260fd8da41) )
+ ROM_LOAD( "136085-1042.17e", 0x20000, 0x20000, CRC(8c496986) SHA1(07c84c68885e2ab3e81ee92942d6a0f29e4dffa8) )
+ ROM_LOAD( "136085-1043.15e", 0x40000, 0x20000, CRC(51812d3b) SHA1(6748fecef753179a9257c0da5a7b7c9648437208) )
+ ROM_LOAD( "136085-1044.12e", 0x60000, 0x20000, CRC(5e2d7f31) SHA1(737c7204d91f5dd5c9ed0321fc6c0d6194a18f8a) )
ROM_REGION( 0x1000, "plds", ROMREGION_DISPOSE )
ROM_LOAD( "gal16v8a-136085-1001.m9", 0x0000, 0x0117, CRC(45dfc0cf) SHA1(39cbb27e504e09d97caea144bfdec2247a39caf9) )
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 2d1691d4df1..d24f35047f2 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -455,11 +455,11 @@ ROM_START( beathead )
ROM_LOAD32_BYTE( "bhpics2.bin", 0x200002, 0x80000, CRC(00b96481) SHA1(39daa46321c1d4f8bce8c25d0450b97f1f19dedb) )
ROM_LOAD32_BYTE( "bhpics3.bin", 0x200003, 0x80000, CRC(99c4f1db) SHA1(aba4440c5cdf413f970a0c65457e2d1b37caf2d6) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM */
- ROM_LOAD( "bhpcm0.bin", 0x80000, 0x20000, CRC(609ca626) SHA1(9bfc913fc4c3453b132595f8553245376bce3a51) )
- ROM_LOAD( "bhpcm1.bin", 0xa0000, 0x20000, CRC(35511509) SHA1(41294b81e253db5d2f30f8589dd59729a31bb2bb) )
- ROM_LOAD( "bhpcm2.bin", 0xc0000, 0x20000, CRC(f71a840a) SHA1(09d045552704cd1434307f9a36ce03c5c06a8ff6) )
- ROM_LOAD( "bhpcm3.bin", 0xe0000, 0x20000, CRC(fedd4936) SHA1(430ed894fa4bfcd56ee5a8a8ef5e161246530e2d) )
+ ROM_REGION( 0x80000, "adpcm", 0 ) /* 1MB for ADPCM */
+ ROM_LOAD( "bhpcm0.bin", 0x00000, 0x20000, CRC(609ca626) SHA1(9bfc913fc4c3453b132595f8553245376bce3a51) )
+ ROM_LOAD( "bhpcm1.bin", 0x20000, 0x20000, CRC(35511509) SHA1(41294b81e253db5d2f30f8589dd59729a31bb2bb) )
+ ROM_LOAD( "bhpcm2.bin", 0x40000, 0x20000, CRC(f71a840a) SHA1(09d045552704cd1434307f9a36ce03c5c06a8ff6) )
+ ROM_LOAD( "bhpcm3.bin", 0x60000, 0x20000, CRC(fedd4936) SHA1(430ed894fa4bfcd56ee5a8a8ef5e161246530e2d) )
ROM_END
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index f7f53e4289d..b4624c1f438 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -233,7 +233,7 @@ ROM_START( blockout )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "bo29e3-0.bin", 0x0000, 0x8000, CRC(3ea01f78) SHA1(5fc4ad4d9f03d7c26d2afc3e7ede75589e40b0d8) )
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "bo29e2-0.bin", 0x0000, 0x20000, CRC(15c5a99d) SHA1(89091eda454a028fd1f17501584bd589baf6d523) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -248,7 +248,7 @@ ROM_START( blckout2 )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "bo29e3-0.bin", 0x0000, 0x8000, CRC(3ea01f78) SHA1(5fc4ad4d9f03d7c26d2afc3e7ede75589e40b0d8) )
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "bo29e2-0.bin", 0x0000, 0x20000, CRC(15c5a99d) SHA1(89091eda454a028fd1f17501584bd589baf6d523) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -263,7 +263,7 @@ ROM_START( blckoutj )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "bo29e3-0.bin", 0x0000, 0x8000, CRC(3ea01f78) SHA1(5fc4ad4d9f03d7c26d2afc3e7ede75589e40b0d8) )
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "bo29e2-0.bin", 0x0000, 0x20000, CRC(15c5a99d) SHA1(89091eda454a028fd1f17501584bd589baf6d523) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -333,7 +333,7 @@ ROM_START( agress )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "palco3.73", 0x0000, 0x8000, CRC(2a21c97d) SHA1(7f71bf18db3e6ff9c69c589268450e66c6585cdd) )
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "palco4.78", 0x0000, 0x20000, CRC(9dfd9cfe) SHA1(5ea8f98bc0cd117cde81c04f02aa33199afe8231) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -349,7 +349,7 @@ ROM_START( agressb )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "palco3.ic73", 0x000000, 0x08000, CRC(2a21c97d) SHA1(7f71bf18db3e6ff9c69c589268450e66c6585cdd) )
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "palco4.ic78", 0x000000, 0x20000, CRC(9dfd9cfe) SHA1(5ea8f98bc0cd117cde81c04f02aa33199afe8231) )
ROM_REGION( 0x0100, "proms", 0 )
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index e2032d822df..787a54629c7 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -536,7 +536,7 @@ ROM_START( bloodbro )
ROM_REGION( 0x100000, "gfx3", ROMREGION_DISPOSE )
ROM_LOAD( "bloodb.obj", 0x00000, 0x100000, CRC(d27c3952) SHA1(de7306432b682f238b911507ad7aa2fa8acbee80) ) /* sprites */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "bb_08.bin", 0x00000, 0x20000, CRC(deb1b975) SHA1(08f2e9a0a23171201b71d381d091edcd3787c287) )
ROM_END
@@ -562,7 +562,7 @@ ROM_START( bloodbra )
ROM_REGION( 0x100000, "gfx3", ROMREGION_DISPOSE )
ROM_LOAD( "bloodb.obj", 0x00000, 0x100000, CRC(d27c3952) SHA1(de7306432b682f238b911507ad7aa2fa8acbee80) ) /* sprites */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "bb_08.bin", 0x00000, 0x20000, CRC(deb1b975) SHA1(08f2e9a0a23171201b71d381d091edcd3787c287) )
ROM_END
@@ -608,7 +608,7 @@ ROM_START( weststry )
ROM_LOAD( "ws19.bin", 0xc0000, 0x20000, CRC(c5dd0a96) SHA1(4696ab1b02d40c54a7dacf0bdf90b624b7d6812e) )
ROM_LOAD( "ws20.bin", 0xe0000, 0x20000, CRC(f1245c16) SHA1(f3941bf5830995f65a5378326fdb72687fbbddcf) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "bb_08.bin", 0x00000, 0x20000, CRC(deb1b975) SHA1(08f2e9a0a23171201b71d381d091edcd3787c287) )
ROM_END
@@ -634,7 +634,7 @@ ROM_START( skysmash )
ROM_REGION( 0x80000, "gfx3", ROMREGION_DISPOSE )
ROM_LOAD( "rom10", 0x00000, 0x080000, CRC(1bbcda5d) SHA1(63915221f70a7dfda6a4d8ac7f5c663c9316610a) ) /* sprites */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "rom1", 0x00000, 0x20000, CRC(e69986f6) SHA1(de38bf2d5638cb40740882e1abccf7928e43a5a6) )
ROM_END
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index f214227d9f4..3a9bd5b0cd5 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -357,10 +357,10 @@ ROM_START( cbuster )
ROM_LOAD( "fu09-.rom", 0x160000, 0x10000, CRC(526809ca) SHA1(2cb9e7417211c1eb23d32e3fee71c5254d34a3ff) )
ROM_LOAD( "fu10-.rom", 0x170000, 0x10000, CRC(6be6d50e) SHA1(b944db4b3a7c76190f6b40f71f033e16e7964f6a) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fu12-.rom", 0x00000, 0x20000, CRC(2d1d65f2) SHA1(be3d57b9976ddf7ee6d20ee9e78fe826ee411d79) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fu13-.rom", 0x00000, 0x20000, CRC(b8525622) SHA1(4a6ec5e3f64256b1383bfbab4167cbd2ec11b5c5) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -395,10 +395,10 @@ ROM_START( cbusterw )
ROM_LOAD( "fu09-.rom", 0x160000, 0x10000, CRC(526809ca) SHA1(2cb9e7417211c1eb23d32e3fee71c5254d34a3ff) )
ROM_LOAD( "fu10-.rom", 0x170000, 0x10000, CRC(6be6d50e) SHA1(b944db4b3a7c76190f6b40f71f033e16e7964f6a) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fu12-.rom", 0x00000, 0x20000, CRC(2d1d65f2) SHA1(be3d57b9976ddf7ee6d20ee9e78fe826ee411d79) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fu13-.rom", 0x00000, 0x20000, CRC(b8525622) SHA1(4a6ec5e3f64256b1383bfbab4167cbd2ec11b5c5) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -433,10 +433,10 @@ ROM_START( cbusterj )
ROM_LOAD( "fr09", 0x160000, 0x10000, CRC(f8363424) SHA1(6a6b143a3474965ef89f75e9d7b15946ae26d0d4) )
ROM_LOAD( "fr10", 0x170000, 0x10000, CRC(241d5760) SHA1(cd216ecf7e88939b91a6e0f02a23c8b875ac24dc) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fu12-.rom", 0x00000, 0x20000, CRC(2d1d65f2) SHA1(be3d57b9976ddf7ee6d20ee9e78fe826ee411d79) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fu13-.rom", 0x00000, 0x20000, CRC(b8525622) SHA1(4a6ec5e3f64256b1383bfbab4167cbd2ec11b5c5) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -471,10 +471,10 @@ ROM_START( twocrude )
ROM_LOAD( "ft09", 0x160000, 0x10000, CRC(6e3657b9) SHA1(7e6a140e33f9bc18e35c255680eebe152a5d8858) )
ROM_LOAD( "ft10", 0x170000, 0x10000, CRC(cdb83560) SHA1(8b258c4436ccea5a74edff1b6219ab7a5eac0328) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fu12-.rom", 0x00000, 0x20000, CRC(2d1d65f2) SHA1(be3d57b9976ddf7ee6d20ee9e78fe826ee411d79) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fu13-.rom", 0x00000, 0x20000, CRC(b8525622) SHA1(4a6ec5e3f64256b1383bfbab4167cbd2ec11b5c5) )
ROM_REGION( 0x0100, "proms", 0 )
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index ec03498503e..c8b65723ac6 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -957,7 +957,7 @@ ROM_START( cninja ) /* World ver 4 */
ROM_LOAD16_BYTE( "mag-04.rom", 0x100000, 0x80000, CRC(144b94cc) SHA1(d982508608942a714b428a2b721bf24e1627cbb6) )
ROM_LOAD16_BYTE( "mag-06.rom", 0x100001, 0x80000, CRC(82d44749) SHA1(c471fa573e00c2f8ae44068439ba6d849a124c68) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gl-06.rom", 0x00000, 0x20000, CRC(d92e519d) SHA1(08238f12bf7058a3965ab6348b468e3d35d4cd23) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -998,7 +998,7 @@ ROM_START( cninja1 ) /* World ver 1 */
ROM_LOAD16_BYTE( "mag-04.rom", 0x100000, 0x80000, CRC(144b94cc) SHA1(d982508608942a714b428a2b721bf24e1627cbb6) )
ROM_LOAD16_BYTE( "mag-06.rom", 0x100001, 0x80000, CRC(82d44749) SHA1(c471fa573e00c2f8ae44068439ba6d849a124c68) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gl-06.rom", 0x00000, 0x20000, CRC(d92e519d) SHA1(08238f12bf7058a3965ab6348b468e3d35d4cd23) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1039,7 +1039,7 @@ ROM_START( cninjau ) /* US ver 4 */
ROM_LOAD16_BYTE( "mag-04.rom", 0x100000, 0x80000, CRC(144b94cc) SHA1(d982508608942a714b428a2b721bf24e1627cbb6) )
ROM_LOAD16_BYTE( "mag-06.rom", 0x100001, 0x80000, CRC(82d44749) SHA1(c471fa573e00c2f8ae44068439ba6d849a124c68) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gl-06.rom", 0x00000, 0x20000, CRC(d92e519d) SHA1(08238f12bf7058a3965ab6348b468e3d35d4cd23) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1080,7 +1080,7 @@ ROM_START( joemac ) /* Japan ver 1 */
ROM_LOAD16_BYTE( "mag-04.rom", 0x100000, 0x80000, CRC(144b94cc) SHA1(d982508608942a714b428a2b721bf24e1627cbb6) )
ROM_LOAD16_BYTE( "mag-06.rom", 0x100001, 0x80000, CRC(82d44749) SHA1(c471fa573e00c2f8ae44068439ba6d849a124c68) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gl-06.rom", 0x00000, 0x20000, CRC(d92e519d) SHA1(08238f12bf7058a3965ab6348b468e3d35d4cd23) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1128,6 +1128,7 @@ ROM_START( stoneage )
ROM_LOAD( "sa_1_069.bin", 0x00000, 0x40000, CRC(2188f3ca) SHA1(9c29b62ed261e63d701ff8d43020089c89a64ab2) )
/* No extra Oki samples in the bootleg */
+ ROM_REGION( 0x80000, "oki2", ROMREGION_ERASEFF )
ROM_END
ROM_START( edrandy ) /* World ver 3 */
@@ -1169,7 +1170,7 @@ ROM_START( edrandy ) /* World ver 3 */
ROM_LOAD16_BYTE( "mad-09", 0x400000, 0x80000, CRC(930f4900) SHA1(dd09d3c8a251b8397996f6a3330e6e704f65d7fa) )
ROM_LOAD16_BYTE( "mad-12", 0x400001, 0x80000, CRC(a0bd62b6) SHA1(a1ab365f3c63fc4edc32b09ecf8f982beb4bfae5) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "ge-08.j13", 0x00000, 0x20000, CRC(dfe28c7b) SHA1(aba55834b276cbab194e03858564077cad21eff1) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1218,7 +1219,7 @@ ROM_START( edrandy2 ) /* World ver 2 */
ROM_LOAD16_BYTE( "mad-09", 0x400000, 0x80000, CRC(930f4900) SHA1(dd09d3c8a251b8397996f6a3330e6e704f65d7fa) )
ROM_LOAD16_BYTE( "mad-12", 0x400001, 0x80000, CRC(a0bd62b6) SHA1(a1ab365f3c63fc4edc32b09ecf8f982beb4bfae5) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "ge-08.j13", 0x00000, 0x20000, CRC(dfe28c7b) SHA1(aba55834b276cbab194e03858564077cad21eff1) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1267,7 +1268,7 @@ ROM_START( edrandy1 ) /* World ver 1 */
ROM_LOAD16_BYTE( "mad-09", 0x400000, 0x80000, CRC(930f4900) SHA1(dd09d3c8a251b8397996f6a3330e6e704f65d7fa) )
ROM_LOAD16_BYTE( "mad-12", 0x400001, 0x80000, CRC(a0bd62b6) SHA1(a1ab365f3c63fc4edc32b09ecf8f982beb4bfae5) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "ge-08.j13", 0x00000, 0x20000, CRC(dfe28c7b) SHA1(aba55834b276cbab194e03858564077cad21eff1) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1316,7 +1317,7 @@ ROM_START( edrandyj ) /* Japan ver 3 */
ROM_LOAD16_BYTE( "mad-09", 0x400000, 0x80000, CRC(930f4900) SHA1(dd09d3c8a251b8397996f6a3330e6e704f65d7fa) )
ROM_LOAD16_BYTE( "mad-12", 0x400001, 0x80000, CRC(a0bd62b6) SHA1(a1ab365f3c63fc4edc32b09ecf8f982beb4bfae5) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "ge-08.j13", 0x00000, 0x20000, CRC(dfe28c7b) SHA1(aba55834b276cbab194e03858564077cad21eff1) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1366,7 +1367,7 @@ ROM_START( robocop2 )
ROM_LOAD16_BYTE( "mah-07.a9", 0x200000, 0x80000, CRC(526f4190) SHA1(23cb79230ec267b8e4236381b5a596d7af8ec5b3) )
ROM_LOAD16_BYTE( "mah-10.a12", 0x200001, 0x80000, CRC(14b770da) SHA1(6d57da630da1ec457ebaeed8c251e85bd737e97c) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gp-08.j13", 0x00000, 0x20000, CRC(365183b1) SHA1(7d3c201c49981c3ac84022283b048e380cbb7ec3) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1416,7 +1417,7 @@ ROM_START( robocp2u )
ROM_LOAD16_BYTE( "mah-07.a9", 0x200000, 0x80000, CRC(526f4190) SHA1(23cb79230ec267b8e4236381b5a596d7af8ec5b3) )
ROM_LOAD16_BYTE( "mah-10.a12", 0x200001, 0x80000, CRC(14b770da) SHA1(6d57da630da1ec457ebaeed8c251e85bd737e97c) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gp-08.j13", 0x00000, 0x20000, CRC(365183b1) SHA1(7d3c201c49981c3ac84022283b048e380cbb7ec3) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -1466,7 +1467,7 @@ ROM_START( robocp2j )
ROM_LOAD16_BYTE( "mah-07.a9", 0x200000, 0x80000, CRC(526f4190) SHA1(23cb79230ec267b8e4236381b5a596d7af8ec5b3) )
ROM_LOAD16_BYTE( "mah-10.a12", 0x200001, 0x80000, CRC(14b770da) SHA1(6d57da630da1ec457ebaeed8c251e85bd737e97c) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gp-08.j13", 0x00000, 0x20000, CRC(365183b1) SHA1(7d3c201c49981c3ac84022283b048e380cbb7ec3) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Extra Oki samples */
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index 6b2f2d04a1b..e96f3ac8e36 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -247,7 +247,7 @@ ROM_START( cowrace )
ROM_LOAD( "u139.bin", 0x0000, 0x2000, CRC(b746bb2f) SHA1(5f5f48752689079ed65fe7bb4a69512ada5db05d) )
ROM_LOAD( "u140.bin", 0x2000, 0x2000, CRC(7e24b674) SHA1(c774efeb8e4e833e73c29007d5294c93df1abef4) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "u4.bin", 0x00000, 0x20000, CRC(f92a3ab5) SHA1(fc164492793597eadb8a50154410936edb74fa23) )
ROM_REGION( 0x20000, "proms", 0 )
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index ca2cde6c033..041cefb4174 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -3188,6 +3188,8 @@ ROM_START( ghouls )
ROM_LOAD( "dm_26.10a", 0x00000, 0x08000, CRC(3692f6e5) SHA1(61b8438d60a39b4cf5062dff0a53228e8a4e4b5f) )
ROM_CONTINUE( 0x10000, 0x08000 )
+ ROM_REGION( 0x40000, "oki", ROMREGION_ERASEFF ) /* Samples (not present) */
+
ROM_REGION( 0x0200, "aboardplds", ROMREGION_DISPOSE )
ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) )
@@ -3235,6 +3237,8 @@ ROM_START( ghoulsu )
ROM_LOAD( "dm_26.10a", 0x00000, 0x08000, CRC(3692f6e5) SHA1(61b8438d60a39b4cf5062dff0a53228e8a4e4b5f) )
ROM_CONTINUE( 0x10000, 0x08000 )
+ ROM_REGION( 0x40000, "oki", ROMREGION_ERASEFF ) /* Samples (not present) */
+
ROM_REGION( 0x0200, "aboardplds", ROMREGION_DISPOSE )
ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) )
@@ -3298,6 +3302,8 @@ ROM_START( daimakai )
ROM_LOAD( "dm_37.13c", 0x00000, 0x08000, CRC(3692f6e5) SHA1(61b8438d60a39b4cf5062dff0a53228e8a4e4b5f) ) // == dm_26.10a
ROM_CONTINUE( 0x10000, 0x08000 )
+ ROM_REGION( 0x40000, "oki", ROMREGION_ERASEFF ) /* Samples (not present) */
+
ROM_REGION( 0x0200, "aboardplds", ROMREGION_DISPOSE )
ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) )
@@ -3330,6 +3336,8 @@ ROM_START( daimakair )
ROM_LOAD( "dam_09.bin", 0x00000, 0x08000, CRC(0656ff53) SHA1(063a8124dbe73d014b11f72007f1b877afd1a661) ) // == dm_26.10a + garbage
ROM_CONTINUE( 0x10000, 0x18000 ) // second half of ROM is unused, not mapped in memory
+ ROM_REGION( 0x40000, "oki", ROMREGION_ERASEFF ) /* Samples (not present) */
+
ROM_REGION( 0x0200, "aboardplds", ROMREGION_DISPOSE )
ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) )
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 6cee104ccbc..64d6974e9b9 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -383,7 +383,7 @@ ROM_START( crospang )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* z80 */
ROM_LOAD( "s1.bin", 0x00000, 0x10000, CRC(d61a224c) SHA1(5cd1b2d136ad58ab550c7ba135558d6c8a4cd8f6) )
- ROM_REGION( 0x20000, "oki", 0 ) /* samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* samples */
ROM_LOAD( "s2.bin", 0x00000, 0x20000, CRC(9f9ecd22) SHA1(631ffe14018ba39658c435b8ecb23b19a14569ee) ) // sample rom contains oksan?
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index e7749700171..94138bb293d 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -311,10 +311,10 @@ ROM_START( darkseal )
ROM_LOAD( "mac-00.rom", 0x000000, 0x80000, CRC(52acf1d6) SHA1(a7b68782417baafc86371b106fd31c5317f5b3d8) ) /* sprites */
ROM_LOAD( "mac-01.rom", 0x080000, 0x80000, CRC(b28f7584) SHA1(e02ddd45130a7b50f80b6dd049059dba8071d768) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-08.rom", 0x00000, 0x20000, CRC(c9bf68e1) SHA1(c81e2534a814fe44c8787946a9fbe18f1743c3b4) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-07.rom", 0x00000, 0x20000, CRC(588dd3cb) SHA1(16c4e7670a4967768ddbfd52939d4e6e42268441) )
ROM_END
@@ -342,10 +342,10 @@ ROM_START( darksea1 )
ROM_LOAD( "mac-00.rom", 0x000000, 0x80000, CRC(52acf1d6) SHA1(a7b68782417baafc86371b106fd31c5317f5b3d8) ) /* sprites */
ROM_LOAD( "mac-01.rom", 0x080000, 0x80000, CRC(b28f7584) SHA1(e02ddd45130a7b50f80b6dd049059dba8071d768) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-08.rom", 0x00000, 0x20000, CRC(c9bf68e1) SHA1(c81e2534a814fe44c8787946a9fbe18f1743c3b4) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-07.rom", 0x00000, 0x20000, CRC(588dd3cb) SHA1(16c4e7670a4967768ddbfd52939d4e6e42268441) )
ROM_END
@@ -373,10 +373,10 @@ ROM_START( darkseaj )
ROM_LOAD( "mac-00.rom", 0x000000, 0x80000, CRC(52acf1d6) SHA1(a7b68782417baafc86371b106fd31c5317f5b3d8) ) /* sprites */
ROM_LOAD( "mac-01.rom", 0x080000, 0x80000, CRC(b28f7584) SHA1(e02ddd45130a7b50f80b6dd049059dba8071d768) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-08.rom", 0x00000, 0x20000, CRC(c9bf68e1) SHA1(c81e2534a814fe44c8787946a9fbe18f1743c3b4) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-07.rom", 0x00000, 0x20000, CRC(588dd3cb) SHA1(16c4e7670a4967768ddbfd52939d4e6e42268441) )
ROM_END
@@ -404,10 +404,10 @@ ROM_START( gatedoom )
ROM_LOAD( "mac-00.rom", 0x000000, 0x80000, CRC(52acf1d6) SHA1(a7b68782417baafc86371b106fd31c5317f5b3d8) ) /* sprites */
ROM_LOAD( "mac-01.rom", 0x080000, 0x80000, CRC(b28f7584) SHA1(e02ddd45130a7b50f80b6dd049059dba8071d768) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-08.rom", 0x00000, 0x20000, CRC(c9bf68e1) SHA1(c81e2534a814fe44c8787946a9fbe18f1743c3b4) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-07.rom", 0x00000, 0x20000, CRC(588dd3cb) SHA1(16c4e7670a4967768ddbfd52939d4e6e42268441) )
ROM_END
@@ -438,10 +438,10 @@ ROM_START( gatedom1 )
ROM_LOAD( "mac-00.rom", 0x000000, 0x80000, CRC(52acf1d6) SHA1(a7b68782417baafc86371b106fd31c5317f5b3d8) ) /* sprites */
ROM_LOAD( "mac-01.rom", 0x080000, 0x80000, CRC(b28f7584) SHA1(e02ddd45130a7b50f80b6dd049059dba8071d768) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-08.rom", 0x00000, 0x20000, CRC(c9bf68e1) SHA1(c81e2534a814fe44c8787946a9fbe18f1743c3b4) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fz-07.rom", 0x00000, 0x20000, CRC(588dd3cb) SHA1(16c4e7670a4967768ddbfd52939d4e6e42268441) )
ROM_END
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 01da5492670..3f0a8bf0733 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -628,7 +628,7 @@ ROM_START( dassault )
ROM_LOAD16_BYTE( "gs14", 0x040000, 0x20000, CRC(750fc523) SHA1(ef8794359ff3a44a97ab402821fbe205a0be8f6a) )
ROM_LOAD16_BYTE( "gs15", 0x040001, 0x20000, CRC(f14edd3d) SHA1(802d576df6dac2c9bf99f963f1955fc3a7ffdac0) )
- ROM_REGION(0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION(0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gs07", 0x00000, 0x20000, CRC(750b7e5d) SHA1(d33b17a1d8c9b05d5c1daf0c80fed6381e04b167) )
ROM_REGION(0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -694,7 +694,7 @@ ROM_START( dassaul4 )
ROM_LOAD16_BYTE( "gs14", 0x040000, 0x20000, CRC(750fc523) SHA1(ef8794359ff3a44a97ab402821fbe205a0be8f6a) )
ROM_LOAD16_BYTE( "gs15", 0x040001, 0x20000, CRC(f14edd3d) SHA1(802d576df6dac2c9bf99f963f1955fc3a7ffdac0) )
- ROM_REGION(0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION(0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gs07", 0x00000, 0x20000, CRC(750b7e5d) SHA1(d33b17a1d8c9b05d5c1daf0c80fed6381e04b167) )
ROM_REGION(0x80000, "oki2", 0 ) /* Extra Oki samples */
@@ -760,7 +760,7 @@ ROM_START( thndzone )
ROM_LOAD16_BYTE( "gs14", 0x040000, 0x20000, CRC(750fc523) SHA1(ef8794359ff3a44a97ab402821fbe205a0be8f6a) )
ROM_LOAD16_BYTE( "gs15", 0x040001, 0x20000, CRC(f14edd3d) SHA1(802d576df6dac2c9bf99f963f1955fc3a7ffdac0) )
- ROM_REGION(0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION(0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "gs07", 0x00000, 0x20000, CRC(750b7e5d) SHA1(d33b17a1d8c9b05d5c1daf0c80fed6381e04b167) )
ROM_REGION(0x80000, "oki2", 0 ) /* Extra Oki samples */
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index 116f7a5e773..78d41be9091 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -347,7 +347,7 @@ ROM_START( dcon )
ROM_LOAD( "obj2", 0x100000, 0x80000, CRC(24e0b51c) SHA1(434b4d58f785eefb5380c08a0704c8dea6609268) )
ROM_LOAD( "obj3", 0x180000, 0x80000, CRC(5274f02d) SHA1(69b94363624177c92e1b3413244ce649c2e5a696) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "pcm", 0x000000, 0x20000, CRC(d2133b85) SHA1(a2e61c9893da8a95c35c0b47e2c43c315b654de8) )
ROM_END
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 1d65044ab3b..33846e33369 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -8391,6 +8391,8 @@ ROM_START( hginga )
ROM_RELOAD( 0x120000, 0x20000 )
ROM_RELOAD( 0x140000, 0x20000 )
ROM_RELOAD( 0x160000, 0x20000 )
+
+ ROM_REGION( 0x40000, "oki", ROMREGION_ERASEFF ) /* Samples - none */
ROM_END
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 69dd9b78013..534525e49f8 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -1468,7 +1468,7 @@ ROM_START( hbarrel )
ROM_LOAD( "hb09.bin", 0x60000, 0x10000, CRC(26240ea0) SHA1(25732986d787afd99a045ce4587f1079f84e675b) )
ROM_LOAD( "hb10.bin", 0x70000, 0x10000, CRC(47d95447) SHA1(d2ffe96a19cfcbddee0df07dad89bd83cba801fa) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "hb08.bin", 0x0000, 0x10000, CRC(645c5b68) SHA1(096ca5d7b5df752df6d2c856b3f94b29eea7c3de) )
ROM_END
@@ -1517,7 +1517,7 @@ ROM_START( hbarrelw )
ROM_LOAD( "hb09.bin", 0x60000, 0x10000, CRC(26240ea0) SHA1(25732986d787afd99a045ce4587f1079f84e675b) )
ROM_LOAD( "hb10.bin", 0x70000, 0x10000, CRC(47d95447) SHA1(d2ffe96a19cfcbddee0df07dad89bd83cba801fa) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "hb_ec08.rom", 0x0000, 0x10000, CRC(2159a609) SHA1(cae503e446c7164a44b59886680f554a4cb1eef2) )
ROM_END
@@ -1560,7 +1560,7 @@ ROM_START( baddudes )
ROM_LOAD( "baddudes.9", 0x60000, 0x10000, CRC(6901e628) SHA1(1162c8cee20450780774cad54a9af40ebf0f0826) )
ROM_LOAD( "baddudes.10", 0x70000, 0x08000, CRC(eeee8a1a) SHA1(2bf8378ff38f6a7c7cbd4cbd489de25cb1f0fe71) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "baddudes.8", 0x0000, 0x10000, CRC(3c87463e) SHA1(f17c98507b562e91e9b27599614b3249fe68ff7a) )
ROM_END
@@ -1603,7 +1603,7 @@ ROM_START( drgninja )
ROM_LOAD( "baddudes.9", 0x60000, 0x10000, CRC(6901e628) SHA1(1162c8cee20450780774cad54a9af40ebf0f0826) )
ROM_LOAD( "baddudes.10", 0x70000, 0x08000, CRC(eeee8a1a) SHA1(2bf8378ff38f6a7c7cbd4cbd489de25cb1f0fe71) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "baddudes.8", 0x0000, 0x10000, CRC(3c87463e) SHA1(f17c98507b562e91e9b27599614b3249fe68ff7a) )
ROM_END
@@ -1649,7 +1649,7 @@ ROM_START( birdtry )
ROM_LOAD( "ek-09.bin", 0x60000, 0x10000, CRC(6d2d488a) SHA1(40b21a4bc8a4641a6f80d7579e32fe9d69eb42f1) )
ROM_LOAD( "ek-10.bin", 0x70000, 0x08000, CRC(580ba206) SHA1(8e57e4ef8c732b85e494bd6ec5da6566f27540e6) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ek-08.bin", 0x0000, 0x10000, CRC(be3db6cb) SHA1(4e8b8e0bef3a3f36d7e641e27b5f48c8fe9a8b7f) )
ROM_END
@@ -1692,7 +1692,7 @@ ROM_START( robocop )
ROM_LOAD( "ep13", 0x60000, 0x10000, CRC(8fca9f28) SHA1(cac85bf2b66e49e22c33c85bdb5712feef6aae7e) )
ROM_LOAD( "ep12", 0x70000, 0x08000, CRC(3cd1d0c3) SHA1(ca3546cf51ebb10dfa4e78954f0212e8fcdb3d57) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ep02", 0x00000, 0x10000, CRC(711ce46f) SHA1(939a8545e53776ff2180d2c7e63bc997689c088e) )
/*
@@ -1750,7 +1750,7 @@ ROM_START( robocopw )
ROM_LOAD( "ep13", 0x60000, 0x10000, CRC(8fca9f28) SHA1(cac85bf2b66e49e22c33c85bdb5712feef6aae7e) )
ROM_LOAD( "ep12", 0x70000, 0x08000, CRC(3cd1d0c3) SHA1(ca3546cf51ebb10dfa4e78954f0212e8fcdb3d57) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ep02", 0x00000, 0x10000, CRC(711ce46f) SHA1(939a8545e53776ff2180d2c7e63bc997689c088e) )
ROM_END
@@ -1793,7 +1793,7 @@ ROM_START( robocopj )
ROM_LOAD( "ep13", 0x60000, 0x10000, CRC(8fca9f28) SHA1(cac85bf2b66e49e22c33c85bdb5712feef6aae7e) )
ROM_LOAD( "ep12", 0x70000, 0x08000, CRC(3cd1d0c3) SHA1(ca3546cf51ebb10dfa4e78954f0212e8fcdb3d57) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ep02", 0x00000, 0x10000, CRC(711ce46f) SHA1(939a8545e53776ff2180d2c7e63bc997689c088e) )
ROM_END
@@ -1836,7 +1836,7 @@ ROM_START( robocopu )
ROM_LOAD( "ep13", 0x60000, 0x10000, CRC(8fca9f28) SHA1(cac85bf2b66e49e22c33c85bdb5712feef6aae7e) )
ROM_LOAD( "ep12", 0x70000, 0x08000, CRC(3cd1d0c3) SHA1(ca3546cf51ebb10dfa4e78954f0212e8fcdb3d57) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ep02", 0x00000, 0x10000, CRC(711ce46f) SHA1(939a8545e53776ff2180d2c7e63bc997689c088e) )
ROM_END
@@ -1879,7 +1879,7 @@ ROM_START( robocpu0 )
ROM_LOAD( "ep13", 0x60000, 0x10000, CRC(8fca9f28) SHA1(cac85bf2b66e49e22c33c85bdb5712feef6aae7e) )
ROM_LOAD( "ep12", 0x70000, 0x08000, CRC(3cd1d0c3) SHA1(ca3546cf51ebb10dfa4e78954f0212e8fcdb3d57) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ep02", 0x00000, 0x10000, CRC(711ce46f) SHA1(939a8545e53776ff2180d2c7e63bc997689c088e) )
ROM_END
@@ -1919,7 +1919,7 @@ ROM_START( robocopb )
ROM_LOAD( "ep13", 0x60000, 0x10000, CRC(8fca9f28) SHA1(cac85bf2b66e49e22c33c85bdb5712feef6aae7e) )
ROM_LOAD( "ep12", 0x70000, 0x08000, CRC(3cd1d0c3) SHA1(ca3546cf51ebb10dfa4e78954f0212e8fcdb3d57) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ep02", 0x00000, 0x10000, CRC(711ce46f) SHA1(939a8545e53776ff2180d2c7e63bc997689c088e) )
ROM_END
@@ -2078,7 +2078,7 @@ ROM_START( hippodrm )
ROM_LOAD( "ew17", 0x60000, 0x10000, CRC(8c97c757) SHA1(36fd807da9e144dfb29c8252e9450cc37ca2604f) )
ROM_LOAD( "ew12", 0x70000, 0x10000, CRC(a2d244bc) SHA1(ff2391efc480f36a302650691f8a7a620b86d99a) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ew03", 0x0000, 0x10000, CRC(b606924d) SHA1(b759fcec10b333465cf5cd1b30987bf2d62186b2) )
ROM_END
@@ -2121,7 +2121,7 @@ ROM_START( ffantasy )
ROM_LOAD( "ev17", 0x60000, 0x10000, CRC(045509d4) SHA1(ebbd71de8e8492ff6321e3ede0d98d9ed462de01) )
ROM_LOAD( "ew12", 0x70000, 0x10000, CRC(a2d244bc) SHA1(ff2391efc480f36a302650691f8a7a620b86d99a) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ew03", 0x0000, 0x10000, CRC(b606924d) SHA1(b759fcec10b333465cf5cd1b30987bf2d62186b2) )
ROM_END
@@ -2164,7 +2164,7 @@ ROM_START( ffantasa )
ROM_LOAD( "ev17", 0x60000, 0x10000, CRC(045509d4) SHA1(ebbd71de8e8492ff6321e3ede0d98d9ed462de01) )
ROM_LOAD( "ew12", 0x70000, 0x10000, CRC(a2d244bc) SHA1(ff2391efc480f36a302650691f8a7a620b86d99a) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ew03", 0x0000, 0x10000, CRC(b606924d) SHA1(b759fcec10b333465cf5cd1b30987bf2d62186b2) )
ROM_END
@@ -2198,7 +2198,7 @@ ROM_START( slyspy )
ROM_LOAD( "fa00.2a", 0x40000, 0x20000, CRC(f7df3fd7) SHA1(ed9e4649e0b1fcca61cf4d159b3f8a35f06102ce) )
ROM_LOAD( "fa02.5a", 0x60000, 0x20000, CRC(84e8da9d) SHA1(41da6042f80ea3562aa350f4f466b16db29e2aca) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fa11.11k", 0x00000, 0x20000, CRC(4e547bad) SHA1(655eda4d00f8846957ed40dcbf750fba3ce19f4e) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -2241,7 +2241,7 @@ ROM_START( slyspy2 )
ROM_LOAD( "fa00.2a", 0x40000, 0x20000, CRC(f7df3fd7) SHA1(ed9e4649e0b1fcca61cf4d159b3f8a35f06102ce) )
ROM_LOAD( "fa02.5a", 0x60000, 0x20000, CRC(84e8da9d) SHA1(41da6042f80ea3562aa350f4f466b16db29e2aca) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fa11.11k", 0x00000, 0x20000, CRC(4e547bad) SHA1(655eda4d00f8846957ed40dcbf750fba3ce19f4e) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -2284,7 +2284,7 @@ ROM_START( secretag )
ROM_LOAD( "fa00.2a", 0x40000, 0x20000, CRC(f7df3fd7) SHA1(ed9e4649e0b1fcca61cf4d159b3f8a35f06102ce) )
ROM_LOAD( "fa02.5a", 0x60000, 0x20000, CRC(84e8da9d) SHA1(41da6042f80ea3562aa350f4f466b16db29e2aca) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fa11.11k", 0x00000, 0x20000, CRC(4e547bad) SHA1(655eda4d00f8846957ed40dcbf750fba3ce19f4e) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -2357,7 +2357,7 @@ ROM_START( secretab )
ROM_LOAD( "sa_21.bin", 0x70000, 0x10000,CRC(dc6a38df) SHA1(9043df911389d3f085299f2f2202cab356473a32) )
ROM_LOAD( "sa_22.bin", 0x60000, 0x10000,CRC(d234cae5) SHA1(0cd07bf087a4da19a5da29785385de9eee52d0fb) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "sa_02.bin", 0x00000, 0x10000,CRC(439eb5a9) SHA1(8d6baad8a1e89279ef0a378941d3d9b49a606864) ) // both halves identical
ROM_END
@@ -2395,7 +2395,7 @@ ROM_START( midres )
ROM_LOAD( "fl00", 0x40000, 0x20000, CRC(756fb801) SHA1(35510c4ddf9258d87fdee0d3a64a8de0ebd1967d) )
ROM_LOAD( "fl02", 0x60000, 0x20000, CRC(54d2c120) SHA1(84f93bcd41d5bda8cfb39c4947fff025f53b143d) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fl17", 0x00000, 0x20000, CRC(9029965d) SHA1(9b28dc38e86f24fa89d7971b141c9bdddc662c99) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -2442,7 +2442,7 @@ ROM_START( midresu )
ROM_LOAD( "fl00", 0x40000, 0x20000, CRC(756fb801) SHA1(35510c4ddf9258d87fdee0d3a64a8de0ebd1967d) )
ROM_LOAD( "fl02", 0x60000, 0x20000, CRC(54d2c120) SHA1(84f93bcd41d5bda8cfb39c4947fff025f53b143d) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fl17", 0x00000, 0x20000, CRC(9029965d) SHA1(9b28dc38e86f24fa89d7971b141c9bdddc662c99) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -2489,7 +2489,7 @@ ROM_START( midresj )
ROM_LOAD( "fl00", 0x40000, 0x20000, CRC(756fb801) SHA1(35510c4ddf9258d87fdee0d3a64a8de0ebd1967d) )
ROM_LOAD( "fl02", 0x60000, 0x20000, CRC(54d2c120) SHA1(84f93bcd41d5bda8cfb39c4947fff025f53b143d) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fh17", 0x00000, 0x20000, CRC(c7b0a24e) SHA1(8a068d7838bbdfb200c7104deb0cd5647336117a) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -2572,7 +2572,7 @@ ROM_START( midresb )
ROM_LOAD( "5.bin", 0x60000, 0x10000, CRC(fd0bd8d3) SHA1(d6b19869ddc2a8ed4f38ba9d613b71853f2d13c0) )
ROM_LOAD( "1.bin", 0x70000, 0x10000, CRC(fc46d5ed) SHA1(20ddf3f67f0dfb222ad8d3fd464b892ec9c9e4f5) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "16.bin", 0x00000, 0x10000, CRC(ccf24b52) SHA1(39b2663c548b30684197284cb8e7a6ca803330c9) )
ROM_END
@@ -2609,7 +2609,7 @@ ROM_START( bouldash )
ROM_LOAD( "fn-00", 0x20000, 0x10000, CRC(ec18d098) SHA1(3cd1a27de295a177e81c14b9e9bbfcf5793aade2) )
ROM_LOAD( "fn-02", 0x30000, 0x10000, CRC(4f060cba) SHA1(4063183e699bb8b6059d56f4e2fec5fa0b037c23) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fn-11", 0x00000, 0x10000, CRC(990fd8d9) SHA1(a37bd96ecd75c610d98df3320f53ae4e2b7fdefd) )
ROM_REGION( 0x0100, "proms", 0 )
@@ -2648,7 +2648,7 @@ ROM_START( bouldshj )
ROM_LOAD( "fn-00", 0x20000, 0x10000, CRC(ec18d098) SHA1(3cd1a27de295a177e81c14b9e9bbfcf5793aade2) )
ROM_LOAD( "fn-02", 0x30000, 0x10000, CRC(4f060cba) SHA1(4063183e699bb8b6059d56f4e2fec5fa0b037c23) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "fn-11", 0x00000, 0x10000, CRC(990fd8d9) SHA1(a37bd96ecd75c610d98df3320f53ae4e2b7fdefd) )
ROM_REGION( 0x0100, "proms", 0 )
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index ef15019a942..1f8515a07a5 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -1383,7 +1383,7 @@ ROM_START( bluehawk )
ROM_LOAD16_BYTE( "rom6", 0x00000, 0x20000, CRC(e6bd9daa) SHA1(3b478fd02b145d13e49539df5260191a5254be19) )
ROM_LOAD16_BYTE( "rom5", 0x00001, 0x20000, CRC(5c654dc6) SHA1(f10f64d7114adf7f18ec37c193c524ec80236201) )
- ROM_REGION( 0x20000, "oki", 0 ) /* OKI6295 samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* OKI6295 samples */
ROM_LOAD( "rom4", 0x00000, 0x20000, CRC(f7318919) SHA1(8b7e2ffe77603142cf1b9440585f8dfa9199ed05) )
ROM_END
@@ -1411,7 +1411,7 @@ ROM_START( bluehawn )
ROM_LOAD16_BYTE( "rom6", 0x00000, 0x20000, CRC(e6bd9daa) SHA1(3b478fd02b145d13e49539df5260191a5254be19) )
ROM_LOAD16_BYTE( "rom5", 0x00001, 0x20000, CRC(5c654dc6) SHA1(f10f64d7114adf7f18ec37c193c524ec80236201) )
- ROM_REGION( 0x20000, "oki", 0 ) /* OKI6295 samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* OKI6295 samples */
ROM_LOAD( "rom4", 0x00000, 0x20000, CRC(f7318919) SHA1(8b7e2ffe77603142cf1b9440585f8dfa9199ed05) )
ROM_END
@@ -1537,7 +1537,7 @@ ROM_START( sadari )
ROM_LOAD16_BYTE( "12.10g", 0x40000, 0x20000, CRC(547b7645) SHA1(fdfe5cccdae1b88736aae702aa55fd642396ce01) )
ROM_LOAD16_BYTE( "7.8g", 0x40001, 0x20000, CRC(14f20fa3) SHA1(95aabb5a5de976fb62b5cffd3efb2a86b5d62c20) )
- ROM_REGION( 0x20000, "oki", 0 ) /* OKI6295 samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* OKI6295 samples */
ROM_LOAD( "8.10r", 0x00000, 0x20000, CRC(9c29a093) SHA1(b6252e0cb8e618cdc4a741ee7ab01058f929fd11) )
ROM_END
@@ -1562,7 +1562,7 @@ ROM_START( gundl94 )
ROM_LOAD16_BYTE( "gd94_012.g9", 0x00000, 0x20000, CRC(117c693c) SHA1(e08bd6fbbae8ac657e6a1f9df36983ace941da3a) )
ROM_LOAD16_BYTE( "gd94_007.g7", 0x00001, 0x20000, CRC(96a72c6d) SHA1(b79a746fc114eb8977591f147e4ea4a4e4f14526) )
- ROM_REGION( 0x20000, "oki", 0 ) /* OKI6295 samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* OKI6295 samples */
ROM_LOAD( "gd94_008.r9", 0x00000, 0x20000, CRC(f92e5803) SHA1(69dd11469e9e6bdc7825a5a14994276b50c10a14) )
ROM_REGION( 0x30000, "cpu2", 0 ) /* extra z80 rom? this doesn't seem to belong to this game! */
@@ -1595,7 +1595,7 @@ ROM_START( primella )
ROM_LOAD16_BYTE( "8_g9.bin", 0x00000, 0x20000, CRC(542ecb83) SHA1(0a4decaad9dde4681f7b6cdab0ae0e4951efc83d) )
ROM_LOAD16_BYTE( "5_g7.bin", 0x00001, 0x20000, CRC(058ecac6) SHA1(12f70f78b882b6ce08c56f6fa9a1211c3464bf9d) )
- ROM_REGION( 0x20000, "oki", 0 ) /* OKI6295 samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* OKI6295 samples */
ROM_LOAD( "gd94_008.r9", 0x00000, 0x20000, CRC(f92e5803) SHA1(69dd11469e9e6bdc7825a5a14994276b50c10a14) ) /* 6_r9 */
ROM_END
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index c8b82463ae2..e8bcb6ff10c 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -729,7 +729,7 @@ ROM_START( dunhuang )
ROM_LOAD( "rom4.u3", 0x00000, 0x40000, CRC(7db45227) SHA1(2a12a2b8a1e58946ce3e7c770b3ca4803c3c3ccd) )
ROM_LOAD( "rom5.u2", 0x40000, 0x80000, CRC(d609880e) SHA1(3d69800e959e8f24ef950fea4312610c4407f6ba) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "rom6.u1", 0x00000, 0x20000, CRC(31cfdc29) SHA1(725249eae9227eadf05418b799e0da0254bb2f51) )
ROM_END
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index f922dba2003..4ddf0d37948 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -371,7 +371,7 @@ ROM_START( dynduke )
ROM_LOAD16_BYTE( "dd.f1", 0x180000, 0x40000, CRC(9aed24ba) SHA1(0068b5bc0d7c817eee3bfbf7de6d19652ba78d41) )
ROM_LOAD16_BYTE( "dd.f2", 0x180001, 0x40000, CRC(3eb5783f) SHA1(5487ceb4f3241241af1a81b1bb686bd3af10b0d1) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "7.x10", 0x000000, 0x10000, CRC(9cbc7b41) SHA1(107c19d3d71ee6af63d03f7278310c5e3786f91d) )
ROM_END
@@ -419,7 +419,7 @@ ROM_START( dyndukf )
ROM_LOAD16_BYTE( "dd.f1", 0x180000, 0x40000, CRC(9aed24ba) SHA1(0068b5bc0d7c817eee3bfbf7de6d19652ba78d41) )
ROM_LOAD16_BYTE( "dd.f2", 0x180001, 0x40000, CRC(3eb5783f) SHA1(5487ceb4f3241241af1a81b1bb686bd3af10b0d1) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "7.x10", 0x000000, 0x10000, CRC(9cbc7b41) SHA1(107c19d3d71ee6af63d03f7278310c5e3786f91d) )
ROM_END
@@ -469,7 +469,7 @@ ROM_START( dbldyn )
ROM_LOAD16_BYTE( "dd.f1", 0x180000, 0x40000, CRC(9aed24ba) SHA1(0068b5bc0d7c817eee3bfbf7de6d19652ba78d41) )
ROM_LOAD16_BYTE( "dd.f2", 0x180001, 0x40000, CRC(3eb5783f) SHA1(5487ceb4f3241241af1a81b1bb686bd3af10b0d1) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "7.x10", 0x000000, 0x10000, CRC(9cbc7b41) SHA1(107c19d3d71ee6af63d03f7278310c5e3786f91d) )
ROM_END
@@ -518,7 +518,7 @@ ROM_START( dbldynf )
ROM_LOAD16_BYTE( "dd.f1", 0x180000, 0x40000, CRC(9aed24ba) SHA1(0068b5bc0d7c817eee3bfbf7de6d19652ba78d41) )
ROM_LOAD16_BYTE( "dd.f2", 0x180001, 0x40000, CRC(3eb5783f) SHA1(5487ceb4f3241241af1a81b1bb686bd3af10b0d1) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "7.x10", 0x000000, 0x10000, CRC(9cbc7b41) SHA1(107c19d3d71ee6af63d03f7278310c5e3786f91d) )
ROM_END
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 82957ca3cb8..43e93ab017b 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -634,7 +634,7 @@ ROM_START( klaxp1 )
ROM_REGION( 0x04000, "gfx2", ROMREGION_DISPOSE )
ROM_LOAD( "klax125d", 0x00000, 0x04000, CRC(409d818e) SHA1(63dcde3ce87c1a9d5afef8089432c499cc70f8f0) )
- ROM_REGION( 0x20000, "adpcm", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "adpcm", 0 ) /* ADPCM data */
ROM_LOAD( "klaxadp0.1f", 0x00000, 0x10000, CRC(ba1e864f) SHA1(7c45e9040701b54c8be398c6e5cdf9201dc37c17) )
ROM_LOAD( "klaxadp1.1e", 0x10000, 0x10000, CRC(dec9a5ac) SHA1(8039d946ac3613fa6193b557cc8775c81871831d) )
ROM_END
@@ -658,7 +658,7 @@ ROM_START( klaxp2 )
ROM_REGION( 0x04000, "gfx2", ROMREGION_DISPOSE )
ROM_LOAD( "klax125d", 0x00000, 0x04000, CRC(409d818e) SHA1(63dcde3ce87c1a9d5afef8089432c499cc70f8f0) )
- ROM_REGION( 0x20000, "adpcm", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "adpcm", 0 ) /* ADPCM data */
ROM_LOAD( "klaxadp0.1f", 0x00000, 0x10000, CRC(ba1e864f) SHA1(7c45e9040701b54c8be398c6e5cdf9201dc37c17) )
ROM_LOAD( "klaxadp1.1e", 0x10000, 0x10000, CRC(dec9a5ac) SHA1(8039d946ac3613fa6193b557cc8775c81871831d) )
ROM_END
@@ -710,7 +710,7 @@ ROM_START( guts )
ROM_LOAD( "guts-pfd.bin", 0xd0000, 0x10000, CRC(979af5b2) SHA1(574a41552eb641668841cf01aeed442ccd3bc8e5) )
ROM_LOAD( "guts-pfe.bin", 0xe0000, 0x10000, CRC(bf384e4d) SHA1(c4810b5a3ee754b169efa01f06941a02b50c53a0) )
- ROM_REGION( 0x20000, "adpcm", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "adpcm", 0 ) /* ADPCM data */
ROM_LOAD( "guts-adpcm0.1f", 0x00000, 0x10000, CRC(92e9c35d) SHA1(dcc724f915e113bc34f499af9fd7c8ebb6d8ba98) )
ROM_LOAD( "guts-adpcm1.1e", 0x10000, 0x10000, CRC(0afddd3a) SHA1(e1a43825ad02325a64869ec8048c8176da01b286) )
ROM_END
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index b4250a99ea4..69f5f1636f7 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -708,7 +708,7 @@ ROM_START( multchmp )
ROM_LOAD( "esd9.fu28", 0x300000, 0x080000, CRC(6652c04a) SHA1(178e1d42847506d869ef79db2f7e10df05e9ef76) )
ROM_LOAD( "esd10.fu31", 0x380000, 0x080000, CRC(d815974b) SHA1(3e528a5df79fa7dc0f38b0ee7f2f3a0ebc97a369) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "esd4.su10", 0x00000, 0x20000, CRC(6e741fcd) SHA1(742e0952916c00f67dd9f8d01e721a9a538d2fc4) )
ROM_END
@@ -738,7 +738,7 @@ ROM_START( multchmk )
ROM_LOAD( "multchmp.u31", 0x300000, 0x080000, CRC(b1e4e9e3) SHA1(1a7393e9073b028b4170393b3788ad8cb86c0c78) )
ROM_LOAD( "multchmp.u32", 0x380000, 0x080000, CRC(f05cb5b4) SHA1(1b33e60942238e39d61ae59e9317b99e83595ab1) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "esd4.su10", 0x00000, 0x20000, CRC(6e741fcd) SHA1(742e0952916c00f67dd9f8d01e721a9a538d2fc4) )
ROM_END
@@ -908,7 +908,7 @@ ROM_START( hedpanic ) /* Story line & game instructions in English */
ROM_LOAD16_BYTE( "esd8.fu35", 0x000000, 0x200000, CRC(23aceb4f) SHA1(35d9ebc33b9e1515e47750cfcdfc0bf8bf44b71d) )
ROM_LOAD16_BYTE( "esd9.fu34", 0x000001, 0x200000, CRC(76b46cd2) SHA1(679cbf50ae5935e8848868081ecef4ec66424f6c) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "esd4.su10", 0x000000, 0x020000, CRC(3c11c590) SHA1(cb33845c3dc0501fff8055c2d66f412881089df1) ) /* AT27010 mask rom */
ROM_END
@@ -933,7 +933,7 @@ ROM_START( hedpanif ) /* Story line in Japanese, game instructions in English */
ROM_LOAD16_BYTE( "esd8.fu35", 0x000000, 0x200000, CRC(23aceb4f) SHA1(35d9ebc33b9e1515e47750cfcdfc0bf8bf44b71d) )
ROM_LOAD16_BYTE( "esd9.fu34", 0x000001, 0x200000, CRC(76b46cd2) SHA1(679cbf50ae5935e8848868081ecef4ec66424f6c) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "esd4.su10", 0x000000, 0x020000, CRC(3c11c590) SHA1(cb33845c3dc0501fff8055c2d66f412881089df1) ) /* AT27010 mask rom */
ROM_END
@@ -961,7 +961,7 @@ ROM_START( hedpanio ) /* Story line & game instructions in English, copyright ye
ROM_LOAD16_BYTE( "sm3.bin", 0x000000, 0x200000, CRC(94dd4cfc) SHA1(a3f9c49611f0bc9d26166dafb44e2c5ebbb31127) )
ROM_LOAD16_BYTE( "sm4.bin", 0x000001, 0x200000, CRC(6da0fb9e) SHA1(c4e7487953f45c5f6ce2ebe558b4c325f6ec54eb) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "esd4.rom", 0x000000, 0x020000, CRC(d7ca6806) SHA1(8ad668bfb5b7561cc0f3e36dfc3c936b136a4274) )
ROM_END
@@ -1040,7 +1040,7 @@ ROM_START( tangtang )
ROM_LOAD16_BYTE( "fu35.bin", 0x000000, 0x200000, CRC(84f3f833) SHA1(f84e41d93dc47a58ada800b921a7e5902b7631cd) )
ROM_LOAD16_BYTE( "fu34.bin", 0x000001, 0x200000, CRC(bf91f543) SHA1(7c149fed8b8044850cd6b798622a91c45336cd47) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "esd4.su10", 0x00000, 0x20000, CRC(f2dfb02d) SHA1(04001488697aad3e5b2d15c9f5a81dc2b7d0952c) )
ROM_END
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 5f0109ceee2..b587afdd7d8 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -933,6 +933,8 @@ ROM_START( bbprot )
ROM_LOAD16_BYTE( "l_bb.bin", 0x000001, 0x080000, CRC(2b7b9a9a) SHA1(51088358814cc337af150526ac7fd6216c102299) )
ROM_LOAD16_BYTE( "r_bb.bin", 0x000000, 0x080000, CRC(28480f3e) SHA1(b89533fd01781e1b83c98b0b61a77f554fbdb4f3) )
+ ROM_REGION( 0x100000, "oki", ROMREGION_ERASEFF ) /* OKI Samples? */
+
ROM_REGION( 0x200000, "gfx1", ROMREGION_DISPOSE ) /* BG GFX */
ROM_LOAD( "p1_29_11.bin", 0x180000, 0x080000, CRC(e7da36c1) SHA1(c7ea40b57088145019c1be3e34ba9e94c60bef78) )
ROM_LOAD( "p2_29_11.bin", 0x100000, 0x080000, CRC(0411e1aa) SHA1(99ae1a45848f8227899989334f3035222bd5da39) )
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 511445c1c8a..790c93ba63d 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -342,7 +342,7 @@ ROM_START( funkyjet )
ROM_LOAD( "mat01", 0x000000, 0x80000, CRC(24093a8d) SHA1(71f76ddd8a4b6e05ceb2fff4e20b6edb5e011e79) ) /* sprites */
ROM_LOAD( "mat00", 0x080000, 0x80000, CRC(fbda0228) SHA1(815d49898d02e699393e370209181f2ca8301949) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "jk03.15h", 0x00000, 0x20000, CRC(69a0eaf7) SHA1(05038e82ee03106625f05082fe9912e16be181ee) )
ROM_END
@@ -361,7 +361,7 @@ ROM_START( funkyjej )
ROM_LOAD( "mat01", 0x000000, 0x80000, CRC(24093a8d) SHA1(71f76ddd8a4b6e05ceb2fff4e20b6edb5e011e79) ) /* sprites */
ROM_LOAD( "mat00", 0x080000, 0x80000, CRC(fbda0228) SHA1(815d49898d02e699393e370209181f2ca8301949) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "jk03.15h", 0x00000, 0x20000, CRC(69a0eaf7) SHA1(05038e82ee03106625f05082fe9912e16be181ee) )
ROM_END
@@ -380,7 +380,7 @@ ROM_START( sotsugyo )
ROM_LOAD( "01.4a", 0x000000, 0x80000, CRC(fa10dd54) SHA1(5dfe66df0bbab5eb151bf65f7e767a2325a50b36) ) /* sprites */
ROM_LOAD( "00.2a", 0x080000, 0x80000, CRC(d35a14ef) SHA1(b8d27766db7e183aee208c690364e4383f3c6882) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "sb030.15h", 0x00000, 0x20000, CRC(1ea43f48) SHA1(74cc8c740f1c7fa94c2cb460ea4ee7aa0c490ed7) )
ROM_END
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 010cdb9380e..f5aa93a873c 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -957,7 +957,7 @@ ROM_START( shadoww )
ROM_LOAD( "shadoww_13a.xx", 0x0e0000, 0x10000, CRC(996d2fa5) SHA1(a32526949af3635914927ebbbe684c3de9562a9d) ) /* sprites D2 */
ROM_LOAD( "shadoww_13b.xx", 0x0f0000, 0x10000, CRC(b8df8a34) SHA1(6810f7961052a983b8c78b42d550038051012c6d) ) /* sprites D2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "4.4a", 0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
ROM_END
@@ -998,7 +998,7 @@ ROM_START( shadowwa )
ROM_LOAD( "shadoww_13a.xx", 0x0e0000, 0x10000, CRC(996d2fa5) SHA1(a32526949af3635914927ebbbe684c3de9562a9d) ) /* sprites D2 */
ROM_LOAD( "shadoww_13b.xx", 0x0f0000, 0x10000, CRC(b8df8a34) SHA1(6810f7961052a983b8c78b42d550038051012c6d) ) /* sprites D2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "4.4a", 0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
ROM_END
@@ -1036,7 +1036,7 @@ ROM_START( gaiden )
ROM_LOAD( "11.1r", 0x0c0000, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
ROM_LOAD( "gaiden_13.1s", 0x0e0000, 0x20000, CRC(7d9f5c5e) SHA1(200102532ea9a88c7c708e03f8893c46dff827d1) ) /* sprites D2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "4.4a", 0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
ROM_END
@@ -1077,7 +1077,7 @@ ROM_START( ryukendn )
ROM_LOAD( "shadoww_13a.xx", 0x0e0000, 0x10000, CRC(996d2fa5) SHA1(a32526949af3635914927ebbbe684c3de9562a9d) ) /* sprites D2 */
ROM_LOAD( "ryukendn_13b.xx", 0x0f0000, 0x10000, CRC(1f43c507) SHA1(29f655442c16677855073284c7ab41059c99c497) ) /* sprites D2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "4.4a", 0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
ROM_END
@@ -1124,7 +1124,7 @@ ROM_START( ryukenda )
ROM_LOAD( "11.1r", 0x0c0000, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
ROM_LOAD( "13.1s", 0x0e0000, 0x20000, CRC(4e56a508) SHA1(f89a6037e602b26d6ce11859e0b43a602b50d985) ) /* sprites D2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "4.4a", 0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
ROM_END
@@ -1154,7 +1154,7 @@ ROM_START( tknight )
ROM_LOAD( "tkni9.bin", 0x000000, 0x80000, CRC(d22f4239) SHA1(360a9a821faabe911eef407ef85452d8b706538f) ) /* sprites */
ROM_LOAD( "tkni8.bin", 0x080000, 0x80000, CRC(4931b184) SHA1(864e827ac109c0ee52a898034c021cd5e92ff000) ) /* sprites */
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "tkni4.bin", 0x0000, 0x20000, CRC(a7a1dbcf) SHA1(2fee1d9745ce2ab54b0b9cbb6ab2e66ba9677245) ) /* samples */
ROM_END
@@ -1185,7 +1185,7 @@ ROM_START( wildfang )
ROM_LOAD( "tkni9.bin", 0x000000, 0x80000, CRC(d22f4239) SHA1(360a9a821faabe911eef407ef85452d8b706538f) ) /* sprites */
ROM_LOAD( "tkni8.bin", 0x080000, 0x80000, CRC(4931b184) SHA1(864e827ac109c0ee52a898034c021cd5e92ff000) ) /* sprites */
- ROM_REGION( 0x20000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
+ ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
ROM_LOAD( "tkni4.bin", 0x0000, 0x20000, CRC(a7a1dbcf) SHA1(2fee1d9745ce2ab54b0b9cbb6ab2e66ba9677245) ) /* samples */
ROM_END
@@ -1213,7 +1213,7 @@ ROM_START( stratof )
ROM_LOAD( "b-2m", 0x00000, 0x80000, CRC(5794ec32) SHA1(07e78d8bcb2373da77ef9f8cde6a01f384f8bf7e) )
ROM_LOAD( "b-1m", 0x80000, 0x80000, CRC(b0de0ded) SHA1(45c74d0c58e3e73c79e587722d9fea9f7ba9cb0a) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "a-4a.4", 0x00000, 0x20000, CRC(ef9acdcf) SHA1(8d62a666843f0cb22e8926ae18a961052d4f9ed5) )
ROM_END
@@ -1241,7 +1241,7 @@ ROM_START( raiga )
ROM_LOAD( "b-2m", 0x00000, 0x80000, CRC(5794ec32) SHA1(07e78d8bcb2373da77ef9f8cde6a01f384f8bf7e) )
ROM_LOAD( "b-1m", 0x80000, 0x80000, CRC(b0de0ded) SHA1(45c74d0c58e3e73c79e587722d9fea9f7ba9cb0a) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "a-4a.4", 0x00000, 0x20000, CRC(ef9acdcf) SHA1(8d62a666843f0cb22e8926ae18a961052d4f9ed5) )
ROM_END
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index c879342cae4..11fd4f1b305 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -5162,7 +5162,7 @@ ROM_START( goldstar )
ROM_REGION( 0x08000, "gfx2", ROMREGION_DISPOSE )
ROM_LOAD( "gs3.bin", 0x00000, 0x08000, CRC(8454ce3c) SHA1(74686ebb91f191db8cbc3d0417a5e8112c5b67b1) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Audio ADPCM */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Audio ADPCM */
ROM_LOAD( "gs1-snd.bin", 0x0000, 0x20000, CRC(9d58960f) SHA1(c68edf95743e146398aabf6b9617d18e1f9bf25b) )
ROM_END
@@ -5177,7 +5177,7 @@ ROM_START( goldstbl )
ROM_REGION( 0x08000, "gfx2", ROMREGION_DISPOSE )
ROM_LOAD( "gsb-spr.bin", 0x00000, 0x08000, CRC(52ecd4c7) SHA1(7ef013020521a0c19ecd67db1c00047e78a3c736) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Audio ADPCM */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Audio ADPCM */
ROM_LOAD( "gs1-snd.bin", 0x0000, 0x20000, CRC(9d58960f) SHA1(c68edf95743e146398aabf6b9617d18e1f9bf25b) )
ROM_END
@@ -5317,7 +5317,7 @@ ROM_START( moonlght )
ROM_REGION( 0x20000, "gfx2", ROMREGION_DISPOSE )
ROM_LOAD( "29.bin", 0x00000, 0x20000, CRC(8a5f274d) SHA1(0f2ad61b00e220fc509c01c11c1a8f4e47b54f2a) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Audio ADPCM */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Audio ADPCM */
ROM_LOAD( "gs1-snd.bin", 0x0000, 0x20000, CRC(9d58960f) SHA1(c68edf95743e146398aabf6b9617d18e1f9bf25b) )
ROM_END
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 410cb029426..8a38ac5bc6f 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -3013,11 +3013,11 @@ ROM_START( steeltal )
ROM_LOAD16_BYTE( "136087-1018.2t", 0x000000, 0x020000, CRC(a5882384) SHA1(157707b5b114fa584893dec07dc456d4a5520f44) )
ROM_LOAD16_BYTE( "136087-1017.2lm", 0x000001, 0x020000, CRC(0a29db30) SHA1(f11ad7fe27989ffd66e9bef2c14ec040a4125d8a) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136087-5002.1m", 0x080000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
- ROM_LOAD( "136087-5003.1n", 0x0a0000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
- ROM_LOAD( "136087-5004.1p", 0x0c0000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
- ROM_LOAD( "136087-5005.1r", 0x0e0000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
+ ROM_REGION( 0x80000, "adpcm", 0 )
+ ROM_LOAD( "136087-5002.1m", 0x000000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
+ ROM_LOAD( "136087-5003.1n", 0x020000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
+ ROM_LOAD( "136087-5004.1p", 0x040000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
+ ROM_LOAD( "136087-5005.1r", 0x060000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
ROM_REGION( 0x015D, "plds", 0 )
/* GAL's located on Sound board */
@@ -3071,11 +3071,11 @@ ROM_START( steeltag )
ROM_LOAD16_BYTE( "136087-1018.2t", 0x000000, 0x020000, CRC(a5882384) SHA1(157707b5b114fa584893dec07dc456d4a5520f44) )
ROM_LOAD16_BYTE( "136087-1017.2lm", 0x000001, 0x020000, CRC(0a29db30) SHA1(f11ad7fe27989ffd66e9bef2c14ec040a4125d8a) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136087-5002.1m", 0x080000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
- ROM_LOAD( "136087-5003.1n", 0x0a0000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
- ROM_LOAD( "136087-5004.1p", 0x0c0000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
- ROM_LOAD( "136087-5005.1r", 0x0e0000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
+ ROM_REGION( 0x80000, "adpcm", 0 )
+ ROM_LOAD( "136087-5002.1m", 0x000000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
+ ROM_LOAD( "136087-5003.1n", 0x020000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
+ ROM_LOAD( "136087-5004.1p", 0x040000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
+ ROM_LOAD( "136087-5005.1r", 0x060000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
ROM_REGION( 0x015D, "plds", 0 )
/* GAL's located on Sound board */
@@ -3129,11 +3129,11 @@ ROM_START( steelta1 )
ROM_LOAD16_BYTE( "136087-1018.2t", 0x000000, 0x020000, CRC(a5882384) SHA1(157707b5b114fa584893dec07dc456d4a5520f44) )
ROM_LOAD16_BYTE( "136087-1017.2lm", 0x000001, 0x020000, CRC(0a29db30) SHA1(f11ad7fe27989ffd66e9bef2c14ec040a4125d8a) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136087-5002.1m", 0x080000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
- ROM_LOAD( "136087-5003.1n", 0x0a0000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
- ROM_LOAD( "136087-5004.1p", 0x0c0000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
- ROM_LOAD( "136087-5005.1r", 0x0e0000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
+ ROM_REGION( 0x80000, "adpcm", 0 )
+ ROM_LOAD( "136087-5002.1m", 0x000000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
+ ROM_LOAD( "136087-5003.1n", 0x020000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
+ ROM_LOAD( "136087-5004.1p", 0x040000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
+ ROM_LOAD( "136087-5005.1r", 0x060000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
ROM_REGION( 0x015D, "plds", 0 )
/* GAL's located on Sound board */
@@ -3187,11 +3187,11 @@ ROM_START( steeltap )
ROM_LOAD16_BYTE( "rom.2t", 0x00000, 0x20000, CRC(05284504) SHA1(03b81c077f8ff073713f4bcc10b82087743b0d84) )
ROM_LOAD16_BYTE( "rom.2lm", 0x00001, 0x20000, CRC(d6e65b87) SHA1(ac4b2f292f6e28a15e3a12f09f6c2f9523e8b178) )
- ROM_REGION( 0x100000, "adpcm", 0 ) /* 1MB for ADPCM samples */
- ROM_LOAD( "136087-5002.1m", 0x080000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
- ROM_LOAD( "136087-5003.1n", 0x0a0000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
- ROM_LOAD( "136087-5004.1p", 0x0c0000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
- ROM_LOAD( "136087-5005.1r", 0x0e0000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
+ ROM_REGION( 0x80000, "adpcm", 0 )
+ ROM_LOAD( "136087-5002.1m", 0x000000, 0x020000, CRC(c904db9c) SHA1(d25fff3da87d2b716cd65fb7dd157c3f1f5e5909) )
+ ROM_LOAD( "136087-5003.1n", 0x020000, 0x020000, CRC(164580b3) SHA1(03118c8323d8a49a65addc61c1402d152d42d7f9) )
+ ROM_LOAD( "136087-5004.1p", 0x040000, 0x020000, CRC(296290a0) SHA1(8a3441a5618233f561531fe456e1f5ed22183421) )
+ ROM_LOAD( "136087-5005.1r", 0x060000, 0x020000, CRC(c029d037) SHA1(0ae736c0ca3a1974911464328dd5a6b41a939130) )
ROM_REGION( 0x015D, "plds", 0 )
/* GAL's located on Sound board */
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index c52d1e7de08..b1c6d690ced 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -726,7 +726,7 @@ ROM_START( jingbell )
ROM_LOAD( "jingle133i5.u24", 0x40000, 0x40000, CRC(021261d1) SHA1(5b23f9bd818193c343f9f4c9317955b17efb8cfa) )
ROM_LOAD( "jingle133i6.u23", 0x80000, 0x40000, CRC(c40228fd) SHA1(4dc05337d64ed2b8d66fc5f0ca8ffbf96799f768) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "jingle133isp.u38", 0x00000, 0x20000, CRC(a42d73b1) SHA1(93157e9630d5c8bb34c71186415d0aa8c5d51951) )
ROM_REGION( 0x2dd, "plds",0 )
@@ -788,7 +788,7 @@ ROM_START( gp98 )
ROM_COPY( "tempgfx", 0x140000, 0x80000, 0x40000 )
- ROM_REGION( 0x20000, "oki", ROMREGION_ERASE00 )
+ ROM_REGION( 0x40000, "oki", ROMREGION_ERASE00 )
/* no OKI on this */
ROM_END
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 5f20651a265..197e029337d 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -2033,7 +2033,7 @@ ROM_START( wfortune )
ROM_LOAD( "wofgrom2", 0x20000, 0x10000, CRC(3d393b2b) SHA1(2c94d2dab7369c099c470cf96391b033f39add78) )
ROM_LOAD( "wofgrom3", 0x30000, 0x10000, CRC(117a2ce9) SHA1(8d601c1cf9f783a42617f13c6862a5835553ac4f) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "wofsbom0", 0x00000, 0x20000, CRC(5c28c3fe) SHA1(eba64ede749fb26f9926f644d66860b54b4c76e7) )
ROM_END
@@ -2053,7 +2053,7 @@ ROM_START( wfortuna )
ROM_LOAD( "wofgrom2", 0x20000, 0x10000, CRC(3d393b2b) SHA1(2c94d2dab7369c099c470cf96391b033f39add78) )
ROM_LOAD( "wofgrom3", 0x30000, 0x10000, CRC(117a2ce9) SHA1(8d601c1cf9f783a42617f13c6862a5835553ac4f) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "wofsbom0", 0x00000, 0x20000, CRC(5c28c3fe) SHA1(eba64ede749fb26f9926f644d66860b54b4c76e7) )
ROM_END
@@ -2094,7 +2094,7 @@ ROM_START( stratab )
ROM_LOAD( "grom1.bin", 0x20000, 0x20000, CRC(340c661f) SHA1(150f9158fa6d956d08051c67c17723b1d8c66867) )
ROM_LOAD( "grom2.bin", 0x40000, 0x20000, CRC(5df9f1cf) SHA1(cad87f63ac0e902dffeeaa42538fc73f792d87d9) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x20000, CRC(6ff390b9) SHA1(f31dae9e31f3fc83b9253e49fd4204820db3587e) )
ROM_END
@@ -2112,7 +2112,7 @@ ROM_START( stratab1 )
ROM_LOAD( "grom1.bin", 0x20000, 0x20000, CRC(340c661f) SHA1(150f9158fa6d956d08051c67c17723b1d8c66867) )
ROM_LOAD( "grom2.bin", 0x40000, 0x20000, CRC(5df9f1cf) SHA1(cad87f63ac0e902dffeeaa42538fc73f792d87d9) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x20000, CRC(6ff390b9) SHA1(f31dae9e31f3fc83b9253e49fd4204820db3587e) )
ROM_END
@@ -2134,7 +2134,7 @@ ROM_START( gtg )
ROM_LOAD( "grom4.bin", 0x80000, 0x20000, CRC(faa16729) SHA1(5d46cddda66b6d23c9ebdf2fb4cebce15586b4ad) )
ROM_LOAD( "grom5.bin", 0xa0000, 0x20000, CRC(5b393314) SHA1(9e314a75ea52373369904915ec786f09eee725a9) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x20000, CRC(1cccbfdf) SHA1(546059fea2e7cd5627a666d80b1fc3ed8fcc0762) )
ROM_END
@@ -2156,7 +2156,7 @@ ROM_START( gtgt )
ROM_LOAD( "grom4.bin", 0x80000, 0x20000, CRC(faa16729) SHA1(5d46cddda66b6d23c9ebdf2fb4cebce15586b4ad) )
ROM_LOAD( "grom5.512", 0xa0000, 0x10000, CRC(44b47015) SHA1(5dde4c932a697b51fe02eab8d948889b3fe7baff) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.010", 0x00000, 0x20000, CRC(d041e0c9) SHA1(1d90f37071d92c714ff69ab2b0337c7c66147995) )
ROM_END
@@ -2179,7 +2179,7 @@ ROM_START( gtg2t )
ROM_LOAD( "grom4.bin", 0x80000, 0x20000, CRC(f6557950) SHA1(fd2bbd6b852a9f2775a23d9fdaa20d31d6766d7f) )
ROM_LOAD( "grom5.bin", 0xa0000, 0x20000, CRC(a680ce6a) SHA1(fe51546933c093cea81858b213afb0e926e9eb4e) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom00.bin", 0x00000, 0x20000, CRC(4dd4db42) SHA1(0dffb51e8de36d8747f443fd65fe9927815eaff0) )
ROM_REGION( 0x0200, "plds", ROMREGION_DISPOSE )
@@ -2204,7 +2204,7 @@ ROM_START( gtg2j )
ROM_LOAD( "grom4.bin", 0x80000, 0x20000, CRC(f6557950) SHA1(fd2bbd6b852a9f2775a23d9fdaa20d31d6766d7f) )
ROM_LOAD( "grom5.bin", 0xa0000, 0x20000, CRC(a680ce6a) SHA1(fe51546933c093cea81858b213afb0e926e9eb4e) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x20000, CRC(1cccbfdf) SHA1(546059fea2e7cd5627a666d80b1fc3ed8fcc0762) )
ROM_REGION( 0x0200, "plds", ROMREGION_DISPOSE )
@@ -2231,7 +2231,7 @@ ROM_START( slikshot )
ROM_LOAD( "grom0.bin", 0x00000, 0x20000, CRC(e60c2804) SHA1(e62d11b6c4439a70a2f32df72c8c64e2f110351e) )
ROM_LOAD( "grom1.bin", 0x20000, 0x20000, CRC(d764d542) SHA1(43fc0c9b627484a670d87da91e212741b137e995) )
- ROM_REGION( 0x10000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x10000, CRC(4b075f5e) SHA1(d1ac2c06352a5b96486a7e8cf8baae0c0e5b1883) )
ROM_END
@@ -2255,7 +2255,7 @@ ROM_START( sliksh17 )
ROM_LOAD( "grom0.bin", 0x00000, 0x20000, CRC(e60c2804) SHA1(e62d11b6c4439a70a2f32df72c8c64e2f110351e) )
ROM_LOAD( "grom1.bin", 0x20000, 0x20000, CRC(d764d542) SHA1(43fc0c9b627484a670d87da91e212741b137e995) )
- ROM_REGION( 0x10000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x10000, CRC(4b075f5e) SHA1(d1ac2c06352a5b96486a7e8cf8baae0c0e5b1883) )
ROM_END
@@ -2281,7 +2281,7 @@ ROM_START( sliksh16 )
ROM_LOAD( "pool-grom.2", 0x20000, 0x10000, CRC(c0bdf4e0) SHA1(3b7c635375c5e5fddcbc1bd1b186c960081ec37e) )
ROM_LOAD( "pool-grom.3", 0x30000, 0x10000, CRC(cb0bd9a3) SHA1(107ff127f9adad84a5f92077851423249fce8e30) )
- ROM_REGION( 0x10000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x10000, CRC(4b075f5e) SHA1(d1ac2c06352a5b96486a7e8cf8baae0c0e5b1883) )
ROM_END
@@ -2305,7 +2305,7 @@ ROM_START( dynobop )
ROM_LOAD( "dynobop.gr0", 0x00000, 0x20000, CRC(3525a7a3) SHA1(fe0b08203c135d55507506936dc34e1503e4906b) )
ROM_LOAD( "dynobop.gr1", 0x20000, 0x20000, CRC(1544a232) SHA1(60bba76537c82887db8e38c6a87c528afdd385d0) )
- ROM_REGION( 0x10000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "dynobop.sr0", 0x00000, 0x10000, CRC(b355bf1d) SHA1(c9745638feb33ec181b8d9a894421f9854286cd9) )
ROM_END
@@ -2329,7 +2329,7 @@ ROM_START( sstrike )
ROM_LOAD( "sstgrom1.bin", 0x20000, 0x20000, CRC(d9ea14e1) SHA1(4cddf3237c203b0a3f7ae770f85f1be35e9e1b78) )
ROM_LOAD( "sstgrom2.bin", 0x40000, 0x20000, CRC(dcd97bf7) SHA1(95361222ac58bf74539f2a7e80574bcd848c615e) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "sstsrom0.bin", 0x00000, 0x20000, CRC(6ff390b9) SHA1(f31dae9e31f3fc83b9253e49fd4204820db3587e) )
ROM_END
@@ -2347,7 +2347,7 @@ ROM_START( pokrdice )
ROM_LOAD( "pd-grom0.bin", 0x00000, 0x20000, CRC(7c2573e7) SHA1(d6a2a16277ad854c66927d88c5617d05eefe1057) )
ROM_LOAD( "pd-grom1.bin", 0x20000, 0x20000, CRC(e7c06aeb) SHA1(4be54b078d886359bf6ed376019cc1f6f04f52d6) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "pd-srom.0", 0x00000, 0x10000, CRC(f85dbd6f) SHA1(fce53019432e4a84e52f0ae1996b2e0d94b32bc0) )
ROM_END
@@ -2368,7 +2368,7 @@ ROM_START( hstennis )
ROM_LOAD( "grom3.bin", 0x60000, 0x20000, CRC(54afb456) SHA1(0a7f10b1a490825a85489ac3f678eb1e11a0ac65) )
ROM_LOAD( "grom4.bin", 0x80000, 0x20000, CRC(ee09d645) SHA1(8233cfbd17d9de548ae3ca5e30928061712e0781) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x20000, CRC(d9ce58c3) SHA1(92574e60497d86b8608fba6278ccfc9036cb7f22) )
ROM_REGION( 0x0200, "plds", ROMREGION_DISPOSE )
@@ -2392,7 +2392,7 @@ ROM_START( hstenn10 )
ROM_LOAD( "grom3.bin", 0x60000, 0x20000, CRC(54afb456) SHA1(0a7f10b1a490825a85489ac3f678eb1e11a0ac65) )
ROM_LOAD( "grom4.bin", 0x80000, 0x20000, CRC(ee09d645) SHA1(8233cfbd17d9de548ae3ca5e30928061712e0781) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0.bin", 0x00000, 0x20000, CRC(d9ce58c3) SHA1(92574e60497d86b8608fba6278ccfc9036cb7f22) )
ROM_REGION( 0x0200, "plds", ROMREGION_DISPOSE )
@@ -2434,7 +2434,7 @@ ROM_START( peggle )
ROM_LOAD( "grom1.bin", 0x20000, 0x20000, CRC(85a7a3a2) SHA1(7fb7be67c75867fcccf4272f1ce42f2af94c16e6) )
ROM_LOAD( "grom2.bin", 0x40000, 0x20000, CRC(bfe11f18) SHA1(5e8d36c6a86a8eb883f50620fbfcea3d8398faeb) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0", 0x00000, 0x20000, CRC(001846ea) SHA1(6a6b77f6d51c4a68105c935804b896aad9981719) )
ROM_END
@@ -2453,7 +2453,7 @@ ROM_START( pegglet )
ROM_LOAD( "grom1.bin", 0x20000, 0x20000, CRC(85a7a3a2) SHA1(7fb7be67c75867fcccf4272f1ce42f2af94c16e6) )
ROM_LOAD( "grom2.bin", 0x40000, 0x20000, CRC(bfe11f18) SHA1(5e8d36c6a86a8eb883f50620fbfcea3d8398faeb) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom0", 0x00000, 0x20000, CRC(001846ea) SHA1(6a6b77f6d51c4a68105c935804b896aad9981719) )
ROM_END
@@ -2620,7 +2620,7 @@ ROM_START( gpgolf )
ROM_LOAD( "grom01.bin", 0x40000, 0x40000, BAD_DUMP CRC(2c834cf9) SHA1(49eb070ca4439d4fcd2d8a2db62d3c99b824bf99) ) /* Self test checksum reports BAD */
ROM_LOAD( "grom02.bin", 0x80000, 0x40000, CRC(aebe6c45) SHA1(15e64fcb36cb1064988ee5cd45699d501a6e7f01) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom00.bin", 0x00000, 0x20000, CRC(4dd4db42) SHA1(0dffb51e8de36d8747f443fd65fe9927815eaff0) )
ROM_END
@@ -2643,7 +2643,7 @@ ROM_START( gtg2 )
ROM_LOAD( "grom4.bin", 0x80000, 0x20000, CRC(f6557950) SHA1(fd2bbd6b852a9f2775a23d9fdaa20d31d6766d7f) )
ROM_LOAD( "grom5.bin", 0xa0000, 0x20000, CRC(a680ce6a) SHA1(fe51546933c093cea81858b213afb0e926e9eb4e) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "srom00.bin", 0x00000, 0x20000, CRC(4dd4db42) SHA1(0dffb51e8de36d8747f443fd65fe9927815eaff0) )
ROM_REGION( 0x0200, "plds", ROMREGION_DISPOSE )
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index 4b7350a8ba2..be2726022ed 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -407,7 +407,7 @@ ROM_START( laperlag )
ROM_LOAD( "ic18-laperlaneragold2.bin", 0x000000, 0x80000, CRC(ae37de44) SHA1(089f97678fa39aee1885d7c63c4bc7c88e7fe553) )
ROM_LOAD( "ic17-laperlaneragold3.bin", 0x080000, 0x80000, CRC(86da6d11) SHA1(e6b7f9ccbf2e91a60fdf38067ec7ac7e73dea8cd) )
- ROM_REGION( 0x20000, "oki", 0 ) /* M6295 samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* M6295 samples */
ROM_LOAD( "ic25-uno.bin", 0x00000, 0x20000, CRC(e6a0854b) SHA1(394e01bb24abd1e0d2c447b4d620fc5d02257d8a) )
ROM_END
@@ -549,7 +549,7 @@ ROM_START( euro2k2s )
ROM_LOAD( "europa2002_2-a.ic20", 0x100000, 0x40000, CRC(971bc33b) SHA1(c385e5bef57cdb52a86c1e38fca471ef5ab3da7c) )
ROM_LOAD( "europa2002space3.ic19", 0x140000, 0x40000, CRC(d82dba04) SHA1(63d407dd036d3c7f190ad7b6d694288e9a9e56d0) ) /* identical halves */
- ROM_REGION( 0x20000, "oki", 0 ) /* M6295 samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* M6295 samples */
ROM_LOAD( "1-a.ic25", 0x00000, 0x20000, CRC(8fcb283d) SHA1(9e95c72967da13606eed6d16f84145273b9ffddf) )
ROM_END
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 4060df6a46d..8f1cb5584b7 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -212,7 +212,7 @@ ROM_START( klax )
ROM_LOAD( "136075-2014.17y", 0x00000, 0x10000, CRC(5c551e92) SHA1(cbff8fc4f4d370b6db2b4953ecbedd249916b891) )
ROM_LOAD( "136075-2013.17w", 0x10000, 0x10000, CRC(36764bbc) SHA1(5762996a327b5f7f93f42dad7eccb6297b3e4c0b) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM data */
ROM_LOAD( "136075-1015.14b", 0x00000, 0x10000, CRC(4d24c768) SHA1(da102105a4d8c552e3594b8ffb1903ecbaa69415) )
ROM_LOAD( "136075-1016.12b", 0x10000, 0x10000, CRC(12e9b4b7) SHA1(2447f116cd865e46e61022143a2668beca99d5d1) )
@@ -242,7 +242,7 @@ ROM_START( klax2 )
ROM_LOAD( "136075-2014.17y", 0x00000, 0x10000, CRC(5c551e92) SHA1(cbff8fc4f4d370b6db2b4953ecbedd249916b891) )
ROM_LOAD( "136075-2013.17w", 0x10000, 0x10000, CRC(36764bbc) SHA1(5762996a327b5f7f93f42dad7eccb6297b3e4c0b) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM data */
ROM_LOAD( "136075-1015.14b", 0x00000, 0x10000, CRC(4d24c768) SHA1(da102105a4d8c552e3594b8ffb1903ecbaa69415) )
ROM_LOAD( "136075-1016.12b", 0x10000, 0x10000, CRC(12e9b4b7) SHA1(2447f116cd865e46e61022143a2668beca99d5d1) )
@@ -272,7 +272,7 @@ ROM_START( klax3 )
ROM_LOAD( "136075-2014.17y", 0x00000, 0x10000, CRC(5c551e92) SHA1(cbff8fc4f4d370b6db2b4953ecbedd249916b891) )
ROM_LOAD( "136075-2013.17w", 0x10000, 0x10000, CRC(36764bbc) SHA1(5762996a327b5f7f93f42dad7eccb6297b3e4c0b) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM data */
ROM_LOAD( "136075-1015.14b", 0x00000, 0x10000, CRC(4d24c768) SHA1(da102105a4d8c552e3594b8ffb1903ecbaa69415) )
ROM_LOAD( "136075-1016.12b", 0x10000, 0x10000, CRC(12e9b4b7) SHA1(2447f116cd865e46e61022143a2668beca99d5d1) )
@@ -302,7 +302,7 @@ ROM_START( klaxj )
ROM_LOAD( "136075-2014.17y", 0x00000, 0x10000, CRC(5c551e92) SHA1(cbff8fc4f4d370b6db2b4953ecbedd249916b891) )
ROM_LOAD( "136075-2013.17w", 0x10000, 0x10000, CRC(36764bbc) SHA1(5762996a327b5f7f93f42dad7eccb6297b3e4c0b) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM data */
ROM_LOAD( "136075-1015.14b", 0x00000, 0x10000, CRC(4d24c768) SHA1(da102105a4d8c552e3594b8ffb1903ecbaa69415) )
ROM_LOAD( "136075-1016.12b", 0x10000, 0x10000, CRC(12e9b4b7) SHA1(2447f116cd865e46e61022143a2668beca99d5d1) )
@@ -332,7 +332,7 @@ ROM_START( klaxd )
ROM_LOAD( "136075-2014.17y", 0x00000, 0x10000, CRC(5c551e92) SHA1(cbff8fc4f4d370b6db2b4953ecbedd249916b891) )
ROM_LOAD( "136075-2013.17w", 0x10000, 0x10000, CRC(36764bbc) SHA1(5762996a327b5f7f93f42dad7eccb6297b3e4c0b) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM data */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM data */
ROM_LOAD( "136075-1015.14b", 0x00000, 0x10000, CRC(4d24c768) SHA1(da102105a4d8c552e3594b8ffb1903ecbaa69415) )
ROM_LOAD( "136075-1016.12b", 0x10000, 0x10000, CRC(12e9b4b7) SHA1(2447f116cd865e46e61022143a2668beca99d5d1) )
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index 186707ac34f..dfad347304e 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -240,7 +240,7 @@ ROM_START( koftball )
ROM_LOAD16_BYTE( "ft5_v6_c2.u60", 0x40001, 0x20000, CRC(3dc22223) SHA1(dc74800c51de3b6a7fbf7214a1da1d2f3d2aea84) )
- ROM_REGION( 0x010000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x040000, "oki", 0 ) /* Samples */
ROM_LOAD( "ft5_v6_c9.u21", 0x00000, 0x10000, CRC(f6216740) SHA1(3d1c795da2f8093e937107e3848cb96338536faf) )
ROM_END
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 3bff1523c63..7f28b6f1666 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -1311,7 +1311,7 @@ ROM_START( legionna )
ROM_REGION( 0x80000, "gfx6", ROMREGION_DISPOSE ) /* LBK */
ROM_COPY( "user2", 0x080000, 0x000000, 0x78000 )
- ROM_REGION( 0x020000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "5", 0x00000, 0x20000, CRC(21d09bde) SHA1(8dce5011e083706ac7b57c5aee4b79d30fa8d4cb) )
ROM_END
@@ -1353,7 +1353,7 @@ ROM_START( legionnu )
ROM_REGION( 0x80000, "gfx6", ROMREGION_DISPOSE ) /* LBK */
ROM_COPY( "user2", 0x080000, 0x000000, 0x78000 )
- ROM_REGION( 0x020000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "5", 0x00000, 0x20000, CRC(21d09bde) SHA1(8dce5011e083706ac7b57c5aee4b79d30fa8d4cb) )
ROM_END
@@ -1389,7 +1389,7 @@ ROM_START( heatbrl )
ROM_REGION( 0x080000, "gfx6", ROMREGION_DISPOSE ) /* LBK tiles */
ROM_LOAD( "bg-2", 0x000000, 0x080000, CRC(77ee4c6f) SHA1(a0072331bc970ba448ac5bb1ae5caa0332c82a99) )
- ROM_REGION( 0x020000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "barrel.8", 0x00000, 0x20000, CRC(489e5b1d) SHA1(ecd69d87ed354d1d08dbe6c2890af5f05d9d67d0) )
ROM_END
@@ -1425,7 +1425,7 @@ ROM_START( heatbrl2 )
ROM_REGION( 0x080000, "gfx6", ROMREGION_DISPOSE ) /* LBK tiles */
ROM_LOAD( "bg-2", 0x000000, 0x080000, CRC(77ee4c6f) SHA1(a0072331bc970ba448ac5bb1ae5caa0332c82a99) )
- ROM_REGION( 0x020000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "barrel.8", 0x00000, 0x20000, CRC(489e5b1d) SHA1(ecd69d87ed354d1d08dbe6c2890af5f05d9d67d0) )
ROM_END
@@ -1465,7 +1465,7 @@ barrel1,2,3,4.BG */
ROM_REGION( 0x080000, "gfx6", ROMREGION_DISPOSE ) /* LBK tiles */
ROM_LOAD( "bg-2", 0x000000, 0x080000, CRC(77ee4c6f) SHA1(a0072331bc970ba448ac5bb1ae5caa0332c82a99) )
- ROM_REGION( 0x020000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "barrel.8", 0x00000, 0x20000, CRC(489e5b1d) SHA1(ecd69d87ed354d1d08dbe6c2890af5f05d9d67d0) )
ROM_END
@@ -1500,7 +1500,7 @@ ROM_START( heatbrlu )
ROM_REGION( 0x080000, "gfx6", ROMREGION_DISPOSE ) /* LBK tiles */
ROM_LOAD( "bg-2", 0x000000, 0x080000, CRC(77ee4c6f) SHA1(a0072331bc970ba448ac5bb1ae5caa0332c82a99) )
- ROM_REGION( 0x020000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "barrel.8", 0x00000, 0x20000, CRC(489e5b1d) SHA1(ecd69d87ed354d1d08dbe6c2890af5f05d9d67d0) )
ROM_END
@@ -1800,7 +1800,7 @@ ROM_START( sdgndmrb )
//#define ROM_COPY(rgn,srcoffset,offset,length)
ROM_COPY( "gfx3", 0x80000, 0x00000, 0x80000 )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "rb-ad.922", 0x000000, 0x020000, CRC(a364cb42) SHA1(c527b39a1627ecee20a2c4df4cf2b5f2ba729081) )
ROM_REGION( 0x040000, "user1", 0 )
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index ef46005911d..6e678439a58 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -316,7 +316,7 @@ ROM_START( lemmings )
ROM_LOAD( "lemmings.14", 0x020000, 0x10000, CRC(c162788f) SHA1(e1f669efa59699cd1b7da71b112701ee79240c18) )
ROM_FILL( 0x030000, 0x10000, 0 ) /* 3bpp data but sprite chip expects 4 */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "lemmings.16", 0x00000, 0x20000, CRC(f747847c) SHA1(00880fa6dff979e5d15daea61938bd18c768c92f) )
ROM_END
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 97c887215b6..3c9f0249d09 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -311,10 +311,10 @@ ROM_START( madmotor )
ROM_LOAD( "21", 0x0c0000, 0x20000, CRC(9c72d364) SHA1(9290e463273fa1f921279f1bab808d91d3aa9648) )
ROM_LOAD( "22", 0x0e0000, 0x20000, CRC(1e78aa60) SHA1(f5f58ee6f5efe56e72623e57ce27884551e09bd9) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "12", 0x00000, 0x20000, CRC(c202d200) SHA1(8470654923a0e8780dad678f5745f8e3e3be08b2) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "13", 0x00000, 0x20000, CRC(cc4d65e9) SHA1(b9bcaa52c570f94d2f2e5dd84c94773cc4115442) )
ROM_END
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index e5b1a96ce02..574be7056b5 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -5170,7 +5170,7 @@ ROM_START( lastfort )
ROMX_LOAD( "tr_jc05", 0x000006, 0x020000, CRC(3fbbe49c) SHA1(642631e69d78898403013884cf0fb711ea000541) , ROM_SKIP(7))
ROMX_LOAD( "tr_jc07", 0x000007, 0x020000, CRC(05e1456b) SHA1(51cd3ad2aa9c0adc7b9d63a337b247b4b65701ca) , ROM_SKIP(7))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "tr_jb11", 0x000000, 0x020000, CRC(83786a09) SHA1(910cf0ccf4493f2a80062149f6364dbb6a1c2a5d) )
ROM_END
@@ -5193,7 +5193,7 @@ ROM_START( lastfork )
ROMX_LOAD( "12i-5", 0x000006, 0x040000, CRC(ce69c805) SHA1(88debdbd8e73da54c1c25a1a60f27a05dac3f104) , ROM_SKIP(7))
ROMX_LOAD( "14i-7", 0x000007, 0x040000, CRC(0cb38317) SHA1(6e18096f6616aa0d9c4f3a2394561ed3f636731e) , ROM_SKIP(7))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "tr_jb11", 0x000000, 0x020000, CRC(83786a09) SHA1(910cf0ccf4493f2a80062149f6364dbb6a1c2a5d) )
ROM_END
@@ -5214,7 +5214,7 @@ ROM_START( lastforg )
ROMX_LOAD( "trma05.bin", 0x000004, 0x080000, CRC(5d917ba5) SHA1(34fc72924fa2877c1038d7f61b22f7667af01e9f) , ROM_GROUPWORD | ROM_SKIP(6))
ROMX_LOAD( "trma06.bin", 0x000006, 0x080000, CRC(d366c04e) SHA1(e0a67688043cb45916860d32ff1076d9257e6ad9) , ROM_GROUPWORD | ROM_SKIP(6))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "trma08.bin", 0x000000, 0x020000, CRC(83786a09) SHA1(910cf0ccf4493f2a80062149f6364dbb6a1c2a5d) ) /* Same as parent set, but different label */
ROM_END
@@ -5251,7 +5251,7 @@ ROM_START( lastfero )
ROMX_LOAD( "tre_jc05", 0x000006, 0x020000, CRC(79f769dd) SHA1(7a9ff8e961ae09fdf36a0a751befc141f47c9fd8) , ROM_SKIP(7))
ROMX_LOAD( "tre_jc07", 0x000007, 0x020000, CRC(b6feacb2) SHA1(85df28d5ff6601753a435e31bcaf45702c7489ea) , ROM_SKIP(7))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "tr_jb11", 0x000000, 0x020000, CRC(83786a09) SHA1(910cf0ccf4493f2a80062149f6364dbb6a1c2a5d) )
ROM_END
@@ -5475,7 +5475,7 @@ ROM_START( pangpoms )
ROMX_LOAD( "ppoms05.bin", 0x000006, 0x020000, CRC(02226214) SHA1(82302e7f1e7269c45e11dfba45ec7bbf522b47f1) , ROM_SKIP(7))
ROMX_LOAD( "ppoms07.bin", 0x000007, 0x020000, CRC(48471c87) SHA1(025fa79993788a0091c4edb83423725abd3a47a2) , ROM_SKIP(7))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "ppoms11.bin", 0x000000, 0x020000, CRC(e89bd565) SHA1(6c7c1ad67ba708dbbe9654c1d290af290207d2be) )
ROM_END
@@ -5498,7 +5498,7 @@ ROM_START( pangpomm )
ROMX_LOAD( "pj.e05", 0x000006, 0x020000, CRC(79c0ec1e) SHA1(b15582e89d859dda4f82908c62e9e07cb45229b9) , ROM_SKIP(7))
ROMX_LOAD( "ppoms07.bin", 0x000007, 0x020000, CRC(48471c87) SHA1(025fa79993788a0091c4edb83423725abd3a47a2) , ROM_SKIP(7))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "ppoms11.bin", 0x000000, 0x020000, CRC(e89bd565) SHA1(6c7c1ad67ba708dbbe9654c1d290af290207d2be) )
ROM_END
@@ -5766,7 +5766,7 @@ ROM_START( skyalert )
ROMX_LOAD( "sa_a_05.bin", 0x000006, 0x040000, CRC(62169d31) SHA1(294887b6ce0d56e053e7f7583b8a160afeef4ce5) , ROM_SKIP(7))
ROMX_LOAD( "sa_a_07.bin", 0x000007, 0x040000, CRC(a6f5966f) SHA1(00319b96dacc4dcfd70935e1626da0ae6aa63e5a) , ROM_SKIP(7))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "sa_a_11.bin", 0x000000, 0x020000, CRC(04842a60) SHA1(ade016c85867dee7ac27efe3910b01f5f8e730a0) )
ROM_END
@@ -5817,7 +5817,7 @@ ROM_START( toride2g )
ROMX_LOAD( "tr2aja-1.12i", 0x000004, 0x080000, CRC(96245a5c) SHA1(524990c88a08648de6f330652fc5c02a27e1325c) , ROM_GROUPWORD | ROM_SKIP(6))
ROMX_LOAD( "tr2aja-3.16i", 0x000006, 0x080000, CRC(49013f5d) SHA1(8f29bd2606b30260e9b21886f2b257f7ae8fb2bf) , ROM_GROUPWORD | ROM_SKIP(6))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "tr2aja-7.3g", 0x000000, 0x020000, CRC(630c6193) SHA1(ddb63724e0b0f7264cb02904e49b24b87beb35a9) )
ROM_END
@@ -5836,7 +5836,7 @@ ROM_START( torid2gg )
ROMX_LOAD( "trii_gb_1", 0x000004, 0x080000, CRC(bcf30944) SHA1(c36fbffa6062a2443a47d8faf83baa903529ee97) , ROM_GROUPWORD | ROM_SKIP(6))
ROMX_LOAD( "trii_gb_3", 0x000006, 0x080000, CRC(138e68d0) SHA1(5a9655f31e2f2e2f16a5bdc334efa78b2cfc37d2) , ROM_GROUPWORD | ROM_SKIP(6))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "trii_ja_7", 0x000000, 0x020000, CRC(6ee32315) SHA1(ef4d59576929deab0aa459a67be21d97c2803dea) )
ROM_END
@@ -5855,7 +5855,7 @@ ROM_START( toride2j )
ROMX_LOAD( "tr2_jb-1.12i", 0x000004, 0x080000, CRC(856f40b7) SHA1(99aca5472b991cd08e9c2128ffdd40675a3b968d) , ROM_GROUPWORD | ROM_SKIP(6))
ROMX_LOAD( "tr2_jb-3.16i", 0x000006, 0x080000, CRC(78ba205f) SHA1(1069a362e60747aaa284c0d9bb7718013df347f3) , ROM_GROUPWORD | ROM_SKIP(6))
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "pcm.3g", 0x000000, 0x020000, CRC(6ee32315) SHA1(ef4d59576929deab0aa459a67be21d97c2803dea) )
ROM_END
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 21b9cba6cfc..3eb1fd40fd4 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -421,7 +421,7 @@ ROM_START( missb2 )
ROM_LOAD16_BYTE( "msbub2-u.ic2", 0x000001, 0x80000, CRC(694c2783) SHA1(401dc8713a02130289f364786c38e70c4c4f9b2e) )
ROM_LOAD16_BYTE( "msbub2-u.ic4", 0x000000, 0x80000, CRC(be71c9f0) SHA1(1961e931017f644486cea0ce431d50973679c848) )
- ROM_REGION( 0x20000, "oki", 0 ) /* samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* samples */
ROM_LOAD( "msbub2-u.13", 0x00000, 0x20000, BAD_DUMP CRC(14f07386) SHA1(097897d92226f900e11dbbdd853aff3ac46ff016) )
/* I doubt this prom is on the board, it's loaded so we can share video emulation with bubble bobble */
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index e9cb51795bc..4ab0efa829a 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -1121,7 +1121,7 @@ ROM_START( nmg5 )
ROM_LOAD( "uh1.bin", 0x0c0000, 0x40000, CRC(f7726e8e) SHA1(f28669725609ffab7c6c3bfddbe293c55ddd0155) )
ROM_LOAD( "uj1.bin", 0x100000, 0x40000, CRC(54f7486e) SHA1(88a237a1005b1fd70b6d8544ef60a0d16cb38e6f) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "xra1.bin", 0x00000, 0x20000, CRC(c74a4f3e) SHA1(2f6165c1d5bdd3e816b95ffd9303dd4bd07f7ac8) )
ROM_END
@@ -1150,7 +1150,7 @@ ROM_START( nmg5e )
ROM_LOAD( "uh1.rom", 0x0c0000, 0x40000, CRC(f6a3ef4d) SHA1(9d5c011ec5eb69822905d0872d5baf55dc76ca39) )
ROM_LOAD( "uj1.rom", 0x100000, 0x40000, CRC(0595d8ef) SHA1(b2f2fbd8cf6dce6358db9cd976aa7d117cafb5ae) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "xra1.bin", 0x00000, 0x20000, CRC(c74a4f3e) SHA1(2f6165c1d5bdd3e816b95ffd9303dd4bd07f7ac8) )
ROM_END
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 82017b5286e..fb3232bc636 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -5314,7 +5314,7 @@ ROM_START( mustangb )
ROM_LOAD16_BYTE( "90058-8", 0x00000, 0x80000, CRC(560bff04) SHA1(b005642adc81d878971ecbdead8ef5e604c90ae2) )
ROM_LOAD16_BYTE( "90058-9", 0x00001, 0x80000, CRC(b9d72a03) SHA1(43ee9def1b6c491c6832562d66c1af54d81d9b3c) )
- ROM_REGION( 0x010000, "oki", 0 ) /* OKIM6295 samples */
+ ROM_REGION( 0x040000, "oki", 0 ) /* OKIM6295 samples */
ROM_LOAD( "mustang.17", 0x00000, 0x10000, CRC(f6f6c4bf) SHA1(ea4cf74d968e254ae47c16c2f4c2f4bc1a528808) )
ROM_END
@@ -5348,7 +5348,7 @@ ROM_START( mustangb2 )
ROM_LOAD16_BYTE( "12.bin", 0xc0000, 0x20000, CRC(42a6cfc2) SHA1(46fc3b30a50efc94613e3b34aaf0543fa4cdc919) )
ROM_LOAD16_BYTE( "11.bin", 0xc0001, 0x20000, CRC(9d3bee66) SHA1(e8db57b9a5581d3d54e69bb7ba229a49a7cc224f) )
- ROM_REGION( 0x010000, "oki", 0 ) /* OKIM6295 samples */
+ ROM_REGION( 0x040000, "oki", 0 ) /* OKIM6295 samples */
ROM_LOAD( "02.bin", 0x00000, 0x10000, CRC(f6f6c4bf) SHA1(ea4cf74d968e254ae47c16c2f4c2f4bc1a528808) )
ROM_END
@@ -5602,7 +5602,7 @@ ROM_START( tdragonb )
ROM_LOAD16_BYTE( "td_10.bin", 0x000000, 0x080000, CRC(bfd0ec5d) SHA1(7983661f74e8695f56e45c6e5c278d7d86431052) ) /* Sprites */
ROM_LOAD16_BYTE( "td_09.bin", 0x000001, 0x080000, CRC(b6e074eb) SHA1(bdde068f03415391b5edaa42f1389df0f7eef899) ) /* Sprites */
- ROM_REGION( 0x010000, "oki", 0 ) /* OKIM6295 samples */
+ ROM_REGION( 0x040000, "oki", 0 ) /* OKIM6295 samples */
ROM_LOAD( "td_01.bin", 0x00000, 0x10000, CRC(f6f6c4bf) SHA1(ea4cf74d968e254ae47c16c2f4c2f4bc1a528808) )
ROM_END
@@ -6903,7 +6903,7 @@ ROM_START( spec2k )
ROM_REGION( 0x20000, "gfx3", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) /* Layer 1, 8x8x4 */
ROM_LOAD( "yonatech4.u3", 0x00000, 0x20000, CRC(5626b08e) SHA1(63207ed6b4fc8684690bf3fe1991a4f3babd73e8) )
- ROM_REGION( 0x020000, "oki1", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
ROM_LOAD( "yonatech2.u101", 0x00000, 0x20000, CRC(4160f172) SHA1(0478a5a4bbba115e6cfb5501aa55aa2836c963bf) )
ROM_REGION( 0x080000, "oki2", 0 ) /* Samples */
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index e62c7e506cd..389ea04ecbd 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -286,7 +286,7 @@ ROM_START( pass )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* z80 clone? */
ROM_LOAD( "23", 0x00000, 0x10000, CRC(b9a0ccde) SHA1(33e7dda247aa44b1933ae9c033c161c152276ce6) )
- ROM_REGION( 0x20000, "oki", 0 ) /* samples? */
+ ROM_REGION( 0x40000, "oki", 0 ) /* samples? */
ROM_LOAD( "31", 0x00000, 0x20000, CRC(c7315bbd) SHA1(c0bb392793cafc7b3f76da8fb26c6c16948f87e5) )
ROM_REGION( 0x40000, "gfx1", 0 ) /* fg layer 'sprites' */
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index d678b4b0a7f..474156e147f 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -379,7 +379,7 @@ ROM_START( pktgaldx )
ROM_LOAD16_BYTE( "maz-00.1b", 0x000000, 0x080000, CRC(fa3071f4) SHA1(72e7d920e9ca94f8cb166007a9e9e5426a201af8) )
ROM_LOAD16_BYTE( "maz-01.3b", 0x000001, 0x080000, CRC(4934fe21) SHA1(b852249f59906d69d32160ebaf9b4781193227e4) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "ke01.14f", 0x00000, 0x20000, CRC(8a106263) SHA1(229ab17403c2b8f4e89a90a8cda2f3c3a4b55d9e) )
ROM_REGION( 0x100000, "oki2", 0 ) /* Oki samples (banked?) */
@@ -397,7 +397,7 @@ ROM_START( pktgaldj )
ROM_LOAD16_BYTE( "maz-00.1b", 0x000000, 0x080000, CRC(fa3071f4) SHA1(72e7d920e9ca94f8cb166007a9e9e5426a201af8) )
ROM_LOAD16_BYTE( "maz-01.3b", 0x000001, 0x080000, CRC(4934fe21) SHA1(b852249f59906d69d32160ebaf9b4781193227e4) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "ke01.14f", 0x00000, 0x20000, CRC(8a106263) SHA1(229ab17403c2b8f4e89a90a8cda2f3c3a4b55d9e) )
ROM_REGION( 0x100000, "oki2", 0 ) /* Oki samples (banked?) */
@@ -417,7 +417,7 @@ ROM_START( pktgaldb )
ROM_LOAD16_BYTE( "9.bin", 0x200001, 0x80000, CRC(078f371c) SHA1(5b510a0f7f50c55cce1ffcc8f2e9c3432b23e352) )
ROM_LOAD16_BYTE( "8.bin", 0x200000, 0x80000, CRC(40f5a032) SHA1(c2ad585ddbc3ef40c6214cb30b4d78a2cd0a9446) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Oki samples */
ROM_LOAD( "kg01.14f", 0x00000, 0x20000, CRC(8a106263) SHA1(229ab17403c2b8f4e89a90a8cda2f3c3a4b55d9e) ) // 1.bin on the bootleg
ROM_REGION( 0x100000, "oki2", 0 ) /* Oki samples (banked?) */
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 74d2cb5ba3f..5009c1b913e 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -643,7 +643,7 @@ ROM_START( magicstk )
ROM_LOAD( "19.u84", 0x40000, 0x20000, CRC(ee12d5b2) SHA1(872edff5a35d2725e3dd752a5f609aca995bfeff) )
ROM_LOAD( "20.u83", 0x60000, 0x20000, CRC(a07f542b) SHA1(0c17629142a90687460b4c951f2062f5c7de8921) )
- ROM_REGION( 0x20000, "oki", 0 ) /* OKI Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* OKI Samples */
ROM_LOAD( "10.u16", 0x00000, 0x20000, CRC(1e4a03ef) SHA1(6a134daa9a6d8dbda51cab348627f078c3dde8c7) )
ROM_REGION( 0x0800, "plds", 0 )
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index d28031e7d81..5b69d120e88 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -340,7 +340,7 @@ ROM_START( raiden )
ROM_REGION( 0x090000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "raiu165.bin", 0x00000, 0x80000, CRC(946d7bde) SHA1(30e8755c2b1ca8bff6278710b8422b51f75eec10) ) /* sprites */
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "rai7.bin", 0x00000, 0x10000, CRC(8f927822) SHA1(592f2719f2c448c3b4b239eeaec078b411e12dbb) )
ROM_REGION( 0x2000, "plds", ROMREGION_DISPOSE )
@@ -377,7 +377,7 @@ ROM_START( raidena )
ROM_REGION( 0x090000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "raiu165.bin", 0x00000, 0x80000, CRC(946d7bde) SHA1(30e8755c2b1ca8bff6278710b8422b51f75eec10) ) /* sprites */
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "rai7.bin", 0x00000, 0x10000, CRC(8f927822) SHA1(592f2719f2c448c3b4b239eeaec078b411e12dbb) )
ROM_END
@@ -410,7 +410,7 @@ ROM_START( raidenk )
ROM_REGION( 0x090000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "raiu165.bin", 0x00000, 0x80000, CRC(946d7bde) SHA1(30e8755c2b1ca8bff6278710b8422b51f75eec10) ) /* sprites */
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "rai7.bin", 0x00000, 0x10000, CRC(8f927822) SHA1(592f2719f2c448c3b4b239eeaec078b411e12dbb) )
ROM_END
@@ -443,7 +443,7 @@ ROM_START( raident )
ROM_REGION( 0x090000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "raiu165.bin", 0x00000, 0x80000, CRC(946d7bde) SHA1(30e8755c2b1ca8bff6278710b8422b51f75eec10) ) /* sprites */
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "rai7.bin", 0x00000, 0x10000, CRC(8f927822) SHA1(592f2719f2c448c3b4b239eeaec078b411e12dbb) )
ROM_END
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 8df6361e636..b2a054631b9 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -339,7 +339,7 @@ ROM_START( sengokmj )
ROM_REGION( 0x080000, "tx_gfx", ROMREGION_DISPOSE )
ROM_COPY( "gfx_tiles" , 0x180000, 0x00000, 0x080000)
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "mah1-1-1.915", 0x00000, 0x20000, CRC(d4612e95) SHA1(937c5dbd25c89d4f4178b0bed510307020c5f40e) )
ROM_REGION( 0x200, "user1", ROMREGION_DISPOSE ) /* not used */
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index c256d939407..da2f4d0c71f 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -2173,7 +2173,7 @@ ROM_START( cookbib2 )
shared ram, the MCU puts it there */
ROM_LOAD16_WORD_SWAP( "protdata.bin", 0x00000, 0x200 , CRC(ae6d8ed5) SHA1(410cdacb9b90ea345c0e4be85e60a138f45a51f1) )
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x040000, "oki", 0 ) /* Samples */
ROM_LOAD( "cookbib2.06", 0x00000, 0x20000, CRC(5e6f76b8) SHA1(725800143dfeaa6093ed5fcc5b9f15678ae9e547) )
ROM_REGION( 0x140000, "gfx1", 0 ) /* Sprites */
@@ -2202,7 +2202,7 @@ ROM_START( cookbib3 )
ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(c819b9a8) SHA1(1d425e8c9940c0e691149e5406dd71808bd73832) )
/* the 'empty' pattern continued after 0x200 but the game doesn't use it or attempt to decrypt it */
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x040000, "oki", 0 ) /* Samples */
ROM_LOAD( "u14.bin", 0x00000, 0x20000, CRC(e5bf9288) SHA1(12fb9542f9105fe1a21a74a08cda4d6372b984ee) )
ROM_REGION( 0x180000, "gfx1", 0 ) /* Sprites */
@@ -2274,7 +2274,7 @@ ROM_START( finalttr )
stop at 0x102200, might be worth going back and checking if its simply random
values due to ram not being cleared, or actual data */
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x040000, "oki", 0 ) /* Samples */
ROM_LOAD( "11.7p", 0x00000, 0x20000, CRC(2e331022) SHA1(1e74c66d16eb9c8ae04acecbb4040dea037492cc) )
ROM_REGION( 0x100000, "gfx1", 0 ) /* Sprites */
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 92de0e93b09..184edcc4d6f 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -382,7 +382,7 @@ ROM_START( spbactn )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "a-u14.3", 0x00000, 0x10000, CRC(57f4c503) SHA1(e5ddc63a43ba824bcaa4340eeba25a0d3f26cad9) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "a-u19", 0x00000, 0x20000, CRC(87427d7d) SHA1(f76b0dc3f0d87deb0f0c81084aff9756b236e867) )
/* Board 9002-B (GFX Board) */
@@ -408,7 +408,7 @@ ROM_START( spbactnj )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "a-u14.3", 0x00000, 0x10000, CRC(57f4c503) SHA1(e5ddc63a43ba824bcaa4340eeba25a0d3f26cad9) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "a-u19", 0x00000, 0x20000, CRC(87427d7d) SHA1(f76b0dc3f0d87deb0f0c81084aff9756b236e867) )
/* Board 9002-B (GFX Board) */
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 9792ad3ae8e..50d25f753c7 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -290,7 +290,7 @@ ROM_START( stadhero )
ROM_LOAD( "ef06.bin", 0x060000, 0x10000, CRC(9f47848f) SHA1(e23337684c8999483cbd11d3d953b06c34f13069) )
ROM_LOAD( "ef07.bin", 0x070000, 0x10000, CRC(8859f655) SHA1(b3d69c5808b3ba7347ddb7f9693499903e9bfe6b) )
- ROM_REGION( 0x10000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ef17.bin", 0x0000, 0x10000, CRC(07c78358) SHA1(ce82b429eec0193fd9665b717336756a514db144) )
ROM_END
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 76c1cc575ff..a4502126b26 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -525,7 +525,7 @@ ROM_START( sharkpy )
ROM_CONTINUE( 0x28000, 0x08000 )
ROM_CONTINUE( 0x38000, 0x08000 )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "shark(ii)-italy_4_ver1.0.u54", 0x00000, 0x20000, CRC(9f384c59) SHA1(d2b087b8370b40b6f0944de661ea6aebaebea06f) )
ROM_REGION( 0x300, "proms", ROMREGION_DISPOSE )
@@ -588,7 +588,7 @@ ROM_START( sharkpya )
ROM_CONTINUE( 0x28000, 0x08000 )
ROM_CONTINUE( 0x38000, 0x08000 )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "shark(ii)-italy_4_ver1.0.u54", 0x00000, 0x20000, CRC(9f384c59) SHA1(d2b087b8370b40b6f0944de661ea6aebaebea06f) )
ROM_REGION( 0x300, "proms", ROMREGION_DISPOSE )
@@ -650,7 +650,7 @@ ROM_START( smoto16 )
ROM_CONTINUE( 0x28000, 0x08000 )
ROM_CONTINUE( 0x38000, 0x08000 )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "rideritaly_4ver1.6.u54", 0x00000, 0x20000, CRC(df828563) SHA1(f39324c5c37486ed9512e0ff934394556dd182ae) )
ROM_REGION( 0x300, "proms", ROMREGION_DISPOSE )
@@ -720,7 +720,7 @@ ROM_START( smoto20 )
ROM_CONTINUE( 0x28000, 0x08000 )
ROM_CONTINUE( 0x38000, 0x08000 )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "rom4ver1.0.u54", 0x00000, 0x20000, CRC(df828563) SHA1(f39324c5c37486ed9512e0ff934394556dd182ae) )
ROM_REGION( 0x300, "proms", ROMREGION_DISPOSE )
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index fab466a41c6..e84da1f0057 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -415,7 +415,7 @@ ROM_START( supbtime )
ROM_LOAD16_BYTE( "mae00.bin", 0x000001, 0x80000, CRC(30043094) SHA1(5302cfd9bdaf90c4901fda75407379c4ce1cbdec) ) /* sprites */
ROM_LOAD16_BYTE( "mae01.bin", 0x000000, 0x80000, CRC(434af3fb) SHA1(1cfd30d14f03554e826576d6d32ce424f0df3748) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "gc05.bin", 0x00000, 0x20000, CRC(2f2246ff) SHA1(3fcceb6f5aa5f33187bcf4c59d88327f396fa80d) )
ROM_END
@@ -435,7 +435,7 @@ ROM_START( supbtima )
ROM_LOAD16_BYTE( "mae00.bin", 0x000001, 0x80000, CRC(30043094) SHA1(5302cfd9bdaf90c4901fda75407379c4ce1cbdec) ) /* sprites */
ROM_LOAD16_BYTE( "mae01.bin", 0x000000, 0x80000, CRC(434af3fb) SHA1(1cfd30d14f03554e826576d6d32ce424f0df3748) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "gc05.bin", 0x00000, 0x20000, CRC(2f2246ff) SHA1(3fcceb6f5aa5f33187bcf4c59d88327f396fa80d) )
ROM_END
@@ -454,7 +454,7 @@ ROM_START( supbtimj )
ROM_LOAD16_BYTE( "mae00.bin", 0x000001, 0x80000, CRC(30043094) SHA1(5302cfd9bdaf90c4901fda75407379c4ce1cbdec) ) /* sprites */
ROM_LOAD16_BYTE( "mae01.bin", 0x000000, 0x80000, CRC(434af3fb) SHA1(1cfd30d14f03554e826576d6d32ce424f0df3748) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "gc05.bin", 0x00000, 0x20000, CRC(2f2246ff) SHA1(3fcceb6f5aa5f33187bcf4c59d88327f396fa80d) )
ROM_END
@@ -473,7 +473,7 @@ ROM_START( chinatwn )
ROM_LOAD16_BYTE( "mak-00.a2", 0x000001, 0x80000, CRC(18e8cc1b) SHA1(afa79557222a94de7d9fde526ca45796f74fb3b2) ) /* sprites */
ROM_LOAD16_BYTE( "mak-01.a4", 0x000000, 0x80000, CRC(d88ebda8) SHA1(ec6eab95f3ca8ee946151c46c6570b0b0c508ffc) )
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "gv_03-.j14", 0x00000, 0x20000, CRC(948faf92) SHA1(2538c7d4fa7fe0bfdd5dccece8ee82e911cee63f) )
ROM_END
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 94dfbb578d3..ed70d989516 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -1080,7 +1080,7 @@ ROM_START( apache3 )
ROM_LOAD( "ap-17d.68", 0x008000, 0x8000, CRC(6199afe4) SHA1(ad8c0ed6c33d984bb29c89f2e7fc7e5a923cefe3) )
ROM_LOAD( "ap-16d.63", 0x010000, 0x8000, CRC(f115656d) SHA1(61798858dc0172192d89e666696b2c7642756899) )
- ROM_REGION( 0x30000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ap-28c.171", 0x000000, 0x20000, CRC(b349f0c2) SHA1(cb1ff1c0e784f669c87ab1eccd3b358950761b74) )
ROM_LOAD( "ap-29c.176", 0x020000, 0x10000, CRC(b38fced3) SHA1(72f61a719f393957bcccf14687bfbb2e7a5f7aee) )
@@ -1132,7 +1132,7 @@ ROM_START( apache3a )
ROM_LOAD( "ap-16e.63", 0x008000, 0x10000, CRC(d3251965) SHA1(aef4f58a6f773060434abda9d7f5f003693577bf) )
ROM_LOAD( "ap-17e.68", 0x008000, 0x08000, CRC(4509c2ed) SHA1(97a6a6710e83aca212ce43d06c3f26c35f9782b8) )
- ROM_REGION( 0x30000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "ap-28c.171", 0x000000, 0x20000, CRC(b349f0c2) SHA1(cb1ff1c0e784f669c87ab1eccd3b358950761b74) )
ROM_LOAD( "ap-29c.176", 0x020000, 0x10000, CRC(b38fced3) SHA1(72f61a719f393957bcccf14687bfbb2e7a5f7aee) )
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index e6980b29fde..01d441c488b 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -474,7 +474,7 @@ ROM_START( fstarfrc )
ROM_LOAD16_BYTE( "fstarf09.rom", 0x00000, 0x80000, CRC(d51341d2) SHA1(e46c319158046d407d4387cb2d8f0b6cfd7be576) )
ROM_LOAD16_BYTE( "fstarf06.rom", 0x00001, 0x80000, CRC(07e40e87) SHA1(22867e52a8267ae8ae0ff0dba6bb846cb3e1b63d) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "fstarf08.rom", 0x00000, 0x20000, CRC(f0ad5693) SHA1(a0202801bb9f9c86175ca7989fbc9efa47183188) )
ROM_END
@@ -497,7 +497,7 @@ ROM_START( fstarfrcj )
ROM_LOAD16_BYTE( "fstarf09.rom", 0x00000, 0x80000, CRC(d51341d2) SHA1(e46c319158046d407d4387cb2d8f0b6cfd7be576) )
ROM_LOAD16_BYTE( "fstarf06.rom", 0x00001, 0x80000, CRC(07e40e87) SHA1(22867e52a8267ae8ae0ff0dba6bb846cb3e1b63d) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "fstarf08.rom", 0x00000, 0x20000, CRC(f0ad5693) SHA1(a0202801bb9f9c86175ca7989fbc9efa47183188) )
ROM_END
@@ -520,7 +520,7 @@ ROM_START( ginkun )
ROM_LOAD16_BYTE( "ginkun09.i22", 0x00000, 0x80000, CRC(233384b9) SHA1(031735b0fb2c89b0af26ba76061776767647c59c) )
ROM_LOAD16_BYTE( "ginkun06.i16", 0x00001, 0x80000, CRC(f8589184) SHA1(b933265960742cb3505eb73631ec419b7e1d1d63) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "ginkun08.i18", 0x00000, 0x20000, CRC(8b7583c7) SHA1(be7ce721504afb45e16eda146f12031d818fc94c) )
ROM_END
@@ -650,7 +650,7 @@ ROM_START( riot )
ROM_LOAD16_BYTE( "9.ic22", 0x00000, 0x80000, CRC(0ead54f3) SHA1(4848eb158d9e2279332225e0b25f1c96a8a5a0c4) )
ROM_LOAD16_BYTE( "6.ic16", 0x00001, 0x80000, CRC(96ef61da) SHA1(c306e4d1eee19af0229a47c2f115f98c74f33d33) )
- ROM_REGION( 0x20000, "oki", 0 )
+ ROM_REGION( 0x40000, "oki", 0 )
ROM_LOAD( "8.ic18", 0x00000, 0x20000, CRC(4b70e266) SHA1(4ed23de9223cc7359fbaff9dd500ef6daee00fb0) )
ROM_END
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index 46b0025b699..eea94b25da4 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -532,7 +532,7 @@ ROM_START( toki )
ROM_REGION( 0x080000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "toki.bk2", 0x000000, 0x80000, CRC(d86ac664) SHA1(bcb64d8e7ad29b8201ebbada1f858075eb8a0f1d) ) /* tiles 2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "tokijp.009", 0x00000, 0x20000, CRC(ae7a6b8b) SHA1(1d410f91354ffd1774896b2e64f20a2043607805) )
ROM_END
@@ -562,7 +562,7 @@ ROM_START( tokia )
ROM_REGION( 0x080000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "toki.bk2", 0x000000, 0x80000, CRC(d86ac664) SHA1(bcb64d8e7ad29b8201ebbada1f858075eb8a0f1d) ) /* tiles 2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "tokijp.009", 0x00000, 0x20000, CRC(ae7a6b8b) SHA1(1d410f91354ffd1774896b2e64f20a2043607805) )
ROM_END
@@ -591,7 +591,7 @@ ROM_START( tokiu )
ROM_REGION( 0x080000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "toki.bk2", 0x000000, 0x80000, CRC(d86ac664) SHA1(bcb64d8e7ad29b8201ebbada1f858075eb8a0f1d) ) /* tiles 2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "tokijp.009", 0x00000, 0x20000, CRC(ae7a6b8b) SHA1(1d410f91354ffd1774896b2e64f20a2043607805) )
ROM_END
@@ -620,7 +620,7 @@ ROM_START( juju )
ROM_REGION( 0x080000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "toki.bk2", 0x000000, 0x80000, CRC(d86ac664) SHA1(bcb64d8e7ad29b8201ebbada1f858075eb8a0f1d) ) /* tiles 2 */
- ROM_REGION( 0x20000, "oki", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
ROM_LOAD( "tokijp.009", 0x00000, 0x20000, CRC(ae7a6b8b) SHA1(1d410f91354ffd1774896b2e64f20a2043607805) )
ROM_END
@@ -672,7 +672,7 @@ ROM_START( jujub )
ROM_LOAD16_BYTE( "25.20l", 0x40000, 0x10000, CRC(be064c4b) SHA1(d777b560942e9f6300aed1bf22a07b381c27a479) )
ROM_LOAD16_BYTE( "26.21l", 0x60000, 0x10000, CRC(f8b5b38d) SHA1(6ec60cf5259469cc9c4bdd9ffc6c63bc2785b708) )
- ROM_REGION( 0x20000, "oki", 0 ) /* OKI samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* OKI samples */
ROM_LOAD( "1.6a", 0x00000, 0x10000, CRC(377153ad) SHA1(1c184197b344c2b65b5842f9ba99fab776a9577b) )
ROM_LOAD( "2.7a", 0x10000, 0x10000, CRC(093ca15d) SHA1(1b298146c9eea93c22c03e63513200b483b86a3f) )
ROM_END
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index a0d599bd6a5..55ae8d721d8 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -2805,7 +2805,7 @@ ROM_START( htchctch )
/* this is not a real rom but instead the data extracted from shared ram, the MCU puts it there */
ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(5b27adb6) SHA1(a0821093d8c73765ff15767bdfc0afa95aa1371d) )
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "p01.c1", 0x00000, 0x20000, CRC(18c06829) SHA1(46b180319ed33abeaba70d2cc61f17639e59bfdb) )
ROM_REGION( 0x80000, "gfx1", 0 ) /* Sprites */
@@ -2836,7 +2836,7 @@ ROM_START( cookbib )
/* this is not a real rom but instead the data extracted from shared ram, the MCU puts it there */
ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(a77d13f4) SHA1(13db72f5b171b0c1226e97ea98d9edd7144d56d9) )
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "sound.uc1", 0x00000, 0x20000, CRC(545e19b6) SHA1(ef518bbe44b22e7ef77ee6af337ebcad9b2674e0) )
ROM_REGION( 0x80000, "gfx1", 0 ) /* */
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 8887c69d0d1..08282a8dcde 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -339,7 +339,7 @@ ROM_START( tumblep )
ROM_LOAD16_BYTE( "map-01.rom", 0x00000, 0x80000, CRC(e81ffa09) SHA1(01ada9557ead91eb76cf00db118d6c432104a398) )
ROM_LOAD16_BYTE( "map-00.rom", 0x00001, 0x80000, CRC(8c879cfe) SHA1(a53ef7811f14a8b105749b1cf29fe8a3a33bab5e) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Oki samples */
ROM_LOAD( "hl03-.j15", 0x00000, 0x20000, CRC(01b81da0) SHA1(914802f3206dc59a720af9d57eb2285bc8ba822b) )
ROM_END
@@ -358,7 +358,7 @@ ROM_START( tumblepj )
ROM_LOAD16_BYTE( "map-01.rom", 0x00000, 0x80000, CRC(e81ffa09) SHA1(01ada9557ead91eb76cf00db118d6c432104a398) )
ROM_LOAD16_BYTE( "map-00.rom", 0x00001, 0x80000, CRC(8c879cfe) SHA1(a53ef7811f14a8b105749b1cf29fe8a3a33bab5e) )
- ROM_REGION( 0x20000, "oki", 0 ) /* Oki samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Oki samples */
ROM_LOAD( "hl03-.j15", 0x00000, 0x20000, CRC(01b81da0) SHA1(914802f3206dc59a720af9d57eb2285bc8ba822b) )
ROM_END
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index da60777e7b1..6d2fb2a32e6 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -284,10 +284,10 @@ ROM_START( vaportra )
ROM_LOAD( "vtmaa03.bin", 0x000000, 0x80000, CRC(1a30bf81) SHA1(00e6c713e12133a99d64ca80638c9cbc8e26b2c8) ) /* sprites */
ROM_LOAD( "vtmaa04.bin", 0x080000, 0x80000, CRC(b713e9cc) SHA1(af33943d75d2ee3a7385f624537008dca9e1d5d8) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fj06", 0x00000, 0x20000, CRC(6e98a235) SHA1(374564b4e494d03cd1330c06e321b9452c22a075) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fj05", 0x00000, 0x20000, CRC(39cda2b5) SHA1(f5c5a305025d451ab48f84cd63e36a3bbdefda96) )
ROM_REGION( 0x200, "proms", 0 )
@@ -322,10 +322,10 @@ ROM_START( vaportru )
ROM_LOAD( "vtmaa03.bin", 0x000000, 0x80000, CRC(1a30bf81) SHA1(00e6c713e12133a99d64ca80638c9cbc8e26b2c8) ) /* sprites */
ROM_LOAD( "vtmaa04.bin", 0x080000, 0x80000, CRC(b713e9cc) SHA1(af33943d75d2ee3a7385f624537008dca9e1d5d8) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fj06", 0x00000, 0x20000, CRC(6e98a235) SHA1(374564b4e494d03cd1330c06e321b9452c22a075) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fj05", 0x00000, 0x20000, CRC(39cda2b5) SHA1(f5c5a305025d451ab48f84cd63e36a3bbdefda96) )
ROM_REGION( 0x200, "proms", 0 )
@@ -360,10 +360,10 @@ ROM_START( kuhga )
ROM_LOAD( "vtmaa03.bin", 0x000000, 0x80000, CRC(1a30bf81) SHA1(00e6c713e12133a99d64ca80638c9cbc8e26b2c8) ) /* sprites */
ROM_LOAD( "vtmaa04.bin", 0x080000, 0x80000, CRC(b713e9cc) SHA1(af33943d75d2ee3a7385f624537008dca9e1d5d8) )
- ROM_REGION( 0x20000, "oki1", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki1", 0 ) /* ADPCM samples */
ROM_LOAD( "fj06", 0x00000, 0x20000, CRC(6e98a235) SHA1(374564b4e494d03cd1330c06e321b9452c22a075) )
- ROM_REGION( 0x20000, "oki2", 0 ) /* ADPCM samples */
+ ROM_REGION( 0x40000, "oki2", 0 ) /* ADPCM samples */
ROM_LOAD( "fj05", 0x00000, 0x20000, CRC(39cda2b5) SHA1(f5c5a305025d451ab48f84cd63e36a3bbdefda96) )
ROM_REGION( 0x200, "proms", 0 )
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 307f05b21ac..5743a1732b0 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -477,7 +477,7 @@ ROM_START( vball ) /* US version */
ROM_LOAD( "25j4-0.35", 0x00000, 0x20000, CRC(877826d8) SHA1(fd77298f9343051f66259dad9127f40afb95f385) ) /* 0,1,2,3 */
ROM_LOAD( "25j3-0.5", 0x20000, 0x20000, CRC(c6afb4fa) SHA1(6d7c966300ce5fb2094476b393434486965d62b4) ) /* 0,1,2,3 */
- ROM_REGION(0x20000, "oki", 0 ) /* Sound region#1: adpcm */
+ ROM_REGION(0x40000, "oki", 0 ) /* Sound region#1: adpcm */
ROM_LOAD( "25j0-0.78", 0x00000, 0x20000, CRC(8e04bdbf) SHA1(baafc5033c9442b83cb332c2c453c13117b31a3b) )
ROM_REGION(0x1000, "proms", 0 ) /* color PROMs */
@@ -505,7 +505,7 @@ ROM_START( vball2pj ) /* Japan version */
ROM_LOAD( "25j4-0.35", 0x00000, 0x20000, CRC(877826d8) SHA1(fd77298f9343051f66259dad9127f40afb95f385) ) /* 0,1,2,3 */
ROM_LOAD( "25j3-0.5", 0x20000, 0x20000, CRC(c6afb4fa) SHA1(6d7c966300ce5fb2094476b393434486965d62b4) ) /* 0,1,2,3 */
- ROM_REGION(0x20000, "oki", 0 ) /* Sound region#1: adpcm */
+ ROM_REGION(0x40000, "oki", 0 ) /* Sound region#1: adpcm */
ROM_LOAD( "25j0-0.78", 0x00000, 0x20000, CRC(8e04bdbf) SHA1(baafc5033c9442b83cb332c2c453c13117b31a3b) )
ROM_REGION(0x1000, "proms", 0 ) /* color PROMs */
@@ -537,7 +537,7 @@ ROM_START( vballb ) /* bootleg */
ROM_LOAD( "vball.35", 0x00000, 0x20000, CRC(877826d8) SHA1(fd77298f9343051f66259dad9127f40afb95f385) ) /* 0,1,2,3 */
ROM_LOAD( "vball.5", 0x20000, 0x20000, CRC(c6afb4fa) SHA1(6d7c966300ce5fb2094476b393434486965d62b4) ) /* 0,1,2,3 */
- ROM_REGION(0x20000, "oki", 0 ) /* Sound region#1: adpcm */
+ ROM_REGION(0x40000, "oki", 0 ) /* Sound region#1: adpcm */
ROM_LOAD( "vball.78a", 0x00000, 0x10000, CRC(f3e63b76) SHA1(da54d1d7d7d55b73e49991e4363bc6f46e0f70eb) )
ROM_LOAD( "vball.78b", 0x10000, 0x10000, CRC(7ad9d338) SHA1(3e3c270fa69bda93b03f07a54145eb5e211ec8ba) )
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 7d859e4fa3f..057fd8d0bed 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -742,7 +742,7 @@ ROM_START( magicbub )
ROM_LOAD( "magbuble.u22", 0x040000, 0x020000, CRC(7c68df7a) SHA1(88acf9dd43892a790415b418f77d88c747aa84f5) )
ROM_LOAD( "magbuble.u23", 0x060000, 0x020000, CRC(c7763fc1) SHA1(ed68b3c3c5155073afb7b55d6d92d3057e40df6c) )
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "magbuble.131", 0x000000, 0x020000, CRC(03e04e89) SHA1(7d80e6a7be2322e32e40acae72bedd8d7e90ad33) )
ROM_END
@@ -772,7 +772,7 @@ ROM_START( magicbua )
ROM_LOAD( "magbuble.u22", 0x040000, 0x020000, CRC(7c68df7a) SHA1(88acf9dd43892a790415b418f77d88c747aa84f5) )
ROM_LOAD( "magbuble.u23", 0x060000, 0x020000, CRC(c7763fc1) SHA1(ed68b3c3c5155073afb7b55d6d92d3057e40df6c) )
- ROM_REGION( 0x020000, "oki", 0 ) /* Samples */
+ ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "magbuble.131", 0x000000, 0x020000, CRC(03e04e89) SHA1(7d80e6a7be2322e32e40acae72bedd8d7e90ad33) )
ROM_END