Added new display + Some optimizations

Added a display for the Stick Angle.

Made some optimizations to the memcard functions.

Added some extra text to the user manual.

Author: Zephiles

USER_MANUAL.md

@@ -60,7 +60,7 @@ This menu allows you to modify your entire inventory, including standard items,
 This menu allows you to modify Mario's stats, all of your partner's stats, whether or not partners are enabled or not, whether a partner is out or not, and whether or not a follower is out or not.
 
 ### Settings
-This menu allows you to save and load various settings. The current settings included are as follows:
+This menu allows you to save and load various settings. The settings are stored on a separate save file on the memory card. The current settings included are as follows:
 * Which cheats are active
 * Cheats button combos
 * Which displays are active

ttyd-tools/rel/include/codes.h

@@ -19,12 +19,14 @@ void lockMarioHPToMax();
 void bobberyEarly();
 void spawnItem();
 void checkIfAreaFlagsShouldBeCleared();
+double getStickAngle();
 
 void displaySequenceInPauseMenu();
 void displayOnScreenTimer();
 void displayMarioCoordinatesBoolCheck();
 void displayJumpStorageDetails();
 void displayButtonInputs();
+void displayStickAngle();
 void displayYoshiSkipDetails();
 void displayPalaceSkipDetails();
 void actionCommandsTimingsInit();

ttyd-tools/rel/include/draw.h

@@ -89,6 +89,7 @@ void drawSequenceInPauseMenu();
 void drawMarioCoordinates();
 void drawJumpStorageDetails();
 void drawButtonInputs();
+void drawStickAngle();
 void drawYoshiSkipDetails();
 void drawPalaceSkipDetails();
 void drawActionCommandsTiming();

ttyd-tools/rel/include/global.h

@@ -239,6 +239,7 @@ enum DISPLAYS_OPTIONS
 	MARIO_COORDINATES,
 	JUMP_STORAGE,
 	BUTTON_INPUT_DISPLAY,
+	STICK_ANGLE,
 	GUARD_SUPERGUARD_TIMINGS,
 	ART_ATTACK_HITBOXES,
 	YOSHI_SKIP,
@@ -502,7 +503,7 @@ struct SettingsStruct
 
 extern Menus Menu[21];
 extern Cheats Cheat[19];
-extern bool Displays[8];
+extern bool Displays[9];
 extern char DisplayBuffer[256];
 
 extern AutoIncrement AdjustableValueMenu;
@@ -541,6 +542,7 @@ extern uint8_t BattlesCurrentActorStatsSize;
 extern const char *BattlesStatusesLines[];
 extern uint8_t BattlesStatusesLinesSize;
 extern uint16_t BattlesStatusesIcons[];
+extern uint8_t DisplaysOrder[];
 extern const char *DisplaysLines[];
 extern const char *OnScreenTimerOptions[];
 extern uint8_t OnScreenTimerOptionsSize;

ttyd-tools/rel/include/memcard.h

@@ -22,9 +22,12 @@ int32_t setFileStatus(int32_t chn, int32_t fileNo, gc::card::card_stat *stats,
 	gc::card::cardcallback callback);
 
 int32_t loopUntilSynced();
-int32_t openFile(const char *description, gc::card::card_file *fileInfo, uint8_t *workArea);
-bool loadSettings(gc::card::card_file *fileInfo);
-bool writeSettings(const char *description, gc::card::card_file *fileInfo);
-bool createSettingsFile(const char *fileName, const char *description, gc::card::card_file *fileInfo);
+
+int32_t loadSettings(const char *fileName, gc::card::card_file *fileInfo, uint8_t *workArea);
+
+int32_t writeSettings(const char *description, const char *fileName, 
+	gc::card::card_file *fileInfo, uint8_t *workArea);
+
+int32_t createSettingsFile(const char *fileName, const char *description, gc::card::card_file *fileInfo);
 
 }

ttyd-tools/rel/source/codes.cpp

@@ -19,6 +19,7 @@
 #include <ttyd/swdrv.h>
 #include <ttyd/win_main.h>
 #include <ttyd/itemdrv.h>
+#include <ttyd/w_atan2.h>
 #include <ttyd/battle_ac.h>
 
 #include <cstdio>
@@ -751,6 +752,31 @@ void checkIfAreaFlagsShouldBeCleared()
 	}
 }
 
+double getStickAngle()
+{
+	double StickX = static_cast<double>(ttyd::system::keyGetStickX(0));
+	if (StickX > 127)
+	{
+		StickX -= 256;
+	}
+	
+	double StickY = static_cast<double>(ttyd::system::keyGetStickY(0));
+	if (StickY > 127)
+	{
+		StickY -= 256;
+	}
+	
+	const double PI = 3.14159265358979323846;
+	double StickAngle = (ttyd::w_atan2::atan2(StickX, StickY)) * (180 / PI);
+	
+	if (StickAngle < 0)
+	{
+		StickAngle += 360;
+	}
+	
+	return StickAngle;
+}
+
 void displaySequenceInPauseMenu()
 {
 	uint32_t PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuStartAddress);
@@ -835,6 +861,28 @@ void displayButtonInputs()
 	drawFunctionOnDebugLayer(drawButtonInputs);
 }
 
