From ad9829f1324326f11928fbf5dd40972fe51caa70 Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Tue, 9 Apr 2024 23:37:46 -0400
Subject: [PATCH 1/8] Remove unnecessary ini's

---
 Data/Sys/GameSettings/G2BE5G.ini | 16 ----------------
 Data/Sys/GameSettings/G2BP7D.ini | 16 ----------------
 Data/Sys/GameSettings/GC8JA4.ini | 24 ------------------------
 Data/Sys/GameSettings/HAJ.ini    |  9 ---------
 Data/Sys/GameSettings/HAL.ini    | 19 -------------------
 Data/Sys/GameSettings/RJ3.ini    | 17 -----------------
 Data/Sys/GameSettings/SGLPA4.ini |  8 --------
 Data/Sys/GameSettings/SRQ.ini    | 17 -----------------
 8 files changed, 126 deletions(-)
 delete mode 100644 Data/Sys/GameSettings/G2BE5G.ini
 delete mode 100644 Data/Sys/GameSettings/G2BP7D.ini
 delete mode 100644 Data/Sys/GameSettings/GC8JA4.ini
 delete mode 100644 Data/Sys/GameSettings/HAJ.ini
 delete mode 100644 Data/Sys/GameSettings/HAL.ini
 delete mode 100644 Data/Sys/GameSettings/RJ3.ini
 delete mode 100644 Data/Sys/GameSettings/SGLPA4.ini
 delete mode 100644 Data/Sys/GameSettings/SRQ.ini

diff --git a/Data/Sys/GameSettings/G2BE5G.ini b/Data/Sys/GameSettings/G2BE5G.ini
deleted file mode 100644
index af06b01fac1d..000000000000
--- a/Data/Sys/GameSettings/G2BE5G.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# G2BE5G - Black & Bruised
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-$Disable interlaced rendering
-0x800D8520:dword:0x38600000
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/G2BP7D.ini b/Data/Sys/GameSettings/G2BP7D.ini
deleted file mode 100644
index 39f453fcbb9d..000000000000
--- a/Data/Sys/GameSettings/G2BP7D.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# G2BP7D - Black & Bruised
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-$Disable interlaced rendering
-0x800D9E68:dword:0x38600000
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/GC8JA4.ini b/Data/Sys/GameSettings/GC8JA4.ini
deleted file mode 100644
index 1fb765408f21..000000000000
--- a/Data/Sys/GameSettings/GC8JA4.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# GC8JA4 - ｸﾗｯｼｭ･ﾊﾞﾝﾃﾞｨｸｰ 爆走！ニトロカート
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-$Fix C4 texture tiling (used for buttons and some character icons)
-0400328C 7D0340AE
-04003290 5108452E
-04003294 5508E13E
-04003298 4E800020
-040CA1B4 4BF390D9
-
-[Video_Settings]
-
-[Video_Hacks]
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/HAJ.ini b/Data/Sys/GameSettings/HAJ.ini
deleted file mode 100644
index 97da4f2deb48..000000000000
--- a/Data/Sys/GameSettings/HAJ.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-# HAJE01, HAJJ01, HAPP01 - Everybody Votes Channel
-
-[WC24Patch]
-$Main
-vt.wapp.wii.com:vt.wiilink24.com:1
-vtp.wapp.wii.com:vtp.wiilink24.com:0
-
-[WC24Patch_Enabled]
-$Main
diff --git a/Data/Sys/GameSettings/HAL.ini b/Data/Sys/GameSettings/HAL.ini
deleted file mode 100644
index 5d8cd65f8bf5..000000000000
--- a/Data/Sys/GameSettings/HAL.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# HALE01, HALJ01, HALP01 - Region Select
-
-[OnFrame_Enabled]
-$RSAPatch
-
-[OnFrame]
-# This patch changes the flag in its nwc24dl.bin to not have an RSA signature.
-# Although Dolphin doesn't validate the RSA signature, a real Wii does which is why we added this workaround.
-$RSAPatch
-0x80009DEC:dword:0x60000000
-0x8001AB20:dword:0x38600001
-0x8001AC68:dword:0x38600001
-
-[WC24Patch]
-$Main
-cfh.wapp.wii.com:ch.wiilink24.com:1
-
-[WC24Patch_Enabled]
-$Main
diff --git a/Data/Sys/GameSettings/RJ3.ini b/Data/Sys/GameSettings/RJ3.ini
deleted file mode 100644
index 61a0c51df5eb..000000000000
--- a/Data/Sys/GameSettings/RJ3.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RJ3E20, RJ3P7J - Jeep Thrills
-
-[Core]
-# Values set here will override the main Dolphin settings.
-# Fixes the blue screen problem. See issue 13118 for more info.
-AccurateNaNs = True
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
diff --git a/Data/Sys/GameSettings/SGLPA4.ini b/Data/Sys/GameSettings/SGLPA4.ini
deleted file mode 100644
index f70ade77e35f..000000000000
--- a/Data/Sys/GameSettings/SGLPA4.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# SGLPA4 - Gormiti: The Lords of Nature!
-
-[OnFrame]
-# Fixes black screen ingame, see https://bugs.dolphin-emu.org/issues/12436
-# This NOPs out UpdateFade's call to RenderFade. We are probably emulating the way the fade works
-# incorrectly, but for now this patch makes the game playable.
-$Fix black screen
-0x801D59C8:dword:0x60000000
diff --git a/Data/Sys/GameSettings/SRQ.ini b/Data/Sys/GameSettings/SRQ.ini
deleted file mode 100644
index 310c0ed6683a..000000000000
--- a/Data/Sys/GameSettings/SRQ.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# SRQE41, SRQP41 - Racquet Sports
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Hacks]
-#This prevents the loading screen from running uncapped
-ImmediateXFBEnable = False

