Added a display for Bridge Skip

An additional feature is that Bridge Skip will be possible in the PAL version of the game when the Bridge Skip display is active.

Also renamed displayMarioCoordinatesBoolCheck to displayMarioCoordinates.

Author: Zephiles

ttyd-tools/rel/include/assembly.h

@@ -24,6 +24,7 @@ void StartFixEvtMapBlendSetFlagPartnerCrash();
 void StartFixEvtMapBlendSetFlagFollowerCrash();
 void StartFallThroughMostObjectsStandard();
 void StartFallThroughMostObjectsBowser();
+void StartJumpOnWater();
 
 // Functions accessed by assembly overwrites
 // main.cpp
@@ -34,6 +35,7 @@ void preventTextboxOptionSelection(char *currentText, void *storeAddress, int32_
 void *fixEvtMapBlendSetFlagPartnerCrash(void *partnerPtr);
 void *fixEvtMapBlendSetFlagFollowerCrash(void *followerPtr);
 const char *replaceJumpFallAnim(char *jumpFallString);
+void *jumpOnWater(void *ptr);
 
 // codes.cpp
 uint32_t allowRunningFromBattles(void *ptr);

ttyd-tools/rel/include/codes.h

@@ -25,7 +25,7 @@ void lockFlags();
 void displaySequenceInPauseMenu();
 void displayOnScreenTimer();
 void displayFrameCounter();
-void displayMarioCoordinatesBoolCheck();
+void displayMarioCoordinates();
 void displayMarioSpeedXZ();
 void displayJumpStorageDetails();
 void displayButtonInputs();
@@ -34,6 +34,7 @@ void displayMemoryWatches();
 
 void displayYoshiSkipDetails();
 void displayPalaceSkipDetails();
+void displayBridgeSkipDetails();
 void displayBlimpTicketSkipDetails();
 void displayActionCommandsTiming();
 

ttyd-tools/rel/include/draw.h

@@ -119,6 +119,7 @@ void drawMemoryWatchesOnOverworld();
 
 void drawYoshiSkipDetails();
 void drawPalaceSkipDetails();
+void drawBridgeSkipDetails();
 void drawBlimpTicketSkipDetails();
 void drawActionCommandsTiming();
 void drawSettingsCurrentWork();

ttyd-tools/rel/include/global.h

@@ -348,6 +348,7 @@ enum DISPLAYS_OPTIONS
 	ART_ATTACK_HITBOXES,
 	YOSHI_SKIP,
 	PALACE_SKIP,
+	BRIDGE_SKIP,
 	BLIMP_TICKET_SKIP,
 };
 
@@ -669,6 +670,21 @@ struct TrickDisplay
 	}
 };
 
+struct BridgeSkipStruct
+{
+	uint32_t MainTimer;
+	uint32_t ResetTimer;
+	bool PressedEarly;
+	bool PressedEarlyShouldDisable;
+	bool TimerPaused;
+	bool TimerStopped;
+	
+	BridgeSkipStruct()
+	{
+		TimerStopped = true;
+	}
+};
+
 struct BlimpTicketSkipStruct
 {
 	uint32_t UpRightTimer;
@@ -848,7 +864,7 @@ struct NpcNameToPtrErrorStruct
 extern MenuVars MenuVar;
 extern Menus Menu[31];
 extern Cheats Cheat[25];
-extern bool Displays[13];
+extern bool Displays[14];
 extern char DisplayBuffer[256];
 extern char HeapBuffer[512];
 extern MemoryWatchStruct MemoryWatch[60];
@@ -868,6 +884,7 @@ extern ClearCacheForBattlesStruct ClearCacheForBattles;
 extern LockFlagsStruct LockFlags;
 extern TrickDisplay YoshiSkip;
 extern TrickDisplay PalaceSkip;
+extern BridgeSkipStruct BridgeSkip;
 extern BlimpTicketSkipStruct BlimpTicketSkip;
 extern OnScreenTimerDisplay OnScreenTimer;
 extern OnScreenTimerDisplayFrameCounter FrameCounter;

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

@@ -0,0 +1,17 @@
+.global StartJumpOnWater
+
+StartJumpOnWater:
+stwu %sp,-0x10(%sp)
+mflr %r0
+stw %r0,0x14(%sp)
+
+# r3 already contains ptr
+bl jumpOnWater
+
+lwz %r0,0x14(%sp)
+mtlr %r0
+addi %sp,%sp,0x10
+
+# Restore the overwritten instruction
+cmplwi %r3,0
+blr

ttyd-tools/rel/source/codes.cpp

@@ -992,7 +992,7 @@ void displayFrameCounter()
 	drawFunctionOnDebugLayer(drawFrameCounter);
 }
 
