DSi theme: Add icon drop down effect during fade-in

DS-Homebrew · Jul 17, 2018 · 6354154 · 6354154
1 parent 7a7211c
commit 6354154
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 8 deletions.
diff --git a/romsel_dsimenutheme/arm9/source/fileBrowse.cpp b/romsel_dsimenutheme/arm9/source/fileBrowse.cpp
@@ -69,6 +69,8 @@ extern bool arm7SCFGLocked;
 extern int consoleModel;
 extern bool isRegularDS;
 
+extern bool dropDown;
+extern bool redoDropDown;
 extern bool showbubble;
 extern bool showSTARTborder;
 
@@ -386,6 +388,15 @@ bool isTopLevel(const char *path)
 #endif
 }
 
+void waitForFadeOut (void) {
+	if (!dropDown && theme == 0) {
+		dropDown = true;
+		for (int i = 0; i < 60; i++) swiWaitForVBlank();
+	} else {
+		for (int i = 0; i < 25; i++) swiWaitForVBlank();
+	}
+}
+
 string browseForFile(const vector<string> extensionList, const char* username)
 {
 	int pressed = 0;
@@ -471,14 +482,15 @@ string browseForFile(const vector<string> extensionList, const char* username)
 			}
 		}
 
+		whiteScreen = false;
+		fadeType = true;	// Fade in from white
+		for (int i = 0; i < 5; i++) swiWaitForVBlank();
 		if (!music) {
 			mmEffectEx(&mus_menu);
 			music = true;
 		}
-		whiteScreen = false;
-		fadeType = true;	// Fade in from white
-		for (int i = 0; i < 30; i++) swiWaitForVBlank();
-
+		waitForFadeOut();
+
 		/* clearText(false);
 		updatePath();
 		TextPane *pane = &createTextPane(20, 3 + ENTRIES_START_ROW*FONT_SY, ENTRIES_PER_SCREEN);
@@ -711,6 +723,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 					whiteScreen = true;
 					if (showBoxArt) clearBoxArt();	// Clear box art
 					boxArtLoaded = false;
+					redoDropDown = true;
 					shouldersRendered = false;
 					showbubble = false;
 					showSTARTborder = false;
@@ -881,6 +894,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 				whiteScreen = true;
 				if (showBoxArt) clearBoxArt();	// Clear box art
 				boxArtLoaded = false;
+				redoDropDown = true;
 				shouldersRendered = false;
 				showbubble = false;
 				showSTARTborder = false;
@@ -900,6 +914,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 				whiteScreen = true;
 				if (showBoxArt) clearBoxArt();	// Clear box art
 				boxArtLoaded = false;
+				redoDropDown = true;
 				shouldersRendered = false;
 				showbubble = false;
 				showSTARTborder = false;
@@ -937,12 +952,16 @@ string browseForFile(const vector<string> extensionList, const char* username)
 						SaveSettings();
 						settingsChanged = false;
 					}
-					shouldersRendered = false;
 					whiteScreen = true;
+					redoDropDown = true;
+					shouldersRendered = false;
+					showbubble = false;
+					showSTARTborder = false;
 					clearText();
 					whiteScreen = false;
 					fadeType = true;	// Fade in from white
-					for (int i = 0; i < 30; i++) swiWaitForVBlank();
+					for (int i = 0; i < 5; i++) swiWaitForVBlank();
+					waitForFadeOut();
 				} else if (showDirectories) {
 					// Go up a directory
 					mmEffectEx(&snd_select);
@@ -955,6 +974,7 @@ string browseForFile(const vector<string> extensionList, const char* username)
 					whiteScreen = true;
 					if (showBoxArt) clearBoxArt();	// Clear box art
 					boxArtLoaded = false;
+					redoDropDown = true;
 					shouldersRendered = false;
 					showbubble = false;
 					showSTARTborder = false;
@@ -1049,13 +1069,15 @@ string browseForFile(const vector<string> extensionList, const char* username)
 				whiteScreen = true;
 				if (showBoxArt) clearBoxArt();	// Clear box art
 				boxArtLoaded = false;
+				redoDropDown = true;
 				shouldersRendered = false;
 				showbubble = false;
 				showSTARTborder = false;
 				clearText();
 				whiteScreen = false;
 				fadeType = true;	// Fade in from white
-				for (int i = 0; i < 30; i++) swiWaitForVBlank();
+				for (int i = 0; i < 5; i++) swiWaitForVBlank();
+				waitForFadeOut();
 			}
 
 			if ((pressed & KEY_SELECT) && !startMenu

diff --git a/romsel_dsimenutheme/arm9/source/graphics/graphics.cpp b/romsel_dsimenutheme/arm9/source/graphics/graphics.cpp
@@ -85,6 +85,12 @@ extern int colorRvalue;
 extern int colorGvalue;
 extern int colorBvalue;
 
+extern bool dropDown;
+extern bool redoDropDown;
+int dropTime = 0;
+int dropSeq = 0;
+int dropSpeed = 5;
+int dropSpeedChange = 0;
 extern bool showbubble;
 extern bool showSTARTborder;
 
@@ -112,7 +118,7 @@ extern int startMenu_cursorPosition;
 extern int pagenum;
 int titleboxXpos;
 int startMenu_titleboxXpos;
-int titleboxYpos = 85;
+int titleboxYpos = -80;	// 85, when dropped down
 int titlewindowXpos;
 int startMenu_titlewindowXpos;
 
@@ -505,6 +511,50 @@ void vBlankHandler()
 			}
 		}
 
+		if (redoDropDown && theme == 0) {
+			dropTime = 0;
+			dropSeq = 0;
+			dropSpeed = 5;
+			dropSpeedChange = 0;
+			titleboxYpos = -80;	// 85, when dropped down
+			dropDown = false;
+			redoDropDown = false;
+		}
+
+		if (dropDown && theme == 0) {
+			if (dropSeq == 0) {
+				titleboxYpos += dropSpeed;
+				if (titleboxYpos > 85) dropSeq = 1;
+			} else if (dropSeq == 1) {
+				titleboxYpos -= dropSpeed;
+				dropTime++;
+				dropSpeedChange++;
+				if (dropTime >= 15) {
+					dropSpeedChange = -1;
+					dropSeq = 2;
+				}
+				if (dropSpeedChange == 2) {
+					dropSpeed--;
+					if (dropSpeed < 0) dropSpeed = 0;
+					dropSpeedChange = -1;
+				}
+			} else if (dropSeq == 2) {
+				titleboxYpos += dropSpeed;
+				if (titleboxYpos >= 85) {
+					dropSeq = 3;
+					titleboxYpos = 85;
+				}
+				dropSpeedChange++;
+				if (dropSpeedChange == 1) {
+					dropSpeed++;
+					if (dropSpeed > 4) dropSpeed = 4;
+					dropSpeedChange = -1;
+				}
+			} else if (dropSeq == 3) {
+				titleboxYpos = 85;
+			}
+		}
+
 		//if (renderingTop)
 		//{
 			/*glBoxFilledGradient(0, -64, 256, 112,

diff --git a/romsel_dsimenutheme/arm9/source/main.cpp b/romsel_dsimenutheme/arm9/source/main.cpp
@@ -308,6 +308,8 @@ bool useBootstrap = false;
 
 using namespace std;
 
+bool dropDown = false;
+bool redoDropDown = false;
 bool showbubble = false;
 bool showSTARTborder = false;