From f7b750d1bab317cfeae17997c0496eec59290f0a Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Tue, 9 Apr 2024 23:38:25 -0400
Subject: [PATCH 2/8] correct typos in gecko code

---
 Source/Core/Core/GeckoCodeConfig.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h
index 2a7f39644835..6f82eecbfb17 100644
--- a/Source/Core/Core/GeckoCodeConfig.h
+++ b/Source/Core/Core/GeckoCodeConfig.h
@@ -198,9 +198,9 @@ E2000001 00000000
 *All mingames, stadiums, characters, and star characters are unlocked.
 
 +$Boot to Main Menu [LittleCoaks]
-280e877d 00000000
+280e877C 00000000
 0463f964 38600005
-e2000001 00000000
+E2000001 00000000
 *Skips the opening cutscenes and stars the game on the main menu. Does not load in memory card.
 
 +$Default Mercy On [LittleCoaks]

From 58ec01832c6b44fcc30cbef35883d961d53507b6 Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:54:12 -0400
Subject: [PATCH 3/8] formatting fix

---
 Source/Core/Core/Core.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h
index 56c12e0c639e..f8a89a66034c 100644
--- a/Source/Core/Core/Core.h
+++ b/Source/Core/Core/Core.h
@@ -172,7 +172,7 @@ void SaveScreenShot(std::string_view name);
 // This displays messages in a user-visible way.
 void DisplayMessage(std::string message, int time_in_ms);
 
-    void RunRioFunctions(const Core::CPUThreadGuard& guard);
+void RunRioFunctions(const Core::CPUThreadGuard& guard);
 void FrameUpdateOnCPUThread();
 void OnFrameEnd();
 bool IsGolfMode();

From 164f930f6273221f57e938b0e5ddbd77ec4de099 Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:54:53 -0400
Subject: [PATCH 4/8] Update MSSB free mem ranges

Also slightly changed the format of the code for easier use
---
 Source/Core/Core/Core.cpp      | 5 +++--
 Source/Core/Core/Core.h        | 2 +-
 Source/Core/Core/GeckoCode.cpp | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 4595f8e33856..9011b719e6e8 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -1830,11 +1830,12 @@ bool GameSupportsTagSets()
     return false;
 }
 
