Skip to content

Commit efb4088

Browse files
committed
Guard/Superguard Timings display - Allow other displays to be drawn while active, and draw on top of them
1 parent a8f8bec commit efb4088

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

ttyd-tools/rel/source/codes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ void displayActionCommandsTiming()
15231523
// Only display if the timer is not at 0
15241524
if (DisplayActionCommands.DisplayTimer > 0)
15251525
{
1526-
drawFunctionOnDebugLayer(drawActionCommandsTiming);
1526+
drawFunctionOnDebugLayerWithOrder(drawActionCommandsTiming, 10.f);
15271527
}
15281528
}
15291529

ttyd-tools/rel/source/main.cpp

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -832,36 +832,25 @@ void Mod::run()
832832
// Run if currently repositioning watches
833833
if (!MenuVar.MenuIsDisplayed || MenuVar.HideMenu)
834834
{
835-
// Don't display some displays if the Guard/Superguard timings display is active
836-
if (DisplayActionCommands.DisplayTimer == 0)
837-
{
838-
// Only run button-based displays if currently not changing button combos
839-
if (!tempChangingCheatButtonCombo)
840-
{
841-
displayYoshiSkipDetails();
842-
displayPalaceSkipDetails();
843-
displayBridgeSkipDetails();
844-
displayBlimpTicketSkipDetails();
845-
}
846-
847-
// Run each display function that isn't button-based
848-
displayMarioCoordinates();
849-
displayMarioSpeedXZ();
850-
displayStickAngle();
851-
displayMemoryWatches();
852-
displayNpcNameToPtrError();
853-
}
854-
855835
// Only run button-based displays if currently not changing button combos
856836
if (!tempChangingCheatButtonCombo)
857837
{
838+
displayYoshiSkipDetails();
839+
displayPalaceSkipDetails();
840+
displayBridgeSkipDetails();
841+
displayBlimpTicketSkipDetails();
858842
displayOnScreenTimer();
859843
displayFrameCounter();
860844
displayJumpStorageDetails();
861845
displayButtonInputs();
862846
}
863847

864848
// Run each display function that isn't button-based
849+
displayMarioCoordinates();
850+
displayMarioSpeedXZ();
851+
displayStickAngle();
852+
displayMemoryWatches();
853+
displayNpcNameToPtrError();
865854
spawnItem(); // Needs to always run due to the adjustable value menu sometimes being displayed
866855
displaySequenceInPauseMenu();
867856
displayActionCommandsTiming();

0 commit comments

Comments
 (0)