ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:3dsfug/Anemone3DS

Browse Source
This commit is contained in:
Alex Taber
2017-09-08 23:26:59 -04:00
parent 97ab2307f8 47c64828a4
commit 5564ffe31b
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/draw.c
View File

@@ -104,33 +104,33 @@ void throw_error(char* error, int error_type) {
switch (error_type) { switch (error_type) {
case ERROR: case ERROR:
while (aptMainLoop()) while (aptMainLoop())
{ {
hidScanInput(); hidScanInput();
u32 kDown = hidKeysDown(); u32 kDown = hidKeysDown();
draw_base_interface(); draw_base_interface();
pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_RED, error); pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_RED, error);
pp2d_draw_wtext(70, 150, 0.8, 0.8, COLOR_WHITE, L"Press \uE000 to shut down."); pp2d_draw_wtext(70, 150, 0.8, 0.8, COLOR_WHITE, L"Press \uE000 to shut down.");
pp2d_end_draw(); pp2d_end_draw();
if (kDown & KEY_A) { if (kDown & KEY_A) {
if (homebrew) if (homebrew)
APT_HardwareResetAsync(); APT_HardwareResetAsync();
else { else {
srvPublishToSubscriber(0x202, 0); srvPublishToSubscriber(0x202, 0);
} }
} }
} }
case WARNING: case WARNING:
while (aptMainLoop()) while (aptMainLoop())
{ {
hidScanInput(); hidScanInput();
u32 kDown = hidKeysDown(); u32 kDown = hidKeysDown();
draw_base_interface(); draw_base_interface();
pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_YELLOW, error); pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_YELLOW, error);
pp2d_draw_wtext(70, 150, 0.8, 0.8, COLOR_WHITE, L"Press \uE000 to continue."); pp2d_draw_wtext(70, 150, 0.8, 0.8, COLOR_WHITE, L"Press \uE000 to continue.");
pp2d_end_draw(); pp2d_end_draw();
if (kDown & KEY_A) break; if (kDown & KEY_A) break;
} }
break; break;
} }
pp2d_end_draw(); pp2d_end_draw();
@@ -149,9 +149,9 @@ void draw_theme_install(int install_type)
case 2: case 2:
pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing BGM..."); pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing BGM...");
break; break;
case 3: case 3:
pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading..."); pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading...");
break; break;
default: default:
break; break;
} }

2
source/main.c
View File

@@ -41,7 +41,7 @@ int init_services(void)
ptmuInit(); ptmuInit();
httpcInit(0); httpcInit(0);
archive_result = open_archives(); archive_result = open_archives();
bool homebrew = true; homebrew = true;
if (!envIsHomebrew()) if (!envIsHomebrew())
{ {
homebrew = false; homebrew = false;