Update MSSB free mem ranges

Also slightly changed the format of the code for easier use
MORImementos · Apr 11, 2024 · 164f930 · 164f930
1 parent 58ec018
commit 164f930
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
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
@@ -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);
   }