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

Merge pull request #57 from astronautlevel2/zeta-patch

Browse Source 
Make Errorcodes great again (well, sorta)
This commit is contained in:
Nils P
2017-09-05 21:40:17 +02:00
committed by GitHub
parent dcac5401c1 5b067cfac0
commit 424fffd35f
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/common.h
View File

@@ -41,6 +41,8 @@
#define BGM_INSTALL 2 #define BGM_INSTALL 2
#define UNINSTALL 3 #define UNINSTALL 3
#define ERROR 0
#define WARNING 1
static const int THEMES_PER_SCREEN = 4; static const int THEMES_PER_SCREEN = 4;
enum TextureID { enum TextureID {

2
include/draw.h
View File

@@ -40,5 +40,5 @@ void draw_theme_install(int install_type);
void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_theme, bool preview_mode, int shuffle_theme_count); void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_theme, bool preview_mode, int shuffle_theme_count);
void draw_splash_install(int install_type); void draw_splash_install(int install_type);
void draw_splash_interface(Splash_s *splashes_list, int splash_count, int selected_splash, bool preview_mode); void draw_splash_interface(Splash_s *splashes_list, int splash_count, int selected_splash, bool preview_mode);
void throw_error(char* error, int error_type);
#endif #endif

19
source/draw.c
View File

@@ -37,6 +37,8 @@ enum Colors {
COLOR_WHITE = RGBA8(255, 255, 255, 255), COLOR_WHITE = RGBA8(255, 255, 255, 255),
COLOR_CURSOR = RGBA8(200, 200, 200, 255), COLOR_CURSOR = RGBA8(200, 200, 200, 255),
COLOR_BLACK = RGBA8(0, 0, 0, 255), COLOR_BLACK = RGBA8(0, 0, 0, 255),
COLOR_RED = RGBA8(200, 0, 0, 255),
COLOR_YELLOW = RGBA8(239, 220, 11, 255),
}; };
void init_screens(void) void init_screens(void)
@@ -142,7 +144,18 @@ void draw_base_interface(void)
pp2d_draw_text(7, 219, 0.6, 0.6, COLOR_WHITE, VERSION); pp2d_draw_text(7, 219, 0.6, 0.6, COLOR_WHITE, VERSION);
pp2d_draw_on(GFX_TOP); pp2d_draw_on(GFX_TOP);
} }
void throw_error(char* error, int error_type) {
draw_base_interface();
switch (error_type) {
case ERROR:
pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_RED, error);
break;
case WARNING:
pp2d_draw_text(70, 120, 0.8, 0.8, COLOR_YELLOW, error);
break;
}
pp2d_end_draw();
}
void draw_theme_install(int install_type) void draw_theme_install(int install_type)
{ {
draw_base_interface(); draw_base_interface();
@@ -207,7 +220,7 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
pp2d_draw_wtext(200, 180, 0.6, 0.6, COLOR_WHITE, L"\uE001 Queue Shuffle"); pp2d_draw_wtext(200, 180, 0.6, 0.6, COLOR_WHITE, L"\uE001 Queue Shuffle");
pp2d_draw_wtext(20, 210, 0.6, 0.6, COLOR_WHITE, L"\uE002 Install BGM"); pp2d_draw_wtext(20, 210, 0.6, 0.6, COLOR_WHITE, L"\uE002 Install BGM");
pp2d_draw_wtext(200, 210, 0.6, 0.6, COLOR_WHITE, L"\uE003 Preview Theme"); pp2d_draw_wtext(200, 210, 0.6, 0.6, COLOR_WHITE, L"\uE003 Preview Theme");
pp2d_draw_wtext(130, 120, 0.6, 0.6, COLOR_WHITE, L"\uE005 Scan QRCode"); pp2d_draw_wtext(130, 120, 0.6, 0.6, COLOR_WHITE, L"\uE005 Scan QRCode");
pp2d_draw_on(GFX_BOTTOM); pp2d_draw_on(GFX_BOTTOM);
pp2d_draw_textf(7, 3, 0.6, 0.6, COLOR_WHITE, "Selected: %i/10", shuffle_theme_count); pp2d_draw_textf(7, 3, 0.6, 0.6, COLOR_WHITE, "Selected: %i/10", shuffle_theme_count);
@@ -303,7 +316,7 @@ void draw_splash_interface(Splash_s *splashes_list, int splash_count, int select
pp2d_draw_text_center(GFX_TOP, 4, 0.5, 0.5, COLOR_WHITE, "Splash mode"); pp2d_draw_text_center(GFX_TOP, 4, 0.5, 0.5, COLOR_WHITE, "Splash mode");
pp2d_draw_wtext_center(GFX_TOP, 180, 0.7, 0.7, COLOR_WHITE, L"\uE000 Install Splash \uE004 Switch to Themes"); pp2d_draw_wtext_center(GFX_TOP, 180, 0.7, 0.7, COLOR_WHITE, L"\uE000 Install Splash \uE004 Switch to Themes");
pp2d_draw_wtext_center(GFX_TOP, 210, 0.7, 0.7, COLOR_WHITE, L"\uE002 Delete current Splash"); pp2d_draw_wtext_center(GFX_TOP, 210, 0.7, 0.7, COLOR_WHITE, L"\uE002 Delete current Splash");
pp2d_draw_on(GFX_BOTTOM); pp2d_draw_on(GFX_BOTTOM);
for (int i = 0; i < splash_count; i++) { for (int i = 0; i < splash_count; i++) {
if (splash_count <= THEMES_PER_SCREEN) if (splash_count <= THEMES_PER_SCREEN)

16
source/main.c
View File

@@ -125,14 +125,14 @@ int main(void)
splash_mode = !splash_mode; splash_mode = !splash_mode;
} else if (kDown & KEY_R) } else if (kDown & KEY_R)
{ {
if (splash_mode || preview_mode) { if (splash_mode || preview_mode) {
continue; continue;
} else { } else {
qr_mode = !qr_mode; qr_mode = !qr_mode;
if (qr_mode) init_qr(); if (qr_mode) init_qr();
else exit_qr(); else exit_qr();
continue; continue;
} }
} }
if (qr_mode) continue; if (qr_mode) continue;