diff --git a/source/arm9/config.c b/source/arm9/config.c index 4e4e929..0de6ace 100644 --- a/source/arm9/config.c +++ b/source/arm9/config.c @@ -14,6 +14,7 @@ #include "util.h" #include "hid.h" #include "arm9/debug.h" +#include "arm9/ui.h" #include "arm9/config.h" #define MAX_FILE_SIZE 0x4000 - 1 @@ -107,7 +108,7 @@ if(fileSize > MAX_FILE_SIZE) { - printf("Invalid config-file size!\n"); + uiPrintIfVerbose("Invalid config-file size!\n"); goto fail; } @@ -115,19 +116,19 @@ if(!filebuf) { - printf("Out of memory!\n"); + uiPrintIfVerbose("Out of memory!\n"); goto fail; } if(f_open(&file, filepath, FA_READ) != FR_OK) { - printf("Failed to open config-file for reading!\n"); + uiPrintIfVerbose("Failed to open config-file for reading!\n"); goto fail; } if(f_read(&file, filebuf, fileSize, &bytesRead) != FR_OK || bytesRead != fileSize) { - printf("Failed to read from config-file!\n"); + uiPrintIfVerbose("Failed to read from config-file!\n"); f_close(&file); goto fail; } @@ -305,7 +306,7 @@ } else { // TODO: what to do if ret == false ? - //printf("Parsing attr text with size %i\n%s\n", curAttr->textLength, curAttr->textData); + //uiPrintIfVerbose("Parsing attr text with size %i\n%s\n", curAttr->textLength, curAttr->textData); keyFunctions[i].parse(curAttr); } } diff --git a/source/arm9/main.c b/source/arm9/main.c index bc41849..7999d5c 100644 --- a/source/arm9/main.c +++ b/source/arm9/main.c @@ -32,15 +32,13 @@ hardwareInit(); debugHashCodeRoData(); - + screen_init(); uiInit(); checkSetVerboseMode(); - uiDrawSplashScreen(); - consoleSelect(&con_bottom); uiPrintIfVerbose("\x1B[32mGood morning\nHello !\e[0m\n\n"); @@ -56,6 +54,8 @@ if(loadSettings(&mode)) { + uiPrintIfVerbose("Trying to launch FIRM from settings...\n"); + switch(mode) { case BootModeQuick: @@ -76,6 +76,8 @@ else screen_init(); } + uiDrawSplashScreen(); + uiPrintIfVerbose("Initializing devices...\n"); if(!devs_init()) screen_init(); diff --git a/source/arm9/menu_firmloader.c b/source/arm9/menu_firmloader.c index 08d248d..ae42d50 100644 --- a/source/arm9/menu_firmloader.c +++ b/source/arm9/menu_firmloader.c @@ -210,7 +210,7 @@ break; else { - if(keyBootMode != BootModeQuiet) + if(keyBootMode == BootModeNormal) uiPrintBootWarning(); } } @@ -220,7 +220,7 @@ try_next: - if(keyBootMode != BootModeQuick) + if(fromMenu) TIMER_sleep(300); // ... we failed, try next one @@ -230,7 +230,7 @@ { if(fromMenu) menuSetReturnToState(STATE_PREVIOUS); - else if(keyBootMode != BootModeQuiet) + else if(keyBootMode == BootModeNormal) uiPrintBootFailure(); return false; }