Revert "Added support for ACE loaders"

This reverts commit ed96950.

Author: Zephiles

ttyd-tools/rel/include/patch.h

@@ -5,7 +5,6 @@
 namespace mod::patch {
 
 void clear_DC_IC_Cache(void *ptr, uint32_t size);
-void overwriteAddressValue(void *address, uint32_t value);
 void writeStandardBranches(void *address, void functionStart(), void functionBranchBack());
 void writeBranch(void *ptr, void *destination);
 void writeBranchBL(void *ptr, void *destination);

ttyd-tools/rel/source/main.cpp

@@ -770,23 +770,20 @@ void initAddressOverwrites()
 
 	patch::writeBranchBL(FallThroughMostObjectsBowserAddress, reinterpret_cast<void *>(StartFallThroughMostObjectsBowser));
 
-	patch::overwriteAddressValue(DebugModeInitialzeAddress, 0x3800FFFF); // li r0,-1
+	*reinterpret_cast<uint32_t *>(DebugModeInitialzeAddress) 				= 0x3800FFFF; // li r0,-1
+	*reinterpret_cast<uint32_t *>(DebugModeShowBuildDateAddress) 			= 0x60000000; // nop
 
-	patch::overwriteAddressValue(DebugModeShowBuildDateAddress, 0x60000000); // nop
+	*reinterpret_cast<uint32_t *>(PauseMenuPartnerMenuAddress) 				= 0x60000000; // nop
+	*reinterpret_cast<uint32_t *>(PauseMenuBadgeMenuAddress) 				= 0x60000000; // nop
 
-	patch::overwriteAddressValue(PauseMenuPartnerMenuAddress, 0x60000000); // nop
+	*reinterpret_cast<uint32_t *>(PreventImportantItemCutscenesAddress) 	= 0x48000030; // b 0x30
 
-	patch::overwriteAddressValue(PauseMenuBadgeMenuAddress, 0x60000000); // nop
-	
-	patch::overwriteAddressValue(PreventImportantItemCutscenesAddress, 0x48000030); // b 0x30
-	
-	patch::overwriteAddressValue(msgWindowMrAddress, 0x38830001); // addi r4,r3,1
+	*reinterpret_cast<uint32_t *>(msgWindowMrAddress) 						= 0x38830001; // addi r4,r3,1
 
 	// Set the initial value for the debug mode variable
-	int32_t *DebugModeVar = reinterpret_cast<int32_t *>(
-		reinterpret_cast<uint32_t>(ttyd::seq_title::seqTitleWorkPointer2) + 0x30);
-	
-	patch::overwriteAddressValue(DebugModeVar, static_cast<uint32_t>(-1));
+	*reinterpret_cast<int32_t *>(
+		reinterpret_cast<uint32_t>(
+			ttyd::seq_title::seqTitleWorkPointer2) + 0x30) = -1;
 }
 
 void Mod::run()

ttyd-tools/rel/source/mod.cpp

@@ -146,18 +146,12 @@ void Mod::init()
 		return gMod->checkForNpcNameToPtrError(name);
 	});
 
-	// Initialize typesettings early
-	// Only run if an ACE loader was not used
-	uint32_t LoaderValue = *reinterpret_cast<uint32_t *>(0x80004148);
-	if (LoaderValue == 0)
-	{
-		// ACE loader was not used, so run the functions
-		ttyd::fontmgr::fontmgrTexSetup();
-		ttyd::windowdrv::windowTexSetup();
-	}
-	
-	// Prevent the functions from being ran again
+	// Initialize typesetting early
+	ttyd::fontmgr::fontmgrTexSetup();
 	patch::hookFunction(ttyd::fontmgr::fontmgrTexSetup, [](){});
+	
+	// Initialize typesetting early
+	ttyd::windowdrv::windowTexSetup();
 	patch::hookFunction(ttyd::windowdrv::windowTexSetup, [](){});
 
 	// Skip the logo

ttyd-tools/rel/source/patch.cpp

@@ -12,13 +12,6 @@ void clear_DC_IC_Cache(void *ptr, uint32_t size)
 	gc::OSCache::ICInvalidateRange(ptr, size);
 }
 
-void overwriteAddressValue(void *address, uint32_t value)
-{
-	uint32_t *tempAddress = reinterpret_cast<uint32_t *>(address);
-	*tempAddress = value;
-	clear_DC_IC_Cache(address, sizeof(uint32_t));
-}
-
 void writeStandardBranches(void *address, void functionStart(), void functionBranchBack())
 {
 	void *BranchBackAddress = reinterpret_cast<void *>(