mirror of
https://github.com/holub/mame
synced 2025-04-23 00:39:36 +03:00
small cleanup
This commit is contained in:
Michaël Banaan Ananas
parent
cb9aab949f
commit
7bbfbe8714
@ -20,32 +20,21 @@
|
||||
#include "sound/msm5205.h"
|
||||
#include "includes/sf.h"
|
||||
|
||||
READ16_MEMBER(sf_state::dummy_r)
|
||||
|
||||
WRITE8_MEMBER(sf_state::sf_coin_w)
|
||||
{
|
||||
return 0xffff;
|
||||
coin_counter_w(machine(), 0, data & 0x01);
|
||||
coin_counter_w(machine(), 1, data & 0x02);
|
||||
coin_lockout_w(machine(), 0, ~data & 0x10);
|
||||
coin_lockout_w(machine(), 1, ~data & 0x20);
|
||||
coin_lockout_w(machine(), 2, ~data & 0x40); /* is there a third coin input? */
|
||||
}
|
||||
|
||||
|
||||
WRITE16_MEMBER(sf_state::sf_coin_w)
|
||||
WRITE8_MEMBER(sf_state::soundcmd_w)
|
||||
{
|
||||
if (ACCESSING_BITS_0_7)
|
||||
{
|
||||
coin_counter_w(machine(), 0, data & 0x01);
|
||||
coin_counter_w(machine(), 1, data & 0x02);
|
||||
coin_lockout_w(machine(), 0, ~data & 0x10);
|
||||
coin_lockout_w(machine(), 1, ~data & 0x20);
|
||||
coin_lockout_w(machine(), 2, ~data & 0x40); /* is there a third coin input? */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
WRITE16_MEMBER(sf_state::soundcmd_w)
|
||||
{
|
||||
if (ACCESSING_BITS_0_7)
|
||||
{
|
||||
soundlatch_byte_w(space, offset, data & 0xff);
|
||||
m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
|
||||
}
|
||||
soundlatch_byte_w(space, offset, data & 0xff);
|
||||
m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
|
||||
}
|
||||
|
||||
|
||||
@ -196,6 +185,7 @@ WRITE8_MEMBER(sf_state::msm2_5205_w)
|
||||
|
||||
|
||||
static ADDRESS_MAP_START( sf_map, AS_PROGRAM, 16, sf_state )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
AM_RANGE(0x000000, 0x04ffff) AM_ROM
|
||||
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_SHARE("videoram")
|
||||
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
|
||||
@ -206,56 +196,58 @@ static ADDRESS_MAP_START( sf_map, AS_PROGRAM, 16, sf_state )
|
||||
AM_RANGE(0xc00008, 0xc00009) AM_READ_PORT("DSW1")
|
||||
AM_RANGE(0xc0000a, 0xc0000b) AM_READ_PORT("DSW2")
|
||||
AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM")
|
||||
AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r)
|
||||
AM_RANGE(0xc00010, 0xc00011) AM_WRITE(sf_coin_w)
|
||||
AM_RANGE(0xc0000e, 0xc0000f) AM_READNOP
|
||||
AM_RANGE(0xc00010, 0xc00011) AM_WRITE8(sf_coin_w, 0x00ff)
|
||||
AM_RANGE(0xc00014, 0xc00015) AM_WRITE(sf_fg_scroll_w)
|
||||
AM_RANGE(0xc00018, 0xc00019) AM_WRITE(sf_bg_scroll_w)
|
||||
AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE(sf_gfxctrl_w)
|
||||
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE(soundcmd_w)
|
||||
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE8(soundcmd_w, 0x00ff)
|
||||
// AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w)
|
||||
AM_RANGE(0xff8000, 0xffdfff) AM_RAM
|
||||
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_SHARE("objectram")
|
||||
ADDRESS_MAP_END
|
||||
|
||||
static ADDRESS_MAP_START( sfus_map, AS_PROGRAM, 16, sf_state )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
AM_RANGE(0x000000, 0x04ffff) AM_ROM
|
||||
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_SHARE("videoram")
|
||||
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
|
||||
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0")
|
||||
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1")
|
||||
AM_RANGE(0xc00004, 0xc00005) AM_READ(dummy_r)
|
||||
AM_RANGE(0xc00006, 0xc00007) AM_READ(dummy_r)
|
||||
AM_RANGE(0xc00004, 0xc00005) AM_READNOP
|
||||
AM_RANGE(0xc00006, 0xc00007) AM_READNOP
|
||||
AM_RANGE(0xc00008, 0xc00009) AM_READ_PORT("DSW1")
|
||||
AM_RANGE(0xc0000a, 0xc0000b) AM_READ_PORT("DSW2")
|
||||
AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM")
|
||||
AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r)
|
||||
AM_RANGE(0xc00010, 0xc00011) AM_WRITE(sf_coin_w)
|
||||
AM_RANGE(0xc0000e, 0xc0000f) AM_READNOP
|
||||
AM_RANGE(0xc00010, 0xc00011) AM_WRITE8(sf_coin_w, 0x00ff)
|
||||
AM_RANGE(0xc00014, 0xc00015) AM_WRITE(sf_fg_scroll_w)
|
||||
AM_RANGE(0xc00018, 0xc00019) AM_WRITE(sf_bg_scroll_w)
|
||||
AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE(sf_gfxctrl_w)
|
||||
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE(soundcmd_w)
|
||||
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE8(soundcmd_w, 0x00ff)
|
||||
// AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w)
|
||||
AM_RANGE(0xff8000, 0xffdfff) AM_RAM
|
||||
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_SHARE("objectram")
|
||||
ADDRESS_MAP_END
|
||||
|
||||
static ADDRESS_MAP_START( sfjp_map, AS_PROGRAM, 16, sf_state )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
AM_RANGE(0x000000, 0x04ffff) AM_ROM
|
||||
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_SHARE("videoram")
|
||||
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
|
||||
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("COINS")
|
||||
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1")
|
||||
AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("P2")
|
||||
AM_RANGE(0xc00006, 0xc00007) AM_READ(dummy_r)
|
||||
AM_RANGE(0xc00006, 0xc00007) AM_READNOP
|
||||
AM_RANGE(0xc00008, 0xc00009) AM_READ_PORT("DSW1")
|
||||
AM_RANGE(0xc0000a, 0xc0000b) AM_READ_PORT("DSW2")
|
||||
AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM")
|
||||
AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r)
|
||||
AM_RANGE(0xc00010, 0xc00011) AM_WRITE(sf_coin_w)
|
||||
AM_RANGE(0xc0000e, 0xc0000f) AM_READNOP
|
||||
AM_RANGE(0xc00010, 0xc00011) AM_WRITE8(sf_coin_w, 0x00ff)
|
||||
AM_RANGE(0xc00014, 0xc00015) AM_WRITE(sf_fg_scroll_w)
|
||||
AM_RANGE(0xc00018, 0xc00019) AM_WRITE(sf_bg_scroll_w)
|
||||
AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE(sf_gfxctrl_w)
|
||||
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE(soundcmd_w)
|
||||
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE8(soundcmd_w, 0x00ff)
|
||||
AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w)
|
||||
AM_RANGE(0xff8000, 0xffdfff) AM_RAM
|
||||
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_SHARE("objectram")
|
||||
@ -794,8 +786,6 @@ GFXDECODE_END
|
||||
|
||||
void sf_state::machine_start()
|
||||
{
|
||||
/* devices */
|
||||
|
||||
save_item(NAME(m_sf_active));
|
||||
save_item(NAME(m_bgscroll));
|
||||
save_item(NAME(m_fgscroll));
|
||||
@ -811,19 +801,17 @@ void sf_state::machine_reset()
|
||||
static MACHINE_CONFIG_START( sf, sf_state )
|
||||
|
||||
/* basic machine hardware */
|
||||
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ? (xtal is 16MHz) */
|
||||
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
|
||||
MCFG_CPU_PROGRAM_MAP(sf_map)
|
||||
MCFG_CPU_VBLANK_INT_DRIVER("screen", sf_state, irq1_line_hold)
|
||||
MCFG_CPU_VBLANK_INT_DRIVER("screen", sf_state, irq1_line_hold)
|
||||
|
||||
MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* ? xtal is 3.579545MHz */
|
||||
MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* ? xtal is 3.579545MHz */
|
||||
MCFG_CPU_PROGRAM_MAP(sound_map)
|
||||
/* NMIs are caused by the main CPU */
|
||||
|
||||
|
||||
MCFG_CPU_ADD("audio2", Z80, 3579545) /* ? xtal is 3.579545MHz */
|
||||
MCFG_CPU_ADD("audio2", Z80, XTAL_3_579545MHz) /* ? xtal is 3.579545MHz */
|
||||
MCFG_CPU_PROGRAM_MAP(sound2_map)
|
||||
MCFG_CPU_IO_MAP(sound2_io_map)
|
||||
MCFG_CPU_PERIODIC_INT_DRIVER(sf_state, irq0_line_hold, 8000)
|
||||
MCFG_CPU_PERIODIC_INT_DRIVER(sf_state, irq0_line_hold, 8000) // ?
|
||||
|
||||
/* video hardware */
|
||||
MCFG_SCREEN_ADD("screen", RASTER)
|
||||
@ -842,7 +830,7 @@ static MACHINE_CONFIG_START( sf, sf_state )
|
||||
/* sound hardware */
|
||||
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
|
||||
|
||||
MCFG_YM2151_ADD("ymsnd", 3579545)
|
||||
MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
|
||||
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
|
||||
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
|
||||
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
|
||||
@ -879,7 +867,7 @@ static MACHINE_CONFIG_DERIVED( sfp, sf )
|
||||
|
||||
/* basic machine hardware */
|
||||
MCFG_CPU_MODIFY("maincpu")
|
||||
MCFG_CPU_VBLANK_INT_DRIVER("screen", sf_state, irq6_line_hold)
|
||||
MCFG_CPU_VBLANK_INT_DRIVER("screen", sf_state, irq6_line_hold)
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
|
||||
@ -906,7 +894,7 @@ ROM_START( sf )
|
||||
ROM_LOAD( "sf-40.bin", 0x060000, 0x020000, CRC(c70b30de) SHA1(26112ee1720b6ad0e2e29e2d25ee2ec76fca0e3a) )
|
||||
|
||||
ROM_REGION( 0x100000, "gfx2", 0 )
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-28.bin", 0x020000, 0x020000, CRC(92f8b91c) SHA1(6d958bc45131810d7b0af02be939ce37a39c35e8) )
|
||||
ROM_LOAD( "sf-30.bin", 0x040000, 0x020000, CRC(b1399856) SHA1(7c956d49b2e73291182ea1ec4cebd3411d1322a1) )
|
||||
ROM_LOAD( "sf-34.bin", 0x060000, 0x020000, CRC(96b6ae2e) SHA1(700e050463b7a29a1eb08007a2add045afdcd8a0) )
|
||||
@ -943,10 +931,10 @@ ROM_START( sf )
|
||||
ROM_LOAD( "sf-33.bin", 0x030000, 0x010000, CRC(3e99d3d5) SHA1(9168a977e80f8c23c6126b9e64eb176290cf941a) )
|
||||
|
||||
ROM_REGION( 0x0320, "proms", 0 )
|
||||
ROM_LOAD( "sfb05(__sf).mb7114h.12k", 0x0000, 0x0100, CRC(75af3553) SHA1(14da009592877a6097b34ea844fa897ceda7465e) ) /* MB7114H */
|
||||
ROM_LOAD( "sfb10(__sf).mb7114h.11h", 0x0100, 0x0100, CRC(c0e56586) SHA1(2abf93aef48af34f869b30f63c130513a97f86a3) ) /* MB7114H */
|
||||
ROM_LOAD( "sfb04(__sf).mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* MB7114H */
|
||||
ROM_LOAD( "sfb00(__sf).mb7051.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* MMI-7603 or MB7051 (equiv to 82s123 32x8 TS) */
|
||||
ROM_LOAD( "sfb05.mb7114h.12k", 0x0000, 0x0100, CRC(75af3553) SHA1(14da009592877a6097b34ea844fa897ceda7465e) ) /* MB7114H */
|
||||
ROM_LOAD( "sfb10.mb7114h.11h", 0x0100, 0x0100, CRC(c0e56586) SHA1(2abf93aef48af34f869b30f63c130513a97f86a3) ) /* MB7114H */
|
||||
ROM_LOAD( "sfb04.mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* MB7114H */
|
||||
ROM_LOAD( "sfb00.mb7051.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* MMI-7603 or MB7051 (equiv to 82s123 32x8 TS) */
|
||||
ROM_END
|
||||
|
||||
ROM_START( sfu )
|
||||
@ -972,7 +960,7 @@ ROM_START( sfu )
|
||||
ROM_LOAD( "sf-40.bin", 0x060000, 0x020000, CRC(c70b30de) SHA1(26112ee1720b6ad0e2e29e2d25ee2ec76fca0e3a) )
|
||||
|
||||
ROM_REGION( 0x100000, "gfx2", 0 )
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-28.bin", 0x020000, 0x020000, CRC(92f8b91c) SHA1(6d958bc45131810d7b0af02be939ce37a39c35e8) )
|
||||
ROM_LOAD( "sf-30.bin", 0x040000, 0x020000, CRC(b1399856) SHA1(7c956d49b2e73291182ea1ec4cebd3411d1322a1) )
|
||||
ROM_LOAD( "sf-34.bin", 0x060000, 0x020000, CRC(96b6ae2e) SHA1(700e050463b7a29a1eb08007a2add045afdcd8a0) )
|
||||
@ -1009,10 +997,10 @@ ROM_START( sfu )
|
||||
ROM_LOAD( "sf-33.bin", 0x030000, 0x010000, CRC(3e99d3d5) SHA1(9168a977e80f8c23c6126b9e64eb176290cf941a) )
|
||||
|
||||
ROM_REGION( 0x0320, "proms", 0 )
|
||||
ROM_LOAD( "mb7114h.12k", 0x0000, 0x0100, CRC(75af3553) SHA1(14da009592877a6097b34ea844fa897ceda7465e) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.11h", 0x0100, 0x0100, CRC(c0e56586) SHA1(2abf93aef48af34f869b30f63c130513a97f86a3) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12k", 0x0000, 0x0100, CRC(75af3553) SHA1(14da009592877a6097b34ea844fa897ceda7465e) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.11h", 0x0100, 0x0100, CRC(c0e56586) SHA1(2abf93aef48af34f869b30f63c130513a97f86a3) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_END
|
||||
|
||||
|
||||
@ -1042,7 +1030,7 @@ ROM_START( sfua )
|
||||
ROM_LOAD( "sf-40.bin", 0x060000, 0x020000, CRC(c70b30de) SHA1(26112ee1720b6ad0e2e29e2d25ee2ec76fca0e3a) )
|
||||
|
||||
ROM_REGION( 0x100000, "gfx2", 0 )
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-28.bin", 0x020000, 0x020000, CRC(92f8b91c) SHA1(6d958bc45131810d7b0af02be939ce37a39c35e8) )
|
||||
ROM_LOAD( "sf-30.bin", 0x040000, 0x020000, CRC(b1399856) SHA1(7c956d49b2e73291182ea1ec4cebd3411d1322a1) )
|
||||
ROM_LOAD( "sf-34.bin", 0x060000, 0x020000, CRC(96b6ae2e) SHA1(700e050463b7a29a1eb08007a2add045afdcd8a0) )
|
||||
@ -1079,10 +1067,10 @@ ROM_START( sfua )
|
||||
ROM_LOAD( "sf-33.bin", 0x030000, 0x010000, CRC(3e99d3d5) SHA1(9168a977e80f8c23c6126b9e64eb176290cf941a) )
|
||||
|
||||
ROM_REGION( 0x0320, "proms", 0 )
|
||||
ROM_LOAD( "sfb05.bin", 0x0000, 0x0100, CRC(864199ad) SHA1(b777df20b19fa7b7536120191df1875101e9d7af) ) /* unknown */
|
||||
ROM_LOAD( "sfb00.bin", 0x0100, 0x0100, CRC(bd3f8c5d) SHA1(c31ee9f466f05a21612f5ea29fb8c7c25dc9e011) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_LOAD( "sfb05.bin", 0x0000, 0x0100, CRC(864199ad) SHA1(b777df20b19fa7b7536120191df1875101e9d7af) ) /* unknown */
|
||||
ROM_LOAD( "sfb00.bin", 0x0100, 0x0100, CRC(bd3f8c5d) SHA1(c31ee9f466f05a21612f5ea29fb8c7c25dc9e011) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_END
|
||||
|
||||
|
||||
@ -1112,7 +1100,7 @@ ROM_START( sfj )
|
||||
ROM_LOAD( "sf-40.bin", 0x060000, 0x020000, CRC(c70b30de) SHA1(26112ee1720b6ad0e2e29e2d25ee2ec76fca0e3a) )
|
||||
|
||||
ROM_REGION( 0x100000, "gfx2", 0 )
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-25.bin", 0x000000, 0x020000, CRC(7f23042e) SHA1(a355fd7047fb1a71ab5cd08e1afd82c2558494c1) ) /* Background m planes 0-1 */
|
||||
ROM_LOAD( "sf-28.bin", 0x020000, 0x020000, CRC(92f8b91c) SHA1(6d958bc45131810d7b0af02be939ce37a39c35e8) )
|
||||
ROM_LOAD( "sf-30.bin", 0x040000, 0x020000, CRC(b1399856) SHA1(7c956d49b2e73291182ea1ec4cebd3411d1322a1) )
|
||||
ROM_LOAD( "sf-34.bin", 0x060000, 0x020000, CRC(96b6ae2e) SHA1(700e050463b7a29a1eb08007a2add045afdcd8a0) )
|
||||
@ -1149,10 +1137,10 @@ ROM_START( sfj )
|
||||
ROM_LOAD( "sf-33.bin", 0x030000, 0x010000, CRC(3e99d3d5) SHA1(9168a977e80f8c23c6126b9e64eb176290cf941a) )
|
||||
|
||||
ROM_REGION( 0x0320, "proms", 0 )
|
||||
ROM_LOAD( "sfb05.bin", 0x0000, 0x0100, CRC(864199ad) SHA1(b777df20b19fa7b7536120191df1875101e9d7af) ) /* unknown */
|
||||
ROM_LOAD( "sfb00.bin", 0x0100, 0x0100, CRC(bd3f8c5d) SHA1(c31ee9f466f05a21612f5ea29fb8c7c25dc9e011) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_LOAD( "sfb05.bin", 0x0000, 0x0100, CRC(864199ad) SHA1(b777df20b19fa7b7536120191df1875101e9d7af) ) /* unknown */
|
||||
ROM_LOAD( "sfb00.bin", 0x0100, 0x0100, CRC(bd3f8c5d) SHA1(c31ee9f466f05a21612f5ea29fb8c7c25dc9e011) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_END
|
||||
|
||||
|
||||
@ -1214,16 +1202,16 @@ ROM_START( sfp )
|
||||
ROM_LOAD( "ms1j18.5g", 0x030000, 0x010000, CRC(89e35dc1) SHA1(368d0cce3bc39b3762d79df0c023242018fbbcb8) )
|
||||
|
||||
ROM_REGION( 0x0320, "proms", 0 )
|
||||
ROM_LOAD( "sfb05.bin", 0x0000, 0x0100, CRC(864199ad) SHA1(b777df20b19fa7b7536120191df1875101e9d7af) ) /* unknown */
|
||||
ROM_LOAD( "sfb00.bin", 0x0100, 0x0100, CRC(bd3f8c5d) SHA1(c31ee9f466f05a21612f5ea29fb8c7c25dc9e011) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_LOAD( "sfb05.bin", 0x0000, 0x0100, CRC(864199ad) SHA1(b777df20b19fa7b7536120191df1875101e9d7af) ) /* unknown */
|
||||
ROM_LOAD( "sfb00.bin", 0x0100, 0x0100, CRC(bd3f8c5d) SHA1(c31ee9f466f05a21612f5ea29fb8c7c25dc9e011) ) /* unknown */
|
||||
ROM_LOAD( "mb7114h.12j", 0x0200, 0x0100, CRC(4c734b64) SHA1(7a122b643bad3e3586821980efff023a63e5a029) ) /* unknown */
|
||||
ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */
|
||||
ROM_END
|
||||
|
||||
|
||||
|
||||
GAME( 1987, sf, 0, sf, sf, driver_device, 0, ROT0, "Capcom", "Street Fighter (World, Analog buttons)", GAME_SUPPORTS_SAVE )
|
||||
GAME( 1987, sf, 0, sf, sf, driver_device, 0, ROT0, "Capcom", "Street Fighter (World, Analog buttons)", GAME_SUPPORTS_SAVE )
|
||||
GAME( 1987, sfu, sf, sfus, sfus, driver_device, 0, ROT0, "Capcom", "Street Fighter (US, set 1)", GAME_SUPPORTS_SAVE ) // Shows Capcom copyright
|
||||
GAME( 1987, sfua, sf, sfjp, sfjp, driver_device, 0, ROT0, "Capcom", "Street Fighter (US, set 2) (protected)", GAME_SUPPORTS_SAVE ) // Shows Capcom USA copyright
|
||||
GAME( 1987, sfj, sf, sfjp, sfjp, driver_device, 0, ROT0, "Capcom", "Street Fighter (Japan) (protected)", GAME_SUPPORTS_SAVE )
|
||||
GAME( 1987, sfp, sf, sfp, sf, driver_device, 0, ROT0, "Capcom", "Street Fighter (prototype)", GAME_SUPPORTS_SAVE )
|
||||
GAME( 1987, sfp, sf, sfp, sf, driver_device, 0, ROT0, "Capcom", "Street Fighter (prototype)", GAME_SUPPORTS_SAVE )
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/***************************************************************************
|
||||
|
||||
Super Dodgeball / Nekketsu Koukou Dodgeball Bu
|
||||
Super Dodge Ball / Nekketsu Koukou Dodgeball Bu
|
||||
|
||||
briver by Paul Hampson and Nicola Salmoria
|
||||
|
||||
@ -238,22 +238,12 @@ WRITE8_MEMBER(spdodgeb_state::mcu63701_w)
|
||||
}
|
||||
|
||||
|
||||
READ8_MEMBER(spdodgeb_state::port_0_r)
|
||||
{
|
||||
int port = ioport("IN0")->read();
|
||||
|
||||
m_toggle^=0x02; /* mcu63701_busy flag */
|
||||
|
||||
return (port | m_toggle);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static ADDRESS_MAP_START( spdodgeb_map, AS_PROGRAM, 8, spdodgeb_state )
|
||||
AM_RANGE(0x0000, 0x0fff) AM_RAM
|
||||
AM_RANGE(0x1000, 0x10ff) AM_WRITEONLY AM_SHARE("spriteram")
|
||||
AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(spdodgeb_videoram_w) AM_SHARE("videoram")
|
||||
AM_RANGE(0x3000, 0x3000) AM_READ(port_0_r) //AM_WRITENOP
|
||||
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("IN0") //AM_WRITENOP
|
||||
AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW") //AM_WRITENOP
|
||||
AM_RANGE(0x3002, 0x3002) AM_WRITE(sound_command_w)
|
||||
// AM_RANGE(0x3003, 0x3003) AM_WRITENOP
|
||||
@ -275,10 +265,16 @@ static ADDRESS_MAP_START( spdodgeb_sound_map, AS_PROGRAM, 8, spdodgeb_state )
|
||||
ADDRESS_MAP_END
|
||||
|
||||
|
||||
CUSTOM_INPUT_MEMBER(spdodgeb_state::mcu63705_busy_r)
|
||||
{
|
||||
m_toggle ^= 0x01;
|
||||
return m_toggle;
|
||||
}
|
||||
|
||||
static INPUT_PORTS_START( spdodgeb )
|
||||
PORT_START("IN0")
|
||||
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen")
|
||||
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* mcu63701_busy flag */
|
||||
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, spdodgeb_state, mcu63705_busy_r, NULL) /* mcu63701_busy flag */
|
||||
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
|
||||
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
|
||||
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
|
||||
@ -404,16 +400,16 @@ void spdodgeb_state::machine_reset()
|
||||
static MACHINE_CONFIG_START( spdodgeb, spdodgeb_state )
|
||||
|
||||
/* basic machine hardware */
|
||||
MCFG_CPU_ADD("maincpu", M6502,12000000/6) /* 2MHz ? */
|
||||
MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/6) /* 2MHz ? */
|
||||
MCFG_CPU_PROGRAM_MAP(spdodgeb_map)
|
||||
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", spdodgeb_state, spdodgeb_interrupt, "screen", 0, 1) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */
|
||||
|
||||
MCFG_CPU_ADD("audiocpu", M6809,12000000/6) /* 2MHz ? */
|
||||
MCFG_CPU_ADD("audiocpu", M6809, XTAL_12MHz/6) /* 2MHz ? */
|
||||
MCFG_CPU_PROGRAM_MAP(spdodgeb_sound_map)
|
||||
|
||||
/* video hardware */
|
||||
MCFG_SCREEN_ADD("screen", RASTER)
|
||||
MCFG_SCREEN_RAW_PARAMS(12000000/2, 384, 0, 256, 272, 0, 240)
|
||||
MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 384, 0, 256, 272, 0, 240)
|
||||
MCFG_SCREEN_UPDATE_DRIVER(spdodgeb_state, screen_update_spdodgeb)
|
||||
MCFG_SCREEN_PALETTE("palette")
|
||||
|
||||
@ -421,11 +417,10 @@ static MACHINE_CONFIG_START( spdodgeb, spdodgeb_state )
|
||||
MCFG_PALETTE_ADD("palette", 1024)
|
||||
MCFG_PALETTE_INIT_OWNER(spdodgeb_state, spdodgeb)
|
||||
|
||||
|
||||
/* sound hardware */
|
||||
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
|
||||
|
||||
MCFG_SOUND_ADD("ymsnd", YM3812, 3000000)
|
||||
MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz/4)
|
||||
MCFG_YM3812_IRQ_HANDLER(WRITELINE(spdodgeb_state, irqhandler))
|
||||
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
|
||||
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
/*************************************************************************
|
||||
|
||||
Street Fighter
|
||||
Street Fighter hardware
|
||||
|
||||
*************************************************************************/
|
||||
|
||||
#include "sound/msm5205.h"
|
||||
|
||||
class sf_state : public driver_device
|
||||
@ -10,34 +11,38 @@ class sf_state : public driver_device
|
||||
public:
|
||||
sf_state(const machine_config &mconfig, device_type type, const char *tag)
|
||||
: driver_device(mconfig, type, tag),
|
||||
m_videoram(*this, "videoram"),
|
||||
m_objectram(*this, "objectram"),
|
||||
m_maincpu(*this, "maincpu"),
|
||||
m_audiocpu(*this, "audiocpu"),
|
||||
m_msm1(*this, "msm1"),
|
||||
m_msm2(*this, "msm2"),
|
||||
m_gfxdecode(*this, "gfxdecode"),
|
||||
m_palette(*this, "palette"){ }
|
||||
|
||||
/* memory pointers */
|
||||
required_shared_ptr<UINT16> m_videoram;
|
||||
required_shared_ptr<UINT16> m_objectram;
|
||||
// UINT16 * m_paletteram; // currently this uses generic palette handling
|
||||
|
||||
/* video-related */
|
||||
tilemap_t *m_bg_tilemap;
|
||||
tilemap_t *m_fg_tilemap;
|
||||
tilemap_t *m_tx_tilemap;
|
||||
int m_sf_active;
|
||||
UINT16 m_bgscroll;
|
||||
UINT16 m_fgscroll;
|
||||
m_palette(*this, "palette"),
|
||||
m_videoram(*this, "videoram"),
|
||||
m_objectram(*this, "objectram")
|
||||
{ }
|
||||
|
||||
/* devices */
|
||||
required_device<cpu_device> m_maincpu;
|
||||
required_device<cpu_device> m_audiocpu;
|
||||
DECLARE_READ16_MEMBER(dummy_r);
|
||||
DECLARE_WRITE16_MEMBER(sf_coin_w);
|
||||
DECLARE_WRITE16_MEMBER(soundcmd_w);
|
||||
required_device<msm5205_device> m_msm1;
|
||||
required_device<msm5205_device> m_msm2;
|
||||
required_device<gfxdecode_device> m_gfxdecode;
|
||||
required_device<palette_device> m_palette;
|
||||
|
||||
/* memory pointers */
|
||||
required_shared_ptr<UINT16> m_videoram;
|
||||
required_shared_ptr<UINT16> m_objectram;
|
||||
|
||||
/* video-related */
|
||||
tilemap_t *m_bg_tilemap;
|
||||
tilemap_t *m_fg_tilemap;
|
||||
tilemap_t *m_tx_tilemap;
|
||||
int m_sf_active;
|
||||
UINT16 m_bgscroll;
|
||||
UINT16 m_fgscroll;
|
||||
|
||||
DECLARE_WRITE8_MEMBER(sf_coin_w);
|
||||
DECLARE_WRITE8_MEMBER(soundcmd_w);
|
||||
DECLARE_WRITE16_MEMBER(protection_w);
|
||||
DECLARE_READ16_MEMBER(button1_r);
|
||||
DECLARE_READ16_MEMBER(button2_r);
|
||||
@ -58,8 +63,4 @@ public:
|
||||
inline int sf_invert( int nb );
|
||||
void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect );
|
||||
void write_dword( address_space &space, offs_t offset, UINT32 data );
|
||||
required_device<msm5205_device> m_msm1;
|
||||
required_device<msm5205_device> m_msm2;
|
||||
required_device<gfxdecode_device> m_gfxdecode;
|
||||
required_device<palette_device> m_palette;
|
||||
};
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
/*************************************************************************
|
||||
|
||||
Super Dodge Ball hardware
|
||||
|
||||
*************************************************************************/
|
||||
|
||||
#include "sound/msm5205.h"
|
||||
|
||||
class spdodgeb_state : public driver_device
|
||||
@ -45,7 +51,6 @@ public:
|
||||
DECLARE_WRITE8_MEMBER(spd_adpcm_w);
|
||||
DECLARE_READ8_MEMBER(mcu63701_r);
|
||||
DECLARE_WRITE8_MEMBER(mcu63701_w);
|
||||
DECLARE_READ8_MEMBER(port_0_r);
|
||||
DECLARE_WRITE8_MEMBER(spdodgeb_scrollx_lo_w);
|
||||
DECLARE_WRITE8_MEMBER(spdodgeb_ctrl_w);
|
||||
DECLARE_WRITE8_MEMBER(spdodgeb_videoram_w);
|
||||
@ -58,6 +63,7 @@ public:
|
||||
TIMER_DEVICE_CALLBACK_MEMBER(spdodgeb_interrupt);
|
||||
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
|
||||
void mcu63705_update_inputs();
|
||||
DECLARE_CUSTOM_INPUT_MEMBER(mcu63705_busy_r);
|
||||
DECLARE_WRITE_LINE_MEMBER(irqhandler);
|
||||
void spd_adpcm_int(msm5205_device *device, int chip);
|
||||
DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_1);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user