From 4e57cf65f93c8c585ddc558945555105fc3c009d Mon Sep 17 00:00:00 2001 From: CTurt Date: Sat, 9 Jan 2016 10:13:14 +0000 Subject: [PATCH] Update fading --- source/DSGM_misc.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/source/DSGM_misc.c b/source/DSGM_misc.c index 318cfec..9c66443 100644 --- a/source/DSGM_misc.c +++ b/source/DSGM_misc.c @@ -9,7 +9,7 @@ inline int DSGM_GetBrightness(u8 screen) { } void DSGM_FadeIn(u8 screen, u8 delay) { - int brightness = DSGM_GetBrightness(DSGM_BOTTOM); + int brightness = DSGM_GetBrightness(screen); if(brightness == -15) { // Fade in from black while(brightness < 0) { @@ -29,24 +29,20 @@ void DSGM_FadeIn(u8 screen, u8 delay) { } void DSGM_FadeOutToBlack(u8 screen, u8 delay) { - int brightness = DSGM_GetBrightness(DSGM_BOTTOM); - if(brightness == 0) { - while(brightness > -15) { - brightness -= 1; - DSGM_SetBrightness(screen, brightness); - int i; for(i = 0; i < delay; i++) swiWaitForVBlank(); - } + int brightness = DSGM_GetBrightness(screen); + while(brightness > -15) { + brightness -= 1; + DSGM_SetBrightness(screen, brightness); + int i; for(i = 0; i < delay; i++) swiWaitForVBlank(); } } void DSGM_FadeOutToWhite(u8 screen, u8 delay) { - int brightness = DSGM_GetBrightness(DSGM_BOTTOM); - if(brightness == 0) { - while(brightness < 15) { - brightness += 1; - DSGM_SetBrightness(screen, brightness); - int i; for(i = 0; i < delay; i++) swiWaitForVBlank(); - } + int brightness = DSGM_GetBrightness(screen); + while(brightness < 15) { + brightness += 1; + DSGM_SetBrightness(screen, brightness); + int i; for(i = 0; i < delay; i++) swiWaitForVBlank(); } }