Added additional features

Shine Sprites and Star Pieces are now reset with the Clear Area Flags code.

The Pause Menu/Z Menu sound effects can now be enabled/disabled via the Cheats menu.

Author: Zephiles

ttyd-tools/rel/include/commonfunctions.h

@@ -36,5 +36,6 @@ void removeFollowerFromOverworld();
 bool checkIfBadgeEquipped(int16_t badge);
 void recheckJumpAndHammerLevels();
 uint32_t getCurrentPitFloor();
+void clearGSWFsRange(uint32_t lowerBound, uint32_t upperBound);
 
 }

ttyd-tools/rel/include/global.h

@@ -70,6 +70,7 @@ enum CHEATS_OPTIONS
 	LEVITATE,
 	LOCK_MARIO_HP_TO_MAX,
 	RUN_FROM_BATTLES,
+	DISABLE_MENU_SOUNDS,
 	BOBBERY_EARLY,
 	FORCE_ITEM_DROP,
 	CLEAR_AREA_FLAGS,
@@ -464,7 +465,7 @@ struct DisplayActionCommandTiming
 };
 
 extern Menus Menu[20];
-extern Cheats Cheat[18];
+extern Cheats Cheat[19];
 extern bool Displays[8];
 extern char DisplayBuffer[256];
 

ttyd-tools/rel/source/codes.cpp

@@ -953,18 +953,19 @@ void displayPalaceSkipDetails()
 int32_t Mod::preventMenuSounds(int32_t soundId, uint32_t unk1, 
 	uint32_t unk2, uint32_t unk3)
 {
-	const int32_t OpenMenu = 1169;
-	const int32_t CloseMenu = 1168;
-	
-	if ((soundId == OpenMenu) || (soundId == CloseMenu))
+	if (Cheat[DISABLE_MENU_SOUNDS].Active)
 	{
-		return -1;
-	}
-	else
-	{
-		// Call original function
-		return mPFN_SoundEfxPlayEx_trampoline(soundId, unk1, unk2, unk3);
+		const int32_t OpenMenu = 1169;
+		const int32_t CloseMenu = 1168;
+		
+		if ((soundId == OpenMenu) || (soundId == CloseMenu))
+		{
+			return -1;
+		}
 	}
+	
+	// Call original function
+	return mPFN_SoundEfxPlayEx_trampoline(soundId, unk1, unk2, unk3);
 }
 
 void actionCommandsTimingsInit()

ttyd-tools/rel/source/commonfunctions.cpp

@@ -264,4 +264,12 @@ uint32_t getCurrentPitFloor()
 	return ttyd::swdrv::swByteGet(1321) + 1; // GSW(1321);
 }
 
+void clearGSWFsRange(uint32_t lowerBound, uint32_t upperBound)
+{
+	for (uint32_t i = lowerBound; i <= upperBound; i++)
+	{
+		ttyd::swdrv::swClear(i);
+	}
+}
+
 }

ttyd-tools/rel/source/global.cpp

@@ -55,6 +55,7 @@ const char *CheatsLines[] =
 	"Levitate",
 	"Lock Mario's HP To Its Max",
 	"Allow Running From Any Battle",
+	"Disable Pause Menu/Z Menu Sounds",
 	"Bobbery Early",
 	"Force NPC Item Drop",
 	"Clear Area Flags",
@@ -768,7 +769,7 @@ const char *ButtonInputDisplay[] =
 #endif
 
 struct Menus Menu[20];
-struct Cheats Cheat[18];
+struct Cheats Cheat[19];
 bool Displays[8];
 char DisplayBuffer[256];
 
@@ -963,10 +964,22 @@ void initMenuVars()
 	Menu[DISPLAYS_NO_BUTTON_COMBO].Line 				= CheatsNoButtonComboOptionsLines;
 
 	Cheat[WALK_THROUGH_WALLS].Active 					= false;
+	// Cheat[SAVE_COORDINATES].Active 					= false;
+	// Cheat[LOAD_COORDINATES].Active 					= false;
 	Cheat[SAVE_ANYWHERE].Active 						= false;
+	// Cheat[TEXT_STORAGE].Active 						= false;
+	// Cheat[TIME_STOP_TEXT_STORAGE].Active 			= false;
+	// Cheat[SPEED_UP_MARIO].Active 					= false;
+	// Cheat[DISABLE_BATTLES].Active 					= false;
+	// Cheat[AUTO_ACTION_COMMANDS].Active 				= false;
+	// Cheat[INFINITE_ITEM_USAGE].Active 				= false;
+	// Cheat[RELOAD_ROOM].Active 						= false;
+	// Cheat[LEVITATE].Active 							= false;
 	Cheat[LOCK_MARIO_HP_TO_MAX].Active 					= false;
 	Cheat[RUN_FROM_BATTLES].Active 						= false;
 	Cheat[SPAWN_ITEM].Active 							= false;
+	// Cheat[DISABLE_MENU_SOUNDS].Active 				= false;
+	// Cheat[BOBBERY_EARLY].Active 						= false;
 	Cheat[FORCE_ITEM_DROP].Active 						= false;
 
 	Cheat[WALK_THROUGH_WALLS].ButtonCombo 				= PAD_Z;