From 2a8ed31cbf5c853be75ee09ac7fa9da8ffa13930 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 8 Aug 2015 15:57:30 -0500 Subject: [PATCH] add a bad PSX dump and change rom status printout a bit --- BizHawk.Client.Common/RomLoader.cs | 21 ++++++--------------- output/gamedb/gamedb.txt | 1 + 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index 438927baf7..037cc39055 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -286,7 +286,7 @@ namespace BizHawk.Client.Common sw.WriteLine("Disc could not be identified as known-good. Look for a better rip."); else { - sw.WriteLine("Disc was identified (99.99% confidently) as known good."); + sw.WriteLine("Disc was identified (99.99% confidently) as known good with disc id hash CRC32:{0:X8}",discHash); sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version."); sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh")); sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)"); @@ -301,7 +301,6 @@ namespace BizHawk.Client.Common } nextEmulator = new Octoshock(nextComm, discs, discNames, null, GetCoreSettings(), GetCoreSyncSettings()); - nextEmulator.CoreComm.RomStatusDetails = "PSX etc."; nextEmulator.CoreComm.RomStatusDetails = sw.ToString(); game = new GameInfo { Name = Path.GetFileNameWithoutExtension(file.Name) }; game.System = "PSX"; @@ -384,7 +383,7 @@ namespace BizHawk.Client.Common else { StringWriter sw = new StringWriter(); - sw.WriteLine("Disc was identified (99.99% confidently) as known good."); + sw.WriteLine("Disc was identified (99.99% confidently) as known good with disc id hash CRC32:{0:X8}", discHash); sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version."); sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh")); sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)"); @@ -475,7 +474,7 @@ namespace BizHawk.Client.Common sw.WriteLine("Disc could not be identified as known-good. Look for a better rip."); else { - sw.WriteLine("Disc was identified (99.99% confidently) as known good."); + sw.WriteLine("Disc was identified (99.99% confidently) as known good with disc id hash CRC32:{0:X8}", discHash); sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version."); sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh")); sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)"); @@ -491,17 +490,9 @@ namespace BizHawk.Client.Common // todo: copy pasta from PSX .cue section nextEmulator = new Octoshock(nextComm, discs, discNames, null, GetCoreSettings(), GetCoreSyncSettings()); - if (game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase) - nextEmulator.CoreComm.RomStatusDetails = "Disc could not be identified as known-good. Look for a better rip."; - else - { - sw.WriteLine("Disc was identified (99.99% confidently) as known good."); - sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version."); - sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh")); - sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)"); - sw.WriteLine("Compare it with the full hash calculated by the PSX menu's Hash Discs tool"); - nextEmulator.CoreComm.RomStatusDetails = sw.ToString(); - } + nextEmulator.CoreComm.RomStatusDetails = sw.ToString(); + game = new GameInfo { Name = Path.GetFileNameWithoutExtension(file.Name) }; + game.System = "PSX"; break; default: diff --git a/output/gamedb/gamedb.txt b/output/gamedb/gamedb.txt index beb2dcef41..99b5d0dc90 100644 --- a/output/gamedb/gamedb.txt +++ b/output/gamedb/gamedb.txt @@ -153,6 +153,7 @@ EDD7A45A7F27E396B6D686F1861642D509863132 Datach - SD Gundam - Gundam Wars NES ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bad PSX (not many, so collecting here for now);;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;licensed by sony... string erased: C94257E7 B Looney Tunes - Sheep Raider (STATiC Dump) PSX dh=00000000 +829A295C B Monster Rancher 2 (U) (EXE Patched) PSX dh=00000000 #include gamedb_neshomebrew.txt #include gamedb_vs.txt