+void displayStickAngle()
+{
+	if (!Displays[STICK_ANGLE])
+	{
+		return;
+	}
+	
+	// Don't display if the Yoshi Skip display is active
+	if (Displays[YOSHI_SKIP])
+	{
+		return;
+	}
+	
+	// Don't display if the Guard/Superguard timings display is active
+	if (DisplayActionCommands.DisplayTimer > 0)
+	{
+		return;
+	}
+	
+	drawFunctionOnDebugLayer(drawStickAngle);
+}
+
 void displayYoshiSkipDetails()
 {
 	if (!Displays[YOSHI_SKIP])

ttyd-tools/rel/source/draw.cpp

@@ -4,6 +4,7 @@
 #include "items.h"
 #include "menufunctions.h"
 #include "commonfunctions.h"
+#include "codes.h"
 
 #include <ttyd/dispdrv.h>
 #include <ttyd/windowdrv.h>
@@ -13,7 +14,6 @@
 #include <ttyd/mario_pouch.h>
 #include <ttyd/system.h>
 #include <ttyd/mario.h>
-#include <ttyd/w_atan2.h>
 #include <ttyd/battle_ac.h>
 
 #include <cstdio>
@@ -2381,28 +2381,36 @@ void drawButtonInputs()
 	}
 }
 
-void drawYoshiSkipDetails()
+void drawStickAngle()
 {
-	double StickX = static_cast<double>(ttyd::system::keyGetStickX(0));
-	if (StickX > 127)
-	{
-		StickX -= 256;
-	}
+	uint32_t TextColor 		= 0xFFFFFFFF;
+	uint8_t Alpha 			= 0xFF;
+	int32_t PosX 			= -232;
+	int32_t PosY 			= -162;
+	float Scale 			= 0.75;
 
-	double StickY = static_cast<double>(ttyd::system::keyGetStickY(0));
-	if (StickY > 127)
+	// Move the text up if the input display is active
+	if (Displays[BUTTON_INPUT_DISPLAY])
 	{
-		StickY -= 256;
+		PosY += 20;
 	}
 
-	double PI = 3.14159265358979323846;
-	double StickAngle = (ttyd::w_atan2::atan2(StickX, StickY)) * (180 / PI);
-	
-	if (StickAngle < 0)
+	// 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])
 	{
-		StickAngle += 360;
+		PosY += 20;
 	}
 
+	char *tempDisplayBuffer = DisplayBuffer;
+	sprintf(tempDisplayBuffer,
+		"StickAngle: %.2f",
+		getStickAngle());
+	
+	drawText(tempDisplayBuffer, PosX, PosY, Alpha, TextColor, Scale);
+}
+
+void drawYoshiSkipDetails()
+{
 	uint32_t TextColor 		= 0xFFFFFFFF;
 	uint8_t Alpha 			= 0xFF;
 	int32_t PosX 			= -232;
@@ -2420,7 +2428,7 @@ void drawYoshiSkipDetails()
 	sprintf(tempDisplayBuffer,
 		"YST: %lu\nStickAngle: %.2f",
 		YoshiSkip.MainTimer,
-		StickAngle);
+		getStickAngle());
 
 	drawText(tempDisplayBuffer, PosX, PosY, Alpha, TextColor, Scale);
 
@@ -2553,6 +2561,12 @@ void drawPalaceSkipDetails()
 		PosY += 20;
 	}
 
+	// Move the text up if the stick angle display is active
+	if (Displays[STICK_ANGLE])
+	{
+		PosY += 20;
+	}
+	
 	// Draw the text
 	char *tempDisplayBuffer = DisplayBuffer;
 	sprintf(tempDisplayBuffer,

ttyd-tools/rel/source/global.cpp

@@ -6,7 +6,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.12";
+const char *VersionNumber = "v3.0.13";
 
 const char *RootLines[] = 
 {
@@ -659,13 +659,27 @@ uint16_t BattlesStatusesIcons[] =
 	#endif
 };
 
+uint8_t DisplaysOrder[] = 
+{
+	ONSCREEN_TIMER,
+	MARIO_COORDINATES,
+	JUMP_STORAGE,
+	BUTTON_INPUT_DISPLAY,
+	GUARD_SUPERGUARD_TIMINGS,
+	ART_ATTACK_HITBOXES,
+	YOSHI_SKIP,
+	PALACE_SKIP,
+	STICK_ANGLE,
+};
+
 const char *DisplaysLines[] = 
 {
 	"Return",
 	"On-Screen Timer",
 	"Mario's Coordinates",
 	"Jump Storage",
 	"Button Input Display",
+	"Stick Angle",
 	"Guard/Superguard Timings",
 	"Art Attack Hitboxes",
 	"Yoshi Skip",
@@ -805,7 +819,7 @@ const char *ButtonInputDisplay[] =
 
 struct Menus Menu[21];
 struct Cheats Cheat[19];
-bool Displays[8];
+bool Displays[9];
 char DisplayBuffer[256];
 
 struct AutoIncrement AdjustableValueMenu;
@@ -1022,15 +1036,12 @@ void initMenuVars()
 	MenuSettings.FileName 								= "rel_settings";
 
 	// Try to open the settings file
-	int32_t ReturnCode = openFile(MenuSettings.FileName, 
+	int32_t ReturnCode = loadSettings(MenuSettings.FileName, 
 		MenuSettings.FileInfo, MenuSettings.WorkArea);
 
-	if ((ReturnCode != CARD_ERROR_READY) || 
-		!loadSettings(MenuSettings.FileInfo))
+	if (ReturnCode != CARD_ERROR_READY)
 	{
 		// Settings file couldn't be opened, so set the default values
-		gc::card::CARDUnmount(CARD_SLOTA);
-		
 		Cheat[WALK_THROUGH_WALLS].Active 					= false;
 		// Cheat[SAVE_COORDINATES].Active 					= false;
 		// Cheat[LOAD_COORDINATES].Active 					= false;

ttyd-tools/rel/source/main.cpp

@@ -601,6 +601,7 @@ void Mod::run()
 		displaySequenceInPauseMenu();
 		displayMarioCoordinatesBoolCheck();
 		displayActionCommandsTiming();
+		displayStickAngle();
 	}
 
 	uint32_t tempFrameCounter = FrameCounter;