Merge pull request #4003 from DavidHaywood/150918

fix finalap3 regression, use correct slave roms for fourtraxa (nw)
This commit is contained in:
ajrhacker 2018-09-15 16:56:36 -04:00 committed by GitHub
commit 9c494531a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1449,6 +1449,12 @@ static INPUT_PORTS_START( luckywld )
NAMCOS2_MCU_DIPSW_DEFAULT
NAMCOS2_MCU_DIAL_DEFAULT
PORT_MODIFY("DSW")
// this applies to both the World and Japan sets
PORT_DIPNAME( 0x40, 0x40, "Show Winners Don't Use Drugs")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
INPUT_PORTS_END
static INPUT_PORTS_START( sgunner )
@ -2055,6 +2061,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::finalap3)
finallap_c68(config);
m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcos2_state::TilemapCB_finalap2, this));
MCFG_VIDEO_START_OVERRIDE(namcos2_state, finalap2)
MACHINE_CONFIG_END
@ -3895,17 +3904,25 @@ ROM_START( fourtraxj )
ROM_LOAD( "fx_voi-1.3m", 0x000000, 0x080000, CRC(6173364f) SHA1(cc426f49b7e87b11f1f51e8e10db7cad87ffb44d) )
ROM_END
// this is a strange, it's based on the fx2 set, but with one of the 68k pair modified (21 bytes changed) and a unique GFX rom?
// changes seem to be related to the trackside advertising banners
/* This is a strange set, it's based on the fx2 set, but with one of the 68k pair modified (21 bytes changed) and a unique GFX ROM
Changes seem to be related to the trackside advertising banners. This was around the same time Super Monaco GP was forced to
remove 'real' advertising banners, so could be related.
The changed graphic ROM has tiles for an additional 'awaiting entry' screen, but it is unclear where they are used,
the same tiles in the fx2 set are blank, assuming that one isn't a bad dump.
Previous dumps of the program / sub CPUs were 0x00 filled instead of 0xff filled in the 2nd half due to a dumping error
*/
ROM_START( fourtraxa )
ROM_REGION( 0x040000, "maincpu", 0 ) /* Master CPU */
// the old dump of this set only differed in having a 0x00 fill in the 2nd half instead of a 0xff fill
ROM_LOAD16_BYTE( "fx4_mp0a.11d", 0x000000, 0x020000, CRC(f147cd6b) SHA1(7cdadd68d55dd8fa9b19cbee1434d9266ae1f4b9) ) // == fx2_mp0.11d
ROM_LOAD16_BYTE( "fx4_mp1a.13d", 0x000001, 0x020000, CRC(d1138c85) SHA1(32bf68ae36f72b84f3c3df28425147b6aaac1edf) )
ROM_REGION( 0x040000, "slave", 0 ) /* Slave CPU */
ROM_LOAD16_BYTE( "fx1_sp0.11k", 0x000000, 0x020000, CRC(41687edd) SHA1(1e79dc9abe5614f836e89b376be1dc70deaac889) )
ROM_LOAD16_BYTE( "fx1_sp1.13k", 0x000001, 0x020000, CRC(dbbae326) SHA1(6743054f7796bd5b1d24fa9cf0095544420b2c76) )
ROM_LOAD16_BYTE( "fx1_sp0.11k", 0x000000, 0x020000, CRC(48548e78) SHA1(b3a9de8682fe63c1c3ecab3e3f9380a884efd4af) ) // same content as fx2 set, different label
ROM_LOAD16_BYTE( "fx1_sp1.13k", 0x000001, 0x020000, CRC(d2861383) SHA1(36be5a8c8a19f35f9a9bd3ef725a83c5e58ccbe0) ) // same content as fx2 set, different label
ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU (Banked) */
ROM_LOAD( "fx1_sd0.7j", 0x000000, 0x020000, CRC(acccc934) SHA1(98f1a823ba7e3f258a73d5780953f9339d438e1a) )