-std::optional<u32> getGameFreeMemory()
+std::optional<std::pair<u32,u32>> getGameFreeMemory()
 {
   switch (mGameBeingPlayed) {
   case GameName::MarioBaseball:
-    return 0x802ed200;
+    //return std::make_pair(0x802ED200, 0x802EE764);
+    return std::make_pair(0x802D5100, 0x802D9500);
   case GameName::ToadstoolTour:
     return std::nullopt;
   case GameName::UnknownGame:
diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h
index f8a89a66034c..c4775e2a225b 100644
--- a/Source/Core/Core/Core.h
+++ b/Source/Core/Core/Core.h
@@ -257,7 +257,7 @@ std::optional<std::vector<std::string>> GetTagSetGeckoString();
 bool GameSupportsTagSets();
 
 // Helper function for the Gecko loader expansion
-std::optional<u32> getGameFreeMemory();
+std::optional<std::pair<u32,u32>> getGameFreeMemory();
 
 static const u32 aOpponentPort = 0x802EBF92;
 static const u32 aFielderPort = 0x802EBF94;
diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp
index 909b6a2348aa..526e51bc59ee 100644
--- a/Source/Core/Core/GeckoCode.cpp
+++ b/Source/Core/Core/GeckoCode.cpp
@@ -191,8 +191,8 @@ static Installation InstallCodeHandlerLocked(const Core::CPUThreadGuard& guard)
   if (use_free_memory)
   {
     // Move Gecko code handler to the free mem region
-    codelist_base_address = free_memory_base_address.value();
-    codelist_end_address = codelist_base_address + 0xA700;
+    codelist_base_address = free_memory_base_address.value().first;
+    codelist_end_address = free_memory_base_address.value().second;
     PowerPC::MMU::HostWrite_U32(guard, ((codelist_base_address & 0xFFFF0000) >> 16 ) + 0x3DE00000, 0x80001904);
     PowerPC::MMU::HostWrite_U32(guard, (codelist_base_address & 0x0000FFFF) + 0x61EF0000, 0x80001908);
   }

From 0eb7359ac3b686a4b9f170314d5929c2ed6fd976 Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:55:00 -0400
Subject: [PATCH 5/8] Update Version.cpp

---
 Source/Core/Common/Version.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
index 435b871d816f..c6f63edb529b 100644
--- a/Source/Core/Common/Version.cpp
+++ b/Source/Core/Common/Version.cpp
@@ -16,7 +16,7 @@ namespace Common
 #else
 #define BUILD_TYPE_STR ""
 #endif
-#define RIO_REV_STR "2.1.0"
+#define RIO_REV_STR "2.1.1"
 
 const std::string& GetScmRevStr()
 {

From 91a6a80b6eba40dd2125f8914455075e1e856ec3 Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Sun, 14 Apr 2024 21:42:16 -0400
Subject: [PATCH 6/8] Update Captain Swap

Fixes issue where team star graphic wouldn't stay after a swap.
---
 Source/Core/Core/GeckoCodeConfig.h | 67 +++++++++++++-----------------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h
index 6f82eecbfb17..b1d652151ed5 100644
--- a/Source/Core/Core/GeckoCodeConfig.h
+++ b/Source/Core/Core/GeckoCodeConfig.h
@@ -207,31 +207,32 @@ E2000001 00000000
 040498DC 9867003F
 *Mercy defaults to on when starting a game
 
-+$Captain Swap [nuche]
-C264F674 0000005A
++$Captain Swap [nuche, LittleCoaks]
+2064F67C 40820AB4
+C264F67C 00000058
 3D60800F 398B877C
 A54C0000 280A0004
 41820014 38C4298C
 38A0000D 38830910
-480002A8 57C004E7
-57C3043E 4182029C
+4800029C 57C004E7
+57C3043E 41820290
 3D608075 398B0C48
 7D6CDA14 8D4B0045
-280A0000 4082023C
+280A0000 40820230
 3D608075 398B0C48
 7D6CDA14 8D4B0041
-280A0000 40820224
+280A0000 40820218
 3D608075 398B0C48
 1D5B0004 7D6C5214
 850B0000 2C080009
-40800208 3D60803C
+408001FC 3D60803C
 398B6738 1D5B0009
 7D6C5214 39400009
 7D4903A6 38E00000
 894B0000 7C085000
 40820008 48000014
 396B0001 38E70001
-4200FFE8 480001CC
+4200FFE8 480001C0
 60000000 3D60803C
 398B6726 1D5B0009
 7D6C5214 7D4B3A14
@@ -240,7 +241,7 @@ A54C0000 280A0004
 7D6903A6 896C0000
 7C095800 40820008
 48000010 398C0001
-4200FFEC 48000184
+4200FFEC 48000178
 60000000 3D608035
 398B3080 1D5B0004
 7D6A6214 912B0000
@@ -279,35 +280,25 @@ BC610008 3C608035
 80010104 38210100
 7C0803A6 7C0802A6
 90010004 9421FF00
-BC610008 3C608035
-606330EC 80630000
-3880006E 38A0001E
-3D808004 618C2DA8
-7D8903A6 4E800421
-B8610008 80010104
-38210100 7C0803A6
-7C0802A6 90010004
-9421FF00 BC610008
-386001BC 48000018
-7C0802A6 90010004
-9421FF00 BC610008
-386001BA 3C80800E
-6084FBA4 80840000
-38A0003F 38C00000
-3D80800C 618C836C
-7D8903A6 4E800421
-B8610008 80010104
-38210100 7C0803A6
-60000000 00000000
-06515E52 00000040
-002F004F 00420050
-00504002 80570032
-0051003E 004F0051
-80584002 0051004C
-40020050 0054003E
-004D4002 0040003E
-004D0051 003E0046
-004B000D 40024000
+BC610008 7F63DB78
+3880000F 3D808006
+618C25A4 7D8903A6
+4E800421 B8610008
+80010104 38210100
+7C0803A6 7C0802A6
+90010004 9421FF00
+BC610008 386001BC
+48000018 7C0802A6
+90010004 9421FF00
+BC610008 386001BA
+3C80800E 6084FBA4
+80840000 38A0003F
+38C00000 3D80800C
+618C836C 7D8903A6
+4E800421 B8610008
+80010104 38210100
+7C0803A6 00000000
+E2000001 00000000
 *Press "Start" over a character to change your captain while mid-draft
 
 +$Checksum [LittleCoaks]

From 544efa91c91a3669a4fa57406b479e97ec7dc0d1 Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Sun, 14 Apr 2024 22:03:12 -0400
Subject: [PATCH 7/8] Update Desync message

---
 Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
index 2bd8b6ab00aa..afb034552a09 100644
--- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
@@ -1263,12 +1263,9 @@ void NetPlayDialog::OnHostInputAuthorityChanged(bool enabled)
 
 void NetPlayDialog::OnDesync(u32 frame, const std::string& player)
 {
- /* DisplayMessage(tr("Possible desync detected: %1 might have desynced at frame %2")
-                     .arg(QString::fromStdString(player), QString::number(frame)),
-                 "red", OSD::Duration::VERY_LONG);*/
   OSD::AddTypedMessage(OSD::MessageType::NetPlayDesync,
-                       "Possible desync detected. Game restart advised.",
-                       OSD::Duration::VERY_LONG, OSD::Color::RED);
+                       "Possible desync detected. Game restart advised (if this goes away, it's a false alarm).",
+                       OSD::Duration::SHORT, OSD::Color::RED);
   // TODO:
   // tell stat tracker here that a desync happened. write it to the event & gamestate
 }

From b34b2eb217df444783097bb0f6fb16c5da03978a Mon Sep 17 00:00:00 2001
From: LittleCoaks <LittleCoaks@users.noreply.github.com>
Date: Sun, 14 Apr 2024 22:57:12 -0400
Subject: [PATCH 8/8] Fix bug where "No Game Mode" message incorrectly pops up

It was due to the Starting Game Message, which tells you if a game mode is active or not, running before the Init function which sets the active game. So the isTagSetActive function returned false because the current game being played var was set to none
---
 Source/Core/Core/NetPlayClient.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index 3925b03b0f34..bed5c0391dc4 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -1010,7 +1010,6 @@ void NetPlayClient::OnStartGame(sf::Packet& packet)
   }
 
   m_dialog->OnMsgStartGame();
-  m_dialog->StartingMsg(Core::isTagSetActive(true));
 }
 
 void NetPlayClient::OnStopGame(sf::Packet& packet)
@@ -2081,6 +2080,8 @@ bool NetPlayClient::StartGame(const std::string& path)
 
   m_dialog->BootGame(path, std::move(boot_session_data));
 
+  m_dialog->StartingMsg(Core::isTagSetActive(true));
+
   UpdateDevices();
 
   return true;