summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-06-18 05:57:56 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-06-18 05:57:56 +0000
commit5129896754308b3e9c91aa57b2e2faafc785a650 (patch)
tree5591f985cca25274d6d93ce0d676a77eb5425f53
parent578dffa5d821215ee8ecd261afc03a9c5a8bd575 (diff)
Cleanups and version bump.mame0132u1
-rw-r--r--src/emu/machine/8237dma.c20
-rw-r--r--src/emu/sound/sp0256.h14
-rw-r--r--src/mame/drivers/gstriker.c4
-rw-r--r--src/mame/drivers/kaneko16.c86
-rw-r--r--src/mame/drivers/liberate.c10
-rw-r--r--src/mame/drivers/magicard.c6
-rw-r--r--src/mame/drivers/naomi.c14
-rw-r--r--src/mame/drivers/progolf.c38
-rw-r--r--src/mame/drivers/rohga.c4
-rw-r--r--src/mame/drivers/segas32.c38
-rw-r--r--src/mame/drivers/starwars.c2
-rw-r--r--src/mame/drivers/system16.c14
-rw-r--r--src/mame/drivers/thunderx.c4
-rw-r--r--src/mame/drivers/triforce.c2
-rw-r--r--src/mame/drivers/twinkle.c28
-rw-r--r--src/mame/machine/kaneko16.c64
-rw-r--r--src/mame/mamedriv.c1
-rw-r--r--src/mame/video/liberate.c14
-rw-r--r--src/mame/video/segaic16.c40
-rw-r--r--src/mame/video/system16.c46
-rw-r--r--src/version.c2
21 files changed, 225 insertions, 226 deletions
diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c
index 3d4f7ed2816..fb93ca98f88 100644
--- a/src/emu/machine/8237dma.c
+++ b/src/emu/machine/8237dma.c
@@ -27,7 +27,7 @@
typedef enum {
DMA8237_SI, /* Idle state */
DMA8237_S0, /* HRQ has been triggered, waiting to receive HLDA */
-// DMA8237_SW, /* Wait state */
+// DMA8237_SW, /* Wait state */
/* Normal transfer states */
DMA8237_S1, /* Output A8-A15; only used when A8-A15 really needs to be output */
@@ -37,13 +37,13 @@ typedef enum {
/* Memory to memory transfer states */
DMA8237_S11, /* Output A8-A15 */
-// DMA8237_S12, /* Output A0-A7 */
-// DMA8237_S13, /* Initiate read */
-// DMA8237_S14, /* Perform read/write */
-// DMA8237_S21, /* Output A8-A15 */
-// DMA8237_S22, /* Output A0-A7 */
-// DMA8237_S23, /* Initiate read */
-// DMA8237_S24, /* Perform read/write */
+// DMA8237_S12, /* Output A0-A7 */
+// DMA8237_S13, /* Initiate read */
+// DMA8237_S14, /* Perform read/write */
+// DMA8237_S21, /* Output A8-A15 */
+// DMA8237_S22, /* Output A0-A7 */
+// DMA8237_S23, /* Initiate read */
+// DMA8237_S24, /* Perform read/write */
} dma8237_state;
@@ -229,7 +229,7 @@ static TIMER_CALLBACK( dma8237_timerproc )
/* Check if a new DMA request has been received. */
{
/* Bit 6 of the command register determines whether the DREQ signals are active
- high or active low. */
+ high or active low. */
UINT16 pending_request = ( ( dma8237->command & 0x40 ) ? ~dma8237->drq : dma8237->drq ) & ~dma8237->mask;
if ( pending_request & 0x0f )
@@ -263,7 +263,7 @@ static TIMER_CALLBACK( dma8237_timerproc )
case DMA8237_S0:
/* S0 is the first of the DMA service. We have requested a hold but are waiting
- for confirmation. */
+ for confirmation. */
if ( dma8237->hlda )
{
if ( dma8237->command & 0x01 )
diff --git a/src/emu/sound/sp0256.h b/src/emu/sound/sp0256.h
index 0563c3c7a95..a157fa81c89 100644
--- a/src/emu/sound/sp0256.h
+++ b/src/emu/sound/sp0256.h
@@ -7,20 +7,20 @@
**********************************************************************
_____ _____
- Vss 1 |* \_/ | 28 OSC 2
+ Vss 1 |* \_/ | 28 OSC 2
_RESET 2 | | 27 OSC 1
ROM DISABLE 3 | | 26 ROM CLOCK
C1 4 | | 25 _SBY RESET
C2 5 | | 24 DIGITAL OUT
- C3 6 | | 23 Vdi
- Vdd 7 | SP0256 | 22 TEST
+ C3 6 | | 23 Vdi
+ Vdd 7 | SP0256 | 22 TEST
SBY 8 | | 21 SER IN
_LRQ 9 | | 20 _ALD
- A8 10 | | 19 SE
- A7 11 | | 18 A1
+ A8 10 | | 19 SE
+ A7 11 | | 18 A1
SER OUT 12 | | 17 A2
- A6 13 | | 16 A3
- A5 14 |_____________| 15 A4
+ A6 13 | | 16 A3
+ A5 14 |_____________| 15 A4
**********************************************************************/
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index be8ea93a82c..ba400b1d69b 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -689,8 +689,8 @@ ROM_START( gstrikea )
ROM_REGION( 0x40000, "ym.deltat", 0 )
ROM_LOAD( "human_scr-gs-106_m532001b-16_3402370.u93", 0x00000, 0x040000, CRC(93c9868c) SHA1(dcecb34e46405155e35aaf134b8547430d23f5a7) )
- ROM_REGION( 0x100000, "ym", 0 )
- ROM_LOAD( "scrgs107.u99", 0x00000, 0x100000, CRC(ecc0a01b) SHA1(239e832b7d22925460a8f44eb82e782cd13aba49) )
+ ROM_REGION( 0x100000, "ym", 0 )
+ ROM_LOAD( "scrgs107.u99", 0x00000, 0x100000, CRC(ecc0a01b) SHA1(239e832b7d22925460a8f44eb82e782cd13aba49) )
/* PALs were protected on this version, used the ones from the "gstriker" set */
ROM_REGION( 0x1000, "plds", 0 )
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 26494164b94..07d05bab7b3 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -3615,8 +3615,8 @@ followed by several tables in the following format
OFFSET 0 - the location of a word which specifies the size of the block
- this is usually '3', but if it's larger than 3 it enables an 'inline encryption' mode, whereby the decryption table is stored in the
- - right before the length register
-
+ - right before the length register
+
OFFSET 1 - a 'mode' register of some sort, usually 0,1,2 or 3 for used data, shogun also called a 'blank' command (length 0) with mode 8
OFFSET 2 - unknown, might be some kind of 'step' register
@@ -3629,7 +3629,7 @@ OFFSET 4-5 (or after the inline decryption table) - the length of the current bl
OFFSET 6-size - data for thie block
-this continues for the number of blocks specified
+this continues for the number of blocks specified
after all the blocks there is a 0x1000 block of data which is the same between games
where games specify the same decryption key the table used is the same, I don't know where these tables come from.
@@ -3644,7 +3644,7 @@ DRIVER_INIT( calc3 )
int x;
int offset = 0;
- UINT8 numregions;
+ UINT8 numregions;
calc3_mcu_crc = 0;
for (x=0;x<0x20000;x++)
@@ -3657,9 +3657,9 @@ DRIVER_INIT( calc3 )
rom++;
-
-
-
+
+
+
for (x=0;x<numregions;x++)
{
int length;
@@ -3671,13 +3671,13 @@ DRIVER_INIT( calc3 )
int inline_table_size = 0;
UINT8 mode = rom[offset+1];
UINT8 unknown = rom[offset+2];
-
-
+
+
printf("%04x keydat %02x - bsofs:%02x m:%02x u:%02x k:%02x | ", startoffset, x, blocksize_offset,mode,unknown,decryption_key_byte);
-
+
// if blocksize_offset > 3, it seems to specify the decryption table (or _a_ decryption table) inline of specified length, which loops over the data
if (blocksize_offset>3)
- {
+ {
inline_table_base = offset+4;
inline_table_size = blocksize_offset-3;
for (xx=0;xx<blocksize_offset-3;xx++)
@@ -3685,17 +3685,17 @@ DRIVER_INIT( calc3 )
printf("%02x ", rom[inline_table_base+xx]);
}
}
-
-
+
+
offset+= blocksize_offset+1;
length = rom[offset+0] | (rom[offset+1]<<8);
-
+
printf("(length %04x)", length);
-
+
printf("\n");
offset+=2;
-
+
//if (x==0x2d)
{
if (length != 0)
@@ -3703,7 +3703,7 @@ DRIVER_INIT( calc3 )
if (blocksize_offset==3)
{
-
+
// these tables are guessed, where do they come from? internal mcu rom? 0x1000 block at the end? are they related?
UINT8* table = 0;
@@ -3714,9 +3714,9 @@ DRIVER_INIT( calc3 )
0x20,0x1c,0x1f,0xc1,0x25,0x2e,0x49,0xe7,0x90,0x1b,0xb4,0xcf,0x1e,0x61,0xd7,0x46,
0xda,0x89,0x08,0x77,0xb1,0x81,0x6b,0x2d,0xb6,0xbc,0x99,0xc9,0x35,0x0a,0x0f,0x01
};
-
-
-
+
+
+
/* ok */
UINT8 table15[64] = {
0x0C,0xEB,0x30,0x25,0xA8,0xED,0xE3,0x23,0xAC,0x2B,0x8D,0x34,0x88,0x9F,0x55,0xB5,
@@ -3724,17 +3724,17 @@ DRIVER_INIT( calc3 )
0x84,0x1B,0xD1,0xB2,0xB5,0xA7,0x0C,0xA0,0x51,0xE6,0x5E,0xC0,0xEB,0x68,0x22,0xD6,
0xC8,0xB6,0xCF,0x46,0x4B,0xF0,0x15,0xD7,0xB0,0xB5,0x29,0xB8,0xFD,0x43,0x5C,0xC0
};
-
+
/* used by shogun & brapboys */
- unsigned char table31[64] = {
+ unsigned char table31[64] = {
// x x x ok x x x ok x x x ok x x x ok
0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xaf, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x3b,
0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xb1, 0x00, 0x00, 0x00, 0xdc,
0x00, 0x00, 0x00, 0xb5, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0xde,
0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0xb1
};
-
+
/* not ok */
unsigned char table3f[64] = {
0x29,0x34,0xD9,0x20,0x61,0x54,0x5F,0x6C,0x21,0x7E,0x5A,0x0F,0xD0,0x35,0x3B,0x2E,
@@ -3743,9 +3743,9 @@ DRIVER_INIT( calc3 )
0x43,0x02,0xC3,0xF5,0x7E,0x18,0xF1,0x82,0xE7,0xE7,0xDC,0x01,0x4F,0x36,0xCA,0x13
};
-
-
- unsigned char tableb0[64] = {
+
+
+ unsigned char tableb0[64] = {
// x x x ok x x x ok x x x ok x x x ok
0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x81,
0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x32,
@@ -3753,15 +3753,15 @@ DRIVER_INIT( calc3 )
0x00, 0x00, 0x00, 0xb2, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x5b
};
- unsigned char tableb7[64] = {
+ unsigned char tableb7[64] = {
// x x x ok x x x ok x x x ok x x x ok
0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0xd7,
0x00, 0x00, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x82,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x26,
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x9d, 0x00, 0x00, 0x00, 0x33
};
-
- unsigned char tablebb[64] = {
+
+ unsigned char tablebb[64] = {
// x x x ok x x x ok x x x ok x x x ok
0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x3d,
0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x69,
@@ -3775,7 +3775,7 @@ DRIVER_INIT( calc3 )
0x29, 0xD3, 0x78, 0x21, 0xF7, 0xFC, 0xF1, 0xCD, 0x69, 0x04, 0xDD, 0x4D, 0xC4, 0x08, 0x7C, 0x2F,
0x1D, 0x95, 0x6C, 0x1C, 0xE7, 0x55, 0x98, 0xA6, 0x3D, 0xEE, 0xE1, 0x40, 0xF4, 0x27, 0x8E, 0x8E
};
-
+
if (decryption_key_byte == 0x01) table = table01;
if (decryption_key_byte == 0x15) table = table15;
if (decryption_key_byte == 0x31) table = table31;
@@ -3784,7 +3784,7 @@ DRIVER_INIT( calc3 )
if (decryption_key_byte == 0xb7) table = tableb7;
if (decryption_key_byte == 0xbb) table = tablebb;
if (decryption_key_byte == 0xbf) table = tablebf;
-
+
if (table)
{
int l;
@@ -3800,27 +3800,27 @@ DRIVER_INIT( calc3 )
for (l=0;l<length;l++)
{
rom[offset+l] -= rom[inline_table_base + (l%inline_table_size)];
- }
+ }
}
else
{
printf("blocksize offset < 3??\n");
-
- }
-
+
+ }
+
// dump out file
{
FILE *fp;
char filename[256];
-
+
sprintf(filename,"data_%s_tableno%02x_key%02x_inlineoffset%02x_length%04x",
machine->gamedrv->name,
x,
decryption_key_byte,
blocksize_offset,
length);
-
-
+
+
fp=fopen(filename, "w+b");
if (fp)
{
@@ -3828,13 +3828,13 @@ DRIVER_INIT( calc3 )
fclose(fp);
}
}
-
+
}
}
-
- offset+=length;
+
+ offset+=length;
}
-
+
// dump out the 0x1000 sized block at the end
{
FILE *fp;
@@ -3850,7 +3850,7 @@ DRIVER_INIT( calc3 )
fclose(fp);
}
}
-
+
DRIVER_INIT_CALL(kaneko16);
// MCU is a 78K series III type CPU
}
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 650418eb1be..9e927f8420a 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -243,14 +243,14 @@ static ADDRESS_MAP_START( prosport_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0200, 0x021f) AM_RAM_WRITE(prosport_paletteram_w) AM_BASE(&paletteram)
AM_RANGE(0x0400, 0x07ff) AM_RAM AM_BASE(&prosport_bg_vram)
AM_RANGE(0x0000, 0x03ff) AM_SHARE(2) AM_RAM
-// AM_RANGE(0x0e00, 0x0fff) AM_RAM
-// AM_RANGE(0x1600, 0x17ff) AM_RAM
-// AM_RANGE(0x1e00, 0x1fff) AM_RAM
+// AM_RANGE(0x0e00, 0x0fff) AM_RAM
+// AM_RANGE(0x1600, 0x17ff) AM_RAM
+// AM_RANGE(0x1e00, 0x1fff) AM_RAM
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(prosport_charram_r,prosport_charram_w) //0x1e00-0x1ff isn't charram!
-// AM_RANGE(0x2000, 0x2fff) AM_RAM //likely i/o
+// AM_RANGE(0x2000, 0x2fff) AM_RAM //likely i/o
AM_RANGE(0x2000, 0x23ff) AM_SHARE(2) AM_RAM
AM_RANGE(0x2800, 0x2bff) AM_RAM
-// AM_RANGE(0x2800, 0x2fff) AM_SHARE(2) AM_RAM
+// AM_RANGE(0x2800, 0x2fff) AM_SHARE(2) AM_RAM
AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE(liberate_colorram_w) AM_BASE(&colorram)
AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE(liberate_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x3800, 0x3fff) AM_RAM AM_BASE(&spriteram)
diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c
index ca2889afe88..34762c8e61f 100644
--- a/src/mame/drivers/magicard.c
+++ b/src/mame/drivers/magicard.c
@@ -503,7 +503,7 @@ ROM_START( pcdi910m )
ROM_LOAD16_WORD( "cdi910.rom", 0x000000, 0x80000, CRC(8ee44ed6) SHA1(3fcdfa96f862b0cb7603fb6c2af84cac59527b05) )
ROM_END
-GAME( 199?, mcdi200, 0, magicard, 0, magicard, ROT0, "Philips", "Magnavox CD-I 200 BIOS", GAME_NO_SOUND | GAME_NOT_WORKING )
-GAME( 199?, pcdi490, 0, magicard, 0, magicard, ROT0, "Philips", "Philips CD-I 490 BIOS", GAME_NO_SOUND | GAME_NOT_WORKING )
-GAME( 199?, pcdi910m,0, magicard, 0, magicard, ROT0, "Philips", "Philips CD-I 910 (Memorex-Tandy) BIOS", GAME_NO_SOUND | GAME_NOT_WORKING )
+//GAME( 199?, mcdi200, 0, magicard, 0, magicard, ROT0, "Philips", "Magnavox CD-I 200 BIOS", GAME_NO_SOUND | GAME_NOT_WORKING )
+//GAME( 199?, pcdi490, 0, magicard, 0, magicard, ROT0, "Philips", "Philips CD-I 490 BIOS", GAME_NO_SOUND | GAME_NOT_WORKING )
+//GAME( 199?, pcdi910m,0, magicard, 0, magicard, ROT0, "Philips", "Philips CD-I 910 (Memorex-Tandy) BIOS", GAME_NO_SOUND | GAME_NOT_WORKING )
*/
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 33db5becdb1..4aa9bf72da4 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -4055,7 +4055,7 @@ ROM_START( trgheart )
DISK_REGION( "gdrom" )
DISK_IMAGE_READONLY( "gdl-0036a", 0, SHA1(91f1e19136997cb1e2edfb1ad342b9427d1d3bfb) )
-\
+
ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE)
//PIC16C622A (317-5121-JPN)
//(sticker 253-5509-5121J)
@@ -4519,14 +4519,14 @@ GAME( 2005, ggxxsla, naomigd, naomigd, naomi, ggxxsla, ROT0, "Arc Syste
GAME( 2006, kurucham, naomigd, naomigd, naomi, naomi, ROT0, "Able", "Kurukuru Chameleon (GDL-0034)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
GAME( 2005, undefeat, naomigd, naomigd, naomi, naomi, ROT270, "G-Rev", "Under Defeat (GDL-0035)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
//GDL-0036 Trigger Heart Exelica
-GAME( 2005, trgheart, naomigd, naomigd, naomi, naomi, ROT270, "Warashi", "Trigger Heart Exelica (Rev A) (GDL-0036A)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-GAME( 2005, jingystm, naomigd, naomigd, naomi, naomi, ROT0, "Atrativa Japan", "Jingi Storm - The Arcade (GDL-0037)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+//GAME( 2005, trgheart, naomigd, naomigd, naomi, naomi, ROT270, "Warashi", "Trigger Heart Exelica (Rev A) (GDL-0036A)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+//GAME( 2005, jingystm, naomigd, naomigd, naomi, naomi, ROT0, "Atrativa Japan", "Jingi Storm - The Arcade (GDL-0037)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
//GDL-0038 Senko No Ronde Special
-GAME( 2006, meltyb, naomigd, naomigd, naomi, naomi, ROT0, "Ecole Software", "Melty Blood Act Cadenza Ver B (GDL-0039)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-GAME( 2006, meltyba, meltyb, naomigd, naomi, naomi, ROT0, "Ecole Software", "Melty Blood Act Cadenza Ver B (Rev A) (GDL-0039A)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-GAME( 2006, karous, naomigd, naomigd, naomi, naomi, ROT270, "Milestone", "Karous (GDL-0040)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+//GAME( 2006, meltyb, naomigd, naomigd, naomi, naomi, ROT0, "Ecole Software", "Melty Blood Act Cadenza Ver B (GDL-0039)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+//GAME( 2006, meltyba, meltyb, naomigd, naomi, naomi, ROT0, "Ecole Software", "Melty Blood Act Cadenza Ver B (Rev A) (GDL-0039A)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+//GAME( 2006, karous, naomigd, naomigd, naomi, naomi, ROT270, "Milestone", "Karous (GDL-0040)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
//GDL-0041 Guilty Gear XX Accent Core
-GAME( 2006, takoron, naomigd, naomigd, naomi, naomi, ROT0, "Compile", "Noukone Puzzle Takoron (GDL-0042)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+//GAME( 2006, takoron, naomigd, naomigd, naomi, naomi, ROT0, "Compile", "Noukone Puzzle Takoron (GDL-0042)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* GDS-xxxx (Sega first party games) */
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 0a41a9361ec..4e0b2fd60ea 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -198,7 +198,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x9801, 0x9801) AM_DEVWRITE("crtc", mc6845_register_w)
AM_RANGE(0x9a00, 0x9a00) AM_READ_PORT("DSW2") AM_WRITE(audio_command_w)
-// AM_RANGE(0x9e00, 0x9e00) AM_WRITENOP
+// AM_RANGE(0x9e00, 0x9e00) AM_WRITENOP
AM_RANGE(0xb000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -493,24 +493,24 @@ static DRIVER_INIT( progolf )
decrypted[A] = BITSWAP8(rom[A],7,5,6,4,3,2,1,0);
/*
- CE12: B1 66 lda ($66),y
- CE14: 20 39 A7 jsr $C759
- C759: E6 66 inc $66
- C75B: D0 02 bne $C75F
- C75D: E6 67 inc $67
- C75F: 60 rts
- CE17: C9 FD cmp #$FD
- CE19: F0 44 beq $CE3F
- CE1B: C9 FE cmp #$FE
- CE1D: F0 13 beq $CE32
- CE1F: C9 FF cmp #$FF
- CE21: F0 4C beq $CE4F <- might go out there, this is the only branch in the entire rom that points to the rts
- ...
- CE48: 90 A3 bcc $CE0D
- CE4A: E6 69 inc $69
- CE4C: 4C 0D AE jmp $CE0D
- CE4F: 60 rts
- */
+ CE12: B1 66 lda ($66),y
+ CE14: 20 39 A7 jsr $C759
+ C759: E6 66 inc $66
+ C75B: D0 02 bne $C75F
+ C75D: E6 67 inc $67
+ C75F: 60 rts
+ CE17: C9 FD cmp #$FD
+ CE19: F0 44 beq $CE3F
+ CE1B: C9 FE cmp #$FE
+ CE1D: F0 13 beq $CE32
+ CE1F: C9 FF cmp #$FF
+ CE21: F0 4C beq $CE4F <- might go out there, this is the only branch in the entire rom that points to the rts
+ ...
+ CE48: 90 A3 bcc $CE0D
+ CE4A: E6 69 inc $69
+ CE4C: 4C 0D AE jmp $CE0D
+ CE4F: 60 rts
+ */
decrypted[0xce21] = 0xd0;
}
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 0be54629317..44ceccb8041 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -131,8 +131,8 @@ static READ16_HANDLER( rohga_irq_ack_r )
static WRITE16_HANDLER( wizdfire_irq_ack_w )
{
/* This might actually do more, nitrobal for example sets 0xca->0xffff->0x80 at startup then writes 7 all the time
- except when a credit is inserted (writes 6 twice).
- Wizard Fire / Dark Seal 2 just writes 1 all the time, so I just don't trust it much for now... -AS */
+ except when a credit is inserted (writes 6 twice).
+ Wizard Fire / Dark Seal 2 just writes 1 all the time, so I just don't trust it much for now... -AS */
cputag_set_input_line(space->machine, "maincpu", 6, CLEAR_LINE);
}
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 328782b4a84..91029bde69e 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -292,25 +292,25 @@ Stadium Cross EPR15093 EPR15094 EPR15018 EPR15019 EPR15192 EPR15020 EPR150
*********************************************************************************************
-On "Super Visual Football: European Sega Cup" and "JLEAGUE" :
-
-JLEAGUE was the original code developed and released in early
-1994 in Japan which than got translated and updated to be
-released as the European Sega Cup.
-
-So, JLEAGUE is the Original.
-and
-"Super Visual Football: European Sega Cup" is the clone.
-
-My source of information?
-I wrote the simulation ( in assembly ) while working in the SEGA
-Haneda ( Tokyo ) office in 1993. We even filed a patent on the
-team/individual player task synchronization. After I finished JLEAGE,
-we handed it off to the satellite groups for localization.
-
-Cheers,
-
-MIB.42
+On "Super Visual Football: European Sega Cup" and "JLEAGUE" :
+
+JLEAGUE was the original code developed and released in early
+1994 in Japan which than got translated and updated to be
+released as the European Sega Cup.
+
+So, JLEAGUE is the Original.
+and
+"Super Visual Football: European Sega Cup" is the clone.
+
+My source of information?
+I wrote the simulation ( in assembly ) while working in the SEGA
+Haneda ( Tokyo ) office in 1993. We even filed a patent on the
+team/individual player task synchronization. After I finished JLEAGE,
+we handed it off to the satellite groups for localization.
+
+Cheers,
+
+MIB.42
***************************************************************************/
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 6e246de3dbc..d07307ee7ce 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -272,7 +272,7 @@ static INPUT_PORTS_START( starwars )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
/* Manual shows Coin_B (Right) as Bit 4,5 - actually Bit 3,4 */
- PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("10EF:3,4")
+ PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("10EF:3,4")
PORT_DIPSETTING( 0x00, "*1" )
PORT_DIPSETTING( 0x04, "*4" )
PORT_DIPSETTING( 0x08, "*5" )
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index cd4f9c018cf..3657c84565c 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -1940,7 +1940,7 @@ ROM_START( bayrouteb2 )
ROM_LOAD16_BYTE( "br_14", 0x60001, 0x10000, CRC(4c4a177b) SHA1(a9dfd7e56b0a21a0f7750d8ec4631901ad182609) )
ROM_LOAD16_BYTE( "bs7.bin", 0x60000, 0x10000, CRC(0c91abcc) SHA1(d25608f3cbacd1bd169f1a2247f007ac8bc8dda0) )
#endif
-
+
// use the roms from the first bootleg set
ROM_REGION16_BE( 0x080000, "gfx2", ROMREGION_ERASEFF ) /* sprites */
ROM_LOAD16_BYTE( "br_obj0o.1b", 0x00001, 0x10000, CRC(098a5e82) SHA1(c5922f418773bc3629071e584457839d67a370e9) )
@@ -2012,8 +2012,8 @@ ROM_START( eswatbl )
ROM_LOAD16_BYTE( "ic11", 0x080001, 0x20000, CRC(f6b096e0) SHA1(695ad1adbdc29f4d614645867e16de038cf92709) )
ROM_CONTINUE( 0x180001, 0x20000 )
ROM_LOAD16_BYTE( "ic14", 0x080000, 0x20000, CRC(6773fef6) SHA1(91e646ea447be02254d060daf255d26afe0cc79e) )
- ROM_CONTINUE( 0x180000, 0x20000 )
-
+ ROM_CONTINUE( 0x180000, 0x20000 )
+
ROM_REGION( 0x50000, "soundcpu", 0 ) /* sound CPU */
ROM_LOAD( "epr12617.a13", 0x00000, 0x08000, CRC(7efecf23) SHA1(2b87af7cfaab5942a3f7b38c987fcba01d3475ab) ) // ic8
ROM_LOAD( "mpr12616.a11", 0x10000, 0x40000, CRC(254347c2) SHA1(bf2d83a69a5be375c7e42e9f7d6e65c1095a354c) ) // ic6
@@ -2208,7 +2208,7 @@ ROM_START( goldnaxeb1 )
ROM_LOAD( "29.13", 0x30000, 0x10000, CRC(e29baf4f) SHA1(3761cb2217599fe3f2f860f9395930b96ec52f47) )
ROM_LOAD( "28.12", 0x40000, 0x10000, CRC(22f0667e) SHA1(2d11b2ce105a3db9c914942cace85aff17deded9) )
ROM_LOAD( "27.11", 0x50000, 0x10000, CRC(afb1a7e4) SHA1(726fded9db72a881128b43f449d2baf450131f63) )
-
+
ROM_REGION16_BE( 0x1c0000, "gfx2", 0 ) /* sprites */
ROM_LOAD16_BYTE( "33.17", 0x000001, 0x10000, CRC(28ba70c8) SHA1(a6f33e1404928b6d1006943494646d6cfbd60a4b) )
ROM_LOAD16_BYTE( "34.18", 0x020001, 0x10000, CRC(2ed96a26) SHA1(edcf915243e6f92d31cdfc53965438f6b6bff51d) )
@@ -2225,7 +2225,7 @@ ROM_START( goldnaxeb1 )
ROM_LOAD16_BYTE( "36.20", 0x060001, 0x10000, CRC(677e64a6) SHA1(e3d0d31097017c6cb1a7f41292783f18ce13b41c) )
ROM_LOAD16_BYTE( "15.bin", 0x140001, 0x10000, CRC(11794d05) SHA1(eef52d7a644dbcc5f983222f163445a725286a32) )
ROM_LOAD16_BYTE( "17.bin", 0x160001, 0x10000, CRC(ad1c1c90) SHA1(155f17593cfab1a117bb755b1edd0c473d455f91) )
-
+
ROM_LOAD16_BYTE( "23.9", 0x040000, 0x10000, CRC(5853000d) SHA1(db7adf1de74c66f667ea7ccc41702576de081ff5) )
ROM_LOAD16_BYTE( "24.10", 0x060000, 0x10000, CRC(697b3276) SHA1(a8aeb2cfaca9368d5bfa14a67de36dbadd4a0585) )
ROM_LOAD16_BYTE( "16.bin", 0x140000, 0x10000, CRC(753b01e8) SHA1(0180cf893d63e60e14e2fb0f5836b302f08f0228) )
@@ -2241,7 +2241,7 @@ ROM_START( goldnaxeb1 )
ROM_LOAD16_BYTE( "20.bin", 0x180000, 0x10000, CRC(cba013c7) SHA1(a0658aaf7893bc9fb8f0435cab9f77ceb1fb4e1d) )
ROM_LOAD16_BYTE( "26.bin", 0x1a0000, 0x10000, CRC(bea4d237) SHA1(46e51e89b4ee1e2701da1004758d7da547a2e4c2) )
-
+
ROM_REGION( 0x30000, "soundcpu", 0 ) /* sound CPU */
ROM_LOAD( "2.3", 0x00000, 0x08000, CRC(399fc5f5) SHA1(6f290b36dc71ff4759598e2a9c185a8945a3c9e7) )
ROM_LOAD( "3.1", 0x10000, 0x10000, CRC(50eb5a56) SHA1(d59ba04254000de5577e8a58d0b51c73112a4c80) )
@@ -2404,7 +2404,7 @@ ROM_START( shinobld )
ROM_LOAD16_BYTE( "4.bin", 0x40000, 0x10000, CRC(04a437f8) SHA1(ea5fed64443236e3404fab243761e60e2e48c84c) )
ROM_LOAD16_BYTE( "7.bin", 0x60001, 0x10000, CRC(41f41063) SHA1(5cc461e9738dddf9eea06831fce3702d94674163) )
ROM_LOAD16_BYTE( "1.bin", 0x60000, 0x10000, CRC(b6e1fd72) SHA1(eb86e4bf880bd1a1d9bcab3f2f2e917bcaa06172) )
-
+
ROM_REGION( 0x10000, "soundcpu", 0 ) /* sound CPU + data */
ROM_LOAD( "16.bin", 0x0000, 0x10000, CRC(52c8364e) SHA1(01d30b82f92498d155d2e31d43d58dff0285cce3) )
ROM_END
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 4830087e064..ef7e3b056bb 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -945,6 +945,4 @@ GAME( 1988, thunderx, 0, thunderx, thunderx, scontra, ROT0, "Konami", "T
GAME( 1988, thnderxa, thunderx, thunderx, thunderx, scontra, ROT0, "Konami", "Thunder Cross (set 2)", 0 )
GAME( 1988, thnderxb, thunderx, thunderx, thunderx, scontra, ROT0, "Konami", "Thunder Cross (set 3)", 0 )
GAME( 1988, thnderxj, thunderx, thunderx, thnderxj, scontra, ROT0, "Konami", "Thunder Cross (Japan)", 0 )
-/*
-GAME( 1988, thndrxja, thunderx, thunderx, thndrxja, scontra, ROT0, "Konami", "Thunder Cross (Japan, newer revision)", 0 )
-*/
+//GAME( 1988, thndrxja, thunderx, thunderx, thndrxja, scontra, ROT0, "Konami", "Thunder Cross (Japan, newer revision)", 0 )
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index 06920a8c8e5..c3631be96e7 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -706,4 +706,4 @@ GAME( 200?, tfupdate, triforce, triforcegd, triforce, 0, ROT0, "Sega",
GAME( 2004, vs4j, triforce, triforcegd, triforce, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (GDT-0013E)", GAME_NO_SOUND|GAME_NOT_WORKING )
GAME( 2004, vs4, triforce, triforcegd, triforce, 0, ROT0, "Sega", "Virtua Striker 4 (Export) (GDT-0015)", GAME_NO_SOUND|GAME_NOT_WORKING )
GAME( 2004, avalon20, triforce, triforcegd, triforce, 0, ROT0, "Sega", "The Key Of Avalon 2.0 - Eutaxy and Commandment - Client (GDT-0017B) (V3.001)", GAME_NO_SOUND|GAME_NOT_WORKING )
-GAME( 2006, vs42006, triforce, triforcegd, triforce, 0, ROT0, "Sega", "Virtua Striker 4 ver. 2006 (Rev D) (Japan) (GDT-0020D)", GAME_NO_SOUND|GAME_NOT_WORKING )
+//GAME( 2006, vs42006, triforce, triforcegd, triforce, 0, ROT0, "Sega", "Virtua Striker 4 ver. 2006 (Rev D) (Japan) (GDT-0020D)", GAME_NO_SOUND|GAME_NOT_WORKING )
diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c
index 403c8aa015c..7fb0db16928 100644
--- a/src/mame/drivers/twinkle.c
+++ b/src/mame/drivers/twinkle.c
@@ -34,7 +34,7 @@ beatmania IIDX 6th Style - Konami 2001 B4U JA A01 B4U JA A02 ?
beatmania IIDX 7th Style - Konami 2002 B44 JA A01 B44 JA A02 ? ?
beatmania IIDX 8th Style - Konami 2002 C44 JA A01 ? C44 ?
-? = Undumped pieces.
+? = Undumped pieces.
# = Dumped but code unknown.
* = Came with beatmania IIDX main board but might be for 8th Style (i.e. game C44)?
If you can help, please contact us at http://guru.mameworld.info or http://mamedev.org/contact.html
@@ -614,12 +614,12 @@ static WRITE32_HANDLER(shared_psx_w)
if (mem_mask == 0xff)
{
twinkle_spu_shared[offset*2] = data;
-// printf("shared_psx_w: %x to %x (%x), mask %x (PC=%x)\n", data, offset, offset*2, mem_mask, cpu_get_pc(space->cpu));
+// printf("shared_psx_w: %x to %x (%x), mask %x (PC=%x)\n", data, offset, offset*2, mem_mask, cpu_get_pc(space->cpu));
}
else if (mem_mask == 0xff0000)
{
twinkle_spu_shared[(offset*2)+1] = data;
-// printf("shared_psx_w: %x to %x (%x), mask %x (PC=%x)\n", data, offset, (offset*2)+1, mem_mask, cpu_get_pc(space->cpu));
+// printf("shared_psx_w: %x to %x (%x), mask %x (PC=%x)\n", data, offset, (offset*2)+1, mem_mask, cpu_get_pc(space->cpu));
}
else
{
@@ -633,7 +633,7 @@ static READ32_HANDLER(shared_psx_r)
result = twinkle_spu_shared[offset*2] | twinkle_spu_shared[(offset*2)+1]<<16;
-// printf("shared_psx_r: @ %x (%x %x), mask %x = %x (PC=%x)\n", offset, offset*2, (offset*2)+1, mem_mask, result, cpu_get_pc(space->cpu));
+// printf("shared_psx_r: @ %x (%x %x), mask %x = %x (PC=%x)\n", offset, offset*2, (offset*2)+1, mem_mask, result, cpu_get_pc(space->cpu));
result = 0; // HACK to prevent the games from freezing while we sort out the rest of the 68k's boot sequence
@@ -703,7 +703,7 @@ static READ16_DEVICE_HANDLER( twinkle_ide_r )
}
else
{
- return ide_controller_r(device, offset+0x1f0, 1);
+ return ide_controller_r(device, offset+0x1f0, 1);
}
}
@@ -713,15 +713,15 @@ static WRITE16_DEVICE_HANDLER( twinkle_ide_w )
}
/*
- System control register (Konami always has one)
+ System control register (Konami always has one)
- bit 7 = write 0 to ack IRQ 1, write 1 to enable (IRQ 1 appears to be vblank)
- bit 8 = write 0 to ack IRQ 2, write 1 to enable (IRQ 2 appears to be DMA completion)
- bit 9 = write 0 to ack IRQ 4, write 1 to enable (IRQ 4 appears to be "command sent", unsure how the MIPS causes it yet however)
- bit 10 = write 0 to ack IRQ 6, write 1 to enable (IRQ 6 is IDE)
- bit 11 = watchdog toggle?
+ bit 7 = write 0 to ack IRQ 1, write 1 to enable (IRQ 1 appears to be vblank)
+ bit 8 = write 0 to ack IRQ 2, write 1 to enable (IRQ 2 appears to be DMA completion)
+ bit 9 = write 0 to ack IRQ 4, write 1 to enable (IRQ 4 appears to be "command sent", unsure how the MIPS causes it yet however)
+ bit 10 = write 0 to ack IRQ 6, write 1 to enable (IRQ 6 is IDE)
+ bit 11 = watchdog toggle?
- Other bits unknown.
+ Other bits unknown.
*/
static WRITE16_HANDLER( twinkle_spu_ctrl_w )
{
@@ -761,14 +761,14 @@ static WRITE16_HANDLER( twinkle_waveram_w )
static READ16_HANDLER( shared_68k_r )
{
-// printf("shared_68k_r: @ %x, mask %x\n", offset, mem_mask);
+// printf("shared_68k_r: @ %x, mask %x\n", offset, mem_mask);
return twinkle_spu_shared[offset];
}
static WRITE16_HANDLER( shared_68k_w )
{
-// printf("shared_68k_w: %x to %x, mask %x\n", data, offset, mem_mask);
+// printf("shared_68k_w: %x to %x, mask %x\n", data, offset, mem_mask);
twinkle_spu_shared[offset] = data & 0xff;
}
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index b3ca49ecc63..e32f2f5dca2 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -396,7 +396,7 @@ static void calc3_mcu_run(running_machine *machine)
if ( calc3_mcu_status != (1|2|4|8) ) return;
//calc3_mcu_status = 0;
-
+
mcu_command = kaneko16_mcu_ram[calc3_mcu_command_offset/2 + 0];
if (mcu_command == 0) return;
@@ -404,13 +404,13 @@ static void calc3_mcu_run(running_machine *machine)
logerror("%s : MCU executed command at %04X: %04X\n",
cpuexec_describe_context(machine),calc3_mcu_command_offset,mcu_command);
-
+
switch (mcu_command)
{
case 0x00ff:
{
-
+
int param1 = kaneko16_mcu_ram[(0>>1) + 1];
int param2 = kaneko16_mcu_ram[(0>>1) + 2];
@@ -450,19 +450,19 @@ static void calc3_mcu_run(running_machine *machine)
kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+5] = 0x0000;
kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+6] = 0x0000;
kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+7] = 0x0000;
-
+
calc3_mcu_command_offset = param3; // where next command will be written?
-
+
}
break;
-
+
// the 'case' seems to be the number of commands in the list
- // there are parts of the code where i've seen up to '5' specified, and the game uploads 5 transfer commands
+ // there are parts of the code where i've seen up to '5' specified, and the game uploads 5 transfer commands
//
case 0x0001:
- {
+ {
int i;
int param1 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 1];
int param2 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 2];
@@ -475,8 +475,8 @@ static void calc3_mcu_run(running_machine *machine)
UINT32 writebackaddress = (param1&0x00ff) | (param2&0xff00);
UINT8 command1tabl = (param1&0xff00) >> 8;
UINT16 command1addr = (param1&0x00ff) | (param2&0xff00);
-
-
+
+
logerror("params %04x %04x %04x %04x %04x %04x %04x\n",
param1,param2,param3,param4,param5,param6,param7);
logerror("command 1 addr %04x command 1 table %02x\n", command1addr, command1tabl);
@@ -484,43 +484,43 @@ static void calc3_mcu_run(running_machine *machine)
// clear old command (handshake to main cpu)
kaneko16_mcu_ram[calc3_mcu_command_offset>>1] = 0x0000;
-
-
+
+
// execute the command:
// param1 ?
- //kaneko16_mcu_ram[param2/2 + 0] = 0x0000; // ?
- //kaneko16_mcu_ram[param2/2 + 1] = 0x0000; // ?
- //kaneko16_mcu_ram[param2/2 + 2] = 0x0000; // ?
- //kaneko16_mcu_ram[param2/2 + 3] = 0x0000; // ? addr.l
- //kaneko16_mcu_ram[param2/2 + 4] = 0x00e0; // 0000e0: 4e73 rte
+ //kaneko16_mcu_ram[param2/2 + 0] = 0x0000; // ?
+ //kaneko16_mcu_ram[param2/2 + 1] = 0x0000; // ?
+ //kaneko16_mcu_ram[param2/2 + 2] = 0x0000; // ?
+ //kaneko16_mcu_ram[param2/2 + 3] = 0x0000; // ? addr.l
+ //kaneko16_mcu_ram[param2/2 + 4] = 0x00e0; // 0000e0: 4e73 rte
//UINT32 writeaddress = (param2);
-
-
-
+
+
+
writeaddress&=0xffff;
for(i=0;i<sizeof(shogwarr_snip_) / 2;i++)
{
- // printf("writes\n %08x", (writeaddress+i)*2);
+ // printf("writes\n %08x", (writeaddress+i)*2);
kaneko16_mcu_ram[(writeaddress/2)+i] = shogwarr_snip_[i];
}
kaneko16_mcu_ram[(writebackaddress/2)+0] = 0x0020;
kaneko16_mcu_ram[(writebackaddress/2)+1] = writeaddress;
-
- // calc3_mcu_command_offset = param3; // where next command will be written?
- // calc3_mcu_status =0;
-
+
+ // calc3_mcu_command_offset = param3; // where next command will be written?
+ // calc3_mcu_status =0;
+
}
break;
case 0x0002:
{
-
+
int param1 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 1];
int param2 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 2];
int param3 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 3];
@@ -529,7 +529,7 @@ static void calc3_mcu_run(running_machine *machine)
int param6 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 6];
int param7 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+ 7];
-
+
UINT8 command1tabl = (param1&0xff00) >> 8;
UINT16 command1addr = (param1&0x00ff) | (param2&0xff00);
UINT8 command2tabl = (param3&0xff00) >> 8;
@@ -538,7 +538,7 @@ static void calc3_mcu_run(running_machine *machine)
logerror("params %04x %04x %04x %04x %04x %04x %04x\n",
param1,param2,param3,param4,param5,param6,param7);
logerror("command 1 addr %04x command 1 table %02x | command 2 addr %04x command 2 table %02x\n", command1addr, command1tabl, command2addr, command2tabl);
-
+
// clear old command (handshake to main cpu)
kaneko16_mcu_ram[calc3_mcu_command_offset>>1] = 0x0000;
@@ -546,10 +546,10 @@ static void calc3_mcu_run(running_machine *machine)
;
}
break;
-
+
case 0x0003:
{
-
+
int param1 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 1];
int param2 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 2];
int param3 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 3];
@@ -558,7 +558,7 @@ static void calc3_mcu_run(running_machine *machine)
int param6 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 6];
int param7 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+ 7];
-
+
UINT8 command1tabl = (param1&0xff00) >> 8;
UINT16 command1addr = (param1&0x00ff) | (param2&0xff00);
UINT8 command2tabl = (param3&0xff00) >> 8;
@@ -569,7 +569,7 @@ static void calc3_mcu_run(running_machine *machine)
logerror("params %04x %04x %04x %04x %04x %04x %04x\n",
param1,param2,param3,param4,param5,param6,param7);
logerror("command 1 addr %04x command 1 table %02x | command 2 addr %04x command 2 table %02x | command 3 addr %04x command 3 table %02x\n", command1addr, command1tabl, command2addr, command2tabl, command3addr, command3tabl);
-
+
// clear old command (handshake to main cpu)
kaneko16_mcu_ram[calc3_mcu_command_offset>>1] = 0x0000;
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index ee7e773ec5a..c5f3beae8c8 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -9422,6 +9422,7 @@ Other Sun games
//DRIVER( mfish_11 )
DRIVER( mfish_12 )
DRIVER( mfish_12a )
+ //DRIVER( mfish_13 )
/* Crazy Monkey */
//DRIVER( crzmon )
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 523527e785f..fad3e414d51 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -121,7 +121,7 @@ WRITE8_HANDLER( prosoccr_io_w )
if (offset > 1 && offset < 6)
tilemap_mark_all_tiles_dirty(background_tilemap);
-// popmessage("%02x %02x",deco16_io_ram[6],deco16_io_ram[7]);
+// popmessage("%02x %02x",deco16_io_ram[6],deco16_io_ram[7]);
switch (offset)
{
@@ -484,10 +484,10 @@ VIDEO_UPDATE( prosport )
bitmap_fill(bitmap,cliprect,0);
-// popmessage("%d",scrollx);
+// popmessage("%d",scrollx);
offs = 0;
-// scrollx = ((deco16_io_ram[0] & 0xf)<<8)+deco16_io_ram[1];
+// scrollx = ((deco16_io_ram[0] & 0xf)<<8)+deco16_io_ram[1];
scrollx = 0;//((deco16_io_ram[0] & 0x3)<<8)+deco16_io_ram[1];
/* TODO: enough for showing something for Pro Bowling, not enough yet for Pro Golf...*/
@@ -511,7 +511,7 @@ VIDEO_UPDATE( prosport )
}
}
-// #if 0
+// #if 0
for(mx = 0;mx < 32;mx++)
{
for(my = 16;my < 32;my++)
@@ -531,12 +531,12 @@ VIDEO_UPDATE( prosport )
offs++;
}
}
-// #endif
+// #endif
//return 0;
-// popmessage("%d %02x %02x %02x %02x %02x %02x %02x %02x",scrollx,deco16_io_ram[0],deco16_io_ram[1],deco16_io_ram[2],deco16_io_ram[3]
-// ,deco16_io_ram[4],deco16_io_ram[5],deco16_io_ram[6],deco16_io_ram[7]);
+// popmessage("%d %02x %02x %02x %02x %02x %02x %02x %02x",scrollx,deco16_io_ram[0],deco16_io_ram[1],deco16_io_ram[2],deco16_io_ram[3]
+// ,deco16_io_ram[4],deco16_io_ram[5],deco16_io_ram[6],deco16_io_ram[7]);
for (offs = 0;offs < 0x400;offs++)
{
diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c
index 2d1bf77ca3f..92929866dce 100644
--- a/src/mame/video/segaic16.c
+++ b/src/mame/video/segaic16.c
@@ -2028,14 +2028,14 @@ static void segaic16_sprites_16b_draw(running_machine *machine, struct sprite_in
int hzoom = data[5] & 0x1f;
const UINT16 *spritedata;
int x, y, pix, xdelta = 1;
-
+
/* some bootlegs have offset sprites */
xpos += info->xoffs;
xpos &= 0x1ff;
-
+
/* originals all have this offset */
xpos -= 0xb8;
-
+
/* initialize the end address to the start address */
data[7] = addr;
@@ -2063,7 +2063,7 @@ static void segaic16_sprites_16b_draw(running_machine *machine, struct sprite_in
/* loop from top to bottom */
for (y = top; y < bottom; y++)
- {
+ {
/* advance a row */
addr += pitch;
@@ -2664,7 +2664,7 @@ static void segaic16_sprites_yboard_draw(running_machine *machine, struct sprite
the system16a bootleg sprite hardware differs in subtle ways on a per game basis
with each game having the words swapped around.
-
+
there are also some subtle, but important changes when compared to the original
system16a sprites, mainly the increment of the address not happening until
the end of the loop
@@ -2692,7 +2692,7 @@ static void segaic16_sprites_yboard_draw(running_machine *machine, struct sprite
pri[x] = 0xff; \
} \
-
+
/* make this an actual function */
#define system16a_bootleg_draw_core() \
{ \
@@ -2788,8 +2788,8 @@ static void segaic16_sprites_yboard_draw(running_machine *machine, struct sprite
} \
} \
-
-
+
+
static void segaic16_sprites_16a_bootleg_wb3bl_draw(running_machine *machine, struct sprite_info *info, bitmap_t *bitmap, const rectangle *cliprect)
{
UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x10000;
@@ -2797,7 +2797,7 @@ static void segaic16_sprites_16a_bootleg_wb3bl_draw(running_machine *machine, st
UINT16 *data;
for (data = info->spriteram; data < info->spriteram+ info->ramsize/2; data += 8)
- {
+ {
int bottom = (data[4] >> 8);
int top = (data[4] & 0xff);
int xpos = (data[0]);
@@ -2805,7 +2805,7 @@ static void segaic16_sprites_16a_bootleg_wb3bl_draw(running_machine *machine, st
UINT16 addr = data[1];
int color = info->colorbase + (((data[6] >> 8) & 0x3f) << 4);
int bank = info->bank[(data[6] >> 4) & 0x7];
- int sprpri = 1 << ((data[6] >> 0) & 0x3);
+ int sprpri = 1 << ((data[6] >> 0) & 0x3);
system16a_bootleg_draw_core();
}
@@ -2827,8 +2827,8 @@ UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x10000;
UINT16 addr = data[2];
int color = info->colorbase + (((data[5] >> 8) & 0x3f) << 4);
int bank = info->bank[(data[5] >> 4) & 0x7];
- int sprpri = 1 << ((data[5] >> 0) & 0x3);
-
+ int sprpri = 1 << ((data[5] >> 0) & 0x3);
+
system16a_bootleg_draw_core();
}
}
@@ -2848,8 +2848,8 @@ static void segaic16_sprites_16a_bootleg_shinobld_draw(running_machine *machine,
UINT16 addr = data[3];
int color = info->colorbase + (((data[4] >> 8) & 0x3f) << 4);
int bank = info->bank[(data[4] >> 4) & 0x7];
- int sprpri = 1 << ((data[4] >> 0) & 0x3);
-
+ int sprpri = 1 << ((data[4] >> 0) & 0x3);
+
system16a_bootleg_draw_core();
}
}
@@ -2872,7 +2872,7 @@ void segaic16_sprites_init(running_machine *machine, int which, int type, int co
for (i = 0; i < 16; i++)
info->bank[i] = i;
info->colorbase = colorbase;
-
+
/* some bootlegs have offset sprites */
info->xoffs = xoffs;
@@ -2903,7 +2903,7 @@ void segaic16_sprites_init(running_machine *machine, int which, int type, int co
info->draw = segaic16_sprites_16a_draw;
info->ramsize = 0x800;
break;
-
+
case SEGAIC16_SPRITES_16B:
info->draw = segaic16_sprites_16b_draw;
info->ramsize = 0x800;
@@ -2934,18 +2934,18 @@ void segaic16_sprites_init(running_machine *machine, int which, int type, int co
case SEGAIC16_SPRITES_16A_BOOTLEG_WB3BL:
info->draw = segaic16_sprites_16a_bootleg_wb3bl_draw;
info->ramsize = 0x800;
- break;
+ break;
case SEGAIC16_SPRITES_16A_BOOTLEG_PASSHTBL:
info->draw = segaic16_sprites_16a_bootleg_passhtb_draw;
info->ramsize = 0x800;
- break;
-
+ break;
+
case SEGAIC16_SPRITES_16A_BOOTLEG_SHINOBLD:
info->draw = segaic16_sprites_16a_bootleg_shinobld_draw;
info->ramsize = 0x800;
break;
-
+
default:
fatalerror("Invalid sprite system specified in segaic16_sprites_init");
}
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index c92b114ccff..6077c18112a 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -72,13 +72,13 @@ static const struct system15_bootleg_config config_table[] =
{ "astormb2", 1, 0,0,0, 107 },
{ "mwalkbl", 1, 0,0,0, 107 },
{ "shdancbl", 1, 0,0,0, 107 },
-
+
/* Tetris-based hardware */
{ "beautyb", 0, 0,0,0, 112 },
{ "iqpipe", 0, 0,0,0, 112 },
-
-
+
+
{ NULL, 0 } // end of table
};
@@ -94,7 +94,7 @@ void setup_system16_bootleg_video(running_machine* machine)
{
if (strcmp(k->name, gamename) == 0)
{
- system16_bootleg_spritebank_type = k->spritebank_type;
+ system16_bootleg_spritebank_type = k->spritebank_type;
system16_bootleg_back_tilemap_yscroll = k->back_tilemap_yscroll;
system16_bootleg_fore_tilemap_yscroll = k->fore_tilemap_yscroll;
system16_bootleg_text_tilemap_yscroll = k->text_tilemap_yscroll;
@@ -104,7 +104,7 @@ void setup_system16_bootleg_video(running_machine* machine)
}
++k;
}
-
+
if (!found) fatalerror("system16 bootleg not in system15_bootleg_config config_table[]!\n");
}
@@ -124,8 +124,8 @@ void setup_system16_bootleg_spritebanking(running_machine* machine)
int i;
for (i = 0; i < 16; i++)
segaic16_sprites_set_bank(machine, 0, i, alternate_banklist[i]);
-
- }
+
+ }
}
@@ -609,9 +609,9 @@ VIDEO_START( system16 )
sys16_18_mode=0;
}
-
+
segaic16_palette_init(0x800);
- segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16B, 0x400,system16_bootleg_sprite_xoffs);
+ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16B, 0x400,system16_bootleg_sprite_xoffs);
setup_system16_bootleg_spritebanking(machine);
@@ -659,7 +659,7 @@ VIDEO_START( system18old )
sys16_fg_priority_mode=3;
sys16_bg_priority_value=0x1800;
sys16_fg_priority_value=0x2000;
-
+
}
@@ -794,7 +794,7 @@ VIDEO_START( system16a_bootleg )
tilemap_set_transparent_pen( system16a_bootleg_text_tilemap, 0 );
tilemap_set_transparent_pen( system16a_bootleg_bg_tilemaps[0], 0 );
tilemap_set_transparent_pen( system16a_bootleg_bg_tilemaps[1], 0 );
-
+
segaic16_palette_init(0x800);
}
@@ -802,21 +802,21 @@ VIDEO_START( system16a_bootleg )
VIDEO_START( system16a_bootleg_wb3bl )
{
VIDEO_START_CALL(system16a_bootleg);
- segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16A_BOOTLEG_WB3BL, 0x400, system16_bootleg_sprite_xoffs);
+ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16A_BOOTLEG_WB3BL, 0x400, system16_bootleg_sprite_xoffs);
setup_system16_bootleg_spritebanking(machine);
}
VIDEO_START( system16a_bootleg_shinobi )
{
VIDEO_START_CALL(system16a_bootleg);
- segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16A_BOOTLEG_SHINOBLD, 0x400, system16_bootleg_sprite_xoffs);
+ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16A_BOOTLEG_SHINOBLD, 0x400, system16_bootleg_sprite_xoffs);
setup_system16_bootleg_spritebanking(machine);
}
VIDEO_START( system16a_bootleg_passsht )
{
VIDEO_START_CALL(system16a_bootleg);
- segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16A_BOOTLEG_PASSHTBL, 0x400, system16_bootleg_sprite_xoffs);
+ segaic16_sprites_init(machine, 0, SEGAIC16_SPRITES_16A_BOOTLEG_PASSHTBL, 0x400, system16_bootleg_sprite_xoffs);
setup_system16_bootleg_spritebanking(machine);
}
@@ -873,8 +873,8 @@ VIDEO_UPDATE( system16a_bootleg )
}
/* draw the sprites */
- segaic16_sprites_draw(screen, bitmap, cliprect, 0);
-
+ segaic16_sprites_draw(screen, bitmap, cliprect, 0);
+
return 0;
}
@@ -914,8 +914,8 @@ VIDEO_UPDATE( system16a_bootleg_passht4b )
}
/* draw the sprites */
- segaic16_sprites_draw(screen, bitmap, cliprect, 0);
-
+ segaic16_sprites_draw(screen, bitmap, cliprect, 0);
+
return 0;
}
@@ -945,7 +945,7 @@ VIDEO_UPDATE( system16 )
tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE, 0x00 );
/* Background */
-
+
if(sys16_bg_priority_mode)
{
tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE | 1, 0x00 );
@@ -961,13 +961,13 @@ VIDEO_UPDATE( system16 )
}
/* Foreground */
-
+
tilemap_draw( bitmap,cliprect, foreground, 0, 0x03 );
tilemap_draw( bitmap,cliprect, foreground, 1, 0x07 );
/* Text Layer */
-
+
if( sys16_textlayer_lo_max!=0 )
{
tilemap_draw( bitmap,cliprect, text_layer, 1, 7 );// needed for Body Slam
@@ -976,7 +976,7 @@ VIDEO_UPDATE( system16 )
tilemap_draw( bitmap,cliprect, text_layer, 0, 0xf );
//draw_sprites(screen->machine, bitmap,cliprect,0 );
-
+
/* draw the sprites */
segaic16_sprites_draw(screen, bitmap, cliprect, 0);
return 0;
@@ -1024,6 +1024,6 @@ VIDEO_UPDATE( system18old )
/* draw the sprites */
segaic16_sprites_draw(screen, bitmap, cliprect, 0);
-
+
return 0;
}
diff --git a/src/version.c b/src/version.c
index 9d0861ba776..03d6bbfb98d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.132 ("__DATE__")";
+const char build_version[] = "0.132u1 ("__DATE__")";