Game DB: Updated to latest version of Nes20 DB

SourMesen · May 2, 2020 · 9772aa0 · 9772aa0
1 parent 7ab9b50
commit 9772aa0
Show file tree

Hide file tree

Showing 4 changed files with 3,319 additions and 400 deletions.
diff --git a/Core/GameDatabase.cpp b/Core/GameDatabase.cpp
@@ -269,6 +269,8 @@ void GameDatabase::SetGameInfo(uint32_t romCrc, RomData &romData, bool updateRom
 				case 'h': msg += "Horizontal"; break;
 				case 'v': msg += "Vertical"; break;
 				case '4': msg += "4 Screens"; break;
+				case '0': msg += "Screen A only"; break;
+				case '1': msg += "Screen B only"; break;
 			}
 			MessageManager::Log(msg);
 		}
@@ -335,6 +337,8 @@ void GameDatabase::UpdateRomData(GameInfo &info, RomData &romData)
 			case 'h': romData.Info.Mirroring = MirroringType::Horizontal; break;
 			case 'v': romData.Info.Mirroring = MirroringType::Vertical; break;
 			case '4': romData.Info.Mirroring = MirroringType::FourScreens; break;
+			case '0': romData.Info.Mirroring = MirroringType::ScreenAOnly; break;
+			case '1': romData.Info.Mirroring = MirroringType::ScreenBOnly; break;
 		}
 	}
 }
diff --git a/Core/UnRom512.h b/Core/UnRom512.h
@@ -30,11 +30,16 @@ class UnRom512 : public BaseMapper
 		SelectPRGPage(1, -1);
 
 		_enableMirroringBit = false;
-		switch(_romInfo.NesHeader.Byte6 & 0x09) {
-			case 0: SetMirroringType(MirroringType::Horizontal); break;
-			case 1: SetMirroringType(MirroringType::Vertical); break;
-			case 8: SetMirroringType(MirroringType::ScreenAOnly); _enableMirroringBit = true; break;
-			case 9: SetMirroringType(MirroringType::FourScreens); break;
+		if(GetMirroringType() == MirroringType::ScreenAOnly || GetMirroringType() == MirroringType::ScreenBOnly) {
+			SetMirroringType(MirroringType::ScreenAOnly);
+			_enableMirroringBit = true;
+		} else {
+			switch(_romInfo.NesHeader.Byte6 & 0x09) {
+				case 0: SetMirroringType(MirroringType::Horizontal); break;
+				case 1: SetMirroringType(MirroringType::Vertical); break;
+				case 8: SetMirroringType(MirroringType::ScreenAOnly); _enableMirroringBit = true; break;
+				case 9: SetMirroringType(MirroringType::FourScreens); break;
+			}
 		}
 
 		if(GetMirroringType() == MirroringType::FourScreens && _chrRam && _chrRamSize >= 0x8000) {