Moved fixRoomProblems to initStageEvents

There may be a possible instance where OSLink wont be called when entering a new room, so initStageEvents is a better place for it, since initStageEvents is set to run just before the check for whether OSLink should run or not

Author: Zephiles

ttyd-tools/rel/include/main.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <cstdint>
+
+namespace mod {
+
+void fixRoomProblems();
+
+}

ttyd-tools/rel/include/mod.h

@@ -27,7 +27,7 @@ class Mod
 	uint32_t pauseArtAttackTimer();
 	uint32_t setIndexWarpEntrance(ttyd::evtmgr::EvtEntry *, uint32_t);
 	int32_t fixMarioKeyOn();
-	bool performRelAndMapPatches(gc::OSModule::OSModuleInfo *, void *);
+	bool performRelPatches(gc::OSModule::OSModuleInfo *, void *);
 	void *disableBattles(uint32_t, void *);
 	void drawArtAttackHitboxes(ttyd::dispdrv::CameraId);
 	int32_t displayActionCommandsTimingHook(void *, ttyd::battle_unit::AttackParams *);

ttyd-tools/rel/source/main.cpp

@@ -1,3 +1,4 @@
+#include "main.h"
 #include "global.h"
 #include "commonfunctions.h"
 #include "menufunctions.h"
@@ -110,6 +111,52 @@ void preventTextboxOptionSelection(char *currentText, void *storeAddress, int32_
 		reinterpret_cast<uint32_t>(storeAddress) + 0x9C) = NewOption;
 }
 
+void fixRoomProblems() // Gets called in initStageEvents
+{
+	uint32_t SequencePosition = getSequencePosition();
+	
+	if (compareStringToNextMap("nok_00"))
+	{
+		// Prevent the game from crashing if the player enters the intro cutscene after interacting with an NPC that is past slot 10
+		// Check if the cutscene is going to play
+		if (SequencePosition < 26)
+		{
+			// Clear the pointer used to check which animation Mario should use when greeting the Koopa
+			uint32_t fbatPointer = reinterpret_cast<uint32_t>(ttyd::npcdrv::fbatGetPointer());
+			*reinterpret_cast<uint32_t *>(fbatPointer + 0x4) = 0; // Mario will do no animation when the pointer is not set
+		}
+	}
+	else if (compareStringToNextMap("rsh_05_a"))
+	{
+		// Prevent the game from crashing if the player enters rsh_05_a with the Sequence past 338
+		if (SequencePosition > 338)
+		{
+			// Set the Sequence to 338 to prevent the crash
+			setSequencePosition(338);
+		}
+	}
+	else if (compareStringToNextMap("aji_13"))
+	{
+		// Prevent the game from crashing if the conveyor belt has not been activated
+		// Set GW(11) to 0 upon entering the room to prevent the crash
+		setGW(11, 0);
+	}
+	else if (compareStringToNextMap("las_08"))
+	{
+		// Prevent the game from crashing if the player entered las_08 with the Sequence as 385 and GSW(1121) at 7
+		if (SequencePosition == 385)
+		{
+			// Check if GSW(1121) is currently at 7
+			uint32_t GSW_1121 = ttyd::swdrv::swByteGet(1121);
+			if (GSW_1121 == 7)
+			{
+				// Lower the value to 6 to prevent the game from crashing
+				ttyd::swdrv::swByteSet(1121, 6);
+			}
+		}
+	}
+}
+
 void *fixEvtMapBlendSetFlagPartnerCrash(void *partnerPtr)
 {
 	// Bring out a partner if no partner is currently out
@@ -371,57 +418,8 @@ int32_t Mod::fixMarioKeyOn()
 	return mPFN_marioKeyOn_trampoline();
 }
 
