diff options
40 files changed, 1886 insertions, 359 deletions
diff --git a/docs/release/hbmame170s.rar b/docs/release/hbmame171s.rar Binary files differindex 4ae105e7fe8..4302ce7a6df 100644 --- a/docs/release/hbmame170s.rar +++ b/docs/release/hbmame171s.rar diff --git a/docs/release/scripts/build/makedep.py b/docs/release/scripts/build/makedep.py index eba69370621..a80582d0161 100644 --- a/docs/release/scripts/build/makedep.py +++ b/docs/release/scripts/build/makedep.py @@ -203,8 +203,9 @@ def parse_file_for_drivers(root, srcfile): content = content.strip() if len(content)>0: if content.startswith('COMP') or content.startswith('CONS') or content.startswith('GAME') or content.startswith('SYST') or content.startswith('GAMEL'): - name = content[4:] - drivers.append(name.rsplit(',', 14)[1]) + splitname = content.split(',', 3) + if len(splitname)>1: + drivers.append(splitname[1]) return 0 def parse_lua_file(srcfile): diff --git a/docs/release/scripts/build/msgfmt.py b/docs/release/scripts/build/msgfmt.py new file mode 100644 index 00000000000..f28c2fcf6c6 --- /dev/null +++ b/docs/release/scripts/build/msgfmt.py @@ -0,0 +1,226 @@ +#!/usr/bin/env python2 +# -*- coding: iso-8859-1 -*- +# Written by Martin v. Löwis <loewis@informatik.hu-berlin.de> + +"""Generate binary message catalog from textual translation description. + +This program converts a textual Uniforum-style message catalog (.po file) into +a binary GNU catalog (.mo file). This is essentially the same function as the +GNU msgfmt program, however, it is a simpler implementation. + +Usage: msgfmt.py [OPTIONS] filename.po + +Options: + -o file + --output-file=file + Specify the output file to write to. If omitted, output will go to a + file named filename.mo (based off the input file name). + + -h + --help + Print this message and exit. + + -V + --version + Display version information and exit. +""" + +import os +import sys +import ast +import getopt +import struct +import array + +__version__ = "1.1" + +MESSAGES = {} + + + +def usage(code, msg=''): + print >> sys.stderr, __doc__ + if msg: + print >> sys.stderr, msg + sys.exit(code) + + + +def add(id, str, fuzzy): + "Add a non-fuzzy translation to the dictionary." + global MESSAGES + if not fuzzy and str: + MESSAGES[id] = str + + + +def generate(): + "Return the generated output." + global MESSAGES + keys = MESSAGES.keys() + # the keys are sorted in the .mo file + keys.sort() + offsets = [] + ids = strs = '' + for id in keys: + # For each string, we need size and file offset. Each string is NUL + # terminated; the NUL does not count into the size. + offsets.append((len(ids), len(id), len(strs), len(MESSAGES[id]))) + ids += id + '\0' + strs += MESSAGES[id] + '\0' + output = '' + # The header is 7 32-bit unsigned integers. We don't use hash tables, so + # the keys start right after the index tables. + # translated string. + keystart = 7*4+16*len(keys) + # and the values start after the keys + valuestart = keystart + len(ids) + koffsets = [] + voffsets = [] + # The string table first has the list of keys, then the list of values. + # Each entry has first the size of the string, then the file offset. + for o1, l1, o2, l2 in offsets: + koffsets += [l1, o1+keystart] + voffsets += [l2, o2+valuestart] + offsets = koffsets + voffsets + output = struct.pack("Iiiiiii", + 0x950412deL, # Magic + 0, # Version + len(keys), # # of entries + 7*4, # start of key index + 7*4+len(keys)*8, # start of value index + 0, 0) # size and offset of hash table + output += array.array("i", offsets).tostring() + output += ids + output += strs + return output + + + +def make(filename, outfile): + ID = 1 + STR = 2 + + # Compute .mo name from .po name and arguments + if filename.endswith('.po'): + infile = filename + else: + infile = filename + '.po' + if outfile is None: + outfile = os.path.splitext(infile)[0] + '.mo' + + try: + lines = open(infile).readlines() + except IOError, msg: + print >> sys.stderr, msg + sys.exit(1) + + section = None + fuzzy = 0 + + # Parse the catalog + lno = 0 + for l in lines: + lno += 1 + # If we get a comment line after a msgstr, this is a new entry + if l[0] == '#' and section == STR: + add(msgid, msgstr, fuzzy) + section = None + fuzzy = 0 + # Record a fuzzy mark + if l[:2] == '#,' and 'fuzzy' in l: + fuzzy = 1 + # Skip comments + if l[0] == '#': + continue + # Now we are in a msgid section, output previous section + if l.startswith('msgid') and not l.startswith('msgid_plural'): + if section == STR: + add(msgid, msgstr, fuzzy) + section = ID + l = l[5:] + msgid = msgstr = '' + is_plural = False + # This is a message with plural forms + elif l.startswith('msgid_plural'): + if section != ID: + print >> sys.stderr, 'msgid_plural not preceded by msgid on %s:%d' %\ + (infile, lno) + sys.exit(1) + l = l[12:] + msgid += '\0' # separator of singular and plural + is_plural = True + # Now we are in a msgstr section + elif l.startswith('msgstr'): + section = STR + if l.startswith('msgstr['): + if not is_plural: + print >> sys.stderr, 'plural without msgid_plural on %s:%d' %\ + (infile, lno) + sys.exit(1) + l = l.split(']', 1)[1] + if msgstr: + msgstr += '\0' # Separator of the various plural forms + else: + if is_plural: + print >> sys.stderr, 'indexed msgstr required for plural on %s:%d' %\ + (infile, lno) + sys.exit(1) + l = l[6:] + # Skip empty lines + l = l.strip() + if not l: + continue + l = ast.literal_eval(l) + if section == ID: + msgid += l + elif section == STR: + msgstr += l + else: + print >> sys.stderr, 'Syntax error on %s:%d' % (infile, lno), \ + 'before:' + print >> sys.stderr, l + sys.exit(1) + # Add last entry + if section == STR: + add(msgid, msgstr, fuzzy) + + # Compute output + output = generate() + + try: + open(outfile,"wb").write(output) + except IOError,msg: + print >> sys.stderr, msg + + + +def main(): + try: + opts, args = getopt.getopt(sys.argv[1:], 'hVo:', + ['help', 'version', 'output-file=']) + except getopt.error, msg: + usage(1, msg) + + outfile = None + # parse options + for opt, arg in opts: + if opt in ('-h', '--help'): + usage(0) + elif opt in ('-V', '--version'): + print >> sys.stderr, "msgfmt.py", __version__ + sys.exit(0) + elif opt in ('-o', '--output-file'): + outfile = arg + # do it + if not args: + print >> sys.stderr, 'No input file given' + print >> sys.stderr, "Try `msgfmt --help' for more information." + return + + for filename in args: + make(filename, outfile) + + +if __name__ == '__main__': + main() diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 2fcfb323653..4f580dc8afa 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -54,7 +54,9 @@ function layoutbuildtask(_folder, _name) end function precompiledheaders() - pchheader("emu.h") + configuration { "not xcode4" } + pchheader("emu.h") + configuration { } end function addprojectflags() @@ -83,6 +85,11 @@ newoption { } newoption { + trigger = "with-benchmarks", + description = "Enable building benchmarks.", +} + +newoption { trigger = "osd", description = "Choose OSD layer implementation", } @@ -193,6 +200,11 @@ newoption { } newoption { + trigger = "TOOLCHAIN", + description = "Toolchain prefix" +} + +newoption { trigger = "PROFILE", description = "Enable profiling.", } @@ -266,15 +278,6 @@ newoption { } newoption { - trigger = "USE_BGFX", - description = "Use of BGFX.", - allowed = { - { "0", "Disabled" }, - { "1", "Enabled" }, - } -} - -newoption { trigger = "DEPRECATED", description = "Generate deprecation warnings during compilation.", allowed = { @@ -417,9 +420,8 @@ if _OPTIONS["NOASM"]=="1" and not _OPTIONS["FORCE_DRC_C_BACKEND"] then _OPTIONS["FORCE_DRC_C_BACKEND"] = "1" end -USE_BGFX = 1 -if(_OPTIONS["USE_BGFX"]~=nil) then - USE_BGFX = tonumber(_OPTIONS["USE_BGFX"]) +if(_OPTIONS["TOOLCHAIN"] == nil) then + _OPTIONS['TOOLCHAIN'] = "" end GEN_DIR = MAME_BUILD_DIR .. "generated/" @@ -442,11 +444,17 @@ configurations { "Release", } -platforms { - "x32", - "x64", - "Native", -- for targets where bitness is not specified -} +if _ACTION == "xcode4" then + platforms { + "x64", + } +else + platforms { + "x32", + "x64", + "Native", -- for targets where bitness is not specified + } +end language "C++" @@ -666,9 +674,10 @@ end --DEFS += -DUSE_SYSTEM_JPEGLIB --endif - --To support casting in Lua 5.3 defines { - "LUA_COMPAT_APIINTCASTS", + "LUA_COMPAT_ALL", + "LUA_COMPAT_5_1", + "LUA_COMPAT_5_2", } if _ACTION == "gmake" then @@ -1044,6 +1053,7 @@ configuration { "nacl*" } configuration { "linux-*" } links { "dl", + "rt", } if _OPTIONS["distro"]=="debian-stable" then defines @@ -1057,12 +1067,15 @@ configuration { "linux-*" } configuration { "steamlink" } links { "dl", - } + "EGL", + "GLESv2", + "SDL2", + } defines { "EGL_API_FB", } -configuration { "osx*" } +configuration { "osx* or xcode4" } links { "pthread", } @@ -1079,6 +1092,11 @@ configuration { "mingw*" } "advapi32", "shlwapi", "wsock32", + "ws2_32", + "psapi", + "iphlpapi", + "shell32", + "userenv", } configuration { "mingw-clang" } linkoptions { @@ -1100,6 +1118,11 @@ configuration { "vs*" } "advapi32", "shlwapi", "wsock32", + "ws2_32", + "psapi", + "iphlpapi", + "shell32", + "userenv", } buildoptions { @@ -1219,6 +1242,7 @@ configuration { "vs2015" } "/wd4463", -- warning C4463: overflow; assigning 1 to bit-field that can only hold values from -1 to 0 "/wd4297", -- warning C4297: 'xxx::~xxx': function assumed not to throw an exception but does "/wd4319", -- warning C4319: 'operator' : zero extending 'type' to 'type' of greater size + "/wd4592", -- warning C4592: symbol will be dynamically initialized (implementation limitation) } configuration { "winphone8* or winstore8*" } removelinks { @@ -1282,10 +1306,7 @@ else startproject (_OPTIONS["subtarget"]) end mainProject(_OPTIONS["target"],_OPTIONS["subtarget"]) - -if (_OPTIONS["STRIP_SYMBOLS"]=="1") then - strip() -end +strip() if _OPTIONS["with-tools"] then group "tools" @@ -1296,3 +1317,8 @@ if _OPTIONS["with-tests"] then group "tests" dofile(path.join("src", "tests.lua")) end + +if _OPTIONS["with-benchmarks"] then + group "benchmarks" + dofile(path.join("src", "benchmarks.lua")) +end diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 2bee6477f01..2cbb33e393e 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -280,6 +280,11 @@ end buildoptions { "-Wno-enum-conversion", } + if _OPTIONS["targetos"]=="macosx" then + buildoptions_c { + "-Wno-unknown-attributes", + } + end end configuration { } @@ -398,6 +403,8 @@ end configuration { } defines { "LUA_COMPAT_ALL", + "LUA_COMPAT_5_1", + "LUA_COMPAT_5_2", } if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then defines { @@ -458,20 +465,19 @@ links { end -------------------------------------------------- --- sqlite3 lua library objects +-- small lua library objects -------------------------------------------------- -project "lsqlite3" +project "lualibs" uuid "1d84edab-94cf-48fb-83ee-b75bc697660e" kind "StaticLib" - -- options { - -- "ForceCPP", - -- } - configuration { "vs*" } buildoptions { "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data + "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx' + "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression + "/wd4130", -- warning C4130: '==': logical operation on address of string constant } configuration { } @@ -487,9 +493,69 @@ project "lsqlite3" MAME_DIR .. "3rdparty/lua/src", } end + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", + MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", + MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", + } + +-------------------------------------------------- +-- luv lua library objects +-------------------------------------------------- + +project "luv" + uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871" + kind "StaticLib" + + if _OPTIONS["targetos"]=="windows" then + defines { + "_WIN32_WINNT=0x0600", + } + end + configuration { "vs*" } + buildoptions { + "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data + } + + configuration { "gmake" } + buildoptions_c { + "-Wno-unused-function", + "-Wno-strict-prototypes", + "-Wno-unused-variable", + "-Wno-maybe-uninitialized", + "-Wno-undef", + } + + configuration { "vs2015" } + buildoptions { + "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used + "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used + } + + configuration { } + defines { + "LUA_COMPAT_ALL", + } + + includedirs { + MAME_DIR .. "3rdparty/lua/src", + MAME_DIR .. "3rdparty/libuv/include", + } + if _OPTIONS["with-bundled-lua"] then + includedirs { + MAME_DIR .. "3rdparty/luv/deps/lua/src", + } + end + + files { + MAME_DIR .. "3rdparty/luv/src/luv.c", + MAME_DIR .. "3rdparty/luv/src/luv.h", } -------------------------------------------------- @@ -639,7 +705,6 @@ end -- BGFX library objects -------------------------------------------------- -if (USE_BGFX == 1) then project "bgfx" uuid "d3e7e119-35cf-4f4f-aba0-d3bdcd1b879a" kind "StaticLib" @@ -664,10 +729,14 @@ end MAME_DIR .. "3rdparty/bgfx/include", MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", - MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include", } + configuration { "not steamlink"} + includedirs { + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", + } + configuration { "vs*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/msvc", @@ -677,7 +746,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx*" } + configuration { "osx* or xcode4" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -763,7 +832,6 @@ end MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm", } end -end -------------------------------------------------- -- PortAudio library objects @@ -919,37 +987,194 @@ links { end -------------------------------------------------- --- GoogleTest library objects +-- libuv library objects -------------------------------------------------- - -project "gtest" - uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" +project "uv" + uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0" kind "StaticLib" + includedirs { + MAME_DIR .. "3rdparty/libuv/include", + MAME_DIR .. "3rdparty/libuv/src", + MAME_DIR .. "3rdparty/libuv/src/win", + } + configuration { "gmake" } - buildoptions { + buildoptions_c { + "-Wno-strict-prototypes", + "-Wno-bad-function-cast", + "-Wno-write-strings", + "-Wno-missing-braces", "-Wno-undef", "-Wno-unused-variable", } - configuration { "mingw-clang" } - buildoptions { - "-O0", -- crash of compiler when doing optimization - } + + local version = str_to_version(_OPTIONS["gcc_version"]) + if (_OPTIONS["gcc"]~=nil) then + if string.find(_OPTIONS["gcc"], "clang") then + buildoptions_c { + "-Wno-unknown-warning-option", + "-Wno-unknown-attributes", + "-Wno-null-dereference", + "-Wno-unused-but-set-variable", + "-Wno-maybe-uninitialized", + } + else + buildoptions_c { + "-Wno-unused-but-set-variable", + "-Wno-maybe-uninitialized", + } + end + end configuration { "vs*" } -if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + "/wd4054", -- warning C4054: 'type cast' : from function pointer 'xxx' to data pointer 'void *' + "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer + "/wd4210", -- warning C4210: nonstandard extension used : function given file scope + "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used + "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used + "/wd4477", -- warning C4477: '<function>' : format string '<format-string>' requires an argument of type '<type>', but variadic argument <position> has type '<type>' } -end configuration { } - includedirs { - MAME_DIR .. "3rdparty/googletest/googletest/include", - MAME_DIR .. "3rdparty/googletest/googletest", + files { + MAME_DIR .. "3rdparty/libuv/src/fs-poll.c", + MAME_DIR .. "3rdparty/libuv/src/inet.c", + MAME_DIR .. "3rdparty/libuv/src/threadpool.c", + MAME_DIR .. "3rdparty/libuv/src/uv-common.c", + MAME_DIR .. "3rdparty/libuv/src/version.c", } + + if _OPTIONS["targetos"]=="windows" then + defines { + "WIN32_LEAN_AND_MEAN", + "_WIN32_WINNT=0x0502", + } + if _ACTION == "vs2013" then + files { + MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c", + } + end + configuration { } + files { + MAME_DIR .. "3rdparty/libuv/src/win/async.c", + MAME_DIR .. "3rdparty/libuv/src/win/core.c", + MAME_DIR .. "3rdparty/libuv/src/win/dl.c", + MAME_DIR .. "3rdparty/libuv/src/win/error.c", + MAME_DIR .. "3rdparty/libuv/src/win/fs-event.c", + MAME_DIR .. "3rdparty/libuv/src/win/fs.c", + MAME_DIR .. "3rdparty/libuv/src/win/getaddrinfo.c", + MAME_DIR .. "3rdparty/libuv/src/win/getnameinfo.c", + MAME_DIR .. "3rdparty/libuv/src/win/handle.c", + MAME_DIR .. "3rdparty/libuv/src/win/loop-watcher.c", + MAME_DIR .. "3rdparty/libuv/src/win/pipe.c", + MAME_DIR .. "3rdparty/libuv/src/win/poll.c", + MAME_DIR .. "3rdparty/libuv/src/win/process-stdio.c", + MAME_DIR .. "3rdparty/libuv/src/win/process.c", + MAME_DIR .. "3rdparty/libuv/src/win/req.c", + MAME_DIR .. "3rdparty/libuv/src/win/signal.c", + MAME_DIR .. "3rdparty/libuv/src/win/stream.c", + MAME_DIR .. "3rdparty/libuv/src/win/tcp.c", + MAME_DIR .. "3rdparty/libuv/src/win/thread.c", + MAME_DIR .. "3rdparty/libuv/src/win/timer.c", + MAME_DIR .. "3rdparty/libuv/src/win/tty.c", + MAME_DIR .. "3rdparty/libuv/src/win/udp.c", + MAME_DIR .. "3rdparty/libuv/src/win/util.c", + MAME_DIR .. "3rdparty/libuv/src/win/winapi.c", + MAME_DIR .. "3rdparty/libuv/src/win/winsock.c", + } + end + + if _OPTIONS["targetos"]~="windows" then + files { + MAME_DIR .. "3rdparty/libuv/src/unix/async.c", + MAME_DIR .. "3rdparty/libuv/src/unix/atomic-ops.h", + MAME_DIR .. "3rdparty/libuv/src/unix/core.c", + MAME_DIR .. "3rdparty/libuv/src/unix/dl.c", + MAME_DIR .. "3rdparty/libuv/src/unix/fs.c", + MAME_DIR .. "3rdparty/libuv/src/unix/getaddrinfo.c", + MAME_DIR .. "3rdparty/libuv/src/unix/getnameinfo.c", + MAME_DIR .. "3rdparty/libuv/src/unix/internal.h", + MAME_DIR .. "3rdparty/libuv/src/unix/loop-watcher.c", + MAME_DIR .. "3rdparty/libuv/src/unix/loop.c", + MAME_DIR .. "3rdparty/libuv/src/unix/pipe.c", + MAME_DIR .. "3rdparty/libuv/src/unix/poll.c", + MAME_DIR .. "3rdparty/libuv/src/unix/process.c", + MAME_DIR .. "3rdparty/libuv/src/unix/signal.c", + MAME_DIR .. "3rdparty/libuv/src/unix/spinlock.h", + MAME_DIR .. "3rdparty/libuv/src/unix/stream.c", + MAME_DIR .. "3rdparty/libuv/src/unix/tcp.c", + MAME_DIR .. "3rdparty/libuv/src/unix/thread.c", + MAME_DIR .. "3rdparty/libuv/src/unix/timer.c", + MAME_DIR .. "3rdparty/libuv/src/unix/tty.c", + MAME_DIR .. "3rdparty/libuv/src/unix/udp.c", + } + end + if _OPTIONS["targetos"]=="linux" then + defines { + "_GNU_SOURCE", + } + files { + MAME_DIR .. "3rdparty/libuv/src/unix/linux-core.c", + MAME_DIR .. "3rdparty/libuv/src/unix/linux-inotify.c", + MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.c", + MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.h", + MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c", + } + end + if _OPTIONS["targetos"]=="macosx" then + defines { + "_DARWIN_USE_64_BIT_INODE=1", + "_DARWIN_UNLIMITED_SELECT=1", + } + files { + MAME_DIR .. "3rdparty/libuv/src/unix/darwin.c", + MAME_DIR .. "3rdparty/libuv/src/unix/darwin-proctitle.c", + MAME_DIR .. "3rdparty/libuv/src/unix/fsevents.c", + MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", + MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c", + } + end + if _OPTIONS["targetos"]=="solaris" then + defines { + "__EXTENSIONS__", + "_XOPEN_SOURCE=500", + } + files { + MAME_DIR .. "3rdparty/libuv/src/unix/sunos.c", + } + end + if _OPTIONS["targetos"]=="freebsd" then + files { + MAME_DIR .. "3rdparty/libuv/src/unix/freebsd.c", + MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", + } + end + + if (_OPTIONS["SHADOW_CHECK"]=="1") then + removebuildoptions { + "-Wshadow" + } + end + +-------------------------------------------------- +-- HTTP parser library objects +-------------------------------------------------- + +project "http-parser" + uuid "90c6ba59-bdb2-4fee-8b44-57601d690e14" + kind "StaticLib" + + configuration { } + files { - MAME_DIR .. "3rdparty/googletest/googletest/src/gtest-all.cc", + MAME_DIR .. "3rdparty/http-parser/http_parser.c", } + if (_OPTIONS["SHADOW_CHECK"]=="1") then + removebuildoptions { + "-Wshadow" + } + end diff --git a/docs/release/scripts/src/benchmarks.lua b/docs/release/scripts/src/benchmarks.lua new file mode 100644 index 00000000000..f774e3f45ca --- /dev/null +++ b/docs/release/scripts/src/benchmarks.lua @@ -0,0 +1,74 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +--------------------------------------------------------------------------- +-- +-- benchmarks.lua +-- +-- Rules for building benchmarks +-- +--------------------------------------------------------------------------- + +-------------------------------------------------- +-- Google Benchmark library objects +-------------------------------------------------- + +project "benchmark" + uuid "60a7e05c-8b4f-497c-bfda-2949a009ba0d" + kind "StaticLib" + + configuration { } + defines { + "HAVE_STD_REGEX", + } + + includedirs { + MAME_DIR .. "3rdparty/benchmark/include", + } + files { + MAME_DIR .. "3rdparty/benchmark/src/benchmark.cc", + MAME_DIR .. "3rdparty/benchmark/src/colorprint.cc", + MAME_DIR .. "3rdparty/benchmark/src/commandlineflags.cc", + MAME_DIR .. "3rdparty/benchmark/src/console_reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/csv_reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/json_reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/log.cc", + MAME_DIR .. "3rdparty/benchmark/src/reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/sleep.cc", + MAME_DIR .. "3rdparty/benchmark/src/string_util.cc", + MAME_DIR .. "3rdparty/benchmark/src/sysinfo.cc", + MAME_DIR .. "3rdparty/benchmark/src/walltime.cc", + MAME_DIR .. "3rdparty/benchmark/src/re_std.cc", + } + + + +project("benchmarks") + uuid ("a9750a48-d283-4a6d-b126-31c7ce049af1") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + configuration { } + + links { + "benchmark", + } + + includedirs { + MAME_DIR .. "3rdparty/benchmark/include", + MAME_DIR .. "src/osd", + } + + files { + MAME_DIR .. "benchmarks/main.cpp", + MAME_DIR .. "benchmarks/eminline_native.cpp", + MAME_DIR .. "benchmarks/eminline_noasm.cpp", + } + diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index bafa63a269d..9514e9f5a74 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -2558,3 +2558,17 @@ if (BUSES["CGENIE_PARALLEL"]~=null) then MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.h", } end + +--------------------------------------------------- +-- +--@src/devices/bus/m5/slot.h,BUSES["M5"] = true +--------------------------------------------------- +if (BUSES["M5"]~=null) then + files { + MAME_DIR .. "src/devices/bus/m5/slot.cpp", + MAME_DIR .. "src/devices/bus/m5/slot.h", + MAME_DIR .. "src/devices/bus/m5/rom.cpp", + MAME_DIR .. "src/devices/bus/m5/rom.h", + } +end + diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 0c2882df5e5..ed6378f93f8 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -10,14 +10,6 @@ --------------------------------------------------------------------------- -------------------------------------------------- --- Shared code --------------------------------------------------- - -files { - MAME_DIR .. "src/devices/cpu/vtlb.cpp", -} - --------------------------------------------------- -- Dynamic recompiler objects -------------------------------------------------- @@ -43,7 +35,6 @@ if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RS MAME_DIR .. "src/devices/cpu/drcbex64.cpp", MAME_DIR .. "src/devices/cpu/drcbex64.h", MAME_DIR .. "src/devices/cpu/drcumlsh.h", - MAME_DIR .. "src/devices/cpu/vtlb.h", MAME_DIR .. "src/devices/cpu/x86emit.h", } end diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index 01e61852d60..c4bb8ece0cf 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -16,7 +16,9 @@ kind (LIBTYPE) addprojectflags() precompiledheaders() - +options { + "ArchiveSplit", +} includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -38,6 +40,18 @@ if _OPTIONS["with-bundled-lua"] then } end +if (_OPTIONS["targetos"] == "windows") then + defines { + "UI_WINDOWS", + } +end + +if (_OPTIONS["osd"] == "sdl") then + defines { + "UI_SDL", + } +end + files { MAME_DIR .. "src/emu/emu.h", MAME_DIR .. "src/emu/gamedrv.h", @@ -105,6 +119,8 @@ files { MAME_DIR .. "src/emu/distate.h", MAME_DIR .. "src/emu/divideo.cpp", MAME_DIR .. "src/emu/divideo.h", + MAME_DIR .. "src/emu/divtlb.cpp", + MAME_DIR .. "src/emu/divtlb.h", MAME_DIR .. "src/emu/drawgfx.cpp", MAME_DIR .. "src/emu/drawgfx.h", MAME_DIR .. "src/emu/drawgfxm.h", @@ -135,6 +151,8 @@ files { MAME_DIR .. "src/emu/inpttype.h", MAME_DIR .. "src/emu/luaengine.cpp", MAME_DIR .. "src/emu/luaengine.h", + MAME_DIR .. "src/emu/language.cpp", + MAME_DIR .. "src/emu/language.h", MAME_DIR .. "src/emu/mame.cpp", MAME_DIR .. "src/emu/mame.h", MAME_DIR .. "src/emu/machine.cpp", @@ -208,8 +226,6 @@ files { MAME_DIR .. "src/emu/ui/info_pty.h", MAME_DIR .. "src/emu/ui/inputmap.cpp", MAME_DIR .. "src/emu/ui/inputmap.h", - MAME_DIR .. "src/emu/ui/selgame.cpp", - MAME_DIR .. "src/emu/ui/selgame.h", MAME_DIR .. "src/emu/ui/sliders.cpp", MAME_DIR .. "src/emu/ui/sliders.h", MAME_DIR .. "src/emu/ui/slotopt.cpp", @@ -222,6 +238,48 @@ files { MAME_DIR .. "src/emu/ui/videoopt.h", MAME_DIR .. "src/emu/ui/viewgfx.cpp", MAME_DIR .. "src/emu/ui/viewgfx.h", + MAME_DIR .. "src/emu/ui/auditmenu.cpp", + MAME_DIR .. "src/emu/ui/auditmenu.h", + MAME_DIR .. "src/emu/ui/cmddata.h", + MAME_DIR .. "src/emu/ui/cmdrender.h", + MAME_DIR .. "src/emu/ui/ctrlmenu.cpp", + MAME_DIR .. "src/emu/ui/ctrlmenu.h", + MAME_DIR .. "src/emu/ui/custmenu.cpp", + MAME_DIR .. "src/emu/ui/custmenu.h", + MAME_DIR .. "src/emu/ui/custui.cpp", + MAME_DIR .. "src/emu/ui/custui.h", + MAME_DIR .. "src/emu/ui/datfile.cpp", + MAME_DIR .. "src/emu/ui/datfile.h", + MAME_DIR .. "src/emu/ui/datmenu.cpp", + MAME_DIR .. "src/emu/ui/datmenu.h", + MAME_DIR .. "src/emu/ui/defimg.h", + MAME_DIR .. "src/emu/ui/dirmenu.cpp", + MAME_DIR .. "src/emu/ui/dirmenu.h", + MAME_DIR .. "src/emu/ui/dsplmenu.cpp", + MAME_DIR .. "src/emu/ui/dsplmenu.h", + MAME_DIR .. "src/emu/ui/icorender.h", + MAME_DIR .. "src/emu/ui/inifile.cpp", + MAME_DIR .. "src/emu/ui/inifile.h", + MAME_DIR .. "src/emu/ui/miscmenu.cpp", + MAME_DIR .. "src/emu/ui/miscmenu.h", + MAME_DIR .. "src/emu/ui/moptions.cpp", + MAME_DIR .. "src/emu/ui/moptions.h", + MAME_DIR .. "src/emu/ui/optsmenu.cpp", + MAME_DIR .. "src/emu/ui/optsmenu.h", + MAME_DIR .. "src/emu/ui/selector.cpp", + MAME_DIR .. "src/emu/ui/selector.h", + MAME_DIR .. "src/emu/ui/selgame.cpp", + MAME_DIR .. "src/emu/ui/selgame.h", + MAME_DIR .. "src/emu/ui/simpleselgame.cpp", + MAME_DIR .. "src/emu/ui/simpleselgame.h", + MAME_DIR .. "src/emu/ui/selsoft.cpp", + MAME_DIR .. "src/emu/ui/selsoft.h", + MAME_DIR .. "src/emu/ui/sndmenu.cpp", + MAME_DIR .. "src/emu/ui/sndmenu.h", + MAME_DIR .. "src/emu/ui/starimg.h", + MAME_DIR .. "src/emu/ui/toolbar.h", + MAME_DIR .. "src/emu/ui/utils.cpp", + MAME_DIR .. "src/emu/ui/utils.h", MAME_DIR .. "src/emu/validity.cpp", MAME_DIR .. "src/emu/validity.h", MAME_DIR .. "src/emu/video.cpp", @@ -333,6 +391,7 @@ dependency { -- additional dependencies -------------------------------------------------- { MAME_DIR .. "src/emu/rendfont.cpp", GEN_DIR .. "emu/uismall.fh" }, + { MAME_DIR .. "src/emu/rendfont.cpp", GEN_DIR .. "emu/ui/uicmd14.fh" }, ------------------------------------------------- -- core layouts -------------------------------------------------- @@ -352,7 +411,8 @@ dependency { } custombuildtask { - { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }}, + { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }}, + { MAME_DIR .. "src/emu/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }}, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 5a97d22d015..fbc923b3073 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -773,6 +773,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/hp_taco.h,MACHINES["HP_TACO"] = true +--------------------------------------------------- + +if (MACHINES["HP_TACO"]~=null) then + files { + MAME_DIR .. "src/devices/machine/hp_taco.cpp", + MAME_DIR .. "src/devices/machine/hp_taco.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/i2cmem.h,MACHINES["I2CMEM"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index da633c55212..b8125bf1989 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -87,8 +87,21 @@ end configuration { "asmjs" } targetextension ".bc" if os.getenv("EMSCRIPTEN") then + local emccopts = "" + emccopts = emccopts .. " -O3" + emccopts = emccopts .. " -s USE_SDL=2" + emccopts = emccopts .. " --memory-init-file 0" + emccopts = emccopts .. " -s ALLOW_MEMORY_GROWTH=0" + emccopts = emccopts .. " -s TOTAL_MEMORY=268435456" + emccopts = emccopts .. " -s DISABLE_EXCEPTION_CATCHING=2" + emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]'" + emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\"" + emccopts = emccopts .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js" + emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js" + emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx@bgfx" + emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "shaders/gles@shaders/gles" postbuildcommands { - os.getenv("EMSCRIPTEN") .. "/emcc -O3 -s DISABLE_EXCEPTION_CATCHING=2 -s USE_SDL=2 --memory-init-file 0 -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]' -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\" $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js", + os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js", } end @@ -128,7 +141,10 @@ end "jpeg", "7z", "lua", - "lsqlite3", + "lualibs", + "luv", + "uv", + "http-parser", } if _OPTIONS["with-bundled-zlib"] then @@ -166,12 +182,8 @@ end "portmidi", } end - if (USE_BGFX == 1) then - links { - "bgfx" - } - end - links{ + links { + "bgfx", "ocore_" .. _OPTIONS["osd"], } @@ -272,8 +284,14 @@ end "@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", "\\") , } + + if (_OPTIONS["osd"] == "sdl") then + configuration { "x64","vs*" } + prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x64/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } + configuration { "x32","vs*" } + prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x86/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } + end - configuration { } debugdir (MAME_DIR) diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index 87e684a50f6..1dfa4317a48 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -89,7 +89,6 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.h", MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.h", MAME_DIR .. "src/osd/modules/opengl/osd_opengl.h", - MAME_DIR .. "src/osd/modules/opengl/SDL1211_opengl.h", } defines { "USE_OPENGL=1", @@ -101,18 +100,39 @@ function osdmodulesbuild() end end - if USE_BGFX == 1 then - files { - MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", - } - defines { - "USE_BGFX" - } - includedirs { - MAME_DIR .. "3rdparty/bgfx/include", - MAME_DIR .. "3rdparty/bx/include", - } - end + files { + MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", + MAME_DIR .. "src/osd/modules/render/binpacker.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/cullreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/depthreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/slider.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/parameter.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/uniform.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp", + } + includedirs { + MAME_DIR .. "3rdparty/bgfx/include", + MAME_DIR .. "3rdparty/bx/include", + MAME_DIR .. "3rdparty/rapidjson/include", + } if _OPTIONS["NO_USE_MIDI"]=="1" then defines { @@ -356,14 +376,6 @@ newoption { }, } -if not _OPTIONS["NO_OPENGL"] then - if _OPTIONS["targetos"]=="os2" then - _OPTIONS["NO_OPENGL"] = "1" - else - _OPTIONS["NO_OPENGL"] = "0" - end -end - newoption { trigger = "USE_DISPATCH_GL", description = "Use GL-dispatching", @@ -374,11 +386,7 @@ newoption { } if not _OPTIONS["USE_DISPATCH_GL"] then - if USE_BGFX == 1 then - _OPTIONS["USE_DISPATCH_GL"] = "0" - else - _OPTIONS["USE_DISPATCH_GL"] = "1" - end + _OPTIONS["USE_DISPATCH_GL"] = "0" end newoption { diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua index e73eb40847f..c8451ed90a9 100644 --- a/docs/release/scripts/src/osd/newui.lua +++ b/docs/release/scripts/src/osd/newui.lua @@ -121,13 +121,14 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", - MAME_DIR .. "src/osd/modules/render/drawdd.cpp", MAME_DIR .. "src/osd/modules/render/drawgdi.cpp", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", MAME_DIR .. "src/osd/windows/input.cpp", MAME_DIR .. "src/osd/windows/output.cpp", MAME_DIR .. "src/osd/windows/video.cpp", MAME_DIR .. "src/osd/windows/window.cpp", + MAME_DIR .. "src/osd/modules/osdwindow.cpp", + MAME_DIR .. "src/osd/modules/osdwindow.h", MAME_DIR .. "src/osd/winui/newui.cpp", MAME_DIR .. "src/osd/windows/winmain.cpp", MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp", diff --git a/docs/release/scripts/src/osd/osdmini.lua b/docs/release/scripts/src/osd/osdmini.lua index 803b7413014..b05839e7873 100644 --- a/docs/release/scripts/src/osd/osdmini.lua +++ b/docs/release/scripts/src/osd/osdmini.lua @@ -79,6 +79,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp", MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp", MAME_DIR .. "src/osd/modules/sound/none.cpp", + MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp", } project ("ocore_" .. _OPTIONS["osd"]) @@ -124,7 +125,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/osdmini/minidir.cpp", MAME_DIR .. "src/osd/osdmini/minifile.cpp", MAME_DIR .. "src/osd/osdmini/minimisc.cpp", - MAME_DIR .. "src/osd/osdmini/minisync.cpp", MAME_DIR .. "src/osd/osdmini/minitime.cpp", MAME_DIR .. "src/osd/modules/sync/work_mini.cpp", } diff --git a/docs/release/scripts/src/osd/osdmini_cfg.lua b/docs/release/scripts/src/osd/osdmini_cfg.lua index ff9539066b2..586075d3cac 100644 --- a/docs/release/scripts/src/osd/osdmini_cfg.lua +++ b/docs/release/scripts/src/osd/osdmini_cfg.lua @@ -7,4 +7,6 @@ defines { "USE_SDL", "SDLMAME_NOASM=1", "USE_OPENGL=0", + "NO_USE_MIDI=1", + "USE_XAUDIO2=0", } diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index 6acb5a2d262..76947ad777a 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -39,29 +39,38 @@ function maintargetosdoptions(_target,_subtarget) end if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then - if _OPTIONS["SDL_LIBVER"]=="sdl2" then - links { - "SDL2_ttf", - } - else - links { - "SDL_ttf", - } - end + links { + "SDL2_ttf", + } local str = backtick("pkg-config --libs fontconfig") addlibfromstring(str) addoptionsfromstring(str) end if _OPTIONS["targetos"]=="windows" then - if _OPTIONS["SDL_LIBVER"]=="sdl2" then - links { - "SDL2.dll", - } + if _OPTIONS["USE_LIBSDL"]~="1" then + configuration { "mingw*"} + links { + "SDL2.dll", + } + configuration { "x64","vs*" } + libdirs { + MAME_DIR .. "3rdparty/sdl2/lib/x64", + } + configuration { "x32","vs*" } + libdirs { + MAME_DIR .. "3rdparty/sdl2/lib/x86", + } + + configuration { "vs*"} + links { + "SDL2", + } + configuration { } else - links { - "SDL.dll", - } + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) end links { "psapi", @@ -93,16 +102,21 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*" or "vs*" } targetprefix "sdl" + links { + "psapi" + } configuration { } end function sdlconfigcmd() - if not _OPTIONS["SDL_INSTALL_ROOT"] then - return _OPTIONS["SDL_LIBVER"] .. "-config" + if _OPTIONS["targetos"]=="asmjs" then + return "sdl2-config" + elseif not _OPTIONS["SDL_INSTALL_ROOT"] then + return _OPTIONS['TOOLCHAIN'] .. "pkg-config sdl2" else - return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin",_OPTIONS["SDL_LIBVER"]) .. "-config" + return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin","sdl2") .. "-config" end end @@ -148,23 +162,6 @@ if not _OPTIONS["NO_USE_XINPUT"] then end newoption { - trigger = "SDL_LIBVER", - description = "Choose SDL version", - allowed = { - { "sdl", "SDL" }, - { "sdl2", "SDL 2" }, - }, -} - -if not _OPTIONS["SDL_LIBVER"] then - if _OPTIONS["targetos"]=="os2" then - _OPTIONS["SDL_LIBVER"] = "sdl" - else - _OPTIONS["SDL_LIBVER"] = "sdl2" - end -end - -newoption { trigger = "SDL2_MULTIAPI", description = "Use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)", allowed = { @@ -192,16 +189,16 @@ if not _OPTIONS["SDL_FRAMEWORK_PATH"] then end newoption { - trigger = "MACOSX_USE_LIBSDL", - description = "Use SDL library on OS (rather than framework)", + trigger = "USE_LIBSDL", + description = "Use SDL library on OS (rather than framework/dll)", allowed = { - { "0", "Use framework" }, + { "0", "Use framework/dll" }, { "1", "Use library" }, }, } -if not _OPTIONS["MACOSX_USE_LIBSDL"] then - _OPTIONS["MACOSX_USE_LIBSDL"] = "0" +if not _OPTIONS["USE_LIBSDL"] then + _OPTIONS["USE_LIBSDL"] = "0" end @@ -235,10 +232,6 @@ elseif _OPTIONS["targetos"]=="os2" then SYNC_IMPLEMENTATION = "os2" end -if _OPTIONS["SDL_LIBVER"]=="sdl" then - USE_BGFX = 0 -end - if BASE_TARGETOS=="unix" then if _OPTIONS["targetos"]=="macosx" then local os_version = str_to_version(backtick("sw_vers -productVersion")) @@ -255,39 +248,27 @@ if BASE_TARGETOS=="unix" then "-weak_framework Metal", } end - if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then + if _OPTIONS["USE_LIBSDL"]~="1" then linkoptions { "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], } - if _OPTIONS["SDL_LIBVER"]=="sdl2" then - links { - "SDL2.framework", - } - else - links { - "SDL.framework", - } - end + links { + "SDL2.framework", + } else - local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'") + local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'") addlibfromstring(str) addoptionsfromstring(str) end else if _OPTIONS["NO_X11"]=="1" then _OPTIONS["USE_QTDEBUG"] = "0" - USE_BGFX = 0 else libdirs { "/usr/X11/lib", "/usr/X11R6/lib", "/usr/openwin/lib", } - if _OPTIONS["SDL_LIBVER"]=="sdl" then - links { - "X11", - } - end end local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) @@ -404,13 +385,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.h", MAME_DIR .. "src/osd/modules/debugger/osx/debugosx.h", } - if _OPTIONS["SDL_LIBVER"]=="sdl" then - -- SDLMain_tmpl isn't necessary for SDL2 - files { - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm", - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.h", - } - end end files { @@ -425,18 +399,17 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl/video.h", MAME_DIR .. "src/osd/sdl/window.cpp", MAME_DIR .. "src/osd/sdl/window.h", + MAME_DIR .. "src/osd/modules/osdwindow.cpp", MAME_DIR .. "src/osd/modules/osdwindow.h", MAME_DIR .. "src/osd/sdl/output.cpp", MAME_DIR .. "src/osd/sdl/watchdog.cpp", MAME_DIR .. "src/osd/sdl/watchdog.h", MAME_DIR .. "src/osd/modules/render/drawsdl.cpp", } - if _OPTIONS["SDL_LIBVER"]=="sdl2" then - files { - MAME_DIR .. "src/osd/modules/render/draw13.cpp", - MAME_DIR .. "src/osd/modules/render/blit13.h", - } - end + files { + MAME_DIR .. "src/osd/modules/render/draw13.cpp", + MAME_DIR .. "src/osd/modules/render/blit13.h", + } project ("ocore_" .. _OPTIONS["osd"]) @@ -529,14 +502,28 @@ if _OPTIONS["with-tools"] then } if _OPTIONS["targetos"] == "windows" then - if _OPTIONS["SDL_LIBVER"] == "sdl2" then - links { - "SDL2.dll", - } + if _OPTIONS["USE_LIBSDL"]~="1" then + configuration { "mingw*"} + links { + "SDL2.dll", + } + configuration { "x64","vs*" } + libdirs { + MAME_DIR .. "3rdparty/sdl2/lib/x64", + } + configuration { "x32","vs*" } + libdirs { + MAME_DIR .. "3rdparty/sdl2/lib/x86", + } + configuration { "vs*"} + links { + "SDL2", + } + configuration { } else - links { - "SDL.dll", - } + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) end links { "psapi", @@ -547,12 +534,14 @@ if _OPTIONS["with-tools"] then files { MAME_DIR .. "src/osd/sdl/main.cpp", } - elseif _OPTIONS["targetos"] == "macosx" and _OPTIONS["SDL_LIBVER"] == "sdl" then - -- SDLMain_tmpl isn't necessary for SDL2 - files { - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm", - } end + + configuration { "mingw*" or "vs*" } + targetextension ".exe" + + configuration { } + + strip() end @@ -594,4 +583,6 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then files { MAME_DIR .. "src/osd/sdl/aueffectutil.mm", } + + strip() end diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua index 2dc1a7e465a..e3a6f913e75 100644 --- a/docs/release/scripts/src/osd/sdl_cfg.lua +++ b/docs/release/scripts/src/osd/sdl_cfg.lua @@ -56,18 +56,12 @@ if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then } end -if _OPTIONS["SDL_LIBVER"]=="sdl2" then - defines { - "SDLMAME_SDL2=1", - } - if _OPTIONS["SDL2_MULTIAPI"]=="1" then - defines { - "SDL2_MULTIAPI", - } - end -else +defines { + "SDLMAME_SDL2=1", +} +if _OPTIONS["SDL2_MULTIAPI"]=="1" then defines { - "SDLMAME_SDL2=0", + "SDL2_MULTIAPI", } end @@ -81,7 +75,7 @@ if BASE_TARGETOS=="unix" then "SDLMAME_UNIX", } if _OPTIONS["targetos"]=="macosx" then - if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then + if _OPTIONS["USE_LIBSDL"]~="1" then buildoptions { "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], } @@ -119,7 +113,7 @@ if _OPTIONS["targetos"]=="windows" then } configuration { "vs*" } includedirs { - path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include") + MAME_DIR .. "3rdparty/sdl2/include", } configuration { } @@ -151,3 +145,21 @@ elseif _OPTIONS["targetos"]=="os2" then backtick(sdlconfigcmd() .. " --cflags"), } end + +configuration { "osx*" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/osx", + } + +configuration { "freebsd" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/freebsd", + } + +configuration { "netbsd" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/freebsd", + } + +configuration { } + diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua index fd508e645c5..154d4732bc1 100644 --- a/docs/release/scripts/src/osd/windows.lua +++ b/docs/release/scripts/src/osd/windows.lua @@ -152,16 +152,17 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", - MAME_DIR .. "src/osd/modules/render/drawd3d.h", 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", - MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", - MAME_DIR .. "src/osd/modules/render/drawdd.cpp", + MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", + MAME_DIR .. "src/osd/modules/render/drawd3d.h", MAME_DIR .. "src/osd/modules/render/drawgdi.cpp", + MAME_DIR .. "src/osd/modules/render/drawgdi.h", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", + MAME_DIR .. "src/osd/modules/render/drawnone.h", MAME_DIR .. "src/osd/windows/input.cpp", MAME_DIR .. "src/osd/windows/input.h", MAME_DIR .. "src/osd/windows/output.cpp", @@ -170,6 +171,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows/video.h", MAME_DIR .. "src/osd/windows/window.cpp", MAME_DIR .. "src/osd/windows/window.h", + MAME_DIR .. "src/osd/modules/osdwindow.cpp", MAME_DIR .. "src/osd/modules/osdwindow.h", MAME_DIR .. "src/osd/windows/winmenu.cpp", MAME_DIR .. "src/osd/windows/winmain.cpp", diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua index 19ef05c3ce9..3e656017816 100644 --- a/docs/release/scripts/src/osd/windows_cfg.lua +++ b/docs/release/scripts/src/osd/windows_cfg.lua @@ -50,7 +50,7 @@ end if _OPTIONS["USE_SDL"]=="1" then defines { - "SDLMAME_SDL2=0", + "SDLMAME_SDL2=1", "USE_XINPUT=0", "USE_SDL=1", "USE_SDL_SOUND", diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index 013a1bfcdb8..cff0beea684 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -144,13 +144,14 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", - MAME_DIR .. "src/osd/modules/render/drawdd.cpp", MAME_DIR .. "src/osd/modules/render/drawgdi.cpp", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", MAME_DIR .. "src/osd/windows/input.cpp", MAME_DIR .. "src/osd/windows/output.cpp", MAME_DIR .. "src/osd/windows/video.cpp", MAME_DIR .. "src/osd/windows/window.cpp", + MAME_DIR .. "src/osd/modules/osdwindow.cpp", + MAME_DIR .. "src/osd/modules/osdwindow.h", -- MAME_DIR .. "src/osd/windows/winmenu.cpp", MAME_DIR .. "src/osd/winui/newui.cpp", MAME_DIR .. "src/osd/windows/winmain.cpp", diff --git a/docs/release/scripts/src/tests.lua b/docs/release/scripts/src/tests.lua index 99d82fcb6cb..d30cff64df2 100644 --- a/docs/release/scripts/src/tests.lua +++ b/docs/release/scripts/src/tests.lua @@ -8,42 +8,78 @@ -- Rules for building tests -- --------------------------------------------------------------------------- +-------------------------------------------------- +-- GoogleTest library objects +-------------------------------------------------- -project("tests") -uuid ("66d4c639-196b-4065-a411-7ee9266564f5") -kind "ConsoleApp" +project "gtest" + uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" + kind "StaticLib" + + configuration { "gmake" } + buildoptions { + "-Wno-undef", + "-Wno-unused-variable", + } -flags { - "Symbols", -- always include minimum symbols for executables -} + configuration { "mingw-clang" } + buildoptions { + "-O0", -- crash of compiler when doing optimization + } -if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) + configuration { "vs*" } +if _OPTIONS["vs"]=="intel-15" then + buildoptions { + "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + } end -configuration { "gmake" } - buildoptions { - "-Wno-undef", + configuration { } + + includedirs { + MAME_DIR .. "3rdparty/googletest/googletest/include", + MAME_DIR .. "3rdparty/googletest/googletest", + } + files { + MAME_DIR .. "3rdparty/googletest/googletest/src/gtest-all.cc", + } + + +project("tests") + uuid ("66d4c639-196b-4065-a411-7ee9266564f5") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables } -configuration { } - -links { - "gtest", - "utils", - "expat", - "zlib", - "ocore_" .. _OPTIONS["osd"], -} - -includedirs { - MAME_DIR .. "3rdparty/googletest/googletest/include", - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", -} - -files { - MAME_DIR .. "tests/main.cpp", - MAME_DIR .. "tests/lib/util/corestr.cpp", -} + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + configuration { "gmake" } + buildoptions { + "-Wno-undef", + } + + configuration { } + + links { + "gtest", + "utils", + "expat", + "zlib", + "ocore_" .. _OPTIONS["osd"], + } + + includedirs { + MAME_DIR .. "3rdparty/googletest/googletest/include", + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib/util", + } + + files { + MAME_DIR .. "tests/main.cpp", + MAME_DIR .. "tests/lib/util/corestr.cpp", + } diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua index 19942651f0c..421f5cc76b5 100644 --- a/docs/release/scripts/src/tools.lua +++ b/docs/release/scripts/src/tools.lua @@ -50,6 +50,13 @@ files { MAME_DIR .. "src/tools/romcmp.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- chdman -------------------------------------------------- @@ -104,6 +111,13 @@ files { MAME_DIR .. "src/version.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- jedutil -------------------------------------------------- @@ -145,6 +159,13 @@ files { MAME_DIR .. "src/tools/jedutil.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- unidasm -------------------------------------------------- @@ -201,6 +222,12 @@ files { MAME_DIR .. "src/emu/emucore.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() -------------------------------------------------- -- ldresample @@ -255,6 +282,13 @@ files { MAME_DIR .. "src/tools/ldresample.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- ldverify -------------------------------------------------- @@ -308,6 +342,13 @@ files { MAME_DIR .. "src/tools/ldverify.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- regrep -------------------------------------------------- @@ -349,6 +390,13 @@ files { MAME_DIR .. "src/tools/regrep.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- srcclean --------------------------------------------------- @@ -390,6 +438,13 @@ files { MAME_DIR .. "src/tools/srcclean.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- src2html -------------------------------------------------- @@ -431,6 +486,13 @@ files { MAME_DIR .. "src/tools/src2html.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- split -------------------------------------------------- @@ -483,6 +545,13 @@ files { MAME_DIR .. "src/tools/split.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- pngcmp -------------------------------------------------- @@ -524,6 +593,13 @@ files { MAME_DIR .. "src/tools/pngcmp.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- nltool -------------------------------------------------- @@ -578,6 +654,13 @@ files { MAME_DIR .. "src/lib/netlist/prg/nltool.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- nlwav -------------------------------------------------- @@ -610,6 +693,13 @@ files { MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- castool -------------------------------------------------- @@ -664,6 +754,13 @@ files { MAME_DIR .. "src/tools/castool.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- floptool -------------------------------------------------- @@ -719,6 +816,13 @@ files { MAME_DIR .. "src/tools/floptool.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- imgtool -------------------------------------------------- @@ -822,3 +926,10 @@ files { MAME_DIR .. "src/tools/imgtool/modules/bml3.cpp", MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp", } + +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua index a09ef123fca..96a310f154b 100644 --- a/docs/release/scripts/src/video.lua +++ b/docs/release/scripts/src/video.lua @@ -156,6 +156,18 @@ end -------------------------------------------------- -- +--@src/devices/video/ef9364.h,VIDEOS["EF9364"] = true +-------------------------------------------------- + +if (VIDEOS["EF9364"]~=null) then + files { + MAME_DIR .. "src/devices/video/ef9364.cpp", + MAME_DIR .. "src/devices/video/ef9364.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/ef9365.h,VIDEOS["EF9365"] = true -------------------------------------------------- @@ -830,3 +842,15 @@ if (VIDEOS["CRTC_EGA"]~=null) then MAME_DIR .. "src/devices/video/crtc_ega.h", } end + +-------------------------------------------------- +-- +--@src/devices/video/jangou_blitter.h,VIDEOS["JANGOU_BLITTER"] = true +-------------------------------------------------- + +if (VIDEOS["JANGOU_BLITTER"]~=null) then + files { + MAME_DIR .. "src/devices/video/jangou_blitter.cpp", + MAME_DIR .. "src/devices/video/jangou_blitter.h", + } +end diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index c00c3d4731c..f59119796fc 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -275,6 +275,7 @@ VIDEOS["BUFSPRITE"] = true VIDEOS["DM9368"] = true --VIDEOS["EF9340_1"] = true --VIDEOS["EF9345"] = true +--VIDEOS["EF9364"] = true --VIDEOS["EF9365"] = true --VIDEOS["GF4500"] = true VIDEOS["GF7600GS"] = true @@ -294,6 +295,7 @@ VIDEOS["HUC6270"] = true --VIDEOS["HUC6272"] = true --VIDEOS["I8244"] = true VIDEOS["I8275"] = true +VIDEOS["JANGOU_BLITTER"] = true VIDEOS["M50458"] = true VIDEOS["MB90082"] = true VIDEOS["MB_VCU"] = true @@ -4019,6 +4021,8 @@ files { createMAMEProjects(_target, _subtarget, "zaccaria") files { + MAME_DIR .. "src/mame/audio/zaccaria.cpp", + MAME_DIR .. "src/mame/audio/zaccaria.h", MAME_DIR .. "src/mame/drivers/laserbat.cpp", MAME_DIR .. "src/mame/includes/laserbat.h", MAME_DIR .. "src/mame/video/laserbat.cpp", @@ -4245,6 +4249,7 @@ files { MAME_DIR .. "src/mame/machine/inder_vid.cpp", MAME_DIR .. "src/mame/machine/inder_vid.h", MAME_DIR .. "src/mame/drivers/corona.cpp", + MAME_DIR .. "src/mame/drivers/amazonlf.cpp", MAME_DIR .. "src/mame/drivers/crystal.cpp", MAME_DIR .. "src/mame/video/vrender0.cpp", MAME_DIR .. "src/mame/video/vrender0.h", @@ -4411,6 +4416,7 @@ files { MAME_DIR .. "src/mame/includes/news.h", MAME_DIR .. "src/mame/video/news.cpp", MAME_DIR .. "src/mame/drivers/nexus3d.cpp", + MAME_DIR .. "src/mame/drivers/nibble.cpp", MAME_DIR .. "src/mame/drivers/norautp.cpp", MAME_DIR .. "src/mame/includes/norautp.h", MAME_DIR .. "src/mame/audio/norautp.cpp", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index cfbf4e0667a..281601e4d5f 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -273,6 +273,7 @@ VIDEOS["DL1416"] = true VIDEOS["DM9368"] = true VIDEOS["EF9340_1"] = true VIDEOS["EF9345"] = true +VIDEOS["EF9364"] = true VIDEOS["EF9365"] = true VIDEOS["GF4500"] = true --VIDEOS+= EPIC12"] = true @@ -397,6 +398,7 @@ MACHINES["ER2055"] = true MACHINES["F3853"] = true MACHINES["HD63450"] = true MACHINES["HD64610"] = true +MACHINES["HP_TACO"] = true MACHINES["I2CMEM"] = true MACHINES["I80130"] = true MACHINES["I8089"] = true @@ -618,6 +620,7 @@ BUSES["ISA"] = true BUSES["ISBX"] = true BUSES["KC"] = true BUSES["LPCI"] = true +BUSES["M5"] = true BUSES["MACPDS"] = true BUSES["MIDI"] = true BUSES["MEGADRIVE"] = true @@ -1185,9 +1188,6 @@ files { createMESSProjects(_target, _subtarget, "apple") files { MAME_DIR .. "src/mame/drivers/apple1.cpp", - MAME_DIR .. "src/mame/includes/apple1.h", - MAME_DIR .. "src/mame/machine/apple1.cpp", - MAME_DIR .. "src/mame/video/apple1.cpp", MAME_DIR .. "src/mame/drivers/apple2.cpp", MAME_DIR .. "src/mame/includes/apple2.h", MAME_DIR .. "src/mame/drivers/apple2e.cpp", @@ -1636,6 +1636,8 @@ files { MAME_DIR .. "src/mame/machine/esqpanel.h", MAME_DIR .. "src/mame/machine/esqvfd.cpp", MAME_DIR .. "src/mame/machine/esqvfd.h", + MAME_DIR .. "src/mame/machine/esqlcd.cpp", + MAME_DIR .. "src/mame/machine/esqlcd.h", } createMESSProjects(_target, _subtarget, "enterprise") @@ -1701,6 +1703,7 @@ files { MAME_DIR .. "src/mame/drivers/fidelz80.cpp", MAME_DIR .. "src/mame/includes/fidelz80.h", MAME_DIR .. "src/mame/drivers/fidel6502.cpp", + MAME_DIR .. "src/mame/drivers/fidel68k.cpp", } createMESSProjects(_target, _subtarget, "force") @@ -2090,6 +2093,8 @@ files { MAME_DIR .. "src/mame/machine/pc9801_cbus.h", MAME_DIR .. "src/mame/machine/pc9801_kbd.cpp", MAME_DIR .. "src/mame/machine/pc9801_kbd.h", + MAME_DIR .. "src/mame/machine/pc9801_cd.cpp", + MAME_DIR .. "src/mame/machine/pc9801_cd.h", MAME_DIR .. "src/mame/drivers/tk80bs.cpp", MAME_DIR .. "src/mame/drivers/hh_ucom4.cpp", MAME_DIR .. "src/mame/includes/hh_ucom4.h", @@ -2767,6 +2772,7 @@ files { MAME_DIR .. "src/mame/includes/gamecom.h", MAME_DIR .. "src/mame/machine/gamecom.cpp", MAME_DIR .. "src/mame/video/gamecom.cpp", + MAME_DIR .. "src/mame/drivers/k28.cpp", } createMESSProjects(_target, _subtarget, "tigertel") @@ -3028,6 +3034,7 @@ files { MAME_DIR .. "src/mame/drivers/ampro.cpp", MAME_DIR .. "src/mame/drivers/amust.cpp", MAME_DIR .. "src/mame/drivers/applix.cpp", + MAME_DIR .. "src/mame/drivers/argox.cpp", MAME_DIR .. "src/mame/drivers/attache.cpp", MAME_DIR .. "src/mame/drivers/aussiebyte.cpp", MAME_DIR .. "src/mame/includes/aussiebyte.h", @@ -3082,6 +3089,7 @@ files { MAME_DIR .. "src/mame/audio/gamate.cpp", MAME_DIR .. "src/mame/drivers/gameking.cpp", MAME_DIR .. "src/mame/drivers/gimix.cpp", + MAME_DIR .. "src/mame/drivers/goupil.cpp", MAME_DIR .. "src/mame/drivers/grfd2301.cpp", MAME_DIR .. "src/mame/drivers/harriet.cpp", MAME_DIR .. "src/mame/drivers/hprot1.cpp", @@ -3125,6 +3133,7 @@ files { MAME_DIR .. "src/mame/drivers/mx2178.cpp", MAME_DIR .. "src/mame/drivers/mycom.cpp", MAME_DIR .. "src/mame/drivers/myvision.cpp", + MAME_DIR .. "src/mame/drivers/notetaker.cpp", MAME_DIR .. "src/mame/drivers/ngen.cpp", MAME_DIR .. "src/mame/machine/ngen_kb.cpp", MAME_DIR .. "src/mame/machine/ngen_kb.h", diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua index 7fad61ce928..137a873ae09 100644 --- a/docs/release/scripts/toolchain.lua +++ b/docs/release/scripts/toolchain.lua @@ -4,6 +4,11 @@ -- local naclToolchain = "" +local toolchainPrefix = "" + +if _OPTIONS['TOOLCHAIN'] then + toolchainPrefix = _OPTIONS["TOOLCHAIN"] +end newoption { trigger = "gcc", @@ -204,15 +209,18 @@ function toolchain(_buildDir, _subDir) if not os.getenv("MINGW32") then print("Set MINGW32 envrionment variable.") end - premake.gcc.cc = "$(MINGW32)/bin/i686-w64-mingw32-gcc" - premake.gcc.cxx = "$(MINGW32)/bin/i686-w64-mingw32-g++" + if not toolchainPrefix then + toolchainPrefix = "$(MINGW32)/bin/i686-w64-mingw32-" + end + premake.gcc.cc = toolchainPrefix .. "gcc" + premake.gcc.cxx = toolchainPrefix .. "g++" -- work around GCC 4.9.2 not having proper linker for LTO=1 usage local version_4_ar = str_to_version(_OPTIONS["gcc_version"]) if (version_4_ar < 50000) then - premake.gcc.ar = "$(MINGW32)/bin/ar" + premake.gcc.ar = toolchainPrefix .. "ar" end if (version_4_ar >= 50000) then - premake.gcc.ar = "$(MINGW32)/bin/gcc-ar" + premake.gcc.ar = toolchainPrefix .. "gcc-ar" end location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw32-gcc") end @@ -221,20 +229,22 @@ function toolchain(_buildDir, _subDir) if not os.getenv("MINGW64") then print("Set MINGW64 envrionment variable.") end - premake.gcc.cc = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc" - premake.gcc.cxx = "$(MINGW64)/bin/x86_64-w64-mingw32-g++" + if not toolchainPrefix then + toolchainPrefix = "$(MINGW64)/bin/x86_64-w64-mingw32-" + end + premake.gcc.cc = toolchainPrefix .. "gcc" + premake.gcc.cxx = toolchainPrefix .. "g++" -- work around GCC 4.9.2 not having proper linker for LTO=1 usage local version_4_ar = str_to_version(_OPTIONS["gcc_version"]) if (version_4_ar < 50000) then - premake.gcc.ar = "$(MINGW64)/bin/ar" + premake.gcc.ar = toolchainPrefix .. "ar" end if (version_4_ar >= 50000) then - premake.gcc.ar = "$(MINGW64)/bin/gcc-ar" + premake.gcc.ar = toolchainPrefix .. "gcc-ar" end location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw64-gcc") end - if "mingw-clang" == _OPTIONS["gcc"] then premake.gcc.cc = "clang" premake.gcc.cxx = "clang++" @@ -283,18 +293,17 @@ function toolchain(_buildDir, _subDir) if "osx" == _OPTIONS["gcc"] then if os.is("linux") then - local osxToolchain = "x86_64-apple-darwin13-" - premake.gcc.cc = osxToolchain .. "clang" - premake.gcc.cxx = osxToolchain .. "clang++" - premake.gcc.ar = osxToolchain .. "ar" + premake.gcc.cc = toolchainPrefix .. "clang" + premake.gcc.cxx = toolchainPrefix .. "clang++" + premake.gcc.ar = toolchainPrefix .. "ar" end location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx") end if "osx-clang" == _OPTIONS["gcc"] then - premake.gcc.cc = "clang" - premake.gcc.cxx = "clang++" - premake.gcc.ar = "ar" + premake.gcc.cc = toolchainPrefix .. "clang" + premake.gcc.cxx = toolchainPrefix .. "clang++" + premake.gcc.ar = toolchainPrefix .. "ar" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang") end @@ -496,7 +505,9 @@ function toolchain(_buildDir, _subDir) configuration { "steamlink" } objdir ( _buildDir .. "steamlink/obj") - + defines { + "__STEAMLINK__=1", -- There is no special prefedined compiler symbol to detect SteamLink, faking it. + } buildoptions { "-marm", "-mfloat-abi=hard", @@ -909,6 +920,15 @@ function toolchain(_buildDir, _subDir) end function strip() + if _OPTIONS["STRIP_SYMBOLS"]~="1" then + return true + end + + configuration { "osx-*", "Release" } + postbuildcommands { + "$(SILENT) echo Stripping symbols.", + "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix) .. "strip \"$(TARGET)\"", + } configuration { "android-arm", "Release" } postbuildcommands { @@ -937,13 +957,12 @@ function strip() configuration { "mingw*", "x64", "Release" } postbuildcommands { "$(SILENT) echo Stripping symbols.", - "$(SILENT) $(MINGW64)/bin/strip -s \"$(TARGET)\"", + "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix or "$(MINGW64)/bin/") .. "strip -s \"$(TARGET)\"", } - configuration { "mingw*", "x32", "Release" } postbuildcommands { "$(SILENT) echo Stripping symbols.", - "$(SILENT) $(MINGW32)/bin/strip -s \"$(TARGET)\"" + "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix or "$(MINGW32)/bin/") .. "strip -s \"$(TARGET)\"", } configuration { "pnacl" } diff --git a/docs/release/src/devices/cpu/m68000/m68kcpu.cpp b/docs/release/src/devices/cpu/m68000/m68kcpu.cpp index 02b3fd9ab6e..7eef2aa28cb 100644 --- a/docs/release/src/devices/cpu/m68000/m68kcpu.cpp +++ b/docs/release/src/devices/cpu/m68000/m68kcpu.cpp @@ -1385,7 +1385,7 @@ UINT16 m68000_base_device::readword_d32_mmu(offs_t address) UINT32 address0 = pmmu_translate_addr(this, address); if (mmu_tmp_buserror_occurred) { return ~0; - } else if (!(address & 1)) { + } else if (WORD_ALIGNED(address)) { return m_space->read_word(address0); } else { UINT32 address1 = pmmu_translate_addr(this, address + 1); @@ -1398,7 +1398,7 @@ UINT16 m68000_base_device::readword_d32_mmu(offs_t address) } } - if (!(address & 1)) + if (WORD_ALIGNED(address)) return m_space->read_word(address); result = m_space->read_byte(address) << 8; return result | m_space->read_byte(address + 1); @@ -1412,7 +1412,7 @@ void m68000_base_device::writeword_d32_mmu(offs_t address, UINT16 data) UINT32 address0 = pmmu_translate_addr(this, address); if (mmu_tmp_buserror_occurred) { return; - } else if (!(address & 1)) { + } else if (WORD_ALIGNED(address)) { m_space->write_word(address0, data); return; } else { @@ -1427,7 +1427,7 @@ void m68000_base_device::writeword_d32_mmu(offs_t address, UINT16 data) } } - if (!(address & 1)) + if (WORD_ALIGNED(address)) { m_space->write_word(address, data); return; @@ -1449,13 +1449,13 @@ UINT32 m68000_base_device::readlong_d32_mmu(offs_t address) } else if ((address +3) & 0xfc) { // not at page boundary; use default code address = address0; - } else if (!(address & 3)) { // 0 + } else if (DWORD_ALIGNED(address)) { // 0 return m_space->read_dword(address0); } else { UINT32 address2 = pmmu_translate_addr(this, address+2); if (mmu_tmp_buserror_occurred) { return ~0; - } else if (!(address & 1)) { // 2 + } else if (WORD_ALIGNED(address)) { // 2 result = m_space->read_word(address0) << 16; return result | m_space->read_word(address2); } else { @@ -1472,9 +1472,9 @@ UINT32 m68000_base_device::readlong_d32_mmu(offs_t address) } } - if (!(address & 3)) + if (DWORD_ALIGNED(address)) return m_space->read_dword(address); - else if (!(address & 1)) + else if (WORD_ALIGNED(address)) { result = m_space->read_word(address) << 16; return result | m_space->read_word(address + 2); @@ -1495,14 +1495,14 @@ void m68000_base_device::writelong_d32_mmu(offs_t address, UINT32 data) } else if ((address +3) & 0xfc) { // not at page boundary; use default code address = address0; - } else if (!(address & 3)) { // 0 + } else if (DWORD_ALIGNED(address)) { // 0 m_space->write_dword(address0, data); return; } else { UINT32 address2 = pmmu_translate_addr(this, address+2); if (mmu_tmp_buserror_occurred) { return; - } else if (!(address & 1)) { // 2 + } else if (WORD_ALIGNED(address)) { // 2 m_space->write_word(address0, data >> 16); m_space->write_word(address2, data); return; @@ -1521,12 +1521,12 @@ void m68000_base_device::writelong_d32_mmu(offs_t address, UINT32 data) } } - if (!(address & 3)) + if (DWORD_ALIGNED(address)) { m_space->write_dword(address, data); return; } - else if (!(address & 1)) + else if (WORD_ALIGNED(address)) { m_space->write_word(address, data >> 16); m_space->write_word(address + 2, data); @@ -1596,7 +1596,7 @@ UINT16 m68000_base_device::readword_d32_hmmu(offs_t address) address = hmmu_translate_addr(this, address); } - if (!(address & 1)) + if (WORD_ALIGNED(address)) return m_space->read_word(address); result = m_space->read_byte(address) << 8; return result | m_space->read_byte(address + 1); @@ -1610,7 +1610,7 @@ void m68000_base_device::writeword_d32_hmmu(offs_t address, UINT16 data) address = hmmu_translate_addr(this, address); } - if (!(address & 1)) + if (WORD_ALIGNED(address)) { m_space->write_word(address, data); return; @@ -1629,9 +1629,9 @@ UINT32 m68000_base_device::readlong_d32_hmmu(offs_t address) address = hmmu_translate_addr(this, address); } - if (!(address & 3)) + if (DWORD_ALIGNED(address)) return m_space->read_dword(address); - else if (!(address & 1)) + else if (WORD_ALIGNED(address)) { result = m_space->read_word(address) << 16; return result | m_space->read_word(address + 2); @@ -1649,12 +1649,12 @@ void m68000_base_device::writelong_d32_hmmu(offs_t address, UINT32 data) address = hmmu_translate_addr(this, address); } - if (!(address & 3)) + if (DWORD_ALIGNED(address)) { m_space->write_dword(address, data); return; } - else if (!(address & 1)) + else if (WORD_ALIGNED(address)) { m_space->write_word(address, data >> 16); m_space->write_word(address + 2, data); diff --git a/docs/release/src/emu/video.cpp b/docs/release/src/emu/video.cpp index 97d71d6fe83..0aae44e8fb6 100644 --- a/docs/release/src/emu/video.cpp +++ b/docs/release/src/emu/video.cpp @@ -108,7 +108,13 @@ video_manager::video_manager(running_machine &machine) m_avi_frame_period(attotime::zero), m_avi_next_frame_time(attotime::zero), m_avi_frame(0), - m_dummy_recording(false) + m_dummy_recording(false), + m_timecode_enabled(false), + m_timecode_write(false), + m_timecode_text(""), + m_timecode_start(attotime::zero), + m_timecode_total(attotime::zero) + { // request a callback upon exiting machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(video_manager::exit), this)); @@ -362,6 +368,63 @@ void video_manager::save_active_screen_snapshots() //------------------------------------------------- +// save_input_timecode - add a line of current +// timestamp to inp.timecode file +//------------------------------------------------- + +void video_manager::save_input_timecode() +{ + // if record timecode input is not active, do nothing + if (!m_timecode_enabled) { + return; + } + m_timecode_write = true; +} + +std::string &video_manager::timecode_text(std::string &str) { + str.clear(); + str += " "; + + if (!m_timecode_text.empty()) { + str += m_timecode_text + " "; + } + + attotime elapsed_time = machine().time() - m_timecode_start; + std::string elapsed_time_str; + strcatprintf(elapsed_time_str, "%02d:%02d", + (elapsed_time.m_seconds / 60) % 60, + elapsed_time.m_seconds % 60); + str += elapsed_time_str; + + bool paused = machine().paused(); + if (paused) { + str.append(" [paused]"); + } + + str += " "; + + return str; +} + +std::string &video_manager::timecode_total_text(std::string &str) { + str.clear(); + str += " TOTAL "; + + attotime elapsed_time = m_timecode_total; + if (machine().ui().show_timecode_counter()) { + elapsed_time += machine().time() - m_timecode_start; + } + std::string elapsed_time_str; + strcatprintf(elapsed_time_str, "%02d:%02d", + (elapsed_time.m_seconds / 60) % 60, + elapsed_time.m_seconds % 60); + str += elapsed_time_str + " "; + return str; +} + + + +//------------------------------------------------- // begin_recording - begin recording of a movie //------------------------------------------------- @@ -584,7 +647,7 @@ void video_manager::postload() // forward //------------------------------------------------- -inline int video_manager::effective_autoframeskip() const +inline bool video_manager::effective_autoframeskip() const { // if we're fast forwarding or paused, autoframeskip is disabled if (m_fastforward || machine().paused()) @@ -621,7 +684,7 @@ inline int video_manager::effective_frameskip() const inline bool video_manager::effective_throttle() const { // if we're paused, or if the UI is active, we always throttle - if (machine().paused() || machine().ui().is_menu_active()) + if (machine().paused()) //|| machine().ui().is_menu_active()) return true; // if we're fast forwarding, we don't throttle diff --git a/docs/release/src/emu/video.h b/docs/release/src/emu/video.h index 7f8477740d2..c5999744971 100644 --- a/docs/release/src/emu/video.h +++ b/docs/release/src/emu/video.h @@ -77,6 +77,7 @@ public: // misc void toggle_throttle(); void toggle_record_movie(); + file_error open_next(emu_file &file, const char *extension); // render a frame void frame_update(bool debug = false); @@ -88,12 +89,24 @@ public: // snapshots void save_snapshot(screen_device *screen, emu_file &file); void save_active_screen_snapshots(); + void save_input_timecode(); // movies void begin_recording(const char *name, movie_format format); void end_recording(movie_format format); void add_sound_to_recording(const INT16 *sound, int numsamples); + void set_timecode_enabled(bool value) { m_timecode_enabled = value; } + bool get_timecode_enabled() { return m_timecode_enabled; } + bool get_timecode_write() { return m_timecode_write; } + void set_timecode_write(bool value) { m_timecode_write = value; } + void set_timecode_text(std::string &str) { m_timecode_text = str; } + void set_timecode_start(attotime time) { m_timecode_start = time; } + void add_to_total_time(attotime time) { m_timecode_total += time; } + std::string &timecode_text(std::string &str); + std::string &timecode_total_text(std::string &str); + + private: // internal helpers void exit(); @@ -101,7 +114,7 @@ private: void postload(); // effective value helpers - int effective_autoframeskip() const; + bool effective_autoframeskip() const; int effective_frameskip() const; bool effective_throttle() const; @@ -116,7 +129,6 @@ private: // snapshot/movie helpers void create_snapshot_bitmap(screen_device *screen); - file_error open_next(emu_file &file, const char *extension); void record_frame(); // internal state @@ -185,6 +197,13 @@ private: static const attoseconds_t ATTOSECONDS_PER_SPEED_UPDATE = ATTOSECONDS_PER_SECOND / 4; static const int PAUSED_REFRESH_RATE = 30; + + bool m_timecode_enabled; // inp.timecode record enabled + bool m_timecode_write; // Show/hide timer at right (partial time) + std::string m_timecode_text; // Message for that video part (intro, gameplay, extra) + attotime m_timecode_start; // Starting timer for that video part (intro, gameplay, extra) + attotime m_timecode_total; // Show/hide timer at left (total elapsed on resulting video preview) + }; #endif /* __VIDEO_H__ */ diff --git a/docs/release/src/hbmame/drivers/cps1mis.cpp b/docs/release/src/hbmame/drivers/cps1mis.cpp index ab72d1f7f63..91d00fd70d9 100644 --- a/docs/release/src/hbmame/drivers/cps1mis.cpp +++ b/docs/release/src/hbmame/drivers/cps1mis.cpp @@ -3280,6 +3280,32 @@ ROM_START( wofchdx1 ) ROM_LOAD( "tk2-q4.4k", 0x180000, 0x80000, CRC(36642e88) SHA1(8ab25b19e2b67215a5cb1f3aa81b9d26009cfeb8) ) ROM_END +ROM_START( wofchdx2 ) + ROM_REGION( CODE_SIZE, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "wofchdx2.23", 0x000000, 0x80000, CRC(29389b7d) SHA1(ccc4a7c4cb43abe9e8f9fd0d1a813f722473784f) ) + ROM_LOAD16_WORD_SWAP( "wofchdx2.22", 0x080000, 0x80000, CRC(a959df0c) SHA1(ec6d9f1f9363dee08ea267fab28d313e0b46d3da) ) + + ROM_REGION( 0x400000, "gfx", 0 ) + ROMX_LOAD( "tk2-1m.3a", 0x000000, 0x80000, CRC(0d9cb9bf) SHA1(cc7140e9a01a14b252cb1090bcea32b0de461928) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "tk2-3m.5a", 0x000002, 0x80000, CRC(45227027) SHA1(b21afc593f0d4d8909dfa621d659cbb40507d1b2) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "tk2-2m.4a", 0x000004, 0x80000, CRC(c5ca2460) SHA1(cbe14867f7b94b638ca80db7c8e0c60881183469) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "tk2-4m.6a", 0x000006, 0x80000, CRC(e349551c) SHA1(1d977bdf256accf750ad9930ec4a0a19bbf86964) , ROM_GROUPWORD | ROM_SKIP(6) ) + ROMX_LOAD( "tk2(ch)_05.7a", 0x200000, 0x80000, CRC(e4a44d53) SHA1(b747679f4d63e5e62d9fd81b3120fba0401fadfb) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_05.7a + ROMX_LOAD( "tk2(ch)_06.8a", 0x200002, 0x80000, CRC(58066ba8) SHA1(c93af968e21094d020e4b2002e0c6fc0d746af0b) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_06.8a + ROMX_LOAD( "tk2(ch)_07.9a", 0x200004, 0x80000, CRC(cc9006c9) SHA1(cfcbec3a67052268a7739538aa28a6391fe5400e) , ROM_GROUPWORD | ROM_SKIP(6) ) /* 1 byte different from wofj, pcb verified */ + ROMX_LOAD( "tk2(ch)_08.10a", 0x200006, 0x80000, CRC(d4a19a02) SHA1(ff396b1d33d9b4842140f2c6d085fe05748e3244) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_08.10a + + ROM_REGION( 0x28000, "audiocpu", 0 ) /* QSound Z80 code */ + ROM_LOAD( "tk2_qa.5k", 0x00000, 0x08000, CRC(c9183a0d) SHA1(d8b1d41c572f08581f8ab9eb878de77d6ea8615d) ) + ROM_CONTINUE( 0x10000, 0x18000 ) + + ROM_REGION( 0x200000, "qsound", 0 ) /* QSound samples */ + ROM_LOAD( "tk2-q1.1k", 0x000000, 0x80000, CRC(611268cf) SHA1(83ab059f2110fb25fdcff928d56b790fc1f5c975) ) + ROM_LOAD( "tk2-q2.2k", 0x080000, 0x80000, CRC(20f55ca9) SHA1(90134e9a9c4749bb65c728b66ea4dac1fd4d88a4) ) + ROM_LOAD( "tk2-q3.3k", 0x100000, 0x80000, CRC(bfcf6f52) SHA1(2a85ff3fc89b4cbabd20779ec12da2e116333c7c) ) + ROM_LOAD( "tk2-q4.4k", 0x180000, 0x80000, CRC(36642e88) SHA1(8ab25b19e2b67215a5cb1f3aa81b9d26009cfeb8) ) +ROM_END + ROM_START( woffr ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "tk2e_23bfr.rom", 0x000000, 0x80000, CRC(e006e81e) SHA1(dad6cd3a1175b6f366e8bf02d1af35af5f1b50cc) ) @@ -3752,7 +3778,8 @@ GAME( 1995, sk2h35, wof, sk2h35, wof, cps_state, sk2h35, RO GAME( 1992, wofb, wof, qsound, wof, cps_state, wofb, ROT0, "bootleg", "Warriors of Fate (ETC 921002) (bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 1994, wofch_v3, wofch, qsound, wofch, cps_state, wof, ROT0, "Capcom", "Tenchi wo Kurau II: Sekiheki no Tatakai (CPS Changer, Japan 921031) (Set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 2010, wofchdx, wofch, qsound, wofch, cps_state, wof, ROT0, "hack", "Sangokushi 3 Gaiden Kakou-on's Revenge DX (red)", MACHINE_SUPPORTS_SAVE ) -GAME( 2010, wofchdx1, wofch, qsound, wofch, cps_state, wof, ROT0, "hack", "Sangokushi 3 Gaiden Kakou-on's Revenge DX (green)", MACHINE_SUPPORTS_SAVE ) +GAME( 2010, wofchdx1, wofch, qsound, wofch, cps_state, wof, ROT0, "hack", "Sangokushi 3 Gaiden Kakou-on's Revenge DX (green set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 2010, wofchdx2, wofch, qsound, wofch, cps_state, wof, ROT0, "hack", "Sangokushi 3 Gaiden Kakou-on's Revenge DX (green set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1992, wofjcn, wof, qsound, wof, cps_state, wof, ROT0, "Capcom", "Tenchi wo Kurau II (Japan 921031) (Chinese)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1992, woffr, wof, qsound, wof, cps_state, wof, ROT0, "Arkatrad", "Warriors of Fate (France 030728)", MACHINE_SUPPORTS_SAVE ) GAME( 1992, wofjh, wof, qsound, wof, cps_state, wof, ROT0, "hack", "Tenchi wo Kurau II (Japan 921031) (Hack set 1)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/gauntlet.cpp b/docs/release/src/hbmame/drivers/gauntlet.cpp index fb3d3524324..477f38ef311 100644 --- a/docs/release/src/hbmame/drivers/gauntlet.cpp +++ b/docs/release/src/hbmame/drivers/gauntlet.cpp @@ -2,8 +2,12 @@ // copyright-holders:Robbbert #include "../mame/drivers/gauntlet.cpp" + +// There's some unknown hacks here. Need info on who the author is, and what the difference is. + + ROM_START( gaunt2s ) - ROM_REGION( 0x80000, "maincpu", 0 ) /* 8*64k for 68000 code */ + ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD16_BYTE( "136037-1307.9a", 0x000000, 0x008000, CRC(46fe8743) SHA1(d5fa19e028a2f43658330c67c10e0c811d332780) ) ROM_LOAD16_BYTE( "136037-1308.9b", 0x000001, 0x008000, CRC(276e15c4) SHA1(7467b2ec21b1b4fcc18ff9387ce891495f4b064c) ) ROM_LOAD16_BYTE( "136043-1105.10a", 0x038000, 0x004000, CRC(45dfda47) SHA1(a9a03150f5a0ad6ce62c5cfdffb4a9f54340590c) ) @@ -13,7 +17,7 @@ ROM_START( gaunt2s ) ROM_LOAD16_BYTE( "136043-1121.6a", 0x050000, 0x008000, CRC(ae301bba) SHA1(3d93236aaffe6ef692e5073b1828633e8abf0ce4) ) ROM_LOAD16_BYTE( "136043-1122.6b", 0x050001, 0x008000, CRC(e94aaa8a) SHA1(378c582c360440b808820bcd3be78ec6e8800c34) ) - ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for 6502 code */ + ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) @@ -45,7 +49,7 @@ ROM_START( gaunt2s ) ROM_END ROM_START( gaunt2ls ) - ROM_REGION( 0x80000, "maincpu", 0 ) /* 8*64k for 68000 code */ + ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD16_BYTE( "136037-1307.9a", 0x000000, 0x008000, CRC(46fe8743) SHA1(d5fa19e028a2f43658330c67c10e0c811d332780) ) ROM_LOAD16_BYTE( "136037-1308.9b", 0x000001, 0x008000, CRC(276e15c4) SHA1(7467b2ec21b1b4fcc18ff9387ce891495f4b064c) ) ROM_LOAD16_BYTE( "136043-1105ls.10a", 0x038000, 0x004000, CRC(5426ab98) SHA1(7894b0ca989428819a9ed3e9a218eb466c167ecf) ) @@ -55,7 +59,7 @@ ROM_START( gaunt2ls ) ROM_LOAD16_BYTE( "136043-1121.6a", 0x050000, 0x008000, CRC(ae301bba) SHA1(3d93236aaffe6ef692e5073b1828633e8abf0ce4) ) ROM_LOAD16_BYTE( "136043-1122.6b", 0x050001, 0x008000, CRC(e94aaa8a) SHA1(378c582c360440b808820bcd3be78ec6e8800c34) ) - ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for 6502 code */ + ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) @@ -86,6 +90,50 @@ ROM_START( gaunt2ls ) ROM_LOAD( "74s287-136037-103.4r", 0x400, 0x100, CRC(6c5ccf08) SHA1(ff5dbadd85aa2e07b383a302fa399e875db8f84f) ) /* MO position/size */ ROM_END +ROM_START( gaunt2f ) + ROM_REGION( 0x80000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "136037-1307.9a", 0x000000, 0x008000, CRC(46fe8743) SHA1(d5fa19e028a2f43658330c67c10e0c811d332780) ) + ROM_LOAD16_BYTE( "136037-1308.9b", 0x000001, 0x008000, CRC(276e15c4) SHA1(7467b2ec21b1b4fcc18ff9387ce891495f4b064c) ) + ROM_LOAD16_BYTE( "136043-1105.10a", 0x038000, 0x004000, CRC(45dfda47) SHA1(a9a03150f5a0ad6ce62c5cfdffb4a9f54340590c) ) + ROM_LOAD16_BYTE( "136043-1106.10b", 0x038001, 0x004000, CRC(343c029c) SHA1(d2df4e5b036500dcc537a1e0025abb2a8c730bdd) ) + ROM_LOAD16_BYTE( "136043-1109.7a", 0x040000, 0x008000, CRC(58a0a9a3) SHA1(7f51184840e3c96574836b8a00bfb4a7a5f508d0) ) + ROM_LOAD16_BYTE( "136043-1110.7b", 0x040001, 0x008000, CRC(658f0da8) SHA1(dfce027ea50188659907be698aeb26f9d8bfab23) ) + ROM_LOAD16_BYTE( "136043-1121.6a", 0x050000, 0x008000, CRC(ae301bba) SHA1(3d93236aaffe6ef692e5073b1828633e8abf0ce4) ) + ROM_LOAD16_BYTE( "136043-1122.6b", 0x050001, 0x008000, CRC(e94aaa8a) SHA1(378c582c360440b808820bcd3be78ec6e8800c34) ) + + ROM_REGION( 0x10000, "audiocpu", 0 ) + ROM_LOAD( "136043-1120.16r", 0x004000, 0x004000, CRC(5c731006) SHA1(045ad571db34ef870b1bf003e77eea403204f55b) ) + ROM_LOAD( "136043-1119.16s", 0x008000, 0x008000, CRC(dc3591e7) SHA1(6d0d8493609974bd5a63be858b045fe4db35d8df) ) + + ROM_REGION( 0x04000, "gfx1", 0 ) + ROM_LOAD( "gaunt2f.6p", 0x000000, 0x004000, CRC(d101905d) SHA1(6f50a84f4d263a7a459b642fa49a619e877535b6) ) + + ROM_REGION( 0x60000, "gfx2", ROMREGION_INVERT ) + ROM_LOAD( "136043-1111.1a", 0x000000, 0x008000, CRC(09df6e23) SHA1(726984275c6a338c12ec0c4cc449f92f4a7a138c) ) + ROM_LOAD( "136037-112.1b", 0x008000, 0x008000, CRC(869330be) SHA1(5dfaaf54ee2b3c0eaf35e8c17558313db9791616) ) + ROM_LOAD( "136043-1123.1c", 0x010000, 0x004000, CRC(e4c98f01) SHA1(a24bece3196d13c38e4acdbf62783860253ba67d) ) + ROM_RELOAD( 0x014000, 0x004000 ) + ROM_LOAD( "136043-1113.1l", 0x018000, 0x008000, CRC(33cb476e) SHA1(e0757ee0120de2d38be44f8dc8702972c35b87b3) ) + ROM_LOAD( "136037-114.1mn", 0x020000, 0x008000, CRC(29ef9882) SHA1(91e1465af6505b35cd97434c13d2b4d40a085946) ) + ROM_LOAD( "136043-1124.1p", 0x028000, 0x004000, CRC(c4857879) SHA1(3b4ce96da0d178b4bc2d05b5b51b42c7ec461113) ) + ROM_RELOAD( 0x02c000, 0x004000 ) + ROM_LOAD( "136043-1115.2a", 0x030000, 0x008000, CRC(f71e2503) SHA1(244e108668eaef6b64c6ff733b08b9ee6b7a2d2b) ) + ROM_LOAD( "136037-116.2b", 0x038000, 0x008000, CRC(11e0ac5b) SHA1(729b7561d59d94ef33874a134b97bcd37573dfa6) ) + ROM_LOAD( "136043-1125.2c", 0x040000, 0x004000, CRC(d9c2c2d1) SHA1(185e38c75c06b6ca131a17ee3a46098279bfe17e) ) + ROM_RELOAD( 0x044000, 0x004000 ) + ROM_LOAD( "136043-1117.2l", 0x048000, 0x008000, CRC(9e30b2e9) SHA1(e9b513089eaf3bec269058b437fefe7075a3fd6f) ) + ROM_LOAD( "136037-118.2mn", 0x050000, 0x008000, CRC(8bf3b263) SHA1(683d900ab7591ee661218be2406fb375a12e435c) ) + ROM_LOAD( "136043-1126.2p", 0x058000, 0x004000, CRC(a32c732a) SHA1(abe801dff7bb3f2712e2189c2b91f172d941fccd) ) + ROM_RELOAD( 0x05c000, 0x004000 ) + + ROM_REGION( 0x500, "proms", 0 ) + ROM_LOAD( "74s472-136037-101.7u", 0x000, 0x200, CRC(2964f76f) SHA1(da966c35557ec1b95e1c39cd950c38a19bce2d67) ) /* MO timing */ + ROM_LOAD( "74s472-136037-102.5l", 0x200, 0x200, CRC(4d4fec6c) SHA1(3541b5c6405ad5742a3121dfd6acb227933de25a) ) /* MO flip control */ + ROM_LOAD( "gaunt2f.4r", 0x400, 0x100, CRC(32ae1fa9) SHA1(09eb56a0798456d73015909973ce2ba9660c1164) ) /* MO position/size */ +ROM_END + + -GAME( 1987, gaunt2s, gaunt2, gauntlet, gauntlet, gauntlet_state, gauntlet2, ROT0, "Todd Bordelon", "Gauntlet II Speed Hack", MACHINE_SUPPORTS_SAVE ) // http://www.ionpool.net/arcade/gauntlet/hacks.html -GAME( 1988, gaunt2ls, gaunt2, gauntlet, gauntlet, gauntlet_state, gauntlet2, ROT0, "Orange Elf", "Gauntlet II New Levels", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, gaunt2s, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Todd Bordelon", "Gauntlet II Speed Hack", MACHINE_SUPPORTS_SAVE ) // http://www.ionpool.net/arcade/gauntlet/hacks.html +GAME( 1988, gaunt2ls, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Orange Elf", "Gauntlet II New Levels", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, gaunt2f, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "hack", "Gauntlet II (graphics hack)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/kof2002.cpp b/docs/release/src/hbmame/drivers/kof2002.cpp index 75596c1bd16..8be202e34fe 100644 --- a/docs/release/src/hbmame/drivers/kof2002.cpp +++ b/docs/release/src/hbmame/drivers/kof2002.cpp @@ -52,6 +52,12 @@ DRIVER_INIT_MEMBER( neogeo_hbmame, kof2k2h ) m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, KOF2002_GFX_KEY); } +DRIVER_INIT_MEMBER( neogeo_hbmame, kof2k2lb ) +{ + DRIVER_INIT_CALL(neogeo); + m_cmc_prot->neogeo_sfix_decrypt(spr_region, spr_region_size, fix_region, fix_region_size); +} + DRIVER_INIT_MEMBER( neogeo_hbmame, kof2k2ps2a ) { DRIVER_INIT_CALL(neogeo); @@ -109,6 +115,32 @@ ROM_START( kof2002x ) ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END +ROM_START( kof2k2ath ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265ath.p1", 0x000000, 0x100000, CRC(5bb7eedb) SHA1(5d2566ae008c34e91799e1cd5c771be6e4de02df) ) + ROM_LOAD16_WORD_SWAP( "265ath.p2", 0x100000, 0x400000, CRC(4ecfc414) SHA1(e8b991f35d850e88f2f360438ba72748129342c9) ) + + NEO_SFIX_128K( "265ath.s1", CRC(df4ce33b) SHA1(1287c84c16e17df7d5887af57fc6657da452d0ae) ) + + NEO_BIOS_AUDIO_128K( "kf10-m1.bin", CRC(f6fab859) SHA1(0184aa1394b9f9946d610278b53b846020dd88dc) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + ROM_START( kof2k2b ) /* The King of Fighters 2002 - Hack by Alphax2? - (Can choose Kusanagi and Rugal) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265b.p1", 0x000000, 0x100000, CRC(f03a9769) SHA1(558eaf60244b7b01588dc773a31d5e3f3ffdbb29) ) @@ -177,7 +209,7 @@ ROM_START( kof2k2bd ) ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) - ROM_LOAD16_BYTE( "265bd.c4", 0x1000001, 0x800000, CRC(2558972F) SHA1(2E0627FC5D689BF64FE36F02A489408D103C4499) ) + ROM_LOAD16_BYTE( "265rm13.c4", 0x1000001, 0x800000, CRC(2558972F) SHA1(2E0627FC5D689BF64FE36F02A489408D103C4499) ) ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) @@ -275,7 +307,33 @@ ROM_START( kof2k2bld ) ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) - ROM_LOAD16_BYTE( "265bd.c4", 0x1000001, 0x800000, CRC(2558972F) SHA1(2E0627FC5D689BF64FE36F02A489408D103C4499) ) + ROM_LOAD16_BYTE( "265rm13.c4", 0x1000001, 0x800000, CRC(2558972F) SHA1(2E0627FC5D689BF64FE36F02A489408D103C4499) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + +ROM_START( kof2k2blood2 ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265blood2.p1", 0x000000, 0x100000, CRC(9573364c) SHA1(1fcb64aa30ef3ee3519ca7b77318f6f87ea24c82) ) + ROM_LOAD16_WORD_SWAP( "265blood2.p2", 0x100000, 0x400000, CRC(670a8b89) SHA1(090f80381cf5a02fc1eed25a781388e246d2fa10) ) + + NEO_SFIX_128K( "265blood2.s1", CRC(59bda320) SHA1(0d8846ad307d1ca778bdcc89c16efe766266f1b7) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) @@ -354,10 +412,60 @@ ROM_START( kof2k2br2 ) /* KOF 2002 Portuguese */ ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END -ROM_START( kof2k2cfc ) /* The King of Fighters 2002 - Fix by C6F8 - (Character colour change release 4 built 20031017) */ +ROM_START( kof2k2bs ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265bs.p1", 0x000000, 0x100000, CRC(d9ccb672) SHA1(9d24c9d27120c379e0ec9d3717a4bb40be2f7027) ) + ROM_LOAD16_WORD_SWAP( "265bs.p2", 0x100000, 0x400000, CRC(96c45626) SHA1(57f58de4051b73848cb6622e223777030e4ef954) ) + + NEO_SFIX_128K( "265evo.s1", CRC(E0EAABA3) SHA1(831b642da9fe7617498cdb1c86475b3b3d3043bc) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265rs.c1", 0x0000000, 0x800000, CRC(c1a21b4c) SHA1(235938175d6011c5c8a37fc94f8fb604132d8038) ) + ROM_LOAD16_BYTE( "265rs.c2", 0x0000001, 0x800000, CRC(9b3d7e8d) SHA1(38c16541862636934a456f23632f64ff0f5ae617) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + +ROM_START( kof2k2c2 ) // hack of kof2k2or + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265or.p1", 0x000000, 0x100000, CRC(eb84d68f) SHA1(8dccf250cf04e129529793abcc655f5fc7fb6629) ) + ROM_LOAD16_WORD_SWAP( "265c2.p2", 0x100000, 0x400000, CRC(5b307583) SHA1(283dffc62c279e7b237da3a30a15e06cccda7a80) ) + + NEO_SFIX_128K( "265kc2.s1", CRC(67e7cbe1) SHA1(3582c2073f04e71a6d5a34145727d148a11ab375) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) + ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265rm13.c4", 0x1000001, 0x800000, CRC(2558972F) SHA1(2e0627fc5d689bf64fe36f02a489408d103c4499) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265or.c7", 0x3000000, 0x800000, CRC(201e75e0) SHA1(7805d7a753df4d97bd73e05f22f31fe6440eaf6c) ) + ROM_LOAD16_BYTE( "265or.c8", 0x3000001, 0x800000, CRC(ff0fd53b) SHA1(68289ab3f808b9c067a948948f48d5a3f1787e6c) ) +ROM_END + +ROM_START( kof2k2cf1 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco) - Colour fix by C6F8 - (Character colour change for Iori p3 and p4) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265-p1.p1", 0x000000, 0x100000, CRC(9ede7323) SHA1(ad9d45498777fda9fa58e75781f48e09aee705a6) ) - ROM_LOAD16_WORD_SWAP( "265cfc.p2", 0x100000, 0x400000, CRC(e22d4ab6) SHA1(7ebab455645c428819d208d66b7b630c58d8f172) ) + ROM_LOAD16_WORD_SWAP( "265cf1.p2", 0x100000, 0x400000, CRC(7df52bd4) SHA1(37dddfca361012c8e04ad6fa45e8a56d80aa5f31) ) NEO_SFIX_MT_128K @@ -378,10 +486,10 @@ ROM_START( kof2k2cfc ) /* The King of Fighters 2002 - Fix by C6F8 - (Character c ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END -ROM_START( kof2k2cf1 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco) - Colour fix by C6F8 - (Character colour change for Iori p3 and p4) */ +ROM_START( kof2k2cf2 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco2) - Colour fix by C6F8 - (Character colour change - release 2 built 20030827) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265-p1.p1", 0x000000, 0x100000, CRC(9ede7323) SHA1(ad9d45498777fda9fa58e75781f48e09aee705a6) ) - ROM_LOAD16_WORD_SWAP( "265cf1.p2", 0x100000, 0x400000, CRC(7df52bd4) SHA1(37dddfca361012c8e04ad6fa45e8a56d80aa5f31) ) + ROM_LOAD16_WORD_SWAP( "265cf2.p2", 0x100000, 0x400000, CRC(f65d9dd1) SHA1(81ca014633385bc1e4e13b962b8aa35b246f63a7) ) NEO_SFIX_MT_128K @@ -402,10 +510,10 @@ ROM_START( kof2k2cf1 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco) - Colou ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END -ROM_START( kof2k2cf2 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco2) - Colour fix by C6F8 - (Character colour change - release 2 built 20030827) */ +ROM_START( kof2k2cf3 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco3) - Colour fix by C6F8 - (Character colour change - release 3 built 20030831) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265-p1.p1", 0x000000, 0x100000, CRC(9ede7323) SHA1(ad9d45498777fda9fa58e75781f48e09aee705a6) ) - ROM_LOAD16_WORD_SWAP( "265cf2.p2", 0x100000, 0x400000, CRC(f65d9dd1) SHA1(81ca014633385bc1e4e13b962b8aa35b246f63a7) ) + ROM_LOAD16_WORD_SWAP( "265cf3.p2", 0x100000, 0x400000, CRC(9b2be0af) SHA1(069ab514aceda7ba43c9557afef9320b84b7eb25) ) NEO_SFIX_MT_128K @@ -426,10 +534,10 @@ ROM_START( kof2k2cf2 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco2) - Colo ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END -ROM_START( kof2k2cf3 ) /* [OLD] The King of Fighters 2002 - (kof2k2cfco3) - Colour fix by C6F8 - (Character colour change - release 3 built 20030831) */ +ROM_START( kof2k2cfc ) /* The King of Fighters 2002 - Fix by C6F8 - (Character colour change release 4 built 20031017) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265-p1.p1", 0x000000, 0x100000, CRC(9ede7323) SHA1(ad9d45498777fda9fa58e75781f48e09aee705a6) ) - ROM_LOAD16_WORD_SWAP( "265cf3.p2", 0x100000, 0x400000, CRC(9b2be0af) SHA1(069ab514aceda7ba43c9557afef9320b84b7eb25) ) + ROM_LOAD16_WORD_SWAP( "265cfc.p2", 0x100000, 0x400000, CRC(e22d4ab6) SHA1(7ebab455645c428819d208d66b7b630c58d8f172) ) NEO_SFIX_MT_128K @@ -546,6 +654,56 @@ ROM_START( kof2k2cl3 ) /* [OLD] The King of Fighters 2002 - (kof2k2chl3) - Revis ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END +ROM_START( kof2k2cn ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265cn.p1", 0x000000, 0x100000, CRC(07de031f) SHA1(6d2c6caea4d94388da597e89cde61ed6efba96fa) ) + ROM_LOAD16_WORD_SWAP( "265cn.p2", 0x100000, 0x400000, CRC(9cb1dd35) SHA1(5e04716cf02e3321fac7bd4551fa352d8a54c7a3) ) + + NEO_SFIX_128K( "265cn.s1", CRC(a449f9ba) SHA1(f1744fd91d85a6391e3e5ff69d868ea9976f04c7) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) + ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265cn.c1", 0x0000000, 0x800000, CRC(35b6ee83) SHA1(1ee4fdd0482ae391544535020c96dba1fd4fb9a4) ) + ROM_LOAD16_BYTE( "265cn.c2", 0x0000001, 0x800000, CRC(9d4bd32f) SHA1(ed0dce5dd6cffce2c55a62559b368ccc46115497) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265cn.c7", 0x3000000, 0x800000, CRC(204c1b0e) SHA1(4e44371fc4d0abbd455554eb066ede07ab5f68f9) ) + ROM_LOAD16_BYTE( "265cn.c8", 0x3000001, 0x800000, CRC(b44c1d54) SHA1(22f9fb31b4f36f5c4fce66b5bd64b45737db43d9) ) +ROM_END + +ROM_START( kof2k2cori ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265cori.p1", 0x000000, 0x100000, CRC(0a3a1f32) SHA1(1f53828a441e025ca5940ed54caa10eb1dde8b32) ) + ROM_LOAD16_WORD_SWAP( "265cori.p2", 0x100000, 0x400000, CRC(7bf474a9) SHA1(8d836a408ae7c754dd7994ce329e649c3714ad6f) ) + + NEO_SFIX_128K( "265kc2.s1", CRC(67e7cbe1) SHA1(3582c2073f04e71a6d5a34145727d148a11ab375) ) + + NEO_BIOS_AUDIO_128K( "265cori.m1", CRC(4cd619bb) SHA1(5dc0d5e923985072e87b485dd8e5ef805f583e15) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265rs.c1", 0x0000000, 0x800000, CRC(c1a21b4c) SHA1(235938175d6011c5c8a37fc94f8fb604132d8038) ) + ROM_LOAD16_BYTE( "265rs.c2", 0x0000001, 0x800000, CRC(9b3d7e8d) SHA1(38c16541862636934a456f23632f64ff0f5ae617) ) + ROM_LOAD16_BYTE( "265ori.c3", 0x1000000, 0x800000, CRC(E5074EEA) SHA1(387ef21d58b416126b95843bac1a0b6cc346818f) ) + ROM_LOAD16_BYTE( "265rm13.c4", 0x1000001, 0x800000, CRC(2558972F) SHA1(2e0627fc5d689bf64fe36f02a489408d103c4499) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265ori.c7", 0x3000000, 0x800000, CRC(0E9F6ADB) SHA1(0e4cdbd3df2ef7b0c78c3275ee22684c67bf2d23) ) + ROM_LOAD16_BYTE( "265ori.c8", 0x3000001, 0x800000, CRC(9961799E) SHA1(cf5d43bbd90269155ac41fe9a31328654784351f) ) +ROM_END + ROM_START( kof2k2dbh ) /* The King of Fighters 2002 - Hack by Dodowang - (Can choose Kusanagi and Rugal - when using NrX have icons in character select menu -> MVS timer flaw) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265dbh.p1", 0x000000, 0x100000, CRC(e9d96cf7) SHA1(fc9fe5ac13cf328867538a474171a6878a09a731) ) @@ -908,6 +1066,32 @@ ROM_START( kof2k2gf ) /* The King of Fighters 2002 - Colour fix by Kumagorou - ( ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END +ROM_START( kof2k2green ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265-p1.p1", 0x000000, 0x100000, CRC(9ede7323) SHA1(ad9d45498777fda9fa58e75781f48e09aee705a6) ) + ROM_LOAD16_WORD_SWAP( "265green.p2", 0x100000, 0x400000, CRC(74df4436) SHA1(266ccc13fe144403215527bfabbec14240f2bb33) ) + + NEO_SFIX_128K( "265evo.s1", CRC(E0EAABA3) SHA1(831b642da9fe7617498cdb1c86475b3b3d3043bc) ) + + NEO_BIOS_AUDIO_128K( "265ori.m1", CRC(AB9D360E) SHA1(a0c8a5aae387c4f0b72790211695da7df924c351) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + ROM_START( kof2k2ht ) ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265ht.p1", 0x000000, 0x100000, CRC(3852f80e) SHA1(eca7670b368f9fbf2242f52a87fd18adf6afc24c) ) @@ -1085,6 +1269,54 @@ ROM_START( kof2k2js ) ROM_LOAD16_BYTE( "265rm13.c8", 0x3000001, 0x800000, CRC(93D8501F) SHA1(470f29de0bad8c15d924fffbbfa85926b551a8ae) ) ROM_END +ROM_START( kof2k2js2 ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265js2.p1", 0x000000, 0x100000, CRC(8da72d5c) SHA1(315d104da120fe1df041221209dc609a2f1d41a8) ) + ROM_LOAD16_WORD_SWAP( "265js.p2", 0x100000, 0x400000, CRC(75185760) SHA1(5501d4d9ac7fcd83102f6fbee7d986006566bf9d) ) + + NEO_SFIX_128K( "265rm13.s1", CRC(BD19C308) SHA1(38a9055bbd981a794e1fd9065985b4c033b78e93) ) + + NEO_BIOS_AUDIO_128K( "265rm13.m1", CRC(9956CCD8) SHA1(ed0f5e87360dfa89a58e1b333f4a66e91c2faf56) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265js2.v1", 0x000000, 0x800000, CRC(6e7e3508) SHA1(9d995fd9e9665da26153704a9fa539259759c105) ) + ROM_LOAD( "265js2.v2", 0x800000, 0x800000, CRC(2157b90f) SHA1(407422df7a24530d21119ef9233b831fb0166661) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265js.c3", 0x1000000, 0x800000, CRC(ca656090) SHA1(ed7f79eeabb965f5cdfbdd1c2d137ef5db366e03) ) + ROM_LOAD16_BYTE( "265js.c4", 0x1000001, 0x800000, CRC(eb898849) SHA1(eac79b04382fc20dd9f7b9345d929aff58889e8f) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265rm13.c7", 0x3000000, 0x800000, CRC(2A9D505C) SHA1(dcd3899aebc4602e4249b3e61299a0c8bf2e5e56) ) + ROM_LOAD16_BYTE( "265rm13.c8", 0x3000001, 0x800000, CRC(93D8501F) SHA1(470f29de0bad8c15d924fffbbfa85926b551a8ae) ) +ROM_END + +ROM_START( kof2k2js4 ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265js4.p1", 0x000000, 0x100000, CRC(1003a13b) SHA1(a4a722a5319be46c6b5ac735142f50aab75defff) ) + ROM_LOAD16_WORD_SWAP( "265js4.p2", 0x100000, 0x400000, CRC(27b26aad) SHA1(12ab5034ab4bf302599ffe1bc1c841f56cc083f5) ) + + NEO_SFIX_128K( "265js4.s1", CRC(1ac24409) SHA1(6c294e4651c4fef66a68845d3281accf5afc2d84) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) + ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + ROM_START( kof2k2k2 ) ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265chl3.p1", 0x000000, 0x100000, CRC(4ae81447) SHA1(add9e5a6737c4b00da326a947043e227d5dfcbb8) ) @@ -1495,6 +1727,30 @@ ROM_START( kof2k2k3g ) /* [OLD] The King of Fighters 2002 - (kof2k2k3r16) - Remi ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END +ROM_START( kof2k2kai ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265kai.p1", 0x000000, 0x100000, CRC(243bd906) SHA1(ec7c2034b050dbe93a2b3bc23a1e9dc22f5b1d40) ) + ROM_LOAD16_WORD_SWAP( "265kai.p2", 0x100000, 0x400000, CRC(c1200d66) SHA1(73b6c449c5de4dae84f5a3bbad67799a39a6a5d5) ) + + NEO_SFIX_128K( "265rm13.s1", CRC(BD19C308) SHA1(38a9055bbd981a794e1fd9065985b4c033b78e93) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) + ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265xxx.c1", 0x0000000, 0x800000, CRC(745B343E) SHA1(ae8293b18cfb4c20e2915149872d9fa561a218bf) ) + ROM_LOAD16_BYTE( "265xxx.c2", 0x0000001, 0x800000, CRC(2AAB7F98) SHA1(083c6e9162ab3bb49b365f91246cb39019dabe43) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + ROM_START( kof2k2kc ) /* The King of Fighters 2002 - Colour fix by Fighters Kim - (Colour change) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265-p1.p1", 0x000000, 0x100000, CRC(9ede7323) SHA1(ad9d45498777fda9fa58e75781f48e09aee705a6) ) @@ -1519,6 +1775,184 @@ ROM_START( kof2k2kc ) /* The King of Fighters 2002 - Colour fix by Fighters Kim ROM_LOAD16_BYTE( "265-c8.c8", 0x3000001, 0x800000, CRC(ab0bb549) SHA1(d23afb60b7f831f7d4a98ad3c4a00ee19877a1ce) ) ROM_END +ROM_START( kof2k2kc2 ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265kc2.p1", 0x000000, 0x100000, CRC(811512bb) SHA1(510f5bb0ba8c72ca5377b18f75d71816e8eb79d1) ) + ROM_LOAD16_WORD_SWAP( "265kc2.p2", 0x100000, 0x400000, CRC(7808c018) SHA1(2d671596de7a878b324d81ba464b58530088eb33) ) + + NEO_SFIX_128K( "265kc2.s1", CRC(67e7cbe1) SHA1(3582c2073f04e71a6d5a34145727d148a11ab375) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265rm13.c4", 0x1000001, 0x800000, CRC(2558972F) SHA1(2e0627fc5d689bf64fe36f02a489408d103c4499) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265kc2.c7", 0x3000000, 0x800000, CRC(54fa8789) SHA1(71311275bed0c47af2ddbcd1c5f77664c6a73a56) ) + ROM_LOAD16_BYTE( "265kc2.c8", 0x3000001, 0x800000, CRC(ce62cb09) SHA1(30f17893ce6441bf41257ab93df5b99683098cfc) ) +ROM_END + +ROM_START( kof2k2kk ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265kk.p1", 0x000000, 0x100000, CRC(69301bc9) SHA1(6f5d0ebe12e88c98ec1f416d440ad7d569886966) ) + ROM_LOAD16_WORD_SWAP( "265kk.p2", 0x100000, 0x400000, CRC(816c5aa2) SHA1(8821f91d4eeab58e3df669f3ab8817a94010f297) ) + + NEO_SFIX_128K( "265kk.s1", CRC(dd1dcb5b) SHA1(a24b4d725e1a3640f9a5cc46ed26192ffef79862) ) + + NEO_BIOS_AUDIO_128K( "265ori.m1", CRC(AB9D360E) SHA1(a0c8a5aae387c4f0b72790211695da7df924c351) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265smg.c7", 0x3000000, 0x800000, CRC(febfa475) SHA1(ed69f7536d39522b85bfaa512e75b85d08b439e9) ) + ROM_LOAD16_BYTE( "265smg.c8", 0x3000001, 0x800000, CRC(8f9b7991) SHA1(9c6e6af48c18e81ecba68563f8fb9caa85899672) ) +ROM_END + +ROM_START( kof2k2lb ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265lb.p1", 0x000000, 0x100000, CRC(1602f059) SHA1(8a94d7f5efadd2a4e5a0bd360825746592e351b3) ) + ROM_LOAD16_WORD_SWAP( "265lb.p2", 0x100000, 0x400000, CRC(7f8298fb) SHA1(b902d72793e0de74ed44b30475999ef0e3722394) ) + + NEO_SFIX_MT_128K + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) + ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + +ROM_START( kof2k2leon ) // Credit display is incorrect + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265leon.p1", 0x000000, 0x100000, CRC(eba68160) SHA1(1d226e00782df71556666222e20f48268c17968c) ) + ROM_LOAD16_WORD_SWAP( "265leon.p2", 0x100000, 0x400000, CRC(952fae3d) SHA1(09f868eb02b8df425c80f59ad43adbc3107755ab) ) + + NEO_SFIX_128K( "265leon.s1", CRC(adf096e9) SHA1(812e321319d9426dbeeb55f14b2bf61bd9c2998e) ) + + NEO_BIOS_AUDIO_128K( "265ori.m1", CRC(AB9D360E) SHA1(a0c8a5aae387c4f0b72790211695da7df924c351) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265leon.c7", 0x3000000, 0x800000, CRC(c02c8a0c) SHA1(f757dc124d8375c47af05b650bfc69997a27c63b) ) + ROM_LOAD16_BYTE( "265leon.c8", 0x3000001, 0x800000, CRC(45ac1284) SHA1(d59357d629557c09d559518d235c0379fa88dd70) ) +ROM_END + +ROM_START( kof2k2mcr ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265mcr.p1", 0x000000, 0x100000, CRC(1aeb806a) SHA1(a79d0021c4076efe4aae00994dfa7f3ddfd41bc5) ) + ROM_LOAD16_WORD_SWAP( "265mcr.p2", 0x100000, 0x400000, CRC(4134dc22) SHA1(20d887b96957d5255f2b18950ea45b6ecd782b51) ) + + NEO_SFIX_128K( "265evo.s1", CRC(E0EAABA3) SHA1(831b642da9fe7617498cdb1c86475b3b3d3043bc) ) + + NEO_BIOS_AUDIO_128K( "265d.m1", CRC(1c661a4b) SHA1(4e5aa862a0a182a806d538996ddc68d9f2dffaf7) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "kf10-v1.bin", 0x000000, 0x800000, CRC(0fc9a58d) SHA1(9d79ef00e2c2abd9f29af5521c2fbe5798bf336f) ) + ROM_LOAD( "kf10-v2.bin", 0x800000, 0x800000, CRC(b8c475a4) SHA1(10caf9c69927a223445d2c4b147864c02ce520a8) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265spls.c7", 0x3000000, 0x800000, CRC(31e7aaa3) SHA1(733710493cd885701f5f34078a875bc77ed57442) ) + ROM_LOAD16_BYTE( "265spls.c8", 0x3000001, 0x800000, CRC(f26a445b) SHA1(3fba6d95c1af77a6fe2e65af39eba0ce3e4134b7) ) +ROM_END + +ROM_START( kof2k2moi2 ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265moir.p1", 0x000000, 0x100000, CRC(0851940b) SHA1(5f374412c783b2d2392693d64c084dac4a7f3438) ) + ROM_LOAD16_WORD_SWAP( "265moir.p2", 0x100000, 0x400000, CRC(95c2783d) SHA1(49eb7ceba441988ff974bc5b9b935036b8701291) ) + + NEO_SFIX_128K( "265k2.s1", CRC(10de5d7c) SHA1(44f4f523a787cf3094923483b824d7795858aff6) ) + + NEO_BIOS_AUDIO_128K( "265ori.m1", CRC(AB9D360E) SHA1(a0c8a5aae387c4f0b72790211695da7df924c351) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265moi2.c1", 0x0000000, 0x800000, CRC(4d15a195) SHA1(68e4fd57a32e671f259ce1d3a98727af3d91d0ba) ) + ROM_LOAD16_BYTE( "265moi2.c2", 0x0000001, 0x800000, CRC(4468df56) SHA1(979973716d75f319c265969555a939d15424b74e) ) + ROM_LOAD16_BYTE( "265ori.c3", 0x1000000, 0x800000, CRC(E5074EEA) SHA1(387ef21d58b416126b95843bac1a0b6cc346818f) ) + ROM_LOAD16_BYTE( "265ori.c4", 0x1000001, 0x800000, CRC(F6EB1FF2) SHA1(77cb493b9e75d42c204a9a6c052a813c2730e44f) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265ori.c7", 0x3000000, 0x800000, CRC(0E9F6ADB) SHA1(0e4cdbd3df2ef7b0c78c3275ee22684c67bf2d23) ) + ROM_LOAD16_BYTE( "265ori.c8", 0x3000001, 0x800000, CRC(9961799E) SHA1(cf5d43bbd90269155ac41fe9a31328654784351f) ) +ROM_END + +ROM_START( kof2k2moir ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265moir.p1", 0x000000, 0x100000, CRC(adb10912) SHA1(1b352dc12010822b54893ae291b0cc19c20475f8) ) + ROM_LOAD16_WORD_SWAP( "265moir.p2", 0x100000, 0x400000, CRC(e9204705) SHA1(421f50e90753c97a497172e655094871cd99b43c) ) + + NEO_SFIX_128K( "265moir.s1", CRC(627af296) SHA1(f2a24587896d05927456a35ef3e749505ac27dbb) ) + + NEO_BIOS_AUDIO_128K( "265ori.m1", CRC(AB9D360E) SHA1(a0c8a5aae387c4f0b72790211695da7df924c351) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265nu.v1", 0x000000, 0x400000, CRC(13d98607) SHA1(0f1a374247992d301bc26c0bab200631a13a9f4a) ) + ROM_LOAD( "265nu.v2", 0x400000, 0x400000, CRC(9cf74677) SHA1(073e7cb00127690fdec05c19f00347ec449f15ac) ) + ROM_LOAD( "265nu.v3", 0x800000, 0x400000, CRC(8e9448b5) SHA1(c22420649c7c68a172290548cab846345c861cb0) ) + ROM_LOAD( "265nu.v4", 0xc00000, 0x400000, CRC(067271b5) SHA1(36e07da78aaf634824c98023053bef802be4e218) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265d.c7", 0x3000000, 0x800000, CRC(8a5b561c) SHA1(A19697D4C2CC8EDEBC669C95AE1DB4C8C2A70B2C) ) + ROM_LOAD16_BYTE( "265d.c8", 0x3000001, 0x800000, CRC(bef667a3) SHA1(D5E8BC185DCF63343D129C31D2DDAB9F723F1A12) ) +ROM_END + ROM_START( kof2k2mp1 ) ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265mp1.p1", 0x000000, 0x100000, CRC(aba169fe) SHA1(934dd20f6e3da261cb9f3587cdd8145ecdcdfa84) ) @@ -1693,8 +2127,8 @@ ROM_START( kof2k2omg8 ) // KOF-ON Team omega 0.8 ROM_LOAD16_BYTE( "265omg8.c2", 0x0000001, 0x800000, CRC(b10c6958) SHA1(e2112d1640cbcdeaaa0cb2bbf87d759184d4a6f0) ) ROM_LOAD16_BYTE( "265omg8.c3", 0x1000000, 0x800000, CRC(2367927c) SHA1(31a5b58feaeb2ecbde5573b48b50cdd8bcaa6ab4) ) ROM_LOAD16_BYTE( "265omg8.c4", 0x1000001, 0x800000, CRC(4ad48c29) SHA1(9908a7c2d579059a97927d58f4ea95b17deb9952) ) - ROM_LOAD16_BYTE( "265-ru.c5", 0x2000000, 0x800000, CRC(11126545) SHA1(4ae58848c8a6701c9cfcd60e6674e8fb7491c0c0) ) - ROM_LOAD16_BYTE( "265-ru.c6", 0x2000001, 0x800000, CRC(d225bb9b) SHA1(ee627dab6aeebfb1af9dbdc315a927245243817c) ) + ROM_LOAD16_BYTE( "365ru.c5", 0x2000000, 0x800000, CRC(11126545) SHA1(4ae58848c8a6701c9cfcd60e6674e8fb7491c0c0) ) + ROM_LOAD16_BYTE( "365ru.c6", 0x2000001, 0x800000, CRC(d225bb9b) SHA1(ee627dab6aeebfb1af9dbdc315a927245243817c) ) ROM_LOAD16_BYTE( "265omg8.c7", 0x3000000, 0x800000, CRC(890c2a4a) SHA1(04e8720ee62782b8fd6621ef4dc4e7469f57b10c) ) ROM_LOAD16_BYTE( "265omg8.c8", 0x3000001, 0x800000, CRC(b726009d) SHA1(29e84e7012cd5c109937ea2e6a455ed9829776ac) ) ROM_END @@ -1719,8 +2153,8 @@ ROM_START( kof2k2omg9 ) // omega v9 ROM_LOAD16_BYTE( "265omg9b.c2", 0x0000001, 0x800000, CRC(e0ddced5) SHA1(d8b5bd419bc825b99c206f54fbce97305839bcc9) ) ROM_LOAD16_BYTE( "265omg9b.c3", 0x1000000, 0x800000, CRC(6898f6e2) SHA1(4d8101534f85838eff3823ead72bdbcee57a3a50) ) ROM_LOAD16_BYTE( "265omg9b.c4", 0x1000001, 0x800000, CRC(9232e491) SHA1(e56b5657842d5e147e56c485dfa9a5a0a6ffba2d) ) - ROM_LOAD16_BYTE( "265-ru.c5", 0x2000000, 0x800000, CRC(11126545) SHA1(4ae58848c8a6701c9cfcd60e6674e8fb7491c0c0) ) - ROM_LOAD16_BYTE( "265-ru.c6", 0x2000001, 0x800000, CRC(d225bb9b) SHA1(ee627dab6aeebfb1af9dbdc315a927245243817c) ) + ROM_LOAD16_BYTE( "365ru.c5", 0x2000000, 0x800000, CRC(11126545) SHA1(4ae58848c8a6701c9cfcd60e6674e8fb7491c0c0) ) + ROM_LOAD16_BYTE( "365ru.c6", 0x2000001, 0x800000, CRC(d225bb9b) SHA1(ee627dab6aeebfb1af9dbdc315a927245243817c) ) ROM_LOAD16_BYTE( "265omg9b.c7", 0x3000000, 0x800000, CRC(6954ef57) SHA1(807f7bcdac379c5dce7745f10925e5c4a10c2c85) ) ROM_LOAD16_BYTE( "265omg9b.c8", 0x3000001, 0x800000, CRC(3e394883) SHA1(03e92267bdef8651bac6278c8068892dadba3ad8) ) ROM_END @@ -1745,8 +2179,8 @@ ROM_START( kof2k2omg9b ) // omega v9 beta ROM_LOAD16_BYTE( "265omg9b.c2", 0x0000001, 0x800000, CRC(e0ddced5) SHA1(d8b5bd419bc825b99c206f54fbce97305839bcc9) ) ROM_LOAD16_BYTE( "265omg9b.c3", 0x1000000, 0x800000, CRC(6898f6e2) SHA1(4d8101534f85838eff3823ead72bdbcee57a3a50) ) ROM_LOAD16_BYTE( "265omg9b.c4", 0x1000001, 0x800000, CRC(9232e491) SHA1(e56b5657842d5e147e56c485dfa9a5a0a6ffba2d) ) - ROM_LOAD16_BYTE( "265-ru.c5", 0x2000000, 0x800000, CRC(11126545) SHA1(4ae58848c8a6701c9cfcd60e6674e8fb7491c0c0) ) - ROM_LOAD16_BYTE( "265-ru.c6", 0x2000001, 0x800000, CRC(d225bb9b) SHA1(ee627dab6aeebfb1af9dbdc315a927245243817c) ) + ROM_LOAD16_BYTE( "365ru.c5", 0x2000000, 0x800000, CRC(11126545) SHA1(4ae58848c8a6701c9cfcd60e6674e8fb7491c0c0) ) + ROM_LOAD16_BYTE( "365ru.c6", 0x2000001, 0x800000, CRC(d225bb9b) SHA1(ee627dab6aeebfb1af9dbdc315a927245243817c) ) ROM_LOAD16_BYTE( "265omg9b.c7", 0x3000000, 0x800000, CRC(6954ef57) SHA1(807f7bcdac379c5dce7745f10925e5c4a10c2c85) ) ROM_LOAD16_BYTE( "265omg9b.c8", 0x3000001, 0x800000, CRC(3e394883) SHA1(03e92267bdef8651bac6278c8068892dadba3ad8) ) ROM_END @@ -2173,6 +2607,32 @@ ROM_START( kof2k2rma ) ROM_LOAD16_BYTE( "265rma.c8", 0x3000001, 0x800000, CRC(a2b54e2d) SHA1(3f534ac51f3c2b1efe8a76cabd7e154ea9f1f13e) ) ROM_END +ROM_START( kof2k2rmb ) + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "265rma.p1", 0x000000, 0x100000, CRC(b98ba35a) SHA1(14c3e255da8d1b75b9d47a1d5a8eb0172e35abf0) ) + ROM_LOAD16_WORD_SWAP( "265rmb.p2", 0x100000, 0x400000, CRC(8684acf0) SHA1(364cde00d3c35b3aca60fe5d0bf6ffa774898787) ) + + NEO_SFIX_128K( "265rm13.s1", CRC(BD19C308) SHA1(38a9055bbd981a794e1fd9065985b4c033b78e93) ) + + NEO_BIOS_AUDIO_128K( "265rm13.m1", CRC(9956CCD8) SHA1(ed0f5e87360dfa89a58e1b333f4a66e91c2faf56) ) + + ROM_REGION( 0x1000000, "ymsnd", 0 ) + ROM_LOAD( "265js.v1", 0x000000, 0x400000, CRC(3961af5a) SHA1(483662b9ec1da54e6786a34327837a48eed3501f) ) + ROM_LOAD( "265rm13.v2", 0x400000, 0x400000, CRC(0a1e505a) SHA1(62d128909b21cef4605ed35195e5503d1e056659) ) + ROM_LOAD( "265rm13.v3", 0x800000, 0x400000, CRC(15bc1d92) SHA1(bc22e274f279a01518de8cd519847eb01ff675ef) ) + ROM_LOAD( "265rm13.v4", 0xc00000, 0x400000, CRC(b5f43393) SHA1(7bbbff6aeb44e8964bbb46372b856ffe6c530076) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "265d.c1", 0x0000000, 0x800000, CRC(7efa6ef7) SHA1(71345A4202E7CC9239538FB978638141416C8893) ) + ROM_LOAD16_BYTE( "265d.c2", 0x0000001, 0x800000, CRC(aa82948b) SHA1(B2A40797F68BDEB80BC54DCCC5495BE68934BF0E) ) + ROM_LOAD16_BYTE( "265d.c3", 0x1000000, 0x800000, CRC(959fad0b) SHA1(63AB83DDC5F688DC8165A7FF8D262DF3FCD942A2) ) + ROM_LOAD16_BYTE( "265d.c4", 0x1000001, 0x800000, CRC(efe6a468) SHA1(2A414285E48AA948B5B0D4A9333BAB083B5FB853) ) + ROM_LOAD16_BYTE( "265d.c5", 0x2000000, 0x800000, CRC(74bba7c6) SHA1(E01ADC7A4633BC0951B9B4F09ABC07D728E9A2D9) ) + ROM_LOAD16_BYTE( "265d.c6", 0x2000001, 0x800000, CRC(e20d2216) SHA1(5D28EEA7B581E780B78F391A8179F1678EE0D9A5) ) + ROM_LOAD16_BYTE( "265rm13.c7", 0x3000000, 0x800000, CRC(2A9D505C) SHA1(dcd3899aebc4602e4249b3e61299a0c8bf2e5e56) ) + ROM_LOAD16_BYTE( "265rm13.c8", 0x3000001, 0x800000, CRC(93D8501F) SHA1(470f29de0bad8c15d924fffbbfa85926b551a8ae) ) +ROM_END + ROM_START( kof2k2rm1 ) /* [OLD] The King of Fighters 2002 - (kof2k2rm1) - Remix by Raymonose - (Remix revision 1 - 66%) */ ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "265rm1.p1", 0x000000, 0x100000, CRC(0ba302d8) SHA1(ce919c4acd305e8c5e0412fdc4fcb84ec2da9c9d) ) @@ -2665,10 +3125,10 @@ ROM_START( kof2k2sm ) // bad gfx on train scene NEO_BIOS_AUDIO_128K( "265nu.m1", CRC(f80eb346) SHA1(7affe04a8e19c33ea99359ffe5f2936f7e724fa1) ) ROM_REGION( 0x1000000, "ymsnd", 0 ) - ROM_LOAD( "265-ru.v1", 0x000000, 0x400000, CRC(8991f6e9) SHA1(ce5afc0169c142d7f98111afbc60b3a9a2e17256) ) - ROM_LOAD( "265-ru.v2", 0x400000, 0x400000, CRC(511e4d2f) SHA1(28190ec86ac2169ab6fad80635ed13cfcf430c65) ) - ROM_LOAD( "265-ru.v3", 0x800000, 0x400000, CRC(1dd8b53a) SHA1(9aa84f145ba07f5f3c3b3fb682eb8a8ab1500b4c) ) - ROM_LOAD( "265-ru.v4", 0xc00000, 0x400000, CRC(63bb5462) SHA1(afc6a085e25bd006f26e16beda4244bc8bc19bb8) ) + ROM_LOAD( "265sm.v1", 0x000000, 0x400000, CRC(8991f6e9) SHA1(ce5afc0169c142d7f98111afbc60b3a9a2e17256) ) + ROM_LOAD( "265sm.v2", 0x400000, 0x400000, CRC(511e4d2f) SHA1(28190ec86ac2169ab6fad80635ed13cfcf430c65) ) + ROM_LOAD( "265sm.v3", 0x800000, 0x400000, CRC(1dd8b53a) SHA1(9aa84f145ba07f5f3c3b3fb682eb8a8ab1500b4c) ) + ROM_LOAD( "265sm.v4", 0xc00000, 0x400000, CRC(63bb5462) SHA1(afc6a085e25bd006f26e16beda4244bc8bc19bb8) ) ROM_REGION( 0x4000000, "sprites", 0 ) ROM_LOAD16_BYTE( "265sm.c1", 0x0000000, 0x800000, CRC(2c6642dd) SHA1(19cf4a674b7f78e5639c9b5517242f20695c6713) ) @@ -2981,6 +3441,7 @@ ROM_END 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 ) GAME( 2002, kof2k2b, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Alphax2?", "Kof2002 (Add Char set 3)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2b1, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Alphax2?", "Kof2002 (Add Char set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2bd, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2bd, ROT0, "hack", "Kof2002 Challenge to Ultimate Battle (Bootleg, Decrypted)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) @@ -2988,9 +3449,12 @@ GAME( 2002, kof2k2bh, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, ko GAME( 2003, kof2k2bjh, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Ben Jeremy", "Kof2002 (Diff Moves 031025)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2bjo, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Ben Jeremy", "Kof2002 (Diff Moves 031013)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2bld, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 BLOOD PLUS", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2blood2,kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 BLOOD PLUS 2", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2br, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "hack", "Kof2002 (Portuguese set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2br1, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "hack", "Kof2002 (Portuguese set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2br2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "hack", "Kof2002 (Portuguese set 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2bs, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Dodowang", "Kof2002 (Boss Dodowang Hack (red flame))", MACHINE_SUPPORTS_SAVE ) +GAME( 2007, kof2k2c2, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGCG / EGHT", "Kof2002 (3rd Strike of the Orochi)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2cf1, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "C6F8", "Kof2002 (Iori p3 and p4 Color Changed)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2cf2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "C6F8", "Kof2002 (Char color changed - rel.2 030827)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2cf3, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "C6F8", "Kof2002 (Char color changed - rel.3 030831)", MACHINE_SUPPORTS_SAVE ) @@ -2999,6 +3463,8 @@ GAME( 2002, kof2k2ch, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, ko GAME( 2003, kof2k2chl, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "CHL", "Kof2002 (Enhanced gameplay - 030410)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2cl2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "CHL", "Kof2002 (Enhanced gameplay - Rev.2 030413)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2cl3, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "CHL", "Kof2002 (Enhanced gameplay - Rev.3 030413)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2cn, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "FoxUU / ZUOJIE", "Kof2002 (Chinese Translation by FoxUU & ZUOJIE)", MACHINE_SUPPORTS_SAVE ) +GAME( 2010, kof2k2cori, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ismamj / EGCG / EGHT", "Kof2002 (3rd Strike By IsmaMj)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2dbh, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2dbh,ROT0, "Dodowang","Kof2002 (Add Char- MVS timer flaw)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2e1, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Kurouri", "Kof2002 (Add Char set 4)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2e2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Creamymami", "Kof2002 (Add Char set 5)", MACHINE_SUPPORTS_SAVE ) @@ -3014,14 +3480,16 @@ GAME( 2002, kof2k2fy, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, ko GAME( 2002, kof2k2gc, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Lewis67", "Kof2002 (Color changed set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2gc2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Lewis67", "Kof2002 (Color changed set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2gf, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Kumagorou", "Kof2002 (Color changed set 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2green, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "KOF-ON Team", "Kof2002 (Green colour hack)", MACHINE_SUPPORTS_SAVE ) GAME( 2008, kof2k2ht, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "FMG CO", "Kof2002 (HT)", MACHINE_SUPPORTS_SAVE ) GAME( 2010, kof2k2ibp, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ismamj", "Kof2002 (Ice Blue Perfect)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2ic1, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Fighters Kim", "Kof2002 (Color changed - Attack cremation ice blue - 80%)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2ic2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Fighters Kim", "Kof2002 (Color changed - Attack cremation ice blue - Old)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2ice, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Fighters Kim", "Kof2002 (Color changed - Attack cremation ice blue)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2jc, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Jui Lee", "Kof2002 (Char color changed for Athena 3P, Kula 3P and Kula 4P)", MACHINE_SUPPORTS_SAVE ) -GAME( 2002, kof2k2js, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "FCHT", "Kof2002 KOF REMIX ULTRA (3.0)", MACHINE_SUPPORTS_SAVE ) -GAME( 2002, kof2k2kc, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Fighters Kim", "Kof2002 (Color changed set 4)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2js, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Jason / FCHT", "Kof2002 KOF REMIX ULTRA (v3.0)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2js2, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Jason / FCHT", "Kof2002 KOF REMIX ULTRA (v3.5)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2js4, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Jason", "Kof2002 KOF REMIX ULTRA (v2.5 SDM)", MACHINE_SUPPORTS_SAVE ) GAME( 2005, kof2k2k2, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 10th Style", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2k3o, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Jason/K3", "Kof2002 (Moves KOF 98 style - 030629)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2k32, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Jason/K3", "Kof2002 (Moves KOF 98 style - 030725)", MACHINE_SUPPORTS_SAVE ) @@ -3039,6 +3507,15 @@ GAME( 2003, kof2k2k3d, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, ko GAME( 2003, kof2k2k3e, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Jason/K3","Kof2002 (Moves KOF 98 style - 031016)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2k3f, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Jason/K3", "Kof2002 (Ultra - Add Char - Diff Moves 031202)", MACHINE_SUPPORTS_SAVE ) GAME( 2004, kof2k2k3g, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Jason/K3", "Kof2002 (Remix Ultra - Add Char - Diff Moves 040418)", MACHINE_SUPPORTS_SAVE ) +GAME( 2007, kof2k2kai, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 (Boss Hack Kai Version)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2kc, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2h, ROT0, "Fighters Kim", "Kof2002 (Color changed set 4)", MACHINE_SUPPORTS_SAVE ) +GAME( 2007, kof2k2kc2, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGCG-EGHT / KOF-ON Team", "Kof2002 (3rd Strike Remixed by Kof ON Team)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2kk, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "KOF-ON Team", "Kof2002 (Hack Johnkof Remixed by KalcenTin)" , MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2lb, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2k2lb, ROT0, "LB70", "Kof2002 RETROPOKTER: VER 1.0", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2leon, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "KOF-ON Team", "Kof2002 (dedicated to Leon9000)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2mcr, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Neht", "Kof2002 MERRY X'MAS MIX", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2moi2, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Kof2002ex2", "Kof2002 2002EX 2(Magic Orochi Iori 2.0)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2moir, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "LB70", "Kof2002 (Retropokter Ver 1.0 - Magic Orochi Iori Remake)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2mp1, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 (Magic Plus)" , MACHINE_SUPPORTS_SAVE ) GAME( 2010, kof2k2mp3, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ismamj", "Kof2002 (Magic Plus III)" , MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2mpu, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Wesker", "Kof2002 (Plus)", MACHINE_SUPPORTS_SAVE ) @@ -3064,11 +3541,12 @@ GAME( 2002, kof2k2pur, kof2002, neogeo_noslot, neogeo, neogeo_state, ne GAME( 2002, kof2k2ra, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Ruin Angel", "Kof2002 (Diff Moves - Based on CHL set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2rgl, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "KOF-ON Team", "Kof2002 Magic Unique Crazy Rugal Plus (Kof on Team)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2rm, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Raymonose", "Kof2002 (Remix 33%)", MACHINE_SUPPORTS_SAVE ) -GAME( 2002, kof2k2rma, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 KOF REMIX ULTRA (2010-07-23)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2rm1, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Raymonose", "Kof2002 (Remix rev.1 - 66%)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2rm2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Raymonose", "Kof2002 (Remix rev.2 - 80% - 030414)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2rm3, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Raymonose", "Kof2002 (Remix rev.3 - 89% - 030420)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2rm13, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "FCHT", "Kof2002 KOF REMIX ULTRA (1.3)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2rma, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 KOF REMIX ULTRA (2010-07-23)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2rmb, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 KOF REMIX ULTRA", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2rr, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Ricky", "Kof2002 (Diff Moves - Based on CHL set 3 - 030430)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2rr1, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Ricky", "Kof2002 (Diff Moves - Based on CHL set 3 - 030508)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof2k2rr2, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Ricky", "Kof2002 (Diff Moves - Based on CHL set 3 - 030508 Boss)", MACHINE_SUPPORTS_SAVE ) @@ -3097,7 +3575,7 @@ GAME( 2002, kof2k2tc, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, ko GAME( 2002, kof2k2ul, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Raymonose", "Kof2002 (Diff Moves 030515)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2ule, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Raymonose", "Kof2002 (Add Char - Diff Move - Ultra kill start max - Ultra pow hack 030515)", MACHINE_SUPPORTS_SAVE ) GAME( 2002, kof2k2wuk, kof2002, neogeo_noslot, neogeo, neogeo_hbmame, kof2002m, ROT0, "Wesker", "Kof2002 (Ultra kill style - rev max2 - perfect)", MACHINE_SUPPORTS_SAVE ) -GAME( 2002, kof2k2xxx, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof2002 (Perfect revised edition)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, kof2k2xxx, kof2002, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Peggy / Kim", "Kof2002 (Perfect revised edition)", MACHINE_SUPPORTS_SAVE ) ///GAME( 2002, kof2002d, kof2002, neogeo_noslot, neogeo, neogeo_state, kof2002d, ROT0, "hack", "Kof2002 (NGM-2650)(NGH-2650) (decrypted C)", MACHINE_SUPPORTS_SAVE ) ///GAME( 2002, kf2k2plb, kof2002, neogeo_noslot, neogeo, neogeo_state, kf2k2pls, ROT0, "bootleg", "Kof2002 Plus (set 3, bootleg / hack)", MACHINE_SUPPORTS_SAVE ) ///GAME( 2002, kf2k2plc, kof2002, neogeo_noslot, neogeo, neogeo_state, kf2k2plc, ROT0, "bootleg", "Kof2002 Super (set 4, bootleg / hack)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/kof98.cpp b/docs/release/src/hbmame/drivers/kof98.cpp index 514654dfb6d..a139d3f82d0 100644 --- a/docs/release/src/hbmame/drivers/kof98.cpp +++ b/docs/release/src/hbmame/drivers/kof98.cpp @@ -1797,6 +1797,32 @@ ROM_START( kof98c20151110 ) ROM_LOAD16_BYTE( "242-c8.c8", 0x3000001, 0x800000, CRC(c823e045) SHA1(886fbf64bcb58bc4eabb1fc9262f6ac9901a0f28) ) ROM_END +ROM_START( kof98c20151223 ) // only p1,p2 are confirmed + ROM_REGION( 0x500000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "242col23.p1", 0x000000, 0x100000, CRC(7549069f) SHA1(3c083f77f4598c1525fc327f41dbd25a89a66723) ) + ROM_LOAD16_WORD_SWAP( "242col23.p2", 0x100000, 0x400000, CRC(c53f8c35) SHA1(005b52da53dd57053d0123febfd004c2137cbace) ) + + NEO_SFIX_128K( "242cok03.s1", CRC(8e37c589) SHA1(44b9f1cd06cd029fcc39bf29724b03e021974c20) ) + + NEO_BIOS_AUDIO_256K( "242coc30.m1", CRC(db046fc4) SHA1(4b793a125bade067ef0fdcd1775d135c646c6b94) ) + + ROM_REGION( 0x1000000, "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_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "242cli15.c1", 0x0000000, 0x800000, CRC(066db0a6) SHA1(ea200b79bf60d2d9a025da873173cc4704d254b0) ) + ROM_LOAD16_BYTE( "242cli15.c2", 0x0000001, 0x800000, CRC(99d0b0fa) SHA1(b56813917de0c19858c13e51888b6af2030bc324) ) + ROM_LOAD16_BYTE( "242cni24.c3", 0x1000000, 0x800000, CRC(ea84bdae) SHA1(27108247ed7406060f0b149a9dfa64869a6bbcf2) ) + ROM_LOAD16_BYTE( "242cni24.c4", 0x1000001, 0x800000, CRC(2c17ac8e) SHA1(fc704f5cf358df81a88d20932be3edffe202dea9) ) + ROM_LOAD16_BYTE( "242-c5.c5", 0x2000000, 0x800000, CRC(9d10bed3) SHA1(4d44addc7c808649bfb03ec45fb9529da413adff) ) + ROM_LOAD16_BYTE( "242-c6.c6", 0x2000001, 0x800000, CRC(da07b6a2) SHA1(9c3f0da7cde1ffa8feca89efc88f07096e502acf) ) + ROM_LOAD16_BYTE( "242-c7.c7", 0x3000000, 0x800000, CRC(f6d7a38a) SHA1(dd295d974dd4a7e5cb26a3ef3febcd03f28d522b) ) + ROM_LOAD16_BYTE( "242-c8.c8", 0x3000001, 0x800000, CRC(c823e045) SHA1(886fbf64bcb58bc4eabb1fc9262f6ac9901a0f28) ) +ROM_END + ROM_START( kof98cd ) ROM_REGION( 0x500000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "242cd.p1", 0x000000, 0x100000, CRC(1a748f96) SHA1(bddb07fa6dc59ae547aed32218a6601b8b80816e) ) @@ -3274,6 +3300,7 @@ GAME( 2015, kof98c20150827, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, GAME( 2015, kof98c20151103, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ivex", "Kof'98 Combo (2015-11-03)", MACHINE_SUPPORTS_SAVE ) GAME( 2015, kof98c20151108, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ivex", "Kof'98 Combo (2015-11-08)", MACHINE_SUPPORTS_SAVE ) GAME( 2015, kof98c20151110, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ivex", "Kof'98 Combo (2015-11-10)", MACHINE_SUPPORTS_SAVE ) +GAME( 2016, kof98c20151223, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Ivex", "Kof'98 Combo (2015-12-23)", MACHINE_SUPPORTS_SAVE ) GAME( 1998, kof98cd, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "hack", "Kof'98 (CD conversion)", MACHINE_SUPPORTS_SAVE ) GAME( 1998, kof98cd1, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "EGHT", "Kof'98 (NGCD Ver 1.04f [EGHT])", MACHINE_SUPPORTS_SAVE ) GAME( 2003, kof98ch, kof98, neogeo_noslot, neogeo, neogeo_state, neogeo, ROT0, "Chase", "Kof'98 (Diff Moves 030503)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/neogeo0.cpp b/docs/release/src/hbmame/drivers/neogeo0.cpp index d1f96cc7047..eef4b72948d 100644 --- a/docs/release/src/hbmame/drivers/neogeo0.cpp +++ b/docs/release/src/hbmame/drivers/neogeo0.cpp @@ -39,6 +39,7 @@ public: DECLARE_DRIVER_INIT(kof2k2bd); DECLARE_DRIVER_INIT(kof2k2dbh); DECLARE_DRIVER_INIT(kof2k2h); + DECLARE_DRIVER_INIT(kof2k2lb); DECLARE_DRIVER_INIT(kof2k2ps2a); DECLARE_DRIVER_INIT(kof2003b); DECLARE_DRIVER_INIT(kof2003d); diff --git a/docs/release/src/hbmame/drivers/psikyosh.cpp b/docs/release/src/hbmame/drivers/psikyosh.cpp index eeb7b912cdd..7d5b19e2be6 100644 --- a/docs/release/src/hbmame/drivers/psikyosh.cpp +++ b/docs/release/src/hbmame/drivers/psikyosh.cpp @@ -27,4 +27,4 @@ ROM_END /* YEAR NAME PARENT MACHINE INPUT CLASS INIT MONITOR COMPANY FULLNAME FLAGS */ -GAME( 2009, s1945iiex, s1945ii, psikyo3v1, s1945ii, psikyosh_state, ps3, ROT270, "Pipi899", "Strikers 1945 II (EX Super Version)", MACHINE_SUPPORTS_SAVE ) +GAME( 2009, s1945iiex, s1945ii, psikyo3v1, s1945ii, psikyosh_state, ps3, ROT270, "Pipi899", "Strikers 1945 II (EX Super Version)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/hbmame.cpp b/docs/release/src/hbmame/hbmame.cpp index 9c78dde658b..299d7cbf496 100644 --- a/docs/release/src/hbmame/hbmame.cpp +++ b/docs/release/src/hbmame/hbmame.cpp @@ -6,47 +6,19 @@ Specific (per target) constants - Copyright Nicola Salmoria and the MAME Team. - Visit http://mamedev.org for licensing and usage restrictions. - ****************************************************************************/ #include "emu.h" -#define APPNAME "HBMAME" -#define APPNAME_LOWER "hbmame" -#define CONFIGNAME "hbmame" -#define CAPGAMENOUN "GAME" -#define CAPSTARTGAMENOUN "Game" -#define GAMENOUN "game" -#define GAMESNOUN "games" -#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttp://mamedev.org" -#define COPYRIGHT_INFO "Copyright Nicola Salmoria and the MAME team" -#define DISCLAIMER "HBMAME is an emulator: it reproduces, more or less faithfully, the behaviour of\n" \ - "several arcade machines. But hardware is useless without software, so an image\n" \ - "of the ROMs which run on that hardware is required. Such ROMs, like any other\n" \ - "commercial software, are copyrighted material and it is therefore illegal to\n" \ - "use them if you don't own the original arcade machine. Needless to say, ROMs\n" \ - "are not distributed together with HBMAME. Distribution of HBMAME together with ROM\n" \ - "images is a violation of copyright law and should be promptly reported to the\n" \ - "authors so that appropriate legal action can be taken.\n" -#define USAGE "Usage: %s [%s] [options]" -#define XML_ROOT "mame" -#define XML_TOP "game" -#define STATE_MAGIC_NUM "MAMESAVE" +#define APPNAME "HBMAME" +#define APPNAME_LOWER "hbmame" +#define CONFIGNAME "hbmame" +#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttp://mamedev.org" +#define COPYRIGHT_INFO "\nMAME portions are copyright Nicola Salmoria and the MAME team.\n" \ + "HBMAME portions are copyright Robbbert." const char * emulator_info::get_appname() { return APPNAME;} const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;} const char * emulator_info::get_configname() { return CONFIGNAME;} -const char * emulator_info::get_capgamenoun() { return CAPGAMENOUN;} -const char * emulator_info::get_capstartgamenoun() { return CAPSTARTGAMENOUN;} -const char * emulator_info::get_gamenoun() { return GAMENOUN;} -const char * emulator_info::get_gamesnoun() { return GAMESNOUN;} const char * emulator_info::get_copyright() { return COPYRIGHT;} const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;} -const char * emulator_info::get_disclaimer() { return DISCLAIMER;} -const char * emulator_info::get_usage() { return USAGE;} -const char * emulator_info::get_xml_root() { return XML_ROOT;} -const char * emulator_info::get_xml_top() { return XML_TOP;} -const char * emulator_info::get_state_magic_num() { return STATE_MAGIC_NUM;} -void emulator_info::printf_usage(const char *par1, const char *par2) { osd_printf_info(USAGE, par1, par2); } diff --git a/docs/release/src/hbmame/hbmame.lst b/docs/release/src/hbmame/hbmame.lst index f1d2fff1377..d7211db790c 100644 --- a/docs/release/src/hbmame/hbmame.lst +++ b/docs/release/src/hbmame/hbmame.lst @@ -219,6 +219,7 @@ wofch wofch_v3 wofchdx wofchdx1 +wofchdx2 wofjcn // chinese language woffr /* Neo-Arc French Trans */ wofjh @@ -367,6 +368,7 @@ wbeast /* Bootleg of War-of-Bug */ gaunt2 // parent gaunt2ls // Orange Elf - new levels gaunt2s /* Speed Hack */ +gaunt2f // graphics hack /* gottlieb */ qbert /* GV-103 (c) 1982 Gottlieb */ @@ -648,6 +650,7 @@ kof98c20150827 kof98c20151103 kof98c20151108 kof98c20151110 +kof98c20151223 kof98cd kof98cd1 kof98ch @@ -928,15 +931,19 @@ kof2k1z2 /* kof2002 */ kof2002d kof2002x +kof2k2ath kof2k2b // no sound in attract mode kof2k2b1 kof2k2bh kof2k2bjh kof2k2bjo kof2k2bld +kof2k2blood2 kof2k2br kof2k2br1 kof2k2br2 +kof2k2bs +kof2k2c2 kof2k2cf1 kof2k2cf2 kof2k2cf3 @@ -945,6 +952,8 @@ kof2k2ch kof2k2chl kof2k2cl2 kof2k2cl3 +kof2k2cn +kof2k2cori kof2k2dbh kof2k2e1 kof2k2e2 @@ -960,6 +969,7 @@ kof2k2fy kof2k2gc kof2k2gc2 kof2k2gf +kof2k2green kof2k2ht kof2k2ibp kof2k2ic1 @@ -967,6 +977,8 @@ kof2k2ic2 kof2k2ice kof2k2jc kof2k2js +kof2k2js2 +kof2k2js4 kof2k2k2 kof2k2k3o kof2k2k32 @@ -984,7 +996,15 @@ kof2k2k3d kof2k2k3e kof2k2k3f kof2k2k3g +kof2k2kai kof2k2kc +kof2k2kc2 +kof2k2kk +kof2k2lb // no sound in attract mode +kof2k2leon +kof2k2mcr +kof2k2moi2 +kof2k2moir // no sound in attract mode kof2k2mp1 /* Magic Plus */ kof2k2mp3 /* Magic Plus III - Ismamj */ kof2k2mpu @@ -1011,6 +1031,7 @@ kof2k2ra kof2k2rgl // no sound in attract mode kof2k2rm kof2k2rma +kof2k2rmb kof2k2rm1 kof2k2rm2 kof2k2rm3 @@ -2166,7 +2187,7 @@ powerins // parent powernbr // Brazil translation /* psikyosh */ -s1945ii +s1945ii // parent s1945iiex /* rallyx */ diff --git a/docs/release/src/hbmame/video/cps1.cpp b/docs/release/src/hbmame/video/cps1.cpp index f4d838b5bd9..280aee37f79 100644 --- a/docs/release/src/hbmame/video/cps1.cpp +++ b/docs/release/src/hbmame/video/cps1.cpp @@ -1721,6 +1721,7 @@ static const struct CPS1config cps1_config_table[]= {"wofch_v3", CPS_B_21_DEF, mapper_sfzch }, //works {"wofchdx", CPS_B_21_DEF, mapper_sfzch }, //works {"wofchdx1", CPS_B_21_DEF, mapper_TK263B }, //works + {"wofchdx2", CPS_B_21_DEF, mapper_TK263B }, //works {"wofjcn", CPS_B_21_QS1, mapper_TK263B }, // problem with chinese language roms {"woffr", CPS_B_21_DEF, mapper_sfzch }, //works {"wofjh", CPS_B_21_QS1, mapper_TK263B }, //works diff --git a/docs/release/src/osd/winui/properties.cpp b/docs/release/src/osd/winui/properties.cpp index 273dcfe708b..5a5e9eb6603 100644 --- a/docs/release/src/osd/winui/properties.cpp +++ b/docs/release/src/osd/winui/properties.cpp @@ -130,6 +130,7 @@ b) Exit the dialog. #include "properties.h" #include "drivenum.h" #include "machine/ram.h" +#include "ui/moptions.h" #if defined(__GNUC__) @@ -231,9 +232,9 @@ static struct ComboBoxVideo { { TEXT("Auto"), "auto" }, { TEXT("GDI"), "gdi" }, - { TEXT("DirectDraw"), "ddraw" }, +// { TEXT("DirectDraw"), "ddraw" }, // removed 20160217 { TEXT("Direct3D"), "d3d" }, -// { TEXT("BGFX"), "bgfx" }, + { TEXT("BGFX"), "bgfx" }, { TEXT("OpenGL"), "opengl" }, }; #define NUMVIDEO (sizeof(g_ComboBoxVideo) / sizeof(g_ComboBoxVideo[0])) @@ -1569,7 +1570,7 @@ static void SetPropEnabledControls(HWND hWnd) // auto is a reserved word bool autov = (core_stricmp(pCurrentOpts.value(OSDOPTION_VIDEO), "auto")==0); bool d3d = (core_stricmp(pCurrentOpts.value(OSDOPTION_VIDEO), "d3d")==0) | autov; - bool ddraw = (core_stricmp(pCurrentOpts.value(OSDOPTION_VIDEO), "ddraw")==0) | autov; + bool ddraw = 0;//(core_stricmp(pCurrentOpts.value(OSDOPTION_VIDEO), "ddraw")==0) | autov; //bool gdi = (core_stricmp(pCurrentOpts.value(OSDOPTION_VIDEO), "gdi")==0) | autov; in_window = pCurrentOpts.bool_value(OSDOPTION_WINDOW); @@ -2496,7 +2497,7 @@ static void BuildDataMap(void) // core misc options datamap_add(properties_datamap, IDC_BIOS, DM_STRING, OPTION_BIOS); datamap_add(properties_datamap, IDC_CHEAT, DM_BOOL, OPTION_CHEAT); - datamap_add(properties_datamap, IDC_SKIP_GAME_INFO, DM_BOOL, OPTION_SKIP_GAMEINFO); + //datamap_add(properties_datamap, IDC_SKIP_GAME_INFO, DM_BOOL, OPTION_UI_SKIP_GAMEINFO); // windows debugging options datamap_add(properties_datamap, IDC_OSLOG, DM_BOOL, OPTION_OSLOG); diff --git a/docs/release/src/version.cpp b/docs/release/src/version.cpp index 65db62b5d62..0e42f37eb5d 100644 --- a/docs/release/src/version.cpp +++ b/docs/release/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.170" +#define BARE_BUILD_VERSION "0.171" extern const char bare_build_version[]; extern const char build_version[]; |