Fix softlock and make error more descriptive, and fixed preview offset

This commit is contained in:
2017-09-01 11:55:32 -04:00
parent 91ba5fed49
commit c4a096249c
3 changed files with 13 additions and 13 deletions

View File

@@ -107,7 +107,7 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
if (themes_list == NULL)
{
pp2d_begin_draw(GFX_TOP);
pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "FAILURE");
pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "NO THEMES FOUND");
pp2d_end_draw();
return;
}
@@ -119,9 +119,9 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
if (current_theme.has_preview)
{
pp2d_begin_draw(GFX_TOP);
pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, preview_offset, 0, 400, 240);
pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, current_theme.preview_offset, 0, 400, 240);
pp2d_draw_on(GFX_BOTTOM);
pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, 40+preview_offset, 240, 320, 240);
pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, 40+current_theme.preview_offset, 240, 320, 240);
}
}
else
@@ -202,7 +202,7 @@ void draw_splash_interface(Splash_s *splashes_list, int splash_count, int select
if (splashes_list == NULL)
{
pp2d_begin_draw(GFX_TOP);
pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "FAILURE");
pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "NO SPLASHES FOUND");
pp2d_end_draw();
return;
}

View File

@@ -51,6 +51,10 @@ Result open_archives(void)
CFGU_SecureInfoGetRegion(&regionCode);
switch(regionCode)
{
case 0:
archive1 = 0x000002cc;
archive2 = 0x00000082;
break;
case 1:
archive1 = 0x000002cd;
archive2 = 0x0000008f;
@@ -59,10 +63,6 @@ Result open_archives(void)
archive1 = 0x000002ce;
archive2 = 0x00000098;
break;
case 3:
archive1 = 0x000002cc;
archive2 = 0x00000082;
break;
default:
archive1 = 0x00;
archive2 = 0x00;

View File

@@ -91,6 +91,10 @@ int main(void)
PTMSYSM_RebootAsync(0);
ptmSysmExit();
}
else if (kDown & KEY_L)
{
splash_mode = !splash_mode;
}
if (themes_list == NULL && !splash_mode)
continue;
@@ -119,10 +123,6 @@ int main(void)
continue;
// Actions
else if (kDown & KEY_L)
{
splash_mode = !splash_mode;
}
else if (kDown & KEY_X)
{
// install_bgm(current_theme);