Bug Fix + Added Additional Features

Fixed the game crashing if the player entered las_08 with the Sequence at 385 and with GSW(1121) at 7. GSW(1121) will be reduced to 6 in this instance in order to avoid the crash.

Allowed being able to give actors badges inside of battles. When an actor that is neither Mario nor the partners is given a badge, all of the current badges equipped are cleared, and the new badge is equipped.

Adjusted the window length for the button timing display to be dynamic.

Author: Zephiles

ttyd-tools/rel/include/commonfunctions.h

@@ -21,6 +21,7 @@ void setNextMap(const char *map);
 void setNextBero(const char *bero);
 bool compareStrings(const char *str1, const char *str2);
 bool compareStringsSize(const char *str1, const char *str2, uint32_t size);
+bool compareStringToNextMap(const char *str);
 uint32_t getSystemLevel();
 void setSystemLevel(uint32_t value);
 void setSeq(const char *map, const char *bero);

ttyd-tools/rel/include/ttyd.eu.lst

@@ -784,7 +784,7 @@
 // 800F8A68:BattleStoreExp
 // 800F8A78:BattleStoreCoin
 // 800F8A8C:BattlePartyInfoWorkInit
-// 800F8B10:_EquipItem
+800F8B10:_EquipItem
 // 800F9188:BtlUnit_EquipItem
 // 800F9250:BattleTransPartyIdToUnitKind
 // 800F92B0:BattleTransPartyId

ttyd-tools/rel/include/ttyd.jp.lst

@@ -778,7 +778,7 @@
 // 800F2CB0:BattleStoreExp
 // 800F2CC0:BattleStoreCoin
 // 800F2CD4:BattlePartyInfoWorkInit
-// 800F2D50:_EquipItem
+800F2D50:_EquipItem
 // 800F33C8:BtlUnit_EquipItem
 // 800F3490:BattleTransPartyIdToUnitKind
 // 800F34F0:BattleTransPartyId

ttyd-tools/rel/include/ttyd.us.lst

@@ -783,7 +783,7 @@
 // 800F7BFC:BattleStoreExp
 // 800F7C0C:BattleStoreCoin
 // 800F7C20:BattlePartyInfoWorkInit
-// 800F7CA4:_EquipItem
+800F7CA4:_EquipItem
 // 800F831C:BtlUnit_EquipItem
 // 800F83E4:BattleTransPartyIdToUnitKind
 // 800F8444:BattleTransPartyId

ttyd-tools/rel/include/ttyd/battle.h

