See Description for changes.

- Remove GodMode & deleteTitle function.
- Add a new Bar & Selector Graphic.
- Change Color Selector UI.

include/animation.hpp

@@ -33,6 +33,8 @@
 namespace Animation {
 	// Draw Progressbar.
 	void DrawProgressBar(float currentProgress, float totalProgress, int mode);
+	// Draw Button.
+	void Button(int x, int y, float speed = .030);
 }
 
 #endif

include/gui/gfx.hpp

@@ -41,6 +41,8 @@ namespace GFX
 	// Draw Sprites.
 	void DrawSprite(int img, int x, int y, float ScaleX = 1, float ScaleY = 1);
 	void DrawSpriteBlend(int img, int x, int y, float ScaleX = 1, float ScaleY = 1);
+
+	void DrawButton(int x, int y, std::string ButtonText = "", u32 color = Config::Button);
 }
 
 #endif

include/screens/mainMenu.hpp

@@ -41,11 +41,11 @@ private:
 	int Selection = 0;
 
 	std::vector<Structs::ButtonPos> mainButtons = {
-		{10, 70, 140, 40}, // Scripts.
-		{170, 70, 140, 40}, // UniStore.
-		{10, 145, 140, 40}, // Settings.
-		{170, 145, 140, 40}, // FTP.
-		{0, 215, 25, 25}, // Back Arrow.
+		{0, 60, 149, 52}, // UniStore.
+		{162, 60, 149, 52}, // Scripts.
+		{0, 130, 149, 52}, // Settings.
+		{162, 130, 149, 52}, // FTP.
+		{0, 215, 25, 25} // Back Arrow.
 	};
 };
 

include/screens/scriptlist.hpp

@@ -97,10 +97,10 @@ private:
 		{5, 0, 25, 25} // Dropdown Menu.
 	};
 	std::vector<Structs::ButtonPos> subPos = {
-		{10, 70, 140, 40}, // Script list.
-		{170, 70, 140, 40}, // Get Scripts.
-		{10, 145, 140, 40}, // Script Creator.
-		{170, 145, 140, 40} // Script path change.
+		{0, 60, 149, 52}, // Script list.
+		{162, 60, 149, 52}, // Get Scripts.
+		{0, 130, 149, 52}, // Script Creator.
+		{162, 130, 149, 52} // Script path change.
 	};
 
 	// DropDownMenu.

include/screens/settings.hpp

@@ -43,6 +43,9 @@ private:
 	int colorMode = 0;
 	int mode = 0;
 	int Selection = 0;
+	bool dropDownMenu = false;
+	mutable int screenPos = 0;
+	int colorSelection = 0;
 
 	// Draws.
 	void DrawSubMenu(void) const;
@@ -56,9 +59,9 @@ private:
 	void MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch);
 
 	std::vector<Structs::ButtonPos> mainButtons = {
-		{90, 40, 140, 35}, // Language.
-		{90, 100, 140, 35}, // Colors.
-		{90, 160, 140, 35}, // Misc.
+		{80, 30, 149, 52}, // Language.
+		{80, 90, 149, 52}, // Colors.
+		{80, 150, 149, 52} // Misc.
 	};
 
 	std::vector<Structs::ButtonPos> langBlocks = {
@@ -74,18 +77,13 @@ private:
 		{177, 188, 20, 20},
 	};
 
-	std::vector<Structs::ButtonPos> buttons = {
-		{10, 85, 95, 41},
-		{115, 85, 95, 41},
-		{220, 85, 95, 41},
-	};
-
 	std::vector<Structs::ButtonPos> arrowPos = {
 		{0, 0, 25, 25}, // Previous Arrow.
 		{295, 0, 25, 25}, // Next Arrow.
 		{0, 215, 25, 25}, // Back Arrow.
 		{0, 0, 25, 25}, // Back Arrow top left.
 		{295, 215, 25, 25}, // Next Page / Misc Arrow.
+		{5, 0, 25, 25} // Dropdown Menu.
 	};
 };
 

include/screens/unistore.hpp

@@ -103,21 +103,24 @@ private:
 		{0, 215, 25, 25}, // Back Arrow.
 		{5, 0, 25, 25}, // Dropdown Menu.
 	};
+
 	std::vector<Structs::ButtonPos> URLBtn = {
-		{10, 70, 140, 40}, // FULL URL.
-		{170, 70, 140, 40}, // Github.
-		{10, 145, 140, 40}, // TinyDB.
-		{170, 145, 140, 40} // QR Code?
+		{0, 60, 149, 52}, // FULL URL.
+		{162, 60, 149, 52}, // GitHub.
+		{0, 130, 149, 52}, // TinyDB.
+		{162, 130, 149, 52} // QR Code?
 	};
+
 	std::vector<Structs::ButtonPos> GitHubPos = {
 		{30, 50, 260, 30}, // Owner & Repo.
 		{30, 130, 260, 30}, // Filename.
 		{135, 180, 50, 30} // OK.
 	};
+
 	std::vector<Structs::ButtonPos> subPos = {
-		{90, 40, 140, 35}, // StoreList.
-		{90, 100, 140, 35}, // storeSearch.
-		{90, 160, 140, 35} // storePathChange.
+		{80, 30, 149, 52}, // StoreList.
+		{80, 90, 149, 52}, // storeSearch.
+		{80, 150, 149, 52} // storePathChange.
 	};
 
 	// DropDownMenu.

include/utils/config.hpp

@@ -30,7 +30,7 @@
 #include <string>
 
 namespace Config {
-	extern int LangPath, lang, Color1, Color2, Color3, TxtColor, SelectedColor, UnselectedColor, viewMode, progressbarColor, autoboot, outdated, uptodate, notFound, future;
+	extern int LangPath, lang, Color1, Color2, Color3, TxtColor, SelectedColor, UnselectedColor, viewMode, progressbarColor, autoboot, outdated, uptodate, notFound, future, Button;
 	extern std::string ScriptPath, MusicPath, StorePath, AutobootFile;
 	extern bool Logging, UseBars, GodMode;
 

include/utils/scriptHelper.hpp

@@ -74,7 +74,6 @@ namespace ScriptHelper {
 
 	bool checkIfValid(std::string scriptFile, int mode = 0);
 
-	void deleteTitle(const std::string TitleID, bool isNAND, std::string message);
 	void bootTitle(const std::string TitleID, bool isNAND, std::string message);
 
 	Result prompt(std::string message);