summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-03-25 13:18:38 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-03-25 13:18:38 +0000
commita91446eacaded421e4ab1c376fca88d3e551606d (patch)
tree762e0b64b7967eae3f7776f5521d22a2f06f124e
parent868d57267a19fb8ad942f88c99acd8013602dd2d (diff)
Cleanups and version bump.mame0137u1
-rw-r--r--src/emu/cpu/avr8/avr8.c4
-rw-r--r--src/emu/cpu/g65816/g65816op.h16
-rw-r--r--src/emu/cpu/i386/i386priv.h14
-rw-r--r--src/emu/cpu/m68000/m68kfpu.c14
-rw-r--r--src/emu/cpu/mn10200/mn10200.c84
-rw-r--r--src/emu/inptport.c4
-rw-r--r--src/emu/sound/tms5110r.c4
-rw-r--r--src/mame/audio/snes_snd.c126
-rw-r--r--src/mame/drivers/berzerk.c36
-rw-r--r--src/mame/drivers/cave.c44
-rw-r--r--src/mame/drivers/funworld.c38
-rw-r--r--src/mame/drivers/galdrvr.c2
-rw-r--r--src/mame/drivers/metro.c16
-rw-r--r--src/mame/drivers/namcofl.c6
-rw-r--r--src/mame/drivers/namcos2.c34
-rw-r--r--src/mame/drivers/namcos21.c4
-rw-r--r--src/mame/drivers/namcos22.c10
-rw-r--r--src/mame/drivers/namcos23.c114
-rw-r--r--src/mame/drivers/nss.c4
-rw-r--r--src/mame/drivers/paradise.c6
-rw-r--r--src/mame/drivers/pasha2.c2
-rw-r--r--src/mame/drivers/snesb.c4
-rw-r--r--src/mame/drivers/stv.c28
-rw-r--r--src/mame/drivers/toaplan1.c2
-rw-r--r--src/mame/drivers/ultrsprt.c2
-rw-r--r--src/mame/drivers/vamphalf.c26
-rw-r--r--src/mame/drivers/vmetal.c6
-rw-r--r--src/mame/includes/paradise.h2
-rw-r--r--src/mame/includes/pbaction.h2
-rw-r--r--src/mame/machine/kaneko16.c2
-rw-r--r--src/mame/video/metro.c34
-rw-r--r--src/mame/video/n64.c6
-rw-r--r--src/mame/video/paradise.c10
-rw-r--r--src/mame/video/pbaction.c4
-rw-r--r--src/mame/video/snes.c4
-rw-r--r--src/mame/video/toaplan1.c2
-rw-r--r--src/version.c2
37 files changed, 359 insertions, 359 deletions
diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c
index a57130b036b..ec06d6695aa 100644
--- a/src/emu/cpu/avr8/avr8.c
+++ b/src/emu/cpu/avr8/avr8.c
@@ -853,8 +853,8 @@ static CPU_EXECUTE( avr8 )
opcycles = 2;
break;
case 0x0900: // SBIC A,b
- if(!(READ_IO_8(cpustate, ACONST5(op)) & (1 << RR3(op))))
- {
+ if(!(READ_IO_8(cpustate, ACONST5(op)) & (1 << RR3(op))))
+ {
opcycles += avr8_is_long_opcode(op) ? 2 : 1;
cpustate->pc += avr8_is_long_opcode(op) ? 2 : 1;
}
diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h
index 2ba7fa53fb2..2a91ea51e9e 100644
--- a/src/emu/cpu/g65816/g65816op.h
+++ b/src/emu/cpu/g65816/g65816op.h
@@ -688,11 +688,11 @@ INLINE uint EA_SIY(g65816i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
r0 = REGISTER_A; \
r1 = SRC; \
carry = CFLAG_AS_1(); \
- if (!FLAG_D) \
+ if (!FLAG_D) \
{ \
result = r0 + r1 + carry; \
- } \
- else \
+ } \
+ else \
{ \
result = (r0 & 0x000f) + (r1 & 0x000f) + (carry << 0); \
if(result > 0x0009) result += 0x0006; \
@@ -710,7 +710,7 @@ INLINE uint EA_SIY(g65816i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
if (FLAG_D && result > 0x9fff) result += 0x6000; \
FLAG_C = (result > 0xffff) ? 0x100 : 0; \
FLAG_Z = REGISTER_A = MAKE_UINT_16(result); \
- FLAG_N = NFLAG_16(REGISTER_A);
+ FLAG_N = NFLAG_16(REGISTER_A);
#endif
/* M6502 Logical AND with accumulator */
@@ -1548,11 +1548,11 @@ INLINE uint EA_SIY(g65816i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
r1 = SRC; \
r1 ^= 0xffff; \
carry = CFLAG_AS_1(); \
- if (!FLAG_D) \
+ if (!FLAG_D) \
{ \
result = r0 + r1 + carry; \
- } \
- else \
+ } \
+ else \
{ \
result = (r0 & 0x000f) + (r1 & 0x000f) + (carry << 0); \
if(result <= 0x000f) result -= 0x0006; \
@@ -1570,7 +1570,7 @@ INLINE uint EA_SIY(g65816i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_
if (FLAG_D && result <= 0xffff) result -= 0x6000; \
FLAG_C = (result > 0xffff) ? 0x100 : 0; \
FLAG_Z = REGISTER_A = MAKE_UINT_16(result); \
- FLAG_N = NFLAG_16(REGISTER_A);
+ FLAG_N = NFLAG_16(REGISTER_A);
#endif
diff --git a/src/emu/cpu/i386/i386priv.h b/src/emu/cpu/i386/i386priv.h
index 52aef5719c3..9e90ba1b672 100644
--- a/src/emu/cpu/i386/i386priv.h
+++ b/src/emu/cpu/i386/i386priv.h
@@ -432,7 +432,7 @@ INLINE UINT32 FETCH32(i386_state *cpustate)
{
translate_address(cpustate,&address);
}
-
+
address &= cpustate->a20_mask;
value = memory_decrypted_read_dword(cpustate->program, address);
cpustate->eip += 4;
@@ -466,7 +466,7 @@ INLINE UINT16 READ16(i386_state *cpustate,UINT32 ea)
{
translate_address(cpustate,&address);
}
-
+
address &= cpustate->a20_mask;
value = memory_read_word_32le( cpustate->program, address );
}
@@ -487,7 +487,7 @@ INLINE UINT32 READ32(i386_state *cpustate,UINT32 ea)
{
translate_address(cpustate,&address);
}
-
+
address &= cpustate->a20_mask;
value = memory_read_dword_32le( cpustate->program, address );
}
@@ -513,7 +513,7 @@ INLINE UINT64 READ64(i386_state *cpustate,UINT32 ea)
{
translate_address(cpustate,&address);
}
-
+
address &= cpustate->a20_mask;
value = (((UINT64) memory_read_dword_32le( cpustate->program, address+0 )) << 0) |
(((UINT64) memory_read_dword_32le( cpustate->program, address+4 )) << 32);
@@ -545,7 +545,7 @@ INLINE void WRITE16(i386_state *cpustate,UINT32 ea, UINT16 value)
{
translate_address(cpustate,&address);
}
-
+
address &= cpustate->a20_mask;
memory_write_word_32le(cpustate->program, address, value);
}
@@ -564,7 +564,7 @@ INLINE void WRITE32(i386_state *cpustate,UINT32 ea, UINT32 value)
{
translate_address(cpustate,&address);
}
-
+
ea &= cpustate->a20_mask;
memory_write_dword_32le(cpustate->program, address, value);
}
@@ -588,7 +588,7 @@ INLINE void WRITE64(i386_state *cpustate,UINT32 ea, UINT64 value)
{
translate_address(cpustate,&address);
}
-
+
ea &= cpustate->a20_mask;
memory_write_dword_32le(cpustate->program, address+0, value & 0xffffffff);
memory_write_dword_32le(cpustate->program, address+4, (value >> 32) & 0xffffffff);
diff --git a/src/emu/cpu/m68000/m68kfpu.c b/src/emu/cpu/m68000/m68kfpu.c
index d464bd0f242..06682c63ab3 100644
--- a/src/emu/cpu/m68000/m68kfpu.c
+++ b/src/emu/cpu/m68000/m68kfpu.c
@@ -642,7 +642,7 @@ static floatx80 READ_EA_FPE(m68ki_cpu_core *m68k, int ea)
}
break;
- default:
+ default:
fatalerror("M68kFPU: READ_EA_FPE0: unhandled mode %d, reg %d, at %08X\n", mode, reg, REG_PC);
break;
}
@@ -717,8 +717,8 @@ static void fpgen_rm_reg(m68ki_cpu_core *m68k, UINT16 w2)
int opmode = w2 & 0x7f;
floatx80 source;
- // fmovecr #$f, fp0 f200 5c0f
-
+ // fmovecr #$f, fp0 f200 5c0f
+
if (rm)
{
switch (src)
@@ -837,7 +837,7 @@ static void fpgen_rm_reg(m68ki_cpu_core *m68k, UINT16 w2)
source = REG_FP[src];
}
-
+
switch (opmode)
{
@@ -877,7 +877,7 @@ static void fpgen_rm_reg(m68ki_cpu_core *m68k, UINT16 w2)
break;
}
case 0x1a: // FNEG
- {
+ {
REG_FP[dst] = source;
REG_FP[dst].high ^= 0x8000;
SET_CONDITION_CODES(m68k, REG_FP[dst]);
@@ -949,13 +949,13 @@ static void fmove_reg_mem(m68ki_cpu_core *m68k, UINT16 w2)
}
case 1: // Single-precision Real
{
- UINT32 d = floatx80_to_float32(REG_FP[src]);
+ UINT32 d = floatx80_to_float32(REG_FP[src]);
WRITE_EA_32(m68k, ea, d);
break;
}
case 2: // Extended-precision Real
{
- WRITE_EA_FPE(m68k, ea, REG_FP[src]);
+ WRITE_EA_FPE(m68k, ea, REG_FP[src]);
break;
}
case 3: // Packed-decimal Real with Static K-factor
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c
index 7799442f222..d01e9dafd93 100644
--- a/src/emu/cpu/mn10200/mn10200.c
+++ b/src/emu/cpu/mn10200/mn10200.c
@@ -133,9 +133,9 @@ INLINE INT32 r24u(mn102_info *mn102, offs_t adr)
INLINE void w24(mn102_info *mn102, offs_t adr, UINT32 val)
{
-/* if(adr == 0x4075aa || adr == 0x40689a || adr == 0x4075a2) {
- log_write("TRACE", adr, val, MEM_LONG);
- }*/
+/* if(adr == 0x4075aa || adr == 0x40689a || adr == 0x4075a2) {
+ log_write("TRACE", adr, val, MEM_LONG);
+ }*/
mn102_write_byte(mn102, adr, val);
mn102_write_byte(mn102, adr+1, val>>8);
mn102_write_byte(mn102, adr+2, val>>16);
@@ -160,11 +160,11 @@ static void mn102_take_irq(mn102_info *mn102, int level, int group)
{
if(!(mn102->psw & 0x800))
{
-// if (group != 8) printf("MN10200: Dropping irq L %d G %d pc=%x, a3=%x\n", level, group, mn102->pc, mn102->a[3]);
+// if (group != 8) printf("MN10200: Dropping irq L %d G %d pc=%x, a3=%x\n", level, group, mn102->pc, mn102->a[3]);
return;
}
-// if (group != 8) printf("MN10200: Taking irq L %d G %d pc=%x, a3=%x\n", level, group, mn102->pc, mn102->a[3]);
+// if (group != 8) printf("MN10200: Taking irq L %d G %d pc=%x, a3=%x\n", level, group, mn102->pc, mn102->a[3]);
mn102->a[3] -= 6;
w24(mn102, mn102->a[3]+2, mn102->pc);
@@ -184,7 +184,7 @@ static void refresh_timer(mn102_info *cpustate, int tmr)
// source is a prescaler?
if (source >= 2)
{
- INT32 rate;
+ INT32 rate;
// is prescaler enabled?
if (cpustate->prescaler[source-2].mode & 0x80)
@@ -249,7 +249,7 @@ INLINE void timer_tick_simple(mn102_info *cpustate, int tmr)
// is the result enabled?
if (cpustate->icrl[group] & (1 << irq_in_grp))
{
-// printf("Timer %d IRQ! (Group %d in_grp %d ICRH %x ICRL %x\n", tmr, group, irq_in_grp, cpustate->icrh[group], cpustate->icrl[group]);
+// printf("Timer %d IRQ! (Group %d in_grp %d ICRH %x ICRL %x\n", tmr, group, irq_in_grp, cpustate->icrh[group], cpustate->icrl[group]);
// try to take it now
mn102_take_irq(cpustate, level, group + 1);
}
@@ -289,10 +289,10 @@ static CPU_INIT(mn10200)
state_save_register_device_item_array(device, 0, cpustate->icrh);
state_save_register_device_item(device, 0, cpustate->psw);
state_save_register_device_item(device, 0, cpustate->mdr);
-// state_save_register_device_item_array(device, 0, cpustate->simple_timer);
-// state_save_register_device_item_array(device, 0, cpustate->prescaler);
-// state_save_register_device_item_array(device, 0, cpustate->dma);
-// state_save_register_device_item_array(device, 0, cpustate->serial);
+// state_save_register_device_item_array(device, 0, cpustate->simple_timer);
+// state_save_register_device_item_array(device, 0, cpustate->prescaler);
+// state_save_register_device_item_array(device, 0, cpustate->dma);
+// state_save_register_device_item_array(device, 0, cpustate->serial);
state_save_register_device_item_array(device, 0, cpustate->ddr);
for (tmr = 0; tmr < NUM_TIMERS_8BIT; tmr++)
@@ -490,7 +490,7 @@ static void mn102_extirq(mn102_info *mn102, int irqnum, int status)
{
int level = (mn102->icrh[7]>>4)&0x7;
-// printf("mn102_extirq: irq %d status %d G8 ICRL %x\n", irqnum, status, mn102->icrl[7]);
+// printf("mn102_extirq: irq %d status %d G8 ICRL %x\n", irqnum, status, mn102->icrl[7]);
// if interrupt is enabled, handle it
if (status)
@@ -1957,30 +1957,30 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
case 0x210: case 0x211: case 0x212: case 0x213: case 0x214:
case 0x215: case 0x216: case 0x217: case 0x218: case 0x219:
mn102->simple_timer[adr-0x210].base = data + 1;
-// printf("MN10200: Timer %d value set %02x\n", adr-0x210, data);
+// printf("MN10200: Timer %d value set %02x\n", adr-0x210, data);
refresh_timer(mn102, adr-0x210);
break;
case 0x21a:
mn102->prescaler[0].cycles = data+1;
-// printf("MN10200: Prescale 0 cycle count %d\n", data+1);
+// printf("MN10200: Prescale 0 cycle count %d\n", data+1);
break;
case 0x21b:
mn102->prescaler[1].cycles = data+1;
-// printf("MN10200: Prescale 1 cycle count %d\n", data+1);
+// printf("MN10200: Prescale 1 cycle count %d\n", data+1);
break;
case 0x220: case 0x221: case 0x222: case 0x223: case 0x224:
- case 0x225: case 0x226: case 0x227: case 0x228: case 0x229:
+ case 0x225: case 0x226: case 0x227: case 0x228: case 0x229:
{
-// const char *source[4] = { "TMxIO", "cascade", "prescale 0", "prescale 1" };
+// const char *source[4] = { "TMxIO", "cascade", "prescale 0", "prescale 1" };
mn102->simple_timer[adr-0x220].mode = data;
-// printf("MN10200: Timer %d %s b6=%d, source=%s\n", adr-0x220, data & 0x80 ? "on" : "off", (data & 0x40) != 0, source[data & 3]);
+// printf("MN10200: Timer %d %s b6=%d, source=%s\n", adr-0x220, data & 0x80 ? "on" : "off", (data & 0x40) != 0, source[data & 3]);
if (data & 0x40)
{
-// printf("MN10200: loading timer %d\n", adr-0x220);
+// printf("MN10200: loading timer %d\n", adr-0x220);
mn102->simple_timer[adr-0x220].cur = mn102->simple_timer[adr-0x220].base;
}
refresh_timer(mn102, adr-0x220);
@@ -1988,35 +1988,35 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
}
case 0x22a:
-// printf("MN10200: Prescale 0 %s, ps0bc %s\n",
-// data & 0x80 ? "on" : "off", data & 0x40 ? "-> ps0br" : "off");
+// printf("MN10200: Prescale 0 %s, ps0bc %s\n",
+// data & 0x80 ? "on" : "off", data & 0x40 ? "-> ps0br" : "off");
mn102->prescaler[0].mode = data;
break;
case 0x22b:
-// printf("MN10200: Prescale 1 %s, ps1bc %s\n",
-// data & 0x80 ? "on" : "off", data & 0x40 ? "-> ps1br" : "off");
+// printf("MN10200: Prescale 1 %s, ps1bc %s\n",
+// data & 0x80 ? "on" : "off", data & 0x40 ? "-> ps1br" : "off");
mn102->prescaler[1].mode = data;
break;
- case 0x230: case 0x240: case 0x250:
+ case 0x230: case 0x240: case 0x250:
{
-// const char *modes[4] = { "single", "double", "ioa", "iob" };
-// const char *sources[8] = { "pres.0", "pres.1", "iob", "sysclk", "*4", "*1", "6", "7" };
-// printf("MN10200: Timer %d comp=%s on_1=%s on_match=%s phase=%s source=%s\n",
-// 10 + ((adr-0x230) >> 4),
-// modes[data >> 6], data & 0x20 ? "cleared" : "not cleared", data & 0x10 ? "cleared" : "not cleared",
-// data & 8 ? "tff" : "rsff", sources[data & 7]);
+// const char *modes[4] = { "single", "double", "ioa", "iob" };
+// const char *sources[8] = { "pres.0", "pres.1", "iob", "sysclk", "*4", "*1", "6", "7" };
+// printf("MN10200: Timer %d comp=%s on_1=%s on_match=%s phase=%s source=%s\n",
+// 10 + ((adr-0x230) >> 4),
+// modes[data >> 6], data & 0x20 ? "cleared" : "not cleared", data & 0x10 ? "cleared" : "not cleared",
+// data & 8 ? "tff" : "rsff", sources[data & 7]);
break;
}
- case 0x231: case 0x241: case 0x251:
+ case 0x231: case 0x241: case 0x251:
{
-// const char *modes[4] = { "up", "down", "up on ioa", "up on iob" };
-// printf("MN10200: Timer %d %s ff=%s op=%s ext_trig=%s %s\n",
-// 10 + ((adr-0x230) >> 4),
-// data & 0x80 ? "enable" : "disable", data & 0x40 ? "operate" : "clear",
-// modes[(data >> 4) & 3], data & 2 ? "on" : "off", data & 1 ? "one-shot" : "repeat");
+// const char *modes[4] = { "up", "down", "up on ioa", "up on iob" };
+// printf("MN10200: Timer %d %s ff=%s op=%s ext_trig=%s %s\n",
+// 10 + ((adr-0x230) >> 4),
+// data & 0x80 ? "enable" : "disable", data & 0x40 ? "operate" : "clear",
+// modes[(data >> 4) & 3], data & 2 ? "on" : "off", data & 1 ? "one-shot" : "repeat");
break;
}
@@ -2302,17 +2302,17 @@ static UINT32 mn10200_r(mn102_info *mn102, UINT32 adr, int type)
case 0x183:
return 0x10;
-
+
case 0x200: case 0x201: case 0x202: case 0x203: case 0x204:
case 0x205: case 0x206: case 0x207: case 0x208: case 0x209:
-// printf("MN10200: timer %d value read = %d\n", adr-0x200, mn102->simple_timer[adr-0x200].cur);
+// printf("MN10200: timer %d value read = %d\n", adr-0x200, mn102->simple_timer[adr-0x200].cur);
return mn102->simple_timer[adr-0x200].cur;
break;
case 0x264: // port 1 data
return memory_read_byte_8le(mn102->io, MN10200_PORT1);
- case 0x28c: case 0x29c: case 0x2ac: case 0x2bc: case 0x2cc: case 0x2dc: case 0x2ec: case 0x2fc:
+ case 0x28c: case 0x29c: case 0x2ac: case 0x2bc: case 0x2cc: case 0x2dc: case 0x2ec: case 0x2fc:
{
int dma = (adr-0x280) >> 4;
return mn102->dma[dma].irq;
@@ -2357,9 +2357,9 @@ static CPU_SET_INFO(mn10200)
case CPUINFO_INT_REGISTER + MN10200_IAGR: cpustate->iagr = info->i; break;
case CPUINFO_INT_INPUT_STATE + MN10200_IRQ0: mn102_extirq(cpustate, 0, info->i); break;
- case CPUINFO_INT_INPUT_STATE + MN10200_IRQ1: mn102_extirq(cpustate, 1, info->i); break;
- case CPUINFO_INT_INPUT_STATE + MN10200_IRQ2: mn102_extirq(cpustate, 2, info->i); break;
- case CPUINFO_INT_INPUT_STATE + MN10200_IRQ3: mn102_extirq(cpustate, 3, info->i); break;
+ case CPUINFO_INT_INPUT_STATE + MN10200_IRQ1: mn102_extirq(cpustate, 1, info->i); break;
+ case CPUINFO_INT_INPUT_STATE + MN10200_IRQ2: mn102_extirq(cpustate, 2, info->i); break;
+ case CPUINFO_INT_INPUT_STATE + MN10200_IRQ3: mn102_extirq(cpustate, 3, info->i); break;
}
}
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index a5600a8e589..54710267e8e 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -4705,7 +4705,7 @@ static void record_port(const input_port_config *port)
int input_machine_has_keyboard(running_machine *machine)
{
int have_keyboard = FALSE;
-#ifdef MESS
+#ifdef MESS
const input_field_config *field;
const input_port_config *port;
for (port = machine->portlist.first(); port != NULL; port = port->next)
@@ -4717,7 +4717,7 @@ int input_machine_has_keyboard(running_machine *machine)
break;
}
}
-#endif
+#endif
return have_keyboard;
}
diff --git a/src/emu/sound/tms5110r.c b/src/emu/sound/tms5110r.c
index 4bd475f3bf7..2ab5f517654 100644
--- a/src/emu/sound/tms5110r.c
+++ b/src/emu/sound/tms5110r.c
@@ -35,10 +35,10 @@
/* quick note on derivative analysis:
Judging by all the TI chips I (Lord Nightmare) have done this test on, the first derivative between successive values of the LPC tables should follow a roughly triangular or sine shaped curve, the second derivative should start at a value, increase slightly, then decrease smoothly and become negative right around where the LPC curve passes 0, finally increase slightly right near the end. If it doesn't do this, there is probably a wrong value in there somewhere. The pitch and energy tables follow similar patterns but aren't the same since they never cross 0. The chirp table doesn't follow this pattern at all.
*/
-
+
/* The following TMS5100/TMC0280/CD2801 coefficients come from US Patent 4,209,836 and several others, and have been verified using derivative analysis to show which values were bad (due to poor quality images or badly typed copies of the tables in the patents, depending on which patent you look at) which were then corrected by figuring out what the tiny remaining marks on the photocopied version of the coefficient sheet COULD have been which would make the derivatives play nice.
***These values have not yet been verified against a real TMS5100 or TMC0280 or CD2801 (from speak & spell, etc)***
-*/
+*/
static const struct tms5100_coeffs pat4209836_coeff =
{
/* subtype */
diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c
index e8e030d31ad..1c7acf84dd3 100644
--- a/src/mame/audio/snes_snd.c
+++ b/src/mame/audio/snes_snd.c
@@ -179,7 +179,7 @@ typedef struct /* Voice state type */
int on_cnt; /* Is it time to turn on yet? */
int pitch; /* Sample pitch (4096->32000Hz) */
int range; /* Last header's range */
- UINT32 samp_id; /* Sample ID# */
+ UINT32 samp_id; /* Sample ID# */
int sampptr; /* Where in sampbuf we are */
signed long smp1; /* Last sample (for BRR filter) */
signed long smp2; /* Second-to-last sample decoded*/
@@ -202,7 +202,7 @@ struct _snes_sound_state
UINT8 ipl_region[64]; /* SPC top 64 bytes */
int keyed_on;
- int keys; /* 8-bits for 8 voices */
+ int keys; /* 8-bits for 8 voices */
voice_state_type voice_state[8];
/* Noise stuff */
@@ -246,7 +246,7 @@ INLINE snes_sound_state *get_safe_token( running_device *device )
/*-------------------------------------------------
- dsp_reset
+ dsp_reset
Reset emulated DSP
-------------------------------------------------*/
@@ -285,9 +285,9 @@ static void dsp_reset( running_device *device )
/*-------------------------------------------------
- dsp_update
+ dsp_update
- Mix one sample of audio. sound_ptr is a pointer
+ Mix one sample of audio. sound_ptr is a pointer
to mix audio into
-------------------------------------------------*/
@@ -320,10 +320,10 @@ static void dsp_update( running_device *device, short *sound_ptr )
dsp_reset(device);
/* Here we check for keys on/off. Docs say that successive writes to KON/KOF
- must be separated by at least 2 Ts periods or risk being neglected.
- Therefore DSP only looks at these during an update, and not at the time of
- the write. Only need to do this once however, since the regs haven't
- changed over the whole period we need to catch up with. */
+ must be separated by at least 2 Ts periods or risk being neglected.
+ Therefore DSP only looks at these during an update, and not at the time of
+ the write. Only need to do this once however, since the regs haven't
+ changed over the whole period we need to catch up with. */
#ifdef DBG_KEY
spc700->dsp_regs[0x4c] &= mask;
#endif
@@ -332,8 +332,8 @@ static void dsp_update( running_device *device, short *sound_ptr )
spc700->dsp_regs[0x7c] &= ~spc700->dsp_regs[0x4c];
/* Question: what is the expected behavior when pitch modulation is enabled on
- voice 0? Jurassic Park 2 does this. For now, using outx of zero for first
- voice. */
+ voice 0? Jurassic Park 2 does this. For now, using outx of zero for first
+ voice. */
outx = 0;
/* Same table for noise and envelope */
@@ -377,10 +377,10 @@ static void dsp_update( running_device *device, short *sound_ptr )
vp->mixfrac = 3 * 4096;
/* NOTE: Real SNES does *not* appear to initialize the envelope
- counter to anything in particular. The first cycle always seems to
- come at a random time sooner than expected; as yet, I have been
- unable to find any pattern. I doubt it will matter though, so
- we'll go ahead and do the full time for now. */
+ counter to anything in particular. The first cycle always seems to
+ come at a random time sooner than expected; as yet, I have been
+ unable to find any pattern. I doubt it will matter though, so
+ we'll go ahead and do the full time for now. */
vp->envcnt = CNT_INIT;
vp->envstate = ATTACK;
}
@@ -419,7 +419,7 @@ static void dsp_update( running_device *device, short *sound_ptr )
#ifndef NO_PMOD
/* Pitch mod uses OUTX from last voice for this one. Luckily we haven't
- modified OUTX since it was used for last voice. */
+ modified OUTX since it was used for last voice. */
if (spc700->dsp_regs[0x2d] & m)
{
#ifdef DBG_PMOD
@@ -436,18 +436,18 @@ static void dsp_update( running_device *device, short *sound_ptr )
for ( ; vp->mixfrac >= 0; vp->mixfrac -= 4096)
{
/* This part performs the BRR decode 'on-the-fly'. This is more
- correct than the old way, which could be fooled if the data and/or
- the loop point changed while the sample was playing, or if the BRR
- decode didn't produce the same result every loop because of the
- filters. The event interface still has no chance of keeping up
- with those kinds of tricks, though. */
+ correct than the old way, which could be fooled if the data and/or
+ the loop point changed while the sample was playing, or if the BRR
+ decode didn't produce the same result every loop because of the
+ filters. The event interface still has no chance of keeping up
+ with those kinds of tricks, though. */
if (!vp->header_cnt)
{
if (vp->end & 1)
{
/* Docs say ENDX bit is set when decode of block with source
- end flag set is done. Does this apply to looping samples?
- Some info I've seen suggests yes. */
+ end flag set is done. Does this apply to looping samples?
+ Some info I've seen suggests yes. */
spc700->dsp_regs[0x7c] |= m;
if (vp->end & 2)
{
@@ -507,15 +507,15 @@ static void dsp_update( running_device *device, short *sound_ptr )
#endif
/* For invalid ranges (D,E,F): if the nybble is negative, the result
- is F000. If positive, 0000. Nothing else like previous range,
- etc. seems to have any effect. If range is valid, do the shift
- normally. Note these are both shifted right once to do the filters
- properly, but the output will be shifted back again at the end. */
+ is F000. If positive, 0000. Nothing else like previous range,
+ etc. seems to have any effect. If range is valid, do the shift
+ normally. Note these are both shifted right once to do the filters
+ properly, but the output will be shifted back again at the end. */
if (vp->range <= 0xc)
{
outx = (outx << vp->range) >> 1;
}
- else
+ else
{
outx &= ~0x7ff;
@@ -581,19 +581,19 @@ static void dsp_update( running_device *device, short *sound_ptr )
else
{
/* Perform 4-Point Gaussian interpolation. Take an approximation of a
- Gaussian bell-curve, and move it through the sample data at a rate
- determined by the pitch. The sample output at any given time is
- the sum of the products of each input sample point with the value
- of the bell-curve corresponding to that point. */
+ Gaussian bell-curve, and move it through the sample data at a rate
+ determined by the pitch. The sample output at any given time is
+ the sum of the products of each input sample point with the value
+ of the bell-curve corresponding to that point. */
vl = vp->mixfrac >> 4;
vr = ((G4[-vl] * vp->sampbuf[vp->sampptr]) >> 11 ) & ~1;
vr += ((G3[-vl] * vp->sampbuf[(vp->sampptr + 1) & 3]) >> 11) & ~1;
vr += ((G2[vl] * vp->sampbuf[(vp->sampptr + 2) & 3]) >> 11 ) & ~1;
/* This is to do the wrapping properly. Based on my tests with the
- SNES, it appears clipping is done only if it is the fourth addition
- that would cause a wrap. If it has already wrapped before the
- fourth addition, it is not clipped. */
+ SNES, it appears clipping is done only if it is the fourth addition
+ that would cause a wrap. If it has already wrapped before the
+ fourth addition, it is not clipped. */
vr = (signed short)vr;
vr += ((G1[vl] * vp->sampbuf[(vp->sampptr + 3) & 3]) >> 11) & ~1;
@@ -643,7 +643,7 @@ static void dsp_update( running_device *device, short *sound_ptr )
#ifndef NO_ECHO
/* Perform echo. First, read mem at current location, and put those samples
- into the FIR filter queue. */
+ into the FIR filter queue. */
#ifdef DBG_ECHO
logerror("Echo delay=%dms, feedback=%d%%\n", spc700->dsp_regs[0x7d] * 16,
((signed char)spc700->dsp_regs[0x0d] * 100) / 0x7f);
@@ -766,9 +766,9 @@ static void dsp_update( running_device *device, short *sound_ptr )
/*-------------------------------------------------
- advance_envelope
+ advance_envelope
- Run envelope step & return ENVX. v is the voice
+ Run envelope step & return ENVX. v is the voice
to process envelope for.
-------------------------------------------------*/
@@ -785,11 +785,11 @@ static int advance_envelope( running_device *device, int v )
if (spc700->voice_state[v].envstate == RELEASE)
{
/* Docs: "When in the state of "key off". the "click" sound is prevented
- by the addition of the fixed value 1/256" WTF??? Alright, I'm going
- to choose to interpret that this way: When a note is keyed off, start
- the RELEASE state, which subtracts 1/256th each sample period (32kHz).
- Note there's no need for a count because it always happens every
- update. */
+ by the addition of the fixed value 1/256" WTF??? Alright, I'm going
+ to choose to interpret that this way: When a note is keyed off, start
+ the RELEASE state, which subtracts 1/256th each sample period (32kHz).
+ Note there's no need for a count because it always happens every
+ update. */
envx -= 0x8; /* 0x8 / 0x800 = 1/256th */
if (envx <= 0)
{
@@ -817,8 +817,8 @@ static int advance_envelope( running_device *device, int v )
{
case ATTACK:
/* Docs are very confusing. "AR is multiplied by the fixed value
- 1/64..." I believe it means to add 1/64th to ENVX once every
- time ATTACK is updated, and that's what I'm going to implement. */
+ 1/64..." I believe it means to add 1/64th to ENVX once every
+ time ATTACK is updated, and that's what I'm going to implement. */
t = adsr1 & 0x0f;
if (t == 0x0f)
@@ -855,8 +855,8 @@ static int advance_envelope( running_device *device, int v )
case DECAY:
/* Docs: "DR... [is multiplied] by the fixed value 1-1/256."
- Well, at least that makes some sense. Multiplying ENVX by
- 255/256 every time DECAY is updated. */
+ Well, at least that makes some sense. Multiplying ENVX by
+ 255/256 every time DECAY is updated. */
cnt -= ENVCNT[((adsr1 >> 3) & 0x0e) + 0x10];
if (cnt <= 0)
@@ -877,7 +877,7 @@ static int advance_envelope( running_device *device, int v )
case SUSTAIN:
/* Docs: "SR [is multiplied] by the fixed value 1-1/256."
- Multiplying ENVX by 255/256 every time SUSTAIN is updated. */
+ Multiplying ENVX by 255/256 every time SUSTAIN is updated. */
#ifdef DBG_ENV
if (ENVCNT[SR(v)] == 0)
logerror("ENV voice %d: envx=%03X, state=SUSTAIN, zero rate\n", v, envx);
@@ -906,14 +906,14 @@ static int advance_envelope( running_device *device, int v )
else
{
/* GAIN mode is set
- Note: if the game switches between ADSR and GAIN modes partway
- through, should the count be reset, or should it continue from
- where it was? Does the DSP actually watch for that bit to
- change, or does it just go along with whatever it sees when it
- performs the update? I'm going to assume the latter and not
- update the count, unless I see a game that obviously wants the
- other behavior. The effect would be pretty subtle, in any case.
- */
+ Note: if the game switches between ADSR and GAIN modes partway
+ through, should the count be reset, or should it continue from
+ where it was? Does the DSP actually watch for that bit to
+ change, or does it just go along with whatever it sees when it
+ performs the update? I'm going to assume the latter and not
+ update the count, unless I see a game that obviously wants the
+ other behavior. The effect would be pretty subtle, in any case.
+ */
t = spc700->dsp_regs[(v << 4) + 7];
if (t < 0x80)
@@ -987,7 +987,7 @@ static int advance_envelope( running_device *device, int v )
case 7:
/* Docs: "Increase (bent line): Addition of the constant
- 1/64 up to .75 of the constaint <sic> 1/256 from .75 to 1." */
+ 1/64 up to .75 of the constaint <sic> 1/256 from .75 to 1." */
cnt -= ENVCNT[t & 0x1f];
if (cnt > 0)
@@ -1052,7 +1052,7 @@ static STREAM_UPDATE( snes_sh_update )
/***************************
- I/O for DSP
+ I/O for DSP
***************************/
static READ8_DEVICE_HANDLER( snes_dsp_io_r )
@@ -1089,7 +1089,7 @@ static WRITE8_DEVICE_HANDLER( snes_dsp_io_w )
}
/***************************
- I/O for SPC700
+ I/O for SPC700
***************************/
READ8_DEVICE_HANDLER( spc_io_r )
@@ -1192,7 +1192,7 @@ WRITE8_DEVICE_HANDLER( spc_io_w )
case 0xa: /* Timer 0 */
case 0xb: /* Timer 1 */
case 0xc: /* Timer 2 */
- if (data == 0)
+ if (data == 0)
data = 255;
break;
case 0xd: /* Counter 0 */
@@ -1249,7 +1249,7 @@ WRITE8_DEVICE_HANDLER( spc_port_in )
UINT8 *spc_get_ram( running_device *device )
{
snes_sound_state *spc700 = get_safe_token(device);
-
+
return spc700->ram;
}
@@ -1296,8 +1296,8 @@ static void state_register( running_device *device )
state_save_register_device_item(device, v, spc700->voice_state[v].mixfrac);
state_save_register_device_item(device, v, spc700->voice_state[v].on_cnt);
state_save_register_device_item(device, v, spc700->voice_state[v].pitch);
- state_save_register_device_item(device, v, spc700->voice_state[v].range);
- state_save_register_device_item(device, v, spc700->voice_state[v].samp_id);
+ state_save_register_device_item(device, v, spc700->voice_state[v].range);
+ state_save_register_device_item(device, v, spc700->voice_state[v].samp_id);
state_save_register_device_item(device, v, spc700->voice_state[v].sampptr);
state_save_register_device_item(device, v, spc700->voice_state[v].smp1);
state_save_register_device_item(device, v, spc700->voice_state[v].smp2);
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 15f6742fc46..01f5d7d103c 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -528,7 +528,7 @@ static READ8_HANDLER( berzerk_audio_r )
switch (offset)
{
/* offset 4 reads from the S14001A */
- case 4:
+ case 4:
return (!s14001a_bsy_r(device)) ? 0x40 : 0x00;
/* offset 6 is open bus */
case 6:
@@ -646,7 +646,7 @@ static INPUT_PORTS_START( joystick ) // used on all games except moonwarp
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -658,7 +658,7 @@ static INPUT_PORTS_START( joystick ) // used on all games except moonwarp
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
INPUT_PORTS_END
-
+
static INPUT_PORTS_START( common ) // used on all games
PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
@@ -674,19 +674,19 @@ static INPUT_PORTS_START( common ) // used on all games
PORT_CONFSETTING( 0x00, "Wells-Gardner" )
PORT_CONFSETTING( 0x01, "Electrohome" )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
-
+
PORT_START("SW2")
/* port for the 'bookkeeping reset' and 'bookkeeping' buttons;
- * The 'bookkeeping reset' button is an actual button on the zpu-1000 and
- * zpu-1001 pcbs, labeled 'S2' or 'SW2'. It is wired to bit 0.
- * * pressing it while high scores are displayed will give a free game
- * without adding any coin info to the bookkeeping info in nvram.
- * The 'bookkeeping' button is wired to the control panel, usually hidden
- * underneath or only accessible through the coin door. Wired to bit 7.
- * * It displays various bookkeeping statistics when pressed sequentially.
- * Pressing P1 fire (according to the manual) when stats are displayed
- * will clear the stat shown on screen.
- */
+ * The 'bookkeeping reset' button is an actual button on the zpu-1000 and
+ * zpu-1001 pcbs, labeled 'S2' or 'SW2'. It is wired to bit 0.
+ * * pressing it while high scores are displayed will give a free game
+ * without adding any coin info to the bookkeeping info in nvram.
+ * The 'bookkeeping' button is wired to the control panel, usually hidden
+ * underneath or only accessible through the coin door. Wired to bit 7.
+ * * It displays various bookkeeping statistics when pressed sequentially.
+ * Pressing P1 fire (according to the manual) when stats are displayed
+ * will clear the stat shown on screen.
+ */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Free Game (not logged in bookkeeping)")
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_NAME("Bookkeeping") PORT_CODE(KEYCODE_F1)
@@ -743,7 +743,7 @@ static INPUT_PORTS_START( berzerkg )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x40, DEF_STR( German ) )
PORT_DIPSETTING( 0x80, DEF_STR( French ) )
- PORT_DIPSETTING( 0xc0, DEF_STR( Spanish ) )
+ PORT_DIPSETTING( 0xc0, DEF_STR( Spanish ) )
INPUT_PORTS_END
static INPUT_PORTS_START( frenzy )
@@ -757,7 +757,7 @@ static INPUT_PORTS_START( frenzy )
/* Bit 0 does some more hardware tests. According to the manual, both bit 0 & 1 must be:
- ON for Signature Analysis (S.A.)
- OFF for game operation */
- //PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) // F2:1,2
+ //PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) // F2:1,2
PORT_DIPNAME( 0x03, 0x00, "Hardware Tests" ) PORT_DIPLOCATION("F2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, "Color test" )
@@ -903,7 +903,7 @@ static INPUT_PORTS_START( moonwarp )
PORT_MODIFY("SYSTEM")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) // is wired high for upright harness, low for cocktail; if high, cocktail dipswitch is ignored.
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) // Hyper flip button is common for both players in cocktail mode.
-
+
PORT_START("P1")
//PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL ) // spinner/dial
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -918,7 +918,7 @@ static INPUT_PORTS_START( moonwarp )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
+
PORT_START("P2_DIAL")
PORT_BIT( 0xff, 0x0, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(4) PORT_COCKTAIL PORT_RESET
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index bac23a6f8ca..888244dae99 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -919,7 +919,7 @@ static WRITE16_HANDLER( tjumpman_leds_w )
set_led_status(space->machine, 6, data & 0x0080); // 3 bet
}
-// popmessage("led %04X", data);
+// popmessage("led %04X", data);
}
static CUSTOM_INPUT( tjumpman_hopper_r )
@@ -1122,7 +1122,7 @@ static ADDRESS_MAP_START( pwrinst2_sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x10, 0x17) AM_DEVWRITE("nmk112", nmk112_okibank_w) // Samples bank
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) //
AM_RANGE(0x50, 0x50) AM_WRITE(soundlatch_ack_w) // To Main CPU
-// AM_RANGE(0x51, 0x51) AM_WRITENOP // ?? volume
+// AM_RANGE(0x51, 0x51) AM_WRITENOP // ?? volume
AM_RANGE(0x80, 0x80) AM_WRITE(pwrinst2_rombank_w) // ROM bank
AM_RANGE(0x60, 0x60) AM_READ(soundlatch_hi_r) // From Main CPU
AM_RANGE(0x70, 0x70) AM_READ(soundlatch_lo_r) //
@@ -2624,46 +2624,46 @@ BP962A.U77 23C16000 GFX
\
ROM_REGION( 0x240000, "oki2", 0 ) \
ROM_LOAD( "bp962a.u47", 0x040000, 0x200000, CRC(6d4e9737) SHA1(81c7ecdfc2d38d0b35e26745866f6672f566f936) ) \
-
+
/* the regions differ only in the EEPROM, hence the macro above - all EEPROMs are Factory Defaulted */
-ROM_START( agallet )
+ROM_START( agallet )
ROMS_AGALLET
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "agallet_europe.nv", 0x0000, 0x0080, CRC(ec38bf65) SHA1(cb8d9eacc0cf55a0c6b187e6673e3354554314b5) )
ROM_END
-ROM_START( agalletu )
+ROM_START( agalletu )
ROMS_AGALLET
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "agallet_usa.nv", 0x0000, 0x0080, CRC(72e65056) SHA1(abf1a86df01064d9d5d8c418e8367817319ec335) )
ROM_END
-ROM_START( agalletj )
+ROM_START( agalletj )
ROMS_AGALLET
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "agallet_japan.nv", 0x0000, 0x0080, CRC(0753f547) SHA1(aabb987470406b8729894108bc4d050f7200917d) )
ROM_END
-ROM_START( agalletk )
+ROM_START( agalletk )
ROMS_AGALLET
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "agallet_korea.nv", 0x0000, 0x0080, CRC(7f41c253) SHA1(50793d4da0ad6eb590941d26a729a1cf4b3c25c2) )
ROM_END
ROM_START( agallett ) // the dumped board was this region
ROMS_AGALLET
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "agallet_taiwan.nv", 0x0000, 0x0080, CRC(0af46742) SHA1(37b704c4c573b2aabd6f016e9e8dd458f95148f7) )
ROM_END
-ROM_START( agalleth )
+ROM_START( agalleth )
ROMS_AGALLET
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "agallet_hongkong.nv", 0x0000, 0x0080, CRC(998d1a74) SHA1(13e7e27a18417949d49e97d521781fc0feeef792) )
ROM_END
@@ -3494,14 +3494,14 @@ U55
/* the regions differ only in the EEPROM, hence the macro above - all EEPROMs are Factory Defaulted */
ROM_START( mazinger )
ROMS_MAZINGER
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "mazinger_world.nv", 0x0000, 0x0080, CRC(4f6225c6) SHA1(ed8e1c3ca9b961778cd317deb0dd8a0143eaab4f) )
ROM_END
ROM_START( mazingerj )
ROMS_MAZINGER
-
+
ROM_REGION16_BE( 0x80, "eeprom", 0 )
ROM_LOAD16_WORD( "mazinger_japan.nv", 0x0000, 0x0080, CRC(f84a2a45) SHA1(2e8ad10994bba9a3952889ed0ec3bcaca9b41d03) )
ROM_END
@@ -4548,12 +4548,12 @@ GAME( 1995, sailormnj, sailormn, sailormn, cave, sailormn, ROT0, "Banpres
GAME( 1995, sailormnk, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Korea)", 0 )
GAME( 1995, sailormnt, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Taiwan)", 0 )
GAME( 1995, sailormnh, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Hong Kong)", 0 )
-GAME( 1995, sailormno, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Europe)", 0 )
-GAME( 1995, sailormnou, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, USA)", 0 )
-GAME( 1995, sailormnoj, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Japan)", 0 )
-GAME( 1995, sailormnok, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Korea)", 0 )
-GAME( 1995, sailormnot, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Taiwan)", 0 )
-GAME( 1995, sailormnoh, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Hong Kong)" , 0 )
+GAME( 1995, sailormno, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Europe)", 0 )
+GAME( 1995, sailormnou, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, USA)", 0 )
+GAME( 1995, sailormnoj, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Japan)", 0 )
+GAME( 1995, sailormnok, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Korea)", 0 )
+GAME( 1995, sailormnot, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Taiwan)", 0 )
+GAME( 1995, sailormnoh, sailormn, sailormn, cave, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Hong Kong)" , 0 )
// The EEPROM determines the region, program roms are the same between sets
GAME( 1996, agallet, 0, sailormn, cave, agallet, ROT270, "Banpresto / Gazelle", "Air Gallet (Europe)", 0 )
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index a65aacd184b..443bafe3950 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -283,7 +283,7 @@
* Multi Win (Funworld)
These sets seems to run in the same modified hardware.
- They are encrypted, and have a second program rom with unknown code/purposes.
+ They are encrypted, and have a second program rom with unknown code/purposes.
* Mongolfier New
@@ -316,13 +316,13 @@
Beschreibung / Description
--------------------------
- Für OES 5,-- Einwurf werden 3 Kredite gegeben. Für einen Kredit bekommt der Spieler
+ F?r OES 5,-- Einwurf werden 3 Kredite gegeben. F?r einen Kredit bekommt der Spieler
500 Spielpunkte. Bei jeder Frage kann der Spieler 100, 500 oder alle Punkte einsetzen.
Wird die Frage richtig beantwortet, wird der Einsatz aufaddiert. Erreicht der Spieler
nach 5 Fragen mehr als 2500 Punkte, bekommt er Bonusfragen. Das Spiel endet bei einer
falschen Beantwortung der Frage.
- Insertion of ATS 5,- (Austrian Schilling coin) yields 5 credits. For 1 credit a player
+ Insertion of ATS 5,- (Austrian Schilling coin) yields 5 credits. For 1 credit a player
receives 500 points. At each question a player can bet 100, 500 or all points. If a
question is answered correctly, the bet is added to the points. If a player reaches
more than 2500 points after 5 questions, he gets bonus questions. The game is over
@@ -759,7 +759,7 @@ static WRITE8_DEVICE_HANDLER(funworld_lamp_a_w)
coin_counter_w(device->machine, 0, data & 0x01); /* credit in counter */
coin_counter_w(device->machine, 7, data & 0x04); /* credit out counter, mapped as coin 8 */
-// popmessage("Lamps A: %02X", data);
+// popmessage("Lamps A: %02X", data);
}
static WRITE8_DEVICE_HANDLER(funworld_lamp_b_w)
@@ -767,7 +767,7 @@ static WRITE8_DEVICE_HANDLER(funworld_lamp_b_w)
output_set_lamp_value(4, (data >> 0) & 1); /* button hold5/bet */
output_set_lamp_value(6, (data >> 1) & 1); /* button 7 (start/play) */
-// popmessage("Lamps B: %02X", data);
+// popmessage("Lamps B: %02X", data);
}
static WRITE8_DEVICE_HANDLER(pia1_ca2_w)
@@ -813,7 +813,7 @@ static READ8_HANDLER( questions_r )
static WRITE8_HANDLER( question_bank_w )
{
-// printf("question bank write %02x\n", data);
+// printf("question bank write %02x\n", data);
funquiz_question_bank = data;
}
@@ -2936,7 +2936,7 @@ ROM_END
/*
- pool10d -
- 3.50.u2 1ST AND 2ND HALF IDENTICAL
+ 3.50.u2 1ST AND 2ND HALF IDENTICAL
*/
ROM_START( pool10d )
ROM_REGION( 0x10000, "maincpu", 0 )
@@ -3553,7 +3553,7 @@ ROM_END
/* (Multi) Joker Card from Vesely Svet (Sprightly World). Czech poker game.
Program roms seems encrypted. Seems to be a Big Deal clone, running in
- Funworld Multi Win hardware.
+ Funworld Multi Win hardware.
1x Custom Funworld CPU, based on 6502 family. Silkscreened "Fun World Elektronik".
1x Maxim MAX690CPA - Microprocessor Supervisory IC (DIP 8).
@@ -3574,8 +3574,8 @@ ROM_END
1x 8 DIP switches bank.
1x Push button (SW2). (reset?)
1x Variable Resistor (VR1).
- 1x 16 MHz. Crystal.
- 1x CR2025 (3V) battery.
+ 1x 16 MHz. Crystal.
+ 1x CR2025 (3V) battery.
1x 2x17 pin male connector.
1x 2x22 Edge connector.
@@ -3763,7 +3763,7 @@ ROM_END
/**** Fun World Quiz ****
Fun World Quiz
- Öhlinger Ges.m.b.H.
+ ?hlinger Ges.m.b.H.
Horizontal Display
Currents
@@ -3791,7 +3791,7 @@ ROM_END
... |N |12| 2P Start
1P Action 1 |P |13| 1P Action 2
2P Action 1 |R |14| 2P Action 2
- 1P Left |S |15| 1P Right
+ 1P Left |S |15| 1P Right
1P Down |T |16| 1P Up
2P Left |U |17| 2P Right
2P Down |V |18| 2P Up
@@ -3828,12 +3828,12 @@ ROM_START( funquiz ) /* Fun World Quiz */
ROM_FILL( 0x0000, 0x4000, 0xff)
ROM_LOAD( "q_3.bin", 0x4000, 0x4000, CRC(0dafa07a) SHA1(5d6fa842c617f92fad14a597396249d5a4d28c9a) )
ROM_FILL( 0x8000, 0x4000, 0xff)
-// ROM_LOAD( "q_2_nec.bin", 0xc000, 0x4000, BAD_DUMP CRC(8e3bfcc7) SHA1(81b35e786fab088a439a4423becf08a78a0b2df0) )
+// ROM_LOAD( "q_2_nec.bin", 0xc000, 0x4000, BAD_DUMP CRC(8e3bfcc7) SHA1(81b35e786fab088a439a4423becf08a78a0b2df0) )
ROM_REGION( 0x10000, "badgfx", 0 ) /* just a temporal container */
ROM_LOAD( "q_2_nec.bin", 0xc000, 0x4000, BAD_DUMP CRC(8e3bfcc7) SHA1(81b35e786fab088a439a4423becf08a78a0b2df0) )
- /* One unpopulated questions socket... Maybe sport_1 is missing */
+ /* One unpopulated questions socket... Maybe sport_1 is missing */
ROM_REGION( 0x100000, "questions", ROMREGION_ERASEFF )
/* 01 - Allgemein */
@@ -4077,7 +4077,7 @@ static DRIVER_INIT( multiwin )
/*****************************************************
This only decrypt the text strings.
- Need more work to get the opcodes properly decrypted
+ Need more work to get the opcodes properly decrypted
******************************************************/
{
@@ -4089,12 +4089,12 @@ static DRIVER_INIT( multiwin )
for (x=0x8000; x < 0x10000; x++)
{
ROM[x] = ROM[x] ^ 0x91;
- UINT8 code;
+ UINT8 code;
ROM[x] = BITSWAP8(ROM[x],5,6,7,2,3,0,1,4);
code = ROM[x];
-
+
/* decrypt code here */
ROM[x+0x10000] = code;
@@ -4122,11 +4122,11 @@ static DRIVER_INIT( royalcdc )
for (x=0x8000; x < 0x10000; x++)
{
ROM[x] = ROM[x] ^ 0x22;
- UINT8 code;
+ UINT8 code;
// this seems correct for the data, plaintext decrypts fine
ROM[x] = BITSWAP8(ROM[x],2,6,7,4,3,1,5,0);
-
+
// the code uses different encryption, there are conflicts here
// so it's probably address based
code = ROM[x];
diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c
index 8f95f90d2c6..0afd0fdf5fc 100644
--- a/src/mame/drivers/galdrvr.c
+++ b/src/mame/drivers/galdrvr.c
@@ -2646,7 +2646,7 @@ static INPUT_PORTS_START( moonwar )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) /* output bits */
PORT_START("IN3") /* IN3/4 - dummy ports for the dial */
-
+
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(4) PORT_REVERSE PORT_RESET PORT_CONDITION("IN2", 0x08, PORTCOND_EQUALS, 0x08) // cocktail: dial is reversed
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(4) PORT_RESET PORT_CONDITION("IN2", 0x08, PORTCOND_EQUALS, 0x00) // upright: dial works normally
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index aa71a20718f..4af9cee1d48 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -60,11 +60,11 @@ To Do:
- Are the 16x16 tiles used by Mouja a Imagetek 14300-only feature?
- Interrupt timing needs figuring out properly, having it incorrect
causes scrolling glitches in some games. Test cases Mouse Go Go
- title screen, GunMaster title screen. Changing it can cause
- excessive slowdown in said games however.
+ title screen, GunMaster title screen. Changing it can cause
+ excessive slowdown in said games however.
- Bang Bang Ball / Bubble Buster slow to a crawl when you press a
button between levels, on a real PCB it speeds up instead (related
- to above?)
+ to above?)
Notes:
@@ -1182,7 +1182,7 @@ static ADDRESS_MAP_START( kokushi_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE_MEMBER(metro_state, blitter_regs) // Tiles Blitter
AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE_MEMBER(metro_state, window) // Tilemap Window
AM_RANGE(0x878870, 0x87887b) AM_WRITEONLY AM_BASE_MEMBER(metro_state, scroll) // Scroll Regs - WRONG
-// AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing
+// AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing
AM_RANGE(0x878890, 0x878891) AM_WRITENOP // ? increasing
AM_RANGE(0x8788a2, 0x8788a3) AM_READWRITE(metro_irq_cause_r, metro_irq_cause_w) // IRQ Cause / IRQ Acknowledge
AM_RANGE(0x8788a4, 0x8788a5) AM_WRITEONLY AM_BASE_MEMBER(metro_state, irq_enable) // IRQ Enable
@@ -1491,7 +1491,7 @@ static ADDRESS_MAP_START( dokyusei_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x478810, 0x47881f) AM_WRITEONLY AM_BASE_MEMBER(metro_state, irq_levels) // IRQ Levels
AM_RANGE(0x478820, 0x47882f) AM_WRITEONLY AM_BASE_MEMBER(metro_state, irq_vectors) // IRQ Vectors
AM_RANGE(0x478830, 0x478831) AM_WRITEONLY AM_BASE_MEMBER(metro_state, irq_enable) // IRQ Enable
-// AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r) // IRQ Cause
+// AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r) // IRQ Cause
AM_RANGE(0x478832, 0x478833) AM_WRITE(metro_irq_cause_w) // IRQ Acknowledge
AM_RANGE(0x478836, 0x478837) AM_WRITENOP // ? watchdog ?
AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE_MEMBER(metro_state, blitter_regs) // Tiles Blitter
@@ -1829,7 +1829,7 @@ static WRITE16_HANDLER( vram_0_clr_w )
static int i;
metro_state *state = (metro_state *)space->machine->driver_data;
-// printf("0 %04x %04x\n",offset,data);
+// printf("0 %04x %04x\n",offset,data);
for(i=0;i<0x20/2;i++)
state->vram_0[(offset*0x10+i)/2] = 0xffff;
}
@@ -1839,7 +1839,7 @@ static WRITE16_HANDLER( vram_1_clr_w )
static int i;
metro_state *state = (metro_state *)space->machine->driver_data;
-// printf("0 %04x %04x\n",offset,data);
+// printf("0 %04x %04x\n",offset,data);
for(i=0;i<0x20/2;i++)
state->vram_1[(offset*0x10+i)/2] = 0xffff;
}
@@ -1849,7 +1849,7 @@ static WRITE16_HANDLER( vram_2_clr_w )
static int i;
metro_state *state = (metro_state *)space->machine->driver_data;
-// printf("0 %04x %04x\n",offset,data);
+// printf("0 %04x %04x\n",offset,data);
for(i=0;i<0x20/2;i++)
state->vram_2[(offset*0x10+i)/2] = 0xffff;
}
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index 4cee6367e08..31078667914 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -674,7 +674,7 @@ ROM_START( speedrcr )
ROM_LOAD( "sysfl-5.bin", 0x000000, 0x000001, NO_DUMP ) /* PALCE16V8H-15PC/4 at 19D */
ROM_REGION( 0x2000, "nvram", 0 ) // default settings, including calibration
- ROM_LOAD("speedrcr.nv", 0x000000, 0x2000, CRC(58b41c70) SHA1(c30ea7f4951ce208781deafef8d99bdb4902e5b8) )
+ ROM_LOAD("speedrcr.nv", 0x000000, 0x2000, CRC(58b41c70) SHA1(c30ea7f4951ce208781deafef8d99bdb4902e5b8) )
ROM_END
@@ -719,7 +719,7 @@ ROM_START( finalapr )
ROM_LOAD("flr1voi.23s", 0x000000, 0x200000, CRC(ff6077cd) SHA1(73c289125ddeae3e43153e4c570549ca04501262) )
ROM_REGION( 0x2000, "nvram", 0 ) // default settings, including calibration
- ROM_LOAD("finalapr.nv", 0x000000, 0x2000, CRC(d51d65fe) SHA1(8a0a523cb6ba2880951e41ca04db23584f0a108c) )
+ ROM_LOAD("finalapr.nv", 0x000000, 0x2000, CRC(d51d65fe) SHA1(8a0a523cb6ba2880951e41ca04db23584f0a108c) )
ROM_END
ROM_START( finalapro )
@@ -804,7 +804,7 @@ ROM_START( finalaprj )
ROM_LOAD("flr1voi.23s", 0x000000, 0x200000, CRC(ff6077cd) SHA1(73c289125ddeae3e43153e4c570549ca04501262) )
ROM_REGION( 0x2000, "nvram", 0 ) // default settings, including calibration
- ROM_LOAD("finalapr.nv", 0x000000, 0x2000, CRC(d51d65fe) SHA1(8a0a523cb6ba2880951e41ca04db23584f0a108c) )
+ ROM_LOAD("finalapr.nv", 0x000000, 0x2000, CRC(d51d65fe) SHA1(8a0a523cb6ba2880951e41ca04db23584f0a108c) )
ROM_END
static void namcofl_common_init(running_machine *machine)
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index fac5e3baedb..80a546f4bda 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1295,10 +1295,10 @@ INPUT_PORTS_END
given
Z, X - Steer Car
- Ctrl - Accelerate
- Alt - Brake
- Mouse - Aim Gun
- Left Shift - Fire Gun
+ Ctrl - Accelerate
+ Alt - Brake
+ Mouse - Aim Gun
+ Left Shift - Fire Gun
*/
static INPUT_PORTS_START( luckywld )
@@ -2802,7 +2802,7 @@ ROM_START( finalap2 )
ROM_LOAD( "flsvoi2", 0x080000, 0x080000, CRC(204b3c27) SHA1(80cd13bfe2a4b3039b4a120b905674e46b8b3b9c) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "finalap2.nv", 0x000000, 0x2000, CRC(c7ae5d0a) SHA1(9527e44accec0ec9d1990138d1b0bfc71957cc8a) )
+ ROM_LOAD( "finalap2.nv", 0x000000, 0x2000, CRC(c7ae5d0a) SHA1(9527e44accec0ec9d1990138d1b0bfc71957cc8a) )
ROM_END
/* FINAL LAP 2 (Japan) */
@@ -2859,7 +2859,7 @@ ROM_START( finalap2j )
ROM_LOAD( "flsvoi2", 0x080000, 0x080000, CRC(204b3c27) SHA1(80cd13bfe2a4b3039b4a120b905674e46b8b3b9c) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "finalap2.nv", 0x000000, 0x2000, CRC(c7ae5d0a) SHA1(9527e44accec0ec9d1990138d1b0bfc71957cc8a) )
+ ROM_LOAD( "finalap2.nv", 0x000000, 0x2000, CRC(c7ae5d0a) SHA1(9527e44accec0ec9d1990138d1b0bfc71957cc8a) )
ROM_END
/* FINAL LAP 3 (WORLD) */
@@ -2919,7 +2919,7 @@ ROM_START( finalap3 ) // this set displays MOTION (Ver. 3) in the test mode menu
ROM_LOAD( "04544191.6r", 0, 8*1024, CRC(90db1bf6) SHA1(dbb9e50a8efc3b4012fcf587cc87da9ef42a1b80) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "finalap3.nv", 0x000000, 0x2000, CRC(efbc6274) SHA1(f542012e467027b7bd5d7102096ff91d8c9adee3) )
+ ROM_LOAD( "finalap3.nv", 0x000000, 0x2000, CRC(efbc6274) SHA1(f542012e467027b7bd5d7102096ff91d8c9adee3) )
ROM_END
@@ -2983,7 +2983,7 @@ ROM_START( finalap3a )
ROM_LOAD( "341.bin", 0x00000, 0x20000, CRC(8c90ca97) SHA1(dce2a680a5bc213f2f48d4baffc86ea27fe90209) ) // was read as 27c010
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "finalap3.nv", 0x000000, 0x2000, CRC(efbc6274) SHA1(f542012e467027b7bd5d7102096ff91d8c9adee3) )
+ ROM_LOAD( "finalap3.nv", 0x000000, 0x2000, CRC(efbc6274) SHA1(f542012e467027b7bd5d7102096ff91d8c9adee3) )
ROM_END
@@ -3044,7 +3044,7 @@ ROM_START( finalap3j )
ROM_LOAD( "04544191.6r", 0, 8*1024, CRC(90db1bf6) SHA1(dbb9e50a8efc3b4012fcf587cc87da9ef42a1b80) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "finalap3.nv", 0x000000, 0x2000, CRC(efbc6274) SHA1(f542012e467027b7bd5d7102096ff91d8c9adee3) )
+ ROM_LOAD( "finalap3.nv", 0x000000, 0x2000, CRC(efbc6274) SHA1(f542012e467027b7bd5d7102096ff91d8c9adee3) )
ROM_END
/* FINEST HOUR */
@@ -3495,7 +3495,7 @@ ROM_START( metlhawk )
ROM_LOAD( "pal12l10-sys87b-3.8d", 0x0400, 0x0040, CRC(d3ae64a6) SHA1(8e56f447908246e84d5a79df1a1cd3d5c8a040fb) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "metlhawk.nv", 0x000000, 0x2000, CRC(547cb0dc) SHA1(965ce5f8a42f5268cda2e77e4be115ccf57f1952) )
+ ROM_LOAD( "metlhawk.nv", 0x000000, 0x2000, CRC(547cb0dc) SHA1(965ce5f8a42f5268cda2e77e4be115ccf57f1952) )
ROM_END
/* METAL HAWK (Japan) */
@@ -3566,7 +3566,7 @@ ROM_START( metlhawkj )
ROM_LOAD( "pal12l10-sys87b-3.8d", 0x0400, 0x0040, CRC(d3ae64a6) SHA1(8e56f447908246e84d5a79df1a1cd3d5c8a040fb) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "metlhawk.nv", 0x000000, 0x2000, CRC(547cb0dc) SHA1(965ce5f8a42f5268cda2e77e4be115ccf57f1952) )
+ ROM_LOAD( "metlhawk.nv", 0x000000, 0x2000, CRC(547cb0dc) SHA1(965ce5f8a42f5268cda2e77e4be115ccf57f1952) )
ROM_END
/* MIRAI NINJA */
@@ -3935,7 +3935,7 @@ ROM_START( sgunner )
ROM_LOAD( "sn_voi2.3l", 0x080000, 0x080000, CRC(8c3251b5) SHA1(fa364c8462f490c636605262c5492a6a9b00e5b1) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "sgunner.nv", 0x000000, 0x2000, CRC(106026f8) SHA1(e4be6701d4eef6c18406593c6dee10644f29a15b) )
+ ROM_LOAD( "sgunner.nv", 0x000000, 0x2000, CRC(106026f8) SHA1(e4be6701d4eef6c18406593c6dee10644f29a15b) )
ROM_END
/* STEEL GUNNER (Japan) */
@@ -3986,7 +3986,7 @@ ROM_START( sgunnerj )
ROM_LOAD( "sn_voi2.3l", 0x080000, 0x080000, CRC(8c3251b5) SHA1(fa364c8462f490c636605262c5492a6a9b00e5b1) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "sgunner.nv", 0x000000, 0x2000, CRC(106026f8) SHA1(e4be6701d4eef6c18406593c6dee10644f29a15b) )
+ ROM_LOAD( "sgunner.nv", 0x000000, 0x2000, CRC(106026f8) SHA1(e4be6701d4eef6c18406593c6dee10644f29a15b) )
ROM_END
/* STEEL GUNNER 2 */
@@ -4041,7 +4041,7 @@ ROM_START( sgunner2 )
ROM_LOAD( "sns_voi2.bin", 0x080000, 0x080000, CRC(562ec86b) SHA1(c9874c7e1f38c5b38d21f45a82028651cf9089a5) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "sgunner2.nv", 0x000000, 0x2000, CRC(57a521c6) SHA1(d60b4f6f099b7f9fb1e575c5f9a74397986c6dac) )
+ ROM_LOAD( "sgunner2.nv", 0x000000, 0x2000, CRC(57a521c6) SHA1(d60b4f6f099b7f9fb1e575c5f9a74397986c6dac) )
ROM_END
/* STEEL GUNNER 2 (Japan) */
@@ -4096,7 +4096,7 @@ ROM_START( sgunner2j )
ROM_LOAD( "sns_voi2.bin", 0x080000, 0x080000, CRC(562ec86b) SHA1(c9874c7e1f38c5b38d21f45a82028651cf9089a5) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "sgunner2j.nv", 0x000000, 0x2000, CRC(014bccf9) SHA1(b6437fadf3e71df7a71fde9ec7ffc95fe6c057b3) )
+ ROM_LOAD( "sgunner2j.nv", 0x000000, 0x2000, CRC(014bccf9) SHA1(b6437fadf3e71df7a71fde9ec7ffc95fe6c057b3) )
ROM_END
/* SUPER WORLD STADIUM */
@@ -4870,7 +4870,7 @@ ROM_START( luckywld )
ROM_LOAD( "lw1ld8.10w", 0, 0x100, CRC(29058c73) SHA1(4916d6bdb7f78e6803698cab32d1586ea457dfc8) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration - see notes with inputs */
- ROM_LOAD( "luckywld.nv", 0x000000, 0x2000, CRC(0c185d2a) SHA1(6a4876361731df423515a0f3b37ba1496d6b1964) )
+ ROM_LOAD( "luckywld.nv", 0x000000, 0x2000, CRC(0c185d2a) SHA1(6a4876361731df423515a0f3b37ba1496d6b1964) )
ROM_END
/* LUCKY & WILD (Japan) */
@@ -4936,7 +4936,7 @@ ROM_START( luckywldj )
ROM_LOAD( "lw1ld8.10w", 0, 0x100, CRC(29058c73) SHA1(4916d6bdb7f78e6803698cab32d1586ea457dfc8) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration - see notes with inputs */
- ROM_LOAD( "luckywld.nv", 0x000000, 0x2000, CRC(0c185d2a) SHA1(6a4876361731df423515a0f3b37ba1496d6b1964) )
+ ROM_LOAD( "luckywld.nv", 0x000000, 0x2000, CRC(0c185d2a) SHA1(6a4876361731df423515a0f3b37ba1496d6b1964) )
ROM_END
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 2ba4dd2b795..33e48a8739a 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1880,7 +1880,7 @@ ROM_START( cybsled )
ROM_LOAD("cy1-voi3.12e",0x180000,0x80000,CRC(c902b4a4) SHA1(816357ec1a02a7ebf817ac1182e9c50ce5ca71f6) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "cybsled.nv", 0x000000, 0x2000, CRC(aa18bf9e) SHA1(3712d4d20e5f5f1c920e3f1f6a00101e874662d0) )
+ ROM_LOAD( "cybsled.nv", 0x000000, 0x2000, CRC(aa18bf9e) SHA1(3712d4d20e5f5f1c920e3f1f6a00101e874662d0) )
ROM_END
ROM_START( cybsledj )
@@ -1937,7 +1937,7 @@ ROM_START( cybsledj )
ROM_LOAD("cy1-voi3.12e",0x180000,0x80000,CRC(c902b4a4) SHA1(816357ec1a02a7ebf817ac1182e9c50ce5ca71f6) )
ROM_REGION( 0x2000, "nvram", 0 ) /* default settings, including calibration */
- ROM_LOAD( "cybsledj.nv", 0x000000, 0x2000, CRC(a73bb03e) SHA1(e074bfeae14178c867070e06f6690ed13115f5fa) )
+ ROM_LOAD( "cybsledj.nv", 0x000000, 0x2000, CRC(a73bb03e) SHA1(e074bfeae14178c867070e06f6690ed13115f5fa) )
ROM_END
ROM_START( driveyes )
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index 8cea721923d..e43f082b381 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -3705,7 +3705,7 @@ ROM_START( cybrcomm )
ROM_LOAD( "rr1gam.4d", 0x0200, 0x0100, CRC(b2161bce) SHA1(d2681cc0cf8e68df0d942d392b4eb4458c4bb356) )
ROM_REGION( 0x2000, "nvram", 0 )
-// ROM_LOAD( "cy1eeprm.9e", 0x0000, 0x2000, CRC(4e1d294b) SHA1(954ce04dcdba65214f5d0690ca59264f9090a1d6) ) /* EPROM (dumped?) */
+// ROM_LOAD( "cy1eeprm.9e", 0x0000, 0x2000, CRC(4e1d294b) SHA1(954ce04dcdba65214f5d0690ca59264f9090a1d6) ) /* EPROM (dumped?) */
ROM_LOAD( "cybrcomm.nv", 0x0000, 0x2000, CRC(8432c066) SHA1(99d4bfda3f8aec288dbeaf291bce85fe9009a1de) ) /* EPROM (useful defaults) */
ROM_END
@@ -5166,10 +5166,10 @@ static INPUT_PORTS_START( cybrcomm )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* Note(s)
- The ranges here are based on the test mode which displays +-224
- The nvram is calibrated using these settings. If the SUBCPU handling changes then these might
- end up needing to change again too
- Default key arrangement is based on dual-joystick 'Tank' arrangement found in Assault and CyberSled
+ The ranges here are based on the test mode which displays +-224
+ The nvram is calibrated using these settings. If the SUBCPU handling changes then these might
+ end up needing to change again too
+ Default key arrangement is based on dual-joystick 'Tank' arrangement found in Assault and CyberSled
*/
PORT_START("STICKY1") /* VOLUME 0 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0x47,0xb7) /* range based on test mode */ PORT_CODE_DEC(KEYCODE_I) PORT_CODE_INC(KEYCODE_K) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) /* right joystick: vertical */
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 754c9a11310..73f4a23df41 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -2506,11 +2506,11 @@ ROM_END
ROM_START( rapidrvr2 )
ROM_REGION32_BE( 0x400000, "user1", 0 ) /* 4 megs for main R4650 code */
- ROM_LOAD16_BYTE( "rd2verc.ic2", 0x000000, 0x200000, CRC(234fc2f4) SHA1(64374f4de19855f1980d8e088049b0c112107f43) )
- ROM_LOAD16_BYTE( "rd2verc.ic1", 0x000001, 0x200000, CRC(651c5da4) SHA1(0e73e2cfafda626597d2ce08bf07458509fb79de) )
+ ROM_LOAD16_BYTE( "rd2verc.ic2", 0x000000, 0x200000, CRC(234fc2f4) SHA1(64374f4de19855f1980d8e088049b0c112107f43) )
+ ROM_LOAD16_BYTE( "rd2verc.ic1", 0x000001, 0x200000, CRC(651c5da4) SHA1(0e73e2cfafda626597d2ce08bf07458509fb79de) )
ROM_REGION( 0x80000, "audiocpu", 0 ) /* Hitachi H8/3002 MCU code */
- ROM_LOAD16_WORD_SWAP( "rd2verc.ic3", 0x000000, 0x080000, CRC(6e26fbaf) SHA1(4ab6637d22f0d26f7e1d10e9c80059c56f64303d) )
+ ROM_LOAD16_WORD_SWAP( "rd2verc.ic3", 0x000000, 0x080000, CRC(6e26fbaf) SHA1(4ab6637d22f0d26f7e1d10e9c80059c56f64303d) )
ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code */
ROM_LOAD( "asca1_io-a.ic2", 0x000000, 0x040000, CRC(77cdf69a) SHA1(497af1059f85c07bea2dd0d303481623f6019dcf) )
@@ -3017,50 +3017,50 @@ ROM_END
ROM_START( downhill )
ROM_REGION32_BE( 0x400000, "user1", 0 ) /* 4 megs for main R4650 code */
- ROM_LOAD16_BYTE( "dh3vera.ic2", 0x000000, 0x200000, CRC(5d9952e9) SHA1(d38422330bd708c247b9968429fbff36fe706598) )
- ROM_LOAD16_BYTE( "dh3vera.ic1", 0x000001, 0x200000, CRC(64a236f3) SHA1(aac59e0db5cfefc4b442e6c3a5189a8418742201) )
+ ROM_LOAD16_BYTE( "dh3vera.ic2", 0x000000, 0x200000, CRC(5d9952e9) SHA1(d38422330bd708c247b9968429fbff36fe706598) )
+ ROM_LOAD16_BYTE( "dh3vera.ic1", 0x000001, 0x200000, CRC(64a236f3) SHA1(aac59e0db5cfefc4b442e6c3a5189a8418742201) )
ROM_REGION( 0x80000, "audiocpu", 0 ) /* Hitachi H8/3002 MCU code */
- ROM_LOAD16_WORD_SWAP( "dh3vera.ic3", 0x000000, 0x080000, CRC(98f9fc8b) SHA1(5152b9e11773033a26da11d1f3774a261e61a2c5) )
+ ROM_LOAD16_WORD_SWAP( "dh3vera.ic3", 0x000000, 0x080000, CRC(98f9fc8b) SHA1(5152b9e11773033a26da11d1f3774a261e61a2c5) )
ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code. "ASCA-3;Ver 2.04;JPN,Multipurpose + Rotary Encoder" */
- ROM_LOAD( "asc3_io-c.ic14", 0x000000, 0x020000, CRC(2f272a7b) SHA1(9d7ebe274c0d26f5f38747224d42d0375e2ed14c) )
+ ROM_LOAD( "asc3_io-c.ic14", 0x000000, 0x020000, CRC(2f272a7b) SHA1(9d7ebe274c0d26f5f38747224d42d0375e2ed14c) )
ROM_REGION32_BE( 0x2000000, "data", 0 ) /* data roms */
- ROM_LOAD16_BYTE( "dh1mtah.2j", 0x000000, 0x800000, CRC(3b56faa7) SHA1(861db7f549bedbb2b837516fcc966ad5890007ce) )
- ROM_LOAD16_BYTE( "dh1mtal.2h", 0x000001, 0x800000, CRC(9fa07bfe) SHA1(a6b847ff7d5eadbf60b434a0d905051ea4227113) )
+ ROM_LOAD16_BYTE( "dh1mtah.2j", 0x000000, 0x800000, CRC(3b56faa7) SHA1(861db7f549bedbb2b837516fcc966ad5890007ce) )
+ ROM_LOAD16_BYTE( "dh1mtal.2h", 0x000001, 0x800000, CRC(9fa07bfe) SHA1(a6b847ff7d5eadbf60b434a0d905051ea4227113) )
ROM_REGION( 0x2000000, "textile", 0 ) /* texture tiles */
- ROM_LOAD( "dh1cgll.4m", 0x0000000, 0x800000, CRC(c0d5ad87) SHA1(bc1992516c63aebdae0322def77f082d799a327a) )
- ROM_LOAD( "dh1cglm.4k", 0x0800000, 0x800000, CRC(5d9a5e35) SHA1(d746abb45f04aa4eb9d43d9c79051e71bf024e38) )
- ROM_LOAD( "dh1cgum.4j", 0x1000000, 0x800000, CRC(1044d0a0) SHA1(e0bf843616e166495fcdc76f076eb53a28287d30) )
- ROM_LOAD( "dh1cguu.5f", 0x1800000, 0x800000, CRC(66cb0dd7) SHA1(1f67320f150f1b55c97eae4b9fe4890fabc8dc7e) )
+ ROM_LOAD( "dh1cgll.4m", 0x0000000, 0x800000, CRC(c0d5ad87) SHA1(bc1992516c63aebdae0322def77f082d799a327a) )
+ ROM_LOAD( "dh1cglm.4k", 0x0800000, 0x800000, CRC(5d9a5e35) SHA1(d746abb45f04aa4eb9d43d9c79051e71bf024e38) )
+ ROM_LOAD( "dh1cgum.4j", 0x1000000, 0x800000, CRC(1044d0a0) SHA1(e0bf843616e166495fcdc76f076eb53a28287d30) )
+ ROM_LOAD( "dh1cguu.5f", 0x1800000, 0x800000, CRC(66cb0dd7) SHA1(1f67320f150f1b55c97eae4b9fe4890fabc8dc7e) )
ROM_REGION16_LE( 0x400000, "textilemapl", 0 ) /* texture tilemap 0-15 */
- ROM_LOAD( "dh1ccrl.7f", 0x000000, 0x400000, CRC(65c857df) SHA1(5d67b17cf272f042b4264d9871d6e4088c20b788) )
+ ROM_LOAD( "dh1ccrl.7f", 0x000000, 0x400000, CRC(65c857df) SHA1(5d67b17cf272f042b4264d9871d6e4088c20b788) )
ROM_REGION( 0x200000, "textilemaph", 0 ) /* texture tilemap 16-17 + attr */
- ROM_LOAD( "dh1ccrh.7e", 0x000000, 0x200000, CRC(f21c482d) SHA1(bfcead2ff3d10f996ac0bf81470d050bd6374156) )
+ ROM_LOAD( "dh1ccrh.7e", 0x000000, 0x200000, CRC(f21c482d) SHA1(bfcead2ff3d10f996ac0bf81470d050bd6374156) )
ROM_REGION32_BE( 0x2000000, "pointrom", 0 ) /* 3D model data */
- ROM_LOAD32_WORD_SWAP( "dh1pt0h.7a", 0x0000000, 0x400000, CRC(0e84a5d8) SHA1(28559f978b86d88bb18c3e58e28a97ecfb5f7fa9) )
- ROM_LOAD32_WORD_SWAP( "dh1pt0l.7c", 0x0000002, 0x400000, CRC(d120eee5) SHA1(fa1269d891f4e0510491aa70c4abd5f36852e691) )
- ROM_LOAD32_WORD_SWAP( "dh1pt1h.5a", 0x0800000, 0x400000, CRC(88cd4c90) SHA1(94016c72a9da983e55c74cbdd3691b596ea50c31) )
- ROM_LOAD32_WORD_SWAP( "dh1pt1l.5c", 0x0800002, 0x400000, CRC(dee2f2bf) SHA1(258f9a6e324502550d27b8feaf36244766fa19da) )
- ROM_LOAD32_WORD_SWAP( "dh1pt2h.4a", 0x1000000, 0x400000, CRC(7e167c65) SHA1(018bf6aea4c1640ef728cf7b8e491f11742ede0d) )
- ROM_LOAD32_WORD_SWAP( "dh1pt2l.4c", 0x1000002, 0x400000, CRC(714e3090) SHA1(39827f645dacbb57c7c40193f3f58e879899a4f3) )
+ ROM_LOAD32_WORD_SWAP( "dh1pt0h.7a", 0x0000000, 0x400000, CRC(0e84a5d8) SHA1(28559f978b86d88bb18c3e58e28a97ecfb5f7fa9) )
+ ROM_LOAD32_WORD_SWAP( "dh1pt0l.7c", 0x0000002, 0x400000, CRC(d120eee5) SHA1(fa1269d891f4e0510491aa70c4abd5f36852e691) )
+ ROM_LOAD32_WORD_SWAP( "dh1pt1h.5a", 0x0800000, 0x400000, CRC(88cd4c90) SHA1(94016c72a9da983e55c74cbdd3691b596ea50c31) )
+ ROM_LOAD32_WORD_SWAP( "dh1pt1l.5c", 0x0800002, 0x400000, CRC(dee2f2bf) SHA1(258f9a6e324502550d27b8feaf36244766fa19da) )
+ ROM_LOAD32_WORD_SWAP( "dh1pt2h.4a", 0x1000000, 0x400000, CRC(7e167c65) SHA1(018bf6aea4c1640ef728cf7b8e491f11742ede0d) )
+ ROM_LOAD32_WORD_SWAP( "dh1pt2l.4c", 0x1000002, 0x400000, CRC(714e3090) SHA1(39827f645dacbb57c7c40193f3f58e879899a4f3) )
ROM_REGION( 0x1000000, "c352", 0 ) /* C352 PCM samples */
- ROM_LOAD( "dh1wavel.2c", 0x000000, 0x800000, CRC(10954726) SHA1(50ee0346c46194dada7b5c0d8b1efe9a7f211b90) )
- ROM_LOAD( "dh1waveh.2a", 0x800000, 0x800000, CRC(2adfa312) SHA1(d01a46af2c95d1ea64e9778979ae147298d921e3) )
+ ROM_LOAD( "dh1wavel.2c", 0x000000, 0x800000, CRC(10954726) SHA1(50ee0346c46194dada7b5c0d8b1efe9a7f211b90) )
+ ROM_LOAD( "dh1waveh.2a", 0x800000, 0x800000, CRC(2adfa312) SHA1(d01a46af2c95d1ea64e9778979ae147298d921e3) )
ROM_REGION( 0x800000, "dups", 0 ) /* duplicate roms */
- ROM_LOAD( "dh1cguu.4f", 0x000000, 0x800000, CRC(66cb0dd7) SHA1(1f67320f150f1b55c97eae4b9fe4890fabc8dc7e) )
- ROM_LOAD( "dh1cgum.5j", 0x000000, 0x800000, CRC(1044d0a0) SHA1(e0bf843616e166495fcdc76f076eb53a28287d30) )
- ROM_LOAD( "dh1cgll.5m", 0x000000, 0x800000, CRC(c0d5ad87) SHA1(bc1992516c63aebdae0322def77f082d799a327a) )
- ROM_LOAD( "dh1cglm.5k", 0x000000, 0x800000, CRC(5d9a5e35) SHA1(d746abb45f04aa4eb9d43d9c79051e71bf024e38) )
- ROM_LOAD( "dh1ccrl.7m", 0x000000, 0x400000, CRC(65c857df) SHA1(5d67b17cf272f042b4264d9871d6e4088c20b788) )
- ROM_LOAD( "dh1ccrh.7k", 0x000000, 0x200000, CRC(f21c482d) SHA1(bfcead2ff3d10f996ac0bf81470d050bd6374156) )
+ ROM_LOAD( "dh1cguu.4f", 0x000000, 0x800000, CRC(66cb0dd7) SHA1(1f67320f150f1b55c97eae4b9fe4890fabc8dc7e) )
+ ROM_LOAD( "dh1cgum.5j", 0x000000, 0x800000, CRC(1044d0a0) SHA1(e0bf843616e166495fcdc76f076eb53a28287d30) )
+ ROM_LOAD( "dh1cgll.5m", 0x000000, 0x800000, CRC(c0d5ad87) SHA1(bc1992516c63aebdae0322def77f082d799a327a) )
+ ROM_LOAD( "dh1cglm.5k", 0x000000, 0x800000, CRC(5d9a5e35) SHA1(d746abb45f04aa4eb9d43d9c79051e71bf024e38) )
+ ROM_LOAD( "dh1ccrl.7m", 0x000000, 0x400000, CRC(65c857df) SHA1(5d67b17cf272f042b4264d9871d6e4088c20b788) )
+ ROM_LOAD( "dh1ccrh.7k", 0x000000, 0x200000, CRC(f21c482d) SHA1(bfcead2ff3d10f996ac0bf81470d050bd6374156) )
ROM_END
// bfe4b800
@@ -3070,50 +3070,50 @@ ROM_START( crszone )
ROM_CONTINUE( 0x000000, 0x400000 )
ROM_REGION( 0x80000, "audiocpu", 0 ) /* Hitachi H8/3002 MCU code */
- ROM_LOAD16_WORD_SWAP( "cszo3verb.ic1", 0x000000, 0x080000, CRC(c790743b) SHA1(5fa7b83a7a1b1105a3aa0870b782cf2741b7d11c) )
+ ROM_LOAD16_WORD_SWAP( "cszo3verb.ic1", 0x000000, 0x080000, CRC(c790743b) SHA1(5fa7b83a7a1b1105a3aa0870b782cf2741b7d11c) )
ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code. "MIU-I/O;Ver2.05;JPN,GUN-EXTENTION" */
- ROM_LOAD( "csz1prg0a.8f", 0x000000, 0x020000, CRC(8edc36b3) SHA1(b5df211988d856572fcc313480e693c8561784e4) )
+ ROM_LOAD( "csz1prg0a.8f", 0x000000, 0x020000, CRC(8edc36b3) SHA1(b5df211988d856572fcc313480e693c8561784e4) )
ROM_REGION32_BE( 0x2000000, "data", 0 ) /* data roms */
- ROM_LOAD16_BYTE( "csz1mtah.2j", 0x0000000, 0x800000, CRC(66b076ad) SHA1(edd32e0b380f01a9626d32f5eec860f841c8be8a) )
- ROM_LOAD16_BYTE( "csz1mtal.2h", 0x0000001, 0x800000, CRC(38dc639a) SHA1(aa9b5b35174c1b007a57a4bd7a53bc3f479b5b71) )
- ROM_LOAD16_BYTE( "csz1mtbh.2m", 0x1000000, 0x800000, CRC(bdec4188) SHA1(a098651fbd8a69a0afc17f4b6c93350926cacd6b) )
- ROM_LOAD16_BYTE( "csz1mtbl.2f", 0x1000001, 0x800000, CRC(9c8f8d7a) SHA1(f61bcc9763df15428c82931a605ee40334d5ad98) )
+ ROM_LOAD16_BYTE( "csz1mtah.2j", 0x0000000, 0x800000, CRC(66b076ad) SHA1(edd32e0b380f01a9626d32f5eec860f841c8be8a) )
+ ROM_LOAD16_BYTE( "csz1mtal.2h", 0x0000001, 0x800000, CRC(38dc639a) SHA1(aa9b5b35174c1b007a57a4bd7a53bc3f479b5b71) )
+ ROM_LOAD16_BYTE( "csz1mtbh.2m", 0x1000000, 0x800000, CRC(bdec4188) SHA1(a098651fbd8a69a0afc17f4b6c93350926cacd6b) )
+ ROM_LOAD16_BYTE( "csz1mtbl.2f", 0x1000001, 0x800000, CRC(9c8f8d7a) SHA1(f61bcc9763df15428c82931a605ee40334d5ad98) )
ROM_REGION( 0x2000000, "textile", 0 ) /* texture tiles */
- ROM_LOAD( "csz1cgll.4m", 0x0000000, 0x800000, CRC(0bcd41f2) SHA1(80b74f9398e8bd074f79a14490d06cfeb875c874) )
- ROM_LOAD( "csz1cglm.4k", 0x0800000, 0x800000, CRC(d4af93d1) SHA1(0df37b793ce8da02d14f714722382786ae5d3ce2) )
- ROM_LOAD( "csz1cgum.4j", 0x1000000, 0x800000, CRC(913c98b5) SHA1(b952dbc19053796077d4f33e8da836893e933b12) )
- ROM_LOAD( "csz1cguu.5f", 0x1800000, 0x800000, CRC(e1d1bf24) SHA1(daf2c68e2d9a8f313d262d221cc990c93dfdf22f) )
+ ROM_LOAD( "csz1cgll.4m", 0x0000000, 0x800000, CRC(0bcd41f2) SHA1(80b74f9398e8bd074f79a14490d06cfeb875c874) )
+ ROM_LOAD( "csz1cglm.4k", 0x0800000, 0x800000, CRC(d4af93d1) SHA1(0df37b793ce8da02d14f714722382786ae5d3ce2) )
+ ROM_LOAD( "csz1cgum.4j", 0x1000000, 0x800000, CRC(913c98b5) SHA1(b952dbc19053796077d4f33e8da836893e933b12) )
+ ROM_LOAD( "csz1cguu.5f", 0x1800000, 0x800000, CRC(e1d1bf24) SHA1(daf2c68e2d9a8f313d262d221cc990c93dfdf22f) )
ROM_REGION16_LE( 0x400000, "textilemapl", 0 ) /* texture tilemap 0-15 */
- ROM_LOAD( "csz1ccrl.7f", 0x000000, 0x400000, CRC(1c20768d) SHA1(6cf4280e26f3625d6f750837bf344163e7e93c3d) )
+ ROM_LOAD( "csz1ccrl.7f", 0x000000, 0x400000, CRC(1c20768d) SHA1(6cf4280e26f3625d6f750837bf344163e7e93c3d) )
ROM_REGION( 0x200000, "textilemaph", 0 ) /* texture tilemap 16-17 + attr */
- ROM_LOAD( "csz1ccrh.7e", 0x000000, 0x200000, CRC(bc2fa03c) SHA1(e63d8e75494a383bf9a213edfa9c472a010f8efe) )
+ ROM_LOAD( "csz1ccrh.7e", 0x000000, 0x200000, CRC(bc2fa03c) SHA1(e63d8e75494a383bf9a213edfa9c472a010f8efe) )
ROM_REGION32_BE( 0x2000000, "pointrom", 0 ) /* 3D model data */
- ROM_LOAD32_WORD_SWAP( "csz1pt0h.7a", 0x0000000, 0x400000, CRC(e82f1abb) SHA1(b1c57152cc27835e06e429fd1659fe0973638142) )
- ROM_LOAD32_WORD_SWAP( "csz1pt0l.7c", 0x0000002, 0x400000, CRC(b0d66afe) SHA1(7cda4eebf1bb1191d17e4b5e616be2fbe4ae9328) )
- ROM_LOAD32_WORD_SWAP( "csz1pt1h.5a", 0x0800000, 0x400000, CRC(e54f80ad) SHA1(3b3fbb3001e630d800b02ec8e653d74878ac5116) )
- ROM_LOAD32_WORD_SWAP( "csz1pt1l.5c", 0x0800002, 0x400000, CRC(527171c8) SHA1(0b2ce3858f40bdedf1543309a6bc28d780415250) )
- ROM_LOAD32_WORD_SWAP( "csz1pt2h.4a", 0x1000000, 0x400000, CRC(e295137a) SHA1(37b18af1b3d9f0e69b45135f89b49a1ceec79127) )
- ROM_LOAD32_WORD_SWAP( "csz1pt2l.4c", 0x1000002, 0x400000, CRC(c87d6dbd) SHA1(686f39073c521d6b21ef8bc1161b41b680697c63) )
- ROM_LOAD32_WORD_SWAP( "csz1pt3h.3a", 0x1800000, 0x400000, CRC(05f65bdf) SHA1(0c349fe5381fe7aeb81f9365a2b44a212f6bd33e) )
- ROM_LOAD32_WORD_SWAP( "csz1pt3l.3c", 0x1800002, 0x400000, CRC(5d077c0f) SHA1(a4fd0167d89bf9417766405726e0334e7c7eaec3) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt0h.7a", 0x0000000, 0x400000, CRC(e82f1abb) SHA1(b1c57152cc27835e06e429fd1659fe0973638142) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt0l.7c", 0x0000002, 0x400000, CRC(b0d66afe) SHA1(7cda4eebf1bb1191d17e4b5e616be2fbe4ae9328) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt1h.5a", 0x0800000, 0x400000, CRC(e54f80ad) SHA1(3b3fbb3001e630d800b02ec8e653d74878ac5116) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt1l.5c", 0x0800002, 0x400000, CRC(527171c8) SHA1(0b2ce3858f40bdedf1543309a6bc28d780415250) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt2h.4a", 0x1000000, 0x400000, CRC(e295137a) SHA1(37b18af1b3d9f0e69b45135f89b49a1ceec79127) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt2l.4c", 0x1000002, 0x400000, CRC(c87d6dbd) SHA1(686f39073c521d6b21ef8bc1161b41b680697c63) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt3h.3a", 0x1800000, 0x400000, CRC(05f65bdf) SHA1(0c349fe5381fe7aeb81f9365a2b44a212f6bd33e) )
+ ROM_LOAD32_WORD_SWAP( "csz1pt3l.3c", 0x1800002, 0x400000, CRC(5d077c0f) SHA1(a4fd0167d89bf9417766405726e0334e7c7eaec3) )
ROM_REGION( 0x1000000, "c352", 0 ) /* C352 PCM samples */
- ROM_LOAD( "csz1wavel.2c", 0x000000, 0x800000, CRC(d0d74132) SHA1(a293d93bca8e12e388a088a592cfa7bcb9a976f7) )
- ROM_LOAD( "csz1waveh.2a", 0x800000, 0x800000, CRC(de9d14a8) SHA1(e5006861928bb1d29bf80c7304f1a6d044b094fd) )
+ ROM_LOAD( "csz1wavel.2c", 0x000000, 0x800000, CRC(d0d74132) SHA1(a293d93bca8e12e388a088a592cfa7bcb9a976f7) )
+ ROM_LOAD( "csz1waveh.2a", 0x800000, 0x800000, CRC(de9d14a8) SHA1(e5006861928bb1d29bf80c7304f1a6d044b094fd) )
ROM_REGION( 0x800000, "dups", 0 ) /* duplicate roms */
- ROM_LOAD( "csz1cguu.4f", 0x000000, 0x800000, CRC(e1d1bf24) SHA1(daf2c68e2d9a8f313d262d221cc990c93dfdf22f) )
- ROM_LOAD( "csz1cgum.5j", 0x000000, 0x800000, CRC(913c98b5) SHA1(b952dbc19053796077d4f33e8da836893e933b12) )
- ROM_LOAD( "csz1cgll.5m", 0x000000, 0x800000, CRC(0bcd41f2) SHA1(80b74f9398e8bd074f79a14490d06cfeb875c874) )
- ROM_LOAD( "csz1cglm.5k", 0x000000, 0x800000, CRC(d4af93d1) SHA1(0df37b793ce8da02d14f714722382786ae5d3ce2) )
- ROM_LOAD( "csz1ccrl.7m", 0x000000, 0x400000, CRC(1c20768d) SHA1(6cf4280e26f3625d6f750837bf344163e7e93c3d) )
- ROM_LOAD( "csz1ccrh.7k", 0x000000, 0x200000, CRC(bc2fa03c) SHA1(e63d8e75494a383bf9a213edfa9c472a010f8efe) )
+ ROM_LOAD( "csz1cguu.4f", 0x000000, 0x800000, CRC(e1d1bf24) SHA1(daf2c68e2d9a8f313d262d221cc990c93dfdf22f) )
+ ROM_LOAD( "csz1cgum.5j", 0x000000, 0x800000, CRC(913c98b5) SHA1(b952dbc19053796077d4f33e8da836893e933b12) )
+ ROM_LOAD( "csz1cgll.5m", 0x000000, 0x800000, CRC(0bcd41f2) SHA1(80b74f9398e8bd074f79a14490d06cfeb875c874) )
+ ROM_LOAD( "csz1cglm.5k", 0x000000, 0x800000, CRC(d4af93d1) SHA1(0df37b793ce8da02d14f714722382786ae5d3ce2) )
+ ROM_LOAD( "csz1ccrl.7m", 0x000000, 0x400000, CRC(1c20768d) SHA1(6cf4280e26f3625d6f750837bf344163e7e93c3d) )
+ ROM_LOAD( "csz1ccrh.7k", 0x000000, 0x200000, CRC(bc2fa03c) SHA1(e63d8e75494a383bf9a213edfa9c472a010f8efe) )
ROM_END
/* Games */
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 016efb483ee..f35bf84d056 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -321,8 +321,8 @@ static WRITE8_DEVICE_HANDLER( spc_ram_100_w )
}
static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x00ef) AM_DEVREADWRITE("spc700", spc_ram_r, spc_ram_w) /* lower 32k ram */
- AM_RANGE(0x00f0, 0x00ff) AM_DEVREADWRITE("spc700", spc_io_r, spc_io_w) /* spc io */
+ AM_RANGE(0x0000, 0x00ef) AM_DEVREADWRITE("spc700", spc_ram_r, spc_ram_w) /* lower 32k ram */
+ AM_RANGE(0x00f0, 0x00ff) AM_DEVREADWRITE("spc700", spc_io_r, spc_io_w) /* spc io */
AM_RANGE(0x0100, 0xffff) AM_DEVWRITE("spc700", spc_ram_100_w)
AM_RANGE(0x0100, 0xffbf) AM_DEVREAD("spc700", spc_ram_100_r)
AM_RANGE(0xffc0, 0xffff) AM_DEVREAD("spc700", spc_ipl_r)
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 28ab19105b8..ba6e5469d3a 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -57,7 +57,7 @@ static WRITE8_HANDLER( paradise_rombank_w )
static WRITE8_DEVICE_HANDLER( paradise_okibank_w )
{
- if (data & ~0x02)
+ if (data & ~0x02)
logerror("%s: unknown oki bank bits %02X\n", cpuexec_describe_context(device->machine), data);
okim6295_set_bank_base(device, (data & 0x02) ? 0x40000 : 0);
@@ -110,7 +110,7 @@ static ADDRESS_MAP_START( paradise_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x2023, 0x2023) AM_READ_PORT("P2")
AM_RANGE(0x2024, 0x2024) AM_READ_PORT("SYSTEM")
AM_RANGE(0x2030, 0x2030) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) // OKI 1
- AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w) AM_BASE_MEMBER(paradise_state, videoram) // Pixmap
+ AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w) AM_BASE_MEMBER(paradise_state, videoram) // Pixmap
ADDRESS_MAP_END
static ADDRESS_MAP_START( torus_io_map, ADDRESS_SPACE_IO, 8 )
@@ -125,7 +125,7 @@ static ADDRESS_MAP_START( torus_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x2022, 0x2022) AM_READ_PORT("P1")
AM_RANGE(0x2023, 0x2023) AM_READ_PORT("P2")
AM_RANGE(0x2024, 0x2024) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w) AM_BASE_MEMBER(paradise_state, videoram) // Pixmap
+ AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w) AM_BASE_MEMBER(paradise_state, videoram) // Pixmap
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 9cb1ef9b984..1e8660e060b 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -82,7 +82,7 @@ public:
static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pasha2_state(machine)); }
pasha2_state(running_machine &machine) { }
-
+
/* memory pointers */
UINT16 * bitmap0;
UINT16 * bitmap1;
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index bddac2c9430..5fc04401c82 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -283,8 +283,8 @@ static WRITE8_DEVICE_HANDLER( spc_ram_100_w )
}
static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x00ef) AM_DEVREADWRITE("spc700", spc_ram_r, spc_ram_w) /* lower 32k ram */
- AM_RANGE(0x00f0, 0x00ff) AM_DEVREADWRITE("spc700", spc_io_r, spc_io_w) /* spc io */
+ AM_RANGE(0x0000, 0x00ef) AM_DEVREADWRITE("spc700", spc_ram_r, spc_ram_w) /* lower 32k ram */
+ AM_RANGE(0x00f0, 0x00ff) AM_DEVREADWRITE("spc700", spc_io_r, spc_io_w) /* spc io */
AM_RANGE(0x0100, 0xffff) AM_DEVWRITE("spc700", spc_ram_100_w)
AM_RANGE(0x0100, 0xffbf) AM_DEVREAD("spc700", spc_ram_100_r)
AM_RANGE(0xffc0, 0xffff) AM_DEVREAD("spc700", spc_ipl_r)
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index dbd8ec56c78..d75ab4a2a9f 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -3096,7 +3096,7 @@ ROM_START( fhboxers )
ROM_LOAD16_WORD_SWAP( "mpr18540.9", 0x2000000, 0x0400000, CRC(4c2b59a4) SHA1(4d15503fcff0e9e0d1ed3bac724278102b506da0) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "fhboxers.nv", 0x0000, 0x0080, CRC(590fd6da) SHA1(1abe71c62c51a246d854f02cd4cb79fd0d427e88) )
+ ROM_LOAD( "fhboxers.nv", 0x0000, 0x0080, CRC(590fd6da) SHA1(1abe71c62c51a246d854f02cd4cb79fd0d427e88) )
ROM_END
/* set system to 1 player to test rom */
@@ -3120,7 +3120,7 @@ ROM_START( findlove )
ROM_LOAD16_WORD_SWAP( "mpr20436.12", 0x2c00000, 0x0400000, CRC(e3823f49) SHA1(754d48635bd1d4fb01ff665bfe2a71593d92f688) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "findlove.nv", 0x0000, 0x0080, CRC(df2fa9f6) SHA1(f05450e1648eafd2ffb52e50769f07bdc75ffb95) )
+ ROM_LOAD( "findlove.nv", 0x0000, 0x0080, CRC(df2fa9f6) SHA1(f05450e1648eafd2ffb52e50769f07bdc75ffb95) )
ROM_END
ROM_START( finlarch )
@@ -3230,7 +3230,7 @@ ROM_START( kiwames )
ROM_LOAD16_WORD_SWAP( "mpr18740.4", 0x0c00000, 0x0200000, CRC(9ca7962f) SHA1(a09e0db2246b34ca7efa3165afbc5ba292a95398) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "kiwames.nv", 0x0000, 0x0080, CRC(c7002732) SHA1(57395d256a58ddcedd354ce1f2c458321be40505) )
+ ROM_LOAD( "kiwames.nv", 0x0000, 0x0080, CRC(c7002732) SHA1(57395d256a58ddcedd354ce1f2c458321be40505) )
ROM_END
ROM_START( maruchan )
@@ -3264,7 +3264,7 @@ ROM_START( myfairld )
ROM_LOAD16_WORD_SWAP( "mpr21001.8", 0x1c00000, 0x0400000, CRC(95fbe549) SHA1(8cfb48f353b2849600373d66f293f103bca700df) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "myfairld.nv", 0x0000, 0x0080, CRC(c7cf3a5a) SHA1(5365f38047821305658f94395f03cf2c49c87576) )
+ ROM_LOAD( "myfairld.nv", 0x0000, 0x0080, CRC(c7cf3a5a) SHA1(5365f38047821305658f94395f03cf2c49c87576) )
ROM_END
ROM_START( othellos )
@@ -3446,7 +3446,7 @@ ROM_START( seabass )
ROM_LOAD16_WORD_SWAP( "mpr20557.9", 0x2000000, 0x0400000, CRC(3c9ba442) SHA1(2e5b795cf4cdc11ab3e4887b2f77c7147c6e3eec) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "seabass.nv", 0x0000, 0x0080, CRC(4e7c0944) SHA1(dbba78f6a7f3e7d12d5c4fff36117db82f5f9c01) )
+ ROM_LOAD( "seabass.nv", 0x0000, 0x0080, CRC(4e7c0944) SHA1(dbba78f6a7f3e7d12d5c4fff36117db82f5f9c01) )
ROM_END
ROM_START( shanhigw )
@@ -3511,7 +3511,7 @@ ROM_START( sss )
ROM_LOAD16_WORD_SWAP( "mpr21493.6", 0x1400000, 0x0400000, CRC(efb2d271) SHA1(a591e48206704fbda5fef3ce69ad279da1017ed6) ) // ic6 good (was .16)
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "sss.nv", 0x0000, 0x0080, CRC(3473b2f3) SHA1(6480b4b321af8ee6e967710e74f2556c17bfca97) )
+ ROM_LOAD( "sss.nv", 0x0000, 0x0080, CRC(3473b2f3) SHA1(6480b4b321af8ee6e967710e74f2556c17bfca97) )
ROM_END
ROM_START( suikoenb )
@@ -3588,7 +3588,7 @@ ROM_START( vmahjong )
ROM_LOAD16_WORD_SWAP( "mpr19621.8", 0x1c00000, 0x0400000, CRC(f92616b3) SHA1(61a9dda92a86a02d027260e11b1bad3b0dda9f02) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "vmahjong.nv", 0x0000, 0x0080, CRC(4e6487f4) SHA1(d6d930ab5f21b8c4f42812d08b3ee90f2bc94081) )
+ ROM_LOAD( "vmahjong.nv", 0x0000, 0x0080, CRC(4e6487f4) SHA1(d6d930ab5f21b8c4f42812d08b3ee90f2bc94081) )
ROM_END
ROM_START( winterht )
@@ -3730,7 +3730,7 @@ ROM_START( critcrsh ) /* Must use Europe or Asia BIOS */
ROM_LOAD16_WORD_SWAP( "mpr-18788.ic9", 0x2000000, 0x0400000, CRC(feae5867) SHA1(7d2e47d5ab18700a246d53fdb7872a905cdac55a) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "critcrsh.nv", 0x0000, 0x0080, CRC(3da9860e) SHA1(05b315aa71fcfc4e617266e1c5e4954eccbf7854) )
+ ROM_LOAD( "critcrsh.nv", 0x0000, 0x0080, CRC(3da9860e) SHA1(05b315aa71fcfc4e617266e1c5e4954eccbf7854) )
ROM_END
ROM_START( sfish2 )
@@ -3784,7 +3784,7 @@ ROM_START( magzun )
ROM_LOAD16_WORD_SWAP( "mpr-19359.ic1", 0x1800000, 0x0400000, CRC(b0d06f9c) SHA1(19e04c9c3a0bea5950aba8e1975962fa37722f32) ) // good
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 3 players
- ROM_LOAD( "magzun.nv", 0x0000, 0x0080, CRC(42700321) SHA1(1f2ba760c410312539c8677223edcd1cda3b51d4) )
+ ROM_LOAD( "magzun.nv", 0x0000, 0x0080, CRC(42700321) SHA1(1f2ba760c410312539c8677223edcd1cda3b51d4) )
ROM_END
@@ -3824,7 +3824,7 @@ ROM_START( nclubv3 )
ROM_LOAD16_WORD_SWAP( "ic25", 0x1400000, 0x0200000, CRC(f77f9e24) SHA1(9a9636114e74c1fd7bd67db8005af02ef6a75ab1) ) // OK
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "nclubv3.nv", 0x0000, 0x0080, CRC(9122a9e9) SHA1(5318994905e005567709c41449547c545182bece) )
+ ROM_LOAD( "nclubv3.nv", 0x0000, 0x0080, CRC(9122a9e9) SHA1(5318994905e005567709c41449547c545182bece) )
ROM_END
ROM_START( techbowl ) // set to 1p
@@ -3839,7 +3839,7 @@ ROM_START( techbowl ) // set to 1p
ROM_LOAD16_WORD_SWAP( "ic30", 0x0a00000, 0x0200000, CRC(8d89877e) SHA1(7d76d48d64d7ac5411d714a4bb83f37e3e5b8df6) ) // OK
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "techbowl.nv", 0x0000, 0x0080, CRC(5bebc2b7) SHA1(e189e891e1753059fbaad4ce82ddf191d5e8176a) )
+ ROM_LOAD( "techbowl.nv", 0x0000, 0x0080, CRC(5bebc2b7) SHA1(e189e891e1753059fbaad4ce82ddf191d5e8176a) )
ROM_END
ROM_START( micrombc ) // set to 1p
@@ -3857,7 +3857,7 @@ ROM_START( micrombc ) // set to 1p
ROM_LOAD16_WORD_SWAP( "ic36", 0x1200000, 0x0200000, CRC(8d89877e) SHA1(7d76d48d64d7ac5411d714a4bb83f37e3e5b8df6) ) // OK
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "micrombc.nv", 0x0000, 0x0080, CRC(6e89815f) SHA1(4478f614fb61859f4ee7bf55462f737387887e6f) )
+ ROM_LOAD( "micrombc.nv", 0x0000, 0x0080, CRC(6e89815f) SHA1(4478f614fb61859f4ee7bf55462f737387887e6f) )
ROM_END
ROM_START( pclub2 ) // set to 1p / runs with the USA bios
@@ -3873,7 +3873,7 @@ ROM_START( pclub2 ) // set to 1p / runs with the USA bios
ROM_LOAD16_WORD_SWAP( "ic30", 0x0a00000, 0x0200000, CRC(8d89877e) SHA1(7d76d48d64d7ac5411d714a4bb83f37e3e5b8df6) ) // OK
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "pclub2.nv", 0x0000, 0x0080, CRC(00d0f04e) SHA1(8b5a3e1c52e34443f83fd4a8948a00cacb5071d0) )
+ ROM_LOAD( "pclub2.nv", 0x0000, 0x0080, CRC(00d0f04e) SHA1(8b5a3e1c52e34443f83fd4a8948a00cacb5071d0) )
ROM_END
ROM_START( pclub2v3 ) // set to 1p / runs with the USA bios
@@ -3889,7 +3889,7 @@ ROM_START( pclub2v3 ) // set to 1p / runs with the USA bios
ROM_LOAD16_WORD_SWAP( "ic30", 0x0a00000, 0x0200000, CRC(8d89877e) SHA1(7d76d48d64d7ac5411d714a4bb83f37e3e5b8df6) ) // OK (rom is blank?!)
ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player
- ROM_LOAD( "pclub2v3.nv", 0x0000, 0x0080, CRC(a8a2d30c) SHA1(bdde3d62ff21190a23698058ff66e476a75a09aa) )
+ ROM_LOAD( "pclub2v3.nv", 0x0000, 0x0080, CRC(a8a2d30c) SHA1(bdde3d62ff21190a23698058ff66e476a75a09aa) )
ROM_END
/*
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 5985a103d6e..75296fedb94 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1171,7 +1171,7 @@ static INPUT_PORTS_START( samesame2 )
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) /* No cocktail */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
-
+
PORT_MODIFY("TJUMP") /* Territory Jumper Block */
/* settings listed in service mode, but not actually used
PORT_DIPNAME( 0x03, 0x00, "Territory" )
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 681d608cf8f..48f70e271cd 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -256,7 +256,7 @@ ROM_START( fiveside )
ROM_LOAD("479_a07.bin", 0x080000, 0x80000, CRC(75835df8) SHA1(105b95c16f2ce6902c2e4c9c2fd9f2f7a848c546))
ROM_REGION16_BE( 0x80, "eeprom", 0 )
- ROM_LOAD( "fiveside.nv", 0x0000, 0x0080, CRC(aad11072) SHA1(8f777ee47801faa7ce8420c3052034720225aae7) )
+ ROM_LOAD( "fiveside.nv", 0x0000, 0x0080, CRC(aad11072) SHA1(8f777ee47801faa7ce8420c3052034720225aae7) )
ROM_END
GAME(1995, fiveside, 0, ultrsprt, ultrsprt, 0, ROT90, "Konami", "Five a Side Soccer (ver UAA)", GAME_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index d6bccf0362f..f5d8807f345 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -31,11 +31,11 @@
It ends up trashing the registers containing the return value for a function
000018D6: MASK L51, L45, $1e00000
- 000018DC: CMPI L51, $c00000
- 000018E2: BE $18e6
- 000018E4: RET PC, L0
- 0003FA66: RET PC, L1 <-- no valid return value
- 00000000: CHK PC, PC causes jump to 0
+ 000018DC: CMPI L51, $c00000
+ 000018E2: BE $18e6
+ 000018E4: RET PC, L0
+ 0003FA66: RET PC, L1 <-- no valid return value
+ 00000000: CHK PC, PC causes jump to 0
It executes this code several times earlier before the crash, so I don't know
if it's some kind of nested call problem, or simply beacuse it's using a
@@ -315,16 +315,16 @@ static ADDRESS_MAP_START( mrkicker_io, ADDRESS_SPACE_IO, 32 )
AM_RANGE(0x4040, 0x4043) AM_WRITE(finalgdr_prot_w)
AM_RANGE(0x6400, 0x6403) AM_READ(finalgdr_prot_r)
AM_RANGE(0x7000, 0x7007) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x0000ff00)
-// AM_RANGE(0x7400, 0x7403) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x0000ff00)
+// AM_RANGE(0x7400, 0x7403) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x0000ff00)
-// AM_RANGE(0xxxxx, 0xxxxx) AM_WRITE(finalgdr_backupram_bank_w)
-// AM_RANGE(0xxxxx, 0xxxxx) AM_READWRITE(finalgdr_backupram_r, finalgdr_backupram_w)
-// AM_RANGE(0xxxxx, 0xxxxx) AM_READ_PORT("P1_P2")
-// AM_RANGE(0xxxxx, 0xxxxx) AM_READ_PORT("SYSTEM")
-// AM_RANGE(0xxxxx, 0xxxxx) AM_READNOP //?
+// AM_RANGE(0xxxxx, 0xxxxx) AM_WRITE(finalgdr_backupram_bank_w)
+// AM_RANGE(0xxxxx, 0xxxxx) AM_READWRITE(finalgdr_backupram_r, finalgdr_backupram_w)
+// AM_RANGE(0xxxxx, 0xxxxx) AM_READ_PORT("P1_P2")
+// AM_RANGE(0xxxxx, 0xxxxx) AM_READ_PORT("SYSTEM")
+// AM_RANGE(0xxxxx, 0xxxxx) AM_READNOP //?
// AM_RANGE(0xxxxx, 0xxxxx) AM_WRITE(flipscreen32_w) //?
-// AM_RANGE(0xxxxx, 0xxxxx) AM_WRITE(finalgdr_prize_w)
-// AM_RANGE(0xxxxx, 0xxxxx) AM_DEVWRITE("oki", finalgdr_oki_bank_w)
+// AM_RANGE(0xxxxx, 0xxxxx) AM_WRITE(finalgdr_prize_w)
+// AM_RANGE(0xxxxx, 0xxxxx) AM_DEVWRITE("oki", finalgdr_oki_bank_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index a9ee16a595f..fa06a41e3ee 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -371,7 +371,7 @@ static TILE_GET_INFO( get_vmetal_texttilemap_tile_info )
tile = (data & 0xf) | (lookup & 0x7fff0);
color = ((lookup >> 20) & 0x1f) + 0xe0;
- if (data & 0x8000)
+ if (data & 0x8000)
tile = 0;
SET_TILE_INFO(1, tile, color, TILE_FLIPYX(0x0));
@@ -385,7 +385,7 @@ static TILE_GET_INFO( get_vmetal_mid1tilemap_tile_info )
get_vmetal_tlookup(machine, data, &tile, &color);
- if (data & 0x8000)
+ if (data & 0x8000)
tile = 0;
SET_TILE_INFO(0, tile, color, TILE_FLIPYX(0x0));
@@ -398,7 +398,7 @@ static TILE_GET_INFO( get_vmetal_mid2tilemap_tile_info )
get_vmetal_tlookup(machine, data, &tile, &color);
- if (data & 0x8000)
+ if (data & 0x8000)
tile = 0;
SET_TILE_INFO(0, tile, color, TILE_FLIPYX(0x0));
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index 6c76b52a5b3..6364d6eee2e 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -5,7 +5,7 @@ public:
static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, paradise_state(machine)); }
paradise_state(running_machine &machine) { }
-
+
/* memory pointers */
UINT8 * vram_0;
UINT8 * vram_1;
diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h
index 42f9097bb43..914b8eade44 100644
--- a/src/mame/includes/pbaction.h
+++ b/src/mame/includes/pbaction.h
@@ -18,7 +18,7 @@ public:
UINT8 * colorram2;
UINT8 * work_ram;
UINT8 * spriteram;
-// UINT8 * paletteram; // currently this uses generic palette handling
+// UINT8 * paletteram; // currently this uses generic palette handling
size_t spriteram_size;
/* video-related */
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 2e668ce3605..3e00e7036c1 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -2041,7 +2041,7 @@ DRIVER_INIT(calc3_scantables)
{
UINT8* tmpdstram = auto_alloc_array(machine, UINT8, 0x2000);
#if CALC3_VERBOSE_OUTPUT
- int length;
+ int length;
#endif
memset(tmpdstram, 0x00,0x2000);
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index e3c235103d5..0d0030b2cd2 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -155,7 +155,7 @@ INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8
if (code & 0x8000) /* Special: draw a tile of a single color (i.e. not from the gfx ROMs) */
{
*pix = (code & 0x0fff)+0x1000;
-
+
if ((*pix & 0xf) != 0xf)
return 1;
else
@@ -172,7 +172,7 @@ INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8
if (tile2 < gfx1->total_elements)
data = gfx_element_get_data(gfx1, tile2);
- else
+ else
{
*pix |= 0;
return 0;
@@ -186,9 +186,9 @@ INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8
case 0x2: *pix = data[(y * (big?16:8)) + ((big?15:7)-x)]; break;
case 0x3: *pix = data[(((big?15:7)-y) * (big?16:8)) + ((big?15:7)-x)]; break;
}
-
+
*pix |= ((((tile & 0x0f000000) >> 24) + 0x10)*0x100);
-
+
if ((*pix & 0xff) != 0xff)
return 1;
else
@@ -196,7 +196,7 @@ INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8
}
else
- {
+ {
const gfx_element *gfx1 = machine->gfx[big?2:0];
UINT32 tile2 = big ? ((tile & 0xfffff) + 4*(code & 0xf)) :
((tile & 0xfffff) + (code & 0xf));
@@ -205,7 +205,7 @@ INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8
if (tile2 < gfx1->total_elements)
data = gfx_element_get_data(gfx1, tile2);
- else
+ else
{
*pix |= 0;
return 0;
@@ -220,7 +220,7 @@ INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8
case 0x2: *pix = data[(y * (big?8:4)) + ((big?7:3)-(x>>1))]; break;
case 0x3: *pix = data[(((big?15:7)-y) * (big?8:4)) + ((big?7:3)-(x>>1))]; break;
}
-
+
if (!(flipxy&2))
{
if (x&1) *pix >>= 4;
@@ -233,7 +233,7 @@ INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8
}
*pix |= (((((tile & 0x0ff00000) >> 20)) + 0x100)*0x10);
-
+
if ((*pix & 0xf) != 0xf)
return 1;
else
@@ -599,7 +599,7 @@ static void draw_tilemap( running_machine *machine, bitmap_t *bitmap, const rect
int width = big ? 4096 : 2048;//pixdata->width;
int height = big ? 4096 : 2048;//pixdata->height;
-
+
int scrwidth = bitmap->width;
int scrheight = bitmap->height;
@@ -650,7 +650,7 @@ static void draw_tilemap( running_machine *machine, bitmap_t *bitmap, const rect
UINT16 tile = tilemapram[tileoffs];
UINT8 draw = get_tile_pix(machine, tile, big ? (srccol&0xf) : (srccol&0x7), big ? (srcline&0xf) : (srcline&0x7), big, &dat);
-
+
if (draw)
{
dst[x] = dat;
@@ -662,7 +662,7 @@ static void draw_tilemap( running_machine *machine, bitmap_t *bitmap, const rect
{
dst = BITMAP_ADDR16(bitmap, scrheight-y-1, 0);
priority_baseaddr = BITMAP_ADDR8(priority_bitmap, scrheight-y-1, 0);
-
+
for (x=0;x<scrwidth;x++)
{
int scrollx = (sx+x-wx)&(windowwidth-1);
@@ -672,10 +672,10 @@ static void draw_tilemap( running_machine *machine, bitmap_t *bitmap, const rect
UINT16 dat = 0;
- UINT16 tile = tilemapram[tileoffs];
+ UINT16 tile = tilemapram[tileoffs];
UINT8 draw = get_tile_pix(machine, tile, big ? (srccol&0xf) : (srccol&0x7), big ? (srcline&0xf) : (srcline&0x7), big, &dat);
-
- if (draw)
+
+ if (draw)
{
dst[scrwidth-x-1] = dat;
priority_baseaddr[scrwidth-x-1] = (priority_baseaddr[scrwidth-x-1] & (pcode >> 8)) | pcode;
@@ -708,10 +708,10 @@ static void draw_layers( running_machine *machine, bitmap_t *bitmap, const recta
if (layer==0) tilemapram = state->vram_0;
else if (layer==1) tilemapram = state->vram_1;
else if (layer==2) tilemapram = state->vram_2;
-
+
draw_tilemap(machine, bitmap, cliprect, 0, 1 << (3 - pri), sx, sy, wx, wy, 0, tilemapram, layer);
-
- if (state->support_16x16)
+
+ if (state->support_16x16)
draw_tilemap(machine, bitmap, cliprect, 0, 1 << (3 - pri), sx, sy, wx, wy, 1, tilemapram, layer);
}
}
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index 48cf2eb5c9f..b025a730c58 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -3766,10 +3766,10 @@ static RDP_COMMAND( rdp_load_block )
switch (ti_size) // slindwords Neededby Vigilante 8
{
- case PIXEL_SIZE_4BIT: ti_width2 >>= 1; slindwords >>= 3; width >>= 1; break;
- case PIXEL_SIZE_8BIT: slindwords >>= 2; break;
+ case PIXEL_SIZE_4BIT: ti_width2 >>= 1; slindwords >>= 3; width >>= 1; break;
+ case PIXEL_SIZE_8BIT: slindwords >>= 2; break;
case PIXEL_SIZE_16BIT: ti_width2 <<= 1; slindwords >>= 1; width <<= 1; break;
- case PIXEL_SIZE_32BIT: ti_width2 <<= 2; width <<= 2; break;
+ case PIXEL_SIZE_32BIT: ti_width2 <<= 2; width <<= 2; break;
}
if ((tb + (width >> 2)) > 0x400)
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index fd84b1ee47d..3d1d9a490d8 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -45,7 +45,7 @@ WRITE8_HANDLER( paradise_palette_w )
paradise_state *state = (paradise_state *)space->machine->driver_data;
state->paletteram[offset] = data;
offset %= 0x800;
- palette_set_color_rgb(space->machine, offset, state->paletteram[offset + 0x800 * 0], state->paletteram[offset + 0x800 * 1],
+ palette_set_color_rgb(space->machine, offset, state->paletteram[offset + 0x800 * 0], state->paletteram[offset + 0x800 * 1],
state->paletteram[offset + 0x800 * 2]);
}
@@ -254,7 +254,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z))
return 0;
if (state->priority & 1)
- if (layers_ctrl & 16)
+ if (layers_ctrl & 16)
draw_sprites(screen->machine, bitmap, cliprect);
if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->tilemap_0, 0, 0);
@@ -266,15 +266,15 @@ if (input_code_pressed(screen->machine, KEYCODE_Z))
if (!(state->priority & 1))
if (layers_ctrl & 16)
draw_sprites(screen->machine, bitmap, cliprect);
- if (layers_ctrl & 8)
+ if (layers_ctrl & 8)
tilemap_draw(bitmap,cliprect, state->tilemap_2, 0, 0);
}
else
{
- if (layers_ctrl & 8)
+ if (layers_ctrl & 8)
tilemap_draw(bitmap, cliprect, state->tilemap_2, 0, 0);
if (!(state->priority & 1))
- if (layers_ctrl & 16)
+ if (layers_ctrl & 16)
draw_sprites(screen->machine, bitmap, cliprect);
}
return 0;
diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c
index 64b4cb59c18..c79f4d87517 100644
--- a/src/mame/video/pbaction.c
+++ b/src/mame/video/pbaction.c
@@ -41,7 +41,7 @@ WRITE8_HANDLER( pbaction_scroll_w )
{
pbaction_state *state = (pbaction_state *)space->machine->driver_data;
state->scroll = data - 3;
- if (flip_screen_get(space->machine))
+ if (flip_screen_get(space->machine))
state->scroll = -state->scroll;
tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll);
@@ -95,7 +95,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect
int sx, sy, flipx, flipy;
/* if next sprite is double size, skip this one */
- if (offs > 0 && spriteram[offs - 4] & 0x80)
+ if (offs > 0 && spriteram[offs - 4] & 0x80)
continue;
sx = spriteram[offs + 3];
diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c
index df218561132..8212e1f1a19 100644
--- a/src/mame/video/snes.c
+++ b/src/mame/video/snes.c
@@ -799,7 +799,7 @@ INLINE void snes_update_line( UINT16 curline, UINT8 layer, UINT8 priority_b, UIN
#ifdef SNES_LAYER_DEBUG
/* if we want to draw only one of the priorities of this layer */
- if (((debug_options.select_pri[layer] & 0x01) && (priority == priority_a)) ||
+ if (((debug_options.select_pri[layer] & 0x01) && (priority == priority_a)) ||
((debug_options.select_pri[layer] & 0x02) && (priority == priority_b)))
{
if (!hires && tile_size)
@@ -999,7 +999,7 @@ static void snes_update_line_mode7( UINT16 curline, UINT8 layer, UINT8 priority_
#ifdef SNES_LAYER_DEBUG
/* if we want to draw only one of the priorities of this layer */
- if (((debug_options.select_pri[layer] & 0x01) && (priority == priority_a)) ||
+ if (((debug_options.select_pri[layer] & 0x01) && (priority == priority_a)) ||
((debug_options.select_pri[layer] & 0x02) && (priority == priority_b)))
continue;
#endif /* SNES_LAYER_DEBUG */
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index 23a85444df6..39c3753ce0c 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -483,7 +483,7 @@ WRITE16_HANDLER( toaplan1_bcu_flipscreen_w )
if (bcu_flipscreen)
{
const rectangle *visarea = video_screen_get_visible_area(space->machine->primary_screen);
-
+
scrollx_offs1 = 0x151 - 6;
scrollx_offs2 = 0x151 - 4;
scrollx_offs3 = 0x151 - 2;
diff --git a/src/version.c b/src/version.c
index 5483d46e45f..de8219d1cd7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.137 ("__DATE__")";
+const char build_version[] = "0.137u1 ("__DATE__")";