@@ -28,7 +28,7 @@ extern "C" {
 // BattleStoreExp
 // BattleStoreCoin
 // BattlePartyInfoWorkInit
-// _EquipItem
+void _EquipItem(void *battleUnitPtr, uint32_t unkBits, int16_t item);
 // BtlUnit_EquipItem
 // BattleTransPartyIdToUnitKind
 // BattleTransPartyId

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

@@ -0,0 +1,11 @@
+.global StartFixRoomProblems
+.global BranchBackFixRoomProblems
+
+StartFixRoomProblems:
+bl fixRoomProblems
+
+# Restore overwritten assembly
+li %r3,512
+
+BranchBackFixRoomProblems:
+b 0

ttyd-tools/rel/source/codes.cpp

@@ -515,7 +515,7 @@ void bobberyEarly()
 	// Turn off GSWF(3137)
 	ttyd::swdrv::swClear(3137);
 
-	if (compareStrings(NextMap, reinterpret_cast<const char *>(muj_05)))
+	if (compareStringToNextMap(reinterpret_cast<const char *>(muj_05)))
 	{
 		uint32_t NPC_6_Addresses_Start = (*reinterpret_cast<uint32_t *>(
 			NPCAddressesStart)) + 0x1040;
@@ -899,9 +899,9 @@ void actionCommandsTimingsInit()
 		DisplayActionCommands.Last_B_Frame 	= -1;
 		DisplayActionCommands.TypeToDraw 	= -1;
 
-		int8_t Last_A_Frame 	= -1;
-		int8_t Last_B_Frame 	= -1;
-		int8_t ButtonPresses 	= 0;
+		int32_t Last_A_Frame 	= -1;
+		int32_t Last_B_Frame 	= -1;
+		int32_t ButtonPresses 	= 0;
 
 		for (int32_t Frame = 0; Frame < 15; ++Frame)
 		{
@@ -921,21 +921,21 @@ void actionCommandsTimingsInit()
 		const int32_t DefenseResult = DisplayActionCommands.Trampoline(
 			battle_unit, attack_params);
 
-		const int8_t SuccessfulTiming 		= 0;
-		const int8_t PressedTooManyButtons 	= 1;
-		const int8_t PressedTooEarly 		= 2;
+		const int32_t SuccessfulTiming 			= 0;
+		const int32_t PressedTooManyButtons 	= 1;
+		const int32_t PressedTooEarly 			= 2;
 
-		if (DefenseResult == 5)
+		if (DefenseResult == 4)
 		{
-			// Successful Superguard; print Last_B_Frame
-			DisplayActionCommands.Last_B_Frame 		= Last_B_Frame;
+			// Successful Guard; print Last_A_Frame
+			DisplayActionCommands.Last_A_Frame 		= Last_A_Frame;
 			DisplayActionCommands.TypeToDraw 		= SuccessfulTiming;
 			DisplayActionCommands.DisplayTimer 		= secondsToFrames(3);
 		}
-		else if (DefenseResult == 4)
+		else if (DefenseResult == 5)
 		{
-			// Successful Guard; print Last_A_Frame
-			DisplayActionCommands.Last_A_Frame 		= Last_A_Frame;
+			// Successful Superguard; print Last_B_Frame
+			DisplayActionCommands.Last_B_Frame 		= Last_B_Frame;
 			DisplayActionCommands.TypeToDraw 		= SuccessfulTiming;
 			DisplayActionCommands.DisplayTimer 		= secondsToFrames(3);
 		}
@@ -945,17 +945,17 @@ void actionCommandsTimingsInit()
 			DisplayActionCommands.TypeToDraw 		= PressedTooManyButtons;
 			DisplayActionCommands.DisplayTimer 		= secondsToFrames(3);
 		}
-		else if (Last_B_Frame > -1)
+		else if (Last_A_Frame > -1)
 		{
 			// Print how many frames early the player pressed A
-			DisplayActionCommands.Last_B_Frame 	= Last_B_Frame;
+			DisplayActionCommands.Last_A_Frame 	= Last_A_Frame;
 			DisplayActionCommands.TypeToDraw 	= PressedTooEarly;
 			DisplayActionCommands.DisplayTimer 	= secondsToFrames(3);
 		}
-		else if (Last_A_Frame > -1)
+		else if (Last_B_Frame > -1)
 		{
 			// Print how many frames early the player pressed B
-			DisplayActionCommands.Last_A_Frame 	= Last_A_Frame;
+			DisplayActionCommands.Last_B_Frame 	= Last_B_Frame;
 			DisplayActionCommands.TypeToDraw 	= PressedTooEarly;
 			DisplayActionCommands.DisplayTimer 	= secondsToFrames(3);
 		}

ttyd-tools/rel/source/commonfunctions.cpp

@@ -168,6 +168,11 @@ bool compareStringsSize(const char *str1, const char *str2, uint32_t size)
 	return ttyd::string::strncmp(str1, str2, size) == 0;
 }
 
+bool compareStringToNextMap(const char *str)
+{
+	return ttyd::string::strcmp(NextMap, str) == 0;
+}
+
 uint32_t getSystemLevel()
 {
 	return ttyd::mariost::marioStGetSystemLevel();

ttyd-tools/rel/source/draw.cpp

@@ -1428,7 +1428,7 @@ void drawErrorMessage(const char *line)
 
 		int32_t TextPosX 			= -130;
 		// int32_t WindowWidth 		= 305;
-		uint16_t LineLength 		= ttyd::fontmgr::FontGetMessageWidth(line);
+		uint32_t LineLength 		= ttyd::fontmgr::FontGetMessageWidth(line);
 		int32_t WindowWidth 		= 80 + (LineLength >> 1) - (LineLength % 10);
 		drawErrorWindow(line, TextPosX, WindowWidth);
 	}
@@ -2551,7 +2551,7 @@ void drawPalaceSkipDetails()
 		PhantomEmberPosY,
 		PartnerPosY);
 
