Moved getStickAngle and getStickAngleString to menufunctions.cpp

Author: Zephiles

ttyd-tools/rel/include/codes.h

@@ -19,8 +19,6 @@ void lockMarioHPToMax();
 void bobberyEarly();
 void spawnItem();
 void checkIfAreaFlagsShouldBeCleared();
-double getStickAngle(int32_t stickXYOut[2]); // If the X and Y values are not wanted, then pass in nullptr
-void getStickAngleString(char *stringOut);
 
 void displaySequenceInPauseMenu();
 void displayOnScreenTimer();

ttyd-tools/rel/include/menufunctions.h

@@ -92,6 +92,9 @@ bool getSequenceStageAndEvent(const char *arrayOut[2], char *stageNameBuffer, ui
 bool getSequenceStageAndEvent(const char *arrayOut[2], uint32_t sequencePosition);
 #endif
 
+double getStickAngle(int32_t stickXYOut[2]); // If the X and Y values are not wanted, then pass in nullptr
+void getStickAngleString(char *stringOut);
+
 // void getButtonsPressedDynamic(uint8_t *buttonArrayOut, uint32_t currentButtonCombo);
 void getButtonsPressed(uint8_t *buttonArrayOut, uint32_t currentButtonCombo);
 void createButtonStringArray(uint8_t *buttonArray, char *stringOut, uint32_t stringOutSize);

ttyd-tools/rel/source/codes.cpp

@@ -29,7 +29,6 @@
 #include <cstring>
 #include <cstdio>
 #include <cinttypes>
-#include <cmath>
 
 namespace mod {
 
@@ -832,73 +831,6 @@ void checkIfAreaFlagsShouldBeCleared()
 	}
 }
 
-double getStickAngle(int32_t stickXYOut[2])
-{
-	int32_t StickXInt = static_cast<int32_t>(ttyd::system::keyGetStickX(0));
-	int32_t StickYInt = static_cast<int32_t>(ttyd::system::keyGetStickY(0));
-	
-	// Check if the stick is at the neutral position
-	if ((StickXInt == 0) && (StickYInt == 0))
-	{
-		// The stick is currently at the neutral position
-		if (stickXYOut)
-		{
-			stickXYOut[0] = 0;
-			stickXYOut[1] = 0;
-		}
-		return -1000;
-	}
-	
-	if (StickXInt > 127)
-	{
-		StickXInt -= 256;
-	}
-	
-	if (StickYInt > 127)
-	{
-		StickYInt -= 256;
-	}
-	
-	// Store the individual stick values if desired
-	if (stickXYOut)
-	{
-		stickXYOut[0] = StickXInt;
-		stickXYOut[1] = StickYInt;
-	}
-	
-	double StickX = static_cast<double>(StickXInt);
-	double StickY = static_cast<double>(StickYInt);
-	const double PI = 3.14159265358979323846;
-	
-	double StickAngle = (atan2(StickX, StickY)) * (180 / PI);
-	if (StickAngle < 0)
-	{
-		StickAngle += 360;
-	}
-	
-	return StickAngle;
-}
-
-void getStickAngleString(char *stringOut)
-{
-	int32_t StickXYAngles[2];
-	double StickAngle = getStickAngle(StickXYAngles);
-	
-	// Check if the stick is at the neutral position
-	if (StickAngle == -1000)
-	{
-		// The stick is currently at the neutral position
-		strcpy(stringOut, "Neutral");
-		return;
-	}
-	
-	sprintf(stringOut, 
-		"%.2f  %" PRId32 "  %" PRId32, 
-		StickAngle, 
-		StickXYAngles[0], 
-		StickXYAngles[1]);
-}
-
 void displaySequenceInPauseMenu()
 {
 	uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();

ttyd-tools/rel/source/draw.cpp

@@ -3,7 +3,6 @@
 #include "commonfunctions.h"
 #include "menufunctions.h"
 #include "memorywatch.h"
-#include "codes.h"
 #include "mod.h"
 #include "assembly.h"
 

ttyd-tools/rel/source/menufunctions.cpp

@@ -28,6 +28,7 @@
 #include <cstdio>
 #include <cstring>
 #include <cinttypes>
+#include <cmath>
 
 namespace mod {
 
@@ -3782,6 +3783,73 @@ bool getSequenceStageAndEvent(const char *arrayOut[2], uint32_t sequencePosition
 	return true;
 }
 
+double getStickAngle(int32_t stickXYOut[2])
+{
+	int32_t StickXInt = static_cast<int32_t>(ttyd::system::keyGetStickX(0));
+	int32_t StickYInt = static_cast<int32_t>(ttyd::system::keyGetStickY(0));
+	
+	// Check if the stick is at the neutral position
+	if ((StickXInt == 0) && (StickYInt == 0))
+	{
+		// The stick is currently at the neutral position
+		if (stickXYOut)
+		{
+			stickXYOut[0] = 0;
+			stickXYOut[1] = 0;
+		}
+		return -1000;
+	}
+	
+	if (StickXInt > 127)
+	{
+		StickXInt -= 256;
+	}
+	
+	if (StickYInt > 127)
+	{
+		StickYInt -= 256;
+	}
+	
+	// Store the individual stick values if desired
+	if (stickXYOut)
+	{
+		stickXYOut[0] = StickXInt;
+		stickXYOut[1] = StickYInt;
+	}
+	
+	double StickX = static_cast<double>(StickXInt);
+	double StickY = static_cast<double>(StickYInt);
+	const double PI = 3.14159265358979323846;
+	
+	double StickAngle = (atan2(StickX, StickY)) * (180 / PI);
+	if (StickAngle < 0)
+	{
+		StickAngle += 360;
+	}
+	
+	return StickAngle;
+}
+
+void getStickAngleString(char *stringOut)
+{
+	int32_t StickXYAngles[2];
+	double StickAngle = getStickAngle(StickXYAngles);
+	
+	// Check if the stick is at the neutral position
+	if (StickAngle == -1000)
+	{
+		// The stick is currently at the neutral position
+		strcpy(stringOut, "Neutral");
+		return;
+	}
+	
+	sprintf(stringOut, 
+		"%.2f  %" PRId32 "  %" PRId32, 
+		StickAngle, 
+		StickXYAngles[0], 
+		StickXYAngles[1]);
+}
+
 /*void getButtonsPressedDynamic(uint8_t *buttonArrayOut, uint32_t currentButtonCombo)
 {
 	uint32_t Counter = 0;