LowLevel
/
Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge branch 'master' into 3gx-master 

* master:
  rosalina: work around gsp bug
  fix typo in screen filters menu
This commit is contained in:
Bea 2020-07-22 19:27:49 +02:00
parent 15342b5030 738a242e3c
commit 47b5466a6e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysmodules/rosalina/source/menus.c
View File

@ -235,7 +235,8 @@ void RosalinaMenu_ChangeScreenBrightness(void)
else if (pressed & KEY_LEFT)
lum -= 10;
lum = lum < 0 ? 0 : lum;
lum = lum < (s32)minLum ? (s32)minLum : lum;
lum = lum > (s32)maxLum ? (s32)maxLum : lum;
// We need to call gsp here because updating the active duty LUT is a bit tedious (plus, GSP has internal state).
// This is actually SetLuminance:

2
sysmodules/rosalina/source/menus/screen_filters.c
View File

@ -116,7 +116,7 @@ Menu screenFiltersMenu = {
{ "[2700K] Incandescent", METHOD, .method = &ScreenFiltersMenu_SetIncandescent },
{ "[2300K] Warm Incandescent", METHOD, .method = &ScreenFiltersMenu_SetWarmIncandescent },
{ "[1900K] Candle", METHOD, .method = &ScreenFiltersMenu_SetCandle },
{ "[2700K] Ember", METHOD, .method = &ScreenFiltersMenu_SetEmber },
{ "[1200K] Ember", METHOD, .method = &ScreenFiltersMenu_SetEmber },
{},
}
};