Merge branch 'master' into developer
Conflicts: source/config.c
This commit is contained in:
commit
e4c87a59d0
@ -34,7 +34,7 @@ void configureCFW(const char *configPath)
|
|||||||
drawString(CONFIG_TITLE, 10, 10, COLOR_TITLE);
|
drawString(CONFIG_TITLE, 10, 10, COLOR_TITLE);
|
||||||
drawString("Press A to select, START to save", 10, 30, COLOR_WHITE);
|
drawString("Press A to select, START to save", 10, 30, COLOR_WHITE);
|
||||||
|
|
||||||
const char *multiOptionsText[] = { "Screen-init brightness: 4( ) 3( ) 2( ) 1( )",
|
const char *multiOptionsText[] = { "Screen-init brightness: 4( ) 3( ) 2( ) 1( )",
|
||||||
"New 3DS CPU: Off( ) Clock( ) L2( ) Clock+L2( )",
|
"New 3DS CPU: Off( ) Clock( ) L2( ) Clock+L2( )",
|
||||||
"Dev. features: None( ) ErrDisp( ) UNITINFO( )" };
|
"Dev. features: None( ) ErrDisp( ) UNITINFO( )" };
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ void configureCFW(const char *configPath)
|
|||||||
int posY;
|
int posY;
|
||||||
u32 enabled;
|
u32 enabled;
|
||||||
} multiOptions[] = {
|
} multiOptions[] = {
|
||||||
{ .posXs = {26, 31, 36, 41} },
|
{ .posXs = {26, 32, 38, 44} },
|
||||||
{ .posXs = {17, 26, 32, 44} },
|
{ .posXs = {17, 26, 32, 44} },
|
||||||
{ .posXs = {20, 31, 43, 0} }
|
{ .posXs = {20, 31, 43, 0} }
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user