Combine MSGData

Universal-Team · Dec 10, 2024 · 6508554 · 6508554
1 parent fa79752
commit 6508554
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 67 deletions.
diff --git a/include/3ds/data/GFXData.hpp b/include/3ds/data/GFXData.hpp
@@ -59,6 +59,8 @@ class GFXData {
 	void DrawCheckbox(const int XPos, const int YPos, const bool Selected);
 	void DrawToggle(const int XPos, const int YPos, const bool Toggled);
 	void DrawSort(const int XPos, const int YPos, const bool Checked);
+
+	bool SpritesDrawn = false;
 private:
 	C2D_SpriteSheet Sprites = nullptr;
 	C2D_Font Font = nullptr;

diff --git a/include/3ds/data/MSGData.hpp → include/data/MSGData.hpp b/include/3ds/data/MSGData.hpp → include/data/MSGData.hpp
diff --git a/include/nds/data/MSGData.hpp b/include/nds/data/MSGData.hpp
diff --git a/nds/build/version.hpp b/nds/build/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VER_NUMBER "-ddfd63e"
+#define VER_NUMBER "-c902ddd"
 
 #endif
diff --git a/source/3ds/data/MSGData.cpp b/source/3ds/data/MSGData.cpp
diff --git a/source/nds/data/MSGData.cpp → source/data/MSGData.cpp b/source/nds/data/MSGData.cpp → source/data/MSGData.cpp
@@ -4,6 +4,8 @@
 
 #include "MSGData.hpp"
 
+#include "gui.hpp"
+#include "Platform.hpp"
 #include "UniversalUpdater.hpp"
 
 
@@ -31,18 +33,16 @@ bool MSGData::PromptMsg(const std::string &MSG) {
 
 	bool Result = false;
 
-	while(1) {
+	while(Platform::MainLoop()) {
 		UU::App->GData->StartFrame();
 		UU::App->GData->DrawTop();
 		Gui::DrawStringCentered(0, 80, TEXT_MEDIUM, TEXT_COLOR, MSG);
 		Gui::DrawStringCentered(0, 210, TEXT_MEDIUM, TEXT_COLOR, "Press A to continue, B to cancel.");
 		UU::App->GData->DrawBottom();
 		UU::App->GData->EndFrame();
 
-		do {
-			swiWaitForVBlank();
-			UU::App->ScanInput();
-		} while (!(UU::App->Down & (KEY_A | KEY_B)));
+		Platform::waitForVBlank();
+		UU::App->ScanInput();
 
 		if (UU::App->Down & KEY_A) {
 			Result = true;