From 7b1da36ed4f1d7999359524e9c64a22124fac31d Mon Sep 17 00:00:00 2001 From: hap Date: Sat, 9 May 2020 11:24:03 +0200 Subject: [PATCH 1/6] microvision: fix backwards lcd screen blend mode (nw) --- src/mame/layout/microvision.lay | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mame/layout/microvision.lay b/src/mame/layout/microvision.lay index 4e88c9e4e6f..d7d1124d3d5 100644 --- a/src/mame/layout/microvision.lay +++ b/src/mame/layout/microvision.lay @@ -6,9 +6,8 @@ license:CC0 - - - + + @@ -25,7 +24,7 @@ license:CC0 - + @@ -35,7 +34,6 @@ license:CC0 - From 005f00ce9d36c78d13c7bf0b42e80e17cfbf1e17 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 10 May 2020 23:17:52 +0200 Subject: [PATCH 2/6] microvision: workaround MT7586, no visible change (nw) (cherry picked from commit 15e9103d30c62f34fff19824213db35952f6c736) --- src/mame/layout/microvision.lay | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mame/layout/microvision.lay b/src/mame/layout/microvision.lay index d7d1124d3d5..68aee4b8847 100644 --- a/src/mame/layout/microvision.lay +++ b/src/mame/layout/microvision.lay @@ -6,7 +6,8 @@ license:CC0 - + + @@ -23,16 +24,17 @@ license:CC0 - - + + - - + + + From a1f546a8a8de85f4bd9b127b6ff5564a760f8235 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 15 May 2020 00:07:45 +1000 Subject: [PATCH 3/6] (nw) cleanup: * unemulated protection means unemulated protection, not "anything I don't understand" * Fix up some titles * Fix a spelling error in a comment --- hash/pi_storyreader_cart.xml | 6 +++--- hash/vsmilem_cart.xml | 4 ++-- src/mame/drivers/tmnt.cpp | 6 +++--- src/mame/video/arcadia.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hash/pi_storyreader_cart.xml b/hash/pi_storyreader_cart.xml index 005ff88b07a..72f46ec8567 100644 --- a/hash/pi_storyreader_cart.xml +++ b/hash/pi_storyreader_cart.xml @@ -379,12 +379,12 @@ license:CC0 - Arielle - Die Meerjungfrau (Germany) + Arielle - Die Meerjungfrau (Germany) 200? Publications International Ltd. / Disney - + @@ -412,7 +412,7 @@ license:CC0 - Die Schöne und das Biest (GER) (Germany) + Die Schöne und das Biest (Germany) 200? Publications International Ltd. / Disney diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml index 456fd1986f7..efff014c095 100644 --- a/hash/vsmilem_cart.xml +++ b/hash/vsmilem_cart.xml @@ -71,7 +71,7 @@ Language: | | 80-084140(US) | Spider-Man & Friends - Secret Missions (AKA Professor V's Secret Missions with diff label)| | | 80-084143(UK) | Spider-Man & Friends - Secret Missions | | XX | 80-084144(GE) | Spider-Man & Freunde - Geheime Missionen | -| XX | 80-084145(FR) | Spider-Man and ses amis - Missions Secrètes | +| XX | 80-084145(FR) | Spider-Man & ses amis - Missions Secrètes | | | 80-084147(SP) | Spider-Man y Amigos: Misiones Secretas (no # on label) | +========+===================+===========================================================================================+ | XX | 80-084160(US) | Disney's Little Einsteins: The Glass Slipper Ball (Rev. 2?) | @@ -918,7 +918,7 @@ Language: - Marvel Spider-Man and ses amis - Missions Secrètes (France) + Marvel Spider-Man & ses amis - Missions Secrètes (France) 2008 VTech diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index 4a57cfcfffb..cd3c5f12cda 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -4346,9 +4346,9 @@ GAME( 1991, blswhstl, 0, blswhstl, blswhstl, tmnt_state, empty_init, GAME( 1991, blswhstla, blswhstl, blswhstl, blswhstl, tmnt_state, empty_init, ROT90, "Konami", "Bells & Whistles (Asia, version M)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, detatwin, blswhstl, blswhstl, blswhstl, tmnt_state, empty_init, ROT90, "Konami", "Detana!! Twin Bee (Japan, version J)", MACHINE_SUPPORTS_SAVE ) -GAME( 1991, glfgreat, 0, glfgreat, glfgreat, glfgreat_state, empty_init, ROT0, "Konami", "Golfing Greats (World, version L)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) -GAME( 1991, glfgreatu, glfgreat, glfgreat, glfgreatu, glfgreat_state, empty_init, ROT0, "Konami", "Golfing Greats (US, version K)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) -GAME( 1991, glfgreatj, glfgreat, glfgreat, glfgreatj, glfgreat_state, empty_init, ROT0, "Konami", "Golfing Greats (Japan, version J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) +GAME( 1991, glfgreat, 0, glfgreat, glfgreat, glfgreat_state, empty_init, ROT0, "Konami", "Golfing Greats (World, version L)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1991, glfgreatu, glfgreat, glfgreat, glfgreatu, glfgreat_state, empty_init, ROT0, "Konami", "Golfing Greats (US, version K)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1991, glfgreatj, glfgreat, glfgreat, glfgreatj, glfgreat_state, empty_init, ROT0, "Konami", "Golfing Greats (Japan, version J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1991, tmnt2, 0, tmnt2, ssridr4p, tmnt_state, empty_init, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver UAA)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, tmnt2a, tmnt2, tmnt2, ssrid4ps, tmnt_state, empty_init, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver ADA)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/video/arcadia.cpp b/src/mame/video/arcadia.cpp index 972f5346b48..f85f93cbc05 100644 --- a/src/mame/video/arcadia.cpp +++ b/src/mame/video/arcadia.cpp @@ -6,7 +6,7 @@ Consolidation and enhancement of documentation by Manfred Schneider based on pre Schematics, manuals and anything you can desire for at http://amigan.1emu.net/ - TODO: find a dump of the characther ROM + TODO: find a dump of the character ROM convert the drawing code to tilemap emulation of signetics 2637 video/audio device From c890ef101dd9cf00d1e97b4e8a85db7a539e5900 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 15 May 2020 05:56:45 +1000 Subject: [PATCH 4/6] taitosj.cpp: since we're renaming these anyway, let's capitalise initialisms (nw) --- src/mame/drivers/taitosj.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp index 3a5bd1bc907..a96032212fa 100644 --- a/src/mame/drivers/taitosj.cpp +++ b/src/mame/drivers/taitosj.cpp @@ -2894,13 +2894,13 @@ GAME( 1982, alpinea, alpine, nomcu, alpinea, taitosj_state, init_alpinea GAME( 1982, timetunl, 0, nomcu, timetunl, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Time Tunnel", MACHINE_SUPPORTS_SAVE ) GAME( 1982, wwestern, 0, nomcu, wwestern, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Wild Western (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1982, wwestern1, wwestern, nomcu, wwestern, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Wild Western (set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, frontlin, 0, mcu, frontlin, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Front Line (AA1, 4 pcb version)", MACHINE_SUPPORTS_SAVE ) -GAME( 1982, frontlina, frontlin, mcu, frontlin, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Front Line (FL, 5 pcb version)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, elevator, 0, mcu, elevator, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Elevator Action (BA3, 4 pcb version, 1.1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, elevatora, elevator, mcu, elevator, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Elevator Action (EA, 5 pcb version, 1.1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, frontlin, 0, mcu, frontlin, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Front Line (AA1, 4 PCB version)", MACHINE_SUPPORTS_SAVE ) +GAME( 1982, frontlina, frontlin, mcu, frontlin, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Front Line (FL, 5 PCB version)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, elevator, 0, mcu, elevator, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Elevator Action (BA3, 4 PCB version, 1.1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, elevatora, elevator, mcu, elevator, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Elevator Action (EA, 5 PCB version, 1.1)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, elevatorb, elevator, nomcu, elevator, taitosj_state, init_taitosj, ROT0, "bootleg", "Elevator Action (bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, tinstar, 0, mcu, tinstar, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "The Tin Star (A10, 4 pcb version)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, tinstara, tinstar, mcu, tinstar, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "The Tin Star (TS, 5 pcb version)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, tinstar, 0, mcu, tinstar, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "The Tin Star (A10, 4 PCB version)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, tinstara, tinstar, mcu, tinstar, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "The Tin Star (TS, 5 PCB version)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, waterski, 0, nomcu, waterski, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Water Ski", MACHINE_SUPPORTS_SAVE ) GAME( 1983, bioatack, 0, nomcu, bioatack, taitosj_state, init_taitosj, ROT270, "Taito Corporation (Fox Video Games license)", "Bio Attack", MACHINE_SUPPORTS_SAVE ) GAME( 1984, sfposeid, 0, mcu, sfposeid, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Sea Fighter Poseidon", MACHINE_SUPPORTS_SAVE ) From 180d2a582224f97ba84e4c4516558ea351d920f5 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 15 May 2020 20:03:04 +1000 Subject: [PATCH 5/6] hp80.cpp: mark language variants of HP 86B as clones (nw) --- src/mame/drivers/hp80.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp index 84e93c93685..ae4f844dcca 100644 --- a/src/mame/drivers/hp80.cpp +++ b/src/mame/drivers/hp80.cpp @@ -2433,7 +2433,7 @@ ROM_START(hp86b_004) ROM_LOAD("chrgen.bin" , 0 , 0x500 , CRC(c7d04292) SHA1(b86ed801ee9f7a57b259374b8a9810572cb03230)) ROM_END -COMP( 1980, hp85, 0, 0, hp85, hp85, hp85_state, empty_init, "HP", "HP 85", 0) -COMP( 1983, hp86b,0, 0, hp86, hp86, hp86_state, empty_init, "HP", "HP 86B",0) -COMP( 1983, hp86b_001, 0, 0, hp86, hp86_001, hp86_int_state, empty_init, "HP", "HP 86B Opt 001",0) -COMP( 1983, hp86b_004, 0, 0, hp86, hp86_004, hp86_int_state, empty_init, "HP", "HP 86B Opt 004",0) +COMP( 1980, hp85, 0, 0, hp85, hp85, hp85_state, empty_init, "HP", "HP 85", 0) +COMP( 1983, hp86b, 0, 0, hp86, hp86, hp86_state, empty_init, "HP", "HP 86B",0) +COMP( 1983, hp86b_001, hp86b, 0, hp86, hp86_001, hp86_int_state, empty_init, "HP", "HP 86B Opt 001",0) +COMP( 1983, hp86b_004, hp86b, 0, hp86, hp86_004, hp86_int_state, empty_init, "HP", "HP 86B Opt 004",0) From e8a0e0469b0e7956be5e3b0c4d243c65d7b8406c Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 18 May 2020 10:52:33 +1000 Subject: [PATCH 6/6] version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index c70f7f64575..412d337f6d4 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index c756efaa1cb..2a4c4a1e809 100644 --- a/makefile +++ b/makefile @@ -1704,14 +1704,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.220"' > $@ + @echo '#define BARE_BUILD_VERSION "0.221"' > $@ @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.220" > $@ + @echo #define BARE_BUILD_VERSION "0.221" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@