diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index cf45f3a8987..5066ba30bc8 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/conf.py b/docs/source/conf.py index bbe71ce6c72..6be8a143e39 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2022, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.241' +version = '0.242' # The full version, including alpha/beta/rc tags. -release = '0.241' +release = '0.242' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index 81bab64237b..5e0a8593654 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -18852,7 +18852,7 @@ license:CC0 - Nibbles Away III (Version 1.25B) + Nibbles Away III (Version 1.25B) 1985 COMPUTER:applications diff --git a/makefile b/makefile index 0f3e1e7d356..efed4e0bbb3 100644 --- a/makefile +++ b/makefile @@ -1546,7 +1546,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.241"' > $@ + @echo '#define BARE_BUILD_VERSION "0.242"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1556,7 +1556,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.241" > $@ + @echo #define BARE_BUILD_VERSION "0.242" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index 26b1e92a252..dce45e9e33f 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -48,7 +48,6 @@ Thunderball 508 1 unknown HyperBall 509 1 unknown Barracora 510 ASD hit 1 ASD Varkon 512 AX hit 1 AX -Spellbinder (unreleased) 513 (mnw) Reflex (unreleased) 514 Time Fantasy 515 1 X Warlok 516 1 X @@ -66,17 +65,13 @@ Starlight 530 AS hit 1 AS *Wild Texas is a clone/bootleg of Firepower II, and shows the same game number. Status: -- All machines are playable (except Spellbinder). +- All machines are playable - Thunderball: turn Speech DIP off, or you get corrupt sound. ToDo: - Some games have an additional alphanumeric display, or different display arrangements - Mechanical sounds vary per machine - Hyperball, status display is different -- Spellbinder, appears to be a non-working beta, runs into the weeds. If num-0 pressed it - fills everything with FF and freezes. Uses another PIA at 4000. Display is bad. If - game started it will soon end by itself. Makes random loud noises even in attract - mode. Doesn't display the game number on first boot, unlike every other game. *****************************************************************************************/ @@ -981,21 +976,6 @@ ROM_START(vrkon_l1) ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(d13db2bb) SHA1(862546bbdd1476906948f7324b7434c29df79baa) ) ROM_END -/*---------------------------------------------------------------------- -/ Spellbinder (#513) Not-working beta. -/ Reconstructed from the source by jessakey -/ No soundrom supplied, using one from hyperball (as PinMAME has done). -/----------------------------------------------------------------------*/ -ROM_START(splbn_l0) - ROM_REGION(0x3000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD("ic20.532", 0x0000, 0x1000, CRC(ff765ebf) SHA1(14d42735291c3f6e112f19bd49a39e00059cf907) ) - ROM_LOAD("ic14.532", 0x1000, 0x1000, CRC(940a817a) SHA1(2583ff6f6b6985d3ac85b4f120ebb002a10b65af) ) - ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(b38fde72) SHA1(17ef3ca354431307b6a79992c50cb2491b8a7631) ) - - ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF) - ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(06051e5e) SHA1(f0ab4be812ceaf771829dd549f2a612156102a93) ) -ROM_END - /*----------------------------- / Time Fantasy (#515) /-----------------------------*/ @@ -1138,7 +1118,6 @@ GAME( 1981, hypbl_l3, hypbl_l4, s7, hypbl, s7_state, empty_init, ROT0, "Williams GAME( 1981, hypbl_l2, hypbl_l4, s7, hypbl, s7_state, empty_init, ROT0, "Williams", "HyperBall (L-2)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 1981, barra_l1, 0, s7, barra, s7_state, empty_init, ROT0, "Williams", "Barracora (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 1982, vrkon_l1, 0, s7, vrkon, s7_state, empty_init, ROT0, "Williams", "Varkon (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1982, splbn_l0, 0, s7, s7, s7_state, empty_init, ROT0, "Williams", "Spellbinder (L-0)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 1982, tmfnt_l5, 0, s7, tmfnt, s7_state, empty_init, ROT0, "Williams", "Time Fantasy (L-5)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 1982, wrlok_l3, 0, s7, wrlok, s7_state, empty_init, ROT0, "Williams", "Warlok (L-3)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 1982, dfndr_l4, 0, s7, dfndr, s7_state, empty_init, ROT0, "Williams", "Defender (L-4)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index caf4a9eaa71..9d6438e029f 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -37082,7 +37082,6 @@ jst_l2 // lsrcu_l2 // pharo_l2 // solar_l2 // -splbn_l0 // strlt_l1 // thund_p1 // thund_p2 //