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

Compare commits

base: ash:master
Branches Tags
ash:master ash:3.0.1-hotfix ash:basename ash:issue-templates ash:rewrite ash:fix-scrolling-for-good
..
compare: ash:3.0.1-hotfix
Branches Tags
ash:master ash:3.0.1-hotfix ash:basename ash:issue-templates ash:rewrite ash:fix-scrolling-for-good

5 Commits
master ... 3.0.1-hotf

Author SHA1 Message Date
Alex Taber
fc697af002 Merge branch 'master' into 3.0.1-hotfix 2024-06-17 20:29:27 -04:00
Alex Taber
0a23b20f6e Backup badges if no badges found 2024-06-17 18:57:26 -04:00
Alex Taber
a8cc3ebfc3 Filter newline and carriage returns when dumping themes 2024-06-17 17:04:35 -04:00
Alex Taber
b1454bf2a1 Fix debug statement 2024-06-17 14:38:42 -04:00
Alex Taber
1a2efdc129 Remove illegal fat32 chars in badge dump 2024-06-17 14:24:57 -04:00
15 changed files with 154 additions and 296 deletions
Expand all files Collapse all files

7
README.md
View File

@@ -1,9 +1,8 @@
![# Anemone3DS](https://git.ataber.pw/ash/Anemone3DS/raw/branch/master/meta/banner.png) ![# Anemone3DS](https://github.com/astronautlevel2/Anemone3DS/blob/master/meta/banner.png)
A Theme and Splashscreen Manager for the Nintendo 3DS, written in C. A Theme and Splashscreen Manager for the Nintendo 3DS, written in C.
# Dependencies # Dependencies
* Make, Git and PKG-Config
* devkitARM, which can be installed following the instructions [here](https://devkitpro.org/wiki/Getting_Started). * devkitARM, which can be installed following the instructions [here](https://devkitpro.org/wiki/Getting_Started).
* jansson, libvorbisidec, libpng, and libarchive, which can be retrieved from [devkitPro pacman](https://devkitpro.org/viewtopic.php?f=13&t=8702). * jansson, libvorbisidec, libpng, and libarchive, which can be retrieved from [devkitPro pacman](https://devkitpro.org/viewtopic.php?f=13&t=8702).
* A recent build of [makerom](https://github.com/profi200/Project_CTR) and the latest release of [bannertool](https://github.com/Steveice10/bannertool). These must be added to your PATH. * A recent build of [makerom](https://github.com/profi200/Project_CTR) and the latest release of [bannertool](https://github.com/Steveice10/bannertool). These must be added to your PATH.
@@ -11,8 +10,8 @@ A Theme and Splashscreen Manager for the Nintendo 3DS, written in C.
# Building # Building
First of all, make sure devkitARM is properly installed - `$DEVKITPRO` and `$DEVKITARM` should be set to `/opt/devkitpro` and `$DEVKITPRO/devkitARM`, respectively. First of all, make sure devkitARM is properly installed - `$DEVKITPRO` and `$DEVKITARM` should be set to `/opt/devkitpro` and `$DEVKITPRO/devkitARM`, respectively.
After that, open the directory you want to clone the repo into, and execute After that, open the directory you want to clone the repo into, and execute
`git clone https://git.ataber.pw.com/ash/Anemone3DS` (or any other cloning method). `git clone https://github.com/astronautlevel2/Anemone3DS` (or any other cloning method).
To install the prerequisite libraries, begin by ensuring devkitPro pacman (and the base install group, `3ds-dev`) is installed, and then install the dkP packages `3ds-jansson`, `3ds-libvorbisidec`, `3ds-libpng`, `3ds-lz4`, `3ds-libarchive` and `3ds-curl` using `[sudo] [dkp-]pacman -S <package-name>`. System wide packages `make`, `git` and `pkg-config` are also needed. To install the prerequisite libraries, begin by ensuring devkitPro pacman (and the base install group, `3ds-dev`) is installed, and then install the dkP packages `3ds-jansson`, `3ds-libvorbisidec`, `3ds-libpng`, `3ds-lz4`, `3ds-libarchive` and `3ds-curl` using `[sudo] [dkp-]pacman -S <package-name>`.
After adding [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools) to your PATH, just enter your directory and run `make`. All built binaries will be in `/out/`. After adding [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools) to your PATH, just enter your directory and run `make`. All built binaries will be in `/out/`.

6
include/colors.h
View File

@@ -35,12 +35,10 @@ typedef u32 Color;
typedef enum { typedef enum {
COLOR_BACKGROUND, //silver-y black COLOR_BACKGROUND, //silver-y black
COLOR_ACCENT, COLOR_ACCENT,
COLOR_WHITE_BACKGROUND, COLOR_WHITE,
COLOR_WHITE_ACCENT,
COLOR_CURSOR, COLOR_CURSOR,
COLOR_BLACK, COLOR_BLACK,
COLOR_RED_BACKGROUND, COLOR_RED,
COLOR_RED_ACCENT,
COLOR_YELLOW, COLOR_YELLOW,
COLOR_AMOUNT, COLOR_AMOUNT,

2
include/common.h
View File

@@ -79,7 +79,7 @@ typedef enum {
REMOTE_MODE_AMOUNT, REMOTE_MODE_AMOUNT,
} RemoteMode; } RemoteMode;
extern const char * main_paths[REMOTE_MODE_AMOUNT]; extern const char * main_paths[MODE_AMOUNT];
extern const int entries_per_screen_v[MODE_AMOUNT]; extern const int entries_per_screen_v[MODE_AMOUNT];
extern const int entries_per_screen_h[MODE_AMOUNT]; extern const int entries_per_screen_h[MODE_AMOUNT];
extern const int entry_size[MODE_AMOUNT]; extern const int entry_size[MODE_AMOUNT];

9
include/config.h
View File

@@ -32,14 +32,9 @@
#include <jansson.h> #include <jansson.h>
typedef struct { typedef struct {
u32 accent_color;
u32 background_color; u32 background_color;
u32 white_color_background; u32 accent_color;
u32 white_color_accent; u32 red_color;
u32 cursor_color;
u32 black_color;
u32 red_color_background;
u32 red_color_accent;
u32 yellow_color; u32 yellow_color;
} Config_s; } Config_s;

4
include/ui_strings.h
View File

@@ -193,8 +193,4 @@ typedef enum {
Language_s init_strings(CFG_Language lang); Language_s init_strings(CFG_Language lang);
extern Language_s language; extern Language_s language;
// fetches the system language through CFGU_GetSystemLanguage
// and returns the appropriate CFG_Language enum value
CFG_Language get_system_language(void);
#endif #endif

BIN
meta/logo.bin
View File

Binary file not shown.

84
source/badges.c
View File

@@ -32,6 +32,7 @@
#include "draw.h" #include "draw.h"
#include "ui_strings.h" #include "ui_strings.h"
static Handle actHandle;
Handle badgeDataHandle; Handle badgeDataHandle;
char *badgeMngBuffer; char *badgeMngBuffer;
u16 *rgb_buf_64x64; u16 *rgb_buf_64x64;
@@ -41,6 +42,51 @@ u8 *alpha_buf_32x32;
u64 progress_finish; u64 progress_finish;
u64 progress_status; u64 progress_status;
Result actInit(void)
{
return srvGetServiceHandle(&actHandle, "act:u");
}
Result actExit(void)
{
return svcCloseHandle(actHandle);
}
Result ACTU_Initialize(u32 sdkVersion, u32 memSize, Handle handle)
{
Result ret = 0;
u32 *cmdbuf = getThreadCommandBuffer();
cmdbuf[0] = 0x00010084;
cmdbuf[1] = sdkVersion;
cmdbuf[2] = memSize;
cmdbuf[3] = 0x20;
cmdbuf[4] = 0x0;
cmdbuf[5] = 0x0;
cmdbuf[6] = handle;
if ((ret = svcSendSyncRequest(actHandle)) != 0) return ret;
return (Result) cmdbuf[1];
}
Result ACTU_GetAccountDataBlock(u32 slot, u32 size, u32 blockId, u32 *output)
{
Result ret = 0;
u32 *cmdbuf = getThreadCommandBuffer();
cmdbuf[0] = 0x000600C2;
cmdbuf[1] = slot;
cmdbuf[2] = size;
cmdbuf[3] = blockId;
cmdbuf[4] = (size << 4) | 12;
cmdbuf[5] = (u32) output;
if ((ret = svcSendSyncRequest(actHandle)) != 0) return ret;
return (Result) cmdbuf[1];
}
void remove_exten(u16 *filename) void remove_exten(u16 *filename)
{ {
for (int i = 0; i < strulen(filename, 0x8A); ++i) for (int i = 0; i < strulen(filename, 0x8A); ++i)
@@ -169,7 +215,7 @@ int install_badge_dir(FS_DirectoryEntry set_dir, int *badge_count, int set_id)
u16 path[512] = {0}; u16 path[512] = {0};
u16 set_icon[17] = {0}; u16 set_icon[17] = {0};
utf8_to_utf16(set_icon, (u8 *) "_seticon.png", 16); utf8_to_utf16(set_icon, (u8 *) "_seticon.png", 16);
struacat(path, main_paths[REMOTE_MODE_BADGES]); struacat(path, "/Badges/");
strucat(path, set_dir.name); strucat(path, set_dir.name);
res = FSUSER_OpenDirectory(&folder, ArchiveSD, fsMakePath(PATH_UTF16, path)); res = FSUSER_OpenDirectory(&folder, ArchiveSD, fsMakePath(PATH_UTF16, path));
if (R_FAILED(res)) if (R_FAILED(res))
@@ -185,7 +231,7 @@ int install_badge_dir(FS_DirectoryEntry set_dir, int *badge_count, int set_id)
if (!strcmp(badge_files[i].shortExt, "PNG")) if (!strcmp(badge_files[i].shortExt, "PNG"))
{ {
memset(path, 0, 512 * sizeof(u16)); memset(path, 0, 512 * sizeof(u16));
struacat(path, main_paths[REMOTE_MODE_BADGES]); struacat(path, "/Badges/");
strucat(path, set_dir.name); strucat(path, set_dir.name);
struacat(path, "/"); struacat(path, "/");
strucat(path, badge_files[i].name); strucat(path, badge_files[i].name);
@@ -199,7 +245,7 @@ int install_badge_dir(FS_DirectoryEntry set_dir, int *badge_count, int set_id)
} else if (!strcmp(badge_files[i].shortExt, "ZIP")) } else if (!strcmp(badge_files[i].shortExt, "ZIP"))
{ {
memset(path, 0, 512 * sizeof(u16)); memset(path, 0, 512 * sizeof(u16));
struacat(path, main_paths[REMOTE_MODE_BADGES]); struacat(path, "/Badges/");
strucat(path, set_dir.name); strucat(path, set_dir.name);
struacat(path, "/"); struacat(path, "/");
strucat(path, badge_files[i].name); strucat(path, badge_files[i].name);
@@ -289,14 +335,7 @@ void free_list(SetNode *head)
SetNode * extract_sets(char *badgeMngBuffer, Handle backupDataHandle) SetNode * extract_sets(char *badgeMngBuffer, Handle backupDataHandle)
{ {
u32 setCount = *((u32 *) (badgeMngBuffer + 0x4)); u32 setCount = *((u32 *) (badgeMngBuffer + 0x4));
if (setCount == 0) return NULL;
if (!setCount) // GYTB? make unknown set
{
u16 set_path[256] = {0};
struacat(set_path, "/3ds/" APP_TITLE "/BadgeBackups/Unknown Set");
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, set_path), FS_ATTRIBUTE_DIRECTORY);
return NULL;
}
SetNode *head = calloc(1, sizeof(SetNode)); SetNode *head = calloc(1, sizeof(SetNode));
SetNode *cursor = head; SetNode *cursor = head;
@@ -402,7 +441,7 @@ Result extract_badges(void)
{ {
u32 set_index = get_set_index(head, badgeSetId); u32 set_index = get_set_index(head, badgeSetId);
if (set_index == 0xFFFFFFFF) { if (set_index == 0xFFFFFFFF) {
sprintf(dir, "/3ds/" APP_TITLE "/BadgeBackups/Unknown Set"); sprintf(dir, "/3ds" APP_TITLE "/BadgeBackups/Unknown Set");
} else } else
{ {
u16 utf16SetName[0x46] = {0}; u16 utf16SetName[0x46] = {0};
@@ -415,9 +454,6 @@ Result extract_badges(void)
DEBUG("UTF-8 Set Name: %s; ID: %lx\n", utf8SetName, badgeSetId); DEBUG("UTF-8 Set Name: %s; ID: %lx\n", utf8SetName, badgeSetId);
sprintf(dir, "/3ds/" APP_TITLE "/BadgeBackups/%s", utf8SetName); sprintf(dir, "/3ds/" APP_TITLE "/BadgeBackups/%s", utf8SetName);
} }
} else
{
sprintf(dir, "/3ds/" APP_TITLE "/BadgeBackups/Unknown Set");
} }
if (shortcut == 0xFFFFFFFF) if (shortcut == 0xFFFFFFFF)
@@ -529,27 +565,27 @@ Result install_badges(void)
if (handle) FSFILE_Close(handle); if (handle) FSFILE_Close(handle);
DEBUG("Initializing ACT\n"); DEBUG("Initializing ACT\n");
res = actInit(true); res = actInit();
if (R_FAILED(res)) if (R_FAILED(res))
{ {
DEBUG("actInit() failed!\n"); DEBUG("actInit() failed!\n");
return res; return res;
} }
DEBUG("Initializing ACT\n"); DEBUG("Initializing ACTU\n");
res = ACT_Initialize(0xB0502C8, 0, 0); res = ACTU_Initialize(0xB0502C8, 0, 0);
if (R_FAILED(res)) if (R_FAILED(res))
{ {
DEBUG("ACT_Initialize failed! %08lx\n", res); DEBUG("ACTU_Initialize failed! %08lx\n", res);
return res; return res;
} }
DEBUG("Getting NNID\n"); DEBUG("Getting NNID\n");
u32 nnidNum = 0xFFFFFFFF; u32 nnidNum = 0xFFFFFFFF;
res = ACT_GetAccountInfo(&nnidNum, sizeof(nnidNum), ACT_DEFAULT_ACCOUNT, INFO_TYPE_PRINCIPAL_ID); res = ACTU_GetAccountDataBlock(0xFE, 4, 12, &nnidNum);
if (R_FAILED(res)) if (R_FAILED(res))
{ {
DEBUG("ACT_GetAccountInfo failed! %08lx\n", res); DEBUG("ACTU_GetAccountDataBlock failed! %08lx\n", res);
return res; return res;
} }
DEBUG("NNID found: 0x%08lx\n", nnidNum); DEBUG("NNID found: 0x%08lx\n", nnidNum);
@@ -563,7 +599,7 @@ Result install_badges(void)
DEBUG("Opening badge directory\n"); DEBUG("Opening badge directory\n");
FS_DirectoryEntry *badge_files = calloc(1024, sizeof(FS_DirectoryEntry)); FS_DirectoryEntry *badge_files = calloc(1024, sizeof(FS_DirectoryEntry));
res = FSUSER_OpenDirectory(&folder, ArchiveSD, fsMakePath(PATH_ASCII, main_paths[REMOTE_MODE_BADGES])); res = FSUSER_OpenDirectory(&folder, ArchiveSD, fsMakePath(PATH_ASCII, "/Badges/"));
if (R_FAILED(res)) if (R_FAILED(res))
{ {
DEBUG("Failed to open folder: %lx\n", res); DEBUG("Failed to open folder: %lx\n", res);
@@ -642,7 +678,7 @@ Result install_badges(void)
default_idx = badge_count; default_idx = badge_count;
} }
u16 path[0x512] = {0}; u16 path[0x512] = {0};
struacat(path, main_paths[REMOTE_MODE_BADGES]); struacat(path, "/Badges/");
strucat(path, badge_files[i].name); strucat(path, badge_files[i].name);
default_set_count += install_badge_png(fsMakePath(PATH_UTF16, path), badge_files[i], &badge_count, default_set); default_set_count += install_badge_png(fsMakePath(PATH_UTF16, path), badge_files[i], &badge_count, default_set);
} else if (!strcmp(badge_files[i].shortExt, "ZIP")) } else if (!strcmp(badge_files[i].shortExt, "ZIP"))
@@ -653,7 +689,7 @@ Result install_badges(void)
default_set = set_count; default_set = set_count;
} }
u16 path[0x512] = {0}; u16 path[0x512] = {0};
struacat(path, main_paths[REMOTE_MODE_BADGES]); struacat(path, "/Badges/");
strucat(path, badge_files[i].name); strucat(path, badge_files[i].name);
default_set_count += install_badge_zip(path, &badge_count, default_set); default_set_count += install_badge_zip(path, &badge_count, default_set);

2
source/camera.c
View File

@@ -201,7 +201,7 @@ static void update_ui(void * arg)
C2D_DrawImageAt((C2D_Image){ &tex, &subt3x }, 0.0f, 0.0f, 0.4f, NULL, 1.0f, 1.0f); C2D_DrawImageAt((C2D_Image){ &tex, &subt3x }, 0.0f, 0.0f, 0.4f, NULL, 1.0f, 1.0f);
set_screen(bottom); set_screen(bottom);
draw_text_center(GFX_BOTTOM, 4, 0.5, 0.5, 0.5, colors[COLOR_WHITE_ACCENT], language.camera.quit); draw_text_center(GFX_BOTTOM, 4, 0.5, 0.5, 0.5, colors[COLOR_WHITE], language.camera.quit);
end_frame(); end_frame();
} }

10
source/colors.c
View File

@@ -32,11 +32,9 @@ void init_colors(void)
{ {
colors[COLOR_BACKGROUND] = config.background_color; colors[COLOR_BACKGROUND] = config.background_color;
colors[COLOR_ACCENT] = config.accent_color; colors[COLOR_ACCENT] = config.accent_color;
colors[COLOR_WHITE_BACKGROUND] = config.white_color_background; colors[COLOR_WHITE] = C2D_Color32(255, 255, 255, 255);
colors[COLOR_WHITE_ACCENT] = config.white_color_accent; colors[COLOR_CURSOR] = C2D_Color32(200, 200, 200, 255);
colors[COLOR_CURSOR] = config.cursor_color; colors[COLOR_BLACK] = C2D_Color32(0, 0, 0, 255);
colors[COLOR_BLACK] = config.black_color; colors[COLOR_RED] = config.red_color;
colors[COLOR_RED_BACKGROUND] = config.red_color_background;
colors[COLOR_RED_ACCENT] = config.red_color_accent;
colors[COLOR_YELLOW] = config.yellow_color; colors[COLOR_YELLOW] = config.yellow_color;
} }

138
source/config.c
View File

@@ -30,8 +30,6 @@ Config_s config;
void load_config(void) void load_config(void)
{ {
Handle test_handle;
Result res;
memset(&config, 0, sizeof(Config_s)); memset(&config, 0, sizeof(Config_s));
char *json_buf = NULL; char *json_buf = NULL;
u32 json_len = file_to_buf(fsMakePath(PATH_ASCII, "/3ds/" APP_TITLE "/config.json"), ArchiveSD, &json_buf); u32 json_len = file_to_buf(fsMakePath(PATH_ASCII, "/3ds/" APP_TITLE "/config.json"), ArchiveSD, &json_buf);
@@ -71,7 +69,7 @@ void load_config(void)
config.background_color = C2D_Color32(r, g, b, a); config.background_color = C2D_Color32(r, g, b, a);
} }
} }
else if (json_is_array(value) && !strcmp(key, "White Color Background") && json_array_size(value) == 4) else if (json_is_array(value) && !strcmp(key, "Red Color") && json_array_size(value) == 4)
{ {
if (json_is_integer(json_array_get(value, 0)) && json_is_integer(json_array_get(value, 1)) if (json_is_integer(json_array_get(value, 0)) && json_is_integer(json_array_get(value, 1))
&& json_is_integer(json_array_get(value, 2)) && json_is_integer(json_array_get(value, 3))) && json_is_integer(json_array_get(value, 2)) && json_is_integer(json_array_get(value, 3)))
@@ -81,72 +79,7 @@ void load_config(void)
u8 b = min(255, json_integer_value(json_array_get(value, 2))); u8 b = min(255, json_integer_value(json_array_get(value, 2)));
u8 a = min(255, json_integer_value(json_array_get(value, 3))); u8 a = min(255, json_integer_value(json_array_get(value, 3)));
config.white_color_background = C2D_Color32(r, g, b, a); config.red_color = C2D_Color32(r, g, b, a);
}
}
else if (json_is_array(value) && !strcmp(key, "White Color Accent") && json_array_size(value) == 4)
{
if (json_is_integer(json_array_get(value, 0)) && json_is_integer(json_array_get(value, 1))
&& json_is_integer(json_array_get(value, 2)) && json_is_integer(json_array_get(value, 3)))
{
u8 r = min(255, json_integer_value(json_array_get(value, 0)));
u8 g = min(255, json_integer_value(json_array_get(value, 1)));
u8 b = min(255, json_integer_value(json_array_get(value, 2)));
u8 a = min(255, json_integer_value(json_array_get(value, 3)));
config.white_color_accent = C2D_Color32(r, g, b, a);
}
}
else if (json_is_array(value) && !strcmp(key, "Cursor Color") && json_array_size(value) == 4)
{
if (json_is_integer(json_array_get(value, 0)) && json_is_integer(json_array_get(value, 1))
&& json_is_integer(json_array_get(value, 2)) && json_is_integer(json_array_get(value, 3)))
{
u8 r = min(255, json_integer_value(json_array_get(value, 0)));
u8 g = min(255, json_integer_value(json_array_get(value, 1)));
u8 b = min(255, json_integer_value(json_array_get(value, 2)));
u8 a = min(255, json_integer_value(json_array_get(value, 3)));
config.cursor_color = C2D_Color32(r, g, b, a);
}
}
else if (json_is_array(value) && !strcmp(key, "Black Color") && json_array_size(value) == 4)
{
if (json_is_integer(json_array_get(value, 0)) && json_is_integer(json_array_get(value, 1))
&& json_is_integer(json_array_get(value, 2)) && json_is_integer(json_array_get(value, 3)))
{
u8 r = min(255, json_integer_value(json_array_get(value, 0)));
u8 g = min(255, json_integer_value(json_array_get(value, 1)));
u8 b = min(255, json_integer_value(json_array_get(value, 2)));
u8 a = min(255, json_integer_value(json_array_get(value, 3)));
config.black_color = C2D_Color32(r, g, b, a);
}
}
else if (json_is_array(value) && !strcmp(key, "Red Color Background") && json_array_size(value) == 4)
{
if (json_is_integer(json_array_get(value, 0)) && json_is_integer(json_array_get(value, 1))
&& json_is_integer(json_array_get(value, 2)) && json_is_integer(json_array_get(value, 3)))
{
u8 r = min(255, json_integer_value(json_array_get(value, 0)));
u8 g = min(255, json_integer_value(json_array_get(value, 1)));
u8 b = min(255, json_integer_value(json_array_get(value, 2)));
u8 a = min(255, json_integer_value(json_array_get(value, 3)));
config.red_color_background = C2D_Color32(r, g, b, a);
}
}
else if (json_is_array(value) && !strcmp(key, "Red Color Accent") && json_array_size(value) == 4)
{
if (json_is_integer(json_array_get(value, 0)) && json_is_integer(json_array_get(value, 1))
&& json_is_integer(json_array_get(value, 2)) && json_is_integer(json_array_get(value, 3)))
{
u8 r = min(255, json_integer_value(json_array_get(value, 0)));
u8 g = min(255, json_integer_value(json_array_get(value, 1)));
u8 b = min(255, json_integer_value(json_array_get(value, 2)));
u8 a = min(255, json_integer_value(json_array_get(value, 3)));
config.red_color_accent = C2D_Color32(r, g, b, a);
} }
} }
else if (json_is_array(value) && !strcmp(key, "Yellow Color") && json_array_size(value) == 4) else if (json_is_array(value) && !strcmp(key, "Yellow Color") && json_array_size(value) == 4)
@@ -162,54 +95,6 @@ void load_config(void)
config.yellow_color = C2D_Color32(r, g, b, a); config.yellow_color = C2D_Color32(r, g, b, a);
} }
} }
else if (json_is_string(value) && !strcmp(key, "Themes Path"))
{
bool need_slash = json_string_value(value)[strlen(json_string_value(value)) - 1] != '/';
char *theme_path = calloc(1, strlen(json_string_value(value)) + 1 + (need_slash ? 1 : 0));
memcpy(theme_path, json_string_value(value), strlen(json_string_value(value)));
if (need_slash) theme_path[strlen(json_string_value(value))] = '/';
if (R_SUCCEEDED(res = FSUSER_OpenDirectory(&test_handle, ArchiveSD, fsMakePath(PATH_ASCII, theme_path))))
{
main_paths[REMOTE_MODE_THEMES] = theme_path;
FSDIR_Close(test_handle);
} else
{
DEBUG("Failed test - reverting to default. Err 0x%08lx\n", res);
free(theme_path);
}
}
else if (json_is_string(value) && !strcmp(key, "Splashes Path"))
{
bool need_slash = json_string_value(value)[strlen(json_string_value(value)) - 1] != '/';
char *splash_path = calloc(1, strlen(json_string_value(value)) + 1 + (need_slash ? 1 : 0));
memcpy(splash_path, json_string_value(value), strlen(json_string_value(value)));
if (need_slash) splash_path[strlen(json_string_value(value))] = '/';
if (R_SUCCEEDED(res = FSUSER_OpenDirectory(&test_handle, ArchiveSD, fsMakePath(PATH_ASCII, splash_path))))
{
main_paths[REMOTE_MODE_SPLASHES] = splash_path;
FSDIR_Close(test_handle);
} else
{
DEBUG("Failed test - reverting to default. Err 0x%08lx\n", res);
free(splash_path);
}
}
else if (json_is_string(value) && !strcmp(key, "Badges Path"))
{
bool need_slash = json_string_value(value)[strlen(json_string_value(value)) - 1] != '/';
char *badge_path = calloc(1, strlen(json_string_value(value)) + 1 + (need_slash ? 1 : 0));
memcpy(badge_path, json_string_value(value), strlen(json_string_value(value)));
if (need_slash) badge_path[strlen(json_string_value(value))] = '/';
if (R_SUCCEEDED(res = FSUSER_OpenDirectory(&test_handle, ArchiveSD, fsMakePath(PATH_ASCII, badge_path))))
{
main_paths[REMOTE_MODE_BADGES] = badge_path;
FSDIR_Close(test_handle);
} else
{
DEBUG("Failed test - reverting to default. Err 0x%08lx\n", res);
free(badge_path);
}
}
} }
} else } else
{ {
@@ -222,24 +107,9 @@ void load_config(void)
if (config.background_color == 0) if (config.background_color == 0)
config.background_color = C2D_Color32(35, 28, 32, 255); //silver-y black config.background_color = C2D_Color32(35, 28, 32, 255); //silver-y black
if (config.white_color_background == 0) if (config.red_color == 0)
config.white_color_background = C2D_Color32(255, 255, 255, 255); config.red_color = C2D_Color32(229, 66, 66, 255);
if (config.white_color_accent == 0)
config.white_color_accent = C2D_Color32(255, 255, 255, 255);
if (config.cursor_color == 0)
config.cursor_color = C2D_Color32(200, 200, 200, 255);
if (config.black_color == 0)
config.black_color = C2D_Color32(0, 0, 0, 255);
if (config.red_color_background == 0)
config.red_color_background = C2D_Color32(229, 66, 66, 255);
if (config.red_color_accent == 0)
config.red_color_accent = C2D_Color32(229, 66, 66, 255);
if (config.yellow_color == 0) if (config.yellow_color == 0)
config.yellow_color = C2D_Color32(239, 220, 11, 255); config.yellow_color = C2D_Color32(239, 220, 11, 255);

136
source/draw.c
View File

@@ -173,11 +173,6 @@ void end_frame(void)
C3D_FrameEnd(0); C3D_FrameEnd(0);
} }
static void draw_image_tint(int image_id, float x, float y, C2D_ImageTint tint)
{
C2D_DrawImageAt(C2D_SpriteSheetGetImage(spritesheet, image_id), x, y, 0.6f, &tint, 1.0f, 1.0f);
}
static void draw_image(int image_id, float x, float y) static void draw_image(int image_id, float x, float y)
{ {
C2D_DrawImageAt(C2D_SpriteSheetGetImage(spritesheet, image_id), x, y, 0.6f, NULL, 1.0f, 1.0f); C2D_DrawImageAt(C2D_SpriteSheetGetImage(spritesheet, image_id), x, y, 0.6f, NULL, 1.0f, 1.0f);
@@ -276,10 +271,10 @@ void draw_base_interface(void)
C2D_TextParse(&minutes, dynamicBuf, string_minutes); C2D_TextParse(&minutes, dynamicBuf, string_minutes);
C2D_TextOptimize(&minutes); C2D_TextOptimize(&minutes);
C2D_DrawText(&hours, C2D_WithColor, 7, 2, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_ACCENT]); C2D_DrawText(&hours, C2D_WithColor, 7, 2, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
if(tm.tm_sec % 2 == 1) if(tm.tm_sec % 2 == 1)
C2D_DrawText(&separator, C2D_WithColor, 28, 1, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_ACCENT]); C2D_DrawText(&separator, C2D_WithColor, 28, 1, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
C2D_DrawText(&minutes, C2D_WithColor, 34, 2, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_ACCENT]); C2D_DrawText(&minutes, C2D_WithColor, 34, 2, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
#ifndef CITRA_MODE #ifndef CITRA_MODE
u8 battery_charging = 0; u8 battery_charging = 0;
@@ -296,7 +291,7 @@ void draw_base_interface(void)
C2D_DrawRectSolid(0, 0, 0.5f, 320, 24, colors[COLOR_ACCENT]); C2D_DrawRectSolid(0, 0, 0.5f, 320, 24, colors[COLOR_ACCENT]);
C2D_DrawRectSolid(0, 216, 0.5f, 320, 24, colors[COLOR_ACCENT]); C2D_DrawRectSolid(0, 216, 0.5f, 320, 24, colors[COLOR_ACCENT]);
C2D_DrawText(&text[TEXT_VERSION], C2D_WithColor, 7, 219, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_ACCENT]); C2D_DrawText(&text[TEXT_VERSION], C2D_WithColor, 7, 219, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
set_screen(top); set_screen(top);
} }
@@ -304,13 +299,13 @@ void draw_base_interface(void)
void throw_error(const char * error, ErrorLevel level) void throw_error(const char * error, ErrorLevel level)
{ {
Text bottom_text = TEXT_AMOUNT; Text bottom_text = TEXT_AMOUNT;
Color text_color = COLOR_WHITE_BACKGROUND; Color text_color = COLOR_WHITE;
switch(level) switch(level)
{ {
case ERROR_LEVEL_ERROR: case ERROR_LEVEL_ERROR:
bottom_text = TEXT_ERROR_QUIT; bottom_text = TEXT_ERROR_QUIT;
text_color = COLOR_RED_BACKGROUND; text_color = COLOR_RED;
break; break;
case ERROR_LEVEL_WARNING: case ERROR_LEVEL_WARNING:
bottom_text = TEXT_ERROR_CONTINUE; bottom_text = TEXT_ERROR_CONTINUE;
@@ -327,7 +322,7 @@ void throw_error(const char * error, ErrorLevel level)
draw_base_interface(); draw_base_interface();
draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[text_color], error); draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[text_color], error);
draw_c2d_text_center(GFX_TOP, 170, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_BACKGROUND], &text[bottom_text]); draw_c2d_text_center(GFX_TOP, 170, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[bottom_text]);
end_frame(); end_frame();
if(kDown & KEY_A) break; if(kDown & KEY_A) break;
@@ -342,7 +337,7 @@ bool draw_confirm(const char * conf_msg, Entry_List_s * list, DrawMode draw_mode
draw_interface(list, instructions, draw_mode); draw_interface(list, instructions, draw_mode);
set_screen(top); set_screen(top);
draw_text_center(GFX_TOP, BUTTONS_Y_LINE_1, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], conf_msg); draw_text_center(GFX_TOP, BUTTONS_Y_LINE_1, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], conf_msg);
draw_c2d_text_center(GFX_TOP, BUTTONS_Y_LINE_3, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_BACKGROUND], &text[TEXT_CONFIRM_YES_NO]); draw_c2d_text_center(GFX_TOP, BUTTONS_Y_LINE_3, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[TEXT_CONFIRM_YES_NO]);
end_frame(); end_frame();
hidScanInput(); hidScanInput();
@@ -360,7 +355,7 @@ bool draw_confirm_no_interface(const char *conf_msg)
{ {
draw_base_interface(); draw_base_interface();
draw_text_center(GFX_TOP, 100, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], conf_msg); draw_text_center(GFX_TOP, 100, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], conf_msg);
draw_c2d_text_center(GFX_TOP, 170, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_BACKGROUND], &text[TEXT_CONFIRM_YES_NO]); draw_c2d_text_center(GFX_TOP, 170, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[TEXT_CONFIRM_YES_NO]);
end_frame(); end_frame();
hidScanInput(); hidScanInput();
@@ -386,7 +381,7 @@ static void draw_install_handler(InstallType type)
if(type != INSTALL_NONE) if(type != INSTALL_NONE)
{ {
C2D_Text * install_text = &text[type]; C2D_Text * install_text = &text[type];
draw_c2d_text_center(GFX_TOP, 120.0f, 0.5f, 0.8f, 0.8f, colors[COLOR_WHITE_BACKGROUND], install_text); draw_c2d_text_center(GFX_TOP, 120.0f, 0.5f, 0.8f, 0.8f, colors[COLOR_WHITE], install_text);
} }
} }
@@ -413,7 +408,7 @@ void draw_loading_bar(u32 current, u32 max, InstallType type)
static void draw_instructions(Instructions_s instructions) static void draw_instructions(Instructions_s instructions)
{ {
if(instructions.info_line != NULL) if(instructions.info_line != NULL)
draw_text_center(GFX_TOP, BUTTONS_Y_INFO, 0.5, 0.55, 0.55, colors[COLOR_WHITE_BACKGROUND], instructions.info_line); draw_text_center(GFX_TOP, BUTTONS_Y_INFO, 0.5, 0.55, 0.55, colors[COLOR_WHITE], instructions.info_line);
const int y_lines[BUTTONS_INFO_LINES-1] = { const int y_lines[BUTTONS_INFO_LINES-1] = {
BUTTONS_Y_LINE_1, BUTTONS_Y_LINE_1,
@@ -424,20 +419,20 @@ static void draw_instructions(Instructions_s instructions)
for(int i = 0; i < BUTTONS_INFO_LINES-1; i++) for(int i = 0; i < BUTTONS_INFO_LINES-1; i++)
{ {
if(instructions.instructions[i][0] != NULL) if(instructions.instructions[i][0] != NULL)
draw_text_wrap_scaled(BUTTONS_X_LEFT, y_lines[i], 0.5, colors[COLOR_WHITE_BACKGROUND], instructions.instructions[i][0], 0.6, 0, BUTTONS_X_RIGHT-2); draw_text_wrap_scaled(BUTTONS_X_LEFT, y_lines[i], 0.5, colors[COLOR_WHITE], instructions.instructions[i][0], 0.6, 0, BUTTONS_X_RIGHT-2);
if(instructions.instructions[i][1] != NULL) if(instructions.instructions[i][1] != NULL)
draw_text_wrap_scaled(BUTTONS_X_RIGHT, y_lines[i], 0.5, colors[COLOR_WHITE_BACKGROUND], instructions.instructions[i][1], 0.6, 0, BUTTONS_X_MAX-2); draw_text_wrap_scaled(BUTTONS_X_RIGHT, y_lines[i], 0.5, colors[COLOR_WHITE], instructions.instructions[i][1], 0.6, 0, BUTTONS_X_MAX-2);
} }
C2D_ImageTint white_tint; C2D_ImageTint white_tint;
C2D_PlainImageTint(&white_tint, colors[COLOR_WHITE_BACKGROUND], 1.0f); C2D_PlainImageTint(&white_tint, colors[COLOR_WHITE], 1.0f);
const char * start_line = instructions.instructions[BUTTONS_INFO_LINES-1][0]; const char * start_line = instructions.instructions[BUTTONS_INFO_LINES-1][0];
if(start_line != NULL) if(start_line != NULL)
{ {
C2D_SpriteSetPos(&sprite_start, BUTTONS_X_LEFT-10, BUTTONS_Y_LINE_4 + 3); C2D_SpriteSetPos(&sprite_start, BUTTONS_X_LEFT-10, BUTTONS_Y_LINE_4 + 3);
C2D_DrawSpriteTinted(&sprite_start, &white_tint); C2D_DrawSpriteTinted(&sprite_start, &white_tint);
draw_text_wrap_scaled(BUTTONS_X_LEFT+26, BUTTONS_Y_LINE_4, 0.5, colors[COLOR_WHITE_BACKGROUND], start_line, 0.6, 0, BUTTONS_X_RIGHT-2); draw_text_wrap_scaled(BUTTONS_X_LEFT+26, BUTTONS_Y_LINE_4, 0.5, colors[COLOR_WHITE], start_line, 0.6, 0, BUTTONS_X_RIGHT-2);
} }
const char * select_line = instructions.instructions[BUTTONS_INFO_LINES-1][1]; const char * select_line = instructions.instructions[BUTTONS_INFO_LINES-1][1];
@@ -445,7 +440,7 @@ static void draw_instructions(Instructions_s instructions)
{ {
C2D_SpriteSetPos(&sprite_select, BUTTONS_X_RIGHT-10, BUTTONS_Y_LINE_4 + 3); C2D_SpriteSetPos(&sprite_select, BUTTONS_X_RIGHT-10, BUTTONS_Y_LINE_4 + 3);
C2D_DrawSpriteTinted(&sprite_select, &white_tint); C2D_DrawSpriteTinted(&sprite_select, &white_tint);
draw_text_wrap_scaled(BUTTONS_X_RIGHT+26, BUTTONS_Y_LINE_4, 0.5, colors[COLOR_WHITE_BACKGROUND], select_line, 0.6, 0, BUTTONS_X_MAX-2); draw_text_wrap_scaled(BUTTONS_X_RIGHT+26, BUTTONS_Y_LINE_4, 0.5, colors[COLOR_WHITE], select_line, 0.6, 0, BUTTONS_X_MAX-2);
} }
} }
@@ -533,18 +528,18 @@ static void draw_entry_info(Entry_s * entry)
{ {
char author[0x41] = {0}; char author[0x41] = {0};
utf16_to_utf8((u8 *)author, entry->author, 0x40); utf16_to_utf8((u8 *)author, entry->author, 0x40);
draw_c2d_text(20, 35, 0.5, 0.5, 0.5, colors[COLOR_WHITE_BACKGROUND], &text[TEXT_BY_AUTHOR]); draw_c2d_text(20, 35, 0.5, 0.5, 0.5, colors[COLOR_WHITE], &text[TEXT_BY_AUTHOR]);
float width = 0; float width = 0;
C2D_TextGetDimensions(&text[TEXT_BY_AUTHOR], 0.5, 0.5, &width, NULL); C2D_TextGetDimensions(&text[TEXT_BY_AUTHOR], 0.5, 0.5, &width, NULL);
draw_text(20+width, 35, 0.5, 0.5, 0.5, colors[COLOR_WHITE_BACKGROUND], author); draw_text(20+width, 35, 0.5, 0.5, 0.5, colors[COLOR_WHITE], author);
char title[0x41] = {0}; char title[0x41] = {0};
utf16_to_utf8((u8 *)title, entry->name, 0x40); utf16_to_utf8((u8 *)title, entry->name, 0x40);
draw_text(20, 50, 0.5, 0.7, 0.7, colors[COLOR_WHITE_BACKGROUND], title); draw_text(20, 50, 0.5, 0.7, 0.7, colors[COLOR_WHITE], title);
char description[0x81] = {0}; char description[0x81] = {0};
utf16_to_utf8((u8 *)description, entry->desc, 0x80); utf16_to_utf8((u8 *)description, entry->desc, 0x80);
draw_text_wrap(20, 70, 0.5, 0.5, 0.5, colors[COLOR_WHITE_BACKGROUND], description, 363); draw_text_wrap(20, 70, 0.5, 0.5, 0.5, colors[COLOR_WHITE], description, 363);
} }
void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int extra_mode) void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int extra_mode)
@@ -558,7 +553,7 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
&text[TEXT_THEMEPLAZA_BADGE_MODE], &text[TEXT_THEMEPLAZA_BADGE_MODE],
}; };
draw_c2d_text_center(GFX_TOP, 4, 0.5f, 0.5f, 0.5f, colors[COLOR_WHITE_ACCENT], mode_string[current_mode]); draw_c2d_text_center(GFX_TOP, 4, 0.5f, 0.5f, 0.5f, colors[COLOR_WHITE], mode_string[current_mode]);
draw_instructions(instructions); draw_instructions(instructions);
@@ -568,22 +563,16 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
set_screen(bottom); set_screen(bottom);
draw_c2d_text(7, 3, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_ACCENT], &text[TEXT_SEARCH]); draw_c2d_text(7, 3, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[TEXT_SEARCH]);
C2D_ImageTint accent_tint; draw_image(sprites_back_idx, 320-96, 0);
C2D_PlainImageTint(&accent_tint, colors[COLOR_WHITE_ACCENT], 1.0f); draw_image(sprites_exit_idx, 320-72, 0);
draw_image(sprites_preview_idx, 320-48, 0);
draw_image_tint(sprites_back_idx, 320-96, 0, accent_tint); draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], remote_mode_switch_char[current_mode]);
draw_image_tint(sprites_exit_idx, 320-72, 0, accent_tint);
draw_image_tint(sprites_preview_idx, 320-48, 0, accent_tint);
draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE_ACCENT], remote_mode_switch_char[current_mode]); draw_image(sprites_arrow_left_idx, 3, 114);
draw_image(sprites_arrow_right_idx, 308, 114);
C2D_ImageTint background_tint;
C2D_PlainImageTint(&background_tint, colors[COLOR_WHITE_BACKGROUND], 1.0f);
draw_image_tint(sprites_arrow_left_idx, 3, 114, background_tint);
draw_image_tint(sprites_arrow_right_idx, 308, 114, background_tint);
for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++) for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++)
{ {
@@ -636,15 +625,15 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
float width = 0; float width = 0;
get_text_dimensions(entries_count_str, 0.6, 0.6, &width, NULL); get_text_dimensions(entries_count_str, 0.6, 0.6, &width, NULL);
x -= width; x -= width;
draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE_ACCENT], entries_count_str); draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], entries_count_str);
char selected_entry_str[0x20] = {0}; char selected_entry_str[0x20] = {0};
sprintf(selected_entry_str, "%" JSON_INTEGER_FORMAT, list->tp_current_page); sprintf(selected_entry_str, "%" JSON_INTEGER_FORMAT, list->tp_current_page);
get_text_dimensions(selected_entry_str, 0.6, 0.6, &width, NULL); get_text_dimensions(selected_entry_str, 0.6, 0.6, &width, NULL);
x -= width; x -= width;
draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE_ACCENT], selected_entry_str); draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], selected_entry_str);
draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE_ACCENT], &text[TEXT_PAGE]); draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_PAGE]);
} }
void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode draw_mode) void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode draw_mode)
@@ -657,10 +646,7 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
&text[TEXT_SPLASH_MODE], &text[TEXT_SPLASH_MODE],
}; };
C2D_ImageTint accent_tint; draw_c2d_text_center(GFX_TOP, 4, 0.5f, 0.5f, 0.5f, colors[COLOR_WHITE], mode_string[current_mode]);
C2D_PlainImageTint(&accent_tint, colors[COLOR_WHITE_ACCENT], 1.0f);
draw_c2d_text_center(GFX_TOP, 4, 0.5f, 0.5f, 0.5f, colors[COLOR_WHITE_ACCENT], mode_string[current_mode]);
if(list->entries == NULL || list->entries_count == 0) if(list->entries == NULL || list->entries_count == 0)
{ {
@@ -689,11 +675,11 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
set_screen(bottom); set_screen(bottom);
draw_image_tint(sprites_qr_idx, 320-96, 0, accent_tint); draw_image(sprites_qr_idx, 320-96, 0);
draw_image_tint(sprites_browse_idx, 320-72, 0, accent_tint); draw_image(sprites_browse_idx, 320-72, 0);
draw_image_tint(sprites_exit_idx, 320-48, 0, accent_tint); draw_image(sprites_exit_idx, 320-48, 0);
draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE_ACCENT], mode_switch_char[!current_mode]); draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
return; return;
} }
@@ -710,48 +696,48 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
{ {
char * shuffle_count_string = NULL; char * shuffle_count_string = NULL;
asprintf(&shuffle_count_string, language.draw.shuffle, list->shuffle_count); asprintf(&shuffle_count_string, language.draw.shuffle, list->shuffle_count);
draw_text(30, 3, 0.6, 0.6, 0.6f, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? colors[COLOR_WHITE_ACCENT] : colors[COLOR_RED_ACCENT], shuffle_count_string); draw_text(30, 3, 0.6, 0.6, 0.6f, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? colors[COLOR_WHITE] : colors[COLOR_RED], shuffle_count_string);
free(shuffle_count_string); free(shuffle_count_string);
} }
if (draw_mode == DRAW_MODE_LIST) if (draw_mode == DRAW_MODE_LIST)
{ {
draw_image_tint(sprites_install_idx, 320-120, 0, accent_tint); draw_image(sprites_install_idx, 320-120, 0);
draw_image_tint(sprites_qr_idx, 320-96, 0, accent_tint); draw_image(sprites_qr_idx, 320-96, 0);
draw_image_tint(sprites_exit_idx, 320-72, 0, accent_tint); draw_image(sprites_exit_idx, 320-72, 0);
draw_image_tint(sprites_preview_idx, 320-48, 0, accent_tint); draw_image(sprites_preview_idx, 320-48, 0);
draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE_ACCENT], mode_switch_char[!current_mode]); draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
draw_image_tint(sprites_menu_idx, 2, 0, accent_tint); draw_image(sprites_menu_idx, 2, 0);
if (current_mode == MODE_THEMES) if (current_mode == MODE_THEMES)
{ {
draw_image_tint(sprites_shuffle_idx, 320-144, 0, accent_tint); draw_image(sprites_shuffle_idx, 320-144, 0);
} }
} }
else else
{ {
if (draw_mode == DRAW_MODE_INSTALL) if (draw_mode == DRAW_MODE_INSTALL)
{ {
draw_image_tint(sprites_install_idx, 320-24, 0, accent_tint); draw_image(sprites_install_idx, 320-24, 0);
draw_image_tint(sprites_shuffle_idx, 320-48, 0, accent_tint); draw_image(sprites_shuffle_idx, 320-48, 0);
draw_image_tint(sprites_shuffle_no_bgm_idx, 320-72, 0, accent_tint); draw_image(sprites_shuffle_no_bgm_idx, 320-72, 0);
draw_image_tint(sprites_bgm_only_idx, 320-96, 0, accent_tint); draw_image(sprites_bgm_only_idx, 320-96, 0);
draw_image_tint(sprites_back_idx, 2, 0, accent_tint); draw_image(sprites_back_idx, 2, 0);
} else if (draw_mode == DRAW_MODE_EXTRA) } else if (draw_mode == DRAW_MODE_EXTRA)
{ {
draw_image_tint(sprites_browse_idx, 320-24, 0, accent_tint); draw_image(sprites_browse_idx, 320-24, 0);
draw_image_tint(sprites_dump_idx, 320-48, 0, accent_tint); draw_image(sprites_dump_idx, 320-48, 0);
draw_image_tint(sprites_sort_idx, 320-72, 0, accent_tint); draw_image(sprites_sort_idx, 320-72, 0);
draw_image_tint(sprites_badge_idx, 320-96, 0, accent_tint); draw_image(sprites_badge_idx, 320-96, 0);
draw_image_tint(sprites_back_idx, 2, 0, accent_tint); draw_image(sprites_back_idx, 2, 0);
} }
} }
// Show arrows if there are themes out of bounds // Show arrows if there are themes out of bounds
//---------------------------------------------------------------- //----------------------------------------------------------------
if(list->scroll > 0) if(list->scroll > 0)
draw_image_tint(sprites_arrow_up_idx, 141, 220, accent_tint); draw_image(sprites_arrow_up_idx, 141, 220);
if(list->scroll + list->entries_loaded < list->entries_count) if(list->scroll + list->entries_loaded < list->entries_count)
draw_image_tint(sprites_arrow_down_idx, 157, 220, accent_tint); draw_image(sprites_arrow_down_idx, 157, 220);
for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++) for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++)
{ {
@@ -768,7 +754,7 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
vertical_offset *= list->entry_size; vertical_offset *= list->entry_size;
vertical_offset += 24; vertical_offset += 24;
u32 font_color = colors[COLOR_WHITE_BACKGROUND]; u32 font_color = colors[COLOR_WHITE];
if(i == selected_entry) if(i == selected_entry)
{ {
@@ -822,18 +808,18 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
float width = 0; float width = 0;
get_text_dimensions(entries_count_str, 0.6, 0.6, &width, NULL); get_text_dimensions(entries_count_str, 0.6, 0.6, &width, NULL);
x -= width; x -= width;
draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE_ACCENT], entries_count_str); draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], entries_count_str);
char selected_entry_str[0x20] = {0}; char selected_entry_str[0x20] = {0};
sprintf(selected_entry_str, "%i", selected_entry + 1); sprintf(selected_entry_str, "%i", selected_entry + 1);
get_text_dimensions(selected_entry_str, 0.6, 0.6, &width, NULL); get_text_dimensions(selected_entry_str, 0.6, 0.6, &width, NULL);
x -= width; x -= width;
draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE_ACCENT], selected_entry_str); draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], selected_entry_str);
if(list->entries_count < 10000) if(list->entries_count < 10000)
draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE_ACCENT], &text[TEXT_SELECTED]); draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_SELECTED]);
else else
draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE_ACCENT], &text[TEXT_SELECTED_SHORT]); draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_SELECTED_SHORT]);
if(draw_mode != DRAW_MODE_LIST) if(draw_mode != DRAW_MODE_LIST)
{ {
C2D_DrawRectSolid(0, 24, 1.0f, 320, 240-48, C2D_Color32(0, 0, 0, 128)); C2D_DrawRectSolid(0, 24, 1.0f, 320, 240-48, C2D_Color32(0, 0, 0, 128));

30
source/fs.c
View File

@@ -117,9 +117,10 @@ Result open_archives(void)
archive2 = 0x00; archive2 = 0x00;
} }
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, main_paths[REMOTE_MODE_THEMES]), FS_ATTRIBUTE_DIRECTORY); FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Themes"), FS_ATTRIBUTE_DIRECTORY);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, main_paths[REMOTE_MODE_SPLASHES]), FS_ATTRIBUTE_DIRECTORY); FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Splashes"), FS_ATTRIBUTE_DIRECTORY);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, main_paths[REMOTE_MODE_BADGES]), FS_ATTRIBUTE_DIRECTORY); FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Badges"), FS_ATTRIBUTE_DIRECTORY);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Badges/ThemePlaza Badges"), FS_ATTRIBUTE_DIRECTORY);
u32 homeMenuPath[3] = {MEDIATYPE_SD, archive2, 0}; u32 homeMenuPath[3] = {MEDIATYPE_SD, archive2, 0};
home.type = PATH_BINARY; home.type = PATH_BINARY;
@@ -188,12 +189,7 @@ Result open_badge_extdata()
} }
FSFILE_Close(test_handle); FSFILE_Close(test_handle);
char tp_path[0x106] = {0}; if(R_FAILED(res = FSUSER_OpenFile(&test_handle, ArchiveSD, fsMakePath(PATH_ASCII, "/Badges/ThemePlaza Badges/_seticon.png"), FS_OPEN_READ, 0)))
sprintf(tp_path, "%sThemePlaza Badges", main_paths[REMOTE_MODE_BADGES]);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, tp_path), FS_ATTRIBUTE_DIRECTORY);
strcat(tp_path, "/_seticon.png");
if(R_FAILED(res = FSUSER_OpenFile(&test_handle, ArchiveSD, fsMakePath(PATH_ASCII, tp_path), FS_OPEN_READ, 0)))
{ {
FILE *fp = fopen("romfs:/tp_set.png", "rb"); FILE *fp = fopen("romfs:/tp_set.png", "rb");
fseek(fp, 0L, SEEK_END); fseek(fp, 0L, SEEK_END);
@@ -202,8 +198,8 @@ Result open_badge_extdata()
fseek(fp, 0L, SEEK_SET); fseek(fp, 0L, SEEK_SET);
fread(icon_buf, 1, size, fp); fread(icon_buf, 1, size, fp);
fclose(fp); fclose(fp);
remake_file(fsMakePath(PATH_ASCII, tp_path), ArchiveSD, size); remake_file(fsMakePath(PATH_ASCII, "/Badges/ThemePlaza Badges/_seticon.png"), ArchiveSD, size);
buf_to_file(size, fsMakePath(PATH_ASCII, tp_path), ArchiveSD, icon_buf); buf_to_file(size, fsMakePath(PATH_ASCII, "/Badges/ThemePlaza Badges/_seticon.png"), ArchiveSD, icon_buf);
DEBUG("res: 0x%08lx\n", res); DEBUG("res: 0x%08lx\n", res);
free(icon_buf); free(icon_buf);
} }
@@ -275,9 +271,6 @@ s16 for_each_file_zip(u16 *zip_path, u32 (*zip_iter_callback)(char *filebuf, u64
if(r != ARCHIVE_OK) if(r != ARCHIVE_OK)
{ {
DEBUG("Invalid zip being opened\n"); DEBUG("Invalid zip being opened\n");
char path[0x128] = {0};
utf16_to_utf8((u8 *) path, zip_path, 0x128);
DEBUG("%s\n", path);
return -1; return -1;
} }
@@ -353,9 +346,6 @@ u32 zip_file_to_buf(const char * file_name, const u16 * zip_path, char ** buf)
if(r != ARCHIVE_OK) if(r != ARCHIVE_OK)
{ {
DEBUG("Invalid zip being opened\n"); DEBUG("Invalid zip being opened\n");
char path[0x128] = {0};
utf16_to_utf8((u8 *) path, zip_path, 0x128);
DEBUG("%s\n", path);
return 0; return 0;
} }
@@ -576,9 +566,9 @@ renamed:
char * curr_filename; char * curr_filename;
if (mode == REMOTE_MODE_BADGES) if (mode == REMOTE_MODE_BADGES)
{ {
sprintf(path_to_file, "%sThemePlaza Badges/%s", main_paths[REMOTE_MODE_BADGES], filename); DEBUG("Remote mode badges! Saving to /Badges/ThemePlaza Badges/\n");
DEBUG("Remote mode badges! Saving to %s/\n", path_to_file); sprintf(path_to_file, "%s%s", "/Badges/ThemePlaza Badges/", filename);
curr_filename = path_to_file + strlen(main_paths[REMOTE_MODE_BADGES]) + strlen("ThemePlaza Badges/"); curr_filename = path_to_file + strlen("/Badges/ThemePlaza Badges/");
} else } else
{ {
sprintf(path_to_file, "%s%s", main_paths[mode], filename); sprintf(path_to_file, "%s%s", main_paths[mode], filename);

9
source/main.c
View File

@@ -61,12 +61,10 @@ Result archive_result;
Result badge_archive_result; Result badge_archive_result;
u32 old_time_limit; u32 old_time_limit;
const char * main_paths[REMOTE_MODE_AMOUNT] = { const char * main_paths[MODE_AMOUNT] = {
"/Themes/", "/Themes/",
"/Splashes/", "/Splashes/",
"/Badges/"
}; };
const int entries_per_screen_v[MODE_AMOUNT] = { const int entries_per_screen_v[MODE_AMOUNT] = {
4, 4,
4, 4,
@@ -381,7 +379,8 @@ int main(void)
{ {
srand(time(NULL)); srand(time(NULL));
init_services(); init_services();
const CFG_Language lang = get_system_language(); CFG_Language lang;
CFGU_GetSystemLanguage(&lang);
language = init_strings(lang); language = init_strings(lang);
init_screens(); init_screens();
@@ -536,7 +535,7 @@ int main(void)
{ {
enable_qr: enable_qr:
draw_base_interface(); draw_base_interface();
draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE_BACKGROUND], language.main.loading_qr); draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], language.main.loading_qr);
end_frame(); end_frame();
if(R_SUCCEEDED(camInit())) if(R_SUCCEEDED(camInit()))
{ {

4
source/themes.c
View File

@@ -378,7 +378,7 @@ Result dump_current_theme(void)
} }
u16 path[0x107] = { 0 }; u16 path[0x107] = { 0 };
struacat(path, main_paths[REMOTE_MODE_THEMES]); struacat(path, "/themes/");
struacat(path, output_dir); struacat(path, output_dir);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, path), FS_ATTRIBUTE_DIRECTORY); FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, path), FS_ATTRIBUTE_DIRECTORY);
@@ -614,7 +614,7 @@ Result dump_all_themes(void)
} }
char path[0x107] = { 0 }; char path[0x107] = { 0 };
sprintf(path, "%sDump-%02lx-%ld-%s", main_paths[REMOTE_MODE_THEMES], dlc_index, extra_index, themename); sprintf(path, "/Themes/Dump-%02lx-%ld-%s", dlc_index, extra_index, themename);
DEBUG("theme folder to create: %s\n", path); DEBUG("theme folder to create: %s\n", path);
FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, path), FS_ATTRIBUTE_DIRECTORY); FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, path), FS_ATTRIBUTE_DIRECTORY);

9
source/ui_strings.c
View File

@@ -2086,12 +2086,3 @@ Language_s init_strings(CFG_Language lang)
return language_english; return language_english;
} }
} }
CFG_Language get_system_language(void)
{
u8 lang = CFG_LANGUAGE_EN;
// can never fail, cfguInit is one of the very first thing that happens on start
// and if it does anyway, default to english
CFGU_GetSystemLanguage(&lang);
return (CFG_Language)lang;
}