-	// uint16_t LineLength = ttyd::fontmgr::FontGetMessageWidth(tempDisplayBuffer);
+	// uint32_t LineLength = ttyd::fontmgr::FontGetMessageWidth(tempDisplayBuffer);
 	// int32_t WindowWidth = 245 + (LineLength >> 1) - (LineLength % 10);
 
 	/*drawTextWithWindow(tempDisplayBuffer, PosX, PosY, Alpha, TextColor, 
@@ -2593,8 +2593,8 @@ void drawActionCommandsTiming()
 	#endif
 
 	uint32_t MarioBattlePointer = reinterpret_cast<uint32_t>(getMarioBattlePointer());
-	uint8_t SimplifiersEquipped = *reinterpret_cast<uint8_t *>(MarioBattlePointer + SimplifierOffset);
-	uint8_t UnsimplifiersEquipped = *reinterpret_cast<uint8_t *>(MarioBattlePointer + UnsimplifierOffset);
+	uint32_t SimplifiersEquipped = *reinterpret_cast<uint8_t *>(MarioBattlePointer + SimplifierOffset);
+	uint32_t UnsimplifiersEquipped = *reinterpret_cast<uint8_t *>(MarioBattlePointer + UnsimplifierOffset);
 
 	int32_t CommandDifficulty = UnsimplifiersEquipped - SimplifiersEquipped + 3;
 	if (CommandDifficulty < 0)
@@ -2606,42 +2606,42 @@ void drawActionCommandsTiming()
 		CommandDifficulty = 6;
 	}
 
-	int8_t temp_Last_A_Frame = DisplayActionCommands.Last_A_Frame;
-	int8_t temp_Last_B_Frame = DisplayActionCommands.Last_B_Frame;
+	int32_t temp_Last_A_Frame = DisplayActionCommands.Last_A_Frame;
+	int32_t temp_Last_B_Frame = DisplayActionCommands.Last_B_Frame;
 
-	uint8_t TypeToDraw = DisplayActionCommands.TypeToDraw;
+	int32_t TypeToDraw = DisplayActionCommands.TypeToDraw;
 	const char *TextToDraw;
 	char *tempDisplayBuffer = DisplayBuffer;
 
-	const int8_t SuccessfulTiming 			= 0;
-	const int8_t PressedTooManyButtons 		= 1;
-	const int8_t PressedTooEarly 			= 2;
+	const int32_t SuccessfulTiming 			= 0;
+	const int32_t PressedTooManyButtons 	= 1;
+	const int32_t PressedTooEarly 			= 2;
 
 	// Check to see which text should be displayed
 	switch (TypeToDraw)
 	{
 		case SuccessfulTiming:
 		{
-			int8_t CurrentDifficultyFrames;
-			int8_t FramePressed;
-			const char *String;
+			int32_t CurrentDifficultyFrames;
+			int32_t FramePressed;
+			char Button;
 
-			if (temp_Last_B_Frame > -1)
+			if (temp_Last_A_Frame > -1)
 			{
-				CurrentDifficultyFrames = SuperguardFrames[CommandDifficulty];
-				FramePressed = CurrentDifficultyFrames - temp_Last_B_Frame;
-				String = "B";
+				CurrentDifficultyFrames = GuardFrames[CommandDifficulty];
+				FramePressed = CurrentDifficultyFrames - temp_Last_A_Frame;
+				Button = 'A';
 			}
 			else
 			{
-				CurrentDifficultyFrames = GuardFrames[CommandDifficulty];
-				FramePressed = CurrentDifficultyFrames - temp_Last_A_Frame;
-				String = "A";
+				CurrentDifficultyFrames = SuperguardFrames[CommandDifficulty];
+				FramePressed = CurrentDifficultyFrames - temp_Last_B_Frame;
+				Button = 'B';
 			}
 
 			sprintf(tempDisplayBuffer,
-				"Pressed %s on frame %d of %d",
-				String,
+				"Pressed %c on frame %ld of %ld",
+				Button,
 				FramePressed,
 				CurrentDifficultyFrames);
 
@@ -2655,21 +2655,21 @@ void drawActionCommandsTiming()
 		}
 		case PressedTooEarly:
 		{
-			int8_t CurrentDifficultyFrames;
-			int8_t FramesEarly;
-			const char *String;
+			int32_t CurrentDifficultyFrames;
+			int32_t FramesEarly;
+			char Button;
 
-			if (temp_Last_B_Frame > -1)
+			if (temp_Last_A_Frame > -1)
 			{
-				CurrentDifficultyFrames = SuperguardFrames[CommandDifficulty];
-				FramesEarly = temp_Last_B_Frame - CurrentDifficultyFrames + 1;
-				String = "B";
+				CurrentDifficultyFrames = GuardFrames[CommandDifficulty];
+				FramesEarly = temp_Last_A_Frame - CurrentDifficultyFrames + 1;
+				Button = 'A';
 			}
 			else
 			{
-				CurrentDifficultyFrames = GuardFrames[CommandDifficulty];
-				FramesEarly = temp_Last_A_Frame - CurrentDifficultyFrames + 1;
-				String = "A";
+				CurrentDifficultyFrames = SuperguardFrames[CommandDifficulty];
+				FramesEarly = temp_Last_B_Frame - CurrentDifficultyFrames + 1;
+				Button = 'B';
 			}
 
 			const char *CheckForPlural;
@@ -2683,8 +2683,8 @@ void drawActionCommandsTiming()
 			}
 
 			sprintf(tempDisplayBuffer,
-				"Pressed %s %d frame%s early",
-				String,
+				"Pressed %c %ld frame%s early",
+				Button,
 				FramesEarly,
 				CheckForPlural);
 
@@ -2703,10 +2703,13 @@ void drawActionCommandsTiming()
 	uint8_t Alpha  			= 0xFF;
 	int32_t TextPosX 		= -232;
 	int32_t TextPosY 		= -105;
-	int32_t WindowWidth 	= 320;
+	// int32_t WindowWidth 	= 320;
 	int32_t WindowCurve 	= 10;
 	float Scale 			= 0.75;
 
+	uint32_t LineLength 	= ttyd::fontmgr::FontGetMessageWidth(TextToDraw);
+	int32_t WindowWidth 	= 129 + (LineLength >> 1) - (LineLength % 10);
+	
 	drawTextWithWindow(TextToDraw, TextPosX, TextPosY, Alpha, TextColor, 
 		Scale, WindowWidth, WindowColor, WindowCurve);
 
@@ -2737,7 +2740,7 @@ void drawTitleScreenInfo()
 	PosX 					+= 113;
 	PosY 					-= 14;
 
-	const char *String = "Practice Codes v3.0.6\nCreated by Zephiles";
+	const char *String = "Practice Codes v3.0.7\nCreated by Zephiles";
 	drawText(String, PosX, PosY, Alpha, TextColor, Scale);
 }
 

ttyd-tools/rel/source/main.cpp

@@ -7,6 +7,7 @@
 #include "draw.h"
 #include "patch.h"
 
+#include <ttyd/swdrv.h>
 #include <ttyd/mario.h>
 #include <ttyd/evt_sub.h>
 #include <ttyd/mario_pouch.h>
@@ -50,6 +51,8 @@ extern "C"
 	void BranchBackPreventTextboxSelection();
 	void StartPreventJumpAndHammer();
 	void BranchBackPreventJumpAndHammer();
+	void StartFixRoomProblems();
+	void BranchBackFixRoomProblems();
 }
 
 // Additional function used by assembly overwrites
@@ -185,11 +188,31 @@ void preventTextboxOptionSelection(char *currentText, void *storeAddress,
 		reinterpret_cast<uint32_t>(storeAddress) + 0x9C) = NewOption;
 }
 
+void fixRoomProblems()
+{
+	// Prevent the game from crashing if the player entered las_08 with the Sequence as 385 and GSW(1121) at 7
+	if (compareStringToNextMap("las_08"))
+	{
+		// Check if the Sequence is currently at 385
+		uint32_t SequencePosition = getSequencePosition();
+		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);
+			}
+		}
+	}
+}
+
 const char *replaceJumpFallAnim(char *jumpFallString)
 {
 	if (compareStringsSize(jumpFallString, "M_J_", 4))
 	{
-		if (compareStrings(NextMap, "gor_01"))
+		if (compareStringToNextMap("gor_01"))
 		{
 			// Return an arbitrary string
 			const char *newString = "gor_01";
@@ -423,6 +446,7 @@ void initAssemblyOverwrites()
 	void *BacktraceScreenFontSizeAddress 		= reinterpret_cast<void *>(0x80428BC0);
 	void *BacktraceScreenPPCHaltBranchAddress 	= reinterpret_cast<void *>(0x8025E4A4);
 	void *BacktraceScreenEndBranchAddress 		= reinterpret_cast<void *>(0x8025E4A8);
+	void *FixRoomProblemsAddress 				= reinterpret_cast<void *>(0x800087C8);
 	#elif defined TTYD_JP
 	void *PreventPreBattleSoftlockAddress 		= reinterpret_cast<void *>(0x80045F28);
 	void *DisableBattlesAddress 				= reinterpret_cast<void *>(0x80044228);
@@ -442,6 +466,7 @@ void initAssemblyOverwrites()
 	void *FixBlooperCrash2Address 				= reinterpret_cast<void *>(0x8010A79C);
 	void *FixMarioKeyOnAddress 					= reinterpret_cast<void *>(0x8005B370);
 	void *PreventTextboxSelectionAddress 		= reinterpret_cast<void *>(0x800CE01C);
+	void *FixRoomProblemsAddress 				= reinterpret_cast<void *>(0x800086F0);
 	#elif defined TTYD_EU
 	void *PreventPreBattleSoftlockAddress 		= reinterpret_cast<void *>(0x800466B4);
 	void *DisableBattlesAddress 				= reinterpret_cast<void *>(0x800449B4);
@@ -464,6 +489,7 @@ void initAssemblyOverwrites()
 	void *BacktraceScreenFontSizeAddress 		= reinterpret_cast<void *>(0x804356C8);
 	void *BacktraceScreenPPCHaltBranchAddress 	= reinterpret_cast<void *>(0x8026207C);
 	void *BacktraceScreenEndBranchAddress 		= reinterpret_cast<void *>(0x80262080);
+	void *FixRoomProblemsAddress 				= reinterpret_cast<void *>(0x80008994);
 	#endif
 
 	writeStandardBranch(PreventPreBattleSoftlockAddress, 
@@ -502,6 +528,9 @@ void initAssemblyOverwrites()
 	writeStandardBranch(PreventTextboxSelectionAddress, 
 		StartPreventTextboxSelection, BranchBackPreventTextboxSelection);
 
+	writeStandardBranch(FixRoomProblemsAddress, 
+		StartFixRoomProblems, BranchBackFixRoomProblems);
+	
 	*reinterpret_cast<uint32_t *>(DebugModeInitialzeAddress) 				= 0x3800FFFF; // li r0,-1
 	*reinterpret_cast<uint32_t *>(DebugModeShowBuildDateAddress) 			= 0x60000000; // nop