Bug Fix + Minor Adjustments

Fixed the Speed Up Mario code setting incorrect speed values for Tube Mode and Peach.

Made some minor adjustments to the codes that display guard/superguard timings.

Increased the font size of the backtrace screen text in all versions.

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -452,7 +452,7 @@ struct DisplayActionCommandTiming
 {
 	int32_t (*Trampoline)(void *, void *);
 	uint16_t DisplayTimer;
-	int8_t TypeToDraw;
+	uint8_t TypeToDraw;
 	int8_t Last_A_Frame;
 	int8_t Last_B_Frame;
 };
@@ -528,8 +528,8 @@ extern char *NextBero;
 extern char *NextMap;
 extern char *NextArea;
 extern ItemData *ItemDataTable;
-extern int8_t *GuardFrames;
-extern int8_t *SuperguardFrames;
+extern uint8_t *GuardFrames;
+extern uint8_t *SuperguardFrames;
 extern uint32_t PauseMenuStartAddress;
 extern uint32_t wp_fadedrv_Address;
 extern uint32_t _mapEntAddress;

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

@@ -176,7 +176,7 @@ bool marioChkKey();
 // marioItemGetChk
 // marioItemGetDisable
 // marioEntry
-// marioSetSpec
+void marioSetSpec();
 // marioSetFamicomMode
 void marioSetCharMode(uint32_t mode);
 int8_t marioGetColor();

ttyd-tools/rel/source/codes.cpp

@@ -280,13 +280,26 @@ void setTimeStopTextStorage()
 
 void speedUpMario()
 {
-	if (!Cheat[SPEED_UP_MARIO].Active)
+	ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
+	const uint16_t TubeMode = 22;
+	
+	if (!Cheat[SPEED_UP_MARIO].Active || ChangingCheatButtonCombo)
 	{
+		// Check to see if Mario is currently in Tube Mode or not
+		if (player->currentMotionId == TubeMode)
+		{
+			// marioSetSpec does not set the values for Tube Mode 
+			player->unk_184 = 1;
+			player->unk_188 = 3;
+		}
+		else
+		{
+			// Set the values to their default for the current character
+			ttyd::mario::marioSetSpec();
+		}
 		return;
 	}
 
-	ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
-	
 	if (checkButtonComboEveryFrame(Cheat[SPEED_UP_MARIO].ButtonCombo))
 	{
 		player->wPlayerBaseSpeed = 16;
@@ -295,8 +308,18 @@ void speedUpMario()
 	}
 	else
 	{
-		player->unk_184 = 1;
-		player->unk_188 = 2.25;
+		// Check to see if Mario is currently in Tube Mode or not
+		if (player->currentMotionId == TubeMode)
+		{
+			// marioSetSpec does not set the values for Tube Mode 
+			player->unk_184 = 1;
+			player->unk_188 = 3;
+		}
+		else
+		{
+			// Set the values to their default for the current character
+			ttyd::mario::marioSetSpec();
+		}
 	}
 }
 
@@ -895,9 +918,9 @@ void actionCommandsTimingsInit()
 		}
 
 		// Reset the values checked when drawing the text
+		DisplayActionCommands.TypeToDraw 	= 0;
 		DisplayActionCommands.Last_A_Frame 	= -1;
 		DisplayActionCommands.Last_B_Frame 	= -1;
-		DisplayActionCommands.TypeToDraw 	= -1;
 
 		int32_t Last_A_Frame 	= -1;
 		int32_t Last_B_Frame 	= -1;
@@ -921,9 +944,9 @@ void actionCommandsTimingsInit()
 		const int32_t DefenseResult = DisplayActionCommands.Trampoline(
 			battle_unit, attack_params);
 
