Wood theme: Revert improved icon scroll speed to fix icon load bugs

DS-Homebrew · May 10, 2024 · b342f2d · b342f2d
1 parent 4bd12a1
commit b342f2d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/romsel_aktheme/arm9/source/fileBrowse.cpp b/romsel_aktheme/arm9/source/fileBrowse.cpp
@@ -410,8 +410,8 @@ void getGameInfo0(const int fileOffset, std::vector<DirEntry> dirContents) {
 	}
 }
 
-static bool scrollUpByOne = false;
-static bool scrollDownByOne = false;
+// static bool scrollUpByOne = false;
+// static bool scrollDownByOne = false;
 
 void loadIcons(const int screenOffset, std::vector<DirEntry> dirContents) {
 	clearText(false);
@@ -511,7 +511,7 @@ void loadIcons(const int screenOffset, std::vector<DirEntry> dirContents) {
 	updateText(false);
 }
 
-extern bool stopDSiAnim;
+/* extern bool stopDSiAnim;
 extern bool stopDSiAnimNotif;
 
 void loadIconUp(const int screenOffset, std::vector<DirEntry> dirContents) {
@@ -734,7 +734,7 @@ void loadIconDown(const int screenOffset, std::vector<DirEntry> dirContents) {
 
 	updateText(false);
 	scrollDownByOne = false;
-}
+} */
 
 void refreshBanners(const int startRow, const int fileOffset, std::vector<DirEntry> dirContents) {
 	clearText(false);
@@ -1625,23 +1625,23 @@ std::string browseForFile(const std::vector<std::string_view> extensionList) {
 			if (screenOffset > 0) {
 				screenOffset--;
 				cursorPosOnScreen = fileOffset - screenOffset;
-				scrollUpByOne = true;
+				// scrollUpByOne = true;
 			}
 		} else if (fileOffset - screenOffset > (0.5 * entriesPerScreen)) {
 			if (screenOffset + entriesPerScreen < file_count) {
 				screenOffset++;
 				cursorPosOnScreen = fileOffset - screenOffset;
-				scrollDownByOne = true;
+				// scrollDownByOne = true;
 			}
 		}
 		if (displayIcons && (screenOffsetPrev != screenOffset || listModeSwitched)) {
-			if (scrollUpByOne) {
+			/* if (scrollUpByOne) {
 				loadIconUp(screenOffset, dirContents);
 			} else if (scrollDownByOne) {
 				loadIconDown(screenOffset, dirContents);
-			} else {
+			} else { */
 				loadIcons(screenOffset, dirContents);
-			}
+			// }
 		} else {
 			refreshBanners(screenOffset, fileOffset, dirContents);
 		}

diff --git a/romsel_aktheme/arm9/source/graphics/graphics.cpp b/romsel_aktheme/arm9/source/graphics/graphics.cpp
@@ -68,8 +68,8 @@ int frameOf60fps = 60;
 int frameDelay = 0;
 bool frameDelayEven = true; // For 24FPS
 bool renderFrame = true;
-bool stopDSiAnim = false;
-bool stopDSiAnimNotif = false;
+// bool stopDSiAnim = false;
+// bool stopDSiAnimNotif = false;
 
 extern int spawnedtitleboxes;
 
@@ -1645,10 +1645,11 @@ void vBlankHandler()
 				}
 				// if (bnrWirelessIcon > 0) glSprite(24, 12, GL_FLIP_NONE, &wirelessIcons[(bnrWirelessIcon-1) & 31]);
 				// Playback animated icons
-				if (!stopDSiAnim && bnriconisDSi[i]) {
+				// if (!stopDSiAnim && bnriconisDSi[i]) {
+				if (bnriconisDSi[i]) {
 					playBannerSequence(i);
 				}
-				stopDSiAnimNotif = stopDSiAnim;
+				// stopDSiAnimNotif = stopDSiAnim;
 			}
 			if (iconScaleEnabled) {
 				if (!iconScaleDelay) {