diff options
author | 2016-06-29 20:24:44 +1000 | |
---|---|---|
committer | 2016-06-29 20:24:44 +1000 | |
commit | d464963202d6fac34b687f232a42a1d3353630c2 (patch) | |
tree | e4281c2e2b2832b005ca866db5f901f28e507139 | |
parent | afef8430619718d39dd7906a9342fe3bd06b6225 (diff) |
0.175 Release fileshbmame175
69 files changed, 1742 insertions, 828 deletions
diff --git a/docs/release/docs/config.txt b/docs/release/docs/config.txt index 54169a32ae2..1b4c5e2ad62 100644 --- a/docs/release/docs/config.txt +++ b/docs/release/docs/config.txt @@ -876,17 +876,20 @@ Core screen options Core vector options ------------------- --[no]antialias / -[no]aa +-beam_width_min <value> +-beam_width_max <value> - Enables antialiased line rendering for vector games. The default is ON - (-antialias). + Sets the minimum and maximum width of the vectors. This is a scaling factor + against the standard vector width, which is interpolated between minimum and + maximum according to the beam's intensity. A value of 1.0 will keep the default + vector line width. Smaller values will reduce the width, and larger values + will increase the width. The default is 1.0. --beam <width> +-beam_intensity_weight <value> - Sets the width of the vectors. This is a scaling factor against the - standard vector width. A value of 1.0 will keep the default vector - line width. Smaller values will reduce the width, and larger values - will increase the width. The default is 1.0. + Applies an exponential weight to the minimum and maximum beam width. For positive + values the interpolated scaling factor will affect lines with higher intensity + more than lines with lower intensity. The default is 0.0. -flicker <value> diff --git a/docs/release/docs/hlsl.txt b/docs/release/docs/hlsl.txt index 99660645bf3..34e2d9aacca 100644 --- a/docs/release/docs/hlsl.txt +++ b/docs/release/docs/hlsl.txt @@ -97,6 +97,7 @@ yiq_phase_count 2 Phase Count value for NTSC signal proces Vector Post-Processing Options ------------------------------ Name Default Values Description +vector_beam_smooth 0.0 The vector beam smoothness. (0.00 to 1.00) vector_length_scale 0.5 The maximum vector attenuation. (0.00 to 1.00) vector_length_ratio 0.5 The minimum vector length (vector length to screen size ratio) that is affected by the attenuation (0.000 to 1.000) @@ -115,7 +116,7 @@ bloom_lvl3_weight 0.16 Bloom level 3 weight. (1/4 smaller that bloom_lvl4_weight 0.08 Bloom level 4 weight. (1/4 smaller that level 3 target) (0.00 to 1.00) bloom_lvl5_weight 0.06 Bloom level 5 weight. (1/4 smaller that level 4 target) (0.00 to 1.00) bloom_lvl6_weight 0.04 Bloom level 6 weight. (1/4 smaller that level 5 target) (0.00 to 1.00) -bloom_lvl7_weight 0.02 Bloom level 7 weight. (1/4 smaller that level 6 target) +bloom_lvl7_weight 0.02 Bloom level 7 weight. (1/4 smaller that level 6 target) (0.00 to 1.00) bloom_lvl8_weight 0.01 Bloom level 8 weight. (1/4 smaller that level 7 target) (0.00 to 1.00) diff --git a/docs/release/hbmame174s.rar b/docs/release/hbmame174s.rar Binary files differdeleted file mode 100644 index 8636ce6f1bb..00000000000 --- a/docs/release/hbmame174s.rar +++ /dev/null diff --git a/docs/release/hbmame175s.rar b/docs/release/hbmame175s.rar Binary files differnew file mode 100644 index 00000000000..718d4d9d842 --- /dev/null +++ b/docs/release/hbmame175s.rar diff --git a/docs/release/scripts/extlib.lua b/docs/release/scripts/extlib.lua index 9d60fe1dc2e..e4e3b7cce46 100644 --- a/docs/release/scripts/extlib.lua +++ b/docs/release/scripts/extlib.lua @@ -10,7 +10,6 @@ local extlibs = { zlib = { "z", "3rdparty/zlib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, flac = { "FLAC", "3rdparty/libflac/include" }, - sqlite3 = { "sqlite3", "3rdparty/sqlite3" }, portmidi = { "portmidi", "3rdparty/portmidi/pm_common" }, portaudio = { "portaudio", "3rdparty/portaudio/include" }, lua = { "lua", "3rdparty/lua/src" }, @@ -39,11 +38,6 @@ newoption { } newoption { - trigger = 'with-system-sqlite3', - description = 'Use system SQLite library', -} - -newoption { trigger = 'with-system-portmidi', description = 'Use system PortMidi library', } diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index cfb30ed95d8..903d77ce3ed 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -350,15 +350,6 @@ newoption { } newoption { - trigger = "IGNORE_GIT", - description = "Ignore usage of git command in build process", - allowed = { - { "0", "Do not ignore" }, - { "1", "Ingore" }, - }, -} - -newoption { trigger = "SOURCES", description = "List of sources to compile.", } @@ -521,7 +512,7 @@ if (_OPTIONS["SOURCES"] == nil) then dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) end -configuration { "gmake" } +configuration { "gmake or ninja" } flags { "SingleOutputDir", } @@ -681,7 +672,7 @@ end "LUA_COMPAT_5_2", } - if _ACTION == "gmake" then + if _ACTION == "gmake" or _ACTION == "ninja" then --we compile C-only to C99 standard with GNU extensions @@ -714,7 +705,7 @@ end -- this speeds it up a bit by piping between the preprocessor/compiler/assembler if not ("pnacl" == _OPTIONS["gcc"]) then buildoptions { - "--pipe", + "-pipe", } end -- add -g if we need symbols, and ensure we have frame pointers @@ -1119,6 +1110,7 @@ configuration { "mingw*" } "-static-libgcc", "-static-libstdc++", "-static", + "-Wl,--start-group", } links { "user32", @@ -1265,7 +1257,7 @@ end includedirs { MAME_DIR .. "3rdparty/dxsdk/Include" } -configuration { "vs2015" } +configuration { "vs2015*" } buildoptions { "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 664898d114e..d8e6c9e2fff 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -60,7 +60,7 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end - configuration { "vs2015" } + configuration { "vs2015*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } @@ -88,7 +88,7 @@ project "zlib" local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then - configuration { "gmake" } + configuration { "gmake or ninja" } if (version >= 30700) then buildoptions { "-Wno-shift-negative-value", @@ -113,7 +113,7 @@ end "verbose=-1", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", } @@ -284,7 +284,7 @@ end "-include stdint.h" } - configuration { "vs2015" } + configuration { "vs2015*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } @@ -299,7 +299,7 @@ end "HAVE_CONFIG_H=1", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-unused-function", "-O0", @@ -352,7 +352,7 @@ project "7z" uuid "ad573d62-e76a-4b11-ae34-5110a6789a42" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-undef", "-Wno-strict-prototypes", @@ -372,7 +372,7 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end - configuration { "vs2015" } + configuration { "vs2015*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter @@ -439,14 +439,14 @@ project "lua" -- uncomment the options below to -- compile using c++. Do the same - -- in lsqlite3. + -- in lualibs. -- In addition comment out the "extern "C"" -- in lua.hpp and do the same in luaengine.c line 47 --options { -- "ForceCPP", --} - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-bad-function-cast" } @@ -558,75 +558,14 @@ project "lualibs" includedirs { ext_includedir("lua"), ext_includedir("zlib"), - ext_includedir("sqlite3"), } files { - MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", } -------------------------------------------------- --- SQLite3 library objects --------------------------------------------------- - -if not _OPTIONS["with-system-sqlite3"] then -project "sqlite3" - uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" - kind "StaticLib" - - configuration { "vs*" } - buildoptions { - "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data - "/wd4127", -- warning C4127: conditional expression is constant - "/wd4232", -- warning C4232: nonstandard extension used : 'xxx' : address of dllimport 'xxx' is not static, identity not guaranteed - "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter - "/wd4706", -- warning C4706: assignment within conditional expression - } -if _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - } -end - configuration { "pnacl" } - defines { - "SQLITE_OMIT_LOAD_EXTENSION", - } - configuration { "vs2015" } - buildoptions { - "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration - } - - - configuration { "gmake" } - buildoptions_c { - "-Wno-bad-function-cast", - "-Wno-undef", - } - - local version = str_to_version(_OPTIONS["gcc_version"]) - if _OPTIONS["gcc"]~=nil and not string.find(_OPTIONS["gcc"], "clang") then - if (version >= 40800) then - buildoptions_c { - "-Wno-array-bounds", - } - end - end - - configuration { } - - files { - MAME_DIR .. "3rdparty/sqlite3/sqlite3.c", - } -else -links { - ext_lib("sqlite3"), -} -end - --------------------------------------------------- -- portmidi library objects -------------------------------------------------- if _OPTIONS["NO_USE_MIDI"]~="1" then @@ -656,7 +595,7 @@ if _OPTIONS["vs"]=="intel-15" then } end - configuration { "vs2015" } + configuration { "vs2015*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } @@ -778,7 +717,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-uninitialized", "-Wno-unused-function", @@ -811,6 +750,8 @@ end if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then buildoptions { "-Wno-switch", + } + buildoptions_cpp { "-Wno-unknown-pragmas", } end @@ -854,15 +795,12 @@ end MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/ocornut_imgui.cpp", - MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/scintilla.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp", MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbuffercompression.cpp", MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbufferdecompression.cpp", MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp", - MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_demo.cpp", MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp", - MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_node_graph_test.cpp", MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_wm.cpp", } if _OPTIONS["targetos"]=="macosx" then @@ -876,155 +814,155 @@ end -------------------------------------------------- -- PortAudio library objects -------------------------------------------------- - -if not _OPTIONS["with-system-portaudio"] then -project "portaudio" - uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" - kind "StaticLib" - - configuration { "vs*" } - buildoptions { - "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch - "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data - "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter - "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch - "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced - "/wd4127", -- warning C4127: conditional expression is constant - } -if _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated - "/Qwd2544", -- message #2544: empty dependent statement in if-statement - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - } -end - configuration { "vs2015" } - buildoptions { - "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration - } - - configuration { "gmake" } - buildoptions_c { - "-Wno-strict-prototypes", - "-Wno-bad-function-cast", - "-Wno-undef", - "-Wno-missing-braces", - "-Wno-unused-variable", - "-Wno-unused-value", - "-Wno-unused-function", - "-Wno-unknown-pragmas", - } - - local version = str_to_version(_OPTIONS["gcc_version"]) - if (_OPTIONS["gcc"]~=nil) then - if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then - buildoptions_c { - "-Wno-unknown-warning-option", - "-Wno-absolute-value", - "-Wno-unused-but-set-variable", - "-Wno-maybe-uninitialized", - "-Wno-sometimes-uninitialized", - } - else - if (version >= 40600) then - buildoptions_c { - "-Wno-unused-but-set-variable", - "-Wno-maybe-uninitialized", - "-Wno-sometimes-uninitialized", - } - end - end - end - configuration { "vs*" } - buildoptions { - "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer - "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used - } - - configuration { } - - includedirs { - MAME_DIR .. "3rdparty/portaudio/include", - MAME_DIR .. "3rdparty/portaudio/src/common", - } - - files { - MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c", - } - - if _OPTIONS["targetos"]=="windows" then - defines { - "PA_USE_DS=1", - "PA_USE_WDMKS=1", - "PA_USE_WMME=1", - } - includedirs { - MAME_DIR .. "3rdparty/portaudio/src/os/win", - } - - configuration { } - files { - MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c", - MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c", - MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c", - MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c", - MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c", - } - - end - if _OPTIONS["targetos"]=="linux" then - defines { - "PA_USE_ALSA=1", - "PA_USE_OSS=1", - "HAVE_LINUX_SOUNDCARD_H", - } - includedirs { - MAME_DIR .. "3rdparty/portaudio/src/os/unix", - } - files { - MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", - MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c", - } - end - if _OPTIONS["targetos"]=="macosx" then - defines { - "PA_USE_COREAUDIO=1", - } - includedirs { - MAME_DIR .. "3rdparty/portaudio/src/os/unix", - } - files { - MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", - MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c", - MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", - } - end - -else -links { - ext_lib("portaudio"), -} -end +-- +--if not _OPTIONS["with-system-portaudio"] then +--project "portaudio" +-- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" +-- kind "StaticLib" +-- +-- configuration { "vs*" } +-- buildoptions { +-- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch +-- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data +-- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter +-- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch +-- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced +-- "/wd4127", -- warning C4127: conditional expression is constant +-- } +--if _OPTIONS["vs"]=="intel-15" then +-- buildoptions { +-- "/Qwd869", -- remark #869: parameter "xxx" was never referenced +-- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated +-- "/Qwd2544", -- message #2544: empty dependent statement in if-statement +-- "/Qwd1879", -- warning #1879: unimplemented pragma ignored +-- } +--end +-- configuration { "vs2015*" } +-- buildoptions { +-- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration +-- } +-- +-- configuration { "gmake or ninja" } +-- buildoptions_c { +-- "-Wno-strict-prototypes", +-- "-Wno-bad-function-cast", +-- "-Wno-undef", +-- "-Wno-missing-braces", +-- "-Wno-unused-variable", +-- "-Wno-unused-value", +-- "-Wno-unused-function", +-- "-Wno-unknown-pragmas", +-- } +-- +-- local version = str_to_version(_OPTIONS["gcc_version"]) +-- if (_OPTIONS["gcc"]~=nil) then +-- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then +-- buildoptions_c { +-- "-Wno-unknown-warning-option", +-- "-Wno-absolute-value", +-- "-Wno-unused-but-set-variable", +-- "-Wno-maybe-uninitialized", +-- "-Wno-sometimes-uninitialized", +-- } +-- else +-- if (version >= 40600) then +-- buildoptions_c { +-- "-Wno-unused-but-set-variable", +-- "-Wno-maybe-uninitialized", +-- "-Wno-sometimes-uninitialized", +-- } +-- end +-- end +-- end +-- configuration { "vs*" } +-- buildoptions { +-- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer +-- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used +-- } +-- +-- configuration { } +-- +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/include", +-- MAME_DIR .. "3rdparty/portaudio/src/common", +-- } +-- +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c", +-- } +-- +-- if _OPTIONS["targetos"]=="windows" then +-- defines { +-- "PA_USE_DS=1", +-- "PA_USE_WDMKS=1", +-- "PA_USE_WMME=1", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/win", +-- } +-- +-- configuration { } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c", +-- } +-- +-- end +-- if _OPTIONS["targetos"]=="linux" then +-- defines { +-- "PA_USE_ALSA=1", +-- "PA_USE_OSS=1", +-- "HAVE_LINUX_SOUNDCARD_H", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix", +-- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c", +-- } +-- end +-- if _OPTIONS["targetos"]=="macosx" then +-- defines { +-- "PA_USE_COREAUDIO=1", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix", +-- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", +-- } +-- end +-- +--else +--links { +-- ext_lib("portaudio"), +--} +--end -------------------------------------------------- -- libuv library objects @@ -1041,7 +979,7 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/win", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", "-Wno-bad-function-cast", @@ -1230,29 +1168,7 @@ project "uv" } end end --------------------------------------------------- --- HTTP parser library objects --------------------------------------------------- -project "http-parser" - uuid "90c6ba59-bdb2-4fee-8b44-57601d690e14" - kind "StaticLib" - - configuration { } - - files { - MAME_DIR .. "3rdparty/http-parser/http_parser.c", - } - if (_OPTIONS["SHADOW_CHECK"]=="1") then - removebuildoptions { - "-Wshadow" - } - end - -else -links { - ext_lib("uv"), -} end -------------------------------------------------- -- SDL2 library diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index 3da1e88cb3c..5fdd355a955 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -576,6 +576,19 @@ end --------------------------------------------------- -- +--@src/devices/bus/electron/exp.h,BUSES["ELECTRON"] = true +--------------------------------------------------- + +if (BUSES["ELECTRON"]~=null) then + files { + MAME_DIR .. "src/devices/bus/electron/exp.cpp", + MAME_DIR .. "src/devices/bus/electron/exp.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/ep64/exp.h,BUSES["EP64"] = true --------------------------------------------------- @@ -1047,6 +1060,8 @@ if (BUSES["PET"]~=null) then MAME_DIR .. "src/devices/bus/pet/petuja.h", MAME_DIR .. "src/devices/bus/pet/cb2snd.cpp", MAME_DIR .. "src/devices/bus/pet/cb2snd.h", + MAME_DIR .. "src/devices/bus/pet/2joysnd.h", + MAME_DIR .. "src/devices/bus/pet/2joysnd.cpp", } end @@ -1077,6 +1092,23 @@ end --------------------------------------------------- -- +--@src/devices/bus/pofo/exp.h,BUSES["POFO"] = true +--------------------------------------------------- + +if (BUSES["POFO"]~=null) then + files { + MAME_DIR .. "src/devices/bus/pofo/exp.cpp", + MAME_DIR .. "src/devices/bus/pofo/exp.h", + MAME_DIR .. "src/devices/bus/pofo/hpc101.cpp", + MAME_DIR .. "src/devices/bus/pofo/hpc101.h", + MAME_DIR .. "src/devices/bus/pofo/hpc102.cpp", + MAME_DIR .. "src/devices/bus/pofo/hpc102.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/s100/s100.h,BUSES["S100"] = true --------------------------------------------------- @@ -2044,6 +2076,22 @@ end --------------------------------------------------- -- +--@src/devices/bus/sg1000_exp/sg1000exp.h,BUSES["SG1000_EXP"] = true +--------------------------------------------------- + +if (BUSES["SG1000_EXP"]~=null) then + files { + MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.cpp", + MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.h", + MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.cpp", + MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.h", + MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.cpp", + MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/sms_ctrl/smsctrl.h,BUSES["SMS_CTRL"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index bb630af1e5c..ef9263c6485 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -221,6 +221,9 @@ if (CPUS["ADSP21062"]~=null) then MAME_DIR .. "src/devices/cpu/sharc/sharcmem.hxx", MAME_DIR .. "src/devices/cpu/sharc/sharcops.h", MAME_DIR .. "src/devices/cpu/sharc/sharcops.hxx", + MAME_DIR .. "src/devices/cpu/sharc/sharcdrc.cpp", + MAME_DIR .. "src/devices/cpu/sharc/sharcfe.cpp", + MAME_DIR .. "src/devices/cpu/sharc/sharcfe.h", } end @@ -1446,13 +1449,13 @@ end -------------------------------------------------- -- PATINHO FEIO - Escola Politecnica - USP (Brazil) ---@src/devices/cpu/patinhofeio/patinho_feio.h,CPUS["PATINHOFEIO"] = true +--@src/devices/cpu/patinhofeio/patinhofeio_cpu.h,CPUS["PATINHOFEIO"] = true -------------------------------------------------- if (CPUS["PATINHOFEIO"]~=null) then files { MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp", - MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h", + MAME_DIR .. "src/devices/cpu/patinhofeio/patinhofeio_cpu.h", } end @@ -2367,3 +2370,21 @@ if (CPUS["ALTO2"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alto2/alto2dsm.cpp") end +------------------------------------------ +-- Sun SPARC, Fujitus MB86901 implementation +--@src/devices/cpu/sparc/sparc.h,CPUS["MB86901"] = true +-------------------------------------------------- + +if (CPUS["MB86901"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/sparc/mb86901.cpp", + MAME_DIR .. "src/devices/cpu/sparc/sparcv8ops.ipp", + MAME_DIR .. "src/devices/cpu/sparc/sparcdasm.h", + MAME_DIR .. "src/devices/cpu/sparc/sparcdefs.h", + MAME_DIR .. "src/devices/cpu/sparc/sparc.h", + } +end + +if (CPUS["MB86901"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sparc/sparcdasm.cpp") +end diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index 2449faa0ae5..a446a6ccaae 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -33,6 +33,7 @@ includedirs { ext_includedir("lua"), ext_includedir("zlib"), ext_includedir("flac"), + ext_includedir("jpeg"), } files { diff --git a/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua index aacd4da54d4..8c3536b144d 100644 --- a/docs/release/scripts/src/lib.lua +++ b/docs/release/scripts/src/lib.lua @@ -80,7 +80,8 @@ project "utils" MAME_DIR .. "src/lib/util/sha1.cpp", MAME_DIR .. "src/lib/util/sha1.h", MAME_DIR .. "src/lib/util/strformat.h", - MAME_DIR .. "src/lib/util/tagmap.h", + MAME_DIR .. "src/lib/util/timeconv.cpp", + MAME_DIR .. "src/lib/util/timeconv.h", MAME_DIR .. "src/lib/util/unicode.cpp", MAME_DIR .. "src/lib/util/unicode.h", MAME_DIR .. "src/lib/util/unzip.cpp", diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 61fba0708e9..aab2cb0b8e3 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -1178,6 +1178,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/ldp1000.h,MACHINES["LDP1000"] = true +--------------------------------------------------- + +if (MACHINES["LDP1000"]~=null) then + files { + MAME_DIR .. "src/devices/machine/ldp1000.cpp", + MAME_DIR .. "src/devices/machine/ldp1000.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/ldvp931.h,MACHINES["LDVP931"] = true --------------------------------------------------- @@ -2034,6 +2046,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/scnxx562.h,MACHINES["DUSCC"] = true +--------------------------------------------------- + +if (MACHINES["DUSCC"]~=null) then + files { + MAME_DIR .. "src/devices/machine/scnxx562.cpp", + MAME_DIR .. "src/devices/machine/scnxx562.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/serflash.h,MACHINES["SERFLASH"] = true --------------------------------------------------- @@ -2856,6 +2880,7 @@ if (MACHINES["APPLE_FDC"]~=null) then MAME_DIR .. "src/devices/machine/applefdc.h", } end + --------------------------------------------------- -- --@src/devices/machine/sonydriv.h,MACHINES["SONY_DRIVE"] = true @@ -2866,3 +2891,14 @@ if (MACHINES["SONY_DRIVE"]~=null) then MAME_DIR .. "src/devices/machine/sonydriv.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/scnxx562.h,MACHINES["SCNXX562"] = true +--------------------------------------------------- +if (MACHINES["SCNXX562"]~=null) then + files { + MAME_DIR .. "src/devices/machine/scnxx562.cpp", + MAME_DIR .. "src/devices/machine/scnxx562.h", + } +end diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index 31b9090d6b1..8fc9965d3c7 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -115,7 +115,7 @@ end targetextension ".bc" if os.getenv("EMSCRIPTEN") then local emccopts = "" - .. " -O3" + .. " -O" .. _OPTIONS["OPTIMIZE"] .. " -s USE_SDL=2" .. " -s USE_SDL_TTF=2" .. " --memory-init-file 0" @@ -132,7 +132,9 @@ end .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then - emccopts = emccopts .. " -g" .. _OPTIONS["SYMLEVEL"] + emccopts = emccopts + .. " -g" .. _OPTIONS["SYMLEVEL"] + .. " -s DEMANGLE_SUPPORT=1" end if _OPTIONS["ARCHOPTS"] then @@ -145,17 +147,7 @@ end end configuration { } - -if _OPTIONS["IGNORE_GIT"]~="1" then - GIT_VERSION = backtick( "git describe --dirty" ) - local p = string.find(GIT_VERSION, '-', 1) - if (p~=nil) then - defines { - "GIT_VERSION=" .. string.sub(GIT_VERSION,p+1) - } - end -end - + if _OPTIONS["targetos"]=="android" then includedirs { MAME_DIR .. "3rdparty/SDL2/include", @@ -229,13 +221,11 @@ end if _OPTIONS["USE_LIBUV"]=="1" then links { ext_lib("uv"), - "http-parser", } end links { ext_lib("zlib"), ext_lib("flac"), - ext_lib("sqlite3"), } if _OPTIONS["NO_USE_MIDI"]~="1" then @@ -277,7 +267,7 @@ if (STANDALONE~=true) then "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist" } custombuildtask { - { MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }}, + { GEN_DIR .. "version.cpp" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }}, } dependency { { "$(TARGET)" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", true }, @@ -355,21 +345,21 @@ if (STANDALONE~=true) then configuration { "mingw*" } custombuildtask { - { MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }}, + { GEN_DIR .. "version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }}, } configuration { "vs*" } prebuildcommands { "mkdir " .. path.translate(GEN_DIR .. "resource/","\\") .. " 2>NUL", "@echo Emitting ".. rctarget .. "vers.rc...", - PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") , + PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(GEN_DIR .. "version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") , } end configuration { } if _OPTIONS["DEBUG_DIR"]~=nil then - debugabsolutedir(_OPTIONS["DEBUG_DIR"]) + debugdir(_OPTIONS["DEBUG_DIR"]) else debugdir (MAME_DIR) end diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index ea9bb933cfc..e35bed2da07 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -75,6 +75,8 @@ files { MAME_DIR .. "src/frontend/mame/pluginopts.h", MAME_DIR .. "src/frontend/mame/ui/ui.cpp", MAME_DIR .. "src/frontend/mame/ui/ui.h", + MAME_DIR .. "src/frontend/mame/ui/text.cpp", + MAME_DIR .. "src/frontend/mame/ui/text.h", MAME_DIR .. "src/frontend/mame/ui/devctrl.h", MAME_DIR .. "src/frontend/mame/ui/menu.cpp", MAME_DIR .. "src/frontend/mame/ui/menu.h", diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua index aa00ec2c194..58fdf39f6a0 100644 --- a/docs/release/scripts/src/netlist.lua +++ b/docs/release/scripts/src/netlist.lua @@ -14,6 +14,11 @@ project "netlist" kind (LIBTYPE) addprojectflags() + + + defines { + "__STDC_CONSTANT_MACROS", + } includedirs { MAME_DIR .. "src/lib/netlist", @@ -27,7 +32,6 @@ project "netlist" MAME_DIR .. "src/lib/netlist/nl_dice_compat.h", MAME_DIR .. "src/lib/netlist/nl_lists.h", MAME_DIR .. "src/lib/netlist/nl_time.h", - MAME_DIR .. "src/lib/netlist/nl_util.h", MAME_DIR .. "src/lib/netlist/nl_base.cpp", MAME_DIR .. "src/lib/netlist/nl_base.h", MAME_DIR .. "src/lib/netlist/nl_parser.cpp", @@ -39,11 +43,14 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/pconfig.h", MAME_DIR .. "src/lib/netlist/plib/palloc.cpp", MAME_DIR .. "src/lib/netlist/plib/palloc.h", + MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp", + MAME_DIR .. "src/lib/netlist/plib/pchrono.h", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h", MAME_DIR .. "src/lib/netlist/plib/plists.h", MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp", MAME_DIR .. "src/lib/netlist/plib/pdynlib.h", + MAME_DIR .. "src/lib/netlist/plib/poptions.cpp", MAME_DIR .. "src/lib/netlist/plib/poptions.h", MAME_DIR .. "src/lib/netlist/plib/pparser.cpp", MAME_DIR .. "src/lib/netlist/plib/pparser.h", @@ -56,6 +63,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/pstream.cpp", MAME_DIR .. "src/lib/netlist/plib/pstream.h", MAME_DIR .. "src/lib/netlist/plib/ptypes.h", + MAME_DIR .. "src/lib/netlist/plib/putil.cpp", + MAME_DIR .. "src/lib/netlist/plib/putil.h", MAME_DIR .. "src/lib/netlist/tools/nl_convert.cpp", MAME_DIR .. "src/lib/netlist/tools/nl_convert.h", MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp", @@ -136,9 +145,10 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_log.h", MAME_DIR .. "src/lib/netlist/devices/nld_system.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_system.h", - MAME_DIR .. "src/lib/netlist/devices/nld_cmos.h", MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h", + MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h", + MAME_DIR .. "src/lib/netlist/devices/nlid_system.h", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h", MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp", diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index a05e55ee4c6..b8e5bb61b83 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -96,6 +96,8 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/output/none.cpp", MAME_DIR .. "src/osd/modules/output/console.cpp", MAME_DIR .. "src/osd/modules/output/network.cpp", + MAME_DIR .. "src/osd/modules/output/win32_output.cpp", + MAME_DIR .. "src/osd/modules/output/win32_output.h", MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp", MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h", MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp", @@ -242,7 +244,7 @@ function qtdebuggerbuild() } local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then - configuration { "gmake" } + configuration { "gmake or ninja" } if (version >= 30600) then buildoptions { "-Wno-inconsistent-missing-override", diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua index a86228e7c4c..a2e95a665da 100644 --- a/docs/release/scripts/src/osd/newui.lua +++ b/docs/release/scripts/src/osd/newui.lua @@ -130,7 +130,6 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", @@ -225,7 +224,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/windows/main.cpp", - MAME_DIR .. "src/osd/windows/windir.cpp", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", @@ -234,6 +232,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index d1a83229698..4094e48c6be 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -239,7 +239,7 @@ elseif _OPTIONS["targetos"]=="macosx" then SDL_NETWORK = "pcap" end -if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then +if _OPTIONS["with-bundled-sdl2"]~=nil then includedirs { GEN_DIR .. "includes", } @@ -295,10 +295,12 @@ if BASE_TARGETOS=="unix" then "/usr/openwin/lib", } end - if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then - links { - "SDL2", - } + if _OPTIONS["with-bundled-sdl2"]~=nil then + if _OPTIONS["targetos"]~="android" then + links { + "SDL2", + } + end else local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) @@ -459,7 +461,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", - MAME_DIR .. "src/osd/sdl/sdldir.cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp", @@ -468,6 +469,7 @@ project ("ocore_" .. _OPTIONS["osd"]) if BASE_TARGETOS=="unix" then files { + MAME_DIR .. "src/osd/modules/file/posixdir.cpp", MAME_DIR .. "src/osd/modules/file/posixfile.cpp", MAME_DIR .. "src/osd/modules/file/posixfile.h", MAME_DIR .. "src/osd/modules/file/posixptty.cpp", @@ -478,6 +480,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows", } files { + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua index b4be2dc7ce4..a6e40c7aadc 100644 --- a/docs/release/scripts/src/osd/windows.lua +++ b/docs/release/scripts/src/osd/windows.lua @@ -154,8 +154,6 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", - MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h", @@ -246,16 +244,48 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/main.cpp", - MAME_DIR .. "src/osd/windows/windir.cpp", MAME_DIR .. "src/osd/windows/winutf8.cpp", MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", } + + + +-------------------------------------------------- +-- ledutil +-------------------------------------------------- + +if _OPTIONS["with-tools"] then + project("ledutil") + uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + links { + "ocore_" .. _OPTIONS["osd"], + } + + includedirs { + MAME_DIR .. "src/osd", + } + + files { + MAME_DIR .. "src/osd/windows/ledutil.cpp", + } +end diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index 1056384647d..85f122bfa16 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -153,7 +153,6 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", @@ -276,7 +275,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/windows/main.cpp", - MAME_DIR .. "src/osd/windows/windir.cpp", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", @@ -285,6 +283,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", diff --git a/docs/release/scripts/src/tests.lua b/docs/release/scripts/src/tests.lua index b5bb5b37366..e0a8da88d75 100644 --- a/docs/release/scripts/src/tests.lua +++ b/docs/release/scripts/src/tests.lua @@ -16,7 +16,7 @@ project "gtest" uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-undef", "-Wno-unused-variable", @@ -52,7 +52,7 @@ project("mametests") targetdir(MAME_DIR) end - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-undef", } diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua index a2e5ad73496..6832190f5d3 100644 --- a/docs/release/scripts/src/tools.lua +++ b/docs/release/scripts/src/tools.lua @@ -87,7 +87,7 @@ includedirs { files { MAME_DIR .. "src/tools/chdman.cpp", MAME_DIR .. "src/emu/emucore.cpp", - MAME_DIR .. "src/version.cpp", + GEN_DIR .. "version.cpp", } configuration { "mingw*" or "vs*" } @@ -165,6 +165,7 @@ links { includedirs { MAME_DIR .. "src/osd", + MAME_DIR .. "src/devices", MAME_DIR .. "src/emu", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", @@ -779,7 +780,7 @@ if _OPTIONS["targetos"] == "macosx" then MAME_DIR .. "src/tools/aueffectutil.mm", } - configuration { } + configuration { } strip() end diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua index 2220e65fff9..95cccd99bfe 100644 --- a/docs/release/scripts/src/video.lua +++ b/docs/release/scripts/src/video.lua @@ -806,6 +806,18 @@ end -------------------------------------------------- -- +--@src/devices/video/zeus2.h,VIDEOS["ZEUS2"] = true +-------------------------------------------------- + +if (VIDEOS["ZEUS2"]~=null) then + files { + MAME_DIR .. "src/devices/video/zeus2.cpp", + MAME_DIR .. "src/devices/video/zeus2.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/voodoo.h,VIDEOS["VOODOO"] = true -------------------------------------------------- diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index 3c45c1f9d6d..df58452777d 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -332,6 +332,7 @@ VIDEOS["V9938"] = true --VIDEOS["VIC4567"] = true VIDEOS["VOODOO"] = true VIDEOS["VOODOO_PCI"] = true +VIDEOS["ZEUS2"] = true -------------------------------------------------- -- specify available machine cores @@ -429,6 +430,7 @@ MACHINES["LC89510"] = true MACHINES["LDPR8210"] = true MACHINES["LDSTUB"] = true MACHINES["LDV1000"] = true +MACHINES["LDP1000"] = true MACHINES["LDVP931"] = true --MACHINES["LH5810"] = true MACHINES["LINFLASH"] = true @@ -640,6 +642,7 @@ BUSES["SAT_CTRL"] = true BUSES["SCSI"] = true --BUSES["SCV"] = true BUSES["SEGA8"] = true +BUSES["SG1000_EXP"] = true BUSES["SMS_CTRL"] = true BUSES["SMS_EXP"] = true --BUSES["SNES"] = true @@ -1168,6 +1171,8 @@ files { MAME_DIR .. "src/mame/machine/mathbox.cpp", MAME_DIR .. "src/mame/machine/mathbox.h", MAME_DIR .. "src/mame/machine/slapstic.cpp", + MAME_DIR .. "src/mame/machine/atarixga.cpp", + MAME_DIR .. "src/mame/machine/atarixga.h", MAME_DIR .. "src/mame/audio/atarijsa.cpp", MAME_DIR .. "src/mame/audio/atarijsa.h", MAME_DIR .. "src/mame/audio/cage.cpp", @@ -1349,7 +1354,6 @@ files { createMAMEProjects(_target, _subtarget, "cinemat") files { - MAME_DIR .. "src/mame/drivers/ataxx.cpp", MAME_DIR .. "src/mame/drivers/cinemat.cpp", MAME_DIR .. "src/mame/includes/cinemat.h", MAME_DIR .. "src/mame/audio/cinemat.cpp", @@ -2115,6 +2119,9 @@ files { MAME_DIR .. "src/mame/drivers/ddribble.cpp", MAME_DIR .. "src/mame/includes/ddribble.h", MAME_DIR .. "src/mame/video/ddribble.cpp", + MAME_DIR .. "src/mame/drivers/divebomb.cpp", + MAME_DIR .. "src/mame/includes/divebomb.h", + MAME_DIR .. "src/mame/video/divebomb.cpp", MAME_DIR .. "src/mame/drivers/djmain.cpp", MAME_DIR .. "src/mame/includes/djmain.h", MAME_DIR .. "src/mame/video/djmain.cpp", @@ -3044,6 +3051,8 @@ files { MAME_DIR .. "src/mame/machine/s32comm.h", MAME_DIR .. "src/mame/machine/m1comm.cpp", MAME_DIR .. "src/mame/machine/m1comm.h", + MAME_DIR .. "src/mame/machine/m2comm.cpp", + MAME_DIR .. "src/mame/machine/m2comm.h", MAME_DIR .. "src/mame/audio/dsbz80.cpp", MAME_DIR .. "src/mame/audio/dsbz80.h", MAME_DIR .. "src/mame/drivers/model2.cpp", @@ -3261,8 +3270,10 @@ files { MAME_DIR .. "src/mame/includes/raiden2.h", MAME_DIR .. "src/mame/machine/r2crypt.cpp", MAME_DIR .. "src/mame/machine/r2crypt.h", - MAME_DIR .. "src/mame/machine/raiden2cop.cpp", - MAME_DIR .. "src/mame/machine/raiden2cop.h", + MAME_DIR .. "src/mame/machine/seibucop/seibucop.cpp", + MAME_DIR .. "src/mame/machine/seibucop/seibucop_dma.hxx", + MAME_DIR .. "src/mame/machine/seibucop/seibucop_cmd.hxx", + MAME_DIR .. "src/mame/machine/seibucop/seibucop.h", MAME_DIR .. "src/mame/drivers/r2dx_v33.cpp", MAME_DIR .. "src/mame/drivers/seibuspi.cpp", MAME_DIR .. "src/mame/includes/seibuspi.h", @@ -4221,6 +4232,11 @@ files { -------------------------------------------------- createMAMEProjects(_target, _subtarget, "misc") + +includedirs { + ext_includedir("jpeg"), +} + files { MAME_DIR .. "src/mame/drivers/1945kiii.cpp", MAME_DIR .. "src/mame/drivers/39in1.cpp", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index 13898021fd6..1063bd71a93 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -132,6 +132,7 @@ CPUS["E0C6200"] = true CPUS["MELPS4"] = true CPUS["HPHYBRID"] = true CPUS["SM510"] = true +CPUS["MB86901"] = true -------------------------------------------------- -- specify available sound cores; some of these are @@ -583,6 +584,7 @@ MACHINES["SMARTMEDIA"] = true MACHINES["APPLE_DRIVE"] = true MACHINES["APPLE_FDC"] = true MACHINES["SONY_DRIVE"] = true +MACHINES["SCNXX562"] = true -------------------------------------------------- -- specify available bus cores @@ -618,6 +620,7 @@ BUSES["CRVISION"] = true BUSES["DMV"] = true BUSES["ECBBUS"] = true BUSES["ECONET"] = true +BUSES["ELECTRON"] = true BUSES["EP64"] = true BUSES["EPSON_SIO"] = true BUSES["GAMEBOY"] = true @@ -653,6 +656,7 @@ BUSES["PC_JOY"] = true BUSES["PC_KBD"] = true BUSES["PET"] = true BUSES["PLUS4"] = true +BUSES["POFO"] = true BUSES["PSX_CONTROLLER"] = true BUSES["QL"] = true BUSES["RS232"] = true @@ -662,6 +666,7 @@ BUSES["SATURN"] = true BUSES["SCSI"] = true BUSES["SCV"] = true BUSES["SEGA8"] = true +BUSES["SG1000_EXP"] = true BUSES["SMS_CTRL"] = true BUSES["SMS_EXP"] = true BUSES["SNES"] = true @@ -1067,7 +1072,7 @@ files { MAME_DIR .. "src/mame/machine/xbox.cpp", MAME_DIR .. "src/mame/includes/saturn.h", MAME_DIR .. "src/mame/drivers/saturn.cpp", - MAME_DIR .. "src/mame/machine/saturn.cpp", + MAME_DIR .. "src/mame/machine/saturn.cpp", } end -------------------------------------------------- @@ -1304,8 +1309,7 @@ files { MAME_DIR .. "src/mame/audio/lynx.cpp", MAME_DIR .. "src/mame/audio/lynx.h", MAME_DIR .. "src/mame/machine/lynx.cpp", - MAME_DIR .. "src/mame/drivers/portfoli.cpp", - MAME_DIR .. "src/mame/includes/portfoli.h", + MAME_DIR .. "src/mame/drivers/pofo.cpp", } createMESSProjects(_target, _subtarget, "att") @@ -1725,6 +1729,7 @@ files { createMESSProjects(_target, _subtarget, "force") files { + MAME_DIR .. "src/mame/drivers/fccpu30.cpp", MAME_DIR .. "src/mame/drivers/force68k.cpp", } @@ -1859,6 +1864,8 @@ files { MAME_DIR .. "src/mame/drivers/ipc.cpp", MAME_DIR .. "src/mame/drivers/ipds.cpp", MAME_DIR .. "src/mame/drivers/isbc.cpp", + MAME_DIR .. "src/mame/drivers/isbc8010.cpp", + MAME_DIR .. "src/mame/drivers/isbc8030.cpp", MAME_DIR .. "src/mame/machine/isbc_215g.cpp", MAME_DIR .. "src/mame/machine/isbc_215g.h", MAME_DIR .. "src/mame/drivers/rex6000.cpp", @@ -2611,6 +2618,7 @@ files { MAME_DIR .. "src/mame/drivers/sun1.cpp", MAME_DIR .. "src/mame/drivers/sun2.cpp", MAME_DIR .. "src/mame/drivers/sun3.cpp", + MAME_DIR .. "src/mame/drivers/sun3x.cpp", MAME_DIR .. "src/mame/drivers/sun4.cpp", } @@ -2678,6 +2686,7 @@ files { MAME_DIR .. "src/mame/drivers/tek405x.cpp", MAME_DIR .. "src/mame/includes/tek405x.h", MAME_DIR .. "src/mame/drivers/tek410x.cpp", + MAME_DIR .. "src/mame/drivers/tek440x.cpp", MAME_DIR .. "src/mame/drivers/tekxp33x.cpp", } @@ -2894,6 +2903,7 @@ files { createMESSProjects(_target, _subtarget, "usp") files { MAME_DIR .. "src/mame/drivers/patinho_feio.cpp", + MAME_DIR .. "src/mame/includes/patinhofeio.h", } createMESSProjects(_target, _subtarget, "veb") @@ -3034,6 +3044,7 @@ files { createMESSProjects(_target, _subtarget, "skeleton") files { + MAME_DIR .. "src/mame/drivers/alesis_qs.cpp", MAME_DIR .. "src/mame/drivers/alphasma.cpp", MAME_DIR .. "src/mame/drivers/ampro.cpp", MAME_DIR .. "src/mame/drivers/amust.cpp", @@ -3188,6 +3199,7 @@ files { MAME_DIR .. "src/mame/drivers/v6809.cpp", MAME_DIR .. "src/mame/drivers/vector4.cpp", MAME_DIR .. "src/mame/drivers/vii.cpp", + MAME_DIR .. "src/mame/drivers/vsmilepro.cpp", MAME_DIR .. "src/mame/drivers/wicat.cpp", MAME_DIR .. "src/mame/drivers/xor100.cpp", MAME_DIR .. "src/mame/includes/xor100.h", diff --git a/docs/release/scripts/target/mame/tiny.lua b/docs/release/scripts/target/mame/tiny.lua index 4e3d4167587..b9ed31261d5 100644 --- a/docs/release/scripts/target/mame/tiny.lua +++ b/docs/release/scripts/target/mame/tiny.lua @@ -61,6 +61,7 @@ MACHINES["PIT8253"] = true MACHINES["Z80CTC"] = true MACHINES["68681"] = true MACHINES["BANKDEV"] = true +MACHINES["GEN_LATCH"] = true MACHINES["WATCHDOG"] = true diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua index e717102f44e..6046b4d97d8 100644 --- a/docs/release/scripts/toolchain.lua +++ b/docs/release/scripts/toolchain.lua @@ -95,6 +95,8 @@ function toolchain(_buildDir, _subDir) local androidPlatform = "android-14" if _OPTIONS["with-android"] then androidPlatform = "android-" .. _OPTIONS["with-android"] + elseif _OPTIONS["PLATFORM"]:find("64", -2) then + androidPlatform = "android-21" end local iosPlatform = "" @@ -107,90 +109,48 @@ function toolchain(_buildDir, _subDir) windowsPlatform = _OPTIONS["with-windows"] end - if _ACTION == "gmake" then + if _ACTION == "gmake" or _ACTION == "ninja" then if nil == _OPTIONS["gcc"] or nil == _OPTIONS["gcc_version"] then print("GCC flavor and version must be specified!") os.exit(1) end - if "android-arm" == _OPTIONS["gcc"] then - - if not os.getenv("ANDROID_NDK_ARM") or not os.getenv("ANDROID_NDK_ROOT") then - print("Set ANDROID_NDK_ARM and ANDROID_NDK_ROOT envrionment variables.") + if string.find(_OPTIONS["gcc"], "android") then + -- 64-bit android platform requires >= 21 + if _OPTIONS["PLATFORM"]:find("64", -2) and tonumber(androidPlatform:sub(9)) < 21 then + error("64-bit android requires platform 21 or higher") end - - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" - premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" - premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar" - premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm") - end - - if "android-arm64" == _OPTIONS["gcc"] then - - if not os.getenv("ANDROID_NDK_ARM64") or not os.getenv("ANDROID_NDK_ROOT") then - print("Set ANDROID_NDK_ARM64 and ANDROID_NDK_ROOT envrionment variables.") + if not os.getenv("ANDROID_NDK_ROOT") then + print("Set ANDROID_NDK_ROOT environment variable.") end - - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" - premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" - premake.gcc.ar = "$(ANDROID_NDK_ARM64)/bin/aarch64-linux-android-ar.exe" - premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm64") - end - - if "android-mips" == _OPTIONS["gcc"] then - - if not os.getenv("ANDROID_NDK_MIPS") or not os.getenv("ANDROID_NDK_ROOT") then - print("Set ANDROID_NDK_MIPS and ANDROID_NDK_ROOT envrionment variables.") + if not os.getenv("ANDROID_NDK_LLVM") then + print("Set ANDROID_NDK_LLVM envrionment variable.") end - - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" - premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" - premake.gcc.ar = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-ar" - premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips") - end - - if "android-mips64" == _OPTIONS["gcc"] then - - if not os.getenv("ANDROID_NDK_MIPS64") or not os.getenv("ANDROID_NDK_ROOT") then - print("Set ANDROID_NDK_MIPS64 and ANDROID_NDK_ROOT envrionment variables.") + platform_ndk_env = "ANDROID_NDK_" .. _OPTIONS["PLATFORM"]:upper() + if not os.getenv(platform_ndk_env) then + print("Set " .. platform_ndk_env .. " environment variable.") end - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" - premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" - premake.gcc.ar = "$(ANDROID_NDK_MIPS64)/bin/mips64el-linux-android-ar.exe" - premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips64") - end - - if "android-x86" == _OPTIONS["gcc"] then + local platformToolchainMap = { + ['arm'] = "arm-linux-androideabi", + ['arm64'] = "aarch64-linux-android", + ['mips64'] = "mips64el-linux-android", + ['mips'] = "mipsel-linux-android", + ['x86'] = "i686-linux-android", + ['x64'] = "x86_64-linux-android", + } - if not os.getenv("ANDROID_NDK_X86") or not os.getenv("ANDROID_NDK_ROOT") then - print("Set ANDROID_NDK_X86 and ANDROID_NDK_ROOT envrionment variables.") - end + toolchainPrefix = os.getenv(platform_ndk_env) .. "/bin/" .. platformToolchainMap[_OPTIONS["PLATFORM"]] .. "-" - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" - premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" - premake.gcc.ar = "$(ANDROID_NDK_X86)/bin/i686-linux-android-ar" + premake.gcc.cc = "$(ANDROID_NDK_LLVM)/bin/clang" + premake.gcc.cxx = "$(ANDROID_NDK_LLVM)/bin/clang++" + premake.gcc.ar = toolchainPrefix .. "ar" premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x86") - end - if "android-x64" == _OPTIONS["gcc"] then - - if not os.getenv("ANDROID_NDK_X64") or not os.getenv("ANDROID_NDK_ROOT") then - print("Set ANDROID_NDK_X64 and ANDROID_NDK_ROOT envrionment variables.") - end - - premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" - premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" - premake.gcc.ar = "$(ANDROID_NDK_X64)/bin/x86_64-linux-android-ar.exe" - premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x64") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-" .. _OPTIONS["PLATFORM"]) end + if "asmjs" == _OPTIONS["gcc"] then if not os.getenv("EMSCRIPTEN") then @@ -373,7 +333,7 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20") end - elseif _ACTION == "vs2013" or _ACTION == "vs2015" then + elseif _ACTION == "vs2013" or _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then if (_ACTION .. "-clang") == _OPTIONS["vs"] then premake.vstudio.toolset = ("LLVM-" .. _ACTION) @@ -813,6 +773,8 @@ function toolchain(_buildDir, _subDir) targetdir (_buildDir .. "openbsd" .. "/bin/x64/Debug") configuration { "android-*" } + targetdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/bin") + objdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/obj") includedirs { MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", @@ -857,8 +819,6 @@ function toolchain(_buildDir, _subDir) configuration { "android-arm" } - targetdir (_buildDir .. "android-arm" .. "/bin") - objdir (_buildDir .. "android-arm" .. "/obj") libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib", @@ -885,9 +845,6 @@ function toolchain(_buildDir, _subDir) } configuration { "android-arm64" } - androidPlatform = "android-21" -- supported from API 21 - targetdir (_buildDir .. "android-arm64" .. "/bin") - objdir (_buildDir .. "android-arm64" .. "/obj") libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/arm64-v8a", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib64", @@ -908,8 +865,6 @@ function toolchain(_buildDir, _subDir) } configuration { "android-mips" } - targetdir (_buildDir .. "android-mips" .. "/bin") - objdir (_buildDir .. "android-mips" .. "/obj") libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/", @@ -930,9 +885,6 @@ function toolchain(_buildDir, _subDir) } configuration { "android-mips64" } - androidPlatform = "android-21" -- supported from API 21 - targetdir (_buildDir .. "android-mips64" .. "/bin") - objdir (_buildDir .. "android-mips64" .. "/obj") libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips64", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/", @@ -953,8 +905,6 @@ function toolchain(_buildDir, _subDir) } configuration { "android-x86" } - targetdir (_buildDir .. "android-x86" .. "/bin") - objdir (_buildDir .. "android-x86" .. "/obj") libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib", @@ -977,9 +927,6 @@ function toolchain(_buildDir, _subDir) } configuration { "android-x64" } - androidPlatform = "android-21" -- supported from API 21 - targetdir (_buildDir .. "android-x64" .. "/bin") - objdir (_buildDir .. "android-x64" .. "/obj") libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86_64", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64", @@ -1101,22 +1048,10 @@ function strip() "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix) .. "strip \"$(TARGET)\"", } - configuration { "android-arm", "Release" } - postbuildcommands { - "$(SILENT) echo Stripping symbols.", - "$(SILENT) $(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-strip -s \"$(TARGET)\"" - } - - configuration { "android-mips", "Release" } - postbuildcommands { - "$(SILENT) echo Stripping symbols.", - "$(SILENT) $(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-strip -s \"$(TARGET)\"" - } - - configuration { "android-x86", "Release" } + configuration { "android-*", "Release" } postbuildcommands { "$(SILENT) echo Stripping symbols.", - "$(SILENT) $(ANDROID_NDK_X86)/bin/i686-linux-android-strip -s \"$(TARGET)\"" + "$(SILENT) " .. toolchainPrefix .. "strip -s \"$(TARGET)\"" } configuration { "linux-* or rpi", "Release" } diff --git a/docs/release/src/emu/validity.cpp b/docs/release/src/emu/validity.cpp index 1f4971b83a7..05607afe0a2 100644 --- a/docs/release/src/emu/validity.cpp +++ b/docs/release/src/emu/validity.cpp @@ -849,17 +849,17 @@ void validity_checker::validate_inputs() osd_printf_error("I/O port error during construction:\n%s\n", errorbuf.c_str()); // do a first pass over ports to add their names and find duplicates - for (ioport_port &port : portlist) - if (!port_map.insert(port.tag()).second) - osd_printf_error("Multiple I/O ports with the same tag '%s' defined\n", port.tag()); + for (auto &port : portlist) + if (!port_map.insert(port.second->tag()).second) + osd_printf_error("Multiple I/O ports with the same tag '%s' defined\n", port.second->tag()); // iterate over ports - for (ioport_port &port : portlist) + for (auto &port : portlist) { - m_current_ioport = port.tag(); + m_current_ioport = port.second->tag(); // iterate through the fields on this port - for (ioport_field &field : port.fields()) + for (ioport_field &field : port.second->fields()) { // verify analog inputs if (field.is_analog()) @@ -971,11 +971,11 @@ void validity_checker::validate_devices() std::unordered_set<std::string> slot_device_map; for (const device_slot_interface &slot : slot_interface_iterator(m_current_config->root_device())) { - for (const device_slot_option &option : slot.option_list()) + for (auto &option : slot.option_list()) { std::string temptag("_"); - temptag.append(option.name()); - device_t *dev = const_cast<machine_config &>(*m_current_config).device_add(&m_current_config->root_device(), temptag.c_str(), option.devtype(), 0); + temptag.append(option.second->name()); + device_t *dev = const_cast<machine_config &>(*m_current_config).device_add(&m_current_config->root_device(), temptag.c_str(), option.second->devtype(), 0); // notify this device and all its subdevices that they are now configured for (device_t &device : device_iterator(*dev)) diff --git a/docs/release/src/emu/video.cpp b/docs/release/src/emu/video.cpp index 1babd7c720b..30aef6875db 100644 --- a/docs/release/src/emu/video.cpp +++ b/docs/release/src/emu/video.cpp @@ -203,7 +203,7 @@ void video_manager::set_frameskip(int frameskip) // operations //------------------------------------------------- -void video_manager::frame_update(bool debug) +void video_manager::frame_update(bool from_debugger) { // only render sound and video if we're in the running phase int phase = machine().phase(); @@ -226,34 +226,36 @@ void video_manager::frame_update(bool debug) // if we're throttling, synchronize before rendering attotime current_time = machine().time(); - if (!debug && !skipped_it && effective_throttle()) + if (!from_debugger && !skipped_it && effective_throttle()) update_throttle(current_time); // ask the OSD to update g_profiler.start(PROFILER_BLIT); - machine().osd().update(!debug && skipped_it); + machine().osd().update(!from_debugger && skipped_it); g_profiler.stop(); emulator_info::periodic_check(); // perform tasks for this frame - if (!debug) + if (!from_debugger) machine().call_notifiers(MACHINE_NOTIFY_FRAME); // update frameskipping - if (!debug) + if (!from_debugger) update_frameskip(); // update speed computations - if (!debug && !skipped_it) + if (!from_debugger && !skipped_it) recompute_speed(current_time); // call the end-of-frame callback if (phase == MACHINE_PHASE_RUNNING) { // reset partial updates if we're paused or if the debugger is active - screen_device *screen = machine().first_screen(); - if (screen != nullptr && (machine().paused() || debug || debugger_within_instruction_hook(machine()))) + screen_device *const screen = machine().first_screen(); + bool const debugger_enabled = machine().debug_flags & DEBUG_FLAG_ENABLED; + bool const within_instruction_hook = debugger_enabled && machine().debugger().within_instruction_hook(); + if (screen && (machine().paused() || from_debugger || within_instruction_hook)) screen->reset_partial_updates(); } } diff --git a/docs/release/src/emu/video.h b/docs/release/src/emu/video.h index 4e426dd9017..a1fb58d3f48 100644 --- a/docs/release/src/emu/video.h +++ b/docs/release/src/emu/video.h @@ -82,7 +82,7 @@ public: osd_file::error open_next(emu_file &file, const char *extension); // render a frame - void frame_update(bool debug = false); + void frame_update(bool from_debugger = false); // current speed helpers std::string speed_text(); diff --git a/docs/release/src/hbmame/bus/neogeo/banked_cart.cpp b/docs/release/src/hbmame/bus/neogeo/banked_cart.cpp index 1ad3b0c34e1..bbf1e70eee0 100644 --- a/docs/release/src/hbmame/bus/neogeo/banked_cart.cpp +++ b/docs/release/src/hbmame/bus/neogeo/banked_cart.cpp @@ -98,7 +98,7 @@ void neogeo_banked_cart_device::init_banks(void) void neogeo_banked_cart_device::install_banks(running_machine& machine, cpu_device* maincpu, UINT8* region, UINT32 region_size) { - maincpu->space(AS_PROGRAM).install_read_bank(0x200000, 0x2fffff, 0, 0, "cartridge"); + maincpu->space(AS_PROGRAM).install_read_bank(0x200000, 0x2fffff, "cartridge"); maincpu->space(AS_PROGRAM).install_write_handler(0x2ffff0, 0x2fffff, write16_delegate(FUNC(neogeo_banked_cart_device::main_cpu_bank_select_w),this)); m_bank_cartridge = machine.root_device().membank("cartridge"); diff --git a/docs/release/src/hbmame/drivers/cclimber.cpp b/docs/release/src/hbmame/drivers/cclimber.cpp index 55b812a3057..9534bf0ffff 100644 --- a/docs/release/src/hbmame/drivers/cclimber.cpp +++ b/docs/release/src/hbmame/drivers/cclimber.cpp @@ -23,7 +23,7 @@ INPUT_PORTS_START( ckonga4 ) /* two less lives than normal */ INPUT_PORTS_END ROM_START( cclimbrm ) - ROM_REGION( 0x10000, "maincpu", 0 ) /* 64k for code */ + ROM_REGION( 0x6000, "maincpu", 0 ) /* 64k for code */ ROM_LOAD( "cc11m", 0x0000, 0x1000, CRC(a7d58b7e) SHA1(83a21b1a731895c84f1f3604f36b21b172bb144b) ) ROM_LOAD( "cc10", 0x1000, 0x1000, CRC(b3c26cef) SHA1(f52cb5482c12a9c5fb56e2e2aec7cab0ed23e5a5) ) ROM_LOAD( "cc09", 0x2000, 0x1000, CRC(6db0879c) SHA1(c0ba1976c1dcd6edadd78073173a26851ae8dd4f) ) @@ -175,8 +175,8 @@ ROM_START( tongypac ) ROM_LOAD( "ck12.bin", 0x1000, 0x1000, CRC(2eb23b60) SHA1(c9e7dc584562aceb374193655fbacb7df6c9c731) ) ROM_END -GAME( 1980, cclimbrm, 0, cclimber, cclimber, cclimber_state, cclimber, ROT0, "Tim Arcadecollecting", "Crazy Climber (US - modded)", MACHINE_SUPPORTS_SAVE ) // http://www.arcadecollecting.com/crazy/cchack -GAME( 1981, ckonga2, ckong, cclimber, ckonga2, driver_device, 0, ROT270, "bootleg", "Crazy Kong Part II -1", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, ckonga3, ckong, cclimber, ckonga4, driver_device, 0, ROT270, "bootleg", "Crazy Kong Part II -2", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, ckongfix, ckong, cclimber, ckong, driver_device, 0, ROT270, "Pinny", "Crazy Kong Part II (Graphic Fix)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, tongypac, ckong, cclimber, ckong, driver_device, 0, ROT270, "Grand Master Peter", "Tongy Paccy", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) +GAME( 1980, cclimbrm, cclimber, cclimberx, cclimber, cclimber_state, cclimber, ROT0, "Tim Arcadecollecting", "Crazy Climber (US - modded)", MACHINE_SUPPORTS_SAVE ) // http://www.arcadecollecting.com/crazy/cchack +GAME( 1981, ckonga2, ckong, cclimber, ckonga2, driver_device, 0, ROT270, "bootleg", "Crazy Kong Part II -1", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, ckonga3, ckong, cclimber, ckonga4, driver_device, 0, ROT270, "bootleg", "Crazy Kong Part II -2", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, ckongfix, ckong, cclimber, ckong, driver_device, 0, ROT270, "Pinny", "Crazy Kong Part II (Graphic Fix)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, tongypac, ckong, cclimber, ckong, driver_device, 0, ROT270, "Grand Master Peter", "Tongy Paccy", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/cps1.cpp b/docs/release/src/hbmame/drivers/cps1.cpp index 278627bfbcb..f1399ff957e 100644 --- a/docs/release/src/hbmame/drivers/cps1.cpp +++ b/docs/release/src/hbmame/drivers/cps1.cpp @@ -1,4 +1,4 @@ -// license:??? +// license:BSD-3-Clause // copyright-holders:Paul Leaman /*************************************************************************** @@ -316,15 +316,15 @@ WRITE8_MEMBER(cps_state::cps1_oki_pin7_w) WRITE16_MEMBER(cps_state::cps1_soundlatch_w) { if (ACCESSING_BITS_0_7) - soundlatch_byte_w(space, 0, data & 0xff); + m_soundlatch->write(space, 0, data & 0xff); else - soundlatch_byte_w(space, 0, data >> 8); + m_soundlatch->write(space, 0, data >> 8); } WRITE16_MEMBER(cps_state::cps1_soundlatch2_w) { if (ACCESSING_BITS_0_7) - soundlatch2_byte_w(space, 0, data & 0xff); + m_soundlatch2->write(space, 0, data & 0xff); } WRITE16_MEMBER(cps_state::cps1_coinctrl_w) @@ -591,8 +591,8 @@ static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, cps_state ) AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_device, read, write) AM_RANGE(0xf004, 0xf004) AM_WRITE(cps1_snd_bankswitch_w) AM_RANGE(0xf006, 0xf006) AM_WRITE(cps1_oki_pin7_w) /* controls pin 7 of OKI chip */ - AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_byte_r) /* Sound command */ - AM_RANGE(0xf00a, 0xf00a) AM_READ(soundlatch2_byte_r) /* Sound timer fade */ + AM_RANGE(0xf008, 0xf008) AM_DEVREAD("soundlatch", generic_latch_8_device, read) /* Sound command */ + AM_RANGE(0xf00a, 0xf00a) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) /* Sound timer fade */ ADDRESS_MAP_END static ADDRESS_MAP_START( qsound_main_map, AS_PROGRAM, 16, cps_state ) @@ -645,6 +645,25 @@ static ADDRESS_MAP_START( sf2m3_map, AS_PROGRAM, 16, cps_state ) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END +static ADDRESS_MAP_START( sf2m10_map, AS_PROGRAM, 16, cps_state ) + AM_RANGE(0x000000, 0x3fffff) AM_ROM + AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") + AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_hack_dsw_r) + AM_RANGE(0x800020, 0x800021) AM_READNOP + AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w) + AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_SHARE("cps_a_regs") + AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_SHARE("cps_b_regs") + AM_RANGE(0x800180, 0x800187) AM_WRITE(cps1_soundlatch_w) + AM_RANGE(0x800188, 0x80018f) AM_WRITE(cps1_soundlatch2_w) + AM_RANGE(0x8001a2, 0x8001b3) AM_WRITE(cps1_cps_a_w) // make 8001b2 point at 800110 + AM_RANGE(0x8001fe, 0x8001ff) AM_WRITENOP // writes FFFF here a lot + AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_SHARE("gfxram") + AM_RANGE(0xe00000, 0xefffff) AM_RAM // it writes to the whole range at start + AM_RANGE(0xf1c000, 0xf1c001) AM_READ(cps1_in2_r) + AM_RANGE(0xfeff00, 0xfeffff) AM_RAM // fix stack crash at start + AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("mainram") +ADDRESS_MAP_END + /*********************************************************** INPUT PORTS, DIPs ***********************************************************/ @@ -2018,7 +2037,7 @@ static INPUT_PORTS_START( kodr1 ) INPUT_PORTS_END -INPUT_PORTS_START( captcomm ) +INPUT_PORTS_START( captcomm ) // HBMAME PORT_INCLUDE( cps1_4players ) PORT_MODIFY("IN0") @@ -2150,7 +2169,7 @@ INPUT_PORTS_START( knights ) PORT_DIPSETTING( 0x00, DEF_STR( Test ) ) INPUT_PORTS_END -INPUT_PORTS_START( varth ) // HBMAME +INPUT_PORTS_START( varth ) PORT_INCLUDE( cps1_3b ) PORT_MODIFY("IN0") @@ -3094,6 +3113,84 @@ static INPUT_PORTS_START( wofch ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write) INPUT_PORTS_END +static INPUT_PORTS_START( pokonyan ) + PORT_INCLUDE( cps1_3b ) + + PORT_START("DSWA") + PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW(A):1,2") + PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW(A):3") + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW(A):4") + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW(A):5") + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW(A):6") + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW(A):7") // not listed in service mode, but left/right don't seem to work otherwise? maybe tied to some cabinet sensor? + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW(A):8") + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_START("DSWB") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW(B):1,2") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x01, "Every 4" ) + PORT_DIPSETTING( 0x02, "Every 2" ) + PORT_DIPSETTING( 0x03, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x00, "Prize Mode" ) PORT_DIPLOCATION("SW(B):3") + PORT_DIPSETTING( 0x00, "Not Used" ) + PORT_DIPSETTING( 0x04, "Used" ) + PORT_DIPNAME( 0x08, 0x08, "Credit Mode" ) PORT_DIPLOCATION("SW(B):4") + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, "Max Stage" ) PORT_DIPLOCATION("SW(B):5") + PORT_DIPSETTING( 0x00, "2" ) + PORT_DIPSETTING( 0x10, "3" ) + PORT_DIPNAME( 0x20, 0x20, "Card Check" ) PORT_DIPLOCATION("SW(B):6") + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW(B):7") + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW(B):8") + PORT_DIPSETTING( 0x00, "1.0 sec" ) + PORT_DIPSETTING( 0x80, "1.2 sec" ) + + PORT_START("DSWC") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW(C):1") + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, "Body Check") PORT_DIPLOCATION("SW(C):2") + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW(C):3") + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, "Screen Stop" ) PORT_DIPLOCATION("SW(C):4") + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW(C):5") + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW(C):6") + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW(C):7") + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW(C):8" ) +INPUT_PORTS_END + /* A Final Fight board with mismatched USA and Japan GFX proves that the columns of the 8x8 tilemap alternate between sides of the 16x16 tile resulting @@ -3205,6 +3302,9 @@ static MACHINE_CONFIG_START( cps1_10MHz, cps_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) @@ -3257,6 +3357,8 @@ static MACHINE_CONFIG_DERIVED( qsound, cps1_12MHz ) MCFG_DEVICE_REMOVE("mono") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + //MCFG_DEVICE_REMOVE("soundlatch") // HBMAME + //MCFG_DEVICE_REMOVE("soundlatch2") // HBMAME MCFG_DEVICE_REMOVE("2151") MCFG_DEVICE_REMOVE("oki") @@ -3276,6 +3378,11 @@ static MACHINE_CONFIG_DERIVED( sf2m3, cps1_12MHz) MCFG_CPU_PROGRAM_MAP(sf2m3_map) MACHINE_CONFIG_END +static MACHINE_CONFIG_DERIVED( sf2m10, cps1_12MHz) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(sf2m10_map) +MACHINE_CONFIG_END + /*************************************************************************** @@ -3287,23 +3394,97 @@ MACHINE_CONFIG_END /* B-Board 88621B-2 */ /* + There are 4 surface mounted ROMs each on it's own small 88621B-sub satellite board, type HN62404FP-18 package is QFP44. + The ROMs on the satellite boards are named and located as follows: + + LW-02 @ 6B + LW-08 @ 9B + LW-06 @ 9D + LW-07 @ 10G + + OTHER: + 2 PALs labeled LW621 (near LW_1.2A) and LWI0 (near LW_00.13C) + Custom chip - CAPCOM CPS-B-01 (QFP160) + NEC D4701AC +*/ +/* Note that ROMs are labeled left to right, top to bottom, instead of top to bottom, left to right as usual. */ +ROM_START( forgottn ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) + ROM_LOAD16_BYTE( "lw40.12f", 0x00000, 0x20000, CRC(73e920b7) SHA1(2df12fc1a66f488d06b0927db909da81466d7d07) ) /* Higher program numbers indicates a later revision */ + ROM_LOAD16_BYTE( "lw41.12h", 0x00001, 0x20000, CRC(58210b9e) SHA1(416cb56a81e74fce6f86c2b2519ba620457b785a) ) /* 1 byte difference: 0x66D4 == 0x0C versus 0x04 in lw15.12h below */ + ROM_LOAD16_BYTE( "lw42.13f", 0x40000, 0x20000, CRC(bea45994) SHA1(c419f65c5e0c11ae7508ec54412bf6b62fac4f72) ) + ROM_LOAD16_BYTE( "lw43.13h", 0x40001, 0x20000, CRC(539b2339) SHA1(8a9e452ef8ed05e0b956d36990266657d3077470) ) + ROM_LOAD16_WORD_SWAP( "lw-07.10g", 0x80000, 0x80000, CRC(fd252a26) SHA1(5cfb097984912a5167a8c7ec4c2e119b642f9970) ) // == lw-07.13e + + ROM_REGION( 0x400000, "gfx", 0 ) + ROMX_LOAD( "lw_2.2b", 0x000000, 0x20000, CRC(4bd75fee) SHA1(c27bfba951a0dc4f493937ceca335c50a1afeddf) , ROM_SKIP(7) ) // == lw-01.9d + ROMX_LOAD( "lw_1.2a", 0x000001, 0x20000, CRC(65f41485) SHA1(fb05dffc87ee2f2b1b6646d54b13671f8eee0429) , ROM_SKIP(7) ) // == lw-01.9d + ROMX_LOAD( "lw-08.9b", 0x000002, 0x80000, CRC(25a8e43c) SHA1(d57cee1fc508db2677e84882fb814e4d9ad20543) , ROM_GROUPWORD | ROM_SKIP(6) ) // == lw-08.9f + ROMX_LOAD( "lw_18.5e", 0x000004, 0x20000, CRC(b4b6241b) SHA1(92b6b530e18ce27ba8739ebba0d8096b1551026c) , ROM_SKIP(7) ) + ROMX_LOAD( "lw_17.5c", 0x000005, 0x20000, CRC(c5eea115) SHA1(22fe692eaf9dd00a56a76f46c19fb76bb5e5f0d6) , ROM_SKIP(7) ) + ROMX_LOAD( "lw_30.8h", 0x000006, 0x20000, CRC(b385954e) SHA1(d33adb5842e7b85d304836bd92a7a96be4ff3694) , ROM_SKIP(7) ) // == lw-12.9g + ROMX_LOAD( "lw_29.8f", 0x000007, 0x20000, CRC(7bda1ac6) SHA1(5b8bd05f52798f98ae16efa2ff61c06e28a4e3a0) , ROM_SKIP(7) ) // == lw-12.9g + ROMX_LOAD( "lw_4.3b", 0x100000, 0x20000, CRC(50cf757f) SHA1(c70d7d34ac2d6671d40dd372e241ccb60bf3bf2b) , ROM_SKIP(7) ) // == lw-01.9d + ROMX_LOAD( "lw_3.3a", 0x100001, 0x20000, CRC(c03ef278) SHA1(ad33b01bd8194025a2ecf7755894d6d638da457a) , ROM_SKIP(7) ) // == lw-01.9d + ROMX_LOAD( "lw_20.7e", 0x100004, 0x20000, CRC(df1a3665) SHA1(7ba9c0edc64d4f9a8563533ce723a0a748352a15) , ROM_SKIP(7) ) + ROMX_LOAD( "lw_19.7c", 0x100005, 0x20000, CRC(15af8440) SHA1(5afd0e833593f1a78487af489fe4384ab68f52b1) , ROM_SKIP(7) ) + ROMX_LOAD( "lw_32.9h", 0x100006, 0x20000, CRC(30967a15) SHA1(6f6c6ca2f40aa9beec63ed64f0571bebc7c1aa50) , ROM_SKIP(7) ) // == lw-12.9g + ROMX_LOAD( "lw_31.9f", 0x100007, 0x20000, CRC(c49d37fb) SHA1(ce400261a0f8d5a9b95d3823f8f52de87b8007f1) , ROM_SKIP(7) ) // == lw-12.9g + ROMX_LOAD( "lw-02.6b", 0x200000, 0x80000, CRC(43e6c5c8) SHA1(d3e6c971de0477ec4e178adc82508208dd8b397f) , ROM_GROUPWORD | ROM_SKIP(6) ) // == lw-02.12d + ROMX_LOAD( "lw_14.10b", 0x200002, 0x20000, CRC(82862cce) SHA1(727ca4ee55e076185b071a49afc87533fde9ec27) , ROM_SKIP(7) ) // == lw-09.12f + ROMX_LOAD( "lw_13.10a", 0x200003, 0x20000, CRC(b81c0e96) SHA1(09f4235786b8ff92a57112669c0385b64477eb01) , ROM_SKIP(7) ) // == lw-09.12f + ROMX_LOAD( "lw-06.9d", 0x200004, 0x80000, CRC(5b9edffc) SHA1(6fd8f4a3ab070733b52365ab1945bf86acb2bf62) , ROM_GROUPWORD | ROM_SKIP(6) ) // == lw-06.12e + ROMX_LOAD( "lw_26.10e", 0x200006, 0x20000, CRC(57bcd032) SHA1(6db0f96fb909ed02fe4b7ee25fe662ea23f884d2) , ROM_SKIP(7) ) // == lw-13.12g + ROMX_LOAD( "lw_25.10c", 0x200007, 0x20000, CRC(bac91554) SHA1(52f5de144193e0f78b9824cc8fd6f934dc19bab0) , ROM_SKIP(7) ) // == lw-13.12g + ROMX_LOAD( "lw_16.11b", 0x300002, 0x20000, CRC(40b26554) SHA1(b4b27573d6c329bc2bc4c64fd857475bf2a10877) , ROM_SKIP(7) ) // == lw-09.12f + ROMX_LOAD( "lw_15.11a", 0x300003, 0x20000, CRC(1b7d2e07) SHA1(0edf4d4b314fd9c29e7915d5d1adef6f9617f921) , ROM_SKIP(7) ) // == lw-09.12f + ROMX_LOAD( "lw_28.11e", 0x300006, 0x20000, CRC(a805ad30) SHA1(baded4ab5fe4e87d53233b5df88edc693c292fc4) , ROM_SKIP(7) ) // == lw-13.12g + ROMX_LOAD( "lw_27.11c", 0x300007, 0x20000, CRC(103c1bd2) SHA1(fc7ce74e108c30554139e55651c5348b11e9e3bd) , ROM_SKIP(7) ) // == lw-13.12g + + ROM_REGION( 0x8000, "stars", 0 ) + ROM_COPY( "gfx", 0x200000, 0x000000, 0x8000 ) + + ROM_REGION( 0x18000, "audiocpu", 0 ) + ROM_LOAD( "lw_37.13c", 0x00000, 0x08000, CRC(59df2a63) SHA1(dfe1fffc7a17179a80a2ae623e93b30a7d6df20d) ) // == lw_00b.13c + ROM_CONTINUE( 0x10000, 0x08000 ) + + ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ + ROM_LOAD( "lw-03u.12e", 0x00000, 0x20000, CRC(807d051f) SHA1(720e4733787b9b11f4d1cdce0892b69475802844) ) // == lw-03u.14c + ROM_LOAD( "lw-04u.13e", 0x20000, 0x20000, CRC(e6cd098e) SHA1(667f6e5736f76a1c4c450c4e2035574ea89d7910) ) // == lw-04u.13c + + ROM_REGION( 0x0200, "aboardplds", 0 ) + ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) ) + ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) ) + ROM_LOAD( "prg1", 0x0000, 0x0117, CRC(f1129744) SHA1(a5300f301c1a08a7da768f0773fa0fe3f683b237) ) + ROM_LOAD( "rom1", 0x0000, 0x0117, CRC(41dc73b9) SHA1(7d4c9f1693c821fbf84e32dd6ef62ddf14967845) ) + ROM_LOAD( "sou1", 0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) ) + + ROM_REGION( 0x0200, "bboardplds", 0 ) + ROM_LOAD( "lw621.1a", 0x0000, 0x0117, CRC(5eec6ce9) SHA1(5ec8b60f1f1bdba865b1fa2387987ce99ff4093a) ) + ROM_LOAD( "lwio.12b", 0x0000, 0x0117, CRC(ad52b90c) SHA1(f0fd6aeea515ee449320fe15684e6b3ab7f97bf4) ) +ROM_END + +/* B-Board 88621B-2 */ +/* These ROMs read from a dead and very unique top board. All EPROMs are type 27C1000, except LW_00.13C which is a 27C512. There are 5 surface mounted ROMs each on it's own small 88621B-sub satellite board, type HN62404FP-18 package is QFP44. The ROMs on the satellite boards are named and located as follows: LW-02 @ 6B - LW-05 @ 6D + LW-05 @ 6D (instead of LW_17.5C, LW_18.5E, LW_19.7C & LW_20.7E as above) LW-08 @ 9B LW-06 @ 9D LW-07 @ 10G + Also known to have LW-13 @ 10D instead of LW_25.10C, LW_26.10E, LW_27.11C & LW_28.11E + OTHER: 2 PALs labeled LW621 (near LW_1.2A) and LWI0 (near LW_00.13C) Custom chip - CAPCOM CPS-B-01 (QFP160) NEC D4701AC */ /* Note that ROMs are labeled left to right, top to bottom, instead of top to bottom, left to right as usual. */ -ROM_START( forgottn ) +ROM_START( forgottna ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) ROM_LOAD16_BYTE( "lw11.12f", 0x00000, 0x20000, CRC(73e920b7) SHA1(2df12fc1a66f488d06b0927db909da81466d7d07) ) ROM_LOAD16_BYTE( "lw15.12h", 0x00001, 0x20000, CRC(50d7012d) SHA1(f82a28a835f0a83b26c2c8170b824447b1d7409f) ) @@ -3909,6 +4090,50 @@ ROM_START( striderua ) ROM_LOAD( "lwio.11e", 0x0000, 0x0117, CRC(ad52b90c) SHA1(f0fd6aeea515ee449320fe15684e6b3ab7f97bf4) ) ROM_END +// 90629B-3 PCB - Converted from an SF2 'inhouse' (but with no official labels etc.) +// actually an incomplete conversion, layer enables are wrong in a number of places which causes the game to break even on real hardware. +// this is essentially a Capcom made bootleg of a Capcom game. +ROM_START( strideruc ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ + ROM_LOAD16_WORD_SWAP( "34.8f", 0x000000, 0x80000, CRC(e0fb5657) SHA1(6c7f668220de80169feea35371aff363f67f7b0c) ) + ROM_LOAD16_WORD_SWAP( "33.6f", 0x080000, 0x80000, CRC(9b3cfc08) SHA1(a7d7f270a097437affa845d80bed82a1fa874878) ) + + ROM_REGION( 0x400000, "gfx", 0 ) + ROMX_LOAD( "6.8a", 0x000000, 0x80000, CRC(4eee9aea) SHA1(5e619fd5f3f1181e32a8fd9dbb4661d74ff8a484) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "8.10a", 0x000002, 0x80000, CRC(2d7f21e4) SHA1(593cec513de40ff802084d54313bb25a4561e25d) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "5.7a", 0x000004, 0x80000, CRC(7705aa46) SHA1(6cbfa30b2852fd117d117beefba434ce41d24c2f) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "7.9a", 0x000006, 0x80000, CRC(5b18b722) SHA1(cf71c62348ca6b404279e87a6686cb3a842eb381) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "15.8c", 0x200000, 0x80000, CRC(005f000b) SHA1(e6f65af7cc3295be9efaaded352e7ae6320b4133) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "17.10c", 0x200002, 0x80000, CRC(b9441519) SHA1(bb0926dc484dae4f64c5e5a6bce20afdc7aeba55) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "14.7c", 0x200004, 0x80000, CRC(b7d04e8b) SHA1(5c5a079baa694927c33d0e0c23e5ff09d6c9d985) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "16.9c", 0x200006, 0x80000, CRC(6b4713b4) SHA1(759b8b1fc7a5c4b00d74a27c2dd11667db44b09e) , ROM_GROUPWORD | ROM_SKIP(6) ) + + ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ + ROM_LOAD( "9.12a", 0x00000, 0x08000, CRC(08d63519) SHA1(c120ecfe25c3c50bc51bc7d5a9ef1c8ca6591240) ) + ROM_CONTINUE( 0x10000, 0x08000 ) + + ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ + ROM_LOAD( "18.11c", 0x00000, 0x20000, CRC(4386bc80) SHA1(fb2b261995aeacfa13e7ee40b1a973dfb178f015) ) + ROM_LOAD( "19.12c", 0x20000, 0x20000, CRC(444536d7) SHA1(a14f5de2f6b5b29ae5161dca1f8c08c566301a91) ) + + // which of these should we be using? + /* + ROM_REGION( 0x0200, "aboardplds", ROMREGION_ERASE00 ) + ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) ) + ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) ) + ROM_LOAD( "prg1", 0x0000, 0x0117, CRC(f1129744) SHA1(a5300f301c1a08a7da768f0773fa0fe3f683b237) ) + ROM_LOAD( "rom1", 0x0000, 0x0117, CRC(41dc73b9) SHA1(7d4c9f1693c821fbf84e32dd6ef62ddf14967845) ) + ROM_LOAD( "sou1", 0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) ) + + ROM_REGION( 0x0200, "bboardplds", ROMREGION_ERASE00 ) + ROM_LOAD( "stf29.1a", 0x0000, 0x0117, CRC(043309c5) SHA1(f6b9610c9f896c495041ba56a654776a521c356b) ) + ROM_LOAD( "iob1.11d", 0x0000, 0x0117, CRC(3abc0700) SHA1(973043aa46ec6d5d1db20dc9d5937005a0f9f6ae) ) + + ROM_REGION( 0x0200, "cboardplds", ROMREGION_ERASE00 ) + ROM_LOAD( "c632.ic1", 0x0000, 0x0117, CRC(0fbd9270) SHA1(d7e737b20c44d41e29ca94be56114b31934dde81) ) + */ +ROM_END + /* B-Board 88622B-3 */ ROM_START( striderj ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ @@ -4693,11 +4918,11 @@ ROM_END /* B-Board 89624B-3 */ ROM_START( ffightua ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "ffu_36.11f", 0x00000, 0x20000, CRC(e2a48af9) SHA1(11e06f95bdf575af396dded2b84d858f6c7388f1) ) // in "30" socket - ROM_LOAD16_BYTE( "ffu_42.11h", 0x00001, 0x20000, CRC(f4bb480e) SHA1(32114df1d2f4f98a4a2280a330c7b6af8ab4d862) ) // in "35" socket - ROM_LOAD16_BYTE( "ffu_37.12f", 0x40000, 0x20000, CRC(c371c667) SHA1(633977c91a8ff09b7fe83128eced7c4dee9aee1d) ) // in "31" socket - ROM_LOAD16_BYTE( "ffu_43.12h", 0x40001, 0x20000, CRC(2f5771f9) SHA1(fb532402bc00b5619a23dfa7e4525f1717020303) ) // in "36" socket /* different CRC from ffightu, ffightu1, pcb verified */ - ROM_LOAD16_WORD_SWAP( "ff-32m.8h", 0x80000, 0x80000, CRC(c747696e) SHA1(d3362dadded31ccb7eaf71ef282d698d18edd722) ) + ROM_LOAD16_BYTE( "ffu_36.11f", 0x00000, 0x20000, CRC(e2a48af9) SHA1(11e06f95bdf575af396dded2b84d858f6c7388f1) ) // in "30" socket + ROM_LOAD16_BYTE( "ffu_42.11h", 0x00001, 0x20000, CRC(f4bb480e) SHA1(32114df1d2f4f98a4a2280a330c7b6af8ab4d862) ) // in "35" socket + ROM_LOAD16_BYTE( "ffu_37.12f", 0x40000, 0x20000, CRC(c371c667) SHA1(633977c91a8ff09b7fe83128eced7c4dee9aee1d) ) // in "31" socket + ROM_LOAD16_BYTE( "ffu_43.12h", 0x40001, 0x20000, CRC(2f5771f9) SHA1(fb532402bc00b5619a23dfa7e4525f1717020303) ) // in "36" socket /* different CRC from ffightu, ffightu1, pcb verified */ + ROM_LOAD16_WORD_SWAP( "ff-32m.8h", 0x80000, 0x80000, CRC(c747696e) SHA1(d3362dadded31ccb7eaf71ef282d698d18edd722) ) ROM_REGION( 0x200000, "gfx", 0 ) ROMX_LOAD( "ff-5m.7a", 0x000000, 0x80000, CRC(9c284108) SHA1(7868f5801347340867720255f8380548ad1a65a7) , ROM_GROUPWORD | ROM_SKIP(6) ) @@ -4728,6 +4953,41 @@ ROM_END /* B-Board 89624B-3 */ ROM_START( ffightub ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "ffu_30_3.11f", 0x00000, 0x20000, CRC(e619eb30) SHA1(41c2589a1b2cab2d0ded527a89f8e0e39e61efe1)) + ROM_LOAD16_BYTE( "ffu_35_3.11h", 0x00001, 0x20000, CRC(bca85263) SHA1(249bc81426ee93cf2efa5594d6813d5dd896cea3) ) + ROM_LOAD16_BYTE( "ffu_31_3.12f", 0x40000, 0x20000, CRC(59abd207) SHA1(9bc1f4d5dabd02cebce84f56f848694591c0629d) ) + ROM_LOAD16_BYTE( "ffu_36_3.12h", 0x40001, 0x20000, CRC(df46ece8) SHA1(aa3081918d499f56664d6bb7b7ede2055d00375d) ) + ROM_LOAD16_WORD_SWAP( "ff-32m.8h", 0x80000, 0x80000, CRC(c747696e) SHA1(d3362dadded31ccb7eaf71ef282d698d18edd722) ) + + ROM_REGION( 0x200000, "gfx", 0 ) + ROMX_LOAD( "ff-5m.7a", 0x000000, 0x80000, CRC(9c284108) SHA1(7868f5801347340867720255f8380548ad1a65a7) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "ff-7m.9a", 0x000002, 0x80000, CRC(a7584dfb) SHA1(f7b00a3ca8cb85264ab293089f9f540a8292b49c) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "ff-1m.3a", 0x000004, 0x80000, CRC(0b605e44) SHA1(5ce16af72858a57aefbf6efed820c2c51935882a) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "ff-3m.5a", 0x000006, 0x80000, CRC(52291cd2) SHA1(df5f3d3aa96a7a33ff22f2a31382942c4c4f1111) , ROM_GROUPWORD | ROM_SKIP(6) ) + + ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ + ROM_LOAD( "ff_09.12b", 0x00000, 0x08000, CRC(b8367eb5) SHA1(ec3db29fdd6200e9a8f4f8073a7e34aef731354f) ) + ROM_CONTINUE( 0x10000, 0x08000 ) + + ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ + ROM_LOAD( "ff_18.11c", 0x00000, 0x20000, CRC(375c66e7) SHA1(36189e23209ce4ae5d9cbabd1574540d0591e7b3) ) + ROM_LOAD( "ff_19.12c", 0x20000, 0x20000, CRC(1ef137f9) SHA1(974b5e72aa28b87ebfa7438efbdfeda769dedf5e) ) + + ROM_REGION( 0x0200, "aboardplds", 0 ) + ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) ) + ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) ) + ROM_LOAD( "prg1", 0x0000, 0x0117, CRC(f1129744) SHA1(a5300f301c1a08a7da768f0773fa0fe3f683b237) ) + ROM_LOAD( "rom1", 0x0000, 0x0117, CRC(41dc73b9) SHA1(7d4c9f1693c821fbf84e32dd6ef62ddf14967845) ) + ROM_LOAD( "sou1", 0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) ) + + ROM_REGION( 0x0200, "bboardplds", 0 ) + ROM_LOAD( "s224b.1a", 0x0000, 0x0117, CRC(cdc4413e) SHA1(c74c60f8f4eb125ffb6414aefba270676d9b8a2d) ) + ROM_LOAD( "iob1.11e", 0x0000, 0x0117, CRC(3abc0700) SHA1(973043aa46ec6d5d1db20dc9d5937005a0f9f6ae) ) +ROM_END + +/* B-Board 89624B-3 */ +ROM_START( ffightuc ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "ffu_30.11f", 0x00000, 0x20000, CRC(ed988977) SHA1(c718e989206bd2b68832c8fcb5667397d500ebac) ) ROM_LOAD16_BYTE( "ffu_35.11h", 0x00001, 0x20000, CRC(07bf1c21) SHA1(f21a939fd92607c7f54816dedbcb3c5818cf4183) ) ROM_LOAD16_BYTE( "ffu_31.12f", 0x40000, 0x20000, CRC(dba5a476) SHA1(2f0176dd050f9630b914f1c1ca5d96215bcf567f) ) @@ -4860,6 +5120,7 @@ ROM_START( ffightj1 ) ROM_LOAD( "lwio.12e", 0x0000, 0x0117, CRC(ad52b90c) SHA1(f0fd6aeea515ee449320fe15684e6b3ab7f97bf4) ) ROM_END + /* B-Board 88622B-3 */ ROM_START( ffightj2 ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ @@ -8871,6 +9132,48 @@ ROM_START( sf2ceblp ) ROM_LOAD( "pic16c55", 0x00000, 0x2000, BAD_DUMP CRC(f22e2311) SHA1(320edfba140728599e91c01e863a8b6d071e4bbf) ) ROM_END + + +ROM_START( sf2cebltw ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "27.12e", 0x000000, 0x20000, CRC(035ee5d9) SHA1(9d268333db96dc6d1539ea938d3b213482e276c6) ) + ROM_LOAD16_BYTE( "31.12f", 0x000001, 0x20000, CRC(353dbde1) SHA1(039785f8863fda945267fc8b9cf640d954ea9803) ) + ROM_LOAD16_BYTE( "24.9e", 0x040000, 0x20000, CRC(005b54cc) SHA1(3d3d7742c11f31cc62d81931dc970cd1f4a26835) ) + ROM_LOAD16_BYTE( "28.9f", 0x040001, 0x20000, CRC(c184d26d) SHA1(b1011e869d0b84c1ab609fcf193b46c7d9cc3b28) ) + ROM_LOAD16_BYTE( "25.10e", 0x080000, 0x20000, CRC(524f5c55) SHA1(67adfd36bb325c4a6d3e1e5b668c4dc983ac0a62) ) + ROM_LOAD16_BYTE( "29.10f", 0x080001, 0x20000, CRC(f06a12f2) SHA1(ddc431ce01392d4a7562760743abd9ea73b06cf3) ) + ROM_LOAD16_BYTE( "26.11e", 0x0c0000, 0x20000, CRC(8312d055) SHA1(e36c23c197096d50d71ceefbf93205d5758153e0) ) + ROM_LOAD16_BYTE( "30.11f", 0x0c0001, 0x20000, CRC(d0580ff2) SHA1(1b2e4c4abbe90a68283c86e7cb5328b242be5683) ) + ROM_LOAD16_WORD_SWAP( "s92_21a.5f", 0x100000, 0x80000, CRC(925a7877) SHA1(1960dca35f0ca6f2b399a9fccfbc0132ac6425d1) ) + + ROM_REGION( 0x40000, "pal", 0 ) + ROM_LOAD( "bruteforce.palce16v8h-25.11d", 0x00000, 0x40000, CRC(430f722d) SHA1(b0c0570057c782b1114819fae907f45a01c55065) ) + + ROM_REGION( 0x600000, "gfx", 0 ) + ROMX_LOAD( "s92_01.bin", 0x000000, 0x80000, CRC(03b0d852) SHA1(f370f25c96ad2b94f8c53d6b7139100285a25bef) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_02.bin", 0x000002, 0x80000, CRC(840289ec) SHA1(2fb42a242f60ba7e74009b5a90eb26e035ba1e82) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_03.bin", 0x000004, 0x80000, CRC(cdb5f027) SHA1(4c7d944fef200fdfcaf57758b901b5511188ed2e) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_04.bin", 0x000006, 0x80000, CRC(e2799472) SHA1(27d3796429338d82a8de246a0ea06dd487a87768) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_05.bin", 0x200000, 0x80000, CRC(ba8a2761) SHA1(4b696d66c51611e43522bed752654314e76d33b6) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_06.bin", 0x200002, 0x80000, CRC(e584bfb5) SHA1(ebdf1f5e2638eed3a65dda82b1ed9151a355f4c9) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_07.bin", 0x200004, 0x80000, CRC(21e3f87d) SHA1(4a4961bb68c3a1ce15f9d393d9c03ecb2466cc29) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_08.bin", 0x200006, 0x80000, CRC(befc47df) SHA1(520390420da3a0271ba90b0a933e65143265e5cf) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_10.bin", 0x400000, 0x80000, CRC(960687d5) SHA1(2868c31121b1c7564e9767b9a19cdbf655c7ed1d) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_11.bin", 0x400002, 0x80000, CRC(978ecd18) SHA1(648a59706b93c84b4206a968ecbdc3e834c476f6) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_12.bin", 0x400004, 0x80000, CRC(d6ec9a0a) SHA1(ed6143f8737013b6ef1684e37c05e037e7a80dae) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92_13.bin", 0x400006, 0x80000, CRC(ed2c67f6) SHA1(0083c0ffaf6fe7659ff0cf822be4346cd6e61329) , ROM_GROUPWORD | ROM_SKIP(6) ) + + ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ + ROM_LOAD( "s92_09.bin", 0x00000, 0x08000, CRC(08f6b60e) SHA1(8258fcaca4ac419312531eec67079b97f471179c) ) + ROM_CONTINUE( 0x10000, 0x08000 ) + + ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ + ROM_LOAD( "s92_18.bin", 0x00000, 0x20000, CRC(7f162009) SHA1(346bf42992b4c36c593e21901e22c87ae4a7d86d) ) + ROM_LOAD( "s92_19.bin", 0x20000, 0x20000, CRC(beade53f) SHA1(277c397dc12752719ec6b47d2224750bd1c07f79) ) +ROM_END + + + ROM_START( sf2amf ) /* the PCB is not working on real hardware */ ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ @@ -9225,6 +9528,87 @@ ROM_START( sf2m8 ) ROM_LOAD( "b-16.6", 0x00000, 0x40000, CRC(6cfffb11) SHA1(995526183ffd35f92e9096500a3fe6237faaa2dd) ) ROM_END +/* SF2M10 + From HBMAME (SF2H14) + Same as sf2ebbl2, except it has program roms unique to sf2h14. + + Using sf2ce gfx roms to get clean gfx (the board was a bodgy + half-done conversion attempt). + +** PCB DETAILS *** +Street Fighter II Champion Edition (bootleg) + +PCB Layout +---------- + +|-----------------------------------------------------| +|LM324 ROM1 3.579545MHz ROM10 ROM12| +|LM324 ROM2 16MHz 2018 ROM9 ROM11| +| M6295 12MHz 2018 SE235 SE005| +| 2018 | +|YM2151 2018 2018 ROM8 | +| ROM3 SE194 SE064| +|J Z80 SF004 SF001| +|A 2018 2018 | +|M 6116 6116 2018 2018 | +|M | +|A |--| | +| |6 | 62256 | +|DSWA(8)|8 |62256 62256 62256 | +| |0 |ROM4 ROM6 | +|DSWB(8)|0 |ROM5 ROM7 | +| |0 | | +|DSWC(8)|--| | +|-----------------------------------------------------| +Notes: + 68000 - Clock 12MHz + Z80 - Clock 3.579545MHz + M6295 - Clock 1.000MHz [16/16]. Pin 7 HIGH + YM2151 - Clock 3.579545MHz + 62256 - 32k x8 SRAM + 2018 - 2k x8 SRAM + 6116 - 2k x8 SRAM +*/ + +ROM_START( sf2m10 ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) + ROM_LOAD16_BYTE( "sf2h14.7", 0x000000, 0x80000, CRC(74803532) SHA1(c1f774bbc4c7b18fcac15417711a86eb852b9957) ) + ROM_LOAD16_BYTE( "sf2h14.5", 0x000001, 0x80000, CRC(66c91972) SHA1(219aecad1feb60bb758190ea82223171075c858e) ) + ROM_LOAD16_BYTE( "yyc-4.1", 0x100000, 0x20000, CRC(1073b7b6) SHA1(81ca1eab65ceac69520584bb23a684ccb9d92f89) ) + ROM_LOAD16_BYTE( "yyc-5.3", 0x100001, 0x20000, CRC(924c6ce2) SHA1(676a912652bd75da5087f0c7eae047b7681a993c) ) + + ROM_REGION( 0x600000, "gfx", 0 ) + // using the proper roms for this program + ROMX_LOAD( "s92-1m.3a", 0x000000, 0x80000, CRC(03b0d852) SHA1(f370f25c96ad2b94f8c53d6b7139100285a25bef) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-3m.5a", 0x000002, 0x80000, CRC(840289ec) SHA1(2fb42a242f60ba7e74009b5a90eb26e035ba1e82) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-2m.4a", 0x000004, 0x80000, CRC(cdb5f027) SHA1(4c7d944fef200fdfcaf57758b901b5511188ed2e) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-4m.6a", 0x000006, 0x80000, CRC(e2799472) SHA1(27d3796429338d82a8de246a0ea06dd487a87768) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-5m.7a", 0x200000, 0x80000, CRC(ba8a2761) SHA1(4b696d66c51611e43522bed752654314e76d33b6) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-7m.9a", 0x200002, 0x80000, CRC(e584bfb5) SHA1(ebdf1f5e2638eed3a65dda82b1ed9151a355f4c9) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-6m.8a", 0x200004, 0x80000, CRC(21e3f87d) SHA1(4a4961bb68c3a1ce15f9d393d9c03ecb2466cc29) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-8m.10a", 0x200006, 0x80000, CRC(befc47df) SHA1(520390420da3a0271ba90b0a933e65143265e5cf) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-10m.3c", 0x400000, 0x80000, CRC(960687d5) SHA1(2868c31121b1c7564e9767b9a19cdbf655c7ed1d) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-12m.5c", 0x400002, 0x80000, CRC(978ecd18) SHA1(648a59706b93c84b4206a968ecbdc3e834c476f6) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-11m.4c", 0x400004, 0x80000, CRC(d6ec9a0a) SHA1(ed6143f8737013b6ef1684e37c05e037e7a80dae) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "s92-13m.6c", 0x400006, 0x80000, CRC(ed2c67f6) SHA1(0083c0ffaf6fe7659ff0cf822be4346cd6e61329) , ROM_GROUPWORD | ROM_SKIP(6) ) + // and overwrite some gfx with supplied extra roms + ROMX_LOAD( "27c1024.10", 0x400000, 0x20000, CRC(84427d1b) SHA1(f988a2b53c8cc46eeb8032084f24966a539b3734) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "27c1024.12", 0x400002, 0x20000, CRC(55bc790c) SHA1(a1114b89f6fa4487210477676984c77ad94b5ef8) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "27c1024.9", 0x400004, 0x20000, CRC(f8725add) SHA1(fa3fcf6637ee4dd7667bd89766074b3c6ba4f166) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "27c1024.11", 0x400006, 0x20000, CRC(c2a5373e) SHA1(602b32e5ecc7007efe9ad30751040ee52b81f59a) , ROM_GROUPWORD | ROM_SKIP(6) ) + + ROM_REGION( 0x18000, "audiocpu", 0 ) + ROM_LOAD( "27c512.3", 0x00000, 0x08000, CRC(a4823a1b) SHA1(7b6bf59dfd578bfbbdb64c27988796783442d659) ) + ROM_CONTINUE( 0x10000, 0x08000 ) + + ROM_REGION( 0x20000, "user1", 0 ) + ROM_LOAD( "27c512.8", 0x00000, 0x10000, CRC(13ea1c44) SHA1(5b05fe4c3920e33d94fac5f59e09ff14b3e427fe) ) + + ROM_REGION( 0x40000, "oki", 0 ) + ROM_LOAD( "27c010.2", 0x00000, 0x20000, CRC(7f162009) SHA1(346bf42992b4c36c593e21901e22c87ae4a7d86d) ) + ROM_LOAD( "27c010.1", 0x20000, 0x20000, CRC(beade53f) SHA1(277c397dc12752719ec6b47d2224750bd1c07f79) ) +ROM_END + ROM_START( sf2yyc ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "b12.rom", 0x000000, 0x80000, CRC(8f742fd5) SHA1(a78a00e686856481011d8b5f5e60ed18197a5225) ) @@ -9547,7 +9931,7 @@ ROM_START( varthu ) ROM_LOAD( "sou1", 0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) ) ROM_REGION( 0x0200, "bboardplds", 0 ) - ROM_LOAD( "va63b.1a", 0x0000, 0x0117, BAD_DUMP CRC(38540e86) SHA1(86e0aba363108f80a8eff84b99d11528ad6db099) ) /* Handcrafted but works on actual US PCB. Redump needed */ + ROM_LOAD( "va63b.1a", 0x0000, 0x0117, CRC(132ab7c5) SHA1(54b78b02cdd9430c90e2289d42585ee71cf71cdc) ) ROM_LOAD( "iob1.12d", 0x0000, 0x0117, CRC(3abc0700) SHA1(973043aa46ec6d5d1db20dc9d5937005a0f9f6ae) ) ROM_LOAD( "bprg1.11d", 0x0000, 0x0117, CRC(31793da7) SHA1(400fa7ac517421c978c1ee7773c30b9ed0c5d3f3) ) ROM_END @@ -9633,7 +10017,7 @@ ROM_START( varthjr ) ROM_LOAD( "sou1", 0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) ) ROM_REGION( 0x0200, "bboardplds", 0 ) - ROM_LOAD( "va63b.1a", 0x0000, 0x0117, BAD_DUMP CRC(38540e86) SHA1(86e0aba363108f80a8eff84b99d11528ad6db099) ) /* Handcrafted but works on actual US PCB. Redump needed */ + ROM_LOAD( "va63b.1a", 0x0000, 0x0117, CRC(132ab7c5) SHA1(54b78b02cdd9430c90e2289d42585ee71cf71cdc) ) ROM_LOAD( "iob1.12d", 0x0000, 0x0117, CRC(3abc0700) SHA1(973043aa46ec6d5d1db20dc9d5937005a0f9f6ae) ) ROM_LOAD( "bprg1.11d", 0x0000, 0x0117, CRC(31793da7) SHA1(400fa7ac517421c978c1ee7773c30b9ed0c5d3f3) ) @@ -10560,7 +10944,7 @@ ROM_START( slammast ) ROM_CONTINUE( 0x10000, 0x18000 ) ROM_REGION( 0x8000, "user1", 0 ) - ROM_COPY( "audiocpu", 0x00000, 0x00000, 0x8000 ) + ROM_COPY( "audiocpu", 0x000000, 0x00000, 0x8000 ) ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */ ROM_LOAD( "mb-q1.1k", 0x000000, 0x80000, CRC(0630c3ce) SHA1(520fc74c5c3638f611fa2f1b5efb08b91747e29b) ) @@ -10623,7 +11007,7 @@ ROM_START( slammastu ) ROM_CONTINUE( 0x10000, 0x18000 ) ROM_REGION( 0x8000, "user1", 0 ) - ROM_COPY( "audiocpu", 0x00000, 0x00000, 0x8000 ) + ROM_COPY( "audiocpu", 0x000000, 0x00000, 0x8000 ) ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */ ROM_LOAD( "mb-q1.1k", 0x000000, 0x80000, CRC(0630c3ce) SHA1(520fc74c5c3638f611fa2f1b5efb08b91747e29b) ) @@ -10683,7 +11067,7 @@ ROM_START( mbomberj ) ROM_CONTINUE( 0x10000, 0x18000 ) ROM_REGION( 0x8000, "user1", 0 ) - ROM_COPY( "audiocpu", 0x00000, 0x00000, 0x8000 ) + ROM_COPY( "audiocpu", 0x000000, 0x00000, 0x8000 ) ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */ ROM_LOAD( "mb-q1.1k", 0x000000, 0x80000, CRC(0630c3ce) SHA1(520fc74c5c3638f611fa2f1b5efb08b91747e29b) ) @@ -11280,6 +11664,56 @@ ROM_START( ganbare ) ROM_LOAD( "c632.ic1", 0x0000, 0x0117, CRC(0fbd9270) SHA1(d7e737b20c44d41e29ca94be56114b31934dde81) ) ROM_END + +ROM_START( pokonyan ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "xmqq-12f.bin", 0x00000, 0x20000, CRC(196297bf) SHA1(4724c4ccb755d3d457f5224d4c4ea860664d3b10) ) + ROM_LOAD16_BYTE( "xmqq-12h.bin", 0x00001, 0x20000, CRC(2d7ee2e9) SHA1(af9f8c346e36b4bd6284913129782187e242aa3f) ) + ROM_LOAD16_BYTE( "xmqq-13f.bin", 0x40000, 0x20000, CRC(8f6abf26) SHA1(e9918abc5ca02c8b3f3b5b2410aedc350dc12ec2) ) + ROM_LOAD16_BYTE( "xmqq-13h.bin", 0x40001, 0x20000, CRC(3fefe432) SHA1(42763c047fd976c9a8fec3a38f2b132b6e2e15a9) ) + + ROM_REGION( 0x200000, "gfx", 0 ) + ROMX_LOAD( "xmqq-4b.bin", 0x000000, 0x20000, CRC(933ab76d) SHA1(a51536b0ad89e08356cbb500c60099bd2a192a76) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-4a.bin", 0x000001, 0x20000, CRC(b098e7a9) SHA1(c848ddc0e6559dac6ca23d29c12bc65ea19b7dc4) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-9b.bin", 0x000002, 0x20000, CRC(b66d62d4) SHA1(1be1b89aa24382b4a3d4585b22b83f35b2a27333) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-9a.bin", 0x000003, 0x20000, CRC(9c23e40b) SHA1(9b5de73c4c6679a53871a45743a60c7cdefc8aaa) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-5e.bin", 0x000004, 0x20000, CRC(63d06d6f) SHA1(364d81aafa4d97e8d709e13b481585f655924254) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-5c.bin", 0x000005, 0x20000, CRC(e2169bb5) SHA1(2ca3d6eeee27606af0b21c69491c3bfbe1f82ed6) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-8h.bin", 0x000006, 0x20000, CRC(113121f5) SHA1(d5b3c97e70c3f53d4d68ed56d98e84df59f42073) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-8f.bin", 0x000007, 0x20000, CRC(beb00e07) SHA1(ab0264cb98fe9d77c5acff86800273ed4bdf2e1f) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-5b.bin", 0x100000, 0x20000, CRC(05354905) SHA1(6a53c47c9d87f76bf73b8cab540910cdcfcb9133) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-5a.bin", 0x100001, 0x20000, CRC(bd40215e) SHA1(7350e56ecef8e87cf5a4d4f50231fada6fc5356b) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-10b.bin", 0x100002, 0x20000, CRC(9fa773ef) SHA1(4f0cf813cfe7fbdf20403cfab81b1c01907eb62f) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-10a.bin", 0x100003, 0x20000, CRC(638d4bc7) SHA1(fca924ad53ad1d00dc2e70436fd22de81c08115f) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-7e.bin", 0x100004, 0x20000, CRC(72c45858) SHA1(e1ea89568077739b891c95f57c867c02f6c109ff) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-7c.bin", 0x100005, 0x20000, CRC(d91cda18) SHA1(ef40cb78484355be74d2a08fdd870b49263ab57d) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-9h.bin", 0x100006, 0x20000, CRC(3cd8594b) SHA1(a099428d0f0231f91881beee0bd6a80ba2c3d693) , ROM_SKIP(7) ) + ROMX_LOAD( "xmqq-9f.bin", 0x100007, 0x20000, CRC(1ec10bed) SHA1(139563c41450591b5674d885e3260cb99b206e25) , ROM_SKIP(7) ) + + ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ + ROM_LOAD( "xmqq-13b.bin", 0x00000, 0x08000, CRC(4e8b81a8) SHA1(4a837345223c51d668ec7f4d7460871c00f71482) ) + ROM_CONTINUE( 0x10000, 0x08000 ) + + ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ + ROM_LOAD( "xmqq-12c.bin", 0x00000, 0x20000, CRC(71ac69ad) SHA1(401fe0294c6b7bc79426ab1922e02a97415cd2ef) ) + ROM_LOAD( "xmqq-13c.bin", 0x20000, 0x20000, CRC(71e29699) SHA1(8f19a925bbd47ef965c41af233359a1552c7f8b0) ) + + /* + ROM_REGION( 0x0200, "aboardplds", 0 ) + ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) ) + ROM_LOAD( "ioa1", 0x0000, 0x0117, CRC(59c7ee3b) SHA1(fbb887c5b4f5cb8df77cec710eaac2985bc482a6) ) + ROM_LOAD( "prg1", 0x0000, 0x0117, CRC(f1129744) SHA1(a5300f301c1a08a7da768f0773fa0fe3f683b237) ) + ROM_LOAD( "rom1", 0x0000, 0x0117, CRC(41dc73b9) SHA1(7d4c9f1693c821fbf84e32dd6ef62ddf14967845) ) + ROM_LOAD( "sou1", 0x0000, 0x0117, CRC(84f4b2fe) SHA1(dcc9e86cc36316fe42eace02d6df75d08bc8bb6d) ) + */ + + /* not sure + ROM_REGION( 0x0200, "bboardplds", 0 ) + ROM_LOAD( "unknown.1a", 0x0000, 0x0117, NO_DUMP ) + ROM_LOAD( "lwio.12e", 0x0000, 0x0117, CRC(ad52b90c) SHA1(f0fd6aeea515ee449320fe15684e6b3ab7f97bf4) ) + */ +ROM_END + /* Home 'CPS Changer' Unit - For MESS */ /* B-Board 91635B-2 */ @@ -11598,10 +12032,10 @@ DRIVER_INIT_MEMBER( cps_state, sf2m8 ) void cps_state::kabuki_setup(void (*decode)(UINT8 *src, UINT8 *dst)) { - UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x8000); + m_decrypt_kabuki = std::make_unique<UINT8[]>(0x8000); UINT8 *rom = memregion("audiocpu")->base(); - decode(rom, decrypt); - membank("decrypted")->set_base(decrypt); + decode(rom, m_decrypt_kabuki.get()); + membank("decrypted")->set_base(m_decrypt_kabuki.get()); } DRIVER_INIT_MEMBER(cps_state,wof) @@ -11716,7 +12150,8 @@ WRITE16_MEMBER( cps_state::sf2m3_layer_w ) /*************************************************** Game Macros *****************************************************/ -GAME( 1988, forgottn, 0, cps1_10MHz, forgottn, cps_state, forgottn, ROT0, "Capcom", "Forgotten Worlds (World)", MACHINE_SUPPORTS_SAVE ) // (c) Capcom U.S.A. but World "warning" +GAME( 1988, forgottn, 0, cps1_10MHz, forgottn, cps_state, forgottn, ROT0, "Capcom", "Forgotten Worlds (World, newer)", MACHINE_SUPPORTS_SAVE ) // (c) Capcom U.S.A. but World "warning" +GAME( 1988, forgottna, forgottn, cps1_10MHz, forgottn, cps_state, forgottn, ROT0, "Capcom", "Forgotten Worlds (World)", MACHINE_SUPPORTS_SAVE ) // (c) Capcom U.S.A. but World "warning" GAME( 1988, forgottnu, forgottn, cps1_10MHz, forgottn, cps_state, forgottn, ROT0, "Capcom", "Forgotten Worlds (USA, B-Board 88621B-2, Rev. C)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, forgottnu1, forgottn, cps1_10MHz, forgottn, cps_state, forgottn, ROT0, "Capcom", "Forgotten Worlds (USA, B-Board 88618B-2, Rev. C)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, forgottnua, forgottn, cps1_10MHz, forgottn, cps_state, forgottn, ROT0, "Capcom", "Forgotten Worlds (USA, B-Board 88618B-2, Rev. A)", MACHINE_SUPPORTS_SAVE ) @@ -11729,6 +12164,7 @@ GAME( 1988, daimakai, ghouls, cps1_10MHz, daimakai, cps_state, cps1, GAME( 1988, daimakair, ghouls, cps1_12MHz, daimakai, cps_state, cps1, ROT0, "Capcom", "Daimakaimura (Japan Resale Ver.)", MACHINE_SUPPORTS_SAVE ) // Wed.26.10.1988 in the ROMs // 12MHz verified GAME( 1989, strider, 0, cps1_10MHz, strider, cps_state, cps1, ROT0, "Capcom", "Strider (USA, B-Board 89624B-2)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, striderua, strider, cps1_10MHz, stridrua, cps_state, cps1, ROT0, "Capcom", "Strider (USA, B-Board 89624B-3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, strideruc, strider, cps1_10MHz, stridrua, cps_state, cps1, ROT0, "bootleg (Capcom)", "Strider (USA, B-Board 90629B-3, buggy Street Fighter II conversion)", MACHINE_SUPPORTS_SAVE ) // various bugs even on PCB, see rom load GAME( 1989, striderj, strider, cps1_10MHz, strider, cps_state, cps1, ROT0, "Capcom", "Strider Hiryu (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, striderjr, strider, cps1_12MHz, strider, cps_state, cps1, ROT0, "Capcom", "Strider Hiryu (Japan Resale Ver.)", MACHINE_SUPPORTS_SAVE ) // 12MHz verified GAME( 1989, dynwar, 0, cps1_10MHz, dynwar, cps_state, cps1, ROT0, "Capcom", "Dynasty Wars (USA, B-Board 89624B-?)", MACHINE_SUPPORTS_SAVE ) // (c) Capcom U.S.A. @@ -11747,7 +12183,8 @@ GAME( 1989, ffighta, ffight, cps1_10MHz, ffight, cps_state, cps1, GAME( 1989, ffightu, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (USA, set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, ffightu1, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (USA, set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, ffightua, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (USA 900112)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, ffightub, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (USA 900613)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, ffightub, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (USA 900424)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, ffightuc, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (USA 900613)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, ffightj, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, ffightj1, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (Japan 900112)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, ffightj2, ffight, cps1_10MHz, ffight, cps_state, cps1, ROT0, "Capcom", "Final Fight (Japan 900305)", MACHINE_SUPPORTS_SAVE ) @@ -11842,6 +12279,7 @@ GAME( 1992, sf2amf, sf2ce, cps1_12MHz, sf2amf, cps_state, sf2hack, GAME( 1992, sf2amf2, sf2ce, cps1_12MHz, sf2hack, cps_state, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (L735 Test Rom, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on World version GAME( 1992, sf2dkot2, sf2ce, cps1_12MHz, sf2, cps_state, cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (Double K.O. Turbo II, bootleg)", MACHINE_SUPPORTS_SAVE ) // 902140 !!! - based on USA version GAME( 1992, sf2ceblp, sf2ce, cps1_10MHz, sf2, cps_state, sf2ceblp, ROT0, "bootleg", "Street Fighter II': Champion Edition (protected bootleg on non-dash board)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on USA version +GAME( 1992, sf2cebltw, sf2ce, cps1_12MHz, sf2, cps_state, cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition ('Taiwan' bootleg with PAL)", MACHINE_SUPPORTS_SAVE ) // 'Taiwan' GAME( 1992, sf2m2, sf2ce, cps1_12MHz, sf2m2, cps_state, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (M2, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on World version GAME( 1992, sf2m3, sf2ce, sf2m3, sf2, cps_state, cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (M3, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on USA version GAME( 1992, sf2m4, sf2ce, cps1_12MHz, sf2m4, cps_state, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (M4, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920322 - based on Japan version @@ -11849,6 +12287,7 @@ GAME( 1992, sf2m5, sf2ce, cps1_12MHz, sf2hack, cps_state, sf2hack, GAME( 1992, sf2m6, sf2ce, cps1_12MHz, sf2hack, cps_state, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (M6, bootleg)", MACHINE_SUPPORTS_SAVE ) // 811102 !!! - based on World version GAME( 1992, sf2m7, sf2ce, cps1_12MHz, sf2hack, cps_state, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (M7, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on World version GAME( 1992, sf2m8, sf2ce, sf2m3, sf2, cps_state, sf2m8, ROT0, "bootleg", "Street Fighter II': Champion Edition (M8, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on USA version +GAME( 1992, sf2m10, sf2ce, sf2m10, sf2hack, cps_state, cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (M10, bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 1992, sf2yyc, sf2ce, cps1_12MHz, sf2hack, cps_state, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (YYC, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on World version GAME( 1992, sf2koryu, sf2ce, cps1_12MHz, sf2hack, cps_state, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (Xiang Long, Chinese bootleg)", MACHINE_SUPPORTS_SAVE ) // 811102 !!! - based on World version GAME( 1992, sf2dongb, sf2ce, cps1_12MHz, sf2, cps_state, sf2dongb, ROT0, "bootleg", "Street Fighter II': Champion Edition (Dongfang Bubai protection, bootleg)", MACHINE_SUPPORTS_SAVE ) // 920313 - based on World version @@ -11891,6 +12330,7 @@ GAME( 1995, megaman, 0, cps1_12MHz, megaman, cps_state, cps1, GAME( 1995, megamana, megaman, cps1_12MHz, megaman, cps_state, cps1, ROT0, "Capcom", "Mega Man: The Power Battle (CPS1, Asia 951006)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, rockmanj, megaman, cps1_12MHz, rockmanj, cps_state, cps1, ROT0, "Capcom", "Rockman: The Power Battle (CPS1, Japan 950922)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, ganbare, 0, ganbare, ganbare, cps_state, ganbare, ROT0, "Capcom", "Ganbare! Marine Kun (Japan 2K0411)", MACHINE_SUPPORTS_SAVE ) +GAME( 1994, pokonyan, 0, cps1_10MHz, pokonyan, cps_state, cps1, ROT0, "Capcom", "Pokonyan! Balloon (Japan 940322)", MACHINE_SUPPORTS_SAVE ) // 2002-10-24 was on the ROM labels, 940322 on the startup screen... take your pick /* Games released on CPS-1 hardware by Mitchell */ @@ -11899,7 +12339,7 @@ GAME( 1995, pang3r1, pang3, pang3, pang3, cps_state, pang3, GAME( 1995, pang3j, pang3, pang3, pang3, cps_state, pang3, ROT0, "Mitchell", "Pang! 3: Kaitou Tachi no Karei na Gogo (Japan 950511)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, pang3b, pang3, pang3, pang3b, cps_state, pang3b, ROT0, "bootleg", "Pang! 3 (bootleg)", MACHINE_SUPPORTS_SAVE ) // 950511 - based on Euro version -/* Home 'CPS Changer' Unit - For MESS */ +/* Home 'CPS Changer' Unit */ CONS( 1994, wofch, 0, 0, qsound, wofch, cps_state, wof, "Capcom", "Tenchi wo Kurau II: Sekiheki no Tatakai (CPS Changer, Japan 921031)", MACHINE_SUPPORTS_SAVE ) CONS( 1995, sfzch, 0, 0, cps1_12MHz, sfzch, cps_state, cps1, "Capcom", "Street Fighter Zero (CPS Changer, Japan 951020)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/cps1mis.cpp b/docs/release/src/hbmame/drivers/cps1mis.cpp index 9805dcf6e21..945afd9f3a3 100644 --- a/docs/release/src/hbmame/drivers/cps1mis.cpp +++ b/docs/release/src/hbmame/drivers/cps1mis.cpp @@ -667,6 +667,8 @@ static MACHINE_CONFIG_START( cps1frog, cps_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.35) diff --git a/docs/release/src/hbmame/drivers/fcrash.cpp b/docs/release/src/hbmame/drivers/fcrash.cpp index 5757ee74ea8..a5fd9df5a92 100644 --- a/docs/release/src/hbmame/drivers/fcrash.cpp +++ b/docs/release/src/hbmame/drivers/fcrash.cpp @@ -101,7 +101,7 @@ WRITE16_MEMBER( cps_state::fcrash_soundlatch_w ) { if (ACCESSING_BITS_0_7) { - soundlatch_byte_w(space, 0, data & 0xff); + m_soundlatch->write(space, 0, data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } } @@ -110,7 +110,7 @@ WRITE16_MEMBER(cps_state::cawingbl_soundlatch_w) { if (ACCESSING_BITS_8_15) { - soundlatch_byte_w(space, 0, data >> 8); + m_soundlatch->write(space, 0, data >> 8); m_audiocpu->set_input_line(0, HOLD_LINE); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(50)); /* boost the interleave or some voices get dropped */ } @@ -816,7 +816,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, cps_state ) AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE("ym1", ym2203_device, read, write) AM_RANGE(0xdc00, 0xdc01) AM_DEVREADWRITE("ym2", ym2203_device, read, write) AM_RANGE(0xe000, 0xe000) AM_WRITE(fcrash_snd_bankswitch_w) - AM_RANGE(0xe400, 0xe400) AM_READ(soundlatch_byte_r) + AM_RANGE(0xe400, 0xe400) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_RANGE(0xe800, 0xe800) AM_WRITE(fcrash_msm5205_0_data_w) AM_RANGE(0xec00, 0xec00) AM_WRITE(fcrash_msm5205_1_data_w) ADDRESS_MAP_END @@ -827,7 +827,7 @@ static ADDRESS_MAP_START( kodb_sound_map, AS_PROGRAM, 8, cps_state ) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("2151", ym2151_device, read, write) AM_RANGE(0xe400, 0xe400) AM_DEVREADWRITE("oki", okim6295_device, read, write) - AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_byte_r) + AM_RANGE(0xe800, 0xe800) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END static ADDRESS_MAP_START( sf2mdt_z80map, AS_PROGRAM, 8, cps_state ) @@ -835,7 +835,7 @@ static ADDRESS_MAP_START( sf2mdt_z80map, AS_PROGRAM, 8, cps_state ) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE("2151", ym2151_device, read, write) - AM_RANGE(0xdc00, 0xdc00) AM_READ(soundlatch_byte_r) + AM_RANGE(0xdc00, 0xdc00) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_RANGE(0xe000, 0xe000) AM_WRITE(sf2mdt_snd_bankswitch_w) AM_RANGE(0xe400, 0xe400) AM_WRITE(fcrash_msm5205_0_data_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(fcrash_msm5205_1_data_w) @@ -847,7 +847,7 @@ static ADDRESS_MAP_START( knightsb_z80map, AS_PROGRAM, 8, cps_state ) AM_RANGE(0xcffe, 0xcfff) AM_WRITENOP // writes lots of data AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE("2151", ym2151_device, read, write) - AM_RANGE(0xdc00, 0xdc00) AM_READ(soundlatch_byte_r) + AM_RANGE(0xdc00, 0xdc00) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_RANGE(0xe000, 0xe000) AM_WRITE(knightsb_snd_bankswitch_w) AM_RANGE(0xe400, 0xe400) AM_WRITE(fcrash_msm5205_0_data_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(fcrash_msm5205_1_data_w) @@ -861,8 +861,8 @@ static ADDRESS_MAP_START( sgyxz_sound_map, AS_PROGRAM, 8, cps_state ) AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_device, read, write) AM_RANGE(0xf004, 0xf004) AM_WRITE(cps1_snd_bankswitch_w) AM_RANGE(0xf006, 0xf006) AM_WRITE(cps1_oki_pin7_w) /* controls pin 7 of OKI chip */ - AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_byte_r) /* Sound command */ - AM_RANGE(0xf00a, 0xf00a) AM_READ(soundlatch2_byte_r) /* Sound timer fade */ + AM_RANGE(0xf008, 0xf008) AM_DEVREAD("soundlatch", generic_latch_8_device, read) + AM_RANGE(0xf00a, 0xf00a) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) ADDRESS_MAP_END @@ -1584,6 +1584,7 @@ static MACHINE_CONFIG_START( fcrash, cps_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_SOUND_ADD("ym1", YM2203, 24000000/6) /* ? */ MCFG_SOUND_ROUTE(0, "mono", 0.10) @@ -1617,8 +1618,8 @@ static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, cps_state ) AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_device, read, write) AM_RANGE(0xf004, 0xf004) AM_WRITE(cps1_snd_bankswitch_w) AM_RANGE(0xf006, 0xf006) AM_WRITE(cps1_oki_pin7_w) /* controls pin 7 of OKI chip */ - AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_byte_r) /* Sound command */ - AM_RANGE(0xf00a, 0xf00a) AM_READ(soundlatch2_byte_r) /* Sound timer fade */ + AM_RANGE(0xf008, 0xf008) AM_DEVREAD("soundlatch", generic_latch_8_device, read) /* Sound command */ + AM_RANGE(0xf00a, 0xf00a) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) /* Sound timer fade */ ADDRESS_MAP_END static MACHINE_CONFIG_START( cawingb, cps_state ) @@ -1647,6 +1648,8 @@ static MACHINE_CONFIG_START( cawingb, cps_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) @@ -1694,6 +1697,7 @@ static MACHINE_CONFIG_START( kodb, cps_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) @@ -3048,90 +3052,6 @@ GAME( 1999, sgyxz, wof, sgyxz, sgyxz, cps_state, cps1, ROT0, GAME( 1990, cawingb, cawing, cawingb, cawingbl, cps_state, cawingbl, ROT0, "bootleg", "Carrier Air Wing (bootleg)", MACHINE_SUPPORTS_SAVE ) -WRITE16_MEMBER(cps_state::varthb_layer_w) -{ - if (data > 0x9000) - m_cps_a_regs[0x06 / 2] = data; -} - -static ADDRESS_MAP_START( varthb_map, AS_PROGRAM, 16, cps_state ) - AM_RANGE(0x000000, 0x1fffff) AM_ROM - AM_RANGE(0x800000, 0x800001) AM_READ_PORT("IN1") /* Player input ports */ - AM_RANGE(0x800006, 0x800007) AM_WRITE(cps1_soundlatch_w) /* Sound command */ - AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */ - AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w) - AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_SHARE("cps_a_regs") /* CPS-A custom */ - AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_SHARE("cps_b_regs") /* CPS-B custom (mapped by LWIO/IOB1 PAL on B-board) */ - AM_RANGE(0x800188, 0x800189) AM_WRITE(varthb_layer_w) - AM_RANGE(0x980000, 0x98000b) AM_WRITE(dinopic_layer_w) - AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_SHARE("gfxram") /* SF2CE executes code from here */ - AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("mainram") -ADDRESS_MAP_END - -static MACHINE_CONFIG_START( varthb, cps_state ) - - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) - MCFG_CPU_PROGRAM_MAP(varthb_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt) - - MCFG_CPU_ADD("audiocpu", Z80, 3579545) - MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map) - - MCFG_MACHINE_START_OVERRIDE(cps_state,cps1) - - /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(64*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) - MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_cps1) - MCFG_SCREEN_VBLANK_DRIVER(cps_state, screen_eof_cps1) - MCFG_SCREEN_PALETTE("palette") - - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1) - MCFG_PALETTE_ADD("palette", 0xc00) - - MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */ - MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) - MCFG_SOUND_ROUTE(0, "mono", 0.35) - MCFG_SOUND_ROUTE(1, "mono", 0.35) - - MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) -MACHINE_CONFIG_END - -ROM_START( varthb ) - ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "2", 0x000000, 0x80000, CRC(2f010023) SHA1(bf4b6c0cd82cf1b86e17d6ea2670110c06e6eabe) ) - ROM_LOAD16_BYTE( "1", 0x000001, 0x80000, CRC(0861dff3) SHA1(bf6dfe18ecaeaa1bbea09267014891c4a4a07943) ) - ROM_LOAD16_BYTE( "4", 0x100000, 0x10000, CRC(aa51e43b) SHA1(46b9dab844c55b50a47d048e5bb114911773699c) ) - ROM_LOAD16_BYTE( "3", 0x100001, 0x10000, CRC(f7e4f2f0) SHA1(2ce4eadb2d6a0e0d5745323eff2c899950ad4d3b) ) - - ROM_REGION( 0x200000, "gfx", 0 ) - ROMX_LOAD( "14", 0x000000, 0x40000, CRC(7ca73780) SHA1(26909db32f84157cd05719e5d1e715e76636d292) , ROM_SKIP(7) ) - ROMX_LOAD( "13", 0x000001, 0x40000, CRC(9fb11869) SHA1(a434fb0b588f934aaa68139495e1212a63ccf162) , ROM_SKIP(7) ) - ROMX_LOAD( "12", 0x000002, 0x40000, CRC(afeba416) SHA1(e722c65ea2e2bac3251c32208899484aa5ef6ad2) , ROM_SKIP(7) ) - ROMX_LOAD( "11", 0x000003, 0x40000, CRC(9eef3507) SHA1(ae03064ca5681fbdc43a34c54aaac11c8467428b) , ROM_SKIP(7) ) - ROMX_LOAD( "10", 0x000004, 0x40000, CRC(eeec6183) SHA1(40dc9c86e90d7c1a2ad600c195fe387180d95fd4) , ROM_SKIP(7) ) - ROMX_LOAD( "9", 0x000005, 0x40000, CRC(0e94f718) SHA1(249534f2323abcdb24099d0abc24c229c699ba94) , ROM_SKIP(7) ) - ROMX_LOAD( "8", 0x000006, 0x40000, CRC(c4ddc5b4) SHA1(79c2a42a664e387932b7804e7a80f5753338c3b0) , ROM_SKIP(7) ) - ROMX_LOAD( "7", 0x000007, 0x40000, CRC(8941ca12) SHA1(5ad5d47b8614c2899d05c65dc3b74947d4bac561) , ROM_SKIP(7) ) - - ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ - ROM_LOAD( "6", 0x00000, 0x08000, CRC(7a99446e) SHA1(ca027f41e3e58be5abc33ad7380746658cb5380a) ) // == va_09.12b - ROM_CONTINUE( 0x10000, 0x08000 ) - - ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ - ROM_LOAD( "5", 0x00000, 0x40000, CRC(1547e595) SHA1(27f47b1afd9700afd9e8167d7e4e2888be34a9e5) ) -ROM_END - static ADDRESS_MAP_START( captcommb2_map, AS_PROGRAM, 16, cps_state ) AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x800000, 0x800001) AM_READ_PORT("IN1") /* Player input ports */ @@ -3187,6 +3107,7 @@ static MACHINE_CONFIG_START( captcommb2, cps_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_YM2151_ADD("2151", 3579545) MCFG_SOUND_ROUTE(0, "mono", 0.35) @@ -3228,5 +3149,4 @@ ROM_START( captcommb2 ) ROM_END -GAME( 1992, varthb, varth, varthb, varth, cps_state, dinopic, ROT270, "bootleg", "Varth: Operation Thunderstorm (bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, captcommb2,captcomm, captcommb2,captcomm, cps_state, cps1, ROT0, "bootleg", "Captain Commando (bootleg with YM2151 + 2xMSM5205)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/ir.cpp b/docs/release/src/hbmame/drivers/ir.cpp index e1e91fc988b..54d4966d1ab 100644 --- a/docs/release/src/hbmame/drivers/ir.cpp +++ b/docs/release/src/hbmame/drivers/ir.cpp @@ -48,8 +48,7 @@ Notes about colour proms: 1. The proms from sets 'invrvnga' and 'invrvng3' are the correct ones. The prom - from 'invrvng3' is used for the other sets, as their proms haven't shown up - yet. + from 'invrvng3' is used for the other sets, as their proms haven't shown up yet. 2. Real name for 'invrvnga' prom is '3r.bin' ; for 'invrvng3' is 'ir.clr'. @@ -101,9 +100,9 @@ public: DECLARE_READ8_MEMBER(mw8080bw_shift_result_rev_r); DECLARE_READ8_MEMBER(mw8080bw_reversable_shift_result_r); DECLARE_WRITE8_MEMBER(mw8080bw_reversable_shift_count_w); - DECLARE_READ8_MEMBER(invrvnge_02_r); - DECLARE_WRITE8_MEMBER(invrvnge_03_w); - DECLARE_WRITE8_MEMBER(invrvnge_05_w); + DECLARE_READ8_MEMBER(port02_r); + DECLARE_WRITE8_MEMBER(port03_w); + DECLARE_WRITE8_MEMBER(port05_w); DECLARE_MACHINE_START(ir); DECLARE_MACHINE_RESET(ir); TIMER_CALLBACK_MEMBER(mw8080bw_interrupt_callback); @@ -127,7 +126,7 @@ private: }; -READ8_MEMBER(ir_state::invrvnge_02_r) +READ8_MEMBER(ir_state::port02_r) { UINT8 data = ioport("IN2")->read(); if (m_flip_screen) return data; @@ -144,11 +143,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( invrvnge_io_map, AS_IO, 8, ir_state ) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") - AM_RANGE(0x02, 0x02) AM_READ(invrvnge_02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) - AM_RANGE(0x03, 0x03) AM_DEVREAD("mb14241", mb14241_device, shift_result_r) AM_WRITE(invrvnge_03_w) + AM_RANGE(0x02, 0x02) AM_READ(port02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) + AM_RANGE(0x03, 0x03) AM_DEVREAD("mb14241", mb14241_device, shift_result_r) AM_WRITE(port03_w) AM_RANGE(0x04, 0x04) AM_DEVWRITE("mb14241", mb14241_device, shift_data_w) - AM_RANGE(0x05, 0x05) AM_WRITE(invrvnge_05_w) - //AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) + AM_RANGE(0x05, 0x05) AM_WRITE(port05_w) + AM_RANGE(0x06, 0x06) AM_WRITENOP //(watchdog_reset_w) ADDRESS_MAP_END //static ADDRESS_MAP_START( invrvnge_sound_map, AS_PROGRAM, 8, ir_state ) @@ -161,7 +160,7 @@ static INPUT_PORTS_START( ir ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_DIPNAME( 0x06, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6") - PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) // [code: 0x3b1-3b5] + PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) // [code: 0x3b1-3b5] PORT_DIPSETTING( 0x02, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x04, DEF_STR( Harder ) ) PORT_DIPSETTING( 0x06, DEF_STR( Hardest ) ) @@ -172,7 +171,7 @@ static INPUT_PORTS_START( ir ) PORT_DIPNAME( 0x80, 0x80, "Fuel Destroyed by Comet" ) PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x80, "6" ) - //PORT_DIPNAME( 0x80, 0x00, "Fuel Usage" ) // [code: 0x1cb0-1cb6] + //PORT_DIPNAME( 0x80, 0x00, "Fuel Usage" ) // [code: 0x1cb0-1cb6] //PORT_DIPSETTING( 0x80, "Fast" ) //PORT_DIPSETTING( 0x00, "Slow" ) @@ -184,7 +183,7 @@ static INPUT_PORTS_START( ir ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) // [code: 0x750-75B] causes this switch to be ineffective + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) // [code: 0x750-75B] causes this switch to be ineffective PORT_START("IN2") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2") @@ -194,7 +193,7 @@ static INPUT_PORTS_START( ir ) PORT_DIPSETTING( 0x03, "6" ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4") - PORT_DIPSETTING( 0x00, "1500" ) // [code: 0x3b9-3c9] + PORT_DIPSETTING( 0x00, "1500" ) // [code: 0x3b9-3c9] PORT_DIPSETTING( 0x08, "2000" ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2) @@ -337,7 +336,7 @@ static const char *const ir_sample_names[] = /* Player 1 start sequence: 0x0c, 0x20, 0x22. */ /* Unknown codes: 0x0A, 0x0c */ /*************************************************************************************/ -WRITE8_MEMBER(ir_state::invrvnge_03_w) +WRITE8_MEMBER(ir_state::port03_w) { switch (data) { @@ -425,7 +424,7 @@ WRITE8_MEMBER(ir_state::invrvnge_03_w) break; case 0x4c: - m_samples->stop(0); // using this to stop sound if game tilted + m_samples->stop(0); // using this to stop sound if game tilted case 0x01: /* These 3 play at boot time */ case 0x40: /* no idea if they are actual sounds */ case 0x44: @@ -439,7 +438,7 @@ WRITE8_MEMBER(ir_state::invrvnge_03_w) } } -WRITE8_MEMBER(ir_state::invrvnge_05_w) +WRITE8_MEMBER(ir_state::port05_w) { /* 00 - normal play diff --git a/docs/release/src/hbmame/drivers/kof2000.cpp b/docs/release/src/hbmame/drivers/kof2000.cpp index d925eacfc24..5031a6c7a17 100644 --- a/docs/release/src/hbmame/drivers/kof2000.cpp +++ b/docs/release/src/hbmame/drivers/kof2000.cpp @@ -75,6 +75,33 @@ ROM_START( kof2000d ) ROM_LOAD16_BYTE( "257d.c8", 0x3000001, 0x800000, CRC(0fa30e5f) SHA1(0cb7fa6b0219e1af2df9b97786c677651a78f37a) ) ROM_END +ROM_START( kof2000ev ) // all confirmed (alt m1 = d404db70) + ROM_REGION( 0x900000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "neo-sma.ev", 0x0c0000, 0x040000, CRC(329d80c9) SHA1(b1360c265a17a14b885dccfce67d14b3e5bc43a5) ) + ROM_LOAD16_WORD_SWAP( "257ev.p1", 0x100000, 0x400000, CRC(70b76979) SHA1(d6543c5399f9064423923effe0558dbe2d46c1d7) ) + ROM_LOAD16_WORD_SWAP( "257ev.p2", 0x500000, 0x400000, CRC(1ec748c2) SHA1(d2d9c78f35a148ed7629d6be02f4264956849beb) ) + + NEO_SFIX_MT_512K + + NEO_BIOS_AUDIO_ENCRYPTED_256K( "257-m1.m1", CRC(4b749113) SHA1(2af2361146edd0ce3966614d90165a5c1afb8de4) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "257-v1.v1", 0x000000, 0x400000, CRC(17cde847) SHA1(4bcc0205b70dc6d9216b29025450c9c5b08cb65d) ) + ROM_LOAD( "257-v2.v2", 0x400000, 0x400000, CRC(1afb20ff) SHA1(57dfd2de058139345ff2b744a225790baaecd5a2) ) + ROM_LOAD( "257-v3.v3", 0x800000, 0x400000, CRC(4605036a) SHA1(51b228a0600d38a6ec37aec4822879ec3b0ee106) ) + ROM_LOAD( "257-v4.v4", 0xc00000, 0x400000, CRC(764bbd6b) SHA1(df23c09ca6cf7d0ae5e11ff16e30c159725106b3) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "257ev.c1", 0x0000000, 0x800000, CRC(c89d1994) SHA1(2eb8a27f39dea743907b4be9e9d99f1858a30ba4) ) + ROM_LOAD16_BYTE( "257ev.c2", 0x0000001, 0x800000, CRC(19754968) SHA1(ca9692d5eac8e6eef5e5dd9888c5e8edcc9a0a7a) ) + ROM_LOAD16_BYTE( "257ev.c3", 0x1000000, 0x800000, CRC(c76b919b) SHA1(3f6245580e55c63d248478818005348f0cb92a6b) ) + ROM_LOAD16_BYTE( "257ev.c4", 0x1000001, 0x800000, CRC(5e03f2af) SHA1(85b7ec527a70411ad27d32a1169915b62230a3a7) ) + ROM_LOAD16_BYTE( "257ev.c5", 0x2000000, 0x800000, CRC(6a3b2fbd) SHA1(dbcf018f96767f753a2bab87f8d31fa6f6ef98d2) ) + ROM_LOAD16_BYTE( "257ev.c6", 0x2000001, 0x800000, CRC(ac4a8edc) SHA1(a305c8c5df3c2191fcdb73d799074a4191f2a252) ) + ROM_LOAD16_BYTE( "257ev.c7", 0x3000000, 0x800000, CRC(608ffca9) SHA1(0d3b184e44b9833f7338514e5633ccb3b3e39fb1) ) + ROM_LOAD16_BYTE( "257ev.c8", 0x3000001, 0x800000, CRC(73280ea8) SHA1(76bad66577b6d9618f2a190d54259eb3b1082d69) ) +ROM_END + ROM_START( kof2000r ) ROM_REGION( 0x900000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "257r.p3", 0x0c0000, 0x040000, CRC(11b98ae2) SHA1(fd901690334ccc26f0680427b05b5c4aad8b7e1a) ) @@ -1132,6 +1159,7 @@ ROM_END GAME( 2000, kof2000d, kof2000, neogeo_noslot, neogeo, neogeo_hbmame, kof2000d, ROT0, "SNK", "Kof2000 (decrypted C)", MACHINE_SUPPORTS_SAVE ) +GAME( 2000, kof2000ev, kof2000, neogeo_noslot, neogeo, neogeo_noslot_state, kof2000, ROT0, "hack", "Kof2000 (unknown ev)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, kof2000r, kof2000, neogeo_noslot, neogeo, neogeo_noslot_state, kof2000, ROT0, "hack", "Kof2000 (KOF REMIX PRO)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, kof2kbh, kof2000, neogeo_noslot, neogeo, neogeo_hbmame, kof2000h, ROT0, "Dodowang","Kof2000 (Add Char - Zero has icon)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, kof2kbj, kof2000, neogeo_noslot, neogeo, neogeo_hbmame, kof2000m, ROT0, "Jason/K3", "Kof2000 (Add Char set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/kof2002.cpp b/docs/release/src/hbmame/drivers/kof2002.cpp index 8be202e34fe..7b87cc02b8d 100644 --- a/docs/release/src/hbmame/drivers/kof2002.cpp +++ b/docs/release/src/hbmame/drivers/kof2002.cpp @@ -67,6 +67,30 @@ DRIVER_INIT_MEMBER( neogeo_hbmame, kof2k2ps2a ) +ROM_START( kof200215 ) // all confirmed + ROM_REGION( 0x600000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265_15.p1", 0x000000, 0x4551cc, CRC(d64def5c) SHA1(8a973b3dff88969fcd890fba321fc56382c08bf6) ) + ROM_LOAD16_WORD_SWAP( "265_15.p2", 0x100000, 0x454f52, CRC(53317848) SHA1(3b24f3c9ab36c47609abbac66e5508e545646381) ) + + NEO_SFIX_MT_128K + + NEO_BIOS_AUDIO_ENCRYPTED_128K( "265-m1.m1", CRC(85aaa632) SHA1(744fba4ca3bc3a5873838af886efb97a8a316104) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265-v1.v1", 0x000000, 0x800000, CRC(15e8f3f5) SHA1(7c9e6426b9fa6db0158baa17a6485ffce057d889) ) + ROM_LOAD( "265-v2.v2", 0x800000, 0x800000, CRC(da41d6f9) SHA1(a43021f1e58947dcbe3c8ca5283b20b649f0409d) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265_15.c1", 0x0000000, 0x800000, CRC(ede8dfa4) SHA1(bc33796215918832faac32adfc6a0a4b2a723760) ) + ROM_LOAD16_BYTE( "265_15.c2", 0x0000001, 0x800000, CRC(98773563) SHA1(d64f31ccff699ee12554ed9a7c703a514bcfa054) ) + ROM_LOAD16_BYTE( "265_15.c3", 0x1000000, 0x800000, CRC(5b8deef8) SHA1(55f78ae33bce5ca4886c620f02cef463d86f58f0) ) + ROM_LOAD16_BYTE( "265_15.c4", 0x1000001, 0x800000, CRC(cb69cd39) SHA1(deaa9a5c5db75bd515fb6a532d5353207f763fbb) ) + ROM_LOAD16_BYTE( "265_15.c5", 0x2000000, 0x800000, CRC(8e0937d8) SHA1(5ccd8a56bc6a1d646879f3a7d4992da11c44ee4c) ) + ROM_LOAD16_BYTE( "265_15.c6", 0x2000001, 0x800000, CRC(42acb491) SHA1(d81bbbac95091e0a4ccf626c0d7f9ed870cd6600) ) + ROM_LOAD16_BYTE( "265_15.c7", 0x3000000, 0x800000, CRC(f4b5e445) SHA1(dff6fe887cdf6d0eb758f891ede85ed31463c513) ) + ROM_LOAD16_BYTE( "265_15.c8", 0x3000001, 0x800000, CRC(598d8826) SHA1(7432299d265af95835d82a43d0d4e322cd487c55) ) +ROM_END + ROM_START( kof2002d ) ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265-p1.p1", 0x000000, 0x100000, CRC(9ede7323) SHA1(ad9d45498777fda9fa58e75781f48e09aee705a6) ) @@ -3439,6 +3463,7 @@ ROM_END +GAME( 2002, kof200215, kof2002, neogeo_noslot, neogeo, neogeo_noslot_state, kof2002, ROT0, "hack", "Kof2002 (MAGIC PLUS II)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2002d, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002d, ROT0, "Eolith / Playmore", "Kof2002 (decrypted C)", MACHINE_SUPPORTS_SAVE ) GAME( 2005, kof2002x, kof2002, neogeo_noslot, neogeo, neogeo_noslot_state, kof2002, ROT0, "hack", "Kof2002 (Babel ice field remix)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2ath, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 (Athena hack)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/kof2003.cpp b/docs/release/src/hbmame/drivers/kof2003.cpp index 861d0edfd9b..91cb9527b7a 100644 --- a/docs/release/src/hbmame/drivers/kof2003.cpp +++ b/docs/release/src/hbmame/drivers/kof2003.cpp @@ -64,7 +64,7 @@ DRIVER_INIT_MEMBER( neogeo_hbmame, kof2k3pcd ) // decrypted C & decrypted Bios m_pcm2_prot->neo_pcm2_swap(ym_region, ym_region_size, 5); neogeo_noslot_state::kf2k3pcb_decrypt_s1data(); - m_maincpu->space(AS_PROGRAM).install_rom(0xc00000, 0xc7ffff, 0, 0x080000, memregion("mainbios")->base()); // 512k bios + m_maincpu->space(AS_PROGRAM).install_rom(0xc00000, 0xc7ffff, 0x080000, memregion("mainbios")->base()); // 512k bios } diff --git a/docs/release/src/hbmame/drivers/kof98.cpp b/docs/release/src/hbmame/drivers/kof98.cpp index d35f1c66c24..bd43459e4a1 100644 --- a/docs/release/src/hbmame/drivers/kof98.cpp +++ b/docs/release/src/hbmame/drivers/kof98.cpp @@ -57,13 +57,13 @@ ROM_START( kof98ae ) // not used, for experimentation ROM_LOAD16_BYTE( "242ae.c6", 0x2000001, 0x800000, CRC(982ba2b3) SHA1(232ce3be7beaad13b35865da770157ef4b29a7a9) ) ROM_LOAD16_BYTE( "242ae.c7", 0x3000000, 0x800000, CRC(8d495552) SHA1(20ff76b681b2e544c5a57060bb98ab6bb91bea3c) ) ROM_LOAD16_BYTE( "242ae.c8", 0x3000001, 0x800000, CRC(8bfc3417) SHA1(38bb85563d0a7f008a64cf76d71d82b935cd98e5) ) - ROM_LOAD16_BYTE( "242ae.c9", 0x4000001, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) + ROM_LOAD16_BYTE( "242ae.c9", 0x4000000, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) ROM_LOAD16_BYTE( "242ae.c10", 0x4000001, 0x800000, CRC(4bd8412d) SHA1(72e9cc6e3df8000d0a7fc7a89257dd0ce56fc909) ) - ROM_LOAD16_BYTE( "242ae.c11", 0x5000001, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) + ROM_LOAD16_BYTE( "242ae.c11", 0x5000000, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) ROM_LOAD16_BYTE( "242ae.c12", 0x5000001, 0x800000, CRC(f165589e) SHA1(6bdcb1dd9ce507fcae40d0aba42a2c1300987479) ) ROM_END -ROM_START( kof98ae0 ) // Anniversary Edition, multiple problems with bad gfx +ROM_START( kof98ae0 ) // Anniversary Edition ROM_REGION( 0x700000, "maincpu", 0 ) // These are corrupt during attract mode fight (where cars are driving past), do not use ROM_LOAD16_WORD_SWAP( "242ae0.p1", 0x000000, 0x100000, CRC(23a80b3e) SHA1(b1afaf382ffd5a1d72ae5ca18c11a751a11d7654) ) @@ -89,13 +89,13 @@ ROM_START( kof98ae0 ) // Anniversary Edition, multiple problems with bad gfx ROM_LOAD16_BYTE( "242ae.c6", 0x2000001, 0x800000, CRC(982ba2b3) SHA1(232ce3be7beaad13b35865da770157ef4b29a7a9) ) ROM_LOAD16_BYTE( "242ae.c7", 0x3000000, 0x800000, CRC(8d495552) SHA1(20ff76b681b2e544c5a57060bb98ab6bb91bea3c) ) ROM_LOAD16_BYTE( "242ae.c8", 0x3000001, 0x800000, CRC(8bfc3417) SHA1(38bb85563d0a7f008a64cf76d71d82b935cd98e5) ) - ROM_LOAD16_BYTE( "242ae.c9", 0x4000001, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) + ROM_LOAD16_BYTE( "242ae.c9", 0x4000000, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) ROM_LOAD16_BYTE( "242ae.c10", 0x4000001, 0x800000, CRC(4bd8412d) SHA1(72e9cc6e3df8000d0a7fc7a89257dd0ce56fc909) ) - ROM_LOAD16_BYTE( "242ae.c11", 0x5000001, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) + ROM_LOAD16_BYTE( "242ae.c11", 0x5000000, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) ROM_LOAD16_BYTE( "242ae.c12", 0x5000001, 0x800000, CRC(f165589e) SHA1(6bdcb1dd9ce507fcae40d0aba42a2c1300987479) ) ROM_END -ROM_START( kof98ae1 ) // Anniversary Edition, multiple problems with bad gfx +ROM_START( kof98ae1 ) // Anniversary Edition ROM_REGION( 0x700000, "maincpu", 0 ) // These are corrupt during attract mode fight (where cars are driving past), do not use ROM_LOAD16_WORD_SWAP( "242ae1.p1", 0x000000, 0x100000, CRC(c9188c66) SHA1(9b248df5438cd555314ec71e52e7da6cfb192219) ) @@ -121,13 +121,13 @@ ROM_START( kof98ae1 ) // Anniversary Edition, multiple problems with bad gfx ROM_LOAD16_BYTE( "242ae.c6", 0x2000001, 0x800000, CRC(982ba2b3) SHA1(232ce3be7beaad13b35865da770157ef4b29a7a9) ) ROM_LOAD16_BYTE( "242ae.c7", 0x3000000, 0x800000, CRC(8d495552) SHA1(20ff76b681b2e544c5a57060bb98ab6bb91bea3c) ) ROM_LOAD16_BYTE( "242ae.c8", 0x3000001, 0x800000, CRC(8bfc3417) SHA1(38bb85563d0a7f008a64cf76d71d82b935cd98e5) ) - ROM_LOAD16_BYTE( "242ae.c9", 0x4000001, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) + ROM_LOAD16_BYTE( "242ae.c9", 0x4000000, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) ROM_LOAD16_BYTE( "242ae.c10", 0x4000001, 0x800000, CRC(4bd8412d) SHA1(72e9cc6e3df8000d0a7fc7a89257dd0ce56fc909) ) - ROM_LOAD16_BYTE( "242ae.c11", 0x5000001, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) + ROM_LOAD16_BYTE( "242ae.c11", 0x5000000, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) ROM_LOAD16_BYTE( "242ae.c12", 0x5000001, 0x800000, CRC(f165589e) SHA1(6bdcb1dd9ce507fcae40d0aba42a2c1300987479) ) ROM_END -ROM_START( kof98ae2 ) // Anniversary Edition, multiple problems with bad gfx +ROM_START( kof98ae2 ) // Anniversary Edition ROM_REGION( 0x700000, "maincpu", 0 ) // These are corrupt during attract mode fight (where cars are driving past), do not use ROM_LOAD16_WORD_SWAP( "242ae2.p1", 0x000000, 0x100000, CRC(74e20ae9) SHA1(84d17fb0ee462fe491e3220e935cb588f8121611) ) @@ -153,12 +153,76 @@ ROM_START( kof98ae2 ) // Anniversary Edition, multiple problems with bad gfx ROM_LOAD16_BYTE( "242ae.c6", 0x2000001, 0x800000, CRC(982ba2b3) SHA1(232ce3be7beaad13b35865da770157ef4b29a7a9) ) ROM_LOAD16_BYTE( "242ae.c7", 0x3000000, 0x800000, CRC(8d495552) SHA1(20ff76b681b2e544c5a57060bb98ab6bb91bea3c) ) ROM_LOAD16_BYTE( "242ae.c8", 0x3000001, 0x800000, CRC(8bfc3417) SHA1(38bb85563d0a7f008a64cf76d71d82b935cd98e5) ) - ROM_LOAD16_BYTE( "242ae.c9", 0x4000001, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) + ROM_LOAD16_BYTE( "242ae.c9", 0x4000000, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) ROM_LOAD16_BYTE( "242ae.c10", 0x4000001, 0x800000, CRC(4bd8412d) SHA1(72e9cc6e3df8000d0a7fc7a89257dd0ce56fc909) ) - ROM_LOAD16_BYTE( "242ae.c11", 0x5000001, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) + ROM_LOAD16_BYTE( "242ae.c11", 0x5000000, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) ROM_LOAD16_BYTE( "242ae.c12", 0x5000001, 0x800000, CRC(f165589e) SHA1(6bdcb1dd9ce507fcae40d0aba42a2c1300987479) ) ROM_END +ROM_START( kof98ae3 ) // All confirmed: kof98ae2 with new p roms + ROM_REGION( 0x700000, "maincpu", 0 ) + // These are corrupt during attract mode fight (where cars are driving past), do not use + ROM_LOAD16_WORD_SWAP( "242ae3.p1", 0x000000, 0x100000, CRC(ad987ba2) SHA1(aa7803e3193f551171f908650cab921b9daf7ab9) ) + ROM_LOAD16_WORD_SWAP( "242ae3.p2", 0x100000, 0x600000, CRC(0409fb1e) SHA1(8e73ea6a68503b6bd434f9b044bd454fb7e371df) ) + + NEO_SFIX_128K( "242ae.s1", CRC(f1fee5c0) SHA1(e0d7b6c3c4a1c24003f25de6a5238e0a8ad32269) ) + + NEO_BIOS_AUDIO_256K( "242ae.m1", CRC(9ade0528) SHA1(67d0c3b146d369416b84c081544fe51fc6c2a140) ) + + ROM_REGION( 0x1400000, "ymsnd", 0 ) + ROM_LOAD( "242-v1.v1", 0x000000, 0x400000, CRC(b9ea8051) SHA1(49606f64eb249263b3341b4f50cc1763c390b2af) ) + ROM_LOAD( "242-v2.v2", 0x400000, 0x400000, CRC(cc11106e) SHA1(d3108bc05c9bf041d4236b2fa0c66b013aa8db1b) ) + ROM_LOAD( "242-v3.v3", 0x800000, 0x400000, CRC(044ea4e1) SHA1(062a2f2e52098d73bc31c9ad66f5db8080395ce8) ) + ROM_LOAD( "242-v4.v4", 0xc00000, 0x400000, CRC(7985ea30) SHA1(54ed5f0324de6164ea81943ebccb3e8d298368ec) ) + ROM_LOAD( "242ae.v5", 0x1000000, 0x400000, CRC(afdd9660) SHA1(0d67fb61111256c0d74d4f2b473ab5a42d1909b9) ) + + ROM_REGION( 0x6000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "242ae.c1", 0x0000000, 0x800000, CRC(0319cfc9) SHA1(f275015d6bddf392936b35cd7399f929a6d63d29) ) + ROM_LOAD16_BYTE( "242ae.c2", 0x0000001, 0x800000, CRC(553f6714) SHA1(9c14963ce9ac0cfd125defe2fe80206deb1bc896) ) + ROM_LOAD16_BYTE( "242-c3.c3", 0x1000000, 0x800000, CRC(22127b4f) SHA1(bd0d00f889d9da7c6ac48f287d9ed8c605ae22cf) ) + ROM_LOAD16_BYTE( "242-c4.c4", 0x1000001, 0x800000, CRC(0b4fa044) SHA1(fa13c3764fae6b035a626601bc43629f1ebaaffd) ) + ROM_LOAD16_BYTE( "242ae.c5", 0x2000000, 0x800000, CRC(71641718) SHA1(b88a00aca2fc34230d2d2da0b235195a5eb1ecf0) ) + ROM_LOAD16_BYTE( "242ae.c6", 0x2000001, 0x800000, CRC(982ba2b3) SHA1(232ce3be7beaad13b35865da770157ef4b29a7a9) ) + ROM_LOAD16_BYTE( "242ae.c7", 0x3000000, 0x800000, CRC(8d495552) SHA1(20ff76b681b2e544c5a57060bb98ab6bb91bea3c) ) + ROM_LOAD16_BYTE( "242ae.c8", 0x3000001, 0x800000, CRC(8bfc3417) SHA1(38bb85563d0a7f008a64cf76d71d82b935cd98e5) ) + ROM_LOAD16_BYTE( "242ae.c9", 0x4000000, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) + ROM_LOAD16_BYTE( "242ae.c10", 0x4000001, 0x800000, CRC(4bd8412d) SHA1(72e9cc6e3df8000d0a7fc7a89257dd0ce56fc909) ) + ROM_LOAD16_BYTE( "242ae.c11", 0x5000000, 0x800000, CRC(e893277f) SHA1(a87db547821c63d162aac3ad178c8f794ef6a060) ) + ROM_LOAD16_BYTE( "242ae.c12", 0x5000001, 0x800000, CRC(f165589e) SHA1(6bdcb1dd9ce507fcae40d0aba42a2c1300987479) ) +ROM_END + +ROM_START( kof98ae20160308 ) // Anniversary Edition, all confirmed. + ROM_REGION( 0x700000, "maincpu", 0 ) + // These are corrupt during attract mode fight (where cars are driving past), do not use + ROM_LOAD16_WORD_SWAP( "242aea.p1", 0x000000, 0x100000, CRC(c7fddbd8) SHA1(b9ded8cd3414a5f11e41436ee3aa79515e33a8d9) ) + ROM_LOAD16_WORD_SWAP( "242aea.p2", 0x100000, 0x600000, CRC(d84dbe5b) SHA1(76f08aa5c15b654b5d080c5537cb91be1f16555c) ) + + NEO_SFIX_256K( "242aea.s1", CRC(345c20b0) SHA1(ff844e47667297f09f8b49ae19987542e253095e) ) + + NEO_BIOS_AUDIO_256K( "242ae.m1", CRC(9ade0528) SHA1(67d0c3b146d369416b84c081544fe51fc6c2a140) ) + + ROM_REGION( 0x1400000, "ymsnd", 0 ) + ROM_LOAD( "242-v1.v1", 0x000000, 0x400000, CRC(b9ea8051) SHA1(49606f64eb249263b3341b4f50cc1763c390b2af) ) + ROM_LOAD( "242-v2.v2", 0x400000, 0x400000, CRC(cc11106e) SHA1(d3108bc05c9bf041d4236b2fa0c66b013aa8db1b) ) + ROM_LOAD( "242-v3.v3", 0x800000, 0x400000, CRC(044ea4e1) SHA1(062a2f2e52098d73bc31c9ad66f5db8080395ce8) ) + ROM_LOAD( "242-v4.v4", 0xc00000, 0x400000, CRC(7985ea30) SHA1(54ed5f0324de6164ea81943ebccb3e8d298368ec) ) + ROM_LOAD( "242ae.v5", 0x1000000, 0x400000, CRC(afdd9660) SHA1(0d67fb61111256c0d74d4f2b473ab5a42d1909b9) ) + + ROM_REGION( 0x6000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "242aea.c1", 0x0000000, 0x800000, CRC(086ec060) SHA1(dace47c251e5c9bea771e221bf550e1b4af5212d) ) + ROM_LOAD16_BYTE( "242aea.c2", 0x0000001, 0x800000, CRC(16b9a9a2) SHA1(c8b757e6a84bae33caab07de27ca6c3d84d1893a) ) + ROM_LOAD16_BYTE( "242-c3.c3", 0x1000000, 0x800000, CRC(22127b4f) SHA1(bd0d00f889d9da7c6ac48f287d9ed8c605ae22cf) ) + ROM_LOAD16_BYTE( "242-c4.c4", 0x1000001, 0x800000, CRC(0b4fa044) SHA1(fa13c3764fae6b035a626601bc43629f1ebaaffd) ) + ROM_LOAD16_BYTE( "242ae.c5", 0x2000000, 0x800000, CRC(71641718) SHA1(b88a00aca2fc34230d2d2da0b235195a5eb1ecf0) ) + ROM_LOAD16_BYTE( "242ae.c6", 0x2000001, 0x800000, CRC(982ba2b3) SHA1(232ce3be7beaad13b35865da770157ef4b29a7a9) ) + ROM_LOAD16_BYTE( "242ae.c7", 0x3000000, 0x800000, CRC(8d495552) SHA1(20ff76b681b2e544c5a57060bb98ab6bb91bea3c) ) + ROM_LOAD16_BYTE( "242ae.c8", 0x3000001, 0x800000, CRC(8bfc3417) SHA1(38bb85563d0a7f008a64cf76d71d82b935cd98e5) ) + ROM_LOAD16_BYTE( "242ae.c9", 0x4000000, 0x800000, CRC(128256d1) SHA1(948af62545756165890e950fcd67bbd6304b3366) ) + ROM_LOAD16_BYTE( "242ae.c10", 0x4000001, 0x800000, CRC(4bd8412d) SHA1(72e9cc6e3df8000d0a7fc7a89257dd0ce56fc909) ) + ROM_LOAD16_BYTE( "242aea.c11", 0x5000000, 0x800000, CRC(56d361cb) SHA1(594826cf58b7cd3b0bee05cdab1265d03c057b58) ) + ROM_LOAD16_BYTE( "242aea.c12", 0x5000001, 0x800000, CRC(f8cb115b) SHA1(ba8a152a59acfcf72c73c6e29cd6e133630e100d) ) +ROM_END + ROM_START( kof98b ) ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "242b.p1", 0x000000, 0x100000, CRC(238ed528) SHA1(9f0155cf298886842cd20d5a797a057889e65e04) ) @@ -3266,6 +3330,8 @@ GAME( 2009, kof98ae, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, GAME( 2009, kof98ae0, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'98 Anniversary Edition (set 0)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 2009, kof98ae1, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGHT", "Kof'98 Anniversary Edition (set 1)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 2009, kof98ae2, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGHT", "Kof'98 Anniversary Edition (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAME( 2009, kof98ae3, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGHT", "Kof'98 Anniversary Edition (set 3)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAME( 2016, kof98ae20160308,kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGHT", "Kof'98 Anniversary Edition (2016-03-08)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 1998, kof98b, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'98 (Boss Hack)", MACHINE_SUPPORTS_SAVE ) GAME( 2006, kof98bh, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'98 (Boss Hack 2006)", MACHINE_SUPPORTS_SAVE ) GAME( 2006, kof98c2006, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ivex", "Kof'98 Combo 2006", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/kof99.cpp b/docs/release/src/hbmame/drivers/kof99.cpp index 22f3abe902b..f355a454907 100644 --- a/docs/release/src/hbmame/drivers/kof99.cpp +++ b/docs/release/src/hbmame/drivers/kof99.cpp @@ -272,6 +272,97 @@ ROM_START( kof99ae20150711 ) /* The King of Fighters '99 - Anniversary Edition * ROM_LOAD16_BYTE( "251aex.c12", 0x5000001, 0x800000, CRC(a7541483) SHA1(3b3f0e67acfae1c3b6c5549ac350d855482f285f) ) ROM_END +ROM_START( kof99ae20160411 ) // all confirmed + ROM_REGION( 0x900000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "251aepc.p1", 0x000000, 0x100000, CRC(5cbb24fd) SHA1(082bdbce405138ef08ccb274d48de2272494b62a) ) + ROM_LOAD16_WORD_SWAP( "251aepc.p2", 0x100000, 0x800000, CRC(55418995) SHA1(419258fc68ae35cde605cc3f89ff05d426299d27) ) + + NEO_BIOS_AUDIO_128K( "251ae.m1", CRC(f847e188) SHA1(0b98595a457292b04f518afcc82c2d6b8f249a7b) ) + + NEO_SFIX_128K( "251aex.s1", CRC(3c31ee43) SHA1(f3bf265ad41037c2317702818136eb08e3ade3a2) ) + + ROM_REGION( 0xe00000, "ymsnd", 0 ) + ROM_LOAD( "251aex.v1", 0x000000, 0x400000, CRC(ceaa3bae) SHA1(ec598f92e7d3b41f38448fee2dd2ee599a482f8f) ) + ROM_LOAD( "251ae.v2", 0x400000, 0x400000, CRC(07d70650) SHA1(70d274771c07215268292f91517ec61634e32611) ) + ROM_LOAD( "251-v3.v3", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) + ROM_LOAD( "251-v4.v4", 0xc00000, 0x200000, CRC(b49e6178) SHA1(dde6f76e958841e8c99b693e13ced9aa9ef316dc) ) + + ROM_REGION( 0x6000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "251aex.c1.bin", 0x000000, 0x800000, CRC(497c2e83) SHA1(379887e839dd4e33b41ab634a54789621bdfea98) ) + ROM_LOAD16_BYTE( "251aex.c2.bin", 0x000001, 0x800000, CRC(0a13eeb7) SHA1(2cb196a955a3472f922d0085cee2ddc0111fdbd3) ) + ROM_LOAD16_BYTE( "251d.c3", 0x1000000, 0x800000, CRC(b047c9d5) SHA1(b840eab2208e6c0a1db0cdb28df46ba07da2ddca) ) + ROM_LOAD16_BYTE( "251d.c4", 0x1000001, 0x800000, CRC(6bc8e4b1) SHA1(674cb8145aeada1683a70beb02ed4ea028f5bdf8) ) + ROM_LOAD16_BYTE( "251d.c5", 0x2000000, 0x800000, CRC(9746268c) SHA1(59d839f01f4827377a752679922bc7281099430d) ) + ROM_LOAD16_BYTE( "251d.c6", 0x2000001, 0x800000, CRC(238b3e71) SHA1(f929c942972f768e68a5a009a3d174d203029160) ) + ROM_LOAD16_BYTE( "251ae.c7", 0x3000000, 0x800000, CRC(f22760ad) SHA1(a503898d9b6141c76f63b7c505ac78d3575530b2) ) + ROM_LOAD16_BYTE( "251ae.c8", 0x3000001, 0x800000, CRC(396c3a70) SHA1(6cd0acd05c138ac85ad63a04dfc015a3e70fa572) ) + ROM_LOAD16_BYTE( "251aeog.c9", 0x4000000, 0x800000, CRC(86a3550d) SHA1(ec74bcadb315a004297dc9e02c72efe5f2e2c5b0) ) + ROM_LOAD16_BYTE( "251aeog.c10", 0x4000001, 0x800000, CRC(986bb897) SHA1(14572621122e97c3ae96a3b85069b9cde062ef19) ) + ROM_LOAD16_BYTE( "251aex.c11", 0x5000000, 0x800000, CRC(7fe785c2) SHA1(b49c3ab1ebf89090388c4757f24d1c02c730cc99) ) + ROM_LOAD16_BYTE( "251aex.c12", 0x5000001, 0x800000, CRC(a7541483) SHA1(3b3f0e67acfae1c3b6c5549ac350d855482f285f) ) +ROM_END + +ROM_START( kof99ae20160419 ) // all confirmed + ROM_REGION( 0x900000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "251aepd.p1", 0x000000, 0x100000, CRC(c19447eb) SHA1(45c25eaaf1a03a5756e2df4a54abf2f7ebfab45a) ) + ROM_LOAD16_WORD_SWAP( "251aepc.p2", 0x100000, 0x800000, CRC(55418995) SHA1(419258fc68ae35cde605cc3f89ff05d426299d27) ) + + NEO_BIOS_AUDIO_128K( "251ae.m1", CRC(f847e188) SHA1(0b98595a457292b04f518afcc82c2d6b8f249a7b) ) + + NEO_SFIX_128K( "251aex.s1", CRC(3c31ee43) SHA1(f3bf265ad41037c2317702818136eb08e3ade3a2) ) + + ROM_REGION( 0xe00000, "ymsnd", 0 ) + ROM_LOAD( "251aex.v1", 0x000000, 0x400000, CRC(ceaa3bae) SHA1(ec598f92e7d3b41f38448fee2dd2ee599a482f8f) ) + ROM_LOAD( "251ae.v2", 0x400000, 0x400000, CRC(07d70650) SHA1(70d274771c07215268292f91517ec61634e32611) ) + ROM_LOAD( "251-v3.v3", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) + ROM_LOAD( "251-v4.v4", 0xc00000, 0x200000, CRC(b49e6178) SHA1(dde6f76e958841e8c99b693e13ced9aa9ef316dc) ) + + ROM_REGION( 0x6000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "251aex.c1.bin", 0x000000, 0x800000, CRC(497c2e83) SHA1(379887e839dd4e33b41ab634a54789621bdfea98) ) + ROM_LOAD16_BYTE( "251aex.c2.bin", 0x000001, 0x800000, CRC(0a13eeb7) SHA1(2cb196a955a3472f922d0085cee2ddc0111fdbd3) ) + ROM_LOAD16_BYTE( "251d.c3", 0x1000000, 0x800000, CRC(b047c9d5) SHA1(b840eab2208e6c0a1db0cdb28df46ba07da2ddca) ) + ROM_LOAD16_BYTE( "251d.c4", 0x1000001, 0x800000, CRC(6bc8e4b1) SHA1(674cb8145aeada1683a70beb02ed4ea028f5bdf8) ) + ROM_LOAD16_BYTE( "251d.c5", 0x2000000, 0x800000, CRC(9746268c) SHA1(59d839f01f4827377a752679922bc7281099430d) ) + ROM_LOAD16_BYTE( "251d.c6", 0x2000001, 0x800000, CRC(238b3e71) SHA1(f929c942972f768e68a5a009a3d174d203029160) ) + ROM_LOAD16_BYTE( "251ae.c7", 0x3000000, 0x800000, CRC(f22760ad) SHA1(a503898d9b6141c76f63b7c505ac78d3575530b2) ) + ROM_LOAD16_BYTE( "251ae.c8", 0x3000001, 0x800000, CRC(396c3a70) SHA1(6cd0acd05c138ac85ad63a04dfc015a3e70fa572) ) + ROM_LOAD16_BYTE( "251aeog.c9", 0x4000000, 0x800000, CRC(86a3550d) SHA1(ec74bcadb315a004297dc9e02c72efe5f2e2c5b0) ) + ROM_LOAD16_BYTE( "251aeog.c10", 0x4000001, 0x800000, CRC(986bb897) SHA1(14572621122e97c3ae96a3b85069b9cde062ef19) ) + ROM_LOAD16_BYTE( "251aex.c11", 0x5000000, 0x800000, CRC(7fe785c2) SHA1(b49c3ab1ebf89090388c4757f24d1c02c730cc99) ) + ROM_LOAD16_BYTE( "251aex.c12", 0x5000001, 0x800000, CRC(a7541483) SHA1(3b3f0e67acfae1c3b6c5549ac350d855482f285f) ) +ROM_END + +ROM_START( kof99aes ) // all confirmed + ROM_REGION( 0xd00000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "251aes.p1", 0x000000, 0x100000, CRC(5dfe36ed) SHA1(d27a2abf3aa7e8a87faf55ff15e4b87905fa0061) ) + ROM_LOAD16_WORD_SWAP( "251aepc.p2", 0x100000, 0x800000, CRC(55418995) SHA1(419258fc68ae35cde605cc3f89ff05d426299d27) ) + ROM_LOAD16_WORD_SWAP( "251aes.p3", 0x900000, 0x400000, CRC(de66edce) SHA1(57d773552cfd22e6d301aa5350dd4d049ef247ac) ) + + NEO_BIOS_AUDIO_128K( "251ae.m1", CRC(f847e188) SHA1(0b98595a457292b04f518afcc82c2d6b8f249a7b) ) + + NEO_SFIX_128K( "251aex.s1", CRC(3c31ee43) SHA1(f3bf265ad41037c2317702818136eb08e3ade3a2) ) + + ROM_REGION( 0xe00000, "ymsnd", 0 ) + ROM_LOAD( "251aex.v1", 0x000000, 0x400000, CRC(ceaa3bae) SHA1(ec598f92e7d3b41f38448fee2dd2ee599a482f8f) ) + ROM_LOAD( "251ae.v2", 0x400000, 0x400000, CRC(07d70650) SHA1(70d274771c07215268292f91517ec61634e32611) ) + ROM_LOAD( "251-v3.v3", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) + ROM_LOAD( "251-v4.v4", 0xc00000, 0x200000, CRC(b49e6178) SHA1(dde6f76e958841e8c99b693e13ced9aa9ef316dc) ) + + ROM_REGION( 0x6000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "251aex.c1.bin", 0x000000, 0x800000, CRC(497c2e83) SHA1(379887e839dd4e33b41ab634a54789621bdfea98) ) + ROM_LOAD16_BYTE( "251aex.c2.bin", 0x000001, 0x800000, CRC(0a13eeb7) SHA1(2cb196a955a3472f922d0085cee2ddc0111fdbd3) ) + ROM_LOAD16_BYTE( "251d.c3", 0x1000000, 0x800000, CRC(b047c9d5) SHA1(b840eab2208e6c0a1db0cdb28df46ba07da2ddca) ) + ROM_LOAD16_BYTE( "251d.c4", 0x1000001, 0x800000, CRC(6bc8e4b1) SHA1(674cb8145aeada1683a70beb02ed4ea028f5bdf8) ) + ROM_LOAD16_BYTE( "251d.c5", 0x2000000, 0x800000, CRC(9746268c) SHA1(59d839f01f4827377a752679922bc7281099430d) ) + ROM_LOAD16_BYTE( "251d.c6", 0x2000001, 0x800000, CRC(238b3e71) SHA1(f929c942972f768e68a5a009a3d174d203029160) ) + ROM_LOAD16_BYTE( "251ae.c7", 0x3000000, 0x800000, CRC(f22760ad) SHA1(a503898d9b6141c76f63b7c505ac78d3575530b2) ) + ROM_LOAD16_BYTE( "251ae.c8", 0x3000001, 0x800000, CRC(396c3a70) SHA1(6cd0acd05c138ac85ad63a04dfc015a3e70fa572) ) + ROM_LOAD16_BYTE( "251aeog.c9", 0x4000000, 0x800000, CRC(86a3550d) SHA1(ec74bcadb315a004297dc9e02c72efe5f2e2c5b0) ) + ROM_LOAD16_BYTE( "251aeog.c10", 0x4000001, 0x800000, CRC(986bb897) SHA1(14572621122e97c3ae96a3b85069b9cde062ef19) ) + ROM_LOAD16_BYTE( "251aex.c11", 0x5000000, 0x800000, CRC(7fe785c2) SHA1(b49c3ab1ebf89090388c4757f24d1c02c730cc99) ) + ROM_LOAD16_BYTE( "251aex.c12", 0x5000001, 0x800000, CRC(a7541483) SHA1(3b3f0e67acfae1c3b6c5549ac350d855482f285f) ) +ROM_END + ROM_START( kof99bh ) /* The King of Fighters '99 - Hack by Dodowang - (Can choose Krizalid and Krizalid' - have icons in character select menu) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "251bh.p1", 0x000000, 0x100000, CRC(eedcc5bd) SHA1(8280c4329d666b4831c766853f5334355dc40cc9) ) @@ -1807,6 +1898,33 @@ ROM_START( kof99the42 ) ROM_LOAD16_BYTE( "251d.c8", 0x3000001, 0x800000, CRC(4c2fad1e) SHA1(26779e79296eb1988a8c4d60d2e1baf041f2c0cf) ) ROM_END +ROM_START( kof99vor ) // all confirmed + ROM_REGION( 0x900000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "vor.ka.neo-sma", 0x0c0000, 0x040000, CRC(ca267237) SHA1(9f7c3fbef8e9ae3a9e8990b93589b1d3325468f5) ) + ROM_LOAD16_WORD_SWAP( "251vor.p1", 0x100000, 0x400000, CRC(a466e66d) SHA1(41653d6ca325d084cda851fecb677976f469978a) ) + ROM_LOAD16_WORD_SWAP( "251vor.p2", 0x500000, 0x400000, CRC(2bf8ac94) SHA1(d6a9a9740819b91d01990ab999f41eef84361760) ) + + NEO_SFIX_MT_128K + + NEO_BIOS_AUDIO_128K( "251-m1.m1", CRC(5e74539c) SHA1(6f49a9343cbd026b2c6720ff3fa2e5b1f85e80da) ) + + ROM_REGION( 0x0e00000, "ymsnd", 0 ) + ROM_LOAD( "251-v1.v1", 0x000000, 0x400000, CRC(ef2eecc8) SHA1(8ed13b9db92dba3124bc5ba66e3e275885ece24a) ) + ROM_LOAD( "251-v2.v2", 0x400000, 0x400000, CRC(73e211ca) SHA1(0e60fa64cab6255d9721e2b4bc22e3de64c874c5) ) + ROM_LOAD( "251-v3.v3", 0x800000, 0x400000, CRC(821901da) SHA1(c6d4975bfaa19a62ed59126cadf2578c0a5c257f) ) + ROM_LOAD( "251-v4.v4", 0xc00000, 0x200000, CRC(b49e6178) SHA1(dde6f76e958841e8c99b693e13ced9aa9ef316dc) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "251vor.c1", 0x000000, 0x800000, CRC(4b3b9454) SHA1(ee0178c9f90d43c704450ef3e39861826e9d3dad) ) + ROM_LOAD16_BYTE( "251vor.c2", 0x000001, 0x800000, CRC(74f028c4) SHA1(2d1e1768a5d842292c5367c861e093f6cae02379) ) + ROM_LOAD16_BYTE( "251vor.c3", 0x100000, 0x800000, CRC(51ecbae7) SHA1(2cf2e2ae3856a7e5d77af7f97d9dc3532d396b27) ) + ROM_LOAD16_BYTE( "251vor.c4", 0x100001, 0x800000, CRC(96c0594b) SHA1(503844cc4c937caa6fe4a0a76f13cc6fbb47e94f) ) + ROM_LOAD16_BYTE( "251vor.c5", 0x200000, 0x800000, CRC(8875aee9) SHA1(29e79c3a2f40ddcdd2d5432e37c5629cbbecd37f) ) + ROM_LOAD16_BYTE( "251vor.c6", 0x200001, 0x800000, CRC(585786b7) SHA1(acfb462d467e914f165f67b8cc2be56937c0feaa) ) + ROM_LOAD16_BYTE( "251vor.c7", 0x300000, 0x800000, CRC(a25152d1) SHA1(bb1dc7d5bff9a599e7ed234abd199c26d8103bbd) ) + ROM_LOAD16_BYTE( "251vor.c8", 0x300001, 0x800000, CRC(2d8a1014) SHA1(dc729bc19b775bb62301d7f98cc9566b9aa8bf7a) ) +ROM_END + ROM_START( kof99wet ) ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "251ndh.p1", 0x000000, 0x100000, CRC(eedcc5bd) SHA1(8280c4329d666b4831c766853f5334355dc40cc9) ) @@ -2412,11 +2530,14 @@ ROM_END GAME( 1999, kof99ab, kof99, neogeo_noslot, neogeo, neogeo_noslot_state, kof99k, ROT0, "Marcochen/PPX Hack Team", "Kof'99 (Rolls moves sideways ver)", MACHINE_SUPPORTS_SAVE ) GAME( 2013, kof99ae, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99ae0, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (unknown date)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 2014, kof99ae20140408, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2014-04-08)", MACHINE_SUPPORTS_SAVE ) -GAME( 2014, kof99ae20140624, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2014-06-24)", MACHINE_SUPPORTS_SAVE ) -GAME( 2015, kof99ae20150121, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2015-01-21)", MACHINE_SUPPORTS_SAVE ) -GAME( 2015, kof99ae20150520, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2015-05-20)", MACHINE_SUPPORTS_SAVE ) -GAME( 2015, kof99ae20150711, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2015-07-11)", MACHINE_SUPPORTS_SAVE ) +GAME( 2014, kof99ae20140408, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2014-04-08)", MACHINE_SUPPORTS_SAVE ) +GAME( 2014, kof99ae20140624, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2014-06-24)", MACHINE_SUPPORTS_SAVE ) +GAME( 2015, kof99ae20150121, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2015-01-21)", MACHINE_SUPPORTS_SAVE ) +GAME( 2015, kof99ae20150520, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2015-05-20)", MACHINE_SUPPORTS_SAVE ) +GAME( 2015, kof99ae20150711, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2015-07-11)", MACHINE_SUPPORTS_SAVE ) +GAME( 2016, kof99ae20160411, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2016-04-11)", MACHINE_SUPPORTS_SAVE ) +GAME( 2016, kof99ae20160419, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition (2016-04-19)", MACHINE_SUPPORTS_SAVE ) +GAME( 2016, kof99aes, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 Anniversary Edition Special", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99bh, kof99, neogeo_noslot, neogeo, neogeo_hbmame, kof99bh, ROT0, "Dodowang", "Kof'99 (2 Add Char with Icons)", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99bhs, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'99 (Boss Striker Hack)", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99bs, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'99 (Boss Hack - DC version by FightChina KOF Hackteamwork)", MACHINE_SUPPORTS_SAVE ) @@ -2477,6 +2598,7 @@ GAME( 1999, kof99sr, kof99, neogeo_noslot, neogeo, neogeo_state, ne GAME( 1999, kof99srr, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Raymonose", "Kof'99 (Super Remix Red)", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99the4, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 The 4 Flame Manipulators (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99the42, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Yashional", "Kof'99 The 4 Flame Manipulators (set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1999, kof99vor, kof99, neogeo_noslot, neogeo, neogeo_noslot_state, kof99, ROT0, "hack", "Kof'99 (unknown vor)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99wet, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'99 (hack colour wet)", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99xxx, kof99, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'99 (Special Boss)", MACHINE_SUPPORTS_SAVE ) GAME( 1999, kof99y, kof99, neogeo_noslot, neogeo, neogeo_noslot_state, kof99k, ROT0, "Ydmis", "Kof'99 (4 Add Char", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/maketrax.cpp b/docs/release/src/hbmame/drivers/maketrax.cpp index eeb3c3a9b25..03d5b076c65 100644 --- a/docs/release/src/hbmame/drivers/maketrax.cpp +++ b/docs/release/src/hbmame/drivers/maketrax.cpp @@ -404,6 +404,18 @@ ROM_START( eyesb ) /* E204 */ PACMAN_SOUND_PROMS ROM_END +ROM_START( ghohunt ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "ghohunt.6e", 0x0000, 0x1000, CRC(b9e9965c) SHA1(8026e792fd474c2cc8ad8917da4d57a7930d30b4) ) + ROM_LOAD( "ghohunt.6f", 0x1000, 0x1000, CRC(9da32395) SHA1(8b4d7309de9dab4f58fcdbb29d98ca6c03a2b6fe) ) + + ROM_REGION( 0x2000, "gfx1", 0 ) + ROM_LOAD( "ghohunt.5e", 0x0000, 0x1000, CRC(c69b5669) SHA1(c4f641ff218aee92dd784968b3e1a030c85d61f6) ) + ROM_LOAD( "ghohunt.5f", 0x1000, 0x1000, CRC(3ad83b13) SHA1(d2ce7ab45cb540f35cb23264e7628ac0ee6b8559) ) + + PACMAN_PROMS +ROM_END + ROM_START( kangaroh ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "kangaroh.1", 0x0000, 0x1000, CRC(bcdd9dff) SHA1(0243d9aaeaa82afb04d40eee192fdd65197fb87e) ) @@ -683,11 +695,10 @@ ROM_START( wavybug ) PACMAN_PROMS ROM_END -ROM_START( zap ) +ROM_START( zap ) // no sound ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "zap.1", 0x0000, 0x1000, CRC(74e6e3a0) SHA1(3d953bfd57aa56f8fe61d1abd01db84d027df3bb) ) ROM_LOAD( "zap.2", 0x1000, 0x1000, CRC(40e1884b) SHA1(ce303b6a6c9e765c256997c19f64e9ebfd8f435e) ) - ROM_LOAD( "blank004k.3", 0x2000, 0x1000, CRC(c71c0011) SHA1(1ceaf73df40e531df3bfb26b4fb7cd95fb7bff1d) ) ROM_LOAD( "zap.4", 0x3000, 0x1000, CRC(17c357e6) SHA1(6486f58592b784d53a5c14f59b25c8cd513b2a0d) ) ROM_REGION( 0x2000, "gfx1", 0 ) @@ -752,6 +763,7 @@ GAME( 1999, tst_pacm, 0, pacman, mspacpls, driver_device, 0, ROT /* Other misc unemulated dumps */ GAME( 1982, eyesb, eyes, pacman, eyes, pacman_state, eyes, ROT90, "bootleg", "Eyes (unknown bootleg)", MACHINE_SUPPORTS_SAVE ) +GAME( 2016, ghohunt, puckman, pacman, pacman0, driver_device, 0, ROT90, "Hurray Banana", "Ghost Hunt", MACHINE_SUPPORTS_SAVE ) /*************************************************************************************************************************/ diff --git a/docs/release/src/hbmame/drivers/mslug.cpp b/docs/release/src/hbmame/drivers/mslug.cpp index b7d16a64476..2dcb35979c8 100644 --- a/docs/release/src/hbmame/drivers/mslug.cpp +++ b/docs/release/src/hbmame/drivers/mslug.cpp @@ -15,7 +15,7 @@ DRIVER_INIT_MEMBER( neogeo_hbmame, mslug3 ) m_sma_prot->mslug3_install_protection(m_maincpu, m_banked_cart); #endif -DRIVER_INIT_MEMBER( neogeo_hbmame, mslug3n ) +DRIVER_INIT_MEMBER( neogeo_hbmame, mslug3n ) // decrypt gfx and extract sx { DRIVER_INIT_CALL(neogeo); m_sprgen->m_fixed_layer_bank_type = 1; @@ -146,6 +146,7 @@ DRIVER_INIT_MEMBER( neogeo_hbmame, ms5pcbd ) } + #if 0 ROM_START( mslug ) ROM_REGION( 0x200000, "maincpu", 0 ) @@ -208,6 +209,9 @@ ROM_START( mslugeh ) /* Metal Slug - Enhance by Ydmis - (New standard weapon sho ROM_LOAD16_BYTE( "201-c3.c3", 0x800000, 0x400000, CRC(5121456a) SHA1(0a7a27d603d1bb2520b5570ebf5b34a106e255a6) ) ROM_LOAD16_BYTE( "201-c4.c4", 0x800001, 0x400000, CRC(f4ad59a3) SHA1(4e94fda8ee63abf0f92afe08060a488546e5c280) ) ROM_END + + + #if 0 ROM_START( mslug2 ) /* MVS AND AES VERSION */ ROM_REGION( 0x300000, "maincpu", 0 ) @@ -429,6 +433,8 @@ ROM_START( mslug2t ) /* System11 - Metal Slug 2 Turbo - hack to remove slowdowns ROM_LOAD16_BYTE( "241-c4.c4", 0x1000001, 0x800000, CRC(7d3e306f) SHA1(1499316fb381775218d897b81a6a0c3465d1a37c) ) ROM_END + + #if 0 ROM_START( mslugx ) /* MVS AND AES VERSION */ ROM_REGION( 0x500000, "maincpu", 0 ) @@ -707,6 +713,8 @@ ROM_START( mslugxst ) ROM_LOAD16_BYTE( "250-c6.c6", 0x2000001, 0x800000, CRC(83e3e69d) SHA1(39be66287696829d243fb71b3fb8b7dc2bc3298f) ) ROM_END + + #if 0 ROM_START( mslug3 ) /* Original Version - Encrypted Code & GFX */ /* revision 2000.4.1 */ /* MVS VERSION */ ROM_REGION( 0x900000, "maincpu", 0 ) @@ -769,32 +777,6 @@ ROM_START( mslug3d ) ROM_LOAD16_BYTE( "256d.c8", 0x3000001, 0x800000, CRC(a369f9d4) SHA1(f8146ea80a1a23da7e7e04c88f778ee9abdfeb5c) ) ROM_END -ROM_START( mslug3d1 ) - ROM_REGION( 0x500000, "maincpu", 0 ) - ROM_LOAD16_WORD_SWAP( "256d1.p1", 0x000000, 0x100000, CRC(9c42ca85) SHA1(7a8f77a89867b889295ae9b9dfd4ba28f02d234d) ) - ROM_LOAD16_WORD_SWAP( "256-ph2.sp2", 0x100000, 0x400000, CRC(1f3d8ce8) SHA1(08b05a8abfb86ec09a5e758d6273acf1489961f9) ) - - NEO_SFIX_MT_512K - - NEO_BIOS_AUDIO_512K( "256-m1.m1", CRC(eaeec116) SHA1(54419dbb21edc8c4b37eaac2e7ad9496d2de037a) ) - - ROM_REGION( 0x1000000, "ymsnd", 0 ) - ROM_LOAD( "256-v1.v1", 0x000000, 0x400000, CRC(f2690241) SHA1(fd56babc1934d10e0d27c32f032f9edda7ca8ce9) ) - ROM_LOAD( "256-v2.v2", 0x400000, 0x400000, CRC(7e2a10bd) SHA1(0d587fb9f64cba0315ce2d8a03e2b8fe34936dff) ) - ROM_LOAD( "256-v3.v3", 0x800000, 0x400000, CRC(0eaec17c) SHA1(c3ed613cc6993edd6fc0d62a90bcd85de8e21915) ) - ROM_LOAD( "256-v4.v4", 0xc00000, 0x400000, CRC(9b4b22d4) SHA1(9764fbf8453e52f80aa97a46fb9cf5937ef15a31) ) - - ROM_REGION( 0x4000000, "sprites", 0 ) - ROM_LOAD16_BYTE( "256-c1d.c1d", 0x0000000, 0x800000, CRC(3540398c) SHA1(0a96f2360eb26c66bf02bbc6f52230b55cc95e4e) ) - ROM_LOAD16_BYTE( "256-c2d.c2d", 0x0000001, 0x800000, CRC(bdd220f0) SHA1(f52851023f3bc120b05f622af0e0ab1bedc41604) ) - ROM_LOAD16_BYTE( "256-c3d.c3d", 0x1000000, 0x800000, CRC(bfaade82) SHA1(66b07e592c9a9b35567fe463496f8f75c32a7db9) ) - ROM_LOAD16_BYTE( "256-c4d.c4d", 0x1000001, 0x800000, CRC(1463add6) SHA1(4db91b46d6430da272d27d00a6dc0eb25949bea1) ) - ROM_LOAD16_BYTE( "256-c5d.c5d", 0x2000000, 0x800000, CRC(48ca7f28) SHA1(e903876be5fb4fa582c988d74c6bef1c3b9c7083) ) - ROM_LOAD16_BYTE( "256-c6d.c6d", 0x2000001, 0x800000, CRC(806eb36f) SHA1(a412a9cab80c326733dde7652d1db2a46afb3ebb) ) - ROM_LOAD16_BYTE( "256-c7d.c7d", 0x3000000, 0x800000, CRC(9395b809) SHA1(ca9ac9832017094eee3623f0b6c4c4b7b4f1374d) ) - ROM_LOAD16_BYTE( "256-c8d.c8d", 0x3000001, 0x800000, CRC(a369f9d4) SHA1(f8146ea80a1a23da7e7e04c88f778ee9abdfeb5c) ) -ROM_END - ROM_START( mslug3e02 ) /* Metal Slug 3 - Super Enhance by Ydmis - (Style remix) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "256e02.p1", 0x000000, 0x100000, CRC(c9cf4ef8) SHA1(e1e10dcea6ce0c8b6939250adaa167e950069760) ) @@ -1472,6 +1454,32 @@ ROM_START( mslug3fro ) /* Metal Slug 3 - Translation Hack by NEO-ARC - (French t ROM_LOAD16_BYTE( "256d.c8", 0x3000001, 0x800000, CRC(a369f9d4) SHA1(f8146ea80a1a23da7e7e04c88f778ee9abdfeb5c) ) ROM_END +ROM_START( mslug3hev ) // all confirmed: mslug3ehs with new p1 + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "256hev.p1", 0x000000, 0x100000, CRC(c824bccc) SHA1(cfe0caff7eedd33e98cdb66d3104b11597f62089) ) + ROM_LOAD16_WORD_SWAP( "256-ph2.sp2", 0x100000, 0x400000, CRC(1f3d8ce8) SHA1(08b05a8abfb86ec09a5e758d6273acf1489961f9) ) + + NEO_SFIX_MT_512K + + NEO_BIOS_AUDIO_512K( "256-m1.m1", CRC(eaeec116) SHA1(54419dbb21edc8c4b37eaac2e7ad9496d2de037a) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "256-v1.v1", 0x000000, 0x400000, CRC(f2690241) SHA1(fd56babc1934d10e0d27c32f032f9edda7ca8ce9) ) + ROM_LOAD( "256-v2.v2", 0x400000, 0x400000, CRC(7e2a10bd) SHA1(0d587fb9f64cba0315ce2d8a03e2b8fe34936dff) ) + ROM_LOAD( "256-v3.v3", 0x800000, 0x400000, CRC(0eaec17c) SHA1(c3ed613cc6993edd6fc0d62a90bcd85de8e21915) ) + ROM_LOAD( "256-v4.v4", 0xc00000, 0x400000, CRC(9b4b22d4) SHA1(9764fbf8453e52f80aa97a46fb9cf5937ef15a31) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "256-c1.c1", 0x0000000, 0x800000, CRC(5a79c34e) SHA1(b8aa51fa50935cae62ab3d125b723ab888691e60) ) + ROM_LOAD16_BYTE( "256-c2.c2", 0x0000001, 0x800000, CRC(944c362c) SHA1(3843ab300f956280475469caee70135658f67089) ) + ROM_LOAD16_BYTE( "256-c3.c3", 0x1000000, 0x800000, CRC(6e69d36f) SHA1(94e8cf42e999114b4bd8b30e0aa2f365578c4c9a) ) + ROM_LOAD16_BYTE( "256-c4.c4", 0x1000001, 0x800000, CRC(b755b4eb) SHA1(804700a0966a48f130c434ede3f970792ea74fa5) ) + ROM_LOAD16_BYTE( "256-c5.c5", 0x2000000, 0x800000, CRC(7aacab47) SHA1(312c1c9846175fe1a3cad51d5ae230cf674fc93d) ) + ROM_LOAD16_BYTE( "256-c6.c6", 0x2000001, 0x800000, CRC(c698fd5d) SHA1(16818883b06849ba2f8d61bdd5e21aaf99bd8408) ) + ROM_LOAD16_BYTE( "256-c7.c7", 0x3000000, 0x800000, CRC(cfceddd2) SHA1(7def666adf8bd1703f40c61f182fc040b6362dc9) ) + ROM_LOAD16_BYTE( "256-c8.c8", 0x3000001, 0x800000, CRC(4d9be34c) SHA1(a737bdfa2b815aea7067e7af2636e83a9409c414) ) +ROM_END + ROM_START( mslug3kh ) /* Metal Slug 3 - Enhance by Fighters Kim and Ydmis - (Style remix 20030801) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "256kh.p1", 0x000000, 0x100000, CRC(696aa1b4) SHA1(2e72191f12f4cbbddda1350fbe859e8bc70be62f) ) @@ -1524,6 +1532,33 @@ ROM_START( mslug3kho ) /* [OLD] Metal Slug 3 - Enhance by Fighters Kim and Ydmis ROM_LOAD16_BYTE( "256-c8.c8", 0x3000001, 0x800000, CRC(4d9be34c) SHA1(a737bdfa2b815aea7067e7af2636e83a9409c414) ) ROM_END +ROM_START( mslug3nd ) // all confirmed + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "256nd.p1", 0x000000, 0x100000, CRC(9c42ca85) SHA1(7a8f77a89867b889295ae9b9dfd4ba28f02d234d) ) + ROM_LOAD16_WORD_SWAP( "256-ph2.sp2", 0x100000, 0x400000, CRC(1f3d8ce8) SHA1(08b05a8abfb86ec09a5e758d6273acf1489961f9) ) + + NEO_SFIX_MT_512K + //NEO_SFIX_MSLUG( "256nd.s1", CRC(6d9d4d0a) SHA1(4237247494aa0d734ffc728c7fc2808aca42539e) ) // this is missing the high score text + + NEO_BIOS_AUDIO_512K( "256-m1.m1", CRC(eaeec116) SHA1(54419dbb21edc8c4b37eaac2e7ad9496d2de037a) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "256-v1.v1", 0x000000, 0x400000, CRC(f2690241) SHA1(fd56babc1934d10e0d27c32f032f9edda7ca8ce9) ) + ROM_LOAD( "256-v2.v2", 0x400000, 0x400000, CRC(7e2a10bd) SHA1(0d587fb9f64cba0315ce2d8a03e2b8fe34936dff) ) + ROM_LOAD( "256-v3.v3", 0x800000, 0x400000, CRC(0eaec17c) SHA1(c3ed613cc6993edd6fc0d62a90bcd85de8e21915) ) + ROM_LOAD( "256-v4.v4", 0xc00000, 0x400000, CRC(9b4b22d4) SHA1(9764fbf8453e52f80aa97a46fb9cf5937ef15a31) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "256-c1d.c1d", 0x0000000, 0x800000, CRC(3540398c) SHA1(0a96f2360eb26c66bf02bbc6f52230b55cc95e4e) ) + ROM_LOAD16_BYTE( "256-c2d.c2d", 0x0000001, 0x800000, CRC(bdd220f0) SHA1(f52851023f3bc120b05f622af0e0ab1bedc41604) ) + ROM_LOAD16_BYTE( "256-c3d.c3d", 0x1000000, 0x800000, CRC(bfaade82) SHA1(66b07e592c9a9b35567fe463496f8f75c32a7db9) ) + ROM_LOAD16_BYTE( "256-c4d.c4d", 0x1000001, 0x800000, CRC(1463add6) SHA1(4db91b46d6430da272d27d00a6dc0eb25949bea1) ) + ROM_LOAD16_BYTE( "256-c5d.c5d", 0x2000000, 0x800000, CRC(48ca7f28) SHA1(e903876be5fb4fa582c988d74c6bef1c3b9c7083) ) + ROM_LOAD16_BYTE( "256-c6d.c6d", 0x2000001, 0x800000, CRC(806eb36f) SHA1(a412a9cab80c326733dde7652d1db2a46afb3ebb) ) + ROM_LOAD16_BYTE( "256-c7d.c7d", 0x3000000, 0x800000, CRC(9395b809) SHA1(ca9ac9832017094eee3623f0b6c4c4b7b4f1374d) ) + ROM_LOAD16_BYTE( "256-c8d.c8d", 0x3000001, 0x800000, CRC(a369f9d4) SHA1(f8146ea80a1a23da7e7e04c88f778ee9abdfeb5c) ) +ROM_END + ROM_START( mslug3v ) // extreme violence ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "256v.p1", 0x000000, 0x100000, CRC(47f9aeea) SHA1(db1c65681ac12b146e2fa21a8f28000f41a11fe2) ) @@ -1550,6 +1585,8 @@ ROM_START( mslug3v ) // extreme violence ROM_LOAD16_BYTE( "256-c8.c8", 0x3000001, 0x800000, CRC(4d9be34c) SHA1(a737bdfa2b815aea7067e7af2636e83a9409c414) ) ROM_END + + #if 0 ROM_START( mslug4 ) /* Original Version - Encrypted GFX */ /* MVS VERSION */ ROM_REGION( 0x500000, "maincpu", 0 ) @@ -1603,8 +1640,8 @@ ROM_END ROM_START( mslug4dh ) // Super D Version ROM_REGION( 0x500000, "maincpu", 0 ) - ROM_LOAD16_WORD_SWAP( "263dh.p1", 0x000000, 0x100000, CRC(af69d959) SHA1(2bc9796003c8742d681e11ad842978d918fbae40) ) - ROM_LOAD16_WORD_SWAP( "263dh.sp2", 0x100000, 0x400000, CRC(2b863b30) SHA1(b5edc43d87faf6540e3154fcbab42efb148cbd04) ) + ROM_LOAD16_WORD_SWAP( "263dh.p1", 0x000000, 0x100000, CRC(af69d959) SHA1(2bc9796003c8742d681e11ad842978d918fbae40) ) + ROM_LOAD16_WORD_SWAP( "263dh.p2", 0x100000, 0x400000, CRC(2b863b30) SHA1(b5edc43d87faf6540e3154fcbab42efb148cbd04) ) NEO_SFIX_MSLUG( "263dh.s1", CRC(c4f4ed0e) SHA1(bbf31c879d72cc843229b03db01399af98e02f01) ) @@ -1625,8 +1662,8 @@ ROM_END ROM_START( mslug4dh1 ) ROM_REGION( 0x500000, "maincpu", 0 ) - ROM_LOAD16_WORD_SWAP( "263dh.p1", 0x000000, 0x100000, CRC(af69d959) SHA1(2bc9796003c8742d681e11ad842978d918fbae40) ) - ROM_LOAD16_WORD_SWAP( "263dh.sp2", 0x100000, 0x400000, CRC(2b863b30) SHA1(b5edc43d87faf6540e3154fcbab42efb148cbd04) ) + ROM_LOAD16_WORD_SWAP( "263dh.p1", 0x000000, 0x100000, CRC(af69d959) SHA1(2bc9796003c8742d681e11ad842978d918fbae40) ) + ROM_LOAD16_WORD_SWAP( "263dh.p2", 0x100000, 0x400000, CRC(2b863b30) SHA1(b5edc43d87faf6540e3154fcbab42efb148cbd04) ) NEO_SFIX_128K( "263-s1.s1", CRC(a9446774) SHA1(c5a309fd8ee6d6750a15c82e710218a3755e38b2) ) @@ -1915,6 +1952,30 @@ ROM_START( mslug4nd ) ROM_LOAD16_BYTE( "263nd.c6", 0x2000001, 0x400000, CRC(D90FC1A0) SHA1(0eaf5f658212c19a4cdbcdbff3b04389a2be76bb) ) ROM_END +ROM_START( mslug4sp ) // all confirmed: same as mslug4 except p roms + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "263sp.p1", 0x000000, 0x100000, CRC(44b6f3d7) SHA1(d6c9b84e1758f731be21c7506ffb5c8837fbc19c) ) + ROM_LOAD16_WORD_SWAP( "263dh.p2", 0x100000, 0x400000, CRC(2b863b30) SHA1(b5edc43d87faf6540e3154fcbab42efb148cbd04) ) + + NEO_SFIX_MT_512K + + NEO_BIOS_AUDIO_ENCRYPTED_128K( "263-m1.m1", CRC(46ac8228) SHA1(5aeea221050c98e4bb0f16489ce772bf1c80f787) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "263-v1.v1", 0x000000, 0x800000, CRC(01e9b9cd) SHA1(0b045c2999449f7dab5ae8a42e957d5b6650431e) ) + ROM_LOAD( "263-v2.v2", 0x800000, 0x800000, CRC(4ab2bf81) SHA1(77ccfa48f7e3daddef5fe5229a0093eb2f803742) ) + + ROM_REGION( 0x3000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "263-c1.c1", 0x0000000, 0x800000, CRC(84865f8a) SHA1(34467ada896eb7c7ca58658bf2a932936d8b632c) ) + ROM_LOAD16_BYTE( "263-c2.c2", 0x0000001, 0x800000, CRC(81df97f2) SHA1(2b74493b8ec8fd49216a627aeb3db493f76124e3) ) + ROM_LOAD16_BYTE( "263-c3.c3", 0x1000000, 0x800000, CRC(1a343323) SHA1(bbbb5232bba538c277ce2ee02e2956ca2243b787) ) + ROM_LOAD16_BYTE( "263-c4.c4", 0x1000001, 0x800000, CRC(942cfb44) SHA1(d9b46c71726383c4581fb042e63897e5a3c92d1b) ) + ROM_LOAD16_BYTE( "263-c5.c5", 0x2000000, 0x800000, CRC(a748854f) SHA1(2611bbedf9b5d8e82c6b2c99b88f842c46434d41) ) + ROM_LOAD16_BYTE( "263-c6.c6", 0x2000001, 0x800000, CRC(5c8ba116) SHA1(6034db09c8706d4ddbcefc053efbc47a0953eb92) ) +ROM_END + + + #if 0 ROM_START( mslug5 ) /* Encrypted Set */ /* MVS VERSION */ ROM_REGION( 0x800000, "maincpu", 0 ) @@ -2008,6 +2069,31 @@ ROM_START( ms5pcbd ) ROM_LOAD16_BYTE( "268pcbd.c4", 0x2000001, 0x1000000, CRC(49e902e8) SHA1(289a560ffe3d50abd773c61fa2df3c1f18d7e803) ) ROM_END +ROM_START( ms5sp ) // all confirmed: ms5plus with p1 changed + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "268sp.p1", 0x000000, 0x100000, CRC(540cd43f) SHA1(29378262a40e09f21dc6f033b8a97463caf5f1a9) ) + ROM_LOAD16_WORD_SWAP( "ms5-p2p.bin", 0x100000, 0x200000, CRC(d6a458e8) SHA1(c0a8bdae06d62859fb6734766ccc190eb2a809a4) ) + ROM_LOAD16_WORD_SWAP( "ms5-p3p.bin", 0x300000, 0x200000, CRC(439ec031) SHA1(f0ad8f9be7d26bc504593c1321bd23c286a221f0) ) + + NEO_SFIX_128K( "ms5-s1p.bin", CRC(21e04432) SHA1(10057a2aa487087f7143d1d69fdad978a6bef0f7) ) + + NEO_BIOS_AUDIO_ENCRYPTED_512K( "268-m1.m1", CRC(4a5a6e0e) SHA1(df0f660f2465e1db7be5adfcaf5e88ad61a74a42) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "268-v1c.v1", 0x000000, 0x800000, CRC(ae31d60c) SHA1(c42285cf4e52fea74247860813e826df5aa7600a) ) + ROM_LOAD( "268-v2c.v2", 0x800000, 0x800000, CRC(c40613ed) SHA1(af889570304e2867d7dfea1e94e388c06249fb67) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "268-c1c.c1", 0x0000000, 0x800000, CRC(ab7c389a) SHA1(025a188de589500bf7637fa8e7a37ab24bf4312e) ) + ROM_LOAD16_BYTE( "268-c2c.c2", 0x0000001, 0x800000, CRC(3560881b) SHA1(493d218c92290b4770024d6ee2917c4022753b07) ) + ROM_LOAD16_BYTE( "268-c3c.c3", 0x1000000, 0x800000, CRC(3af955ea) SHA1(cf36b6ae9b0d12744b17cb7a928399214de894be) ) + ROM_LOAD16_BYTE( "268-c4c.c4", 0x1000001, 0x800000, CRC(c329c373) SHA1(5073d4079958a0ef5426885af2c9e3178f37d5e0) ) + ROM_LOAD16_BYTE( "268-c5c.c5", 0x2000000, 0x800000, CRC(959c8177) SHA1(889bda7c65d71172e7d89194d1269561888fe789) ) + ROM_LOAD16_BYTE( "268-c6c.c6", 0x2000001, 0x800000, CRC(010a831b) SHA1(aec140661e3ae35d264df416478ba15188544d91) ) + ROM_LOAD16_BYTE( "268-c7c.c7", 0x3000000, 0x800000, CRC(6d72a969) SHA1(968dd9a4d1209b770b9b85ea6532fa24d262a262) ) + ROM_LOAD16_BYTE( "268-c8c.c8", 0x3000001, 0x800000, CRC(551d720e) SHA1(ebf69e334fcaba0fda6fd432fd0970283a365d12) ) +ROM_END + ROM_START( mslug5b ) ROM_REGION( 0x600000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "268b.p1", 0x000000, 0x100000, CRC(d05853ea) SHA1(8bb284d8f937b1b50d28d207f5fd262e4ed1d96c) ) @@ -2083,6 +2169,32 @@ ROM_START( mslug5d1 ) ROM_LOAD16_BYTE( "268hd.c8", 0x3000001, 0x800000, CRC(fafc3eb9) SHA1(F4F73194CC7FD151BE3CA2561F993B5BE7628369) ) ROM_END +ROM_START( mslug5f ) // all confirmed: mslug5lvf with different p1 rom + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "268f.p1", 0x000000, 0x100000, CRC(6be7043d) SHA1(caaf24cc653abbd435de7732f6489c613f3911ac) ) + ROM_LOAD16_WORD_SWAP( "268lvf.p2", 0x100000, 0x400000, CRC(f06c589a) SHA1(0882ee5221ab873f87a719e34bd5250b79b82730) ) + + NEO_SFIX_MT_128K + + NEO_BIOS_AUDIO_512K( "268l9a.m1", CRC(464c72ad) SHA1(9e8a01c2bad897e2bbf32563a30f0474f8fcd2b5) ) + + ROM_REGION( 0x1037510, "ymsnd", 0 ) + ROM_LOAD( "268l9b.v1", 0x000000, 0x400000, CRC(fcc8ba01) SHA1(c187c318c65f6aefae05e6cef9f17492edf2e4db) ) + ROM_LOAD( "268l9b.v2", 0x400000, 0x400000, CRC(386f32bd) SHA1(d49fc812c442563b9e82da43bf5c6b9deea0f687) ) + ROM_LOAD( "268l9b.v3", 0x800000, 0x400000, CRC(dc737e12) SHA1(f940ea767404f6a15dea526eda56ad66517ba79e) ) + ROM_LOAD( "268l9b.v4", 0xc00000, 0x437510, CRC(2b310542) SHA1(5f0050d36cd1f722d78d9ae98db537eacc4d8548) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "268l9b.c1", 0x0000000, 0x800000, CRC(aad8ff17) SHA1(f8c5f7bd9aa4b930ceb38b25934650ac810563df) ) + ROM_LOAD16_BYTE( "268l9b.c2", 0x0000001, 0x800000, CRC(b0404dd4) SHA1(0ab1f81072dac777c3269811dfb69cb40bd7a245) ) + ROM_LOAD16_BYTE( "268l9b.c3", 0x1000000, 0x800000, CRC(95dda158) SHA1(7ec4625a17f815e8d7e690cb01f3c9dbce75e39b) ) + ROM_LOAD16_BYTE( "268l9b.c4", 0x1000001, 0x800000, CRC(c052cf1f) SHA1(198041e813914570b943fc1927e986e5553c6bd4) ) + ROM_LOAD16_BYTE( "268l9b.c5", 0x2000000, 0x800000, CRC(8b9f7e21) SHA1(0dcefc5efc67d520a880b3da6122c342ebdc5e2f) ) + ROM_LOAD16_BYTE( "268l9b.c6", 0x2000001, 0x800000, CRC(4a0693cf) SHA1(c4bdf72754f85250dfccdd4444941931a6596569) ) + ROM_LOAD16_BYTE( "268l9b.c7", 0x3000000, 0x800000, CRC(3ad5eaf4) SHA1(b4c4cf0425d42bd47bc85acfab93006c003af341) ) + ROM_LOAD16_BYTE( "268l9b.c8", 0x3000001, 0x800000, CRC(3e7c670d) SHA1(166eda40c01d01b1d8ec82f2482e8cb4e5ca0e79) ) +ROM_END + ROM_START( mslug5fr ) /* Metal Slug 5 - French translation - NeoArc */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "268fr.p1", 0x000000, 0x100000, CRC(63cc3c2d) SHA1(b4543c65427d15f784641617dcab53663031a9f3) ) @@ -2207,6 +2319,84 @@ ROM_START( mslug5l9b ) ROM_LOAD16_BYTE( "268l9b.c8", 0x3000001, 0x800000, CRC(3e7c670d) SHA1(166eda40c01d01b1d8ec82f2482e8cb4e5ca0e79) ) ROM_END +ROM_START( mslug5lvf ) // all confirmed: mslug5l9b with different p roms + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "268lvf.p1", 0x000000, 0x100000, CRC(18763285) SHA1(53947549729d6522f7b0858c968a1df19ab82f76) ) + ROM_LOAD16_WORD_SWAP( "268lvf.p2", 0x100000, 0x400000, CRC(f06c589a) SHA1(0882ee5221ab873f87a719e34bd5250b79b82730) ) + + NEO_SFIX_MT_128K + + NEO_BIOS_AUDIO_512K( "268l9a.m1", CRC(464c72ad) SHA1(9e8a01c2bad897e2bbf32563a30f0474f8fcd2b5) ) + + ROM_REGION( 0x1037510, "ymsnd", 0 ) + ROM_LOAD( "268l9b.v1", 0x000000, 0x400000, CRC(fcc8ba01) SHA1(c187c318c65f6aefae05e6cef9f17492edf2e4db) ) + ROM_LOAD( "268l9b.v2", 0x400000, 0x400000, CRC(386f32bd) SHA1(d49fc812c442563b9e82da43bf5c6b9deea0f687) ) + ROM_LOAD( "268l9b.v3", 0x800000, 0x400000, CRC(dc737e12) SHA1(f940ea767404f6a15dea526eda56ad66517ba79e) ) + ROM_LOAD( "268l9b.v4", 0xc00000, 0x437510, CRC(2b310542) SHA1(5f0050d36cd1f722d78d9ae98db537eacc4d8548) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "268l9b.c1", 0x0000000, 0x800000, CRC(aad8ff17) SHA1(f8c5f7bd9aa4b930ceb38b25934650ac810563df) ) + ROM_LOAD16_BYTE( "268l9b.c2", 0x0000001, 0x800000, CRC(b0404dd4) SHA1(0ab1f81072dac777c3269811dfb69cb40bd7a245) ) + ROM_LOAD16_BYTE( "268l9b.c3", 0x1000000, 0x800000, CRC(95dda158) SHA1(7ec4625a17f815e8d7e690cb01f3c9dbce75e39b) ) + ROM_LOAD16_BYTE( "268l9b.c4", 0x1000001, 0x800000, CRC(c052cf1f) SHA1(198041e813914570b943fc1927e986e5553c6bd4) ) + ROM_LOAD16_BYTE( "268l9b.c5", 0x2000000, 0x800000, CRC(8b9f7e21) SHA1(0dcefc5efc67d520a880b3da6122c342ebdc5e2f) ) + ROM_LOAD16_BYTE( "268l9b.c6", 0x2000001, 0x800000, CRC(4a0693cf) SHA1(c4bdf72754f85250dfccdd4444941931a6596569) ) + ROM_LOAD16_BYTE( "268l9b.c7", 0x3000000, 0x800000, CRC(3ad5eaf4) SHA1(b4c4cf0425d42bd47bc85acfab93006c003af341) ) + ROM_LOAD16_BYTE( "268l9b.c8", 0x3000001, 0x800000, CRC(3e7c670d) SHA1(166eda40c01d01b1d8ec82f2482e8cb4e5ca0e79) ) +ROM_END + +ROM_START( mslug5lvnc ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "268lvf.p1", 0x000000, 0x100000, CRC(18763285) SHA1(53947549729d6522f7b0858c968a1df19ab82f76) ) + ROM_LOAD16_WORD_SWAP( "268lvf.p2", 0x100000, 0x400000, CRC(f06c589a) SHA1(0882ee5221ab873f87a719e34bd5250b79b82730) ) + + NEO_SFIX_MT_128K + + NEO_BIOS_AUDIO_512K( "268l9a.m1", CRC(464c72ad) SHA1(9e8a01c2bad897e2bbf32563a30f0474f8fcd2b5) ) + + ROM_REGION( 0x10002f0, "ymsnd", 0 ) + ROM_LOAD( "268l9a.v1", 0x000000, 0x400000, CRC(a8e12a92) SHA1(b23d80d131649c1d243bb30cf5b2141354a7ac55) ) + ROM_LOAD( "268lvnc.v2", 0x400000, 0x400000, CRC(0608cba3) SHA1(ad7c985a25abd68c58e502c008b45e0b14422829) ) + ROM_LOAD( "268l9a.v3", 0x800000, 0x400000, CRC(aeff1982) SHA1(ac777a12639e21f0f227be84a59c7bb543c6ddd9) ) + ROM_LOAD( "268l9a.v4", 0xc00000, 0x4002f0, CRC(179cbca3) SHA1(fdcb0df0c2f73d11cd32a8625ad6fa24cedb9dc9) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "268l9a.c1", 0x0000000, 0x800000, CRC(5e2e9087) SHA1(2366df8b0ee03e8938dcae571dccf32cfcfd685b) ) + ROM_LOAD16_BYTE( "268l9a.c2", 0x0000001, 0x800000, CRC(d15770e3) SHA1(162c166c3fdc2a29af88dfea8a10138284029e36) ) + ROM_LOAD16_BYTE( "268l9a.c3", 0x1000000, 0x800000, CRC(3e104b8f) SHA1(ee8467e07f27fbcad35a239b45e1e7e5aed79a25) ) + ROM_LOAD16_BYTE( "268l9a.c4", 0x1000001, 0x800000, CRC(03f32dda) SHA1(64bc08dce4a8188878d683a6290e370e4d3488a1) ) + ROM_LOAD16_BYTE( "268l9a.c5", 0x2000000, 0x800000, CRC(fd3e0f24) SHA1(5143c521c79a011465c93717171bb24b550bdc1f) ) + ROM_LOAD16_BYTE( "268l9a.c6", 0x2000001, 0x800000, CRC(3c873aba) SHA1(b1c882f7c228046929f82a24d9f635c1b6443a94) ) + ROM_LOAD16_BYTE( "268l9a.c7", 0x3000000, 0x800000, CRC(0d070c3b) SHA1(2d785bd095726b4e48aa65578b9694372f4c46c3) ) + ROM_LOAD16_BYTE( "268l9a.c8", 0x3000001, 0x800000, CRC(09751dd8) SHA1(5a1378faa3bd3ebb6573d7c171639df153b5202b) ) +ROM_END + +ROM_START( mslug5w ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "268w.p1", 0x000000, 0x100000, CRC(b0c126da) SHA1(9081ec2c3cfc27baf759417b24f2ebc07ceffab0) ) + ROM_LOAD16_WORD_SWAP( "268lvf.p2", 0x100000, 0x400000, CRC(f06c589a) SHA1(0882ee5221ab873f87a719e34bd5250b79b82730) ) + + NEO_SFIX_MT_128K + + NEO_BIOS_AUDIO_512K( "268l9a.m1", CRC(464c72ad) SHA1(9e8a01c2bad897e2bbf32563a30f0474f8fcd2b5) ) + + ROM_REGION( 0x10002f0, "ymsnd", 0 ) + ROM_LOAD( "268l9a.v1", 0x000000, 0x400000, CRC(a8e12a92) SHA1(b23d80d131649c1d243bb30cf5b2141354a7ac55) ) + ROM_LOAD( "268lvnc.v2", 0x400000, 0x400000, CRC(0608cba3) SHA1(ad7c985a25abd68c58e502c008b45e0b14422829) ) + ROM_LOAD( "268nd.v3", 0x800000, 0x400000, CRC(02fd519e) SHA1(6fbda5bf8dbf52bc110aba7b9d20b24bdc2fe0d7) ) + ROM_LOAD( "268l9a.v4", 0xc00000, 0x4002f0, CRC(179cbca3) SHA1(fdcb0df0c2f73d11cd32a8625ad6fa24cedb9dc9) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "268l9a.c1", 0x0000000, 0x800000, CRC(5e2e9087) SHA1(2366df8b0ee03e8938dcae571dccf32cfcfd685b) ) + ROM_LOAD16_BYTE( "268l9a.c2", 0x0000001, 0x800000, CRC(d15770e3) SHA1(162c166c3fdc2a29af88dfea8a10138284029e36) ) + ROM_LOAD16_BYTE( "268l9a.c3", 0x1000000, 0x800000, CRC(3e104b8f) SHA1(ee8467e07f27fbcad35a239b45e1e7e5aed79a25) ) + ROM_LOAD16_BYTE( "268l9a.c4", 0x1000001, 0x800000, CRC(03f32dda) SHA1(64bc08dce4a8188878d683a6290e370e4d3488a1) ) + ROM_LOAD16_BYTE( "268l9a.c5", 0x2000000, 0x800000, CRC(fd3e0f24) SHA1(5143c521c79a011465c93717171bb24b550bdc1f) ) + ROM_LOAD16_BYTE( "268l9a.c6", 0x2000001, 0x800000, CRC(3c873aba) SHA1(b1c882f7c228046929f82a24d9f635c1b6443a94) ) + ROM_LOAD16_BYTE( "268l9a.c7", 0x3000000, 0x800000, CRC(0d070c3b) SHA1(2d785bd095726b4e48aa65578b9694372f4c46c3) ) + ROM_LOAD16_BYTE( "268l9a.c8", 0x3000001, 0x800000, CRC(09751dd8) SHA1(5a1378faa3bd3ebb6573d7c171639df153b5202b) ) +ROM_END + ROM_START( mslug5nd ) ROM_REGION( 0x800000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "268nd.p1", 0x000000, 0x100000, CRC(ca50afdf) SHA1(e3780b77f20d139a0dcaa2ded2c6ee323b8b4279) ) // this rom is watermarked by HappyASR (24/12/03) @@ -2265,9 +2455,6 @@ GAME( 2013, mslugxr, mslugx, neogeo_noslot, neogeo, neogeo_noslot_state, msl GAME( 1999, mslugxst, mslugx, neogeo_noslot, neogeo, neogeo_noslot_state, mslugx, ROT0, "hack", "Metal Slug X (Enhanced Version by STARK) [EGCG]", MACHINE_SUPPORTS_SAVE ) // Metal Slug 3 GAME( 2000, mslug3d, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3d, ROT0, "SNK", "Metal Slug 3 (decrypted C)", MACHINE_SUPPORTS_SAVE ) -GAME( 2000, mslug3d1, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, cmc42sfix,ROT0, "SNK", "Metal Slug 3 (NGH-2560)(Fully Decrypted C)", MACHINE_SUPPORTS_SAVE ) -GAME( 2000, mslug3eha, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "HappyAsr", "Metal Slug 3 (Style remix 030826)", MACHINE_SUPPORTS_SAVE ) -GAME( 2000, mslug3ehs, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Ydmis", "Metal Slug 3 (Style remix set 01)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, mslug3e02, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Ydmis", "Metal Slug 3 (Style remix set 02)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, mslug3e03, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Ydmis", "Metal Slug 3 (Style remix set 03)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, mslug3e04, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Ydmis", "Metal Slug 3 (Style remix set 04)", MACHINE_SUPPORTS_SAVE ) @@ -2290,14 +2477,18 @@ GAME( 2000, mslug3e20, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, msl GAME( 2000, mslug3e21, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Ydmis", "Metal Slug 3 (Style remix set 21)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, mslug3e22, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Ydmis", "Metal Slug 3 (Style remix set 22)", MACHINE_SUPPORTS_SAVE ) GAME( 2013, mslug3eb, mslug3, neogeo_noslot, neogeo, neogeo_noslot_state, mslug3, ROT0, "PlayerX China", "Metal Slug 3 (EB)" , MACHINE_SUPPORTS_SAVE ) +GAME( 2000, mslug3eha, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "HappyAsr", "Metal Slug 3 (Style remix 030826)", MACHINE_SUPPORTS_SAVE ) +GAME( 2000, mslug3ehs, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Ydmis", "Metal Slug 3 (Style remix set 01)", MACHINE_SUPPORTS_SAVE ) GAME( 2004, mslug3fr, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3fr, ROT0, "Arkatrad", "Metal Slug 3 (French)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, mslug3fro, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3fr, ROT0, "Arkatrad", "Metal Slug 3 (French) (Old)", MACHINE_SUPPORTS_SAVE ) +GAME( 2000, mslug3hev, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "hack", "Metal Slug 3 (unknown hev)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, mslug3kh, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Fighters Kim and Ydmis", "Metal Slug 3 (Style remix 030801)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, mslug3kho, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Fighters Kim and Ydmis", "Metal Slug 3 (Style remix 030728)", MACHINE_SUPPORTS_SAVE ) -GAME( 2012, mslug3v, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, mslug3n, ROT0, "Eezezy", "Metal Slug 3 (Violence Edition)", MACHINE_SUPPORTS_SAVE ) +GAME( 2000, mslug3nd, mslug3, neogeo_noslot, neogeo, neogeo_hbmame, cmc42sfix,ROT0, "SNK", "Metal Slug 3 (NGH-2560)(Fully Decrypted C)", MACHINE_SUPPORTS_SAVE ) +GAME( 2012, mslug3v, mslug3, neogeo_noslot, neogeo, neogeo_noslot_state, mslug3b6, ROT0, "Eezezy", "Metal Slug 3 (Violence Edition)", MACHINE_SUPPORTS_SAVE ) // Metal Slug 4 -GAME( 2002, mslug4d, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, mslug4d, ROT0, "Mega","Metal Slug 4 (decrypted C)", MACHINE_SUPPORTS_SAVE ) -GAME( 2007, mslug4dh, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, mslug4dh, ROT0, "HappyASR [EGCG]","Metal Slug 4 Super D Version", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, mslug4d, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, mslug4d, ROT0, "Mega", "Metal Slug 4 (decrypted C)", MACHINE_SUPPORTS_SAVE ) +GAME( 2007, mslug4dh, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, mslug4dh, ROT0, "HappyASR [EGCG]", "Metal Slug 4 Super D Version", MACHINE_SUPPORTS_SAVE ) GAME( 2002, mslug4dh1, mslug4, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Metal Slug 4 Super D Version (Hack by HappyASR [EGCG])", MACHINE_SUPPORTS_SAVE ) GAME( 2002, mslug4eh, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, mslug4m, ROT0, "Creamymami", "Metal Slug 4 (Style remix 030414 set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, mslug4eh2, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, mslug4m, ROT0, "Creamymami", "Metal Slug 4 (Style remix 030414 set 2)", MACHINE_SUPPORTS_SAVE ) @@ -2311,15 +2502,21 @@ GAME( 2007, mslug4i, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, msl GAME( 2002, mslug4i1, mslug4, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Metal Slug 4 (Italian)2", MACHINE_SUPPORTS_SAVE ) GAME( 2002, mslug4kh, mslug4, neogeo_noslot, neogeo, neogeo_hbmame, mslug4m, ROT0, "Creamymami and Fighters Kim", "Metal Slug 4 (Style remix 030731)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, mslug4nd, mslug4, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Mega Enterprise / Playmore Corporation", "Metal Slug 4 (fully decrypted)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, mslug4sp, mslug4, neogeo_noslot, neogeo, neogeo_noslot_state, mslug4, ROT0, "hack", "Metal Slug 4 (unknown sp)", MACHINE_SUPPORTS_SAVE ) // Metal Slug 5 GAME( 2003, mslug5b, mslug5, neogeo_noslot, neogeo, neogeo_hbmame, mslug5b, ROT0, "bootleg", "Metal Slug 5 (bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, mslug5d, mslug5, neogeo_noslot, neogeo, neogeo_hbmame, mslug5d, ROT0, "hack", "Metal Slug 5 (decrypted C)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, mslug5d1, mslug5, neogeo_noslot, neogeo, neogeo_hbmame, mslug5d1, ROT0, "hack", "Metal Slug 5 (NGM-2680) (fully decrypted)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, mslug5f, mslug5, neogeo_noslot, neogeo, neogeo_noslot_state, s1945p, ROT0, "C.B", "Metal Slug 5 (unknown f)", MACHINE_SUPPORTS_SAVE ) GAME( 2006, mslug5fr, mslug5, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Arkatrad", "Metal Slug 5 (French)", MACHINE_SUPPORTS_SAVE ) GAME( 2006, mslug5fr1, mslug5, neogeo_noslot, neogeo, neogeo_hbmame, mslug5fr1,ROT0, "NEO-ARC", "Metal Slug 5 (French Edition)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, mslug5hd, mslug5, neogeo_noslot, neogeo, neogeo_hbmame, mslug5hd, ROT0, "hack", "Metal Slug 5 (NGH-2680) (Decrypted C)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, mslug5l9a, mslug5, neogeo_noslot, neogeo, neogeo_noslot_state, s1945p, ROT0, "C.B", "Metal Slug 5 Level 9 Hack (Ver A)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, mslug5l9b, mslug5, neogeo_noslot, neogeo, neogeo_noslot_state, s1945p, ROT0, "C.B", "Metal Slug 5 Level 9 Hack (Ver B)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, mslug5lvf, mslug5, neogeo_noslot, neogeo, neogeo_noslot_state, s1945p, ROT0, "C.B", "Metal Slug 5 (unknown lvf)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, mslug5lvnc,mslug5, neogeo_noslot, neogeo, neogeo_noslot_state, s1945p, ROT0, "C.B", "Metal Slug 5 (unknown lvnc)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, mslug5nd, mslug5, neogeo_noslot, neogeo, neogeo_hbmame, mslug5nd, ROT0, "hack", "Metal Slug 5 (decrypted)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, mslug5w, mslug5, neogeo_noslot, neogeo, neogeo_noslot_state, s1945p, ROT0, "C.B", "Metal Slug 5 (unknown w)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, ms5boot, mslug5, neogeo_noslot, neogeo, neogeo_hbmame, ms5boot, ROT0, "bootleg", "Metal Slug 5 (Bootleg Set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, ms5pcbd, ms5pcb, neogeo_noslot, dualbios, neogeo_hbmame, ms5pcbd, ROT0, "hack", "Metal Slug 5 (JAMMA PCB) decrypted", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, ms5sp, mslug5, neogeo_noslot, neogeo, neogeo_noslot_state, ms5plus, ROT0, "hack", "Metal Slug 5 PLUS (unknown sp)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/neogeo.cpp b/docs/release/src/hbmame/drivers/neogeo.cpp index 8d36e3e70d6..bbfd2c8c76c 100644 --- a/docs/release/src/hbmame/drivers/neogeo.cpp +++ b/docs/release/src/hbmame/drivers/neogeo.cpp @@ -788,7 +788,7 @@ WRITE16_MEMBER(neogeo_state::memcard_w) WRITE8_MEMBER(neogeo_state::audio_command_w) { - soundlatch_write(data); + m_soundlatch->write(space, 0, data); m_audio_cpu_nmi_pending = true; audio_cpu_check_nmi(); @@ -800,7 +800,7 @@ WRITE8_MEMBER(neogeo_state::audio_command_w) READ8_MEMBER(neogeo_state::audio_command_r) { - UINT8 ret = soundlatch_read(); + UINT8 ret = m_soundlatch->read(space, 0); m_audio_cpu_nmi_pending = false; audio_cpu_check_nmi(); @@ -811,7 +811,7 @@ READ8_MEMBER(neogeo_state::audio_command_r) CUSTOM_INPUT_MEMBER(neogeo_state::get_audio_result) { - UINT8 ret = soundlatch_read(1); // soundlatch2_byte_r + UINT8 ret = m_soundlatch2->read(m_audiocpu->space(AS_PROGRAM), 0); return ret; } @@ -1024,8 +1024,8 @@ DRIVER_INIT_MEMBER(neogeo_state,neogeo) m_sprgen->m_fixed_layer_bank_type = 0; // install controllers - m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, 0, 0x01ff7e, read16_delegate(FUNC(neogeo_state::in0_r), this)); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x340000, 0x340001, 0, 0x01fffe, read16_delegate(FUNC(neogeo_state::in1_r), this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, 0, 0x01ff7e, 0, read16_delegate(FUNC(neogeo_state::in0_r), this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x340000, 0x340001, 0, 0x01fffe, 0, read16_delegate(FUNC(neogeo_state::in1_r), this)); } @@ -1281,11 +1281,11 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( audio_io_map, AS_IO, 8, neogeo_state ) - AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, soundlatch_clear_byte_w) + AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READ(audio_command_r) AM_DEVWRITE("soundlatch", generic_latch_8_device, clear_w) AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) - AM_RANGE(0x08, 0x08) AM_MIRROR(0xff10) AM_MASK(0x0010) AM_WRITE(audio_cpu_enable_nmi_w) - AM_RANGE(0x08, 0x0b) AM_MIRROR(0xfff0) AM_MASK(0xff03) AM_READ(audio_cpu_bank_select_r) - AM_RANGE(0x0c, 0x0c) AM_MIRROR(0xff00) AM_WRITE(soundlatch2_byte_w) + AM_RANGE(0x08, 0x08) AM_MIRROR(0xff00) AM_SELECT(0x0010) AM_WRITE(audio_cpu_enable_nmi_w) + AM_RANGE(0x08, 0x0b) AM_MIRROR(0x00f0) AM_SELECT(0xff00) AM_READ(audio_cpu_bank_select_r) + AM_RANGE(0x0c, 0x0c) AM_MIRROR(0xff00) AM_DEVWRITE("soundlatch2", generic_latch_8_device, write) ADDRESS_MAP_END @@ -1399,6 +1399,9 @@ MACHINE_CONFIG_START( neogeo_base, neogeo_state ) /* audio hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + MCFG_SOUND_ADD("ymsnd", YM2610, NEOGEO_YM2610_CLOCK) MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.28) diff --git a/docs/release/src/hbmame/drivers/neogeo_noslot.cpp b/docs/release/src/hbmame/drivers/neogeo_noslot.cpp index 27d3a229fa0..02b4a729c5c 100644 --- a/docs/release/src/hbmame/drivers/neogeo_noslot.cpp +++ b/docs/release/src/hbmame/drivers/neogeo_noslot.cpp @@ -8433,7 +8433,7 @@ DRIVER_INIT_MEMBER(neogeo_noslot_state,vliner) m_maincpu->space(AS_PROGRAM).install_ram(0x200000, 0x201fff); - m_maincpu->space(AS_PROGRAM).install_read_port(0x300000, 0x300001, 0, 0x01ff7e, "DSW"); + m_maincpu->space(AS_PROGRAM).install_read_port(0x300000, 0x300001, 0x01ff7e, "DSW"); m_maincpu->space(AS_PROGRAM).install_read_port(0x280000, 0x280001, "IN5"); m_maincpu->space(AS_PROGRAM).install_read_port(0x2c0000, 0x2c0001, "IN6"); @@ -8696,7 +8696,7 @@ DRIVER_INIT_MEMBER(neogeo_noslot_state,kf2k3upl) // copied to slot void neogeo_noslot_state::install_banked_bios() { - m_maincpu->space(AS_PROGRAM).install_read_bank(0xc00000, 0xc1ffff, 0, 0x0e0000, "bankedbios"); + m_maincpu->space(AS_PROGRAM).install_read_bank(0xc00000, 0xc1ffff, 0x0e0000, "bankedbios"); membank("bankedbios")->configure_entries(0, 2, memregion("mainbios")->base(), 0x20000); membank("bankedbios")->set_entry(1); } @@ -8763,7 +8763,7 @@ DRIVER_INIT_MEMBER(neogeo_noslot_state,kf2k3pcb) m_pcm2_prot->neo_pcm2_swap(ym_region, ym_region_size, 5); m_sprgen->m_fixed_layer_bank_type = 2; m_pvc_prot->install_pvc_protection(m_maincpu,m_banked_cart); - m_maincpu->space(AS_PROGRAM).install_rom(0xc00000, 0xc7ffff, 0, 0x080000, memregion("mainbios")->base()); // 512k bios + m_maincpu->space(AS_PROGRAM).install_rom(0xc00000, 0xc7ffff, 0x080000, memregion("mainbios")->base()); // 512k bios } diff --git a/docs/release/src/hbmame/drivers/neogeohb.cpp b/docs/release/src/hbmame/drivers/neogeohb.cpp index f0906423a67..215ed88cbfd 100644 --- a/docs/release/src/hbmame/drivers/neogeohb.cpp +++ b/docs/release/src/hbmame/drivers/neogeohb.cpp @@ -109,9 +109,9 @@ NUM YEAR COMPANY TITLE 334*2002 ADK Dance RhythMIX 335*2002 ADK World Heroes 3 336 Face Dragon's Heaven -337*2000 Vektorlogic Neo Sparks (cancelled?) +337*2000 Vektorlogic Neo Sparks (cancelled) 338 2004 Vektorlogic Super Bubble Pop -339* Vektorlogic TommyK (cancelled?) +339* Vektorlogic TommyK (cancelled) 350* Neo Dev Cart 351* MVS Test Cart 360 2003 PhenixSoft Crouching Tiger Hidden Dragon (hack of kof2001) (original number 5003) @@ -204,7 +204,8 @@ NUM YEAR COMPANY TITLE 472 2015 freem ADPCM-A Playback Demo 473 2015 blastar Twister in a mirror intro 474 2015 freem Sound-Loop Demo -475 2016 kannagi Sprite Demo +475 2016 kannagi Ennemi Sprite Demo +476 2015 kannagi Neo Fight ********************** 800 to 899 ********************************** @@ -1563,6 +1564,24 @@ ROM_START( ennemi ) ROM_LOAD16_BYTE( "475.c2", 0x000001, 0x200000, CRC(319b0d51) SHA1(f57b4b3c96d94a6887f9e02e53af8eaef59d617a) ) ROM_END +// 476 : Neo Fight by Kannagi (14-12-2015) +// Arrows to move fighter around. A = kick; B = punch; C & D slide background left & right. No sound. +ROM_START( neofight ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "476.p1", 0x000000, 0x080000, CRC(b0eb16a0) SHA1(136b1cb9b9daf1b8563c66002d07bb5128d41061) ) + + NEO_SFIX_128K( "052-s1.s1", CRC(97689804) SHA1(fa8dab3b3353d7115a0368f3fc749950c0186fbc) ) + + NEO_BIOS_AUDIO_128K( "052-m1.m1", CRC(49f17d2d) SHA1(70971fcf71ae3a6b2e26e7ade8063941fb178ae5) ) + + ROM_REGION( 0x200000, "ymsnd", 0 ) + ROM_LOAD( "052-v1.v1", 0x000000, 0x200000, CRC(22c097a5) SHA1(328c4e6db0a026f54a633cff1443a3f964a8daea) ) + + ROM_REGION( 0x400000, "sprites", 0 ) + ROM_LOAD16_BYTE( "476.c1", 0x000000, 0x200000, CRC(99fda4d5) SHA1(c5ff1b724a8cbc209c47eb4fb1eca4f0b76aad5c) ) + ROM_LOAD16_BYTE( "476.c2", 0x000001, 0x200000, CRC(2e48378a) SHA1(80389cfc420b2e7c5f50c809995a3298a57c697f) ) +ROM_END + // 802 : Last Hope CD Beta by NG:DEV.Team // Bugs: Insert Coin causes reboot; purple boxes instead of graphics; some corrupt graphics @@ -1671,6 +1690,7 @@ GAME( 2004, neo2500, neogeo, neogeo_noslot, neogeo, neogeo_state, neog GAME( 2012, neo3d, neogeo, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Oxygene", "Neo 3D Demo", MACHINE_SUPPORTS_SAVE ) GAME( 2004, neocstlv, neogeo, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "BarfHappy", "Neo Castlevania Demo", MACHINE_SUPPORTS_SAVE ) GAME( 2003, neodemo, neogeo, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Charles Doty", "Demo - NeoGeo", MACHINE_SUPPORTS_SAVE ) +GAME( 2015, neofight, neogeo, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Kannagi", "Neo Fight", MACHINE_SUPPORTS_SAVE ) GAME( 2013, neogal1, neogeo, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "BEY", "Neo Geo Galaga Demo R001", MACHINE_SUPPORTS_SAVE ) GAME( 2013, neogal1d, neogal1, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "BEY", "Neo Geo Galaga Demo R001 (debug)", MACHINE_SUPPORTS_SAVE ) GAME( 2013, neogal1t, neogal1, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "BEY", "Neo Geo Galaga Demo R001 (text)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/ngkofmisc.cpp b/docs/release/src/hbmame/drivers/ngkofmisc.cpp index 1f9976a406b..6a8dbe35b74 100644 --- a/docs/release/src/hbmame/drivers/ngkofmisc.cpp +++ b/docs/release/src/hbmame/drivers/ngkofmisc.cpp @@ -19,6 +19,13 @@ static MACHINE_CONFIG_DERIVED_CLASS( hbmame_kog, neogeo_arcade, neogeo_hbmame ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(main_map_noslot) MCFG_KOG_PROT_ADD("kog_prot") + + //joystick controller + MCFG_NEOGEO_CONTROL_EDGE_CONNECTOR_ADD("edge", neogeo_arc_edge_fixed, "joy", true) + + //no mahjong controller + MCFG_NEOGEO_CONTROL_PORT_ADD("ctrl1", neogeo_arc_pin15, "", true) + MCFG_NEOGEO_CONTROL_PORT_ADD("ctrl2", neogeo_arc_pin15, "", true) MACHINE_CONFIG_END DRIVER_INIT_MEMBER( neogeo_hbmame, kogd ) diff --git a/docs/release/src/hbmame/drivers/ngsvc.cpp b/docs/release/src/hbmame/drivers/ngsvc.cpp index 313c2bb7741..1c79c56c21a 100644 --- a/docs/release/src/hbmame/drivers/ngsvc.cpp +++ b/docs/release/src/hbmame/drivers/ngsvc.cpp @@ -102,6 +102,30 @@ ROM_START( svcd1 ) ROM_LOAD16_BYTE( "269d1.c8", 0x3000001, 0x800000, CRC(b17dfcf9) SHA1(46af296b12831ee40355f52d2c316f609557d6df) ) ROM_END +ROM_START( svcesv ) // all confirmed + ROM_REGION( 0x800000, "maincpu", 0 ) + ROM_LOAD32_WORD_SWAP( "269esv.p1", 0x000000, 0x400000, CRC(c6fd0131) SHA1(25439e469d0403439fde5d6532081a9b405bf642) ) + ROM_LOAD32_WORD_SWAP( "269esv.p2", 0x000002, 0x400000, CRC(2adede28) SHA1(555d3a9a53f0c7e8b450f7885b0ea86abece0843) ) + + NEO_SFIX_MT_512K + + NEO_BIOS_AUDIO_ENCRYPTED_512K( "269-m1.m1", CRC(f6819d00) SHA1(d3bbe09df502464f104e53501708ac6e2c1832c6) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "269-v1.v1", 0x000000, 0x800000, CRC(c659b34c) SHA1(1931e8111ef43946f68699f8707334c96f753a1e) ) + ROM_LOAD( "269-v2.v2", 0x800000, 0x800000, CRC(dd903835) SHA1(e58d38950a7a8697bb22a1cc7a371ae6664ae8f9) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "269esv.c1", 0x0000000, 0x800000, CRC(03cda72a) SHA1(5557d44f191ed329256fd5dc383a7242ca30aee5) ) + ROM_LOAD16_BYTE( "269esv.c2", 0x0000001, 0x800000, CRC(442a7724) SHA1(8b7155978638a6656b0df9ccf7bd85be8172b167) ) + ROM_LOAD16_BYTE( "269esv.c3", 0x1000000, 0x800000, CRC(b311b183) SHA1(52b4c8c5530b856bbb497e5b33587cee0abfc892) ) + ROM_LOAD16_BYTE( "269esv.c4", 0x1000001, 0x800000, CRC(4aa13c41) SHA1(733c1434b65d2b595ba40d51045cfa523c14eefa) ) + ROM_LOAD16_BYTE( "269esv.c5", 0x2000000, 0x800000, CRC(1a81e716) SHA1(12d5f4128be45294aaf14461203ad99d768ad9bd) ) + ROM_LOAD16_BYTE( "269esv.c6", 0x2000001, 0x800000, CRC(6f346ae8) SHA1(a5561786bcdb51ffd72332c8da4a4448490a7068) ) + ROM_LOAD16_BYTE( "269esv.c7", 0x3000000, 0x800000, CRC(8dd412d3) SHA1(3d2afd7fc09c59537209071d049ec294f76770e5) ) + ROM_LOAD16_BYTE( "269esv.c8", 0x3000001, 0x800000, CRC(305ef23f) SHA1(3bdd24b075757062803ac2a6f9582bcfe0bcbb4c) ) +ROM_END + ROM_START( svch ) ROM_REGION( 0x600000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "269h.p1", 0x000000, 0x600000, CRC(06435efb) SHA1(115d8dbad06565cfdd6b607cc2359ec3ae5db6e0) ) @@ -324,14 +348,15 @@ ROM_END -GAME( 2003, svcd, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcd, ROT0, "hack", "SvC Chaos (decrypted C set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcd1, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcd1, ROT0, "hack", "SvC Chaos (decrypted C set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svch, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "chbandy", "SvC Chaos (Remix Ver 1.0 by chbandy)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcnd, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcplusd, ROT0, "hack", "SvC Chaos (unknown nd)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcpcbd, svcpcb, neogeo_noslot, dualbios, neogeo_hbmame, svcpcd, ROT0, "bootleg", "SVC Chaos (JAMMA PCB, decrypted C & V)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcplusb, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcplusb, ROT0, "bootleg", "SvC Chaos PLUS (Bootleg, set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcplusd, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcplusd, ROT0, "hack", "SvC Chaos PLUS (unknown plusd)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcpryu, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "SvC Plus (Koryu)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcps2, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGHT", "SvC Playstation2 Hack Final 1.02 (EGHT)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcrm, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Jason", "SVC REMIX ULTRA (Ver 1.2 by Jason)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, svcspryu, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "SvC Plus (Super Koryu)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcd, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcd, ROT0, "hack", "SvC Chaos (decrypted C set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcd1, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcd1, ROT0, "hack", "SvC Chaos (decrypted C set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svch, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "chbandy", "SvC Chaos (Remix Ver 1.0 by chbandy)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcesv, svc, neogeo_noslot, neogeo, neogeo_noslot_state, svc, ROT0, "hack", "SvC Chaos (unknown esv)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcnd, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcplusd, ROT0, "hack", "SvC Chaos (unknown nd)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcpcbd, svcpcb, neogeo_noslot, dualbios, neogeo_hbmame, svcpcd, ROT0, "hack", "SVC Chaos (JAMMA PCB, decrypted C & V)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcplusb, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcplusb, ROT0, "hack", "SvC Chaos PLUS (Bootleg, set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcplusd, svc, neogeo_noslot, neogeo, neogeo_hbmame, svcplusd, ROT0, "hack", "SvC Chaos PLUS (unknown plusd)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcpryu, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "SvC Plus (Koryu)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcps2, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGHT", "SvC Playstation2 Hack Final 1.02 (EGHT)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcrm, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Jason", "SVC REMIX ULTRA (Ver 1.2 by Jason)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, svcspryu, svc, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "SvC Plus (Super Koryu)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/nmk16.cpp b/docs/release/src/hbmame/drivers/nmk16.cpp index 3fda100e558..8054bde2364 100644 --- a/docs/release/src/hbmame/drivers/nmk16.cpp +++ b/docs/release/src/hbmame/drivers/nmk16.cpp @@ -2,10 +2,12 @@ // copyright-holders:Robbbert #include "../mame/drivers/nmk16.cpp" -ROM_START( tdragonp ) +ROM_START( tdragonp ) // not working at all ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code -bitswapped- */ ROM_LOAD16_BYTE( "91070_68k.8p", 0x00000, 0x20000, CRC(6930fffc) SHA1(571cc735dca654b77cd759b6cc52a74c24d88865) ) ROM_LOAD16_BYTE( "91070_68k.7p", 0x00001, 0x20000, CRC(c2d90c90) SHA1(d6c3dd955e516e9dc5efbb7aebc6dee9c49a8c98) ) + ROM_FILL(0, 1, 0) // fix stack + ROM_FILL(2, 2, 0) ROM_REGION( 0x020000, "fgtile", 0 ) ROM_LOAD( "91070.6", 0x000000, 0x20000, CRC(fe365920) SHA1(7581931cb95cd5a8ed40e4f5385b533e3d19af22) ) /* 8x8 tiles */ @@ -19,13 +21,11 @@ ROM_START( tdragonp ) ROM_REGION( 0x010000, "audiocpu", 0 ) /* Code for (unknown?) CPU */ ROM_LOAD( "91070.1", 0x00000, 0x10000, CRC(bf493d74) SHA1(6f8f5eff4b71fb6cabda10075cfa88a3f607859e) ) - ROM_REGION( 0x0a0000, "oki1", 0 ) /* OKIM6295 samples */ - ROM_LOAD( "91070.3", 0x00000, 0x20000, CRC(ae6875a8) SHA1(bfdb350b3d3fce2bead1ac60875beafe427765ed) ) - ROM_CONTINUE( 0x40000, 0x60000 ) /* banked */ + ROM_REGION( 0x080000, "oki1", 0 ) /* OKIM6295 samples */ + ROM_LOAD( "91070.3", 0x00000, 0x80000, CRC(ae6875a8) SHA1(bfdb350b3d3fce2bead1ac60875beafe427765ed) ) /* 0x20000 - 0x80000 banked */ - ROM_REGION( 0x0a0000, "oki2", 0 ) /* OKIM6295 samples */ - ROM_LOAD( "91070.2", 0x00000, 0x20000, CRC(ecfea43e) SHA1(d664dfa6698fec8e602523bdae16068f1ff6547b) ) - ROM_CONTINUE( 0x40000, 0x60000 ) /* banked */ + ROM_REGION( 0x080000, "oki2", 0 ) /* OKIM6295 samples */ + ROM_LOAD( "91070.2", 0x00000, 0x80000, CRC(ecfea43e) SHA1(d664dfa6698fec8e602523bdae16068f1ff6547b) ) /* 0x20000 - 0x80000 banked */ ROM_REGION( 0x0200, "proms", 0 ) ROM_LOAD( "91070.9", 0x0000, 0x0100, CRC(cfdbb86c) SHA1(588822f6308a860937349c9106c2b4b1a75823ec) ) /* unknown */ @@ -37,9 +37,8 @@ ROM_START( tdragon2p ) ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "6p.rom", 0x00000, 0x80000, CRC(f99f4bf8) SHA1(34dfc188d94b89efdaa61cfc40af88868d7f22db) ) - ROM_REGION( 0x30000, "audiocpu", 0 ) /* Z80 code */ + ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 code */ ROM_LOAD( "5.bin", 0x00000, 0x20000, CRC(b870be61) SHA1(ea5d45c3a3ab805e55806967f00167cf6366212e) ) - ROM_RELOAD( 0x10000, 0x20000 ) /* banked */ ROM_REGION( 0x020000, "fgtile", 0 ) ROM_LOAD( "1.bin", 0x000000, 0x020000, CRC(d488aafa) SHA1(4d05e7ca075b638dd90ae4c9f224817a8a3ae9f3) ) /* 8x8 tiles */ @@ -63,4 +62,4 @@ ROM_START( tdragon2p ) ROM_END GAME( 1991, tdragonp, tdragon, tdragon, tdragon, driver_device, 0, ROT270, "Trap15", "Thunder Dragon Practice Mode (9th Jan. 1992 - v1.01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1993, tdragon2p,tdragon2, tdragon2, tdragon2, driver_device, 0, ROT270, "Trap15", "Thunder Dragon 2 Practice Mode (9th Nov. 1993 - v1.0)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1993, tdragon2p,tdragon2, tdragon2, tdragon2, nmk16_state, banked_audiocpu, ROT270, "Trap15", "Thunder Dragon 2 Practice Mode (9th Nov. 1993 - v1.0)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/docs/release/src/hbmame/drivers/pacman.cpp b/docs/release/src/hbmame/drivers/pacman.cpp index 8f170ebd0a3..7fee1652b3d 100644 --- a/docs/release/src/hbmame/drivers/pacman.cpp +++ b/docs/release/src/hbmame/drivers/pacman.cpp @@ -1868,7 +1868,6 @@ ROM_START( pacminer ) ROM_LOAD( "pacminer.6e", 0x0000, 0x1000, CRC(11dee14e) SHA1(1aeb94299a33daa9b51fdab3c0abea98858cc7dd) ) ROM_LOAD( "pacminer.6f", 0x1000, 0x1000, CRC(8c449bd7) SHA1(84233296683321f71fdef604ca19bfffd97e993c) ) ROM_LOAD( "pacminer.6h", 0x2000, 0x1000, CRC(a0e62570) SHA1(654a71144eae3c78d7baaeb9119aad0ece500e60) ) - ROM_LOAD( "pacminer.6j", 0x3000, 0x1000, CRC(c71c0011) SHA1(1ceaf73df40e531df3bfb26b4fb7cd95fb7bff1d) ) ROM_REGION( 0x2000, "gfx1", 0 ) ROM_LOAD( "pacminer.5e", 0x0000, 0x1000, CRC(9b3cc7cd) SHA1(9bfb71e71f7f61e26d23e6370d684cdc6c910899) ) diff --git a/docs/release/src/hbmame/drivers/schaser.cpp b/docs/release/src/hbmame/drivers/schaser.cpp index 44e04eaf463..f47ab7891ed 100644 --- a/docs/release/src/hbmame/drivers/schaser.cpp +++ b/docs/release/src/hbmame/drivers/schaser.cpp @@ -66,9 +66,10 @@ public: DECLARE_READ8_MEMBER(mw8080bw_shift_result_rev_r); DECLARE_READ8_MEMBER(mw8080bw_reversable_shift_result_r); DECLARE_WRITE8_MEMBER(mw8080bw_reversable_shift_count_w); - DECLARE_READ8_MEMBER(schasercv_02_r); - DECLARE_WRITE8_MEMBER(schaser_03_w); - DECLARE_WRITE8_MEMBER(schaser_05_w); + DECLARE_READ8_MEMBER(port02_r); + DECLARE_WRITE8_MEMBER(port03_w); + DECLARE_WRITE8_MEMBER(port05_w); + DECLARE_WRITE8_MEMBER(colour_w); DECLARE_MACHINE_START(sc); DECLARE_MACHINE_RESET(sc); TIMER_DEVICE_CALLBACK_MEMBER(schaser_effect_555_cb); @@ -77,7 +78,6 @@ public: private: bool m_flip_screen; - bool m_screen_red; bool m_sound_enabled; bool m_explosion; bool m_555_is_low; @@ -197,7 +197,7 @@ static const double schaser_effect_rc[8] = (1.0/ (1.0/RES_K(15) + 1.0/RES_K(39) + 1.0/RES_K(82)) + RES_K(20)) * CAP_U(1) }; -WRITE8_MEMBER(sc_state::schaser_03_w) +WRITE8_MEMBER(sc_state::port03_w) { /* bit 1 - Dot Sound Enable bit 2 - Effect Sound A (a stream of pulses) @@ -279,7 +279,7 @@ WRITE8_MEMBER(sc_state::schaser_03_w) m_sn->mixer_b_w(m_explosion); } -WRITE8_MEMBER(sc_state::schaser_05_w) +WRITE8_MEMBER(sc_state::port05_w) { /* bit 0 - Music (DAC) bit 2 - Coin Lockout @@ -334,7 +334,6 @@ void sc_state::schaser_reinit_555_time_remain() MACHINE_START_MEMBER( sc_state, sc ) { save_item(NAME(m_flip_screen)); - save_item(NAME(m_screen_red)); save_item(NAME(m_sound_enabled)); save_item(NAME(m_explosion)); save_item(NAME(m_last_effect)); @@ -349,7 +348,6 @@ MACHINE_START_MEMBER( sc_state, sc ) MACHINE_RESET_MEMBER( sc_state, sc ) { m_flip_screen = 0; - m_screen_red = 0; m_sound_enabled = 0; m_explosion = 0; m_last_effect = 0xff; @@ -360,8 +358,8 @@ MACHINE_RESET_MEMBER( sc_state, sc ) m_555_timer->adjust(attotime::never); address_space &space = m_maincpu->space(AS_PROGRAM); - schaser_03_w(space, 0, 0); - schaser_05_w(space, 0, 0); + port03_w(space, 0, 0); + port05_w(space, 0, 0); mw8080bw_start_interrupt_timer(); } @@ -473,7 +471,7 @@ UINT32 sc_state::screen_update_schasercv(screen_device &screen, bitmap_rgb32 &bi return 0; } -READ8_MEMBER(sc_state::schasercv_02_r) +READ8_MEMBER(sc_state::port02_r) { UINT8 data = ioport("IN2")->read(); if (m_flip_screen) return data; @@ -481,20 +479,25 @@ READ8_MEMBER(sc_state::schasercv_02_r) return (data & 0x89) | (in1 & 0x70) | (BIT(in1, 3) << 1) | (BIT(in1, 7) << 2); } +WRITE8_MEMBER( sc_state::colour_w ) +{ + m_p_colorram[offset & 0x1f9f] = data; +} + static ADDRESS_MAP_START( schaser_map, AS_PROGRAM, 8, sc_state ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("ram") AM_RANGE(0x4000, 0x5fff) AM_ROM - AM_RANGE(0xc000, 0xdfff) AM_MIRROR(0x0060) AM_RAM AM_SHARE("colorram") + AM_RANGE(0xc000, 0xdfff) AM_SHARE("colorram") AM_WRITE(colour_w) ADDRESS_MAP_END static ADDRESS_MAP_START( schasercv_io_map, AS_IO, 8, sc_state ) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") - AM_RANGE(0x02, 0x02) AM_READ(schasercv_02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) - AM_RANGE(0x03, 0x03) AM_DEVREAD("mb14241", mb14241_device, shift_result_r) AM_WRITE(schaser_03_w) + AM_RANGE(0x02, 0x02) AM_READ(port02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) + AM_RANGE(0x03, 0x03) AM_DEVREAD("mb14241", mb14241_device, shift_result_r) AM_WRITE(port03_w) AM_RANGE(0x04, 0x04) AM_DEVWRITE("mb14241", mb14241_device, shift_data_w) - AM_RANGE(0x05, 0x05) AM_WRITE(schaser_05_w) - //AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) + AM_RANGE(0x05, 0x05) AM_WRITE(port05_w) + AM_RANGE(0x06, 0x06) AM_WRITENOP //(watchdog_reset_w) ADDRESS_MAP_END @@ -510,18 +513,18 @@ static INPUT_PORTS_START( schasercv ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_START("IN2") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x01, "4" ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2) - PORT_DIPNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:2") + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2) + PORT_DIPNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x08, DEF_STR( Hard ) ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_DIPLOCATION("SW1:5") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2) PORT_DIPLOCATION("SW1:6") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2) PORT_DIPLOCATION("SW1:7") - PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x00, "SW1:3" ) /* doesn't do anything */ + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_DIPLOCATION("SW1:5") + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2) PORT_DIPLOCATION("SW1:6") + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2) PORT_DIPLOCATION("SW1:7") + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x00, "SW1:3" ) /* doesn't do anything */ PORT_START("VR1") PORT_ADJUSTER( 70, "VR1 - Music Volume" ) diff --git a/docs/release/src/hbmame/drivers/system1.cpp b/docs/release/src/hbmame/drivers/system1.cpp index a6e92e86281..fd9a5eb7900 100644 --- a/docs/release/src/hbmame/drivers/system1.cpp +++ b/docs/release/src/hbmame/drivers/system1.cpp @@ -66,5 +66,5 @@ ROM_START( wbmlkb ) ROM_LOAD( "pr5317.37", 0x0000, 0x0100, CRC(648350b8) SHA1(c7986aa9127ef5b50b845434cb4e81dff9861cd2) ) ROM_END -GAME( 1987, wbmlbit, wbml, sys2, wbml, system1_state, bootsys2, ROT0, "Michele", "Wonder Boy in Monster Land (Italian - v0.99)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) -GAME( 1987, wbmlkb, wbml, sys2, wbml, system1_state, bootsys2, ROT0, "hack", "Wonder Boy in Monster Land (Korean)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) +GAME( 1987, wbmlbit, wbml, sys2xb, wbml, system1_state, bootsys2, ROT0, "Michele", "Wonder Boy in Monster Land (Italian - v0.99)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) +GAME( 1987, wbmlkb, wbml, sys2xb, wbml, system1_state, bootsys2, ROT0, "hack", "Wonder Boy in Monster Land (Korean)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/taito_f2.cpp b/docs/release/src/hbmame/drivers/taito_f2.cpp index 4a665947114..bc03c209e66 100644 --- a/docs/release/src/hbmame/drivers/taito_f2.cpp +++ b/docs/release/src/hbmame/drivers/taito_f2.cpp @@ -32,7 +32,7 @@ static MACHINE_CONFIG_START( f2demo, taitof2_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */ - MCFG_YM2610_IRQ_HANDLER(WRITELINE(taitof2_state, irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) diff --git a/docs/release/src/hbmame/drivers/taito_f3.cpp b/docs/release/src/hbmame/drivers/taito_f3.cpp index d85f2937046..5e91769903d 100644 --- a/docs/release/src/hbmame/drivers/taito_f3.cpp +++ b/docs/release/src/hbmame/drivers/taito_f3.cpp @@ -9,7 +9,7 @@ ROM_START( arkretrh ) ROM_LOAD32_BYTE("e36-09", 0x000002, 0x040000, CRC(f16985e0) SHA1(a74cfee8f958e7a32354d4353eeb199a7fb1ce64) ) ROM_LOAD32_BYTE("e36-wrd", 0x000003, 0x040000, CRC(4467ff37) SHA1(509a0d516def02d86d81b9868de0d9593539e65c) ) - ROM_REGION(0x180000, "audiocpu", 0) /* Sound CPU */ + ROM_REGION(0x180000, "taito_en:audiocpu", 0) /* Sound CPU */ ROM_LOAD16_BYTE("e36-12", 0x100000, 0x40000, CRC(3bae39be) SHA1(777142ecc24799b934ed51ac4cd8700bb6da7e3c) ) ROM_LOAD16_BYTE("e36-13", 0x100001, 0x40000, CRC(94448e82) SHA1(d7766490318623be770545918391c5e6144dd619) ) @@ -47,7 +47,7 @@ ROM_START( cleopath ) ROM_LOAD ("e28-04.bin", 0x300000, 0x100000, CRC(57aef029) SHA1(5c07209015d4749d1ffb3e9c1a890e6cfeec8cb0) ) ROM_FILL ( 0x200000, 0x100000, 0 ) - ROM_REGION(0x140000, "audiocpu", 0) /* Sound CPU */ + ROM_REGION(0x140000, "taito_en:audiocpu", 0) /* Sound CPU */ ROM_LOAD16_BYTE("e28-11.bin", 0x100000, 0x20000, CRC(01a06950) SHA1(94d22cd839f9027e9d45264c366e0cb5d698e0b6) ) ROM_LOAD16_BYTE("e28-12.bin", 0x100001, 0x20000, CRC(dc19260f) SHA1(fa0ca03a236326652e4f9898d07cd837c1507a9d) ) @@ -74,7 +74,7 @@ ROM_START( driusgxh ) ROM_LOAD ("d87-08.bin", 0x600000, 0x200000, CRC(76d23602) SHA1(ca53ea6641182c44a4038bbeaa5effb1687f1980) ) ROM_FILL ( 0x400000, 0x200000, 0 ) - ROM_REGION(0x180000, "audiocpu", 0) /* 68000 sound CPU */ + ROM_REGION(0x180000, "taito_en:audiocpu", 0) /* 68000 sound CPU */ ROM_LOAD16_BYTE("d87-13.bin", 0x100000, 0x40000, CRC(15b1fff4) SHA1(28692b731ae98a47c2c5e11a8a71b61a813d9a64) ) ROM_LOAD16_BYTE("d87-14.bin", 0x100001, 0x40000, CRC(eecda29a) SHA1(6eb238e47bc7bf635ffbdbb25fb06a37db980ef8) ) @@ -120,7 +120,7 @@ ROM_START( f3demo ) ROM_LOAD ("d87-08.bin", 0x600000, 0x200000, CRC(76d23602) SHA1(ca53ea6641182c44a4038bbeaa5effb1687f1980) ) ROM_FILL ( 0x400000, 0x200000, 0 ) - ROM_REGION(0x180000, "audiocpu", 0) /* 68000 sound CPU */ + ROM_REGION(0x180000, "taito_en:audiocpu", 0) /* 68000 sound CPU */ ROM_LOAD16_BYTE("d87-13.bin", 0x100000, 0x40000, CRC(15b1fff4) SHA1(28692b731ae98a47c2c5e11a8a71b61a813d9a64) ) ROM_LOAD16_BYTE("d87-14.bin", 0x100001, 0x40000, CRC(eecda29a) SHA1(6eb238e47bc7bf635ffbdbb25fb06a37db980ef8) ) @@ -148,7 +148,7 @@ ROM_START( gekiridh ) ROM_LOAD ("e11-06.bin", 0x600000, 0x200000, CRC(200ce305) SHA1(c80a0b96510913a6411e6763fb72bf413fb792da) ) ROM_FILL ( 0x400000, 0x200000, 0 ) - ROM_REGION(0x140000, "audiocpu", 0) /* 68000 sound CPU */ + ROM_REGION(0x140000, "taito_en:audiocpu", 0) /* 68000 sound CPU */ ROM_LOAD16_BYTE("e11-13.bin", 0x100000, 0x20000, CRC(51a11ff7) SHA1(c03042489d71423667f25856d15aa6a363ea6c92) ) ROM_LOAD16_BYTE("e11-14.bin", 0x100001, 0x20000, CRC(dce2ba91) SHA1(00bc353c7747a7954365b587d7bc759ee5dc09c2) ) @@ -176,7 +176,7 @@ ROM_START( gekiridoc ) ROM_LOAD ("e11-06c.bin", 0x600000, 0x200000, CRC(0acc71d3) SHA1(455c70ec8f1087189170160d5683545bbea1fe9a) ) ROM_FILL ( 0x400000, 0x200000, 0 ) - ROM_REGION(0x140000, "audiocpu", 0) /* 68000 sound CPU */ + ROM_REGION(0x140000, "taito_en:audiocpu", 0) /* 68000 sound CPU */ ROM_LOAD16_BYTE("e11-13.bin", 0x100000, 0x20000, CRC(51a11ff7) SHA1(c03042489d71423667f25856d15aa6a363ea6c92) ) ROM_LOAD16_BYTE("e11-14.bin", 0x100001, 0x20000, CRC(dce2ba91) SHA1(00bc353c7747a7954365b587d7bc759ee5dc09c2) ) @@ -204,7 +204,7 @@ ROM_START( landmakh ) ROM_LOAD ("e61-07.43", 0x600000, 0x200000, CRC(4a57965d) SHA1(8e80788e0f47fb242da9af3aa19077dc0ec829b8) ) ROM_FILL ( 0x400000, 0x200000, 0 ) - ROM_REGION(0x140000, "audiocpu", 0) /* 68000 sound CPU */ + ROM_REGION(0x140000, "taito_en:audiocpu", 0) /* 68000 sound CPU */ ROM_LOAD16_BYTE("e61-14.32", 0x100000, 0x20000, CRC(b905f4a7) SHA1(613b954e3e129fd44b4ce64958f16e5636012d6e) ) ROM_LOAD16_BYTE("e61-15.33", 0x100001, 0x20000, CRC(87909869) SHA1(7b90c23899a673966cac3352d375d17b83e66596) ) @@ -231,7 +231,7 @@ ROM_START( pbobl2xh ) ROM_LOAD16_BYTE("e10-06.rom", 0x000001, 0x100000, CRC(1b0f20e2) SHA1(66b44d059c2896abac2f0e7fc932489dee440ba0) ) ROM_LOAD ("e10-05.rom", 0x300000, 0x100000, CRC(81266151) SHA1(aa3b144f32995425db97efce440e234a3c7a6715) ) - ROM_REGION(0x180000, "audiocpu", 0) /* 68000 sound CPU */ + ROM_REGION(0x180000, "taito_en:audiocpu", 0) /* 68000 sound CPU */ ROM_LOAD16_BYTE("e10-30.32", 0x100000, 0x40000, CRC(bb090c1e) SHA1(af2ff23d6f9bd56c25530cb9bf9f452b6f5210f5) ) ROM_LOAD16_BYTE("e10-31.33", 0x100001, 0x40000, CRC(f4b88d65) SHA1(c74dcb4bed979039fad1d5c7528c14ce4db1d5ec) ) diff --git a/docs/release/src/hbmame/hbmame.lst b/docs/release/src/hbmame/hbmame.lst index 6dacc7b06ad..ac8dafff6f5 100644 --- a/docs/release/src/hbmame/hbmame.lst +++ b/docs/release/src/hbmame/hbmame.lst @@ -99,6 +99,7 @@ tongypac ckongfix /* Graphics Fix */ ckonga2 ckonga3 +cclimber // parent cclimbrm /* Tim Arcadecollecting Modded Version */ /* centiped */ @@ -138,7 +139,6 @@ sf2 // parent sf2ce // parent slammast // parent strider // parent -varth // parent wof // parent /* cps1mis */ @@ -292,7 +292,7 @@ vampjb /* cps3 */ redearth // parent -redeartn // no-cd version - needs correct bios +redeartn // no-cd version sfiii3 // parent sfiii3an // hack sfiii4rd // hack @@ -330,12 +330,10 @@ exriongr /* Vag @ GreekRoms 2004 */ /* fcrash */ fcrash +captcommb2 ffightbl ffightbla kodb -varthb // from mame+ -// from mame+ to be checked -captcommb2 /* galaga */ galaga @@ -622,10 +620,12 @@ kof97zm /* kof98 */ kof98aas -//kof98ae //black splashes all over fight scene where cars speed past -kof98ae0 -kof98ae1 -kof98ae2 +//kof98ae //test only, do not enable +kof98ae0 //black splashes all over fight scene where cars speed past +kof98ae1 //black splashes all over fight scene where cars speed past +kof98ae2 //black splashes all over fight scene where cars speed past +kof98ae3 //black splashes all over fight scene where cars speed past +kof98ae20160308 //black splashes all over fight scene where cars speed past kof98b kof98bh kof98c2006 @@ -755,6 +755,9 @@ kof99ae20140624 kof99ae20150121 kof99ae20150520 kof99ae20150711 +kof99ae20160411 +kof99ae20160419 +kof99aes kof99bh kof99bhs kof99bs @@ -825,6 +828,7 @@ kof99sr kof99srr kof99the4 kof99the42 +//kof99vor // corrupt gfx kof99wet kof99wh1 kof99wh2 @@ -840,6 +844,7 @@ kof99yd /* kof2000 */ kof2000d +kof2000ev kof2000r kof2kbh kof2kbj @@ -968,6 +973,7 @@ kof2k1z2 //kf2k1pls /* kof2002 */ +kof200215 kof2002d kof2002x kof2k2ath @@ -1146,6 +1152,7 @@ bace /* Widel's Games */ crashh /* PacMAME Hacks */ dderby /* Widel's Games */ eyesb +ghohunt // Hurray Banana kangaroh /* Widel's Games */ lazybug lazybug1 @@ -1290,7 +1297,6 @@ mslugxp mslugxr mslugxst mslug3d -mslug3d1 mslug3eha mslug3ehs mslug3e02 @@ -1317,8 +1323,10 @@ mslug3e22 mslug3eb mslug3fr mslug3fro +mslug3hev mslug3kh mslug3kho +mslug3nd mslug3v /* EEZEZY Violence Edition */ mslug4d mslug4dh /* Super D version */ @@ -1335,17 +1343,23 @@ mslug4i mslug4i1 mslug4kh mslug4nd +mslug4sp mslug5b mslug5d mslug5d1 +mslug5f mslug5fr mslug5fr1 mslug5hd mslug5l9a mslug5l9b +mslug5lvf +mslug5lvnc mslug5nd +mslug5w ms5boot ms5pcbd +ms5sp /* mspacman */ mspacman /* (c) 1981 Midway */ /* made by Gencomp */ @@ -1689,6 +1703,7 @@ neo2500 /* Blastar */ neo3d // Oxygene neocstlv // BarfHappy neodemo /* Charles Doty */ +neofight // Kannagi neogal1 // BEY neogal1d // BEY neogal1t // BEY @@ -2034,6 +2049,7 @@ sengoku3yk /* ngsvc */ svcd svcd1 +svcesv svch svcnd svcpcbd diff --git a/docs/release/src/hbmame/includes/cps1.h b/docs/release/src/hbmame/includes/cps1.h index 2615e09c7c7..d48cda8ef40 100644 --- a/docs/release/src/hbmame/includes/cps1.h +++ b/docs/release/src/hbmame/includes/cps1.h @@ -12,6 +12,7 @@ #include "sound/msm5205.h" #include "sound/qsound.h" #include "sound/okim6295.h" +#include "machine/gen_latch.h" #include "machine/timekpr.h" #include "cpu/m68000/m68000.h" @@ -124,6 +125,8 @@ public: m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), m_palette(*this, "palette"), + m_soundlatch(*this, "soundlatch"), + m_soundlatch2(*this, "soundlatch2"), m_decrypted_opcodes(*this, "decrypted_opcodes"), m_region_stars(*this, "stars") { } @@ -232,6 +235,8 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + optional_device<generic_latch_8_device> m_soundlatch; + optional_device<generic_latch_8_device> m_soundlatch2; optional_shared_ptr<UINT16> m_decrypted_opcodes; optional_memory_region m_region_stars; @@ -365,6 +370,7 @@ public: DECLARE_WRITE8_MEMBER(knightsb_snd_bankswitch_w); DECLARE_WRITE8_MEMBER(fcrash_msm5205_0_data_w); DECLARE_WRITE8_MEMBER(fcrash_msm5205_1_data_w); + DECLARE_WRITE16_MEMBER(varthb_layer_w); UINT32 screen_update_fcrash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void fcrash_update_transmasks(); void fcrash_render_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -406,7 +412,7 @@ public: DECLARE_WRITE_LINE_MEMBER(m5205_int1); DECLARE_WRITE_LINE_MEMBER(m5205_int2); - // HBMAME start +// HBMAME start DECLARE_WRITE16_MEMBER(dinoh_sound_command_w); DECLARE_WRITE16_MEMBER(daimakb_layer_w); @@ -426,11 +432,9 @@ public: DECLARE_DRIVER_INIT(sk2h31); DECLARE_DRIVER_INIT(sk2h35); DECLARE_DRIVER_INIT(wofb); - DECLARE_WRITE16_MEMBER(varthb_layer_w); DECLARE_MACHINE_START(captcommb2); // HBMAME end - }; /*----------- defined in drivers/cps1.c -----------*/ @@ -446,10 +450,10 @@ INPUT_PORTS_EXTERN( knights ); INPUT_PORTS_EXTERN( punisher ); INPUT_PORTS_EXTERN( sf2 ); INPUT_PORTS_EXTERN( slammast ); - -// HBMAME start INPUT_PORTS_EXTERN( varth ); +// HBMAME start INPUT_PORTS_EXTERN( captcomm ); // HBMAME end + #endif diff --git a/docs/release/src/hbmame/includes/galaxian.h b/docs/release/src/hbmame/includes/galaxian.h index 7653d8f403f..c26d3df19b8 100644 --- a/docs/release/src/hbmame/includes/galaxian.h +++ b/docs/release/src/hbmame/includes/galaxian.h @@ -6,6 +6,7 @@ ***************************************************************************/ +#include "machine/gen_latch.h" #include "machine/i8255.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -50,11 +51,12 @@ public: m_ppi8255_0(*this, "ppi8255_0"), m_ppi8255_1(*this, "ppi8255_1"), m_ppi8255_2(*this, "ppi8255_2"), - m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), m_palette(*this, "palette"), + m_soundlatch(*this, "soundlatch"), + m_spriteram(*this, "spriteram"), + m_videoram(*this, "videoram"), m_decrypted_opcodes(*this, "decrypted_opcodes") { } required_device<cpu_device> m_maincpu; @@ -66,14 +68,16 @@ public: optional_device<ay8910_device> m_ay8910_2; optional_device<ay8910_device> m_ay8910_cclimber; optional_device<digitalker_device> m_digitalker; - optional_device<i8255_device> m_ppi8255_0; - optional_device<i8255_device> m_ppi8255_1; - optional_device<i8255_device> m_ppi8255_2; - required_shared_ptr<UINT8> m_spriteram; - required_shared_ptr<UINT8> m_videoram; + optional_device<i8255_device> m_ppi8255_0; + optional_device<i8255_device> m_ppi8255_1; + optional_device<i8255_device> m_ppi8255_2; required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + optional_device<generic_latch_8_device> m_soundlatch; + + required_shared_ptr<UINT8> m_spriteram; + required_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_decrypted_opcodes; int m_bullets_base; @@ -239,7 +243,6 @@ public: DECLARE_DRIVER_INIT(thepitm); DECLARE_DRIVER_INIT(theend); DECLARE_DRIVER_INIT(scramble); - DECLARE_DRIVER_INIT(explorer); DECLARE_DRIVER_INIT(sfx); DECLARE_DRIVER_INIT(atlantis); DECLARE_DRIVER_INIT(scobra); diff --git a/docs/release/src/hbmame/includes/neogeo.h b/docs/release/src/hbmame/includes/neogeo.h index a8b33e045f2..a8c3b942722 100644 --- a/docs/release/src/hbmame/includes/neogeo.h +++ b/docs/release/src/hbmame/includes/neogeo.h @@ -9,6 +9,7 @@ #include "machine/upd1990a.h" #include "machine/ng_memcard.h" +#include "machine/gen_latch.h" #include "video/neogeo_spr.h" #include "bus/neogeo/neogeo_slot.h" #include "bus/neogeo/neogeo_carts.h" @@ -56,6 +57,8 @@ public: m_ctrl1(*this, "ctrl1"), m_ctrl2(*this, "ctrl2"), m_sprgen(*this, "spritegen"), + m_soundlatch(*this, "soundlatch"), + m_soundlatch2(*this, "soundlatch2"), m_use_cart_vectors(0), m_use_cart_audio(0), m_cartslot1(*this, "cartslot1"), @@ -198,6 +201,8 @@ protected: UINT8 m_raster_level; required_device<neosprite_optimized_device> m_sprgen; + optional_device<generic_latch_8_device> m_soundlatch; + optional_device<generic_latch_8_device> m_soundlatch2; UINT16 get_video_control( ); // color/palette related diff --git a/docs/release/src/osd/winui/hbmameui.rc b/docs/release/src/osd/winui/hbmameui.rc index 92fe375e761..dcc6afec41b 100644 --- a/docs/release/src/osd/winui/hbmameui.rc +++ b/docs/release/src/osd/winui/hbmameui.rc @@ -892,9 +892,9 @@ BEGIN ICON IDI_MAMEUI_ICON,IDC_STATIC,20,10,20,20 LTEXT "Title\nDirectory\nExtra",IDC_PROP_TITLE,52,9,161,25, SS_NOPREFIX - CONTROL "Draw antialiased vectors",IDC_ANTIALIAS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,40,92,10,0, - HIDC_ANTIALIAS +// CONTROL "Draw antialiased vectors",IDC_ANTIALIAS,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,10,40,92,10,0, +// HIDC_ANTIALIAS GROUPBOX "Beam width",IDC_BEAMTEXT,60,53,100,28 CONTROL "BeamSlider",IDC_BEAM,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,66,65,64,10,0,HIDC_BEAM diff --git a/docs/release/src/osd/winui/helpids.cpp b/docs/release/src/osd/winui/helpids.cpp index 19b3e980f98..31e5e15ffc4 100644 --- a/docs/release/src/osd/winui/helpids.cpp +++ b/docs/release/src/osd/winui/helpids.cpp @@ -9,7 +9,6 @@ extern const DWORD dwHelpIDs[] = { IDC_ADSTICK ,HIDC_ADSTICK, - IDC_ANTIALIAS ,HIDC_ANTIALIAS, IDC_ARTWORK_CROP ,HIDC_ARTWORK_CROP, IDC_ASPECT ,HIDC_ASPECT, IDC_ASPECTRATIOD ,HIDC_ASPECTRATIOD, diff --git a/docs/release/src/osd/winui/mameui.rc b/docs/release/src/osd/winui/mameui.rc index 754d2a25adf..2d8f9f67515 100644 --- a/docs/release/src/osd/winui/mameui.rc +++ b/docs/release/src/osd/winui/mameui.rc @@ -132,12 +132,17 @@ BEGIN END POPUP "&Help" BEGIN +// MENUITEM "&Contents\tF1", ID_HELP_CONTENTS +// MENUITEM "&Troubleshooting", ID_HELP_TROUBLE +// MENUITEM SEPARATOR +// MENUITEM "&New Game Changes", ID_HELP_WHATS_NEWUI +// MENUITEM "&Mame Release Notes", ID_HELP_WHATS_NEW +// MENUITEM SEPARATOR +// MENUITEM "&About", ID_HELP_ABOUT +// MENUITEM "&Mess Release Notes", ID_HELP_RELEASE + MENUITEM "What's New in MAME", ID_HELP_WHATS_NEW MENUITEM "&Contents\tF1", ID_HELP_CONTENTS - MENUITEM "&Troubleshooting", ID_HELP_TROUBLE - MENUITEM SEPARATOR - MENUITEM "&New Game Changes", ID_HELP_WHATS_NEWUI - MENUITEM "&Mame Release Notes", ID_HELP_WHATS_NEW - MENUITEM SEPARATOR +// MENUITEM "&Troubleshooting", ID_HELP_TROUBLE MENUITEM "&About", ID_HELP_ABOUT END END @@ -389,7 +394,7 @@ BEGIN CTEXT "Multiple Arcade Machine Emulator",IDC_STATIC,147,7,142, 11,NOT WS_GROUP CTEXT "Version 0",IDC_VERSION,147,18,142,11,NOT WS_GROUP - CTEXT "Copyright (C) 1997-2015 The MAME Team",IDC_STATIC,147, + CTEXT "Copyright (C) 1997-2016 The MAME Team",IDC_STATIC,147, 29,142,10,NOT WS_GROUP CTEXT "MAMEUI version by",IDC_STATIC,147,51,142,10,NOT WS_GROUP @@ -660,8 +665,8 @@ BEGIN // GROUPBOX "Version",IDC_STATIC,119,150,90,28 // COMBOBOX IDC_D3D_VERSION,125,160,78,95,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_D3D_VERSION - GROUPBOX "DirectDraw",IDC_STATIC,113,187,102,26 - CONTROL "Stretch using hardware",IDC_HWSTRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,119,197,85,10,0,HIDC_HWSTRETCH +// GROUPBOX "DirectDraw",IDC_STATIC,113,187,102,26 +// CONTROL "Stretch using hardware",IDC_HWSTRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,119,197,85,10,0,HIDC_HWSTRETCH PUSHBUTTON "Reset",IDC_PROP_RESET,4,222,97,14,0,0,HIDC_PROP_RESET PUSHBUTTON "Restore Default Settings",IDC_USE_DEFAULT,118,222,97,14,0,0,HIDC_USE_DEFAULT @@ -835,6 +840,9 @@ BEGIN WS_TABSTOP,10,40,86,10,0,HIDC_CHEAT CONTROL "Sleep when possible",IDC_SLEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,52,86,10,0,HIDC_SLEEP + CONTROL "Skip game info",IDC_SKIP_GAME_INFO,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,10,64,96,10,0, + HIDC_SKIP_GAME_INFO CONTROL "Save game state on exit",IDC_ENABLE_AUTOSAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,10,76,96,10,0, HIDC_ENABLE_AUTOSAVE @@ -892,9 +900,9 @@ BEGIN ICON IDI_MAMEUI_ICON,IDC_STATIC,20,10,20,20 LTEXT "Title\nDirectory\nExtra",IDC_PROP_TITLE,52,9,161,25, SS_NOPREFIX - CONTROL "Draw antialiased vectors",IDC_ANTIALIAS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,40,92,10,0, - HIDC_ANTIALIAS +// CONTROL "Draw antialiased vectors",IDC_ANTIALIAS,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,10,40,92,10,0, +// HIDC_ANTIALIAS GROUPBOX "Beam width",IDC_BEAMTEXT,60,53,100,28 CONTROL "BeamSlider",IDC_BEAM,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,66,65,64,10,0,HIDC_BEAM diff --git a/docs/release/src/osd/winui/mui_util.cpp b/docs/release/src/osd/winui/mui_util.cpp index 9a010c61393..9f140c75afd 100644 --- a/docs/release/src/osd/winui/mui_util.cpp +++ b/docs/release/src/osd/winui/mui_util.cpp @@ -417,16 +417,15 @@ static void InitDriversInfo(void) gameinfo->usesLightGun = FALSE; if (gamedrv->ipt) { - ioport_port *port; ioport_list portlist; std::string errors; for (device_t &cfg : device_iterator(config.root_device())) if (cfg.input_ports()) portlist.append(cfg, errors); - for (port = portlist.first(); port; port = port->next()) + for (auto &port : portlist) { - for (ioport_field &field : port->fields()) + for (ioport_field &field : port.second->fields()) { UINT32 type; type = field.type(); diff --git a/docs/release/src/osd/winui/newui.cpp b/docs/release/src/osd/winui/newui.cpp index 5430c8dedf7..73dda176311 100644 --- a/docs/release/src/osd/winui/newui.cpp +++ b/docs/release/src/osd/winui/newui.cpp @@ -2018,7 +2018,7 @@ static BOOL win_file_dialog(running_machine &machine, //============================================================ // input_item_from_serial_number //============================================================ - +#if 0 static int input_item_from_serial_number(running_machine &machine, int serial_number, ioport_port **port, ioport_field **field, ioport_setting **setting) { @@ -2050,7 +2050,7 @@ static int input_item_from_serial_number(running_machine &machine, int serial_nu return (i == serial_number); } - +#endif //============================================================ @@ -2060,8 +2060,6 @@ static int input_item_from_serial_number(running_machine &machine, int serial_nu static void customise_input(running_machine &machine, HWND wnd, const char *title, int player, int inputclass) { dialog_box *dlg; - ioport_port *port; - ioport_field *field; int this_inputclass = 0; int this_player = 0, portslot_count = 0, i = 0; const int max_portslots = 256; @@ -2076,17 +2074,17 @@ static void customise_input(running_machine &machine, HWND wnd, const char *titl if (!dlg) return; - for (port = machine.ioport().ports().first(); port; port = port->next()) + for (auto &port : machine.ioport().ports()) { - for (field = port->fields().first(); field; field = field->next()) + for (ioport_field &field : port.second->fields()) { /* add if we match the group and we have a valid name */ - const char *name = field->name(); - this_inputclass = field->type_class(); - this_player = field->player(); + const char *name = field.name(); + this_inputclass = field.type_class(); + this_player = field.player(); if ((name) - && (field->enabled()) + && (field.enabled()) //check me && ((field->type() == IPT_OTHER && field->name()) || (machine.ioport().type_group(field->type(), field->player()) != IPG_INVALID)) && (this_player == player) && (this_inputclass == inputclass)) @@ -2096,7 +2094,7 @@ static void customise_input(running_machine &machine, HWND wnd, const char *titl * want to reorder the tab order */ if (portslot_count < max_portslots) { - portslots[portslot_count].field = field; + portslots[portslot_count].field = &field; portslot_count++; } } @@ -2166,21 +2164,19 @@ static void customise_keyboard(running_machine &machine, HWND wnd) static bool check_for_miscinput(running_machine &machine) { - ioport_port *port; - ioport_field *field; int this_inputclass = 0; - for (port = machine.ioport().ports().first(); port; port = port->next()) + for (auto &port : machine.ioport().ports()) { - for (field = port->fields().first(); field; field = field->next()) + for (ioport_field &field : port.second->fields()) { - const char *name = field->name(); - this_inputclass = field->type_class(); + const char *name = field.name(); + this_inputclass = field.type_class(); /* add if we match the group and we have a valid name */ if ((name) - && (field->enabled()) - && ((field->type() == IPT_OTHER && field->name()) || (machine.ioport().type_group(field->type(), field->player()) != IPG_INVALID)) + && (field.enabled()) + && ((field.type() == IPT_OTHER && field.name()) || (machine.ioport().type_group(field.type(), field.player()) != IPG_INVALID)) && (this_inputclass != INPUT_CLASS_CONTROLLER) && (this_inputclass != INPUT_CLASS_KEYBOARD)) { @@ -2200,8 +2196,6 @@ static bool check_for_miscinput(running_machine &machine) static void customise_miscinput(running_machine &machine, HWND wnd) { dialog_box *dlg; - ioport_port *port; - ioport_field *field; int this_inputclass = 0; int portslot_count = 0, i = 0; const int max_portslots = 256; @@ -2217,17 +2211,17 @@ static void customise_miscinput(running_machine &machine, HWND wnd) if (!dlg) return; - for (port = machine.ioport().ports().first(); port; port = port->next()) + for (auto &port : machine.ioport().ports()) { - for (field = port->fields().first(); field; field = field->next()) + for (ioport_field &field : port.second->fields()) { - const char *name = field->name(); - this_inputclass = field->type_class(); + const char *name = field.name(); + this_inputclass = field.type_class(); /* add if we match the group and we have a valid name */ if ((name) - && (field->enabled()) - && ((field->type() == IPT_OTHER && field->name()) || (machine.ioport().type_group(field->type(), field->player()) != IPG_INVALID)) + && (field.enabled()) + && ((field.type() == IPT_OTHER && field.name()) || (machine.ioport().type_group(field.type(), field.player()) != IPG_INVALID)) && (this_inputclass != INPUT_CLASS_CONTROLLER) && (this_inputclass != INPUT_CLASS_KEYBOARD)) { @@ -2236,7 +2230,7 @@ static void customise_miscinput(running_machine &machine, HWND wnd) * want to reorder the tab order */ if (portslot_count < max_portslots) { - portslots[portslot_count].field = field; + portslots[portslot_count].field = &field; portslot_count++; } } @@ -2293,8 +2287,7 @@ static void storeval_inputport(void *param, int val) static void customise_switches(running_machine &machine, HWND wnd, const char* title_string, UINT32 ipt_name) { dialog_box *dlg; - ioport_port *port; - ioport_field *field; + ioport_field *afield; ioport_setting *setting; const char *switch_name = NULL; ioport_field::user_settings settings; @@ -2305,22 +2298,22 @@ static void customise_switches(running_machine &machine, HWND wnd, const char* t if (!dlg) return; - for (port = machine.ioport().ports().first(); port; port = port->next()) + for (auto &port : machine.ioport().ports()) { - for (field = port->fields().first(); field; field = field->next()) + for (ioport_field &field : port.second->fields()) { - type = field->type(); + type = field.type(); if (type == ipt_name) { - switch_name = field->name(); - - field->get_user_settings(settings); + switch_name = field.name(); - if (win_dialog_add_combobox(dlg, switch_name, settings.value, storeval_inputport, (void *) field)) + field.get_user_settings(settings); + afield = &field; + if (win_dialog_add_combobox(dlg, switch_name, settings.value, storeval_inputport, (void *) afield)) goto done; - for (setting = field->settings().first(); setting; setting = setting->next()) + for (setting = field.settings().first(); setting; setting = setting->next()) { if (win_dialog_add_combobox_item(dlg, setting->name(), setting->value())) goto done; @@ -2434,9 +2427,8 @@ static int port_type_is_analog(int type) static void customise_analogcontrols(running_machine &machine, HWND wnd) { dialog_box *dlg; - ioport_port *port; - ioport_field *field; ioport_field::user_settings settings; + ioport_field *afield; const char *name; char buf[255]; static const struct dialog_layout layout = { 120, 52 }; @@ -2445,28 +2437,29 @@ static void customise_analogcontrols(running_machine &machine, HWND wnd) if (!dlg) return; - for (port = machine.ioport().ports().first(); port; port = port->next()) + for (auto &port : machine.ioport().ports()) { - for (field = port->fields().first(); field; field = field->next()) + for (ioport_field &field : port.second->fields()) { - if (port_type_is_analog(field->type())) + if (port_type_is_analog(field.type())) { - field->get_user_settings(settings); - name = field->name(); + field.get_user_settings(settings); + name = field.name(); + afield = &field; _snprintf(buf, ARRAY_LENGTH(buf), "%s %s", name, "Digital Speed"); - if (win_dialog_add_adjuster(dlg, buf, settings.delta, 1, 255, FALSE, store_delta, (void *) field)) + if (win_dialog_add_adjuster(dlg, buf, settings.delta, 1, 255, FALSE, store_delta, (void *) afield)) goto done; _snprintf(buf, ARRAY_LENGTH(buf), "%s %s", name, "Autocenter Speed"); - if (win_dialog_add_adjuster(dlg, buf, settings.centerdelta, 1, 255, FALSE, store_centerdelta, (void *) field)) + if (win_dialog_add_adjuster(dlg, buf, settings.centerdelta, 1, 255, FALSE, store_centerdelta, (void *) afield)) goto done; _snprintf(buf, ARRAY_LENGTH(buf), "%s %s", name, "Reverse"); - if (win_dialog_add_combobox(dlg, buf, settings.reverse ? 1 : 0, store_reverse, (void *) field)) + if (win_dialog_add_combobox(dlg, buf, settings.reverse ? 1 : 0, store_reverse, (void *) afield)) goto done; if (win_dialog_add_combobox_item(dlg, "Off", 0)) goto done; @@ -2475,7 +2468,7 @@ static void customise_analogcontrols(running_machine &machine, HWND wnd) _snprintf(buf, ARRAY_LENGTH(buf), "%s %s", name, "Sensitivity"); - if (win_dialog_add_adjuster(dlg, buf, settings.sensitivity, 1, 255, TRUE, store_sensitivity, (void *) field)) + if (win_dialog_add_adjuster(dlg, buf, settings.sensitivity, 1, 255, TRUE, store_sensitivity, (void *) afield)) goto done; } } @@ -2712,11 +2705,10 @@ static dialog_box *build_option_dialog(device_image_interface *dev, char *filter struct file_dialog_params *params; struct storeval_optres_params *storeval_params; static const struct dialog_layout filedialog_layout = { 44, 220 }; - const image_device_format *format; // make the filter pos = 0; - for (format = dev->formatlist().first(); format; format = format->next()) + for (auto &format : dev->formatlist()) pos += add_filter_entry(filter + pos, filter_len - pos, format->description(), format->extensions()); // create the dialog @@ -2741,7 +2733,7 @@ static dialog_box *build_option_dialog(device_image_interface *dev, char *filter { // make sure that this entry is present on at least one option specification found = FALSE; - for (format = dev->formatlist().first(); format; format = format->next()) + for (auto &format : dev->formatlist()) { if (option_resolution_contains(format->optspec(), guide_entry->parameter)) { @@ -2936,7 +2928,7 @@ static void change_device(HWND wnd, device_image_interface *image, bool is_save) // add custom dialog elements, if appropriate if (is_save && (image->device_get_creation_option_guide()) - && (image->formatlist().first())) + && (image->formatlist().front())) { dialog = build_option_dialog(image, filter, ARRAY_LENGTH(filter), &create_format, &create_args); if (!dialog) @@ -3182,8 +3174,6 @@ static void prepare_menus(HWND wnd) UINT flags_for_exists = 0; UINT flags_for_writing = 0; bool has_config = 0, has_dipswitch = 0, has_keyboard = 0, has_misc = 0, has_analog = 0; - ioport_port *port; - ioport_field *field; int frameskip = 0; int orientation = 0; int speed = 0; @@ -3215,11 +3205,11 @@ static void prepare_menus(HWND wnd) has_misc = check_for_miscinput(window->machine()); has_analog = 0; - for (port = window->machine().ioport().ports().first(); port; port = port->next()) + for (auto &port : window->machine().ioport().ports()) { - for (field = port->fields().first(); field; field = field->next()) + for (ioport_field &field : port.second->fields()) { - if (port_type_is_analog(field->type())) + if (port_type_is_analog(field.type())) { has_analog = 1; break; @@ -3370,7 +3360,7 @@ static void win_toggle_menubar(void) HWND hwnd = 0; HMENU menu = 0; - for (auto window : win_window_list) + for (auto window : osd_common_t::s_window_list) { RECT before_rect = { 100, 100, 200, 200 }; RECT after_rect = { 100, 100, 200, 200 }; @@ -3521,7 +3511,7 @@ static void help_about_mess(HWND wnd) { //help_display(wnd, "mess.chm::/windows/main.htm"); //doesnt do anything //help_display(wnd, "mess.chm"); - help_display(wnd, "http://www.mess.org/"); + help_display(wnd, "http://mamedev.org/"); } @@ -3601,8 +3591,6 @@ static int invoke_command(HWND wnd, UINT command) int handled = 1; int dev_command = 0; device_image_interface *img; - ioport_field *field; - ioport_setting *setting; LONG_PTR ptr = GetWindowLongPtr(wnd, GWLP_USERDATA); win_window_info *window = (win_window_info *)ptr; ioport_field::user_settings settings; @@ -3784,10 +3772,10 @@ static int invoke_command(HWND wnd, UINT command) window->m_target->set_view(command - ID_VIDEO_VIEW_0); window->update(); // actually change window size } - else - if (input_item_from_serial_number(window->machine(), command - ID_INPUT_0, NULL, &field, &setting)) +// else +// if (input_item_from_serial_number(window->machine(), command - ID_INPUT_0, NULL, &field, &setting)) // should never happen - handled = 0; +// handled = 0; else // bogus command handled = 0; diff --git a/docs/release/src/osd/winui/properties.cpp b/docs/release/src/osd/winui/properties.cpp index f12630590b3..5b7fa44c37b 100644 --- a/docs/release/src/osd/winui/properties.cpp +++ b/docs/release/src/osd/winui/properties.cpp @@ -2161,7 +2161,6 @@ static void BuildDataMap(void) datamap_add(properties_datamap, IDC_PAUSEBRIGHTDISP, DM_FLOAT, OPTION_PAUSE_BRIGHTNESS); // core vector options - datamap_add(properties_datamap, IDC_ANTIALIAS, DM_BOOL, OPTION_ANTIALIAS); datamap_add(properties_datamap, IDC_BEAM, DM_FLOAT, OPTION_BEAM_WIDTH_MAX); datamap_add(properties_datamap, IDC_BEAMDISP, DM_FLOAT, OPTION_BEAM_WIDTH_MAX); datamap_add(properties_datamap, IDC_FLICKER, DM_FLOAT, OPTION_FLICKER); diff --git a/docs/release/src/osd/winui/resource.h b/docs/release/src/osd/winui/resource.h index a82b8364258..d5577bba830 100644 --- a/docs/release/src/osd/winui/resource.h +++ b/docs/release/src/osd/winui/resource.h @@ -114,7 +114,6 @@ #define IDC_CONTRAST 1026 #define IDC_SAMPLERATE 1027 #define IDC_NUMSCREENS 1028 -#define IDC_ANTIALIAS 1029 #define IDC_BEAM 1030 #define IDC_FLICKER 1031 #define IDC_FLIPX 1032 diff --git a/docs/release/src/osd/winui/screenshot.cpp b/docs/release/src/osd/winui/screenshot.cpp index 868c3b0a91d..0c2a37147b4 100644 --- a/docs/release/src/osd/winui/screenshot.cpp +++ b/docs/release/src/osd/winui/screenshot.cpp @@ -389,7 +389,7 @@ static osd_file::error OpenZipDIBFile(const char *dir_name, const char *zip_name else { fname = std::string(dir_name) + PATH_SEPARATOR + std::string(zip_name) + ".7z"; - ziperr = util::archive_file::open_zip(fname, zip); + ziperr = util::archive_file::open_7z(fname, zip); if (ziperr == util::archive_file::error::NONE) { diff --git a/docs/release/src/osd/winui/winui.cpp b/docs/release/src/osd/winui/winui.cpp index aed782a8061..b46ed105e18 100644 --- a/docs/release/src/osd/winui/winui.cpp +++ b/docs/release/src/osd/winui/winui.cpp @@ -855,11 +855,11 @@ public: char buffer[1024]; // if we are in fullscreen mode, go to windowed mode - if ((video_config.windowed == 0) && !win_window_list.empty()) + if ((video_config.windowed == 0) && !osd_common_t::s_window_list.empty()) winwindow_toggle_full_screen(); vsnprintf(buffer, ARRAY_LENGTH(buffer), msg, args);printf("%s\n",buffer); - win_message_box_utf8(!win_window_list.empty() ? win_window_list.front()->platform_window<HWND>() : hMain, buffer, MAMEUINAME, MB_ICONERROR | MB_OK); + win_message_box_utf8(!osd_common_t::s_window_list.empty() ? osd_common_t::s_window_list.front()->platform_window<HWND>() : hMain, buffer, MAMEUINAME, MB_ICONERROR | MB_OK); } else chain_output(channel, msg, args); @@ -1213,7 +1213,7 @@ HICON LoadIconFromFile(const char *iconname) sprintf(tmpStr, "%s/icons.7z", GetIconsDir()); sprintf(tmpIcoName, "%s.ico", iconname); - ziperr = util::archive_file::open_zip(tmpStr, zip); + ziperr = util::archive_file::open_7z(tmpStr, zip); if (ziperr == util::archive_file::error::NONE) { res = zip->search(tmpIcoName, false); @@ -3261,10 +3261,10 @@ static int GUI_seq_pressed(const input_seq *seq) { int codenum; int res = 1; - int invert = 0; + bool invert = 0; int count = 0; - for (codenum = 0; codenum < ARRAY_LENGTH(seq); codenum++) + for (codenum = 0; (*seq)[codenum] != input_seq::end_code; codenum++) { input_code code = (*seq)[codenum]; diff --git a/docs/release/src/version.cpp b/docs/release/src/version.cpp index 44df5620301..5f46a84a9bd 100644 --- a/docs/release/src/version.cpp +++ b/docs/release/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.174" +#define BARE_BUILD_VERSION "0.175" extern const char bare_build_version[]; extern const char build_version[]; diff --git a/src/version.cpp b/src/version.cpp index 44df5620301..5f46a84a9bd 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.174" +#define BARE_BUILD_VERSION "0.175" extern const char bare_build_version[]; extern const char build_version[]; |