Clear brightness upon loading last ran game

DS-Homebrew · Feb 21, 2018 · 1b96648 · 1b96648
1 parent 29616b7
commit 1b96648
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/titleandsettings/arm9/source/graphics/graphics.cpp b/titleandsettings/arm9/source/graphics/graphics.cpp
@@ -48,6 +48,13 @@ void vramcpy_ui (void* dest, const void* src, int size)
 	}
 }
 
+void ClearBrightness(void) {
+	fadeType = true;
+	screenBrightness = 0;
+	swiWaitForVBlank();
+	swiWaitForVBlank();
+}
+
 // Ported from PAlib (obsolete)
 void SetBrightness(u8 screen, s8 bright) {
 	u16 mode = 1 << 14;

diff --git a/titleandsettings/arm9/source/main.cpp b/titleandsettings/arm9/source/main.cpp
@@ -43,6 +43,8 @@
 
 bool fadeType = false;		// false = out, true = in
 
+extern void ClearBrightness();
+
 const char* settingsinipath = "/_nds/srloader/settings.ini";
 const char* twldrsettingsinipath = "sd:/_nds/twloader/settings.ini";
 const char* bootstrapinipath = "sd:/_nds/nds-bootstrap.ini";
@@ -277,6 +279,9 @@ void loadROMselect() {
 }
 
 int lastRanROM() {
+	fadeType = false;
+	for (int i = 0; i < 30; i++) swiWaitForVBlank();
+	ClearBrightness();
 	int err = 0;
 	if(!flashcardUsed) {
 		if (!arm7SCFGLocked) {