Cache Issue Fix

Cleared the cache for Mario's and the partners' stats upon entering a battle if they were modified manually.

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -417,6 +417,12 @@ struct ClearAreaFlagsStruct
 	bool StartClearingFlags;
 };
 
+struct ClearCacheForBattlesStruct
+{
+	bool MarioStatsShouldBeCleared;
+	bool PartnerStatsShouldBeCleared;
+};
+
 struct TrickDisplay
 {
 	uint32_t MainTimer;
@@ -463,6 +469,7 @@ extern SaveAnywhereStruct SaveAnywhere;
 extern ReloadRoomStruct ReloadRoom;
 extern SpawnItems SpawnItem;
 extern ClearAreaFlagsStruct ClearAreaFlags;
+extern ClearCacheForBattlesStruct ClearCacheForBattles;
 extern TrickDisplay YoshiSkip;
 extern TrickDisplay PalaceSkip;
 extern OnScreenTimerDisplay OnScreenTimer;

ttyd-tools/rel/include/mod.h

@@ -15,7 +15,7 @@ class Mod
 	void preventButtonInputInBattle();
 	int32_t pauseMenuPreventUnpause(void *);
 	bool infiniteItemUsage(int16_t, uint32_t);
-	bool recheckBattleJumpAndHammerLevels();
+	bool performPreBattleActions();
 	int32_t preventMenuSounds(int32_t, uint32_t, uint32_t, uint32_t);
 	const char *getCustomMessage(const char *);
 

ttyd-tools/rel/source/global.cpp

@@ -779,6 +779,7 @@ struct SaveAnywhereStruct SaveAnywhere;
 struct ReloadRoomStruct ReloadRoom;
 struct SpawnItems SpawnItem;
 struct ClearAreaFlagsStruct ClearAreaFlags;
+struct ClearCacheForBattlesStruct ClearCacheForBattles;
 struct TrickDisplay YoshiSkip;
 struct TrickDisplay PalaceSkip;
 struct OnScreenTimerDisplay OnScreenTimer;

ttyd-tools/rel/source/main.cpp

@@ -11,6 +11,7 @@
 #include <ttyd/mario.h>
 #include <ttyd/evt_sub.h>
 #include <ttyd/mario_pouch.h>
+#include <ttyd/OSCache.h>
 
 #include <cstdio>
 
@@ -325,11 +326,31 @@ void Mod::preventButtonInputInBattle()
 	mPFN_BattlePadManager_trampoline();
 }
 
-bool Mod::recheckBattleJumpAndHammerLevels()
+bool Mod::performPreBattleActions()
 {
 	// Make sure the Jump and Hammer upgrades have been properly checked
 	recheckJumpAndHammerLevels();
 
+	// Clear the cache for Mario if his stats were changed manually
+	if (ClearCacheForBattles.MarioStatsShouldBeCleared)
+	{
+		ClearCacheForBattles.MarioStatsShouldBeCleared = false;
+		
+		uint32_t PouchPtr = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
+		void *AddressesToClearStart = reinterpret_cast<void *>(PouchPtr + 0x70);
+		ttyd::OSCache::DCFlushRange(AddressesToClearStart, 0x21);
+	}
+	
+	// Clear the cache for the partners if their stats were changed manually
+	if (ClearCacheForBattles.PartnerStatsShouldBeCleared)
+	{
+		ClearCacheForBattles.PartnerStatsShouldBeCleared = false;
+		
+		uint32_t PouchPtr = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
+		void *AddressesToClearStart = reinterpret_cast<void *>(PouchPtr + 0xE);
+		ttyd::OSCache::DCFlushRange(AddressesToClearStart, 0x61);
+	}
+	
 	// Call original function
 	return mPFN_battle_init_trampoline();
 }

ttyd-tools/rel/source/menufunctions.cpp

