Merge tag 'mame0272' into rel272

MAME 0.272
mahlemiut · Nov 30, 2024 · bb637eb · bb637eb
2 parents 449c361 + 5d8e4cf
commit bb637eb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="271"
-      android:versionName="0.271"
+      android:versionCode="272"
+      android:versionName="0.272"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.271'
+version = '0.272'
 # The full version, including alpha/beta/rc tags.
-release = '0.271'
+release = '0.272'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/hash/msx1_cass.xml b/hash/msx1_cass.xml
@@ -4163,8 +4163,8 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="danchits">
-		<description>Danchi Tsuma no Yuuwaku (Japan)</description>
+	<software name="danchizm">
+		<description>Danchizuma no Yuuwaku (Japan)</description>
 		<year>1985</year>
 		<publisher>KOEI</publisher>
 		<info name="alt_title" value="団地妻の誘惑"/>

diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml
@@ -8230,8 +8230,8 @@ ExtractDisk  [02]"DAIVA_B        " -> "daiva_02.d88"
 		</part>
 	</software>
 
-	<software name="danchits">
-		<description>Danchi Tsuma no Yuuwaku</description>
+	<software name="danchizm">
+		<description>Danchizuma no Yuuwaku</description>
 		<year>1983</year>
 		<publisher>光栄 (Koei)</publisher>
 		<!-- PC8801 -->
@@ -8244,8 +8244,8 @@ ExtractDisk  [02]"DAIVA_B        " -> "daiva_02.d88"
 		</part>
 	</software>
 
-	<software name="danchitsa" cloneof="danchits">
-		<description>Danchi Tsuma no Yuuwaku (alt)</description>
+	<software name="danchizma" cloneof="danchizm">
+		<description>Danchizuma no Yuuwaku (alt)</description>
 		<year>1983</year>
 		<publisher>光栄 (Koei)</publisher>
 		<!-- PC8801 -->

diff --git a/hash/x1_cass.xml b/hash/x1_cass.xml
@@ -224,8 +224,8 @@ Titles, publishers and release dates taken from:
 		</part>
 	</software>
 
-	<software name="danchits">
-		<description>Danchi Tsuma no Yuuwaku</description>
+	<software name="danchizm">
+		<description>Danchizuma no Yuuwaku</description>
 		<year>1983</year>
 		<publisher>光栄 (Koei)</publisher>
 		<info name="release" value="198306xx"/>

diff --git a/makefile b/makefile
@@ -1578,7 +1578,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.271"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.272"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
 	@echo 'const char build_version[] = BARE_BUILD_VERSION "W (" BARE_VCS_REVISION ")";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.271" > $@
+	@echo #define BARE_BUILD_VERSION "0.272" > $@
 	@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/cvs/quasar.cpp b/src/mame/cvs/quasar.cpp
@@ -337,7 +337,7 @@ int quasar_state::audio_t1_r()
 void quasar_state::program(address_map &map)
 {
 	map(0x0000, 0x13ff).rom();
-	map(0x1400, 0x14ff).ram().w(FUNC(quasar_state::bullet_w)).share(m_bullet_ram);
+	map(0x1400, 0x14ff).mirror(0x6000).ram().w(FUNC(quasar_state::bullet_w)).share(m_bullet_ram);
 	map(0x1500, 0x15ff).mirror(0x6000).rw(m_s2636[0], FUNC(s2636_device::read_data), FUNC(s2636_device::write_data));
 	map(0x1600, 0x16ff).mirror(0x6000).rw(m_s2636[1], FUNC(s2636_device::read_data), FUNC(s2636_device::write_data));
 	map(0x1700, 0x17ff).mirror(0x6000).rw(m_s2636[2], FUNC(s2636_device::read_data), FUNC(s2636_device::write_data));

diff --git a/src/mame/misc/compucranes.cpp b/src/mame/misc/compucranes.cpp
@@ -92,7 +92,7 @@ ROM_END
 // "GANCHONEW V7" PCB with AT PSU connector
 ROM_START(mastcranea)
 	ROM_REGION(0x80000, "maincpu", 0)
-	ROM_LOAD("v7.ic3",      0x00000, 0x40000, CRC(733dfcbc) SHA1(d18d7945e9b8f189f2169d3d90c3cfea97d3b39c)) // 1ST AND 2ND HALF IDENTICAL (W29C020C)
+	ROM_LOAD("v7.ic3",      0x00000, 0x40000, CRC(299c9ad1) SHA1(b0ba2ab588151dba89307e118ba061cad2b8116b)) // 1ST AND 2ND HALF IDENTICAL (W29C020C)
 
 	ROM_REGION(0x00117, "pld", 0)
 	ROM_LOAD("atf16v8.ic4", 0x00000, 0x00117, CRC(4d665a06) SHA1(504f0107482f636cd216579e982c6162c0b120a7)) // Verified to be the same on all known PCB revisions