From 986cec8f14b362f938a7215b89fc365467576895 Mon Sep 17 00:00:00 2001 From: MetalliC <0vetal0@gmail.com> Date: Mon, 9 Sep 2019 20:06:12 +0300 Subject: [PATCH] cps3.cpp changes: - replaced "bad" v4 CHDs with v5 built using Trurip DATs (actual game data verified to remain the same) - revert RGB color extension, hardware doesn't do that --- src/mame/drivers/cps3.cpp | 41 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index 7633764b6a5..75a79bb889c 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -508,7 +508,7 @@ Hardware registers info 7A xxxx xxxx xxxx xxxx V ?? Zoom Offset? 0 0 7C xxxx xxxx xxxx xxxx V ?? Zoom Size? 1023 1023 (261 at BIOS init) 7E xxxx xxxx xxxx xxxx V Zoom Scale 64 64 - 80 ---- ---- ---- -210 Pixel clock 3 5 not clear how it works, which OSC is base clock, etc. + 80 ---- ---- ---- -210 Pixel clock 3 5 base clock is 42.954545MHz, 3 = /5 divider, 5 = /4 divider. ---- ---- ---4 3--- Flip screen X/Y (or Y/X) ---- ---- --5- ---- ?? always set to 1, 0 in unused 24KHz mode (pixel clock divider?) ---- ---- -6-- ---- ?? set to 0 by BIOS init, then set to 1 after video mode selection, 0 in unused 24KHz mode (pixel clock divider?) @@ -534,8 +534,8 @@ Hardware registers info All CRTC-related values is last clock/line of given area, i.e. actual sizes is +1 to value. - (*) H Total value is same for all 15KHz modes, uses fixed clock (not affected by pixel clock modifier), - probably 42.954545MHz/6 (similar to SSV) /(454+1) = 15734.25Hz /(262+1) = 59.826Hz + (*) H Total value is same for all 15KHz modes, uses fixed clock (not affected by pixel clock modifier) - + 42.954545MHz/6 (similar to SSV) /(454+1) = 15734.25Hz /(262+1) = 59.826Hz unused 24KHz 512x384 mode uses H Total 293 V Total 424 (42.954545MHz/6 /(293+1) = 24350.62Hz /(424+1) = 57.29Hz) @@ -971,7 +971,7 @@ void cps3_state::set_mame_colours(int colournum, u16 data, u32 fadeval) colournum &= 0x1ffff; m_colourram[colournum] = data; - m_mame_colours[colournum] = rgb_t(pal5bit(r), pal5bit(g), pal5bit(b)); + m_mame_colours[colournum] = rgb_t(r << 3, g << 3, b << 3); // no color extension, VideoDAC's RGB bits 0-2 connected to GND if (colournum < 0x10000) m_palette->set_pen_color(colournum,m_mame_colours[colournum]/* rgb_t(r<<3,g<<3,b<<3)*/);//m_mame_colours[colournum]); } @@ -2525,6 +2525,7 @@ void cps3_state::cps3(machine_config &config) /* Measured clocks: Video DAC = 8.602MHz (384 wide mode) ~ 42.9545MHz / 5 + 10.73MHZ (496 wide mode) ~ 42.9545MHz / 4 H = 15.73315kHz V = 59.8Hz H/V ~ 263 lines @@ -2615,7 +2616,7 @@ ROM_START( redearth ) ROM_LOAD( "redearth_euro.29f400.u2", 0x000000, 0x080000, CRC(02e0f336) SHA1(acc37e830dfeb9674f5a0fb24f4cc23217ae4ff5) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-wzd-5", 0, BAD_DUMP SHA1(e5676752b08283dc4a98c3d7b759e8aa6dcd0679) ) + DISK_IMAGE_READONLY( "cap-wzd-5", 0, SHA1(034c375c3f2f68723eef530b40da909a7be7b556) ) ROM_END ROM_START( redearthr1 ) @@ -2631,7 +2632,7 @@ ROM_START( warzard ) ROM_LOAD( "warzard_japan.29f400.u2", 0x000000, 0x080000, CRC(f8e2f0c6) SHA1(93d6a986f44c211fff014e55681eca4d2a2774d6) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-wzd-5", 0, BAD_DUMP SHA1(e5676752b08283dc4a98c3d7b759e8aa6dcd0679) ) + DISK_IMAGE_READONLY( "cap-wzd-5", 0, SHA1(034c375c3f2f68723eef530b40da909a7be7b556) ) ROM_END ROM_START( warzardr1 ) @@ -2648,7 +2649,7 @@ ROM_START( sfiii ) ROM_LOAD( "sfiii_euro.29f400.u2", 0x000000, 0x080000, CRC(27699ddc) SHA1(d8b525cd27e584560b129598df31fd2c5b2a682a) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) + DISK_IMAGE_READONLY( "cap-sf3-3", 0, SHA1(20aa46f8ffeb235205dc95cfd8fba42c7d102355) ) ROM_END ROM_START( sfiiiu ) @@ -2656,7 +2657,7 @@ ROM_START( sfiiiu ) ROM_LOAD( "sfiii_usa_region_b1.29f400.u2", 0x000000, 0x080000, CRC(fb172a8e) SHA1(48ebf59910f246835f7dc0c588da30f7a908072f) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) + DISK_IMAGE_READONLY( "cap-sf3-3", 0, SHA1(20aa46f8ffeb235205dc95cfd8fba42c7d102355) ) ROM_END ROM_START( sfiiia ) @@ -2664,7 +2665,7 @@ ROM_START( sfiiia ) ROM_LOAD( "sfiii_asia_region_bd.29f400.u2", 0x000000, 0x080000, CRC(cbd28de7) SHA1(9c15ecb73b9587d20850e62e8683930a45caa01b) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) + DISK_IMAGE_READONLY( "cap-sf3-3", 0, SHA1(20aa46f8ffeb235205dc95cfd8fba42c7d102355) ) ROM_END ROM_START( sfiiij ) @@ -2672,7 +2673,7 @@ ROM_START( sfiiij ) ROM_LOAD( "sfiii_japan.29f400.u2", 0x000000, 0x080000, CRC(74205250) SHA1(c3e83ace7121d32da729162662ec6b5285a31211) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) + DISK_IMAGE_READONLY( "cap-sf3-3", 0, SHA1(20aa46f8ffeb235205dc95cfd8fba42c7d102355) ) ROM_END ROM_START( sfiiih ) @@ -2680,7 +2681,7 @@ ROM_START( sfiiih ) ROM_LOAD( "sfiii_hispanic.29f400.u2", 0x000000, 0x080000, CRC(d2b3cd48) SHA1(00ebb270c24a66515c97e35331de54ff5358000e) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) + DISK_IMAGE_READONLY( "cap-sf3-3", 0, SHA1(20aa46f8ffeb235205dc95cfd8fba42c7d102355) ) ROM_END @@ -2689,7 +2690,7 @@ ROM_START( sfiii2 ) ROM_LOAD( "sfiii2_usa.29f400.u2", 0x000000, 0x080000, CRC(75dd72e0) SHA1(5a12d6ea6734df5de00ecee6f9ef470749d2f242) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-3ga000", 0, BAD_DUMP SHA1(4e162885b0b3265a56e0265037bcf247e820f027) ) + DISK_IMAGE_READONLY( "cap-3ga000", 0, SHA1(a0c11a5c3057dc1ad3962aa38adf95acb3430bec) ) ROM_END ROM_START( sfiii2j ) @@ -2697,7 +2698,7 @@ ROM_START( sfiii2j ) ROM_LOAD( "sfiii2_japan.29f400.u2", 0x000000, 0x080000, CRC(faea0a3e) SHA1(a03cd63bcf52e4d57f7a598c8bc8e243694624ec) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-3ga000", 0, BAD_DUMP SHA1(4e162885b0b3265a56e0265037bcf247e820f027) ) + DISK_IMAGE_READONLY( "cap-3ga000", 0, SHA1(a0c11a5c3057dc1ad3962aa38adf95acb3430bec) ) ROM_END @@ -2714,7 +2715,7 @@ ROM_START( jojor1 ) ROM_LOAD( "jojo_usa.29f400.u2", 0x000000, 0x080000, CRC(8d40f7be) SHA1(2a4bd83db2f959c33b071e517941aa55a0f919c0) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-jjk-2", 0, BAD_DUMP SHA1(0f5c09171409213e191a607ee89ca3a91fe9c96a) ) + DISK_IMAGE_READONLY( "cap-jjk-2", 0, SHA1(ce22d10f2b35a0e00f8d83642b97842c9b2327fa) ) ROM_END ROM_START( jojor2 ) @@ -2722,7 +2723,7 @@ ROM_START( jojor2 ) ROM_LOAD( "jojo_usa.29f400.u2", 0x000000, 0x080000, CRC(8d40f7be) SHA1(2a4bd83db2f959c33b071e517941aa55a0f919c0) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-jjk000", 0, BAD_DUMP SHA1(09869f6d8c032b527e02d815749dc8fab1289e86) ) + DISK_IMAGE_READONLY( "cap-jjk000", 0, SHA1(a24e174aaaf47f98312a38129645026a613cd344) ) ROM_END ROM_START( jojoj ) @@ -2738,7 +2739,7 @@ ROM_START( jojojr1 ) ROM_LOAD( "jojo_japan.29f400.u2", 0x000000, 0x080000, CRC(02778f60) SHA1(a167f9ebe030592a0cdb0c6a3c75835c6a43be4c) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-jjk-2", 0, BAD_DUMP SHA1(0f5c09171409213e191a607ee89ca3a91fe9c96a) ) + DISK_IMAGE_READONLY( "cap-jjk-2", 0, SHA1(ce22d10f2b35a0e00f8d83642b97842c9b2327fa) ) ROM_END ROM_START( jojojr2 ) @@ -2746,7 +2747,7 @@ ROM_START( jojojr2 ) ROM_LOAD( "jojo_japan.29f400.u2", 0x000000, 0x080000, CRC(02778f60) SHA1(a167f9ebe030592a0cdb0c6a3c75835c6a43be4c) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-jjk000", 0, BAD_DUMP SHA1(09869f6d8c032b527e02d815749dc8fab1289e86) ) + DISK_IMAGE_READONLY( "cap-jjk000", 0, SHA1(a24e174aaaf47f98312a38129645026a613cd344) ) ROM_END @@ -2763,7 +2764,7 @@ ROM_START( sfiii3r1 ) ROM_LOAD( "sfiii3_euro.29f400.u2", 0x000000, 0x080000, CRC(30bbf293) SHA1(f094c2eeaf4f6709060197aca371a4532346bf78) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-33s-1", 0, BAD_DUMP SHA1(2f4a9006a31903114f9f9dc09465ae253e565c51) ) + DISK_IMAGE_READONLY( "cap-33s-1", 0, SHA1(92e146fea751404077919da91f4c5112742627ed) ) ROM_END ROM_START( sfiii3u ) @@ -2779,7 +2780,7 @@ ROM_START( sfiii3ur1 ) ROM_LOAD( "sfiii3_usa.29f400.u2", 0x000000, 0x080000, CRC(ecc545c1) SHA1(e39083820aae914fd8b80c9765129bedb745ceba) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-33s-1", 0, BAD_DUMP SHA1(2f4a9006a31903114f9f9dc09465ae253e565c51) ) + DISK_IMAGE_READONLY( "cap-33s-1", 0, SHA1(92e146fea751404077919da91f4c5112742627ed) ) ROM_END ROM_START( sfiii3j ) @@ -2795,7 +2796,7 @@ ROM_START( sfiii3jr1 ) ROM_LOAD( "sfiii3_japan.29f400.u2", 0x000000, 0x080000, CRC(63f23d1f) SHA1(58559403c325454f8c8d3eb0f569a531aa22db26) ) DISK_REGION( "scsi:1:cdrom" ) - DISK_IMAGE_READONLY( "cap-33s-1", 0, BAD_DUMP SHA1(2f4a9006a31903114f9f9dc09465ae253e565c51) ) + DISK_IMAGE_READONLY( "cap-33s-1", 0, SHA1(92e146fea751404077919da91f4c5112742627ed) ) ROM_END