-void displayMarioCoordinatesBoolCheck()
+void displayMarioCoordinates()
 {
 	if (!Displays[MARIO_COORDINATES])
 	{
@@ -1117,7 +1117,7 @@ void displayYoshiSkipDetails()
 	else
 	{
 		ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
-		bool MarioControl = player->flags1 & (1 << 0); // Check if 0 bit is active
+		bool MarioControl = player->flags1 & (1 << 0); // Check if 0 bit is set
 
 		if (MarioControl && YoshiSkip.TimerPaused)
 		{
@@ -1204,6 +1204,113 @@ void displayPalaceSkipDetails()
 	drawFunctionOnDebugLayer(drawPalaceSkipDetails);
 }
 
+void displayBridgeSkipDetails()
+{
+	if (!Displays[BRIDGE_SKIP])
+	{
+		return;
+	}
+	
+	ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
+	bool unkNoLongerOnGround = player->flags2 & (1 << 28); // Check if 28 bit is set
+	bool unkNotAbleToJump = player->flags2 & (1 << 16); // Check if 16 bit is set
+	
+	if (!unkNoLongerOnGround && unkNotAbleToJump) // Done falling, now starting to stand up
+	{
+		if (!BridgeSkip.PressedEarly)
+		{
+			// Reset the timer upon landing and while not pressing A
+			BridgeSkip.MainTimer = 0;
+			
+			// Check if A was pressed too early
+			if (BridgeSkip.TimerPaused && BridgeSkip.TimerStopped)
+			{
+				// Pressed A too early, so start the timer
+				BridgeSkip.PressedEarly = true;
+				BridgeSkip.TimerPaused = false;
+				BridgeSkip.TimerStopped = false;
+			}
+			else
+			{
+				// Stop the timer
+				BridgeSkip.TimerPaused = true;
+				BridgeSkip.TimerStopped = false;
+			}
+		}
+		else if (BridgeSkip.PressedEarlyShouldDisable)
+		{
+			// Reset the early state
+			BridgeSkip.TimerPaused = true;
+			BridgeSkip.PressedEarly = false;
+			BridgeSkip.PressedEarlyShouldDisable = false;
+			BridgeSkip.TimerStopped = false;
+		}
+		else
+		{
+			// The timer is currently running
+		}
+	}
+	else if (!unkNoLongerOnGround && !unkNotAbleToJump) // A timing, start timer
+	{
+		if (!BridgeSkip.PressedEarly)
+		{
+			if (BridgeSkip.TimerPaused) // Prevents running when the display is initially enabled
+			{
+				if (!BridgeSkip.TimerStopped)
+				{
+					// Didn't press A, so start the timer
+					BridgeSkip.TimerPaused = false;
+				}
+				else if (!(player->flags2 & (1 << 17))) // Check if 17 bit is not set; unkCurrentlyJumping
+				{
+					// Pressed A one frame early
+					BridgeSkip.PressedEarly = true;
+					BridgeSkip.PressedEarlyShouldDisable = true;
+				}
+				else
+				{
+					// Pressed A on the correct frame, so leave the timer paused
+				}
+			}
+		}
+		else
+		{
+			// Stop the timer
+			BridgeSkip.TimerPaused = true;
+			BridgeSkip.PressedEarlyShouldDisable = true;
+		}
+	}
+	
+	if (checkButtonCombo(PAD_A))
+	{
+		// Stop when A is pressed
+		BridgeSkip.TimerStopped = true;
+	}
+	
+	if (checkButtonComboEveryFrame(PAD_Y))
+	{
+		// Hold Y to increment the reset counter
+		BridgeSkip.ResetTimer++;
+	}
+	else
+	{
+		BridgeSkip.ResetTimer = 0;
+	}
+	
+	if (BridgeSkip.ResetTimer > secondsToFrames(2))
+	{
+		// Reset the timer when button is held for 2 seconds
+		BridgeSkip.MainTimer = 0;
+		BridgeSkip.ResetTimer = 0;
+		BridgeSkip.PressedEarly = false;
+		BridgeSkip.PressedEarlyShouldDisable = false;
+		BridgeSkip.TimerPaused = false;
+		BridgeSkip.TimerStopped = true;
+	}
+	
+	drawFunctionOnDebugLayer(drawBridgeSkipDetails);
+}
+
 void displayBlimpTicketSkipDetails()
 {
 	if (!Displays[BLIMP_TICKET_SKIP])

ttyd-tools/rel/source/draw.cpp

@@ -3790,8 +3790,9 @@ void drawOnScreenTimer()
 	if (!Displays[BUTTON_INPUT_DISPLAY])
 	{
 		if (Displays[MARIO_COORDINATES] || 
+			Displays[YOSHI_SKIP] || 
 			Displays[PALACE_SKIP] || 
-			Displays[YOSHI_SKIP])
+			Displays[BRIDGE_SKIP])
 		{
 			PosY += 20;
 		}
@@ -3837,8 +3838,9 @@ void drawFrameCounter()
 	if (!Displays[BUTTON_INPUT_DISPLAY])
 	{
 		if (Displays[MARIO_COORDINATES] || 
+			Displays[YOSHI_SKIP] || 
 			Displays[PALACE_SKIP] || 
-			Displays[YOSHI_SKIP])
+			Displays[BRIDGE_SKIP])
 		{
 			PosY += 20;
 		}
@@ -3902,8 +3904,9 @@ void drawMarioSpeedXZ()
 
 	// Move the text up if the Mario coordinates display is active
 	if (Displays[MARIO_COORDINATES] || 
+		Displays[YOSHI_SKIP] || 
 		Displays[PALACE_SKIP] || 
-		Displays[YOSHI_SKIP])
+		Displays[BRIDGE_SKIP])
 	{
 		PosY += 20;
 	}
@@ -4005,8 +4008,10 @@ void drawStickAngle()
 		PosY += 20;
 	}
 
-	// Move the text up if Mario's Coordinates are displayed, or if the Palace Skip display is active
-	if (Displays[MARIO_COORDINATES] || Displays[PALACE_SKIP])
+	// Move the text up if the Mario coordinates display is active
+	if (Displays[MARIO_COORDINATES] || 
+		Displays[PALACE_SKIP] || 
+		Displays[BRIDGE_SKIP])
 	{
 		PosY += 20;
 	}
@@ -4238,6 +4243,84 @@ void drawPalaceSkipDetails()
 	}
 }
 