@@ -1635,6 +1635,15 @@ void setMarioStatsValue(uint32_t currentMenuOption)
 	// Perform adjustments on certain addresses
 	switch (currentMenuOption)
 	{
+		case MARIO_HP:
+		case MARIO_FP:
+		case MARIO_RANK:
+		case SPECIAL_MOVES:
+		case STAR_POWER:
+		{
+			ClearCacheForBattles.MarioStatsShouldBeCleared = true;
+			break;
+		}
 		case BP:
 		{
 			// Force the game to recalculate how much BP is left
@@ -1653,6 +1662,8 @@ void setMarioStatsValue(uint32_t currentMenuOption)
 			{
 				*reinterpret_cast<int16_t *>(PouchPtr + 0x70) = MaxHP;
 			}
+			
+			ClearCacheForBattles.MarioStatsShouldBeCleared = true;
 			break;
 		}
 		case MARIO_MAX_FP:
@@ -1667,22 +1678,25 @@ void setMarioStatsValue(uint32_t currentMenuOption)
 			{
 				*reinterpret_cast<int16_t *>(PouchPtr + 0x74) = MaxFP;
 			}
+			
+			ClearCacheForBattles.MarioStatsShouldBeCleared = true;
 			break;
 		}
-		/*case MARIO_LEVEL:
+		case MARIO_LEVEL:
 		{
 			// Adjust Mario's rank with the level
-			int16_t MarioLevel = *reinterpret_cast<int16_t *>(PouchPtr + 0x8A);
+			/*int16_t MarioLevel = *reinterpret_cast<int16_t *>(PouchPtr + 0x8A);
 			int16_t NewRank = MarioLevel / 10;
 			
 			if (NewRank > 3)
 			{
 				NewRank = 3;
 			}
 			
-			*reinterpret_cast<int16_t *>(PouchPtr + 0x88) = NewRank;
+			*reinterpret_cast<int16_t *>(PouchPtr + 0x88) = NewRank;*/
+			ClearCacheForBattles.MarioStatsShouldBeCleared = true;
 			break;
-		}*/
+		}
 		case MAX_STAR_POWER:
 		{
 			// Prevent the current value from exceeding the max value
@@ -1693,6 +1707,8 @@ void setMarioStatsValue(uint32_t currentMenuOption)
 			{
 				*reinterpret_cast<int16_t *>(PouchPtr + 0x7A) = MaxSP;
 			}
+			
+			ClearCacheForBattles.MarioStatsShouldBeCleared = true;
 			break;
 		}
 		default:
@@ -1714,6 +1730,8 @@ void setPartnerStatsValue(uint32_t currentMenuOption)
 		{
 			*reinterpret_cast<int16_t *>(PartnerEnabledAddress + 0x6) = 
 				static_cast<int16_t>(tempMenuSecondaryValue);
+			
+			ClearCacheForBattles.PartnerStatsShouldBeCleared = true;
 			break;
 		}
 		case PARTNER_MAX_HP:
@@ -1724,6 +1742,8 @@ void setPartnerStatsValue(uint32_t currentMenuOption)
 			// Set the Max HP entering battle
 			*reinterpret_cast<int16_t *>(PartnerEnabledAddress + 0x4) = 
 				static_cast<int16_t>(tempMenuSecondaryValue);
+			
+			ClearCacheForBattles.PartnerStatsShouldBeCleared = true;
 			break;
 		}
 		case PARTNER_RANK:
@@ -1734,6 +1754,8 @@ void setPartnerStatsValue(uint32_t currentMenuOption)
 			// Set the rank for battles
 			*reinterpret_cast<int16_t *>(PartnerEnabledAddress + 0xC) = 
 				static_cast<int16_t>(tempMenuSecondaryValue);
+			
+			ClearCacheForBattles.PartnerStatsShouldBeCleared = true;
 			break;
 		}
 		default:

ttyd-tools/rel/source/mod.cpp

@@ -65,7 +65,7 @@ void Mod::init()
 	mPFN_battle_init_trampoline = patch::hookFunction(
 		ttyd::seq_battle::battle_init, []()
 	{
-		return gMod->recheckBattleJumpAndHammerLevels();
+		return gMod->performPreBattleActions();
 	});
 
 	mPFN_SoundEfxPlayEx_trampoline = patch::hookFunction(