-void fixRoomProblems()
+bool Mod::performRelPatches(gc::OSModule::OSModuleInfo *newModule, void *bss)
 {
-	uint32_t SequencePosition = getSequencePosition();
-	
-	if (compareStringToNextMap("nok_00"))
-	{
-		// Prevent the game from crashing if the player enters the intro cutscene after interacting with an NPC that is past slot 10
-		// Check if the cutscene is going to play
-		if (SequencePosition < 26)
-		{
-			// Clear the pointer used to check which animation Mario should use when greeting the Koopa
-			uint32_t fbatPointer = reinterpret_cast<uint32_t>(ttyd::npcdrv::fbatGetPointer());
-			*reinterpret_cast<uint32_t *>(fbatPointer + 0x4) = 0; // Mario will do no animation when the pointer is not set
-		}
-	}
-	else if (compareStringToNextMap("rsh_05_a"))
-	{
-		// Prevent the game from crashing if the player enters rsh_05_a with the Sequence past 338
-		if (SequencePosition > 338)
-		{
-			// Set the Sequence to 338 to prevent the crash
-			setSequencePosition(338);
-		}
-	}
-	else if (compareStringToNextMap("aji_13"))
-	{
-		// Prevent the game from crashing if the conveyor belt has not been activated
-		// Set GW(11) to 0 upon entering the room to prevent the crash
-		setGW(11, 0);
-	}
-	else if (compareStringToNextMap("las_08"))
-	{
-		// Prevent the game from crashing if the player entered las_08 with the Sequence as 385 and GSW(1121) at 7
-		if (SequencePosition == 385)
-		{
-			// Check if GSW(1121) is currently at 7
-			uint32_t GSW_1121 = ttyd::swdrv::swByteGet(1121);
-			if (GSW_1121 == 7)
-			{
-				// Lower the value to 6 to prevent the game from crashing
-				ttyd::swdrv::swByteSet(1121, 6);
-			}
-		}
-	}
-}
-
-bool Mod::performRelAndMapPatches(gc::OSModule::OSModuleInfo *newModule, void *bss)
-{
-	// Check to see if any fixes need to be applied to specific maps
-	fixRoomProblems();
-	
 	// Call the original function immediately, as the REL file should be linked before applying patches
 	const bool Result = mPFN_OSLink_trampoline(newModule, bss);
 
@@ -716,7 +714,7 @@ void initAddressOverwrites()
 
 	*reinterpret_cast<uint32_t *>(msgWindowMrAddress) 						= 0x38830001; // addi r4,r3,1
 
-	// Set the initial value for the debug mode variable, to allow backtrace screens before the title sequence begins
+	// Set the initial value for the debug mode variable
 	*reinterpret_cast<int32_t *>(
 		reinterpret_cast<uint32_t>(
 			ttyd::seq_title::seqTitleWorkPointer2) + 0x30) = -1;

ttyd-tools/rel/source/menufunctions.cpp

@@ -3,6 +3,7 @@
 #include "commonfunctions.h"
 #include "codes.h"
 #include "memorywatch.h"
+#include "main.h"
 
 #include <gc/os.h>
 #include <gc/OSTime.h>
@@ -3697,6 +3698,9 @@ bool getEventDetails(int32_t index, WarpByEventDetailsStruct *warpByEventDetails
 
 void *initStageEvents()
 {
+	// Check to see if any fixes need to be applied to specific maps
+	fixRoomProblems();
+	
 	if (!WarpByEvent.ShouldInit)
 	{
 		// The overwritten instruction sets r3 to the global work pointer, so return the global work pointer

ttyd-tools/rel/source/mod.cpp

@@ -109,7 +109,7 @@ void Mod::init()
 	mPFN_OSLink_trampoline = patch::hookFunction(
 		gc::OSModule::OSLink, [](gc::OSModule::OSModuleInfo *newModule, void *bss)
 	{
-		return gMod->performRelAndMapPatches(newModule, bss);
+		return gMod->performRelPatches(newModule, bss);
 	});
 
 	mPFN_fbatHitCheck_trampoline = patch::hookFunction(