Stick Angle Display - Added separate text for the stick being at neutral

Author: Zephiles

ttyd-tools/rel/include/codes.h

@@ -19,7 +19,7 @@ void lockMarioHPToMax();
 void bobberyEarly();
 void spawnItem();
 void checkIfAreaFlagsShouldBeCleared();
-double getStickAngle();
+void getStickAngleString(char *stringOut);
 
 void displaySequenceInPauseMenu();
 void displayOnScreenTimer();

ttyd-tools/rel/source/codes.cpp

@@ -755,31 +755,40 @@ void checkIfAreaFlagsShouldBeCleared()
 	}
 }
 
-double getStickAngle()
+void getStickAngleString(char *stringOut)
 {
 	int32_t tempStickX = static_cast<int32_t>(ttyd::system::keyGetStickX(0));
+	int32_t tempStickY = static_cast<int32_t>(ttyd::system::keyGetStickY(0));
+	
+	// Check if the stick is at the neutral position
+	if ((tempStickX == 0) && (tempStickY == 0))
+	{
+		// The stick is currently at the neutral position
+		ttyd::string::strcpy(stringOut, "Neutral");
+		return;
+	}
+	
 	if (tempStickX > 127)
 	{
 		tempStickX -= 256;
 	}
-	double StickX = static_cast<double>(tempStickX);
 
-	int32_t tempStickY = static_cast<int32_t>(ttyd::system::keyGetStickY(0));
 	if (tempStickY > 127)
 	{
 		tempStickY -= 256;
 	}
-	double StickY = static_cast<double>(tempStickY);
 
+	double StickX = static_cast<double>(tempStickX);
+	double StickY = static_cast<double>(tempStickY);
 	const double PI = 3.14159265358979323846;
-	double StickAngle = (ttyd::w_atan2::atan2(StickX, StickY)) * (180 / PI);
 
+	double StickAngle = (ttyd::w_atan2::atan2(StickX, StickY)) * (180 / PI);
 	if (StickAngle < 0)
 	{
 		StickAngle += 360;
 	}
 
-	return StickAngle;
+	sprintf(stringOut, "%.2f", StickAngle);
 }
 
 void displaySequenceInPauseMenu()

ttyd-tools/rel/source/draw.cpp

@@ -3433,10 +3433,13 @@ void drawStickAngle()
 		PosY += 20;
 	}
 
+	char StickAngleString[12];
+	getStickAngleString(StickAngleString);
+	
 	char *tempDisplayBuffer = DisplayBuffer;
 	sprintf(tempDisplayBuffer,
-		"StickAngle: %.2f",
-		getStickAngle());
+		"StickAngle: %s",
+		StickAngleString);
 
 	drawText(tempDisplayBuffer, PosX, PosY, Alpha, TextColor, Scale);
 }
@@ -3487,11 +3490,14 @@ void drawYoshiSkipDetails()
 	}
 
 	// Draw the text
+	char StickAngleString[12];
+	getStickAngleString(StickAngleString);
+	
 	char *tempDisplayBuffer = DisplayBuffer;
 	sprintf(tempDisplayBuffer,
-		"YST: %" PRIu32 "\nStickAngle: %.2f",
+		"YST: %" PRIu32 "\nStickAngle: %s",
 		YoshiSkip.MainTimer,
-		getStickAngle());
+		StickAngleString);
 
 	drawText(tempDisplayBuffer, PosX, PosY, Alpha, TextColor, Scale);
 

ttyd-tools/rel/source/global.cpp

@@ -6,7 +6,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.23";
+const char *VersionNumber = "v3.0.24";
 
 const char *RootLines[] = 
 {