+void drawBridgeSkipDetails()
+{
+	uint32_t TextColor 		= 0xFFFFFFFF;
+	uint8_t Alpha 			= 0xFF;
+	int32_t PosX 			= -232;
+	int32_t PosY 			= -117;
+	float Scale 			= 0.75;
+	
+	// Move the text up if the input display is active
+	if (Displays[BUTTON_INPUT_DISPLAY])
+	{
+		PosY += 20;
+	}
+	
+	// Move the text up if the Mario Speed XZ display is active
+	if (Displays[MARIO_SPEED_XZ])
+	{
+		PosY += 20;
+	}
+	
+	// Move the text up if the Stick Angle display is active
+	if (Displays[STICK_ANGLE])
+	{
+		PosY += 20;
+	}
+	
+	uint32_t MainTimer = BridgeSkip.MainTimer;
+	
+	// Check whether A was pressed early or late
+	const char *EarlyOrLate;
+	if (!BridgeSkip.PressedEarly)
+	{
+		EarlyOrLate = "Late";
+	}
+	else
+	{
+		// Increment the timer by 1 to account for being early by X frames
+		MainTimer += 1;
+		EarlyOrLate = "Early";
+	}
+	
+	// Check if the Frames text should be plural
+	const char *FramesPlural;
+	if (MainTimer == 1)
+	{
+		FramesPlural = "";
+	}
+	else
+	{
+		FramesPlural = "s";
+	}
+	
+	// Draw the text
+	char *tempDisplayBuffer = DisplayBuffer;
+	ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
+	
+	sprintf(tempDisplayBuffer,
+		"%" PRIu32 " Frame%s %s\nHRP: 0x%08" PRIX32,
+		MainTimer,
+		FramesPlural,
+		EarlyOrLate,
+		reinterpret_cast<uint32_t>(player->wObjHazardRespawn));
+	
+	drawText(tempDisplayBuffer, PosX, PosY, Alpha, TextColor, Scale);
+	
+	// Draw Mario's coordinates if they're not already drawn
+	if (!Displays[MARIO_COORDINATES])
+	{
+		drawMarioCoordinates();
+	}
+	
+	// Increment the main timer
+	if (!BridgeSkip.TimerPaused && !BridgeSkip.TimerStopped)
+	{
+		BridgeSkip.MainTimer++;
+	}
+}
+
 void drawBlimpTicketSkipDetails()
 {
 	uint32_t TextColor 		= 0xFFFFFFFF;