From f9aaf8b9715470f0fd9182164fc6bd3c0443453b Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sat, 4 Jul 2020 14:45:15 +0200
Subject: [PATCH] Revert "Return nothing from VolumeWii::GetGameTDBID if Datel"

This reverts commit f9705fd1176432755df3dba0ef5c50f505193371.
GameTDB.com has covers for non-GNHE5d Datel discs.
---
 Source/Core/DiscIO/VolumeGC.cpp  | 8 +++++---
 Source/Core/DiscIO/VolumeWii.cpp | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 83b0d3dd00..cb8c26f73e 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -59,11 +59,13 @@ const FileSystem* VolumeGC::GetFileSystem(const Partition& partition) const
 
 std::string VolumeGC::GetGameTDBID(const Partition& partition) const
 {
-  // Don't return an ID for Datel discs
-  if (!GetBootDOLOffset(*this, PARTITION_NONE).has_value())
+  const std::string game_id = GetGameID(partition);
+
+  // Don't return an ID for Datel discs that are using the game ID of NHL Hitz 2002
+  if (game_id == "GNHE5d" && !GetBootDOLOffset(*this, partition).has_value())
     return "";
 
-  return GetGameID(partition);
+  return game_id;
 }
 
 Region VolumeGC::GetRegion() const
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp
index c17744f172..9880e6d79e 100644
--- a/Source/Core/DiscIO/VolumeWii.cpp
+++ b/Source/Core/DiscIO/VolumeWii.cpp
@@ -301,10 +301,6 @@ u64 VolumeWii::PartitionOffsetToRawOffset(u64 offset, const Partition& partition
 
 std::string VolumeWii::GetGameTDBID(const Partition& partition) const
 {
-  // Don't return an ID for Datel discs
-  if (m_game_partition == PARTITION_NONE)
-    return "";
-
   return GetGameID(partition);
 }