From 59633f5309b8386ebf321104dc16bd46b372bf1c Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 27 Nov 2019 14:35:25 +0100 Subject: [PATCH] VolumeVerifier: Detect broken Super Paper Mario https://bugs.dolphin-emu.org/issues/11900 --- Source/Core/DiscIO/VolumeVerifier.cpp | 34 +++++++++++++++++++++++++++ Source/Core/DiscIO/VolumeVerifier.h | 1 + 2 files changed, 35 insertions(+) diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 5b84ca2633..905a1cc26d 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -972,6 +973,39 @@ void VolumeVerifier::CheckMisc() "The CRC32 of this file might match the CRC32 of a good dump even " "though the files are not identical.")); } + + if (StringBeginsWith(game_id_unencrypted, "R8P")) + CheckSuperPaperMario(); + } +} + +void VolumeVerifier::CheckSuperPaperMario() +{ + // When Super Paper Mario (any region/revision) reads setup/aa1_01.dat when starting a new game, + // it also reads a few extra bytes so that the read length is divisible by 0x20. If these extra + // bytes are zeroes like in good dumps, the game works correctly, but otherwise it can freeze + // (depending on the exact values of the extra bytes). https://bugs.dolphin-emu.org/issues/11900 + + const DiscIO::Partition partition = m_volume.GetGamePartition(); + const FileSystem* fs = m_volume.GetFileSystem(partition); + if (!fs) + return; + + std::unique_ptr file_info = fs->FindFileInfo("setup/aa1_01.dat"); + if (!file_info) + return; + + const u64 offset = file_info->GetOffset() + file_info->GetSize(); + const u64 length = Common::AlignUp(offset, 0x20) - offset; + std::vector data(length); + if (!m_volume.Read(offset, length, data.data(), partition)) + return; + + if (std::any_of(data.cbegin(), data.cend(), [](u8 x) { return x != 0; })) + { + AddProblem(Severity::High, + Common::GetStringT("Some padding data that should be zero is not zero. " + "This can make the game freeze at certain points.")); } } diff --git a/Source/Core/DiscIO/VolumeVerifier.h b/Source/Core/DiscIO/VolumeVerifier.h index c9e69c3b09..e6b4b33c72 100644 --- a/Source/Core/DiscIO/VolumeVerifier.h +++ b/Source/Core/DiscIO/VolumeVerifier.h @@ -158,6 +158,7 @@ private: u64 GetBiggestReferencedOffset() const; u64 GetBiggestReferencedOffset(const FileInfo& file_info) const; void CheckMisc(); + void CheckSuperPaperMario(); void SetUpHashing(); void WaitForAsyncOperations() const; bool ReadChunkAndWaitForAsyncOperations(u64 bytes_to_read);