diff --git a/include/arm9/main.h b/include/arm9/main.h index 8b4dfbe..20f842f 100644 --- a/include/arm9/main.h +++ b/include/arm9/main.h @@ -1,7 +1,7 @@ #pragma once #include "fatfs/ff.h" -#include "arm9/console.h" +#include "arm9/ui.h" typedef struct { char model[0x10]; @@ -17,9 +17,6 @@ bootInfoStruct bootInfo; -// PrintConsole for each screen -PrintConsole con_top, con_bottom; - // SD card FAT fs instance FATFS sd_fs; diff --git a/source/arm9/main.c b/source/arm9/main.c index 44b4004..74e8513 100644 --- a/source/arm9/main.c +++ b/source/arm9/main.c @@ -341,24 +341,6 @@ return (u8)tmp; } -void clearConsoles() -{ - consoleSelect(&con_bottom); - consoleClear(); - consoleSelect(&con_top); - consoleClear(); -} - -void clearConsole(int which) -{ - if(which) - consoleSelect(&con_top); - else - consoleSelect(&con_bottom); - - consoleClear(); -} - void power_off_safe() { clearConsoles(); diff --git a/source/arm9/ui.c b/source/arm9/ui.c index a2d72b0..69e5ed1 100644 --- a/source/arm9/ui.c +++ b/source/arm9/ui.c @@ -32,7 +32,7 @@ consoleMainInit(); } -static void clearConsoles() +void clearConsoles() { consoleSelect(&con_bottom); consoleClear();