Merge pull request ProjectRio#88 from ProjectRio/2.1.1_release

2.1.1_release
MORImementos · Apr 15, 2024 · dc39b6b · dc39b6b
2 parents d5c35c3 + b34b2eb
commit dc39b6b
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 179 deletions.
diff --git a/Data/Sys/GameSettings/G2BE5G.ini b/Data/Sys/GameSettings/G2BE5G.ini
diff --git a/Data/Sys/GameSettings/G2BP7D.ini b/Data/Sys/GameSettings/G2BP7D.ini
diff --git a/Data/Sys/GameSettings/GC8JA4.ini b/Data/Sys/GameSettings/GC8JA4.ini
diff --git a/Data/Sys/GameSettings/HAJ.ini b/Data/Sys/GameSettings/HAJ.ini
diff --git a/Data/Sys/GameSettings/HAL.ini b/Data/Sys/GameSettings/HAL.ini
diff --git a/Data/Sys/GameSettings/RJ3.ini b/Data/Sys/GameSettings/RJ3.ini
diff --git a/Data/Sys/GameSettings/SGLPA4.ini b/Data/Sys/GameSettings/SGLPA4.ini
diff --git a/Data/Sys/GameSettings/SRQ.ini b/Data/Sys/GameSettings/SRQ.ini
diff --git 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()
 {

diff --git 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
@@ -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();
@@ -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
@@ -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);
   }

diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h
@@ -198,40 +198,41 @@ 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]
 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]

diff --git 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;

diff --git 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
 }