diff options
author | Robbbert <Robbbert@users.noreply.github.com> | 2021-07-28 12:58:54 +1000 |
---|---|---|
committer | Robbbert <Robbbert@users.noreply.github.com> | 2021-07-28 12:58:54 +1000 |
commit | d4ad20f87c886636c61069e1253ad1836f381690 (patch) | |
tree | 1f63ea5b1e016c9864424fffd9ceb4654e41de05 | |
parent | 956ccb5c4bcb75db93b18580d03a7d7d454d9a07 (diff) |
0.234 filestag234
25 files changed, 611 insertions, 307 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 833cb6e3712..173b0eee78e 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -1382,6 +1382,7 @@ end "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter "/wd4458", -- warning C4458: declaration of 'xxx' hides class member "/wd4459", -- warning C4459: declaration of 'xxx' hides global declaration + "/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable "/wd4702", -- warning C4702: unreachable code "/wd4706", -- warning C4706: assignment within conditional expression "/wd4804", -- warning C4804: '>>': unsafe use of type 'bool' in operation diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index f7aa6280533..e8b08df8f0c 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -197,6 +197,7 @@ end files { MAME_DIR .. "3rdparty/softfloat/softfloat.c", MAME_DIR .. "3rdparty/softfloat/fsincos.c", + MAME_DIR .. "3rdparty/softfloat/fpatan.c", MAME_DIR .. "3rdparty/softfloat/fyl2x.c", } diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index 5d4df6e5730..d889e7af294 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -1692,6 +1692,8 @@ if (BUSES["MSX_SLOT"]~=null) then MAME_DIR .. "src/devices/bus/msx_cart/disk.h", MAME_DIR .. "src/devices/bus/msx_cart/dooly.cpp", MAME_DIR .. "src/devices/bus/msx_cart/dooly.h", + MAME_DIR .. "src/devices/bus/msx_cart/easi_speech.cpp", + MAME_DIR .. "src/devices/bus/msx_cart/easi_speech.h", MAME_DIR .. "src/devices/bus/msx_cart/fmpac.cpp", MAME_DIR .. "src/devices/bus/msx_cart/fmpac.h", MAME_DIR .. "src/devices/bus/msx_cart/fs_sr022.cpp", @@ -2460,6 +2462,8 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/ezcgi.h", MAME_DIR .. "src/devices/bus/a2bus/grappler.cpp", MAME_DIR .. "src/devices/bus/a2bus/grappler.h", + MAME_DIR .. "src/devices/bus/a2bus/lancegs.cpp", + MAME_DIR .. "src/devices/bus/a2bus/lancegs.h", MAME_DIR .. "src/devices/bus/a2bus/laser128.cpp", MAME_DIR .. "src/devices/bus/a2bus/laser128.h", MAME_DIR .. "src/devices/bus/a2bus/mouse.cpp", @@ -2474,6 +2478,8 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/ramcard16k.h", MAME_DIR .. "src/devices/bus/a2bus/sider.cpp", MAME_DIR .. "src/devices/bus/a2bus/sider.h", + MAME_DIR .. "src/devices/bus/a2bus/softcard3.cpp", + MAME_DIR .. "src/devices/bus/a2bus/softcard3.h", MAME_DIR .. "src/devices/bus/a2bus/ssbapple.cpp", MAME_DIR .. "src/devices/bus/a2bus/ssbapple.h", MAME_DIR .. "src/devices/bus/a2bus/ssprite.cpp", @@ -4593,3 +4599,21 @@ if (BUSES["THOMSON"]~=null) then MAME_DIR .. "src/devices/bus/thomson/nanoreseau.h", } end + +--------------------------------------------------- +-- +--@src/devices/bus/pce_ctrl/pcectrl.h,BUSES["PCE_CTRL"] = true +--------------------------------------------------- + +if (BUSES["PCE_CTRL"]~=null) then + files { + MAME_DIR .. "src/devices/bus/pce_ctrl/pcectrl.cpp", + MAME_DIR .. "src/devices/bus/pce_ctrl/pcectrl.h", + MAME_DIR .. "src/devices/bus/pce_ctrl/joypad2.cpp", + MAME_DIR .. "src/devices/bus/pce_ctrl/joypad2.h", + MAME_DIR .. "src/devices/bus/pce_ctrl/joypad6.cpp", + MAME_DIR .. "src/devices/bus/pce_ctrl/joypad6.h", + MAME_DIR .. "src/devices/bus/pce_ctrl/multitap.cpp", + MAME_DIR .. "src/devices/bus/pce_ctrl/multitap.h", + } +end diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index fa655d8b60b..de81507f8a9 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -3218,8 +3218,8 @@ if CPUS["F2MC16"] then end if opt_tool(CPUS, "F2MC16") then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16dasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16dasm.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16d.h") end -------------------------------------------------- diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 80e642a5b24..6e1280ac505 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -3282,6 +3282,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/tmc0999.h,MACHINES["TMC0999"] = true +--------------------------------------------------- + +if (MACHINES["TMC0999"]~=null) then + files { + MAME_DIR .. "src/devices/machine/tmc0999.cpp", + MAME_DIR .. "src/devices/machine/tmc0999.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/tmc208k.h,MACHINES["TMC208K"] = true --------------------------------------------------- @@ -3802,13 +3814,13 @@ end --------------------------------------------------- -- ---@src/devices/machine/ncr5380n.h,MACHINES["NCR5380N"] = true +--@src/devices/machine/ncr5380.h,MACHINES["NCR5380"] = true --------------------------------------------------- -if (MACHINES["NCR5380N"]~=null) then +if (MACHINES["NCR5380"]~=null) then files { - MAME_DIR .. "src/devices/machine/ncr5380n.cpp", - MAME_DIR .. "src/devices/machine/ncr5380n.h", + MAME_DIR .. "src/devices/machine/ncr5380.cpp", + MAME_DIR .. "src/devices/machine/ncr5380.h", } end diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua index dbd271989ca..b61b5ffb0f7 100644 --- a/docs/release/scripts/src/video.lua +++ b/docs/release/scripts/src/video.lua @@ -807,18 +807,6 @@ end -------------------------------------------------- -- ---@src/devices/video/polylgcy.h,VIDEOS["POLY"] = true --------------------------------------------------- - -if (VIDEOS["POLY"]~=null) then - files { - MAME_DIR .. "src/devices/video/polylgcy.cpp", - MAME_DIR .. "src/devices/video/polylgcy.h", - } -end - --------------------------------------------------- --- --@src/devices/video/psx.h,VIDEOS["PSX"] = true -------------------------------------------------- @@ -1156,8 +1144,13 @@ if (VIDEOS["VOODOO"]~=null) then files { MAME_DIR .. "src/devices/video/voodoo.cpp", MAME_DIR .. "src/devices/video/voodoo.h", - MAME_DIR .. "src/devices/video/vooddefs.ipp", - MAME_DIR .. "src/devices/video/voodoo_rast.ipp", + MAME_DIR .. "src/devices/video/voodoo_2.cpp", + MAME_DIR .. "src/devices/video/voodoo_2.h", + MAME_DIR .. "src/devices/video/voodoo_banshee.cpp", + MAME_DIR .. "src/devices/video/voodoo_banshee.h", + MAME_DIR .. "src/devices/video/voodoo_regs.h", + MAME_DIR .. "src/devices/video/voodoo_render.cpp", + MAME_DIR .. "src/devices/video/voodoo_render.h", } end diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index 226ac6a4324..be5c46c559c 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -589,7 +589,7 @@ MACHINES["MSM5832"] = true MACHINES["MSM58321"] = true MACHINES["MSM6242"] = true MACHINES["MSM6253"] = true -MACHINES["NCR5380N"] = true +MACHINES["NCR5380"] = true MACHINES["NCR5390"] = true MACHINES["NCR539x"] = true MACHINES["NETLIST"] = true @@ -803,6 +803,7 @@ BUSES["NSCSI"] = true --BUSES["O2"] = true --BUSES["ORICEXT"] = true --BUSES["PCE"] = true +--BUSES["PCE_CTRL"] = true BUSES["PC_JOY"] = true BUSES["PC_KBD"] = true --BUSES["PET"] = true @@ -1323,8 +1324,6 @@ files { MAME_DIR .. "src/mame/includes/relief.h", MAME_DIR .. "src/mame/video/relief.cpp", MAME_DIR .. "src/mame/drivers/runaway.cpp", - MAME_DIR .. "src/mame/includes/runaway.h", - MAME_DIR .. "src/mame/video/runaway.cpp", MAME_DIR .. "src/mame/drivers/sbrkout.cpp", MAME_DIR .. "src/mame/drivers/shuuz.cpp", MAME_DIR .. "src/mame/includes/shuuz.h", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index 15e31fd7400..4ef88975da0 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -363,7 +363,7 @@ VIDEOS["HD44780"] = true VIDEOS["HD61202"] = true VIDEOS["HD61603"] = true VIDEOS["HD61830"] = true ---VIDEOS["HD63484"] = true +VIDEOS["HD63484"] = true VIDEOS["HD66421"] = true VIDEOS["HLCD0438"] = true VIDEOS["HLCD0488"] = true @@ -625,7 +625,7 @@ MACHINES["MSM58321"] = true MACHINES["MSM6242"] = true --MACHINES["MSM6253"] = true MACHINES["MYB3K_KEYBOARD"] = true -MACHINES["NCR5380N"] = true +MACHINES["NCR5380"] = true MACHINES["NCR5385"] = true MACHINES["NCR5390"] = true MACHINES["NCR539x"] = true @@ -700,6 +700,7 @@ MACHINES["TDC1008"] = true --MACHINES["TE7750"] = true MACHINES["TIMEKPR"] = true MACHINES["TMC0430"] = true +MACHINES["TMC0999"] = true MACHINES["TMC208K"] = true MACHINES["TMP68301"] = true MACHINES["TMS5501"] = true @@ -715,7 +716,7 @@ MACHINES["TTL74123"] = true MACHINES["TTL74145"] = true MACHINES["TTL74148"] = true MACHINES["TTL74153"] = true ---MACHINES["TTL74157"] = true +MACHINES["TTL74157"] = true MACHINES["TTL74161"] = true MACHINES["TTL74164"] = true MACHINES["TTL74175"] = true @@ -930,6 +931,7 @@ BUSES["PC_JOY"] = true BUSES["PC_KBD"] = true BUSES["PC1512"] = true BUSES["PCE"] = true +BUSES["PCE_CTRL"] = true BUSES["PET"] = true BUSES["PLUS4"] = true BUSES["POFO"] = true @@ -1674,6 +1676,7 @@ files { MAME_DIR .. "src/mame/drivers/apricot.cpp", MAME_DIR .. "src/mame/drivers/apricotf.cpp", MAME_DIR .. "src/mame/drivers/apricotp.cpp", + MAME_DIR .. "src/mame/drivers/apxen.cpp", MAME_DIR .. "src/mame/machine/apricotkb.cpp", MAME_DIR .. "src/mame/machine/apricotkb.h", MAME_DIR .. "src/mame/drivers/victor9k.cpp", @@ -1899,6 +1902,7 @@ files { MAME_DIR .. "src/mame/machine/lynx.cpp", MAME_DIR .. "src/mame/drivers/pofo.cpp", MAME_DIR .. "src/mame/machine/pofo_kbd.cpp", + MAME_DIR .. "src/mame/machine/pofo_kbd.h", MAME_DIR .. "src/mame/drivers/tvboy.cpp", } @@ -2020,6 +2024,7 @@ files { MAME_DIR .. "src/mame/drivers/pv1000.cpp", MAME_DIR .. "src/mame/drivers/pv2000.cpp", MAME_DIR .. "src/mame/drivers/sk1.cpp", + MAME_DIR .. "src/mame/drivers/sx1000.cpp", MAME_DIR .. "src/mame/drivers/rz1.cpp", MAME_DIR .. "src/mame/drivers/casio_rompack.cpp", } @@ -2453,6 +2458,7 @@ files { MAME_DIR .. "src/mame/drivers/fidel_dames.cpp", MAME_DIR .. "src/mame/drivers/fidel_desdis.cpp", MAME_DIR .. "src/mame/drivers/fidel_eag68k.cpp", + MAME_DIR .. "src/mame/drivers/fidel_eldorado.cpp", MAME_DIR .. "src/mame/drivers/fidel_elite.cpp", MAME_DIR .. "src/mame/drivers/fidel_excel.cpp", MAME_DIR .. "src/mame/drivers/fidel_msc.cpp", @@ -2968,8 +2974,9 @@ files { createMESSProjects(_target, _subtarget, "microterm") files { MAME_DIR .. "src/mame/drivers/ergo201.cpp", - MAME_DIR .. "src/mame/drivers/microterm.cpp", MAME_DIR .. "src/mame/drivers/microterm_f8.cpp", + MAME_DIR .. "src/mame/drivers/mt420.cpp", + MAME_DIR .. "src/mame/drivers/mt5510.cpp", } createMESSProjects(_target, _subtarget, "mips") @@ -3062,6 +3069,7 @@ files { MAME_DIR .. "src/mame/drivers/hh_cop400.cpp", MAME_DIR .. "src/mame/drivers/hh_cops1.cpp", MAME_DIR .. "src/mame/drivers/ns5652.cpp", + MAME_DIR .. "src/mame/drivers/ns32kdb.cpp", } createMESSProjects(_target, _subtarget, "ncd") @@ -3121,7 +3129,6 @@ files { MAME_DIR .. "src/mame/drivers/elf.cpp", MAME_DIR .. "src/mame/includes/elf.h", MAME_DIR .. "src/mame/drivers/exp85.cpp", - MAME_DIR .. "src/mame/includes/exp85.h", } createMESSProjects(_target, _subtarget, "next") @@ -3776,6 +3783,7 @@ files { MAME_DIR .. "src/mame/drivers/betacam.cpp", MAME_DIR .. "src/mame/drivers/bvm.cpp", MAME_DIR .. "src/mame/drivers/dfs500.cpp", + MAME_DIR .. "src/mame/drivers/dpsv55.cpp", MAME_DIR .. "src/mame/drivers/pockstat.cpp", MAME_DIR .. "src/mame/drivers/psx.cpp", MAME_DIR .. "src/mame/machine/psxcd.cpp", diff --git a/docs/release/src/emu/validity.cpp b/docs/release/src/emu/validity.cpp index 78b75a7ae43..757c446e394 100644 --- a/docs/release/src/emu/validity.cpp +++ b/docs/release/src/emu/validity.cpp @@ -1706,7 +1706,7 @@ void validity_checker::validate_roms(device_t &root) // analog input field //------------------------------------------------- -void validity_checker::validate_analog_input_field(ioport_field &field) +void validity_checker::validate_analog_input_field(const ioport_field &field) { // analog ports must have a valid sensitivity if (field.sensitivity() == 0) @@ -1787,7 +1787,7 @@ void validity_checker::validate_analog_input_field(ioport_field &field) // setting //------------------------------------------------- -void validity_checker::validate_dip_settings(ioport_field &field) +void validity_checker::validate_dip_settings(const ioport_field &field) { const char *demo_sounds = ioport_string_from_index(INPUT_STRING_Demo_Sounds); const char *flipscreen = ioport_string_from_index(INPUT_STRING_Flip_Screen); @@ -1795,30 +1795,31 @@ void validity_checker::validate_dip_settings(ioport_field &field) bool coin_error = false; // iterate through the settings - for (ioport_setting &setting : field.settings()) + for (auto setting = field.settings().begin(); field.settings().end() != setting; ++setting) { // note any coinage strings - int strindex = get_defstr_index(setting.name()); + int strindex = get_defstr_index(setting->name()); if (strindex >= __input_string_coinage_start && strindex <= __input_string_coinage_end) coin_list[strindex - __input_string_coinage_start] = 1; // make sure demo sounds default to on - if (field.name() == demo_sounds && strindex == INPUT_STRING_On && field.defvalue() != setting.value()) + if (field.name() == demo_sounds && strindex == INPUT_STRING_On && field.defvalue() != setting->value()) osd_printf_error("Demo Sounds must default to On\n"); // check for bad demo sounds options if (field.name() == demo_sounds && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No)) - osd_printf_error("Demo Sounds option must be Off/On, not %s\n", setting.name()); + osd_printf_error("Demo Sounds option must be Off/On, not %s\n", setting->name()); // check for bad flip screen options if (field.name() == flipscreen && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No)) - osd_printf_error("Flip Screen option must be Off/On, not %s\n", setting.name()); + osd_printf_error("Flip Screen option must be Off/On, not %s\n", setting->name()); // if we have a neighbor, compare ourselves to him - if (setting.next() != nullptr) + auto const nextsetting = std::next(setting); + if (field.settings().end() != nextsetting) { // check for inverted off/on dispswitch order - int next_strindex = get_defstr_index(setting.next()->name(), true); + int next_strindex = get_defstr_index(nextsetting->name(), true); if (strindex == INPUT_STRING_On && next_strindex == INPUT_STRING_Off) osd_printf_error("%s option must have Off/On options in the order: Off, On\n", field.name()); @@ -1832,9 +1833,9 @@ void validity_checker::validate_dip_settings(ioport_field &field) // check for proper coin ordering else if (strindex >= __input_string_coinage_start && strindex <= __input_string_coinage_end && next_strindex >= __input_string_coinage_start && next_strindex <= __input_string_coinage_end && - strindex >= next_strindex && setting.condition() == setting.next()->condition()) + strindex >= next_strindex && setting->condition() == nextsetting->condition()) { - osd_printf_error("%s option has unsorted coinage %s > %s\n", field.name(), setting.name(), setting.next()->name()); + osd_printf_error("%s option has unsorted coinage %s > %s\n", field.name(), setting->name(), nextsetting->name()); coin_error = true; } } @@ -1856,7 +1857,7 @@ void validity_checker::validate_dip_settings(ioport_field &field) // stored within an ioport field or setting //------------------------------------------------- -void validity_checker::validate_condition(ioport_condition &condition, device_t &device) +void validity_checker::validate_condition(const ioport_condition &condition, device_t &device) { // resolve the tag, then find a matching port if (m_ioport_set.find(device.subtag(condition.tag())) == m_ioport_set.end()) @@ -1916,7 +1917,7 @@ void validity_checker::validate_inputs(device_t &root) } // iterate through the fields on this port - for (ioport_field &field : port.second->fields()) + for (ioport_field const &field : port.second->fields()) { // verify analog inputs if (field.is_analog()) @@ -1973,7 +1974,7 @@ void validity_checker::validate_inputs(device_t &root) validate_condition(field.condition(), device); // verify conditions on the settings - for (ioport_setting &setting : field.settings()) + for (ioport_setting const &setting : field.settings()) if (!setting.condition().none()) validate_condition(setting.condition(), device); diff --git a/docs/release/src/frontend/mame/clifront.cpp b/docs/release/src/frontend/mame/clifront.cpp index c2aabd15015..fd8b6463012 100644 --- a/docs/release/src/frontend/mame/clifront.cpp +++ b/docs/release/src/frontend/mame/clifront.cpp @@ -37,6 +37,8 @@ #include <algorithm> #include <new> +#include <set> +#include <tuple> #include <cctype> @@ -547,53 +549,82 @@ void cli_frontend::listroms(const std::vector<std::string> &args) osd_printf_info("\n"); // iterate through ROMs - bool hasroms = false; + std::list<std::tuple<std::string, int64_t, std::string>> entries; + std::set<std::string_view> devnames; for (device_t const &device : device_enumerator(root)) { + bool hasroms = false; for (const rom_entry *region = rom_first_region(device); region; region = rom_next_region(region)) { for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom)) { - // print a header if (!hasroms) - osd_printf_info( - "ROMs required for %s \"%s\".\n" - "%-32s %10s %s\n", - type, root.shortname(), "Name", "Size", "Checksum"); - hasroms = true; + { + hasroms = true; + if (&device != &root) + devnames.insert(device.shortname()); + } // accumulate the total length of all chunks int64_t length = -1; if (ROMREGION_ISROMDATA(region)) length = rom_file_size(rom); - // start with the name - osd_printf_info("%-32s ", rom->name()); + entries.emplace_back(rom->name(), length, rom->hashdata()); + } + } + } - // output the length next - if (length >= 0) - osd_printf_info("%10u", unsigned(uint64_t(length))); + // print results + if (entries.empty()) + osd_printf_info("No ROMs required for %s \"%s\".\n", type, root.shortname()); + else + { + // print a header + osd_printf_info("ROMs required for %s \"%s\"", type, root.shortname()); + if (!devnames.empty()) + { + osd_printf_info(" (including device%s", devnames.size() > 1 ? "s" : ""); + bool first = true; + for (const std::string_view &devname : devnames) + { + if (first) + first = false; else - osd_printf_info("%10s", ""); + osd_printf_info(","); + osd_printf_info(" \"%s\"", devname); + } + osd_printf_info(")"); + } + osd_printf_info(".\n%-32s %10s %s\n", "Name", "Size", "Checksum"); - // output the hash data - util::hash_collection hashes(rom->hashdata()); - if (!hashes.flag(util::hash_collection::FLAG_NO_DUMP)) - { - if (hashes.flag(util::hash_collection::FLAG_BAD_DUMP)) - osd_printf_info(" BAD"); - osd_printf_info(" %s", hashes.macro_string()); - } - else - osd_printf_info(" NO GOOD DUMP KNOWN"); + for (auto &entry : entries) + { + // start with the name + osd_printf_info("%-32s ", std::get<0>(entry)); + + // output the length next + int64_t length = std::get<1>(entry); + if (length >= 0) + osd_printf_info("%10u", unsigned(uint64_t(length))); + else + osd_printf_info("%10s", ""); - // end with a CR - osd_printf_info("\n"); + // output the hash data + util::hash_collection hashes(std::get<2>(entry)); + if (!hashes.flag(util::hash_collection::FLAG_NO_DUMP)) + { + if (hashes.flag(util::hash_collection::FLAG_BAD_DUMP)) + osd_printf_info(" BAD"); + osd_printf_info(" %s", hashes.macro_string()); } + else + osd_printf_info(" NO GOOD DUMP KNOWN"); + + // end with a CR + osd_printf_info("\n"); } } - if (!hasroms) - osd_printf_info("No ROMs required for %s \"%s\".\n", type, root.shortname()); }); } diff --git a/docs/release/src/hbmame/drivers/dkong.cpp b/docs/release/src/hbmame/drivers/dkong.cpp index 64e7c69838a..2281354e94c 100644 --- a/docs/release/src/hbmame/drivers/dkong.cpp +++ b/docs/release/src/hbmame/drivers/dkong.cpp @@ -782,6 +782,62 @@ ROM_START( dkongbp ) ROM_LOAD( "v-5e.bpr", 0x0200, 0x0100, CRC(b869b8f5) SHA1(c2bdccbf2654b64ea55cd589fd21323a9178a660) ) ROM_END +ROM_START( dkongbp1 ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "dkongbp.5et", 0x0000, 0x1000, CRC(c80c0431) SHA1(446e897150d027f797edbe30d0502f5f5a652ba7) ) + ROM_LOAD( "dkongbp.5ct", 0x1000, 0x1000, CRC(c742739c) SHA1(a143af813f7c23b6bab483ad2610e686ebc568da) ) + ROM_LOAD( "dkongbp.5bt", 0x2000, 0x1000, CRC(a46859ec) SHA1(bbe8a32b7396f6347ce8b4a77b760277fb965551) ) + ROM_LOAD( "dkongbp.5at", 0x3000, 0x1000, CRC(4742a48e) SHA1(ddef0c7e25cbeba37a387de1d72583a2861dbbf4) ) + + ROM_REGION( 0x1800, "soundcpu", 0 ) + ROM_LOAD( "dkongbp.3i", 0x0000, 0x0800, CRC(7590f5ee) SHA1(b08245ce86d2c2de1b0d000743b7e9fcdf2ee215) ) + ROM_RELOAD( 0x0800, 0x0800 ) + ROM_LOAD( "s_3j_b.bin", 0x1000, 0x0800, CRC(4743fe92) SHA1(6c82b57637c0212a580591397e6a5a1718f19fd2) ) + + ROM_REGION( 0x1000, "gfx1", 0 ) + ROM_LOAD( "dkongbp.5h", 0x0000, 0x0800, CRC(caf8820b) SHA1(b3e5768bd19c16510d05cd9d5d7ad72e05d08a8c) ) + ROM_LOAD( "dkongbp.3pt", 0x0800, 0x0800, CRC(b0cd1e84) SHA1(16f8404114e3f62e0789819f6a65f34189b595bc) ) + + ROM_REGION( 0x2000, "gfx2", 0 ) + ROM_LOAD( "dkongbp.4m", 0x0000, 0x0800, CRC(1b46aae1) SHA1(f08c57f2c85df81180444cab76acb4f367d71619) ) + ROM_LOAD( "dkongbp.4n", 0x0800, 0x0800, CRC(fbaaa6f0) SHA1(e61e92418270fb81d9fd33da0a92970d458f69e4) ) + ROM_LOAD( "dkongbp.4r", 0x1000, 0x0800, CRC(919362a0) SHA1(5df953cded45ad55ba2bbd5f6d5c7e4577dcaa5f) ) + ROM_LOAD( "dkongbp.4s", 0x1800, 0x0800, CRC(d57098ca) SHA1(b746b0e137844e0e1cb715df065bbf7a3246f2e9) ) + + ROM_REGION( 0x0300, "proms", 0 ) + ROM_LOAD( "dkongbp.2k", 0x0000, 0x0100, CRC(4826ce71) SHA1(5fe7d63ce7adece81ab8930196434410fbe4e241) ) + ROM_LOAD( "dkongbp.2j", 0x0100, 0x0100, CRC(4a7a511b) SHA1(c0d3ee62e5f6e22d24603ab24403b206d043956f) ) + ROM_LOAD( "v-5e.bpr", 0x0200, 0x0100, CRC(b869b8f5) SHA1(c2bdccbf2654b64ea55cd589fd21323a9178a660) ) +ROM_END + +ROM_START( dkongan ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "dkongan.5et", 0x0000, 0x1000, CRC(cf44c2dd) SHA1(26776fa00250fbffdc1cb2ef012f851cffd67b3d) ) + ROM_LOAD( "dkongan.5ct", 0x1000, 0x1000, CRC(34238a95) SHA1(a997989a33d5ad8dc77483781de12fd161e57f39) ) + ROM_LOAD( "dkongan.5bt", 0x2000, 0x1000, CRC(6c5614e5) SHA1(cf8a31c303eb18260cc328593f365ebd9d81fb5c) ) + ROM_LOAD( "dkongan.5at", 0x3000, 0x1000, CRC(0b92803c) SHA1(01bb401837ddeeb5ff36d98eebde9a5819ac19e8) ) + + ROM_REGION( 0x1800, "soundcpu", 0 ) + ROM_LOAD( "dkongan.3i", 0x0000, 0x0800, CRC(44993c29) SHA1(7beeae49df5126bbf268dc66bb61e6a8b832fa31) ) + ROM_RELOAD( 0x0800, 0x0800 ) + ROM_LOAD( "dkongan.3j", 0x1000, 0x0800, CRC(4743fe92) SHA1(6c82b57637c0212a580591397e6a5a1718f19fd2) ) + + ROM_REGION( 0x1000, "gfx1", 0 ) + ROM_LOAD( "dkongan.5h", 0x0000, 0x0800, CRC(ae4c3990) SHA1(20db41211bfdc6b79198fc8cd022465468430059) ) + ROM_LOAD( "dkongan.3pt", 0x0800, 0x0800, CRC(25cc07d4) SHA1(62374e89c79527cb78a70f83781299d4786bcec0) ) + + ROM_REGION( 0x2000, "gfx2", 0 ) + ROM_LOAD( "dkongan.4m", 0x0000, 0x0800, CRC(410ab9a2) SHA1(c98f2053bc2f2140209ac2d8d0a7c1f489ec429c) ) + ROM_LOAD( "dkongan.4n", 0x0800, 0x0800, CRC(4f7e8fd4) SHA1(b031f512a40d6cdd430cc57f470efe53e55fbad7) ) + ROM_LOAD( "dkongan.4r", 0x1000, 0x0800, CRC(9eb470c0) SHA1(58644eed4c4f0b714f51147fbf77b9c2ee18ad2c) ) + ROM_LOAD( "dkongan.4s", 0x1800, 0x0800, CRC(73ef61cc) SHA1(7736e1451a36f1b9b20108c0d5f6ba861602d307) ) + + ROM_REGION( 0x0300, "proms", 0 ) + ROM_LOAD( "c-2k.bpr", 0x0000, 0x0100, CRC(e273ede5) SHA1(b50ec9e1837c00c20fb2a4369ec7dd0358321127) ) + ROM_LOAD( "c-2j.bpr", 0x0100, 0x0100, CRC(d6412358) SHA1(f9c872da2fe8e800574ae3bf483fb3ccacc92eb3) ) + ROM_LOAD( "v-5e.bpr", 0x0200, 0x0100, CRC(b869b8f5) SHA1(c2bdccbf2654b64ea55cd589fd21323a9178a660) ) +ROM_END + GAME( 1981, dkongbcc, dkong, dkong2b, dkong, dkong_state, empty_init, ROT270, "Jeff Kulczycki", "Donkey Kong (US set 1 with barrel control coloring)", MACHINE_SUPPORTS_SAVE ) @@ -810,5 +866,7 @@ GAME( 2020, dkongotr, dkong, dkong2b, dkong, dkong_state, empty_init, ROT GAME( 2020, dkongitd, dkong, dkong2b, dkong, dkong_state, empty_init, ROT270, "Paul Goes", "Donkey Kong In the Dark v1.02", MACHINE_SUPPORTS_SAVE ) GAME( 2021, dkongtj, dkong, dkong2b, dkong, dkong_state, empty_init, ROT270, "Paul Goes", "Donkey Kong Twisted Jungle v1.05", MACHINE_SUPPORTS_SAVE ) GAME( 2021, dkongbp, dkong, dkong2b, dkong, dkong_state, empty_init, ROT270, "Paul Goes", "Donkey Kong Barrelpalooza v1.06", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, dkongbp1, dkong, dkong2b, dkong, dkong_state, empty_init, ROT270, "Paul Goes", "Donkey Kong Barrelpalooza v1.07", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, dkongan, dkong, dkong2b, dkong, dkong_state, empty_init, ROT270, "Paul Goes", "Donkey Kong 40th Anniversary Edition", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/mhavoc_hb.cpp b/docs/release/src/hbmame/drivers/mhavoc_hb.cpp index 5263755dac4..020eeae0ade 100644 --- a/docs/release/src/hbmame/drivers/mhavoc_hb.cpp +++ b/docs/release/src/hbmame/drivers/mhavoc_hb.cpp @@ -306,7 +306,7 @@ void mhavoc_hbmame::mhavocrv(machine_config &config) /************************************* * - * ROM definitions + * Major Havoc The Promised End * *************************************/ @@ -322,6 +322,7 @@ void mhavoc_hbmame::mhavocrv(machine_config &config) // license:BSD-3-Clause // copyright-holders:Robbbert +// thanks-to: Jess M Askey (designer of mhavocrv and mhavocpex) void mhavoc_hbmame::gammape_map(address_map &map) @@ -340,6 +341,22 @@ void mhavoc_hbmame::gammape_map(address_map &map) map(0x8000, 0xffff).rom(); /* Program ROM (32K) */ } +//later mhavocpe versions ditched the old TMS5220 and used the OKIM6295 +void mhavoc_hbmame::gammape2_map(address_map &map) +{ + map(0x0000, 0x07ff).ram().mirror(0x1800); /* Program RAM (2K) */ + map(0x2000, 0x203f).rw(FUNC(mhavoc_hbmame::quad_pokeyn_r), FUNC(mhavoc_hbmame::quad_pokeyn_w)).mirror(0x07C0); /* Quad Pokey read/write */ + map(0x2800, 0x2800).portr("IN1").mirror(0x07ff); /* Gamma Input Port */ + map(0x3000, 0x3000).r(FUNC(mhavoc_hbmame::mhavoc_alpha_r)).mirror(0x07ff); /* Alpha Comm. Read Port */ + map(0x3800, 0x3803).portr("DIAL").mirror(0x07fc); /* Roller Controller Input */ + map(0x4000, 0x4000).portr("DSW2").w(FUNC(mhavoc_hbmame::mhavoc_gamma_irq_ack_w)).mirror(0x07ff); /* DSW at 8S, IRQ Acknowledge */ + map(0x4800, 0x4800).w(FUNC(mhavoc_hbmame::mhavoc_out_1_w)).mirror(0x07ff); /* Coin Counters */ + map(0x5000, 0x5000).w(FUNC(mhavoc_hbmame::mhavoc_alpha_w)).mirror(0x07ff); /* Alpha Comm. Write Port */ + map(0x5900, 0x5900).w("oki", FUNC(okim6295_device::write)); + map(0x6000, 0x61ff).rw("eeprom", FUNC(eeprom_parallel_28xx_device::read), FUNC(eeprom_parallel_28xx_device::write)).mirror(0x1e00); /* EEROM */ + map(0x8000, 0xbfff).rom().mirror(0x4000); +} + void mhavoc_hbmame::alphape_map(address_map &map) { map(0x0000, 0x01ff).ram(); @@ -386,26 +403,40 @@ void mhavoc_hbmame::mhavocpe(machine_config &config) /* create BETA */ M6502(config, m_beta, MHAVOC_CLOCK_2_5M); /* 2.5 MHz */ m_beta->set_addrmap(AS_PROGRAM, &mhavoc_hbmame::betape_map); - +} + +void mhavoc_hbmame::mhavocpe2(machine_config &config) +{ + mhavoc(config); + + /* set updated maps */ + m_alpha->set_addrmap(AS_PROGRAM, &mhavoc_hbmame::alphape_map); + m_gamma->set_addrmap(AS_PROGRAM, &mhavoc_hbmame::gammape2_map); + /* create BETA */ + //M6502(config, m_beta, MHAVOC_CLOCK_2_5M); /* 2.5 MHz */ + //m_beta->set_addrmap(AS_PROGRAM, &mhavoc_hbmame::betape_map); + /* Put OKI on GAMMA */ + OKIM6295(config, m_oki, OKI_CLOCK, okim6295_device::PIN7_HIGH); + m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); } ROM_START( mhavocpex1 ) ROM_REGION( 0x2000, "vectorrom", 0 ) - ROM_LOAD( "mhpe1.6kl", 0x00000, 0x2000, CRC(4c05b1a8) SHA1(89b524182fcfd966d6a7e3188235c957c451b8a9) ) + ROM_LOAD( "mhavocpex1.6kl", 0x00000, 0x2000, CRC(4c05b1a8) SHA1(89b524182fcfd966d6a7e3188235c957c451b8a9) ) ROM_REGION( 0x20000, "alpha", 0 ) - ROM_LOAD( "mhpe1.1mn", 0x08000, 0x4000, CRC(3b691eff) SHA1(e8227d1458e3ed4d0e8444ec23f2c2d45a0d93b8) ) - ROM_LOAD( "mhpe1.1l", 0x0c000, 0x4000, CRC(fb53dae6) SHA1(08e9bd60e801778d3521d64817a10ba1ed74f4ff) ) - ROM_LOAD( "mhpe1.1q", 0x10000, 0x8000, CRC(660e3d57) SHA1(6eddf1335c536406080eab73f5501a202fb0583d) ) - ROM_LOAD( "mhpe1.1np", 0x18000, 0x8000, CRC(c1a70bad) SHA1(0b72b6817e2f00d2c001ac61ebd2cd42ff7785c9) ) + ROM_LOAD( "mhavocpex1.1mn", 0x08000, 0x4000, CRC(3b691eff) SHA1(e8227d1458e3ed4d0e8444ec23f2c2d45a0d93b8) ) + ROM_LOAD( "mhavocpex1.1l", 0x0c000, 0x4000, CRC(fb53dae6) SHA1(08e9bd60e801778d3521d64817a10ba1ed74f4ff) ) + ROM_LOAD( "mhavocpex1.1q", 0x10000, 0x8000, CRC(660e3d57) SHA1(6eddf1335c536406080eab73f5501a202fb0583d) ) + ROM_LOAD( "mhavocpex1.1np", 0x18000, 0x8000, CRC(c1a70bad) SHA1(0b72b6817e2f00d2c001ac61ebd2cd42ff7785c9) ) ROM_REGION( 0x8000, "avg", 0 ) - ROM_LOAD( "mhpe1.6h", 0x0000, 0x4000, CRC(79fc58c0) SHA1(7b40dfb89bc4078e2bd6f89a570f2be9cca15df9) ) - ROM_LOAD( "mhpe1.6jk", 0x4000, 0x4000, CRC(dc78b802) SHA1(6b951982232de08d32d3a2d01814cc28f89d2120) ) + ROM_LOAD( "mhavocpex1.6h", 0x0000, 0x4000, CRC(79fc58c0) SHA1(7b40dfb89bc4078e2bd6f89a570f2be9cca15df9) ) + ROM_LOAD( "mhavocpex1.6jk", 0x4000, 0x4000, CRC(dc78b802) SHA1(6b951982232de08d32d3a2d01814cc28f89d2120) ) ROM_REGION( 0x10000, "gamma", 0 ) - ROM_LOAD( "mhpe1.9s", 0x8000, 0x8000, CRC(d42ee58e) SHA1(667aec3c3e93df3f8dedddb0db1188291e37630b) ) + ROM_LOAD( "mhavocpex1.9s", 0x8000, 0x8000, CRC(d42ee58e) SHA1(667aec3c3e93df3f8dedddb0db1188291e37630b) ) ROM_REGION( 0x10000, "beta", ROMREGION_ERASEFF ) @@ -415,20 +446,20 @@ ROM_END ROM_START( mhavocpex2 ) ROM_REGION( 0x2000, "vectorrom", 0 ) - ROM_LOAD( "mhpe2.6kl", 0x00000, 0x2000, CRC(3804822b) SHA1(78ca5ad3ac9ce9f6ce6ca497f70c7233adc52502) ) + ROM_LOAD( "mhavocpex2.6kl", 0x00000, 0x2000, CRC(3804822b) SHA1(78ca5ad3ac9ce9f6ce6ca497f70c7233adc52502) ) ROM_REGION( 0x20000, "alpha", 0 ) - ROM_LOAD( "mhpe2.1mn", 0x08000, 0x4000, CRC(2b505cae) SHA1(1ca14c6c810a3dec964eae63e9941e411d3ec546) ) - ROM_LOAD( "mhpe2.1l", 0x0c000, 0x4000, CRC(8c078dcf) SHA1(b4681eb4930938a93e74c313ee1031ad1a71e198) ) - ROM_LOAD( "mhpe2.1q", 0x10000, 0x8000, CRC(7602fccd) SHA1(9073c5e2a70f23c7bab2927936ee5a22e2adb57a) ) - ROM_LOAD( "mhpe2.1np", 0x18000, 0x8000, CRC(bc6775e1) SHA1(a59a93d4414a0318e37c1e50ef139b6611e4233f) ) + ROM_LOAD( "mhavocpex2.1mn", 0x08000, 0x4000, CRC(2b505cae) SHA1(1ca14c6c810a3dec964eae63e9941e411d3ec546) ) + ROM_LOAD( "mhavocpex2.1l", 0x0c000, 0x4000, CRC(8c078dcf) SHA1(b4681eb4930938a93e74c313ee1031ad1a71e198) ) + ROM_LOAD( "mhavocpex2.1q", 0x10000, 0x8000, CRC(7602fccd) SHA1(9073c5e2a70f23c7bab2927936ee5a22e2adb57a) ) + ROM_LOAD( "mhavocpex2.1np", 0x18000, 0x8000, CRC(bc6775e1) SHA1(a59a93d4414a0318e37c1e50ef139b6611e4233f) ) ROM_REGION( 0x8000, "avg", 0 ) - ROM_LOAD( "mhpe2.6h", 0x0000, 0x4000, CRC(ec19097f) SHA1(261c957e5311ac5fd700949e04e9d4a6ef12c043) ) - ROM_LOAD( "mhpe2.6jk", 0x4000, 0x4000, CRC(2ac3f07b) SHA1(27d06ed9edf8cd227c7db7c28a7f7357da1260c6) ) + ROM_LOAD( "mhavocpex2.6h", 0x0000, 0x4000, CRC(ec19097f) SHA1(261c957e5311ac5fd700949e04e9d4a6ef12c043) ) + ROM_LOAD( "mhavocpex2.6jk", 0x4000, 0x4000, CRC(2ac3f07b) SHA1(27d06ed9edf8cd227c7db7c28a7f7357da1260c6) ) ROM_REGION( 0x10000, "gamma", 0 ) - ROM_LOAD( "mhpe2.9s", 0x8000, 0x8000, CRC(57ca8c09) SHA1(84ae19a9ff3b61c75f1fd147540a1e5fb42e6915) ) + ROM_LOAD( "mhavocpex2.9s", 0x8000, 0x8000, CRC(57ca8c09) SHA1(84ae19a9ff3b61c75f1fd147540a1e5fb42e6915) ) ROM_REGION( 0x10000, "beta", ROMREGION_ERASEFF ) @@ -438,20 +469,20 @@ ROM_END ROM_START( mhavocpex3 ) ROM_REGION( 0x2000, "vectorrom", 0 ) - ROM_LOAD( "mhpe3.6kl", 0x00000, 0x2000, CRC(0bebf550) SHA1(043dd185a40208de8f7952026f1645799eb3445f) ) + ROM_LOAD( "mhavocpex3.6kl", 0x00000, 0x2000, CRC(0bebf550) SHA1(043dd185a40208de8f7952026f1645799eb3445f) ) ROM_REGION( 0x20000, "alpha", 0 ) - ROM_LOAD( "mhpe3.1mn", 0x08000, 0x4000, CRC(b3a485e8) SHA1(47e20e02a69675d5df51e68d33bc407b441d621c) ) - ROM_LOAD( "mhpe3.1l", 0x0c000, 0x4000, CRC(baa2d31a) SHA1(d6337763e4d6cc86c95d2abf54955a7b413c9846) ) - ROM_LOAD( "mhpe3.1q", 0x10000, 0x8000, CRC(ebb47bb5) SHA1(e73ea9bde6c525b644824deb73a4caa3f9a7e28f) ) - ROM_LOAD( "mhpe3.1np", 0x18000, 0x8000, CRC(793b480d) SHA1(9a0398dad5b8634190d9432e1b94a786054b4e6e) ) + ROM_LOAD( "mhavocpex3.1mn", 0x08000, 0x4000, CRC(b3a485e8) SHA1(47e20e02a69675d5df51e68d33bc407b441d621c) ) + ROM_LOAD( "mhavocpex3.1l", 0x0c000, 0x4000, CRC(baa2d31a) SHA1(d6337763e4d6cc86c95d2abf54955a7b413c9846) ) + ROM_LOAD( "mhavocpex3.1q", 0x10000, 0x8000, CRC(ebb47bb5) SHA1(e73ea9bde6c525b644824deb73a4caa3f9a7e28f) ) + ROM_LOAD( "mhavocpex3.1np", 0x18000, 0x8000, CRC(793b480d) SHA1(9a0398dad5b8634190d9432e1b94a786054b4e6e) ) ROM_REGION( 0x8000, "avg", 0 ) - ROM_LOAD( "mhpe3.6h", 0x0000, 0x4000, CRC(f1bcfaf2) SHA1(a70c3dd399c961f8a12dfc343c106d7e77e77a42) ) - ROM_LOAD( "mhpe3.6jk", 0x4000, 0x4000, CRC(8a8a67cf) SHA1(af5e64e0329015e3d2cc5292d671fe64cafd6463) ) + ROM_LOAD( "mhavocpex3.6h", 0x0000, 0x4000, CRC(f1bcfaf2) SHA1(a70c3dd399c961f8a12dfc343c106d7e77e77a42) ) + ROM_LOAD( "mhavocpex3.6jk", 0x4000, 0x4000, CRC(8a8a67cf) SHA1(af5e64e0329015e3d2cc5292d671fe64cafd6463) ) ROM_REGION( 0x10000, "gamma", 0 ) - ROM_LOAD( "mhpe3.9s", 0x8000, 0x8000, CRC(603ac7da) SHA1(8343cc8a388673436df9b5ad2894136943c676da) ) + ROM_LOAD( "mhavocpex3.9s", 0x8000, 0x8000, CRC(603ac7da) SHA1(8343cc8a388673436df9b5ad2894136943c676da) ) ROM_REGION( 0x10000, "beta", ROMREGION_ERASEFF ) @@ -461,20 +492,20 @@ ROM_END ROM_START( mhavocpex4 ) ROM_REGION( 0x2000, "vectorrom", 0 ) - ROM_LOAD( "mhpe4.6kl", 0x00000, 0x2000, CRC(75ab6d18) SHA1(874f4a15532f257480c8f6ca0cf9b3cd7ea39908) ) + ROM_LOAD( "mhavocpex4.6kl", 0x00000, 0x2000, CRC(75ab6d18) SHA1(874f4a15532f257480c8f6ca0cf9b3cd7ea39908) ) ROM_REGION( 0x20000, "alpha", 0 ) - ROM_LOAD( "mhpe4.1mn", 0x08000, 0x4000, CRC(120b00f0) SHA1(b8546c81ecc8e16f5e0afb7ce9b941623d862d31) ) - ROM_LOAD( "mhpe4.1l", 0x0c000, 0x4000, CRC(ffcb7a73) SHA1(ec284426c381da3c15ec50c3bbbdf38fb15efcb2) ) - ROM_LOAD( "mhpe4.1q", 0x10000, 0x8000, CRC(dc85e7b3) SHA1(c9cbe410915686f470c033cc5ccacf76f81c46ba) ) - ROM_LOAD( "mhpe4.1np", 0x18000, 0x8000, CRC(134d84f9) SHA1(4933dda173c9abc813edf6cd0bcef24977b6fe1a) ) + ROM_LOAD( "mhavocpex4.1mn", 0x08000, 0x4000, CRC(120b00f0) SHA1(b8546c81ecc8e16f5e0afb7ce9b941623d862d31) ) + ROM_LOAD( "mhavocpex4.1l", 0x0c000, 0x4000, CRC(ffcb7a73) SHA1(ec284426c381da3c15ec50c3bbbdf38fb15efcb2) ) + ROM_LOAD( "mhavocpex4.1q", 0x10000, 0x8000, CRC(dc85e7b3) SHA1(c9cbe410915686f470c033cc5ccacf76f81c46ba) ) + ROM_LOAD( "mhavocpex4.1np", 0x18000, 0x8000, CRC(134d84f9) SHA1(4933dda173c9abc813edf6cd0bcef24977b6fe1a) ) ROM_REGION( 0x8000, "avg", 0 ) - ROM_LOAD( "mhpe4.6h", 0x0000, 0x4000, CRC(df87c581) SHA1(bc13cd3ddf4a1e8c93d452eafafd295c37e43057) ) - ROM_LOAD( "mhpe4.6jk", 0x4000, 0x4000, CRC(8b1f8b3d) SHA1(c0825a1d7b49eb2cf169361563cd0f8e6df5a159) ) + ROM_LOAD( "mhavocpex4.6h", 0x0000, 0x4000, CRC(df87c581) SHA1(bc13cd3ddf4a1e8c93d452eafafd295c37e43057) ) + ROM_LOAD( "mhavocpex4.6jk", 0x4000, 0x4000, CRC(8b1f8b3d) SHA1(c0825a1d7b49eb2cf169361563cd0f8e6df5a159) ) ROM_REGION( 0x10000, "gamma", 0 ) - ROM_LOAD( "mhpe4.9s", 0x8000, 0x8000, CRC(e91ba3e8) SHA1(6283e5365cda8fe9706c1cd15ac7bd3978e029bc) ) + ROM_LOAD( "mhavocpex4.9s", 0x8000, 0x8000, CRC(e91ba3e8) SHA1(6283e5365cda8fe9706c1cd15ac7bd3978e029bc) ) ROM_REGION( 0x10000, "beta", ROMREGION_ERASEFF ) @@ -484,20 +515,20 @@ ROM_END ROM_START( mhavocpex5 ) ROM_REGION( 0x2000, "vectorrom", 0 ) - ROM_LOAD( "mhpe5.6kl", 0x00000, 0x2000, CRC(025ae0de) SHA1(5390dee62e5499c8767b4fc34f38fef49579d05b) ) + ROM_LOAD( "mhavocpex5.6kl", 0x00000, 0x2000, CRC(025ae0de) SHA1(5390dee62e5499c8767b4fc34f38fef49579d05b) ) ROM_REGION( 0x20000, "alpha", 0 ) - ROM_LOAD( "mhpe5.1mn", 0x08000, 0x4000, CRC(b2b3067e) SHA1(209a5d6d53825164ba7c92cff67e69571c6a0b32) ) - ROM_LOAD( "mhpe5.1l", 0x0c000, 0x4000, CRC(367c0028) SHA1(e2f153d4c1b3ba19b48a34d1bd776318499513c9) ) - ROM_LOAD( "mhpe5.1q", 0x10000, 0x8000, CRC(04e4476b) SHA1(b9ac489e2b3ea8c04e6c907b3dbf6dfdbba976af) ) - ROM_LOAD( "mhpe5.1np", 0x18000, 0x8000, CRC(8c8ca853) SHA1(12d1dbd3f76e85021ba2226defd194de8543c9ac) ) + ROM_LOAD( "mhavocpex5.1mn", 0x08000, 0x4000, CRC(b2b3067e) SHA1(209a5d6d53825164ba7c92cff67e69571c6a0b32) ) + ROM_LOAD( "mhavocpex5.1l", 0x0c000, 0x4000, CRC(367c0028) SHA1(e2f153d4c1b3ba19b48a34d1bd776318499513c9) ) + ROM_LOAD( "mhavocpex5.1q", 0x10000, 0x8000, CRC(04e4476b) SHA1(b9ac489e2b3ea8c04e6c907b3dbf6dfdbba976af) ) + ROM_LOAD( "mhavocpex5.1np", 0x18000, 0x8000, CRC(8c8ca853) SHA1(12d1dbd3f76e85021ba2226defd194de8543c9ac) ) ROM_REGION( 0x8000, "avg", 0 ) - ROM_LOAD( "mhpe5.6h", 0x0000, 0x4000, CRC(ea89c415) SHA1(f91ae8b9d1942e4ee14eaf9c1d0e687f2039c89d) ) - ROM_LOAD( "mhpe5.6jk", 0x4000, 0x4000, CRC(c56e754a) SHA1(6f02782aa14e10f6a9a2f5065d3ec9e2d9e07d5e) ) + ROM_LOAD( "mhavocpex5.6h", 0x0000, 0x4000, CRC(ea89c415) SHA1(f91ae8b9d1942e4ee14eaf9c1d0e687f2039c89d) ) + ROM_LOAD( "mhavocpex5.6jk", 0x4000, 0x4000, CRC(c56e754a) SHA1(6f02782aa14e10f6a9a2f5065d3ec9e2d9e07d5e) ) ROM_REGION( 0x10000, "gamma", 0 ) - ROM_LOAD( "mhpe5.9s", 0x8000, 0x8000, CRC(8abffddd) SHA1(4cea72b569de302feac53b4e4a861887904c6bbe) ) + ROM_LOAD( "mhavocpex5.9s", 0x8000, 0x8000, CRC(8abffddd) SHA1(4cea72b569de302feac53b4e4a861887904c6bbe) ) ROM_REGION( 0x10000, "beta", ROMREGION_ERASEFF ) @@ -530,7 +561,92 @@ ROM_START( mhavocpex6 ) ROM_LOAD( "136002-125.6c", 0x0000, 0x0100, CRC(5903af03) SHA1(24bc0366f394ad0ec486919212e38be0f08d0239) ) ROM_END +ROM_START( mhavocpex7 ) + ROM_REGION( 0x2000, "vectorrom", 0 ) + ROM_LOAD( "mhavocpex7.6kl", 0x00000, 0x2000, CRC(ef7843f8) SHA1(bfd096b0db69188f9032578839c9bd91367f7aae) ) + + ROM_REGION( 0x20000, "alpha", 0 ) + ROM_LOAD( "mhavocpex7.1mn", 0x08000, 0x4000, CRC(f043dcaf) SHA1(3f20c20ea601190a52dac50d3281ed09a18a4948) ) + ROM_LOAD( "mhavocpex7.1l", 0x0c000, 0x4000, CRC(da963eab) SHA1(b10872898b12d79cd6cf0651ec61962315b5aff9) ) + //ROM_LOAD( "mhavocpex7.1q", 0x10000, 0x8000, CRC(39c5b2d0) SHA1(9cd68ad1b4a7f68c1c6bdcbc60b3cf5a7a289ea7) ) + ROM_LOAD( "mhavocpex7.1q", 0x10000, 0x8000, CRC(57499813) SHA1(ff53f65fc34c5f4b8d4af78776fb242ac59d536a) ) + ROM_LOAD( "mhavocpex7.1np", 0x18000, 0x8000, CRC(0d362096) SHA1(dccc0509aac7003fee11bf7eeabff81360c226a8) ) + + ROM_REGION( 0x8000, "avg", 0 ) + ROM_LOAD( "mhavocpex7.6h", 0x0000, 0x4000, CRC(4129d0e9) SHA1(6fd168de59d684f216a0a0ac45aed0782b18f900) ) + ROM_LOAD( "mhavocpex7.6jk", 0x4000, 0x4000, CRC(9361ed01) SHA1(ea07f8430f7e97e0c62d8df2963bb7b66a45b698) ) + + ROM_REGION( 0x10000, "gamma", 0 ) + ROM_LOAD( "mhavocpex7.9s", 0x8000, 0x4000, CRC(9703c51f) SHA1(c010021e0dabc568af2eb1d516726ac21a1c9c98) ) + + //ROM_REGION( 0x10000, "beta", 0 ) + //ROM_LOAD( "mhavocpe.1bc", 0x8000, 0x4000, CRC(1b31ae10) SHA1(247726f9ebe4892edc7c9577a7fffc93057fafe5) ) + //ROM_LOAD( "mhavocpe.1d", 0xc000, 0x4000, CRC(e86d6226) SHA1(45e00d62c424cb60c30b63ee2de57a465989d8ee) ) + + ROM_REGION( 0x100, "avg:prom", 0 ) + ROM_LOAD( "136002-125.6c", 0x0000, 0x0100, CRC(5903af03) SHA1(24bc0366f394ad0ec486919212e38be0f08d0239) ) + + ROM_REGION( 0x40000, "oki", 0 ) /* 256k for ADPCM samples */ + ROM_LOAD( "mhavocpex7.x1", 0x000000, 0x040000, CRC(5cfa1865) SHA1(ab520b4af6a9ffc2593223798fee8026266a722e) ) +ROM_END + +ROM_START( mhavocpex7de ) + ROM_REGION( 0x2000, "vectorrom", 0 ) + ROM_LOAD( "mhavocpex7de.6kl", 0x00000, 0x2000, CRC(6bc3240f) SHA1(6152a5015a99142d77203fa70f96160ffecd460c) ) + + ROM_REGION( 0x20000, "alpha", 0 ) + ROM_LOAD( "mhavocpex7de.1mn", 0x08000, 0x4000, CRC(30fc2132) SHA1(0d07fab70e9e2d606a825837436c242706fa690a) ) + ROM_LOAD( "mhavocpex7de.1l", 0x0c000, 0x4000, CRC(245100c8) SHA1(90333f9ad7b1c4422bc0b68a9a4d59edd9596d65) ) + ROM_LOAD( "mhavocpex7de.1q", 0x10000, 0x8000, CRC(8fb86a78) SHA1(53b3ec55962c7a6f615838005b56de7458147f46) ) + ROM_LOAD( "mhavocpex7de.1np", 0x18000, 0x8000, CRC(c8a86dfb) SHA1(8e3257068ae52095b8f15012a46cc99d9e28242f) ) + + ROM_REGION( 0x8000, "avg", 0 ) + ROM_LOAD( "mhavocpex7de.6h", 0x0000, 0x4000, CRC(8df8c6e5) SHA1(b5fadd531f040ef01c9c39810bfe81b800a32f78) ) + ROM_LOAD( "mhavocpex7de.6jk", 0x4000, 0x4000, CRC(5fb0fb0d) SHA1(70f72856cb8ade503b00e43c12ed52bbabbd7ca6) ) + + ROM_REGION( 0x10000, "gamma", 0 ) + ROM_LOAD( "mhavocpex7de.9s", 0x8000, 0x4000, CRC(722ade2e) SHA1(212cb5c9201e41e08eada3aec3c77ab8728135b1) ) + + //ROM_REGION( 0x10000, "beta", 0 ) + //ROM_LOAD( "mhavocpe.1bc", 0x8000, 0x4000, CRC(1b31ae10) SHA1(247726f9ebe4892edc7c9577a7fffc93057fafe5) ) + //ROM_LOAD( "mhavocpe.1d", 0xc000, 0x4000, CRC(e86d6226) SHA1(45e00d62c424cb60c30b63ee2de57a465989d8ee) ) + ROM_REGION( 0x100, "avg:prom", 0 ) + ROM_LOAD( "136002-125.6c", 0x0000, 0x0100, CRC(5903af03) SHA1(24bc0366f394ad0ec486919212e38be0f08d0239) ) + + ROM_REGION( 0x40000, "oki", 0 ) /* 256k for ADPCM samples */ + ROM_LOAD( "mhavocpex7de.x1", 0x000000, 0x040000, CRC(5cfa1865) SHA1(ab520b4af6a9ffc2593223798fee8026266a722e) ) +ROM_END + +ROM_START( mhavocpex7fr ) + ROM_REGION( 0x2000, "vectorrom", 0 ) + ROM_LOAD( "mhavocpex7fr.6kl", 0x00000, 0x2000, CRC(3d7f8a57) SHA1(cc8cd99003b56805c6eab9c4d26c17c485966d17) ) + + ROM_REGION( 0x20000, "alpha", 0 ) + ROM_LOAD( "mhavocpex7fr.1mn", 0x08000, 0x4000, CRC(ad00b995) SHA1(f210a934be809b272bbbd7b3a459df6614e8a8f9) ) + ROM_LOAD( "mhavocpex7fr.1l", 0x0c000, 0x4000, CRC(c01b01fa) SHA1(9965da7863da933a1be1ce32e3db578ce4e54bb4) ) + ROM_LOAD( "mhavocpex7fr.1q", 0x10000, 0x8000, CRC(81ac4eda) SHA1(eeab82e1bad953a72300986c9dcdc02f3113cb06) ) + ROM_LOAD( "mhavocpex7fr.1np", 0x18000, 0x8000, CRC(6cf82736) SHA1(4a17ebd9aac863ce34ff5ef2d139cf319c373502) ) + + ROM_REGION( 0x8000, "avg", 0 ) + ROM_LOAD( "mhavocpex7fr.6h", 0x0000, 0x4000, CRC(03fafab0) SHA1(5a27c5cf745d51e76c8af63c7880b0337e1b97f5) ) + ROM_LOAD( "mhavocpex7fr.6jk", 0x4000, 0x4000, CRC(d1b2c758) SHA1(047c328855a6fa930e172b77798d0373027ac0ce) ) + + ROM_REGION( 0x10000, "gamma", 0 ) + ROM_LOAD( "mhavocpex7fr.9s", 0x8000, 0x4000, CRC(8620f53c) SHA1(96a05e1410d2d5fa55a35bf88d057101aede6681) ) + + //ROM_REGION( 0x10000, "beta", 0 ) + //ROM_LOAD( "mhavocpe.1bc", 0x8000, 0x4000, CRC(1b31ae10) SHA1(247726f9ebe4892edc7c9577a7fffc93057fafe5) ) + //ROM_LOAD( "mhavocpe.1d", 0xc000, 0x4000, CRC(e86d6226) SHA1(45e00d62c424cb60c30b63ee2de57a465989d8ee) ) + + ROM_REGION( 0x100, "avg:prom", 0 ) + ROM_LOAD( "136002-125.6c", 0x0000, 0x0100, CRC(5903af03) SHA1(24bc0366f394ad0ec486919212e38be0f08d0239) ) + + ROM_REGION( 0x40000, "oki", 0 ) /* 256k for ADPCM samples */ + ROM_LOAD( "mhavocpex7fr.x1", 0x000000, 0x040000, CRC(5cfa1865) SHA1(ab520b4af6a9ffc2593223798fee8026266a722e) ) +ROM_END + +#if 0 //Placeholder Driver for upcoming final release ROM_START( mhavocpe ) ROM_REGION( 0x2000, "vectorrom", 0 ) @@ -547,21 +663,28 @@ ROM_START( mhavocpe ) ROM_LOAD( "mhavocpe.6jk", 0x4000, 0x4000, CRC(3dd7bec9) SHA1(aaa5e48d45519624017a9ec04b3e4b721e01ff2a) ) ROM_REGION( 0x10000, "gamma", 0 ) - ROM_LOAD( "mhavocpe.9s", 0x8000, 0x8000, CRC(5e1b2ada) SHA1(8fc2334e090b5f9b2bd97ab792aa69f170643752) ) + ROM_LOAD( "mhavocpe.9s", 0x8000, 0x4000, CRC(5e1b2ada) SHA1(8fc2334e090b5f9b2bd97ab792aa69f170643752) ) - ROM_REGION( 0x10000, "beta", 0 ) - ROM_LOAD( "mhavocpe.1bc", 0x8000, 0x4000, CRC(54618f8d) SHA1(f20b1fca139eb1b0fd882c5a25b7c5b31c48d9b4) ) - ROM_LOAD( "mhavocpe.1d", 0xc000, 0x4000, CRC(2f397fbd) SHA1(c714f0cb4cc8958e5bf0e1533f1790785e235299) ) + //ROM_REGION( 0x10000, "beta", 0 ) + //ROM_LOAD( "mhavocpe.1bc", 0x8000, 0x4000, CRC(54618f8d) SHA1(f20b1fca139eb1b0fd882c5a25b7c5b31c48d9b4) ) + //ROM_LOAD( "mhavocpe.1d", 0xc000, 0x4000, CRC(2f397fbd) SHA1(c714f0cb4cc8958e5bf0e1533f1790785e235299) ) ROM_REGION( 0x100, "avg:prom", 0 ) - ROM_LOAD( "136002-125.6c", 0x0000, 0x0100, CRC(5903af03) SHA1(24bc0366f394ad0ec486919212e38be0f08d0239) ) -ROM_END - + ROM_LOAD( "136002-125.6c", 0x0000, 0x0100, CRC(5903af03) SHA1(24bc0366f394ad0ec486919212e38be0f08d0239) ) -GAME( 2018, mhavocpex1, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (ALPHA v0.21)", MACHINE_SUPPORTS_SAVE ) -GAME( 2019, mhavocpex2, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (ALPHA v0.50)", MACHINE_SUPPORTS_SAVE ) -GAME( 2020, mhavocpex3, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (ALPHA v0.52)", MACHINE_SUPPORTS_SAVE ) -GAME( 2020, mhavocpex4, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.67)", MACHINE_SUPPORTS_SAVE ) -GAME( 2020, mhavocpex5, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.72)", MACHINE_SUPPORTS_SAVE ) -GAME( 2021, mhavocpex6, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.75)", MACHINE_SUPPORTS_SAVE ) -GAME( 2021, mhavocpe, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (NOT YET RELEASED)", MACHINE_SUPPORTS_SAVE ) + ROM_REGION( 0x40000, "oki", 0 ) /* 256k for ADPCM samples */ + ROM_LOAD( "mhavocpe.x1", 0x000000, 0x040000, CRC(4dc14fe8) SHA1(c7cc00715f6687ced9d69ec793d6e9d4bc1b5287) ) +ROM_END +#endif + + +GAME( 2018, mhavocpex1, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (ALPHA v0.21)", MACHINE_SUPPORTS_SAVE ) +GAME( 2019, mhavocpex2, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (ALPHA v0.50)", MACHINE_SUPPORTS_SAVE ) +GAME( 2020, mhavocpex3, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (ALPHA v0.52)", MACHINE_SUPPORTS_SAVE ) +GAME( 2020, mhavocpex4, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.67)", MACHINE_SUPPORTS_SAVE ) +GAME( 2020, mhavocpex5, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.72)", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, mhavocpex6, mhavoc, mhavocpe, mhavocrv, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.75)", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, mhavocpex7, mhavoc, mhavocpe2, mhavoc, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.78)", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, mhavocpex7fr, mhavoc, mhavocpe2, mhavoc, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.78) FRENCH", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, mhavocpex7de, mhavoc, mhavocpe2, mhavoc, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (BETA v0.78) GERMAN", MACHINE_SUPPORTS_SAVE ) +//GAME( 2021, mhavocpe, mhavoc, mhavocpe, mhavoc, mhavoc_hbmame, init_mhavocrv, ROT0, "JMA", "Major Havoc - The Promised End (NOT YET RELEASED)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/neogeohb.cpp b/docs/release/src/hbmame/drivers/neogeohb.cpp index 09384e24e1b..e5d7835d743 100644 --- a/docs/release/src/hbmame/drivers/neogeohb.cpp +++ b/docs/release/src/hbmame/drivers/neogeohb.cpp @@ -179,7 +179,7 @@ NUM GAME YEAR COMPANY TITLE 444 1234 2018 kl3mousse Sea Fighter 445* 2014 M.Priewe Doom in the Deep (in development or cancelled) 446 7777 2014 M.Priewe Monitor Test Tool -447* 2016 M.Priewe Hypernoid (in development or cancelled) +447* 2016 M.Priewe Hypernoid (released July 2021, stuck behind paywall) 448 449* n/r RiKo Cosmic Tower (in development or cancelled) 450* 2012 RKGAMES Neo-sprite demo (CD only) diff --git a/docs/release/src/hbmame/drivers/system1.cpp b/docs/release/src/hbmame/drivers/system1.cpp index e5dfc1f8f7d..30b7808237a 100644 --- a/docs/release/src/hbmame/drivers/system1.cpp +++ b/docs/release/src/hbmame/drivers/system1.cpp @@ -75,42 +75,3 @@ ROM_END GAME( 1987, wbmlbit, wbml, sys2xb, wbml, system1_state, init_bootsys2, ROT0, "Michele", "Wonder Boy in Monster Land (Italian - v0.99)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) GAME( 1987, wbmlkb, wbml, sys2xb, wbml, system1_state, init_bootsys2, ROT0, "Aneue Bannzai", "Wonder Boy in Monster Land (Translation Korean)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) - -// LOST ROMS - raflsiau - this was included in various versions of MAME (this code from 0.61), but the story goes that the -// dumper's hard drive crashed before the roms could be sent to Mamedev, and thus lost forever. -// The only changed roms are those in "maincpu" - the remainder is identical to raflesia - -ROM_START( raflsiau ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "epr-7433.129", 0x0000, 0x2000, CRC(6f4931b0 ) ) - ROM_LOAD( "epr-7434.130", 0x2000, 0x2000, CRC(ec46e21b ) ) - ROM_LOAD( "epr-7435.131", 0x4000, 0x2000, CRC(e035ff6b ) ) - ROM_LOAD( "epr-7436.132", 0x6000, 0x2000, CRC(6527aae7 ) ) - ROM_LOAD( "epr-7437.133", 0x8000, 0x2000, CRC(e13dd5e4 ) ) - ROM_LOAD( "epr-7438.134", 0xa000, 0x2000, CRC(a0aa4729 ) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) - ROM_LOAD( "epr-7420.120", 0x0000, 0x2000, CRC(14387666) SHA1(9cb18e3002c32f658e4725707069f9cd2f496507) ) - - ROM_REGION( 0xc000, "tiles", 0 ) - ROM_LOAD( "epr-7419.62", 0x0000, 0x2000, CRC(bfd5f34c) SHA1(78c4d380d5558212e535c3262223137447d64818) ) - ROM_LOAD( "epr-7418.61", 0x2000, 0x2000, CRC(f8cbc9b6) SHA1(48be9337f704a11ac1fdeb64a3b3518c796bcdd0) ) - ROM_LOAD( "epr-7417.64", 0x4000, 0x2000, CRC(e63501bc) SHA1(5cfd19241c54782c262bbb23c6f682534e77feb7) ) - ROM_LOAD( "epr-7416.63", 0x6000, 0x2000, CRC(093e5693) SHA1(78bb1c4651bd63a9f776766d2eac4f1c09242ed5) ) - ROM_LOAD( "epr-7415.66", 0x8000, 0x2000, CRC(1a8d6bd6) SHA1(b04ee35f603c6c9923ba888914eb43a8b7753d92) ) - ROM_LOAD( "epr-7414.65", 0xa000, 0x2000, CRC(5d20f218) SHA1(bdc0185d133f7bbe287106882bacde846634ffa4) ) - - ROM_REGION( 0x10000, "sprites", 0 ) - ROM_LOAD( "epr-7407.117", 0x0000, 0x4000, CRC(f09fc057) SHA1(c6f06144b708055b31fbcba9f38b63736db789d8) ) - ROM_LOAD( "epr-7409.04", 0x4000, 0x4000, CRC(819fedb8) SHA1(e63f0422814423be91d8e1937a13d19693a1a5fc) ) - ROM_LOAD( "epr-7408.110", 0x8000, 0x4000, CRC(3189f33c) SHA1(8476c2c01920f0492cf643929d4f023f3afe0164) ) - ROM_LOAD( "epr-7410.05", 0xc000, 0x4000, CRC(ced74789) SHA1(d0ad845bfe83412ac8d43125e1c50d0581a5b47e) ) - - ROM_REGION( 0x0100, "lookup_proms", 0 ) - ROM_LOAD( "pr-5317.76", 0x0000, 0x0100, CRC(648350b8) SHA1(c7986aa9127ef5b50b845434cb4e81dff9861cd2) ) -ROM_END - -// machine config is guess -// YEAR NAME PARENT MACHINE CONFIG INPUTS CLASS INIT -GAME( 1986, raflsiau, raflesia, sys1pio, raflesia, system1_state, init_bank00, ROT270, "Coreland / Sega", "Rafflesia (not encrypted)", MACHINE_SUPPORTS_SAVE ) - diff --git a/docs/release/src/hbmame/hbmame.lst b/docs/release/src/hbmame/hbmame.lst index 523b6531bb0..550cbd59b2a 100644 --- a/docs/release/src/hbmame/hbmame.lst +++ b/docs/release/src/hbmame/hbmame.lst @@ -1526,8 +1526,8 @@ decomult // Dave Widel @source:dkong.cpp dkong //parent dkong2m -dkongbcc // Jeffs Rom Hacks -dkongex // Jeffs Hack with Foundry Level +dkongbcc //Jeffs Rom Hacks +dkongex //Jeffs Hack with Foundry Level dkongf dkongst dkongst2 @@ -1548,13 +1548,15 @@ dkspkyrmx // Sock Master - Spooky Remix Halloween Tournament 2018 dktrainer dkpace kong2600 // Vic Twenty George hack of Donkey Kong -nadkong -dkcbarrel -dkfreerun -dkongotr -dkongitd -dkongtj -dkongbp +nadkong // +dkcbarrel // Paul Goes +dkfreerun // Paul Goes +dkongotr // Paul Goes +dkongitd // Paul Goes +dkongtj // Paul Goes +dkongbp // Paul Goes +dkongbp1 // Paul Goes +dkongan // Paul Goes //dk_remix @source:docastle.cpp @@ -4147,51 +4149,54 @@ kikikai //parent kikikais01 @source:mgd2.cpp -bstarsd /* 0002 (c) 1990 SNK */ -tpgolfd /* 0003 (c) 1990 SNK */ -maglordd /* 0005 (c) 1990 Alpha Denshi Co. */ -ridherod /* 0006 (c) 1990 SNK */ -alpham2d /* 0007 (c) 1991 SNK */ -ncombatd /* 0009 (c) 1990 Alpha Denshi Co. */ -cyberlipd /* 0010 (c) 1990 SNK */ -superspyd /* 0011 (c) 1990 SNK */ -mutnatd /* 0014 (c) 1992 SNK */ -kotmd /* 0016 (c) 1991 SNK */ -sengokud /* 0017 (c) 1991 SNK */ -burningfd /* 0018 (c) 1991 SNK */ -lbowlingd /* 0019 (c) 1990 SNK */ -gpilotsd /* 0020 (c) 1991 SNK */ -joyjoyd /* 0021 (c) 1990 SNK */ -lresortd /* 0024 (c) 1992 SNK */ -eightmand /* 0025 (c) 1991 SNK / Pallas */ -minasand /* 0027 (c) 1990 Monolith Corp. */ -2020bbd /* 0030 (c) 1991 SNK / Pallas */ -socbrawld /* 0031 (c) 1991 SNK */ -roboarmyd /* 0032 (c) 1991 SNK */ -fatfury1d /* 0033 (c) 1991 SNK */ -fbfrenzyd /* 0034 (c) 1992 SNK */ -bakatonod /* 0036 (c) 1991 Monolith Corp. */ -crswordd /* 0037 (c) 1991 Alpha Denshi Co. */ -trallyd /* 0038 (c) 1991 Alpha Denshi Co. */ -sengoku2d /* 0040 (c) 1993 SNK */ -3countbd /* 0043 (c) 1993 SNK */ -aofd /* 0044 (c) 1992 SNK */ -androdund /* 0049 (c) 1992 Visco */ -ncommandd /* 0050 (c) 1992 Alpha Denshi Co. */ -wh1d /* 0053 (c) 1992 Alpha Denshi Co. */ +bstarsd // 0002 (c) 1990 SNK +tpgolfd // 0003 (c) 1990 SNK +maglordd // 0005 (c) 1990 Alpha Denshi Co. +ridherod // 0006 (c) 1990 SNK +alpham2d // 0007 (c) 1991 SNK +ncombatd // 0009 (c) 1990 Alpha Denshi Co. +cyberlipd // 0010 (c) 1990 SNK +superspyd // 0011 (c) 1990 SNK +mutnatd // 0014 (c) 1992 SNK +kotmd // 0016 (c) 1991 SNK +sengokud // 0017 (c) 1991 SNK +burningfd // 0018 (c) 1991 SNK +lbowlingd // 0019 (c) 1990 SNK +gpilotsd // 0020 (c) 1991 SNK +joyjoyd // 0021 (c) 1990 SNK +lresortd // 0024 (c) 1992 SNK +eightmand // 0025 (c) 1991 SNK / Pallas +minasand // 0027 (c) 1990 Monolith Corp. +2020bbd // 0030 (c) 1991 SNK / Pallas +socbrawld // 0031 (c) 1991 SNK +roboarmyd // 0032 (c) 1991 SNK +fatfury1d // 0033 (c) 1991 SNK +fbfrenzyd // 0034 (c) 1992 SNK +bakatonod // 0036 (c) 1991 Monolith Corp. +crswordd // 0037 (c) 1991 Alpha Denshi Co. +trallyd // 0038 (c) 1991 Alpha Denshi Co. +sengoku2d // 0040 (c) 1993 SNK +3countbd // 0043 (c) 1993 SNK +aofd // 0044 (c) 1992 SNK +androdund // 0049 (c) 1992 Visco +ncommandd // 0050 (c) 1992 Alpha Denshi Co. +wh1d // 0053 (c) 1992 Alpha Denshi Co. @source:mhavoc.cpp -mhavoc //parent -mhavocrv //HB Jess M. Askey +mhavoc //parent +mhavocrv //HB Jess M. Askey @source:mhavoc_hb.cpp -//mhavocpe //HB Jess M. Askey ROMS ARE MISSING -mhavocpex1 //HB Jess M. Askey -mhavocpex2 //HB Jess M. Askey -mhavocpex3 //HB Jess M. Askey -mhavocpex4 //HB Jess M. Askey -mhavocpex5 //HB Jess M. Askey -mhavocpex6 //HB Jess M. Askey +//mhavocpe //HB Jess M. Askey ROMS ARE MISSING +mhavocpex1 //HB Jess M. Askey +mhavocpex2 //HB Jess M. Askey +mhavocpex3 //HB Jess M. Askey +mhavocpex4 //HB Jess M. Askey +mhavocpex5 //HB Jess M. Askey +mhavocpex6 //HB Jess M. Askey +mhavocpex7 //HB Jess M. Askey +mhavocpex7de //HB Jess M. Askey +mhavocpex7fr //HB Jess M. Askey @source:midtunit.cpp mk //parent @@ -8709,8 +8714,6 @@ survartss01 wbml //parent wbmlbit wbmlkb -//raflesia //parent -//raflsiau // roms missing @source:system16.cpp sys16dem // HB diff --git a/docs/release/src/hbmame/includes/mhavoc_hb.h b/docs/release/src/hbmame/includes/mhavoc_hb.h index 4f75dd55f52..b1f93a55ec0 100644 --- a/docs/release/src/hbmame/includes/mhavoc_hb.h +++ b/docs/release/src/hbmame/includes/mhavoc_hb.h @@ -9,6 +9,7 @@ #include "machine/timer.h" #include "sound/pokey.h" #include "sound/tms5220.h" +#include "sound/okim6295.h" #define MHAVOC_CLOCK 10000000 #define MHAVOC_CLOCK_5M (MHAVOC_CLOCK/2) @@ -20,6 +21,8 @@ #define MHAVOC_CLOCK_5K (MHAVOC_CLOCK_625K/16/8) #define MHAVOC_CLOCK_2_4K (MHAVOC_CLOCK_625K/16/16) +#define OKI_CLOCK 1056000 + class mhavoc_hbmame : public driver_device { @@ -34,6 +37,7 @@ public: m_comram(*this, "comram"), m_pokey(*this, "pokey%u", 1U), m_tms(*this, "tms"), + m_oki(*this, "oki"), m_lamps(*this, "lamp%u", 0U), m_coin(*this, "COIN"), m_service(*this, "SERVICE") @@ -43,6 +47,7 @@ public: void mhavoc(machine_config &config); void mhavocrv(machine_config &config); void mhavocpe(machine_config &config); //HBMAME + void mhavocpe2(machine_config &config); //HBMAME void init_mhavocrv(); @@ -79,6 +84,7 @@ private: void gamma_map(address_map &map); void alphape_map(address_map &map); //HBMAME void gammape_map(address_map &map); //HBMAME + void gammape2_map(address_map &map); //HBMAME void betape_map(address_map &map); //HBMAME virtual void machine_start() override; @@ -92,6 +98,7 @@ private: required_shared_ptr<uint8_t> m_comram; optional_device_array<pokey_device, 4> m_pokey; optional_device<tms5220_device> m_tms; + optional_device<okim6295_device> m_oki; output_finder<2> m_lamps; optional_ioport m_coin; optional_ioport m_service; diff --git a/docs/release/src/hbmame/machine/mhavoc_hb.cpp b/docs/release/src/hbmame/machine/mhavoc_hb.cpp index 5874124aaaa..39650da05cd 100644 --- a/docs/release/src/hbmame/machine/mhavoc_hb.cpp +++ b/docs/release/src/hbmame/machine/mhavoc_hb.cpp @@ -249,7 +249,8 @@ void mhavoc_hbmame::mhavoc_out_0_w(uint8_t data) m_player_1 = (data >> 5) & 1; /* Bit 3 = Gamma reset */ - m_gamma->set_input_line(INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); + if (m_gamma) + m_gamma->set_input_line(INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); if (!(data & 0x08)) { //logerror("\t\t\t\t*** GAMMA processor RESET Cleared. ***\n"); @@ -261,7 +262,8 @@ void mhavoc_hbmame::mhavoc_out_0_w(uint8_t data) /* Bit 2 = Beta reset */ /* this is the unpopulated processor in the corner of the pcb farthest from the quad pokey, not used on shipping boards */ - m_beta->set_input_line(INPUT_LINE_RESET, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE); + if (m_beta) + m_beta->set_input_line(INPUT_LINE_RESET, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE); /* Bit 0 = Roller light (Blinks on fatal errors) */ diff --git a/docs/release/src/mame/drivers/galaxian.cpp b/docs/release/src/mame/drivers/galaxian.cpp index 228abb9f828..2356644773c 100644 --- a/docs/release/src/mame/drivers/galaxian.cpp +++ b/docs/release/src/mame/drivers/galaxian.cpp @@ -10076,8 +10076,8 @@ ROM_START( pisces ) ROM_LOAD( "p6.bin", 0x2800, 0x0800, CRC(5ab2822f) SHA1(bbcac3aab943dd9b173de11ddf02ff75d16b1582) ) ROM_REGION( 0x2000, "gfx1", 0 ) -// ROM_LOAD( "pisces.1j", 0x0000, 0x1000, CRC(2dba9e0e) ) -// ROM_LOAD( "pisces.1k", 0x1000, 0x1000, CRC(cdc5aa26) ) +// ROM_LOAD( "pisces.1j", 0x0000, 0x1000, CRC(2dba9e0e) SHA1(edfb974766b57327ac846426a3a9583b33a4b7c9) ) +// ROM_LOAD( "pisces.1k", 0x1000, 0x1000, CRC(cdc5aa26) SHA1(72a396d142a775bb39231d700308b8bd7aff7f75) ) ROM_LOAD( "g09.bin", 0x0000, 0x0800, CRC(9503a23a) SHA1(23848de56841dd1de9ef74d5a9c981c784098175) ) ROM_LOAD( "g11.bin", 0x0800, 0x0800, CRC(0adfc3fe) SHA1(a4da488632d9906066db45ae62747caf5ffbf2d8) ) ROM_LOAD( "g10.bin", 0x1000, 0x0800, CRC(3e61f849) SHA1(efa0059bc843af0c3bb94f4bc0a8286ca5069179) ) @@ -10097,8 +10097,8 @@ ROM_START( piscesb ) ROM_LOAD( "p6.bin", 0x2800, 0x0800, CRC(5ab2822f) SHA1(bbcac3aab943dd9b173de11ddf02ff75d16b1582) ) ROM_REGION( 0x2000, "gfx1", 0 ) -// ROM_LOAD( "pisces.1j", 0x0000, 0x1000, CRC(2dba9e0e) ) -// ROM_LOAD( "pisces.1k", 0x1000, 0x1000, CRC(cdc5aa26) ) +// ROM_LOAD( "pisces.1j", 0x0000, 0x1000, CRC(2dba9e0e) SHA1(edfb974766b57327ac846426a3a9583b33a4b7c9) ) +// ROM_LOAD( "pisces.1k", 0x1000, 0x1000, CRC(cdc5aa26) SHA1(72a396d142a775bb39231d700308b8bd7aff7f75) ) ROM_LOAD( "g09.bin", 0x0000, 0x0800, CRC(9503a23a) SHA1(23848de56841dd1de9ef74d5a9c981c784098175) ) ROM_LOAD( "g11.bin", 0x0800, 0x0800, CRC(0adfc3fe) SHA1(a4da488632d9906066db45ae62747caf5ffbf2d8) ) ROM_LOAD( "g10.bin", 0x1000, 0x0800, CRC(3e61f849) SHA1(efa0059bc843af0c3bb94f4bc0a8286ca5069179) ) @@ -13890,6 +13890,30 @@ ROM_START( bomber ) ROM_LOAD( "c01s.6e", 0x0000, 0x0020, CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) ) // q.9c on pcb ROM_END +ROM_START( spcmission ) + // Bootleg of Scramble from SegaSA / Sonic + ROM_REGION( 0x10000, "maincpu", 0 ) // 64k for code + ROM_LOAD( "3l.bin", 0x0000, 0x0800, CRC(b3e7f1bb) SHA1(489547b236abf9ba277c5d6558d674d646ca7086) ) // The only different ROM from 'bomber' + ROM_LOAD( "3k.bin", 0x0800, 0x0800, CRC(1fca370c) SHA1(b48b67afe226b13656a1585a1d7ad4b6322c58a1) ) + ROM_LOAD( "3h.bin", 0x1000, 0x0800, CRC(8a714167) SHA1(34ed01fd9e9efa5cd9067284a2b66b72cafe3209) ) + ROM_LOAD( "3f.bin", 0x1800, 0x0800, CRC(dd380a22) SHA1(125e713a58cc5f2c1e38f67dad29f8c985ce5a8b) ) + ROM_LOAD( "3e.bin", 0x2000, 0x0800, CRC(92980e72) SHA1(7e0605b461ace534f8f91028bb82968ecd907ca1) ) + ROM_LOAD( "3d.bin", 0x2800, 0x0800, CRC(9fd96374) SHA1(c8456dd8a012353a023a2d3fa5d508e49c36ace8) ) + ROM_LOAD( "3c.bin", 0x3000, 0x0800, CRC(88ac07a0) SHA1(c57061db5984b472039356bf84a050b5b66e3813) ) + ROM_LOAD( "3a.bin", 0x3800, 0x0800, CRC(75232e09) SHA1(b0da201bf05c63031cdbe9f7059e3c710557f33d) ) + + ROM_REGION( 0x10000, "audiocpu", 0 ) // 64k for the audio CPU + ROM_LOAD( "8k.bin", 0x0000, 0x0800, CRC(97ba15e8) SHA1(2729ccb156540ace2360b03c485865f7f97f5368) ) + ROM_LOAD( "8l.bin", 0x0800, 0x0800, CRC(6510761d) SHA1(0df92f9f123447d59a9106b2351d680cb04d1a9e) ) + + ROM_REGION( 0x1000, "gfx1", 0 ) + ROM_LOAD( "5f.bin", 0x0000, 0x0800, CRC(4708845b) SHA1(a8b1ad19a95a9d35050a2ab7194cc96fc5afcdc9) ) + ROM_LOAD( "5h.bin", 0x0800, 0x0800, CRC(11fd2887) SHA1(69844e48bb4d372cac7ae83c953df573c7ecbb7f) ) + + ROM_REGION( 0x0020, "proms", 0 ) + ROM_LOAD( "mb7051.bin", 0x0000, 0x0020, CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) ) +ROM_END + ROM_START( astroamb ) // ROMs verified on two different PCBs ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "1.sub", 0x0000, 0x1000, CRC(99533fcd) SHA1(859414e70dcde452b1ddfc68e7bc3298c1a410ba) ) @@ -15205,25 +15229,26 @@ GAME( 1980, theends, theend, theend, theend, galaxian_state, init_ GAME( 1981, theendss, theend, theend, theend, galaxian_state, init_theend, ROT90, "bootleg (Sonic)", "The End (SegaSA / Sonic)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, takeoff, theend, takeoff, explorer, galaxian_state, init_explorer, ROT90, "bootleg (Sidam)", "Take Off (bootleg of The End)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // colors likely need bitswap<8> somewhere; needs different sound timer. reference: https://www.youtube.com/watch?v=iPYX3yJORTE -GAME( 1981, scramble, 0, scramble, scramble, galaxian_state, init_scramble, ROT90, "Konami", "Scramble", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, scrambles, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, scrambles2, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, strfbomb, scramble, scramble, strfbomb, galaxian_state, init_scramble, ROT90, "bootleg (Omni)", "Strafe Bomb (bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, explorer, scramble, explorer, explorer, galaxian_state, init_explorer, ROT90, "bootleg (Sidam)", "Explorer (bootleg of Scramble)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // needs different sound timer -GAME( 1981, scramblebf, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Karateco)", "Scramble (Karateco, French bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, scrambp, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Billport S.A.)", "Impacto (Billport S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) // similar to the Karateco set above -GAME( 1981, spctrek, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Video Game S.A.)", "Space Trek (Video Game S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, scramce, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Centromatic S.A.)", "Scramble (Centromatic S.A., Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) // similar to above -GAME( 1981, scrampt, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Petaco S.A.)", "Scramble (Petaco S.A., Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) // ^^ -GAME( 1981, scramrf, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Recreativos Franco)", "Scramble (Recreativos Franco, Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, offensiv, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Video Dens)", "Offensive (Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, ncentury, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Petaco S.A.)", "New Century (Spanish bootleg of Scramble)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly -GAME( 1981, scrammr, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Model Racing)", "Scramble (Model Racing, Italian bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly -GAME( 1981, scramblebb, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg?", "Scramble (bootleg?)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, scramblebun, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg", "Scramble (unknown bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly -GAME( 1981, kamikazesp, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Euromatic S.A.)", "Kamikaze (Euromatic S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) -GAME( 198?, bomber, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Alca)", "Bomber (bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) -GAME( 1981, astroamb, scramble, astroamb, astroamb, galaxian_state, init_scramble, ROT90, "bootleg (U.C.E.)", "Astro Ambush (Scramble bootleg on Galaxian hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // uses the same sound implementation as Galaxian, might differ +GAME( 1981, scramble, 0, scramble, scramble, galaxian_state, init_scramble, ROT90, "Konami", "Scramble", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, scrambles, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, scrambles2, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, strfbomb, scramble, scramble, strfbomb, galaxian_state, init_scramble, ROT90, "bootleg (Omni)", "Strafe Bomb (bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, explorer, scramble, explorer, explorer, galaxian_state, init_explorer, ROT90, "bootleg (Sidam)", "Explorer (bootleg of Scramble)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // needs different sound timer +GAME( 1981, scramblebf, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Karateco)", "Scramble (Karateco, French bootleg)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, scrambp, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Billport S.A.)", "Impacto (Billport S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) // similar to the Karateco set above +GAME( 1981, spctrek, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Video Game S.A.)", "Space Trek (Video Game S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, scramce, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Centromatic S.A.)", "Scramble (Centromatic S.A., Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) // similar to above +GAME( 1981, scrampt, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Petaco S.A.)", "Scramble (Petaco S.A., Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) // ^^ +GAME( 1981, scramrf, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Recreativos Franco)", "Scramble (Recreativos Franco, Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, offensiv, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Video Dens)", "Offensive (Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, ncentury, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Petaco S.A.)", "New Century (Spanish bootleg of Scramble)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly +GAME( 1981, scrammr, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Model Racing)", "Scramble (Model Racing, Italian bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly +GAME( 1981, scramblebb, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg?", "Scramble (bootleg?)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, scramblebun, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg", "Scramble (unknown bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly +GAME( 1981, kamikazesp, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Euromatic S.A.)", "Kamikaze (Euromatic S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) +GAME( 198?, bomber, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (Alca)", "Bomber (bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) +GAME( 198?, spcmission, scramble, scramble, scramble, galaxian_state, init_scramble, ROT90, "bootleg (SegaSA / Sonic)", "Space Mission (SegaSA / Sonic, Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE ) +GAME( 1981, astroamb, scramble, astroamb, astroamb, galaxian_state, init_scramble, ROT90, "bootleg (U.C.E.)", "Astro Ambush (Scramble bootleg on Galaxian hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // uses the same sound implementation as Galaxian, might differ GAME( 1981, atlantis, 0, theend, atlantis, galaxian_state, init_atlantis, ROT90, "Comsoft", "Battle of Atlantis (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, atlantis2, atlantis, theend, atlantis, galaxian_state, init_atlantis, ROT90, "Comsoft", "Battle of Atlantis (set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/mame/drivers/konamigx.cpp b/docs/release/src/mame/drivers/konamigx.cpp index 596a59b885c..285068a805e 100644 --- a/docs/release/src/mame/drivers/konamigx.cpp +++ b/docs/release/src/mame/drivers/konamigx.cpp @@ -2181,6 +2181,39 @@ ROM_START( salmndr2a ) ROM_LOAD( "salmndr2a.nv", 0x0000, 0x080, CRC(3a98a8f9) SHA1(08c2d164620a4d8ad902d502acea8ad621931198) ) ROM_END +/* Magical Twinbee */ +ROM_START( mtwinbee ) + /* main program */ + ROM_REGION( 0x800000, "maincpu", 0 ) + GX_BIOS + ROM_LOAD32_WORD_SWAP( "424eaa02.31b", 0x200002, 512*1024, CRC(34659905) SHA1(011df093502644ab7ceb7fd1fbca41d09af89566) ) + ROM_LOAD32_WORD_SWAP( "424eaa04.27b", 0x200000, 512*1024, CRC(f42d3139) SHA1(e03006b4a87a70dfba9ec5e4857442424269986c) ) + + /* sound program */ + ROM_REGION( 0x40000, "soundcpu", 0 ) + ROM_LOAD16_BYTE("424a06.9c", 0x000000, 128*1024, CRC(a4760e14) SHA1(78dbd309f3f7fa61e92c9554e594449a7d4eed5a) ) + ROM_LOAD16_BYTE("424a07.7c", 0x000001, 128*1024, CRC(fa90d7e2) SHA1(6b6dee29643309005834416bdfdb18d74f34cb1b) ) + + /* tiles */ + ROM_REGION( 0x500000, "k056832", ROMREGION_ERASE00 ) + TILE_WORD_ROM_LOAD( "424a14.17h", 0x000000, 2*1024*1024, CRC(b1d9fce8) SHA1(143ed2f03ac10a0f18d878c0ee0509a5714e4664) ) + TILE_BYTE_ROM_LOAD( "424a12.13g", 0x000004, 512*1024, CRC(7f9cb8b1) SHA1(f5e18d70fcb572bb85f9b064995fc0ab0bb581e8) ) + + /* sprites */ + ROM_REGION( 0x500000, "k055673", ROMREGION_ERASE00 ) + ROM_LOAD32_WORD( "424a11.25g", 0x000000, 2*1024*1024, CRC(29592688) SHA1(a4b44e9153988a510915af83116e3c18dd15642f) ) + ROM_LOAD32_WORD( "424a10.28g", 0x000002, 2*1024*1024, CRC(cf24e5e3) SHA1(095bf2ae4f47c6e4768515ae5e22c982fbc660a5) ) + ROM_LOAD( "424a09.30g", 0x400000, 1*1024*1024, CRC(daa07224) SHA1(198cafa3d0ead2aa2593be066c6f372e66c11c44) ) + + /* sound data */ + ROM_REGION( 0x400000, "k054539", 0 ) + ROM_LOAD( "424a17.9g", 0x000000, 2*1024*1024, CRC(e9dd9692) SHA1(c289019c8d1dd71b3cec26479c39b649de804707) ) + ROM_LOAD( "424a18.7g", 0x200000, 2*1024*1024, CRC(0f0d9f3a) SHA1(57f6b113b80f06964b7e672ad517c1654c5569c5) ) + + ROM_REGION16_BE( 0x80, "eeprom", 0 ) // default eeprom to prevent game booting with error + ROM_LOAD( "mtwinbee.nv", 0x0000, 0x080, CRC(942b4323) SHA1(2f6799bf187510355df5e52c4d416f5c5e70fa05) ) +ROM_END + /* Twinbee Yahhoo! */ ROM_START( tbyahhoo ) /* main program */ @@ -3848,6 +3881,7 @@ static const GXGameInfoT gameDefs[] = { "fantjour", 7, 9, BPP5 }, { "fantjoura", 7, 9, BPP5 }, { "puzldama", 7, 0, BPP5 }, + { "mtwinbee", 7, 8, BPP5 }, { "tbyahhoo", 7, 8, BPP5 }, { "tkmmpzdm", 7, 2, BPP6 }, { "dragoonj", 7, 3, BPP4 }, @@ -4012,7 +4046,8 @@ GAME( 1994, gokuparo, fantjour, gokuparo, gokuparo, konamigx_state, init_ko GAME( 1994, crzcross, konamigx, gokuparo, puzldama, konamigx_state, init_posthack, ROT0, "Konami", "Crazy Cross (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1994, puzldama, crzcross, gokuparo, puzldama, konamigx_state, init_posthack, ROT0, "Konami", "Taisen Puzzle-dama (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1995, tbyahhoo, konamigx, tbyahhoo, gokuparo, konamigx_state, init_posthack, ROT0, "Konami", "Twin Bee Yahhoo! (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1995, mtwinbee, konamigx, tbyahhoo, gokuparo, konamigx_state, init_posthack, ROT0, "Konami", "Magical Twin Bee (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1995, tbyahhoo, mtwinbee, tbyahhoo, gokuparo, konamigx_state, init_posthack, ROT0, "Konami", "Twin Bee Yahhoo! (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1995, tkmmpzdm, konamigx, konamigx_6bpp, tokkae, konamigx_state, init_konamigx, ROT0, "Konami", "Tokimeki Memorial Taisen Puzzle-dama (ver JAB)", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/docs/release/src/osd/winui/hbmameui.rc b/docs/release/src/osd/winui/hbmameui.rc index 7e0eec90e71..5256184108e 100644 --- a/docs/release/src/osd/winui/hbmameui.rc +++ b/docs/release/src/osd/winui/hbmameui.rc @@ -444,7 +444,7 @@ BEGIN DEFPUSHBUTTON "&OK",IDOK,200,109,50,14,WS_GROUP CTEXT "HomeBrew MAME",IDC_STATIC,147,7,142,11,NOT WS_GROUP CTEXT "Version 0",IDC_VERSION,147,18,142,11,NOT WS_GROUP - CTEXT "Copyright (C) 1997-2020 Robbbert",IDC_STATIC,147,29,142,10,NOT WS_GROUP + CTEXT "Copyright (C) 1997-2021 Robbbert",IDC_STATIC,147,29,142,10,NOT WS_GROUP CTEXT "MAMEUI version by",IDC_STATIC,147,51,142,10,NOT WS_GROUP CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,147,44,142,1 CTEXT "Christopher Kirmse and the MAMEUI team",IDC_STATIC,147,62,142,9,NOT WS_GROUP diff --git a/docs/release/src/osd/winui/mui_audit.cpp b/docs/release/src/osd/winui/mui_audit.cpp index 568064ddfdc..eb278f409a8 100644 --- a/docs/release/src/osd/winui/mui_audit.cpp +++ b/docs/release/src/osd/winui/mui_audit.cpp @@ -122,7 +122,11 @@ const char * GetAuditString(int audit_result) return "No"; default: - printf("unknown audit value %i\n",audit_result); + if (audit_result == -1) + printf("GetAuditString: Audit value -1, try doing a full F5 audit\n"); + else + printf("GetAuditString: Unknown audit value %i\n",audit_result); + fflush(stdout); } return "?"; diff --git a/docs/release/src/osd/winui/treeview.cpp b/docs/release/src/osd/winui/treeview.cpp index 3eadeb2b2f0..d5b5a06ecc1 100644 --- a/docs/release/src/osd/winui/treeview.cpp +++ b/docs/release/src/osd/winui/treeview.cpp @@ -928,7 +928,7 @@ void CreateBIOSFolders(int parent_index) void CreateCPUFolders(int parent_index) { int device_folder_count = 0; - LPTREEFOLDER device_folders[512]; + LPTREEFOLDER device_folders[1024]; LPTREEFOLDER folder; int nFolder = numFolders; @@ -940,40 +940,48 @@ void CreateCPUFolders(int parent_index) for (device_execute_interface &device : execute_interface_enumerator(config.root_device())) { // get the name - std::string dev_name = device.device().name(); + const char* dev_name = device.device().name(); - // do we have a folder for this device? - folder = NULL; - for (int j = 0; j < device_folder_count; j++) + if (dev_name) { - if (!strcmp(dev_name.c_str(), device_folders[j]->m_lpTitle)) + // do we have a folder for this device? + folder = NULL; + for (int j = 0; j < device_folder_count; j++) { - folder = device_folders[j]; - break; + if (strcmp(dev_name, device_folders[j]->m_lpTitle)==0) + { + folder = device_folders[j]; + break; + } } - } - // are we forced to create a folder? - if (folder == NULL) - { - LPTREEFOLDER lpTemp = NewFolder(device.device().name(), next_folder_id, parent_index, IDI_CPU, GetFolderFlags(numFolders)); - ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA)); - memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA)); - ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id; - ExtraFolderData[next_folder_id]->m_nIconId = IDI_CPU; - ExtraFolderData[next_folder_id]->m_nParent = treeFolders[parent_index]->m_nFolderId; - ExtraFolderData[next_folder_id]->m_nSubIconId = -1; - strcpy( ExtraFolderData[next_folder_id]->m_szTitle, device.device().name() ); - ExtraFolderData[next_folder_id++]->m_dwFlags = 0; - AddFolder(lpTemp); - folder = treeFolders[nFolder++]; - - // record that we found this folder - device_folders[device_folder_count++] = folder; - } + // are we forced to create a folder? + if (folder == NULL) + { + LPTREEFOLDER lpTemp = NewFolder(dev_name, next_folder_id, parent_index, IDI_CPU, GetFolderFlags(numFolders)); + ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA)); + memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA)); + ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id; + ExtraFolderData[next_folder_id]->m_nIconId = IDI_CPU; + ExtraFolderData[next_folder_id]->m_nParent = treeFolders[parent_index]->m_nFolderId; + ExtraFolderData[next_folder_id]->m_nSubIconId = -1; + strcpy( ExtraFolderData[next_folder_id]->m_szTitle, dev_name ); + ExtraFolderData[next_folder_id++]->m_dwFlags = 0; + AddFolder(lpTemp); + folder = treeFolders[nFolder++]; - // cpu type #'s are one-based - AddGame(folder, i); + // record that we found this folder + device_folders[device_folder_count++] = folder; + if (device_folder_count >= std::size(device_folders)) + { + printf("CreateCPUFolders buffer overrun: %d\n",device_folder_count); + fflush(stdout); + } + } + + // cpu type #'s are one-based + AddGame(folder, i); + } } } const char *fname = "CPU"; @@ -996,41 +1004,49 @@ void CreateSoundFolders(int parent_index) for (device_sound_interface &device : sound_interface_enumerator(config.root_device())) { // get the name - std::string dev_name = device.device().name(); + const char* dev_name = device.device().name(); - // do we have a folder for this device? - folder = NULL; - for (int j = 0; j < device_folder_count; j++) + if (dev_name) { - if (!strcmp(dev_name.c_str(), device_folders[j]->m_lpTitle)) + // do we have a folder for this device? + folder = NULL; + for (int j = 0; j < device_folder_count; j++) { - folder = device_folders[j]; - break; + if (strcmp(dev_name, device_folders[j]->m_lpTitle)==0) + { + folder = device_folders[j]; + break; + } } - } - // are we forced to create a folder? - if (folder == NULL) - { - LPTREEFOLDER lpTemp = NewFolder(device.device().name(), next_folder_id, parent_index, IDI_SOUND, GetFolderFlags(numFolders)); - ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA)); - memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA)); - - ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id; - ExtraFolderData[next_folder_id]->m_nIconId = IDI_SOUND; - ExtraFolderData[next_folder_id]->m_nParent = treeFolders[parent_index]->m_nFolderId; - ExtraFolderData[next_folder_id]->m_nSubIconId = -1; - strcpy( ExtraFolderData[next_folder_id]->m_szTitle, device.device().name() ); - ExtraFolderData[next_folder_id++]->m_dwFlags = 0; - AddFolder(lpTemp); - folder = treeFolders[nFolder++]; - - // record that we found this folder - device_folders[device_folder_count++] = folder; - } + // are we forced to create a folder? + if (folder == NULL) + { + LPTREEFOLDER lpTemp = NewFolder(dev_name, next_folder_id, parent_index, IDI_SOUND, GetFolderFlags(numFolders)); + ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA)); + memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA)); - // cpu type #'s are one-based - AddGame(folder, i); + ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id; + ExtraFolderData[next_folder_id]->m_nIconId = IDI_SOUND; + ExtraFolderData[next_folder_id]->m_nParent = treeFolders[parent_index]->m_nFolderId; + ExtraFolderData[next_folder_id]->m_nSubIconId = -1; + strcpy( ExtraFolderData[next_folder_id]->m_szTitle, dev_name ); + ExtraFolderData[next_folder_id++]->m_dwFlags = 0; + AddFolder(lpTemp); + folder = treeFolders[nFolder++]; + + // record that we found this folder + device_folders[device_folder_count++] = folder; + if (device_folder_count >= std::size(device_folders)) + { + printf("CreateSoundFolders buffer overrun: %d\n",device_folder_count); + fflush(stdout); + } + } + + // cpu type #'s are one-based + AddGame(folder, i); + } } } const char *fname = "Sound"; diff --git a/docs/release/src/version.cpp b/docs/release/src/version.cpp index 7a25224ae3e..aead431ceec 100644 --- a/docs/release/src/version.cpp +++ b/docs/release/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.233" +#define BARE_BUILD_VERSION "0.234" extern const char bare_build_version[]; extern const char build_version[]; @@ -1760,14 +1760,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.233"' > $@ + @echo '#define BARE_BUILD_VERSION "0.234"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.233" > $@ + @echo #define BARE_BUILD_VERSION "0.234" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/src/version.cpp b/src/version.cpp index 7a25224ae3e..aead431ceec 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.233" +#define BARE_BUILD_VERSION "0.234" extern const char bare_build_version[]; extern const char build_version[]; |