Implement more uses of checkIfPointerIsValid

Author: Zephiles

ttyd-tools/rel/include/commonfunctions.h

@@ -7,6 +7,8 @@
 
 namespace mod {
 
+extern "C" {
+
 bool checkButtonCombo(uint16_t combo);
 bool checkButtonComboEveryFrame(uint16_t combo);
 bool checkForSpecificSeq(ttyd::seqdrv::SeqIndex wantedSeq);
@@ -42,4 +44,6 @@ ttyd::evtmgr::EvtWork *getCurrentEventWork();
 bool checkIfPointerIsValid(void *ptr);
 void *getLastPointerFromPath(void *address, int32_t *offset, uint32_t offsetAmount);;
 
+}
+
 }

ttyd-tools/rel/source/assembly/FixBlooperCrash2.s

@@ -17,7 +17,7 @@ mr %r30,%r4
 
 # Check if battleUnitPointer is valid
 mr %r3,%r4 # battleUnitPointer
-bl checkBattleUnitPointer
+bl checkIfPointerIsValid
 
 # Check the returned bool
 cmpwi %r3,0 # False

ttyd-tools/rel/source/main.cpp

@@ -59,22 +59,6 @@ extern "C"
 	void BranchBackFixRoomProblems();
 }
 
-// Additional function used by assembly overwrites
-extern "C" {
-bool checkBattleUnitPointer(void *battleUnitPointer)
-{
-	uint32_t BattleUnitPtr = reinterpret_cast<uint32_t>(battleUnitPointer);
-	if ((BattleUnitPtr < 0x80000000) || (BattleUnitPtr >= 0x81800000))
-	{
-		return false;
-	}
-	else
-	{
-		return true;
-	}
-}
-}
-
 // Functions accessed by assembly overwrites
 extern "C" {
 void *preventPreBattleSoftlock(void *fbatPointer)
@@ -121,7 +105,7 @@ bool displayMegaHammerBadgesInMenu(uint32_t checkBit)
 
 uint32_t fixBlooperCrash1(uint32_t unkValue, void *battleUnitPointer)
 {
-	if (checkBattleUnitPointer(battleUnitPointer))
+	if (checkIfPointerIsValid(battleUnitPointer))
 	{
 		#ifdef TTYD_US
 		uint32_t offset = 0x218;

ttyd-tools/rel/source/memorywatch.cpp

@@ -73,7 +73,7 @@ const char *getAddressStringFromOffsets(int32_t slot, uint32_t maxOffset)
 			MemoryWatch[slot].Address), OffsetArray, maxOffset));
 
 	// Make sure the address is valid
-	if ((Address < 0x80000000) || (Address >= 0x81800000))
+	if (!checkIfPointerIsValid(reinterpret_cast<void *>(Address)))
 	{
 		// Address is invalid
 		return "???";
@@ -98,7 +98,7 @@ const char *getValueString(int32_t slot)
 			MemoryWatch[slot].AddressOffset, MemoryWatch[slot].AddressOffsetAmount));
 
 	// Make sure the address is valid
-	if ((Address < 0x80000000) || (Address >= 0x81800000))
+	if (!checkIfPointerIsValid(reinterpret_cast<void *>(Address)))
 	{
 		// Address is invalid
 		return "???";