Fix bugs when non-mssb game plays with game mode

the tagset codes would get injected for mgtt lol
MORImementos · Mar 5, 2024 · 19b22c1 · 19b22c1
1 parent dfdc2c8
commit 19b22c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
@@ -1790,6 +1790,9 @@ void SetTagSet(std::optional<TagSet> tagset, bool netplay)
 
 bool isTagSetActive(std::optional<bool> netplay)
 {
+  if (!GameSupportsTagSets())
+    return false;
+
   if (!netplay.has_value())
     netplay = NetPlay::IsNetPlayRunning();
 
@@ -1808,6 +1811,9 @@ bool isNetplay()
 
 std::optional<std::vector<std::string>> GetTagSetGeckoString()
 {
+  if (!GameSupportsTagSets())
+    return std::nullopt;
+
   std::optional<TagSet> tagset_active = GetActiveTagSet(NetPlay::IsNetPlayRunning());
 
   if (!tagset_active.has_value())
@@ -1816,6 +1822,14 @@ std::optional<std::vector<std::string>> GetTagSetGeckoString()
   return tagset_active.value().gecko_codes_string();
 }
 
+bool GameSupportsTagSets()
+{
+  if (mGameBeingPlayed == GameName::MarioBaseball)
+    return true;
+  else
+    return false;
+}
+
 std::optional<u32> getGameFreeMemory()
 {
   switch (mGameBeingPlayed) {

diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h
@@ -254,6 +254,7 @@ void SetTagSet(std::optional<TagSet> tagset, bool netplay);
 bool isTagSetActive(std::optional<bool> netplay = std::nullopt);
 bool isNetplay();
 std::optional<std::vector<std::string>> GetTagSetGeckoString();
+bool GameSupportsTagSets();
 
 // Helper function for the Gecko loader expansion
 std::optional<u32> getGameFreeMemory();