Bug Fix

Fixed a black screen occuring if the player hit a save block at the same time as either warping or reloading the room.

Author: Zephiles

ttyd-tools/rel/include/codes.h

@@ -11,6 +11,7 @@ void saveAnywhere();
 void setTextStorage();
 void setTimeStopTextStorage();
 void speedUpMario();
+void checkIfSystemLevelShouldBeLowered();
 void reloadRoomMain();
 void reloadRoom();
 void levitate();

ttyd-tools/rel/include/global.h

@@ -393,6 +393,7 @@ struct SaveAnywhereStruct
 
 struct ReloadRoomStruct
 {
+	bool SystemLevelShouldBeLowered;
 	char NewBero[32]; // 31 bytes for NextBero, 1 byte for NULL
 	char NewMap[9]; // 8 bytes for NextMap, 1 byte for NULL
 };

ttyd-tools/rel/source/codes.cpp

@@ -315,6 +315,30 @@ bool Mod::infiniteItemUsage(int16_t item, uint32_t index)
 	return mPFN_pouchRemoveItemIndex_trampoline(item, index);
 }
 
+void checkIfSystemLevelShouldBeLowered()
+{
+	// Only run when the player has either reloaded the room or warped
+	if (!ReloadRoom.SystemLevelShouldBeLowered)
+	{
+		return;
+	}
+	
+	// Keep lowering the system level until the seq changes to Game
+	if (!checkForSpecificSeq(ttyd::seqdrv::SeqIndex::kGame))
+	{
+		// Only lower the system level if it's not currently at 0
+		uint32_t SystemLevel = getSystemLevel();
+		if (SystemLevel > 0)
+		{
+			setSystemLevel(0);
+		}
+	}
+	else
+	{
+		ReloadRoom.SystemLevelShouldBeLowered = false;
+	}
+}
+
 void reloadRoomMain()
 {
 	ttyd::seqdrv::SeqIndex NextSeq 		= ttyd::seqdrv::seqGetNextSeq();
@@ -374,6 +398,7 @@ void reloadRoomMain()
 	ttyd::pmario_sound::psndClearFlag(0x80);
 	ttyd::mario_cam::marioSetCamId(4);
 	setSystemLevel(0);
+	ReloadRoom.SystemLevelShouldBeLowered = true;
 }
 
 void reloadRoom()
@@ -401,12 +426,7 @@ void reloadRoom()
 	if ((player->currentMotionId == ReceivingItem) && (NextSeq == MapChange))
 	{
 		// Reset the System Level
-		// Only lower the system level if it's not currently at 0
-		uint32_t SystemLevel = getSystemLevel();
-		if (SystemLevel > 0)
-		{
-			setSystemLevel(0);
-		}
+		ReloadRoom.SystemLevelShouldBeLowered = true;
 
 		// Reset the camera - mainly for the black bars at the top and bottom of the screen
 		uint32_t CameraPointer = reinterpret_cast<uint32_t>(ttyd::camdrv::camGetPtr(8));

ttyd-tools/rel/source/draw.cpp

@@ -2737,7 +2737,7 @@ void drawTitleScreenInfo()
 	PosX 					+= 113;
 	PosY 					-= 14;
 
-	const char *String = "Practice Codes v3.0.5\nCreated by Zephiles";
+	const char *String = "Practice Codes v3.0.6\nCreated by Zephiles";
 	drawText(String, PosX, PosY, Alpha, TextColor, Scale);
 }
 

ttyd-tools/rel/source/main.cpp

@@ -552,6 +552,7 @@ void Mod::run()
 	reloadRoom(); // Needs to always run due to the extra code that always does some failsafe checking
 	bobberyEarly();
 	checkIfAreaFlagsShouldBeCleared();
+	checkIfSystemLevelShouldBeLowered();
 
 	// Run each display function
 	// Only run if the mod menu isn't currently open