diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 15ed6171d41..37f9939e95d 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -562,7 +562,7 @@ WRITE16_MEMBER(raiden2_state::cop_cmd_w) space.write_dword(cop_regs[2], space.read_dword(cop_regs[0]+4)); break; - // raidndx only + // raidendx only case 0x7e05: space.write_dword(0x470, (space.read_dword(cop_regs[4]) & 0x30) << 6); // Actually, wherever the bank selection actually is @@ -2238,7 +2238,7 @@ ROM_END /* Raiden DX sets */ -ROM_START( raidndx ) +ROM_START( raidendx ) ROM_REGION( 0x200000, "mainprg", 0 ) /* v30 main cpu */ ROM_LOAD32_BYTE("1d.4n", 0x000000, 0x80000, CRC(14d725fc) SHA1(f12806f64f069fdc4ee29b309a32f7ca00b36f93) ) ROM_LOAD32_BYTE("2d.4p", 0x000001, 0x80000, CRC(5e7e45cb) SHA1(94eff893b5335c522f1c063c3175b9bac87b0a25) ) @@ -2273,7 +2273,7 @@ ROM_START( raidndx ) ROM_LOAD( "dx_pcm.3a", 0x00000, 0x40000, CRC(8cf0d17e) SHA1(0fbe0b1e1ca5360c7c8329331408e3d799b4714c) ) /* Shared with original Raiden 2 */ ROM_END -ROM_START( raidndxa1 ) +ROM_START( raidendxa1 ) ROM_REGION( 0x200000, "mainprg", 0 ) /* v30 main cpu */ ROM_LOAD32_BYTE("dx_1h.4n", 0x000000, 0x80000, BAD_DUMP CRC(7624c36b) SHA1(84c17f2988031210d06536710e1eac558f4290a1) ) // bad ROM_LOAD32_BYTE("dx_2h.4p", 0x000001, 0x80000, CRC(4940fdf3) SHA1(c87e307ed7191802583bee443c7c8e4f4e33db25) ) @@ -2308,7 +2308,7 @@ ROM_START( raidndxa1 ) ROM_LOAD( "dx_pcm.3a", 0x00000, 0x40000, CRC(8cf0d17e) SHA1(0fbe0b1e1ca5360c7c8329331408e3d799b4714c) ) ROM_END -ROM_START( raidndxa2 ) +ROM_START( raidendxa2 ) ROM_REGION( 0x200000, "mainprg", 0 ) /* v30 main cpu */ ROM_LOAD32_BYTE("1d.bin", 0x000000, 0x80000, CRC(22b155ae) SHA1(388151e2c8fb301bd5bc66a974e9fe16816ae0bc) ) ROM_LOAD32_BYTE("2d.bin", 0x000001, 0x80000, CRC(2be98ca8) SHA1(491e990405b0ad3de45bdbcc2453af9215ae19c8) ) @@ -2343,7 +2343,7 @@ ROM_START( raidndxa2 ) ROM_LOAD( "dx_pcm.3a", 0x00000, 0x40000, CRC(8cf0d17e) SHA1(0fbe0b1e1ca5360c7c8329331408e3d799b4714c) ) /* Shared with original Raiden 2 */ ROM_END -ROM_START( raidndxj ) +ROM_START( raidendxj ) ROM_REGION( 0x200000, "mainprg", 0 ) /* v30 main cpu */ ROM_LOAD32_BYTE("rdxj_1.bin", 0x000000, 0x80000, CRC(b5b32885) SHA1(fb3c592b2436d347103c17bd765176062be95fa2) ) ROM_LOAD32_BYTE("rdxj_2.bin", 0x000001, 0x80000, CRC(7efd581d) SHA1(4609a0d8afb3d62a38b461089295efed47beea91) ) @@ -2378,7 +2378,7 @@ ROM_START( raidndxj ) ROM_LOAD( "dx_pcm.3a", 0x00000, 0x40000, CRC(8cf0d17e) SHA1(0fbe0b1e1ca5360c7c8329331408e3d799b4714c) ) /* Shared with original Raiden 2 */ ROM_END -ROM_START( raidndxu ) +ROM_START( raidendxu ) ROM_REGION( 0x200000, "mainprg", 0 ) /* v30 main cpu */ ROM_LOAD32_BYTE("1a.u1210", 0x000000, 0x80000, CRC(53e63194) SHA1(a957330e14649cf46ad27fb99c460576c59e60b1) ) ROM_LOAD32_BYTE("2a.u1211", 0x000001, 0x80000, CRC(ec8d1647) SHA1(5ceae132c6c09d6bb8565e9141ee1170bbdfd5fc) ) @@ -2413,7 +2413,7 @@ ROM_START( raidndxu ) ROM_LOAD( "dx_pcm.3a", 0x00000, 0x40000, CRC(8cf0d17e) SHA1(0fbe0b1e1ca5360c7c8329331408e3d799b4714c) ) /* Shared with original Raiden 2 */ ROM_END -ROM_START( raidndxg ) +ROM_START( raidendxg ) ROM_REGION( 0x200000, "mainprg", 0 ) /* v30 main cpu */ ROM_LOAD32_BYTE("1d.u1210", 0x000000, 0x80000, CRC(14d725fc) SHA1(f12806f64f069fdc4ee29b309a32f7ca00b36f93) ) ROM_LOAD32_BYTE("2d.u1211", 0x000001, 0x80000, CRC(5e7e45cb) SHA1(94eff893b5335c522f1c063c3175b9bac87b0a25) ) @@ -2928,12 +2928,12 @@ GAME( 1993, raiden2f, raiden2, raiden2, raiden2, raiden2_state, raiden2, ROT2 GAME( 1993, raiden2g, raiden2, raiden2, raiden2, raiden2_state, raiden2, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden II (set 8, US Fabtek, Easy Version)", GAME_NOT_WORKING) // rev 3 and 4 mix? -GAME( 1994, raidndx, 0, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu", "Raiden DX (UK)", GAME_NOT_WORKING) -GAME( 1994, raidndxa1,raidndx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Metrotainment license)", "Raiden DX (Asia set 1)", GAME_NOT_WORKING) -GAME( 1994, raidndxa2,raidndx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Metrotainment license)", "Raiden DX (Asia set 2)", GAME_NOT_WORKING) -GAME( 1994, raidndxj, raidndx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu", "Raiden DX (Japan)", GAME_NOT_WORKING) -GAME( 1994, raidndxu, raidndx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden DX (US)", GAME_NOT_WORKING) -GAME( 1994, raidndxg, raidndx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Tuning license)", "Raiden DX (Germany)", GAME_NOT_WORKING) +GAME( 1994, raidendx, 0, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu", "Raiden DX (UK)", GAME_NOT_WORKING) +GAME( 1994, raidendxa1,raidendx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Metrotainment license)", "Raiden DX (Asia set 1)", GAME_NOT_WORKING) +GAME( 1994, raidendxa2,raidendx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Metrotainment license)", "Raiden DX (Asia set 2)", GAME_NOT_WORKING) +GAME( 1994, raidendxj, raidendx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu", "Raiden DX (Japan)", GAME_NOT_WORKING) +GAME( 1994, raidendxu, raidendx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden DX (US)", GAME_NOT_WORKING) +GAME( 1994, raidendxg, raidendx, raidendx, raidendx, raiden2_state, raidendx, ROT270, "Seibu Kaihatsu (Tuning license)", "Raiden DX (Germany)", GAME_NOT_WORKING) GAME( 1993, zeroteam, 0, zeroteam, zeroteam, raiden2_state, zeroteam, ROT0, "Seibu Kaihatsu", "Zero Team USA (set 1, US, Fabtek license)", GAME_NOT_WORKING) GAME( 1993, zeroteama,zeroteam,zeroteam, zeroteam, raiden2_state, zeroteam, ROT0, "Seibu Kaihatsu", "Zero Team (set 2, Japan? (earlier?))", GAME_NOT_WORKING) diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c index e0e588d8a1e..93c86672f42 100644 --- a/src/mame/machine/seicop.c +++ b/src/mame/machine/seicop.c @@ -1728,7 +1728,7 @@ WRITE16_HANDLER( copdxbl_0_w ) static UINT16 cop_status,cop_dist,cop_angle; static UINT16 cop_hit_status; -static UINT32 cop_hit_val_x,cop_hit_val_y; +static INT32 cop_hit_val_x,cop_hit_val_y; static UINT32 cop_sort_lookup,cop_sort_ram_addr,cop_sort_param; static INT8 cop_angle_compare; static UINT8 cop_angle_mod_val; @@ -1935,7 +1935,18 @@ static WRITE16_HANDLER( generic_cop_w ) case (0x05a/2): pal_brightness_val = data & 0xff; break; case (0x05c/2): pal_brightness_mode = data & 0xff; break; - /* DMA / layer clearing */ + /* DMA / layer clearing section */ + case (0x074/2): + /* + This sets up a DMA mode of some sort + 0x0e00: grainbow, cupsoc + 0x0a00: legionna, godzilla, denjinmk + 0x0600: heatbrl + 0x1e00: zeroteam, xsedae + raiden2 and raidendx doesn't set this up, this could indicate that this is related to the non-private buffer DMAs + (both only uses 0x14 and 0x15 as DMAs) + */ + break; /* used in palette DMAs, for fading effects */ case (0x076/2): diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 1d2938a2610..4537d679e4f 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -7777,12 +7777,12 @@ raiden2d // (c) 1993 Seibu Kaihatsu raiden2e // (c) 1993 Seibu Kaihatsu raiden2f // (c) 1993 Seibu Kaihatsu + Fabtek license raiden2g // (c) 1993 Seibu Kaihatsu -raidndx // (c) 1994 Seibu Kaihatsu -raidndxj // (c) 1994 Seibu Kaihatsu -raidndxu // (c) 1994 Seibu Kaihatsu + Fabtek license -raidndxa1 // (c) 1994 Seibu Kaihatsu + Metrotainment license -raidndxa2 // (c) 1994 Seibu Kaihatsu + Metrotainment license -raidndxg // (c) 1994 Seibu Kaihatsu + Tuning license +raidendx // (c) 1994 Seibu Kaihatsu +raidendxj // (c) 1994 Seibu Kaihatsu +raidendxu // (c) 1994 Seibu Kaihatsu + Fabtek license +raidendxa1 // (c) 1994 Seibu Kaihatsu + Metrotainment license +raidendxa2 // (c) 1994 Seibu Kaihatsu + Metrotainment license +raidendxg // (c) 1994 Seibu Kaihatsu + Tuning license zeroteam // (c) 1993 Seibu Kaihatsu + Fabtek license zeroteama // (c) 1993 Seibu Kaihatsu zeroteamb // (c) 1993 Seibu Kaihatsu