Bug fix

DS-Homebrew · Aug 26, 2024 · ce63a64 · ce63a64
1 parent eb1dd90
commit ce63a64
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 37 deletions.
diff --git a/quickmenu/arm9/source/graphics/graphics.cpp b/quickmenu/arm9/source/graphics/graphics.cpp
@@ -755,14 +755,6 @@ void vBlankHandler()
 
 				drawCursorRect(std::roundf(cursorTL), std::roundf(cursorBL), std::roundf(cursorTR), std::roundf(cursorBR));
 			// }
-
-
-			if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
-				reloadIconPalettes();
-				vblankRefreshCounter = 0;
-			} else {
-				vblankRefreshCounter++;
-			}
 		}
 		/*if (showdialogbox) {
 			glBoxFilled(15, 79, 241, 129+(dialogboxHeight*8), RGB15(0, 0, 0));
@@ -773,6 +765,15 @@ void vBlankHandler()
 	  glEnd2D();
 	  GFX_FLUSH = 0;
 	}
+
+	if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
+		if (!whiteScreen && startMenu) {
+			reloadIconPalettes();
+		}
+		vblankRefreshCounter = 0;
+	} else {
+		vblankRefreshCounter++;
+	}
 }
 
 static void clockNeedleDraw(int angle, u32 length, u16 color) {

diff --git a/romsel_aktheme/arm9/source/graphics/graphics.cpp b/romsel_aktheme/arm9/source/graphics/graphics.cpp
@@ -1699,20 +1699,20 @@ void vBlankHandler()
 			glBoxFilled(16, 88, 240, 120+(dialogboxHeight*12), formBodyColor);
 		}
 
-		if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
-			if (!showdialogbox) {
-				reloadIconPalettes();
-			}
-			vblankRefreshCounter = 0;
-		} else {
-			vblankRefreshCounter++;
-		}
-
 		glEnd2D();
 		GFX_FLUSH = 0;
 		updateFrame = false;
 	}
 
+	if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
+		if (!showdialogbox) {
+			reloadIconPalettes();
+		}
+		vblankRefreshCounter = 0;
+	} else {
+		vblankRefreshCounter++;
+	}
+
 	if (doubleBuffer) {
 		dmaCopyHalfWordsAsynch(0, topImageWithText[secondBuffer], BG_GFX_SUB, 0x18000);
 		dmaCopyHalfWordsAsynch(1, bottomImageWithBar[secondBuffer], BG_GFX, 0x18000);

diff --git a/romsel_dsimenutheme/arm9/source/graphics/graphics.cpp b/romsel_dsimenutheme/arm9/source/graphics/graphics.cpp
@@ -1193,23 +1193,24 @@ void vBlankHandler() {
 			}
 		}
 
-		if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
-			if (showdialogbox && dbox_Ypos == -192) {
-				// Reload the dialog box palettes here...
-				reloadDboxPalette();
-			} else if (!showdialogbox) {
-				reloadIconPalettes();
-			}
-			vblankRefreshCounter = 0;
-		} else {
-			vblankRefreshCounter++;
-		}
 		//}
 		glEnd2D();
 		GFX_FLUSH = 0;
 		updateFrame = false;
 	}
 
+	if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
+		if (showdialogbox && dbox_Ypos == -192) {
+			// Reload the dialog box palettes here...
+			reloadDboxPalette();
+		} else if (!showdialogbox) {
+			reloadIconPalettes();
+		}
+		vblankRefreshCounter = 0;
+	} else {
+		vblankRefreshCounter++;
+	}
+
 	if (boxArtColorDeband) {
 		//ndmaCopyWordsAsynch(0, tex().frameBuffer(secondBuffer), BG_GFX, 0x18000);
 		dmaCopyHalfWordsAsynch(1, tex().frameBufferBot(secondBuffer), BG_GFX_SUB, 0x18000);

diff --git a/romsel_r4theme/arm9/source/graphics/graphics.cpp b/romsel_r4theme/arm9/source/graphics/graphics.cpp
@@ -597,20 +597,20 @@ void vBlankHandler()
 			glBoxFilled(0, 0, 256, 192, RGB15(0, 0, 0));
 		}
 
-		if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
-			if (!startMenu && !showdialogbox) {
-				reloadIconPalettes();
-			}
-			vblankRefreshCounter = 0;
-		} else {
-			vblankRefreshCounter++;
-		}
-
 		glEnd2D();
 		GFX_FLUSH = 0;
 		updateFrame = false;
 	}
 
+	if (vblankRefreshCounter >= REFRESH_EVERY_VBLANKS) {
+		if (!startMenu && !showdialogbox) {
+			reloadIconPalettes();
+		}
+		vblankRefreshCounter = 0;
+	} else {
+		vblankRefreshCounter++;
+	}
+
 	if (doubleBuffer) {
 		extern bool startMenu;
 		dmaCopyHalfWordsAsynch(0, topImageWithText[startMenu][secondBuffer], BG_GFX_SUB, 0x18000);