-		const int32_t SuccessfulTiming 			= 0;
-		const int32_t PressedTooManyButtons 	= 1;
-		const int32_t PressedTooEarly 			= 2;
+		const uint32_t SuccessfulTiming 		= 1;
+		const uint32_t PressedTooManyButtons 	= 2;
+		const uint32_t PressedTooEarly 			= 3;
 
 		if (DefenseResult == 4)
 		{

ttyd-tools/rel/source/draw.cpp

@@ -2611,21 +2611,21 @@ void drawActionCommandsTiming()
 	int32_t temp_Last_A_Frame = DisplayActionCommands.Last_A_Frame;
 	int32_t temp_Last_B_Frame = DisplayActionCommands.Last_B_Frame;
 
-	int32_t TypeToDraw = DisplayActionCommands.TypeToDraw;
+	uint32_t TypeToDraw = DisplayActionCommands.TypeToDraw;
 	const char *TextToDraw;
 	char *tempDisplayBuffer = DisplayBuffer;
 
-	const int32_t SuccessfulTiming 			= 0;
-	const int32_t PressedTooManyButtons 	= 1;
-	const int32_t PressedTooEarly 			= 2;
+	const uint32_t SuccessfulTiming 		= 1;
+	const uint32_t PressedTooManyButtons 	= 2;
+	const uint32_t PressedTooEarly 			= 3;
 
 	// Check to see which text should be displayed
 	switch (TypeToDraw)
 	{
 		case SuccessfulTiming:
 		{
-			int32_t CurrentDifficultyFrames;
-			int32_t FramePressed;
+			uint32_t CurrentDifficultyFrames;
+			uint32_t FramePressed;
 			char Button;
 
 			if (temp_Last_A_Frame > -1)
@@ -2657,8 +2657,8 @@ void drawActionCommandsTiming()
 		}
 		case PressedTooEarly:
 		{
-			int32_t CurrentDifficultyFrames;
-			int32_t FramesEarly;
+			uint32_t CurrentDifficultyFrames;
+			uint32_t FramesEarly;
 			char Button;
 
 			if (temp_Last_A_Frame > -1)
@@ -2742,7 +2742,7 @@ void drawTitleScreenInfo()
 	PosX 					+= 113;
 	PosY 					-= 14;
 
-	const char *String = "Practice Codes v3.0.8\nCreated by Zephiles";
+	const char *String = "Practice Codes v3.0.9\nCreated by Zephiles";
 	drawText(String, PosX, PosY, Alpha, TextColor, Scale);
 }
 

ttyd-tools/rel/source/global.cpp

@@ -807,8 +807,8 @@ char *NextBero 							= reinterpret_cast<char *>(r13 + 0x1688);
 char *NextMap 							= reinterpret_cast<char *>(r13 + 0x16A8);
 char *NextArea 							= reinterpret_cast<char *>(r13 + 0x16C8);
 ItemData *ItemDataTable 				= reinterpret_cast<ItemData *>(0x803108A8);
-int8_t *GuardFrames 					= reinterpret_cast<int8_t *>(0x802EE018);
-int8_t *SuperguardFrames 				= reinterpret_cast<int8_t *>(0x802EE020);
+uint8_t *GuardFrames 					= reinterpret_cast<uint8_t *>(0x802EE018);
+uint8_t *SuperguardFrames 				= reinterpret_cast<uint8_t *>(0x802EE020);
 uint32_t PauseMenuStartAddress 			= r13 + 0x1D10;
 uint32_t wp_fadedrv_Address 			= r13 + 0x1700;
 uint32_t _mapEntAddress 				= r13 + 0x1740;
@@ -823,8 +823,8 @@ char *NextBero 							= reinterpret_cast<char *>(r13 + 0x1128);
 char *NextMap 							= reinterpret_cast<char *>(r13 + 0x1148);
 char *NextArea 							= reinterpret_cast<char *>(r13 + 0x1168);
 ItemData *ItemDataTable 				= reinterpret_cast<ItemData *>(0x8030EE58);
-int8_t *GuardFrames 					= reinterpret_cast<int8_t *>(0x802EDA48);
-int8_t *SuperguardFrames 				= reinterpret_cast<int8_t *>(0x802EDA50);
+uint8_t *GuardFrames 					= reinterpret_cast<uint8_t *>(0x802EDA48);
+uint8_t *SuperguardFrames 				= reinterpret_cast<uint8_t *>(0x802EDA50);
 uint32_t PauseMenuStartAddress 			= r13 + 0x17B0;
 uint32_t wp_fadedrv_Address 			= r13 + 0x11A0;
 uint32_t _mapEntAddress 				= r13 + 0x11E0;
@@ -839,8 +839,8 @@ char *NextBero 							= reinterpret_cast<char *>(r13 + 0x1768);
 char *NextMap 							= reinterpret_cast<char *>(r13 + 0x1788);
 char *NextArea 							= reinterpret_cast<char *>(r13 + 0x17A8);
 ItemData *ItemDataTable 				= reinterpret_cast<ItemData *>(0x8031C638);
-int8_t *GuardFrames 					= reinterpret_cast<int8_t *>(0x802F9C78);
-int8_t *SuperguardFrames 				= reinterpret_cast<int8_t *>(0x802F9C80);
+uint8_t *GuardFrames 					= reinterpret_cast<uint8_t *>(0x802F9C78);
+uint8_t *SuperguardFrames 				= reinterpret_cast<uint8_t *>(0x802F9C80);
 uint32_t PauseMenuStartAddress 			= r13 + 0x1DF0;
 uint32_t wp_fadedrv_Address 			= r13 + 0x17E0;
 uint32_t _mapEntAddress 				= r13 + 0x1820;

ttyd-tools/rel/source/main.cpp

@@ -487,6 +487,7 @@ void initAssemblyOverwrites()
 	void *FixBlooperCrash2Address 				= reinterpret_cast<void *>(0x8010A79C);
 	void *FixMarioKeyOnAddress 					= reinterpret_cast<void *>(0x8005B370);
 	void *PreventTextboxSelectionAddress 		= reinterpret_cast<void *>(0x800CE01C);
+	void *BacktraceScreenFontSizeAddress 		= reinterpret_cast<void *>(0x80422618);
 	void *FixRoomProblemsAddress 				= reinterpret_cast<void *>(0x800086F0);
 	#elif defined TTYD_EU
 	void *PreventPreBattleSoftlockAddress 		= reinterpret_cast<void *>(0x800466B4);
@@ -562,9 +563,10 @@ void initAssemblyOverwrites()
 
 	*reinterpret_cast<uint32_t *>(msgWindowMrAddress) 						= 0x38830001; // addi r4,r3,1
 
+	*reinterpret_cast<float *>(BacktraceScreenFontSizeAddress) 				= 0.66;
+	
 	#ifndef TTYD_JP
-	// The backtrace screen does not need to be modified in JP
-	*reinterpret_cast<float *>(BacktraceScreenFontSizeAddress) 				= 0.65;
+	// This part of the backtrace screen does not need to be modified in JP
 	*reinterpret_cast<uint32_t *>(BacktraceScreenPPCHaltBranchAddress) 		= 0x3B400000; // li r26,0
 	*reinterpret_cast<uint32_t *>(BacktraceScreenEndBranchAddress) 			= 0x4BFFFDD4; // b -0x22C
 	#endif
@@ -592,13 +594,13 @@ void Mod::run()
 		loadMarioAndPartnerPositions();
 		setTextStorage();
 		setTimeStopTextStorage();
-		speedUpMario();
 		lockMarioHPToMax();
 		levitate();
 	}
 
 	// Run each cheat function that isn't button-based
 	saveAnywhere(); // Needs to always run due to the script taking more than one frame
+	speedUpMario(); // Needs to always run due to Mario's base speed constantly being set
 	reloadRoom(); // Needs to always run due to the extra code that always does some failsafe checking
 	bobberyEarly();
 	checkIfAreaFlagsShouldBeCleared();