Separated error codes and HTTP from util.

source/core/data/cia.c

@@ -3,7 +3,7 @@
 #include "cia.h"
 #include "smdh.h"
 #include "tmd.h"
-#include "../util.h"
+#include "../error.h"
 
 u64 cia_get_title_id(u8* cia) {
     u32 headerSize = ((*(u32*) &cia[0x00]) + 0x3F) & ~0x3F;
@@ -33,11 +33,11 @@ Result cia_file_get_smdh(SMDH* smdh, Handle handle) {
             if(metaSize >= 0x3AC0) {
                 res = FSFILE_Read(handle, &bytesRead, headerSize + certSize + ticketSize + tmdSize + contentSize + 0x400, smdh, sizeof(SMDH));
             } else {
-                res = R_FBI_BAD_DATA;
+                res = R_APP_BAD_DATA;
             }
         }
     } else {
-        res = R_FBI_INVALID_ARGUMENT;
+        res = R_APP_INVALID_ARGUMENT;
     }
 
     return res;

source/core/error.c

@@ -0,0 +1,124 @@
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <3ds.h>
+
+#include "error.h"
+
+extern void cleanup();
+
+static int util_get_line_length(PrintConsole* console, const char* str) {
+    int lineLength = 0;
+    while(*str != 0) {
+        if(*str == '\n') {
+            break;
+        }
+
+        lineLength++;
+        if(lineLength >= console->consoleWidth - 1) {
+            break;
+        }
+
+        str++;
+    }
+
+    return lineLength;
+}
+
+static int util_get_lines(PrintConsole* console, const char* str) {
+    int lines = 1;
+    int lineLength = 0;
+    while(*str != 0) {
+        if(*str == '\n') {
+            lines++;
+            lineLength = 0;
+        } else {
+            lineLength++;
+            if(lineLength >= console->consoleWidth - 1) {
+                lines++;
+                lineLength = 0;
+            }
+        }
+
+        str++;
+    }
+
+    return lines;
+}
+
+void error_panic(const char* s, ...) {
+    va_list list;
+    va_start(list, s);
+
+    char buf[1024];
+    vsnprintf(buf, 1024, s, list);
+
+    va_end(list);
+
+    gspWaitForVBlank();
+
+    u16 width;
+    u16 height;
+    for(int i = 0; i < 2; i++) {
+        memset(gfxGetFramebuffer(GFX_TOP, GFX_LEFT, &width, &height), 0, (size_t) (width * height * 3));
+        memset(gfxGetFramebuffer(GFX_TOP, GFX_RIGHT, &width, &height), 0, (size_t) (width * height * 3));
+        memset(gfxGetFramebuffer(GFX_BOTTOM, GFX_LEFT, &width, &height), 0, (size_t) (width * height * 3));
+
+        gfxSwapBuffers();
+    }
+
+    PrintConsole* console = consoleInit(GFX_TOP, NULL);
+
+    const char* header = "FBI has encountered a fatal error!";
+    const char* footer = "Press any button to exit.";
+
+    printf("\x1b[0;0H");
+    for(int i = 0; i < console->consoleWidth; i++) {
+        printf("-");
+    }
+
+    printf("\x1b[%d;0H", console->consoleHeight - 1);
+    for(int i = 0; i < console->consoleWidth; i++) {
+        printf("-");
+    }
+
+    printf("\x1b[0;%dH%s", (console->consoleWidth - util_get_line_length(console, header)) / 2, header);
+    printf("\x1b[%d;%dH%s", console->consoleHeight - 1, (console->consoleWidth - util_get_line_length(console, footer)) / 2, footer);
+
+    int bufRow = (console->consoleHeight - util_get_lines(console, buf)) / 2;
+    char* str = buf;
+    while(*str != 0) {
+        if(*str == '\n') {
+            bufRow++;
+            str++;
+            continue;
+        } else {
+            int lineLength = util_get_line_length(console, str);
+
+            char old = *(str + lineLength);
+            *(str + lineLength) = '\0';
+            printf("\x1b[%d;%dH%s", bufRow, (console->consoleWidth - lineLength) / 2, str);
+            *(str + lineLength) = old;
+
+            bufRow++;
+            str += lineLength;
+        }
+    }
+
+    gfxFlushBuffers();
+    gspWaitForVBlank();
+
+    while(aptMainLoop()) {
+        hidScanInput();
+        if(hidKeysDown() & ~KEY_TOUCH) {
+            break;
+        }
+
+        gspWaitForVBlank();
+    }
+
+    cleanup();
+    exit(1);
+}

source/core/error.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#define R_APP_INVALID_ARGUMENT MAKERESULT(RL_PERMANENT, RS_INVALIDARG, RM_APPLICATION, 1)
+#define R_APP_CANCELLED MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, 2)
+#define R_APP_SKIPPED MAKERESULT(RL_PERMANENT, RS_NOTSUPPORTED, RM_APPLICATION, 3)
+
+#define R_APP_THREAD_CREATE_FAILED MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 4)
+
+#define R_APP_PARSE_FAILED MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 5)
+#define R_APP_BAD_DATA MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 6)
+
+#define R_APP_HTTP_TOO_MANY_REDIRECTS MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 7)
+#define R_APP_HTTP_ERROR_BASE MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 8)
+#define R_APP_HTTP_ERROR_END (R_APP_HTTP_ERROR_BASE + 600)
+
+#define R_APP_CURL_INIT_FAILED (R_APP_HTTP_ERROR_END + 1)
+#define R_APP_CURL_ERROR_BASE (R_APP_CURL_INIT_FAILED + 1)
+
+#define R_APP_NOT_IMPLEMENTED MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, RD_NOT_IMPLEMENTED)
+#define R_APP_OUT_OF_MEMORY MAKERESULT(RL_FATAL, RS_OUTOFRESOURCE, RM_APPLICATION, RD_OUT_OF_MEMORY)
+#define R_APP_OUT_OF_RANGE MAKERESULT(RL_PERMANENT, RS_INVALIDARG, RM_APPLICATION, RD_OUT_OF_RANGE)
+
+void error_panic(const char* s, ...);

source/core/http.c

@@ -0,0 +1,153 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <3ds.h>
+
+#include "error.h"
+#include "http.h"
+
+#define HTTPC_TIMEOUT 15000000000
+
+Result http_open(httpcContext* context, const char* url, bool userAgent) {
+    return http_open_ranged(context, url, userAgent, 0, 0);
+}
+
+Result http_open_ranged(httpcContext* context, const char* url, bool userAgent, u32 rangeStart, u32 rangeEnd) {
+    if(context == NULL || url == NULL) {
+        return R_APP_INVALID_ARGUMENT;
+    }
+
+    char currUrl[1024];
+    strncpy(currUrl, url, sizeof(currUrl));
+
+    char range[64];
+    if(rangeEnd > rangeStart) {
+        snprintf(range, sizeof(range), "%lu-%lu", rangeStart, rangeEnd);
+    } else {
+        snprintf(range, sizeof(range), "%lu-", rangeStart);
+    }
+
+    Result res = 0;
+
+    bool resolved = false;
+    u32 redirectCount = 0;
+    while(R_SUCCEEDED(res) && !resolved && redirectCount < 32) {
+        if(R_SUCCEEDED(res = httpcOpenContext(context, HTTPC_METHOD_GET, currUrl, 1))) {
+            u32 response = 0;
+            if(R_SUCCEEDED(res = httpcSetSSLOpt(context, SSLCOPT_DisableVerify))
+               && (!userAgent || R_SUCCEEDED(res = httpcAddRequestHeaderField(context, "User-Agent", HTTP_USER_AGENT)))
+               && (rangeStart == 0 || R_SUCCEEDED(res = httpcAddRequestHeaderField(context, "Range", range)))
+               && R_SUCCEEDED(res = httpcSetKeepAlive(context, HTTPC_KEEPALIVE_ENABLED))
+               && R_SUCCEEDED(res = httpcBeginRequest(context))
+               && R_SUCCEEDED(res = httpcGetResponseStatusCodeTimeout(context, &response, HTTPC_TIMEOUT))) {
+                if(response == 301 || response == 302 || response == 303) {
+                    redirectCount++;
+
+                    memset(currUrl, '\0', sizeof(currUrl));
+                    if(R_SUCCEEDED(res = httpcGetResponseHeader(context, "Location", currUrl, sizeof(currUrl)))) {
+                        httpcCloseContext(context);
+                    }
+                } else {
+                    resolved = true;
+
+                    if(response != 200) {
+                        res = R_APP_HTTP_ERROR_BASE + response;
+                    }
+                }
+            }
+
+            if(R_FAILED(res)) {
+                httpcCloseContext(context);
+            }
+        }
+    }
+
+    if(R_SUCCEEDED(res) && redirectCount >= 32) {
+        res = R_APP_HTTP_TOO_MANY_REDIRECTS;
+    }
+
+    return res;
+}
+
+Result http_get_size(httpcContext* context, u32* size) {
+    if(context == NULL || size == NULL) {
+        return R_APP_INVALID_ARGUMENT;
+    }
+
+    return httpcGetDownloadSizeState(context, NULL, size);
+}
+
+Result http_get_file_name(httpcContext* context, char* out, u32 size) {
+    if(context == NULL || out == NULL) {
+        return R_APP_INVALID_ARGUMENT;
+    }
+
+    Result res = 0;
+
+    char* header = (char*) calloc(1, size + 64);
+    if(header != NULL) {
+        if(R_SUCCEEDED(res = httpcGetResponseHeader(context, "Content-Disposition", header, size + 64))) {
+            char* start = strstr(header, "filename=");
+            if(start != NULL) {
+                char format[32];
+                snprintf(format, sizeof(format), "filename=\"%%%lu[^\"]\"", size);
+                if(sscanf(start, format, out) != 1) {
+                    res = R_APP_BAD_DATA;
+                }
+            } else {
+                res = R_APP_BAD_DATA;
+            }
+        }
+
+        free(header);
+    } else {
+        res = R_APP_OUT_OF_MEMORY;
+    }
+
+    return res;
+}
+
+Result http_read(httpcContext* context, u32* bytesRead, void* buffer, u32 size) {
+    if(context == NULL || buffer == NULL) {
+        return R_APP_INVALID_ARGUMENT;
+    }
+
+    Result res = 0;
+
+    u32 startPos = 0;
+    if(R_SUCCEEDED(res = httpcGetDownloadSizeState(context, &startPos, NULL))) {
+        res = HTTPC_RESULTCODE_DOWNLOADPENDING;
+
+        u32 outPos = 0;
+        while(res == HTTPC_RESULTCODE_DOWNLOADPENDING && outPos < size) {
+            if(R_SUCCEEDED(res = httpcReceiveDataTimeout(context, &((u8*) buffer)[outPos], size - outPos, HTTPC_TIMEOUT)) || res == HTTPC_RESULTCODE_DOWNLOADPENDING) {
+                Result posRes = 0;
+                u32 currPos = 0;
+                if(R_SUCCEEDED(posRes = httpcGetDownloadSizeState(context, &currPos, NULL))) {
+                    outPos = currPos - startPos;
+                } else {
+                    res = posRes;
+                }
+            }
+        }
+
+        if(res == HTTPC_RESULTCODE_DOWNLOADPENDING) {
+            res = 0;
+        }
+
+        if(R_SUCCEEDED(res) && bytesRead != NULL) {
+            *bytesRead = outPos;
+        }
+    }
+
+    return res;
+}
+
+Result http_close(httpcContext* context) {
+    if(context == NULL) {
+        return R_APP_INVALID_ARGUMENT;
+    }
+
+    return httpcCloseContext(context);
+}

source/core/http.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#define MAKE_HTTP_USER_AGENT_(major, minor, micro) ("Mozilla/5.0 (Nintendo 3DS; Mobile; rv:10.0) Gecko/20100101 FBI/" #major "." #minor "." #micro)
+#define MAKE_HTTP_USER_AGENT(major, minor, micro) MAKE_HTTP_USER_AGENT_(major, minor, micro)
+#define HTTP_USER_AGENT MAKE_HTTP_USER_AGENT(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO)
+
+#define HTTP_CONNECT_TIMEOUT 15
+
+Result http_open(httpcContext* context, const char* url, bool userAgent);
+Result http_open_ranged(httpcContext* context, const char* url, bool userAgent, u32 rangeStart, u32 rangeEnd);
+Result http_get_size(httpcContext* context, u32* size);
+Result http_get_file_name(httpcContext* context, char* out, u32 size);
+Result http_read(httpcContext* context, u32* bytesRead, void* buffer, u32 size);
+Result http_close(httpcContext* context);

source/core/screen.c

@@ -6,9 +6,9 @@
 #include <3ds.h>
 #include <citro3d.h>
 
-#include "../libs/stb_image/stb_image.h"
+#include "error.h"
 #include "screen.h"
-#include "util.h"
+#include "../libs/stb_image/stb_image.h"
 
 #include "default_shbin.h"
 
@@ -40,7 +40,7 @@ static struct {
 static void screen_set_blend(u32 color, bool rgb, bool alpha) {
     C3D_TexEnv* env = C3D_GetTexEnv(0);
     if(env == NULL) {
-        util_panic("Failed to retrieve combiner settings.");
+        error_panic("Failed to retrieve combiner settings.");
         return;
     }
 
@@ -65,7 +65,7 @@ static void screen_set_blend(u32 color, bool rgb, bool alpha) {
 
 void screen_init() {
     if(!C3D_Init(C3D_DEFAULT_CMDBUF_SIZE * 4)) {
-        util_panic("Failed to initialize the GPU.");
+        error_panic("Failed to initialize the GPU.");
         return;
     }
 
@@ -75,7 +75,7 @@ void screen_init() {
 
     target_top = C3D_RenderTargetCreate(TOP_SCREEN_HEIGHT, TOP_SCREEN_WIDTH, GPU_RB_RGB8, 0);
     if(target_top == NULL) {
-        util_panic("Failed to initialize the top screen target.");
+        error_panic("Failed to initialize the top screen target.");
         return;
     }
 
@@ -84,7 +84,7 @@ void screen_init() {
 
     target_bottom = C3D_RenderTargetCreate(BOTTOM_SCREEN_HEIGHT, BOTTOM_SCREEN_WIDTH, GPU_RB_RGB8, 0);
     if(target_bottom == NULL) {
-        util_panic("Failed to initialize the bottom screen target.");
+        error_panic("Failed to initialize the bottom screen target.");
         return;
     }
 
@@ -96,13 +96,13 @@ void screen_init() {
 
     dvlb = DVLB_ParseFile((u32*) default_shbin, default_shbin_len);
     if(dvlb == NULL) {
-        util_panic("Failed to parse shader.");
+        error_panic("Failed to parse shader.");
         return;
     }
 
     Result progInitRes = shaderProgramInit(&program);
     if(R_FAILED(progInitRes)) {
-        util_panic("Failed to initialize shader program: 0x%08lX", progInitRes);
+        error_panic("Failed to initialize shader program: 0x%08lX", progInitRes);
         return;
     }
 
@@ -110,7 +110,7 @@ void screen_init() {
 
     Result progSetVshRes = shaderProgramSetVsh(&program, &dvlb->DVLE[0]);
     if(R_FAILED(progSetVshRes)) {
-        util_panic("Failed to set up vertex shader: 0x%08lX", progInitRes);
+        error_panic("Failed to set up vertex shader: 0x%08lX", progInitRes);
         return;
     }
 
@@ -118,7 +118,7 @@ void screen_init() {
 
     C3D_AttrInfo* attrInfo = C3D_GetAttrInfo();
     if(attrInfo == NULL) {
-        util_panic("Failed to retrieve attribute info.");
+        error_panic("Failed to retrieve attribute info.");
         return;
     }
 
@@ -132,14 +132,14 @@ void screen_init() {
 
     Result fontMapRes = fontEnsureMapped();
     if(R_FAILED(fontMapRes)) {
-        util_panic("Failed to map system font: 0x%08lX", fontMapRes);
+        error_panic("Failed to map system font: 0x%08lX", fontMapRes);
         return;
     }
 
     TGLP_s* glyphInfo = fontGetGlyphInfo();
     glyph_sheets = calloc(glyphInfo->nSheets, sizeof(C3D_Tex));
     if(glyph_sheets == NULL) {
-        util_panic("Failed to allocate font glyph texture data.");
+        error_panic("Failed to allocate font glyph texture data.");
         return;
     }
 
@@ -198,7 +198,7 @@ void screen_set_base_alpha(u8 alpha) {
 
 void screen_set_color(u32 id, u32 color) {
     if(id >= MAX_COLORS) {
-        util_panic("Attempted to draw string with invalid color ID \"%lu\".", id);
+        error_panic("Attempted to draw string with invalid color ID \"%lu\".", id);
         return;
     }
 
@@ -229,7 +229,7 @@ u32 screen_allocate_free_texture() {
     }
 
     if(id == 0) {
-        util_panic("Out of free textures.");
+        error_panic("Out of free textures.");
         return 0;
     }
 
@@ -238,7 +238,7 @@ u32 screen_allocate_free_texture() {
 
 static void screen_prepare_texture(u32* pow2WidthOut, u32* pow2HeightOut, u32 id, u32 width, u32 height, GPU_TEXCOLOR format, bool linearFilter) {
     if(id >= MAX_TEXTURES) {
-        util_panic("Attempted to prepare invalid texture ID \"%lu\".", id);
+        error_panic("Attempted to prepare invalid texture ID \"%lu\".", id);
         return;
     }
 
@@ -258,7 +258,7 @@ static void screen_prepare_texture(u32* pow2WidthOut, u32* pow2HeightOut, u32 id
     }
 
     if(textures[id].tex.data == NULL && !C3D_TexInit(&textures[id].tex, (u16) pow2Width, (u16) pow2Height, format)) {
-        util_panic("Failed to initialize texture with ID \"%lu\".", id);
+        error_panic("Failed to initialize texture with ID \"%lu\".", id);
         return;
     }
 
@@ -321,13 +321,13 @@ void screen_load_texture_untiled(u32 id, void* data, u32 size, u32 width, u32 he
 
 void screen_load_texture_path(u32 id, const char* path, bool linearFilter) {
     if(id >= MAX_TEXTURES) {
-        util_panic("Attempted to load path \"%s\" to invalid texture ID \"%lu\".", path, id);
+        error_panic("Attempted to load path \"%s\" to invalid texture ID \"%lu\".", path, id);
         return;
     }
 
     FILE* fd = fopen(path, "rb");
     if(fd == NULL) {
-        util_panic("Failed to load PNG file \"%s\": %s", path, strerror(errno));
+        error_panic("Failed to load PNG file \"%s\": %s", path, strerror(errno));
         return;
     }
 
@@ -338,7 +338,7 @@ void screen_load_texture_path(u32 id, const char* path, bool linearFilter) {
 
 void screen_load_texture_file(u32 id, FILE* fd, bool linearFilter) {
     if(id >= MAX_TEXTURES) {
-        util_panic("Attempted to load file to invalid texture ID \"%lu\".", id);
+        error_panic("Attempted to load file to invalid texture ID \"%lu\".", id);
         return;
     }
 
@@ -348,7 +348,7 @@ void screen_load_texture_file(u32 id, FILE* fd, bool linearFilter) {
     u8* image = stbi_load_from_file(fd, &width, &height, &depth, STBI_rgb_alpha);
 
     if(image == NULL || depth != STBI_rgb_alpha) {
-        util_panic("Failed to load PNG file to texture ID \"%lu\".", id);
+        error_panic("Failed to load PNG file to texture ID \"%lu\".", id);
         return;
     }
 
@@ -375,7 +375,7 @@ void screen_load_texture_file(u32 id, FILE* fd, bool linearFilter) {
 
 void screen_unload_texture(u32 id) {
     if(id >= MAX_TEXTURES) {
-        util_panic("Attempted to unload invalid texture ID \"%lu\".", id);
+        error_panic("Attempted to unload invalid texture ID \"%lu\".", id);
         return;
     }
 
@@ -389,7 +389,7 @@ void screen_unload_texture(u32 id) {
 
 void screen_get_texture_size(u32* width, u32* height, u32 id) {
     if(id >= MAX_TEXTURES) {
-        util_panic("Attempted to get size of invalid texture ID \"%lu\".", id);
+        error_panic("Attempted to get size of invalid texture ID \"%lu\".", id);
         return;
     }
 
@@ -404,7 +404,7 @@ void screen_get_texture_size(u32* width, u32* height, u32 id) {
 
 void screen_begin_frame() {
     if(!C3D_FrameBegin(C3D_FRAME_SYNCDRAW)) {
-        util_panic("Failed to begin frame.");
+        error_panic("Failed to begin frame.");
         return;
     }
 }
@@ -415,7 +415,7 @@ void screen_end_frame() {
 
 void screen_select(gfxScreen_t screen) {
     if(!C3D_FrameDrawOn(screen == GFX_TOP ? target_top : target_bottom)) {
-        util_panic("Failed to select render target.");
+        error_panic("Failed to select render target.");
         return;
     }
 
@@ -442,7 +442,7 @@ static void screen_draw_quad(float x1, float y1, float x2, float y2, float left,
 
 void screen_draw_texture(u32 id, float x, float y, float width, float height) {
     if(id >= MAX_TEXTURES) {
-        util_panic("Attempted to draw invalid texture ID \"%lu\".", id);
+        error_panic("Attempted to draw invalid texture ID \"%lu\".", id);
         return;
     }
 
@@ -464,7 +464,7 @@ void screen_draw_texture(u32 id, float x, float y, float width, float height) {
 
 void screen_draw_texture_crop(u32 id, float x, float y, float width, float height) {
     if(id >= MAX_TEXTURES) {
-        util_panic("Attempted to draw invalid texture ID \"%lu\".", id);
+        error_panic("Attempted to draw invalid texture ID \"%lu\".", id);
         return;
     }
 
@@ -561,7 +561,7 @@ static void screen_draw_string_internal(const char* text, float x, float y, floa
     }
 
     if(colorId >= MAX_COLORS) {
-        util_panic("Attempted to draw string with invalid color ID \"%lu\".", colorId);
+        error_panic("Attempted to draw string with invalid color ID \"%lu\".", colorId);
         return;
     }
 

source/core/spi.c

@@ -3,8 +3,8 @@
 
 #include <3ds.h>
 
+#include "error.h"
 #include "spi.h"
-#include "util.h"
 
 /*
  * Based on information from TWLSaveTool, by TuxSH.
@@ -88,7 +88,7 @@ static Result spi_get_page_size(SaveChip chip, u32* pageSize) {
             size = 256;
             break;
         default:
-            res = R_FBI_NOT_IMPLEMENTED;
+            res = R_APP_NOT_IMPLEMENTED;
             break;
     }
 
@@ -133,7 +133,7 @@ static Result spi_get_capacity(SaveChip chip, u32* capacity) {
             cap = 8 * 1024 * 1024;
             break;
         default:
-            res = R_FBI_NOT_IMPLEMENTED;
+            res = R_APP_NOT_IMPLEMENTED;
             break;
     }
 
@@ -146,7 +146,7 @@ static Result spi_get_capacity(SaveChip chip, u32* capacity) {
 
 static Result spi_execute_command(SaveChip chip, void* cmd, u32 cmdSize, void* answer, u32 answerSize, void* data, u32 dataSize) {
     if(chip == CHIP_NONE) {
-        return R_FBI_NOT_IMPLEMENTED;
+        return R_APP_NOT_IMPLEMENTED;
     }
 
     bool infrared = chip == CHIP_FLASH_256KB_INFRARED || chip == CHIP_FLASH_512KB_INFRARED || chip == CHIP_FLASH_1MB_INFRARED || chip == CHIP_FLASH_8MB_INFRARED;
@@ -277,7 +277,7 @@ static Result spi_read_data(SaveChip chip, u32* bytesRead, void* data, u32 offse
                     pos += size;
                     break;
                 default:
-                    res = R_FBI_NOT_IMPLEMENTED;
+                    res = R_APP_NOT_IMPLEMENTED;
                     break;
             }
         }
@@ -341,7 +341,7 @@ static Result spi_write_data(SaveChip chip, u32* bytesWritten, void* data, u32 o
                     case CHIP_FLASH_8MB:
                     case CHIP_FLASH_8MB_INFRARED:
                     default:
-                        res = R_FBI_NOT_IMPLEMENTED;
+                        res = R_APP_NOT_IMPLEMENTED;
                         break;
                 }
 
@@ -456,7 +456,7 @@ static Result spi_get_save_chip(SaveChip* chip, SaveChip base) {
                     if(base < CHIP_FLASH_256KB_INFRARED) {
                         res = spi_get_save_chip(&c, CHIP_FLASH_256KB_INFRARED);
                     } else {
-                        res = R_FBI_NOT_IMPLEMENTED;
+                        res = R_APP_NOT_IMPLEMENTED;
                     }
 
                     break;

source/core/task/capturecam.c

@@ -5,7 +5,7 @@
 
 #include "capturecam.h"
 #include "task.h"
-#include "../util.h"
+#include "../error.h"
 
 #define EVENT_CANCEL 0
 #define EVENT_RECV 1
@@ -99,7 +99,7 @@ static void task_capture_cam_thread(void* arg) {
 
         free(buffer);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     for(int i = 0; i < EVENT_COUNT; i++) {
@@ -117,7 +117,7 @@ static void task_capture_cam_thread(void* arg) {
 
 Result task_capture_cam(capture_cam_data* data) {
     if(data == NULL || data->buffer == NULL || data->width <= 0 || data->width > 640 || data->height <= 0 || data->height > 480) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     data->mutex = 0;
@@ -130,7 +130,7 @@ Result task_capture_cam(capture_cam_data* data) {
 
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY)) && R_SUCCEEDED(res = svcCreateMutex(&data->mutex, false))) {
         if(threadCreate(task_capture_cam_thread, data, 0x10000, 0x1A, 0, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/core/task/task.c

@@ -1,7 +1,7 @@
 #include <3ds.h>
 
 #include "task.h"
-#include "../util.h"
+#include "../error.h"
 
 static bool task_quit;
 
@@ -33,14 +33,14 @@ void task_init() {
     Result res = 0;
 
     if(R_FAILED(res = svcCreateEvent(&task_pause_event, RESET_STICKY))) {
-        util_panic("Failed to create task pause event: 0x%08lX", res);
+        error_panic("Failed to create task pause event: 0x%08lX", res);
         return;
     }
 
     if(R_FAILED(res = svcCreateEvent(&task_suspend_event, RESET_STICKY))) {
         svcCloseHandle(task_pause_event);
 
-        util_panic("Failed to create task suspend event: 0x%08lX", res);
+        error_panic("Failed to create task suspend event: 0x%08lX", res);
         return;
     }
 

source/core/util.c

@@ -1,131 +1,13 @@
-#include <sys/iosupport.h>
-#include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <3ds.h>
 
+#include "error.h"
 #include "linkedlist.h"
 #include "util.h"
 #include "task/task.h"
 
-extern void cleanup();
-
-static int util_get_line_length(PrintConsole* console, const char* str) {
-    int lineLength = 0;
-    while(*str != 0) {
-        if(*str == '\n') {
-            break;
-        }
-
-        lineLength++;
-        if(lineLength >= console->consoleWidth - 1) {
-            break;
-        }
-
-        str++;
-    }
-
-    return lineLength;
-}
-
-static int util_get_lines(PrintConsole* console, const char* str) {
-    int lines = 1;
-    int lineLength = 0;
-    while(*str != 0) {
-        if(*str == '\n') {
-            lines++;
-            lineLength = 0;
-        } else {
-            lineLength++;
-            if(lineLength >= console->consoleWidth - 1) {
-                lines++;
-                lineLength = 0;
-            }
-        }
-
-        str++;
-    }
-
-    return lines;
-}
-
-void util_panic(const char* s, ...) {
-    va_list list;
-    va_start(list, s);
-
-    char buf[1024];
-    vsnprintf(buf, 1024, s, list);
-
-    va_end(list);
-
-    gspWaitForVBlank();
-
-    u16 width;
-    u16 height;
-    for(int i = 0; i < 2; i++) {
-        memset(gfxGetFramebuffer(GFX_TOP, GFX_LEFT, &width, &height), 0, (size_t) (width * height * 3));
-        memset(gfxGetFramebuffer(GFX_TOP, GFX_RIGHT, &width, &height), 0, (size_t) (width * height * 3));
-        memset(gfxGetFramebuffer(GFX_BOTTOM, GFX_LEFT, &width, &height), 0, (size_t) (width * height * 3));
-
-        gfxSwapBuffers();
-    }
-
-    PrintConsole* console = consoleInit(GFX_TOP, NULL);
-
-    const char* header = "FBI has encountered a fatal error!";
-    const char* footer = "Press any button to exit.";
-
-    printf("\x1b[0;0H");
-    for(int i = 0; i < console->consoleWidth; i++) {
-        printf("-");
-    }
-
-    printf("\x1b[%d;0H", console->consoleHeight - 1);
-    for(int i = 0; i < console->consoleWidth; i++) {
-        printf("-");
-    }
-
-    printf("\x1b[0;%dH%s", (console->consoleWidth - util_get_line_length(console, header)) / 2, header);
-    printf("\x1b[%d;%dH%s", console->consoleHeight - 1, (console->consoleWidth - util_get_line_length(console, footer)) / 2, footer);
-
-    int bufRow = (console->consoleHeight - util_get_lines(console, buf)) / 2;
-    char* str = buf;
-    while(*str != 0) {
-        if(*str == '\n') {
-            bufRow++;
-            str++;
-            continue;
-        } else {
-            int lineLength = util_get_line_length(console, str);
-
-            char old = *(str + lineLength);
-            *(str + lineLength) = '\0';
-            printf("\x1b[%d;%dH%s", bufRow, (console->consoleWidth - lineLength) / 2, str);
-            *(str + lineLength) = old;
-
-            bufRow++;
-            str += lineLength;
-        }
-    }
-
-    gfxFlushBuffers();
-    gspWaitForVBlank();
-
-    while(aptMainLoop()) {
-        hidScanInput();
-        if(hidKeysDown() & ~KEY_TOUCH) {
-            break;
-        }
-
-        gspWaitForVBlank();
-    }
-
-    cleanup();
-    exit(1);
-}
-
 FS_Path* util_make_path_utf8(const char* path) {
     size_t len = strlen(path);
 
@@ -171,7 +53,7 @@ bool util_is_dir(FS_Archive archive, const char* path) {
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return R_SUCCEEDED(res);
@@ -192,7 +74,7 @@ Result util_ensure_dir(FS_Archive archive, const char* path) {
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -320,7 +202,7 @@ static linked_list opened_archives;
 
 Result util_open_archive(FS_Archive* archive, FS_ArchiveID id, FS_Path path) {
     if(archive == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     Result res = 0;
@@ -358,7 +240,7 @@ Result util_ref_archive(FS_Archive archive) {
 
         linked_list_add(&opened_archives, ref);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -408,148 +290,3 @@ void util_escape_file_name(char* out, const char* file, size_t size) {
         }
     }
 }
-
-#define HTTPC_TIMEOUT 15000000000
-
-Result util_http_open(httpcContext* context, const char* url, bool userAgent) {
-    return util_http_open_ranged(context, url, userAgent, 0, 0);
-}
-
-Result util_http_open_ranged(httpcContext* context, const char* url, bool userAgent, u32 rangeStart, u32 rangeEnd) {
-    if(context == NULL || url == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
-    }
-
-    char currUrl[1024];
-    strncpy(currUrl, url, sizeof(currUrl));
-
-    char range[64];
-    if(rangeEnd > rangeStart) {
-        snprintf(range, sizeof(range), "%lu-%lu", rangeStart, rangeEnd);
-    } else {
-        snprintf(range, sizeof(range), "%lu-", rangeStart);
-    }
-
-    Result res = 0;
-
-    bool resolved = false;
-    u32 redirectCount = 0;
-    while(R_SUCCEEDED(res) && !resolved && redirectCount < 32) {
-        if(R_SUCCEEDED(res = httpcOpenContext(context, HTTPC_METHOD_GET, currUrl, 1))) {
-            u32 response = 0;
-            if(R_SUCCEEDED(res = httpcSetSSLOpt(context, SSLCOPT_DisableVerify))
-               && (!userAgent || R_SUCCEEDED(res = httpcAddRequestHeaderField(context, "User-Agent", HTTP_USER_AGENT)))
-               && (rangeStart == 0 || R_SUCCEEDED(res = httpcAddRequestHeaderField(context, "Range", range)))
-               && R_SUCCEEDED(res = httpcSetKeepAlive(context, HTTPC_KEEPALIVE_ENABLED))
-               && R_SUCCEEDED(res = httpcBeginRequest(context))
-               && R_SUCCEEDED(res = httpcGetResponseStatusCodeTimeout(context, &response, HTTPC_TIMEOUT))) {
-                if(response == 301 || response == 302 || response == 303) {
-                    redirectCount++;
-
-                    memset(currUrl, '\0', sizeof(currUrl));
-                    if(R_SUCCEEDED(res = httpcGetResponseHeader(context, "Location", currUrl, sizeof(currUrl)))) {
-                        httpcCloseContext(context);
-                    }
-                } else {
-                    resolved = true;
-
-                    if(response != 200) {
-                        res = R_FBI_HTTP_ERROR_BASE + response;
-                    }
-                }
-            }
-
-            if(R_FAILED(res)) {
-                httpcCloseContext(context);
-            }
-        }
-    }
-
-    if(R_SUCCEEDED(res) && redirectCount >= 32) {
-        res = R_FBI_TOO_MANY_REDIRECTS;
-    }
-
-    return res;
-}
-
-Result util_http_get_size(httpcContext* context, u32* size) {
-    if(context == NULL || size == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
-    }
-
-    return httpcGetDownloadSizeState(context, NULL, size);
-}
-
-Result util_http_get_file_name(httpcContext* context, char* out, u32 size) {
-    if(context == NULL || out == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
-    }
-
-    Result res = 0;
-
-    char* header = (char*) calloc(1, size + 64);
-    if(header != NULL) {
-        if(R_SUCCEEDED(res = httpcGetResponseHeader(context, "Content-Disposition", header, size + 64))) {
-            char* start = strstr(header, "filename=");
-            if(start != NULL) {
-                char format[32];
-                snprintf(format, sizeof(format), "filename=\"%%%lu[^\"]\"", size);
-                if(sscanf(start, format, out) != 1) {
-                    res = R_FBI_BAD_DATA;
-                }
-            } else {
-                res = R_FBI_BAD_DATA;
-            }
-        }
-
-        free(header);
-    } else {
-        res = R_FBI_OUT_OF_MEMORY;
-    }
-
-    return res;
-}
-
-Result util_http_read(httpcContext* context, u32* bytesRead, void* buffer, u32 size) {
-    if(context == NULL || buffer == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
-    }
-
-    Result res = 0;
-
-    u32 startPos = 0;
-    if(R_SUCCEEDED(res = httpcGetDownloadSizeState(context, &startPos, NULL))) {
-        res = HTTPC_RESULTCODE_DOWNLOADPENDING;
-
-        u32 outPos = 0;
-        while(res == HTTPC_RESULTCODE_DOWNLOADPENDING && outPos < size) {
-            if(R_SUCCEEDED(res = httpcReceiveDataTimeout(context, &((u8*) buffer)[outPos], size - outPos, HTTPC_TIMEOUT)) || res == HTTPC_RESULTCODE_DOWNLOADPENDING) {
-                Result posRes = 0;
-                u32 currPos = 0;
-                if(R_SUCCEEDED(posRes = httpcGetDownloadSizeState(context, &currPos, NULL))) {
-                    outPos = currPos - startPos;
-                } else {
-                    res = posRes;
-                }
-            }
-        }
-
-        if(res == HTTPC_RESULTCODE_DOWNLOADPENDING) {
-            res = 0;
-        }
-
-        if(R_SUCCEEDED(res) && bytesRead != NULL) {
-            *bytesRead = outPos;
-        }
-    }
-
-    return res;
-}
-
-Result util_http_close(httpcContext* context) {
-    if(context == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
-    }
-
-    return httpcCloseContext(context);
-}

source/core/util.h

@@ -2,57 +2,17 @@
 
 typedef struct json_t json_t;
 
-// Errors
-#define R_FBI_INVALID_ARGUMENT MAKERESULT(RL_PERMANENT, RS_INVALIDARG, RM_APPLICATION, 1)
-#define R_FBI_CANCELLED MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, 2)
-#define R_FBI_WRONG_SYSTEM MAKERESULT(RL_PERMANENT, RS_NOTSUPPORTED, RM_APPLICATION, 3)
-#define R_FBI_THREAD_CREATE_FAILED MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 4)
-#define R_FBI_PARSE_FAILED MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 5)
-#define R_FBI_BAD_DATA MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 6)
-#define R_FBI_TOO_MANY_REDIRECTS MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 7)
-
-#define R_FBI_HTTP_ERROR_BASE MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, 8)
-#define R_FBI_HTTP_ERROR_END (R_FBI_HTTP_ERROR_BASE + 600)
-
-#define R_FBI_CURL_INIT_FAILED (R_FBI_HTTP_ERROR_END + 1)
-#define R_FBI_CURL_ERROR_BASE (R_FBI_CURL_INIT_FAILED + 1)
-
-#define R_FBI_NOT_IMPLEMENTED MAKERESULT(RL_PERMANENT, RS_INTERNAL, RM_APPLICATION, RD_NOT_IMPLEMENTED)
-#define R_FBI_OUT_OF_MEMORY MAKERESULT(RL_FATAL, RS_OUTOFRESOURCE, RM_APPLICATION, RD_OUT_OF_MEMORY)
-#define R_FBI_OUT_OF_RANGE MAKERESULT(RL_PERMANENT, RS_INVALIDARG, RM_APPLICATION, RD_OUT_OF_RANGE)
-
-// HTTP constants
-#define MAKE_HTTP_USER_AGENT_(major, minor, micro) ("Mozilla/5.0 (Nintendo 3DS; Mobile; rv:10.0) Gecko/20100101 FBI/" #major "." #minor "." #micro)
-#define MAKE_HTTP_USER_AGENT(major, minor, micro) MAKE_HTTP_USER_AGENT_(major, minor, micro)
-#define HTTP_USER_AGENT MAKE_HTTP_USER_AGENT(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO)
-
-#define HTTP_CONNECT_TIMEOUT 15
-
 // File constants
 #define FILE_NAME_MAX 512
 #define FILE_PATH_MAX 512
 
-// Panic
-void util_panic(const char* s, ...);
-
 // Strings
 bool util_is_string_empty(const char* str);
 
-// Files
-Result util_open_archive(FS_Archive* archive, FS_ArchiveID id, FS_Path path);
-Result util_ref_archive(FS_Archive archive);
-Result util_close_archive(FS_Archive archive);
-
+// Paths
 const char* util_get_3dsx_path();
 void util_set_3dsx_path(const char* path);
 
-FS_Path util_make_binary_path(const void* data, u32 size);
-FS_Path* util_make_path_utf8(const char* path);
-void util_free_path_utf8(FS_Path* path);
-
-bool util_is_dir(FS_Archive archive, const char* path);
-Result util_ensure_dir(FS_Archive archive, const char* path);
-
 void util_get_file_name(char* out, const char* file, u32 size);
 void util_escape_file_name(char* out, const char* file, size_t size);
 void util_get_path_file(char* out, const char* path, u32 size);
@@ -61,13 +21,17 @@ void util_get_parent_path(char* out, const char* path, u32 size);
 bool util_filter_cias(void* data, const char* name, u32 attributes);
 bool util_filter_tickets(void* data, const char* name, u32 attributes);
 
-// Titles
-FS_MediaType util_get_title_destination(u64 titleId);
+// Files
+Result util_open_archive(FS_Archive* archive, FS_ArchiveID id, FS_Path path);
+Result util_ref_archive(FS_Archive archive);
+Result util_close_archive(FS_Archive archive);
 
-// HTTP
-Result util_http_open(httpcContext* context, const char* url, bool userAgent);
-Result util_http_open_ranged(httpcContext* context, const char* url, bool userAgent, u32 rangeStart, u32 rangeEnd);
-Result util_http_get_size(httpcContext* context, u32* size);
-Result util_http_get_file_name(httpcContext* context, char* out, u32 size);
-Result util_http_read(httpcContext* context, u32* bytesRead, void* buffer, u32 size);
-Result util_http_close(httpcContext* context);
+FS_Path util_make_binary_path(const void* data, u32 size);
+FS_Path* util_make_path_utf8(const char* path);
+void util_free_path_utf8(FS_Path* path);
+
+bool util_is_dir(FS_Archive archive, const char* path);
+Result util_ensure_dir(FS_Archive archive, const char* path);
+
+// Titles
+FS_MediaType util_get_title_destination(u64 titleId);

source/main.c

@@ -5,12 +5,11 @@
 #include <curl/curl.h>
 
 #include "core/clipboard.h"
+#include "core/error.h"
 #include "core/screen.h"
 #include "core/util.h"
 #include "core/task/task.h"
-#include "ui/error.h"
 #include "ui/mainmenu.h"
-#include "ui/resources.h"
 #include "ui/ui.h"
 
 #define CURRENT_KPROCESS (*(void**) 0xFFFF9004)
@@ -104,7 +103,7 @@ Result init_services() {
                && INIT_SERVICE(socInit(soc_buffer, 0x100000), (void (*)()) socExit));
         }
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     if(R_FAILED(res)) {
@@ -121,19 +120,19 @@ void init() {
 
     Result romfsRes = romfsInit();
     if(R_FAILED(romfsRes)) {
-        util_panic("Failed to mount RomFS: %08lX", romfsRes);
+        error_panic("Failed to mount RomFS: %08lX", romfsRes);
         return;
     }
 
     if(R_FAILED(init_services())) {
         if(!attempt_patch_pid()) {
-            util_panic("Kernel backdoor not installed.\nPlease run a kernel exploit and try again.");
+            error_panic("Kernel backdoor not installed.\nPlease run a kernel exploit and try again.");
             return;
         }
 
         Result initRes = init_services();
         if(R_FAILED(initRes)) {
-            util_panic("Failed to initialize services: %08lX", initRes);
+            error_panic("Failed to initialize services: %08lX", initRes);
             return;
         }
     }
@@ -143,7 +142,7 @@ void init() {
     APT_GetAppCpuTimeLimit(&old_time_limit);
     Result cpuRes = APT_SetAppCpuTimeLimit(30);
     if(R_FAILED(cpuRes)) {
-        util_panic("Failed to set syscore CPU time limit: %08lX", cpuRes);
+        error_panic("Failed to set syscore CPU time limit: %08lX", cpuRes);
         return;
     }
 
@@ -152,7 +151,6 @@ void init() {
     curl_global_init(CURL_GLOBAL_ALL);
 
     screen_init();
-    resources_load();
     ui_init();
     task_init();
 }

source/ui/error.c

@@ -9,8 +9,8 @@
 #include "error.h"
 #include "prompt.h"
 #include "resources.h"
+#include "../core/error.h"
 #include "../core/screen.h"
-#include "../core/util.h"
 
 static const char* level_to_string(Result res) {
     switch(R_LEVEL(res)) {
@@ -489,25 +489,25 @@ static const char* description_to_string(Result res) {
             break;
         case RM_APPLICATION:
             switch(res) {
-                case R_FBI_INVALID_ARGUMENT:
+                case R_APP_INVALID_ARGUMENT:
                     return "Invalid argument";
-                case R_FBI_CANCELLED:
+                case R_APP_CANCELLED:
                     return "Operation cancelled";
-                case R_FBI_WRONG_SYSTEM:
-                    return "Attempted to install an N3DS title on an O3DS";
-                case R_FBI_THREAD_CREATE_FAILED:
+                case R_APP_SKIPPED:
+                    return "Operation skipped";
+                case R_APP_THREAD_CREATE_FAILED:
                     return "Thread creation failed";
-                case R_FBI_PARSE_FAILED:
+                case R_APP_PARSE_FAILED:
                     return "Parse failed";
-                case R_FBI_BAD_DATA:
+                case R_APP_BAD_DATA:
                     return "Bad data";
-                case R_FBI_TOO_MANY_REDIRECTS:
+                case R_APP_HTTP_TOO_MANY_REDIRECTS:
                     return "Too many redirects";
-                case R_FBI_CURL_INIT_FAILED:
+                case R_APP_CURL_INIT_FAILED:
                     return "Failed to initialize CURL.";
                 default:
-                    if(res >= R_FBI_HTTP_ERROR_BASE && res < R_FBI_HTTP_ERROR_END) {
-                        switch(res - R_FBI_HTTP_ERROR_BASE) {
+                    if(res >= R_APP_HTTP_ERROR_BASE && res < R_APP_HTTP_ERROR_END) {
+                        switch(res - R_APP_HTTP_ERROR_BASE) {
                             case 100:
                                 return "HTTP 100: Continue";
                             case 101:
@@ -637,8 +637,8 @@ static const char* description_to_string(Result res) {
                         }
                     }
 
-                    if(res >= R_FBI_CURL_ERROR_BASE && res < R_FBI_CURL_ERROR_BASE + CURL_LAST) {
-                        return curl_easy_strerror((CURLcode) (res - R_FBI_CURL_ERROR_BASE));
+                    if(res >= R_APP_CURL_ERROR_BASE && res < R_APP_CURL_ERROR_BASE + CURL_LAST) {
+                        return curl_easy_strerror((CURLcode) (res - R_APP_CURL_ERROR_BASE));
                     }
 
                     break;

source/ui/resources.c

@@ -5,6 +5,7 @@
 #include <3ds.h>
 
 #include "resources.h"
+#include "../core/error.h"
 #include "../core/screen.h"
 #include "../core/util.h"
 #include "../core/task/task.h"
@@ -27,7 +28,7 @@ static FILE* resources_open_file(const char* path) {
 static void resources_load_texture(u32 id, const char* name) {
     FILE* fd = resources_open_file(name);
     if(fd == NULL) {
-        util_panic("Failed to open texture \"%s\": %s\n", name, strerror(errno));
+        error_panic("Failed to open texture \"%s\": %s\n", name, strerror(errno));
         return;
     }
 
@@ -39,7 +40,7 @@ static void resources_load_texture(u32 id, const char* name) {
 void resources_load() {
     FILE* fd = resources_open_file("textcolor.cfg");
     if(fd == NULL) {
-        util_panic("Failed to open text color config: %s\n", strerror(errno));
+        error_panic("Failed to open text color config: %s\n", strerror(errno));
         return;
     }
 

source/ui/section/action/deletecontents.c

@@ -12,6 +12,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -55,7 +56,7 @@ static Result action_delete_delete(void* data, u32 index) {
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     if(R_SUCCEEDED(res)) {

source/ui/section/action/exportsecurevalue.c

@@ -10,6 +10,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -48,7 +49,7 @@ static void action_export_secure_value_update(ui_view* view, void* data, float*
 
                     util_free_path_utf8(fsPath);
                 } else {
-                    res = R_FBI_OUT_OF_MEMORY;
+                    res = R_APP_OUT_OF_MEMORY;
                 }
             }
 

source/ui/section/action/exporttwlsave.c

@@ -11,6 +11,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/spi.h"
@@ -78,7 +79,7 @@ static Result action_export_twl_save_open_dst(void* data, u32 index, void* initi
 
                 util_free_path_utf8(fsPath);
             } else {
-                res = R_FBI_OUT_OF_MEMORY;
+                res = R_APP_OUT_OF_MEMORY;
             }
         }
 

source/ui/section/action/extractsmdh.c

@@ -11,6 +11,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -47,7 +48,7 @@ static void action_extract_smdh_update(ui_view* view, void* data, float* progres
 
                             util_free_path_utf8(fsPath);
                         } else {
-                            res = R_FBI_OUT_OF_MEMORY;
+                            res = R_APP_OUT_OF_MEMORY;
                         }
                     }
 
@@ -57,7 +58,7 @@ static void action_extract_smdh_update(ui_view* view, void* data, float* progres
 
             free(smdh);
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
 
         FSFILE_Close(fileHandle);

source/ui/section/action/importsecurevalue.c

@@ -10,6 +10,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -37,7 +38,7 @@ static void action_import_secure_value_update(ui_view* view, void* data, float*
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     ui_pop();

source/ui/section/action/importtwlsave.c

@@ -11,6 +11,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/spi.h"
@@ -52,7 +53,7 @@ static Result action_import_twl_save_open_src(void* data, u32 index, u32* handle
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;

source/ui/section/action/installcdn.c

@@ -13,6 +13,8 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
+#include "../../../core/http.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -61,32 +63,32 @@ static Result action_install_cdn_open_src(void* data, u32 index, u32* handle) {
             snprintf(url, 256, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%016llX/%08lX", installData->ticket->titleId, installData->contentIds[index - 1]);
         }
 
-        if(R_SUCCEEDED(res = util_http_open(context, url, false))) {
+        if(R_SUCCEEDED(res = http_open(context, url, false))) {
             *handle = (u32) context;
         } else {
             free(context);
         }
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
 }
 
 static Result action_install_cdn_close_src(void* data, u32 index, bool succeeded, u32 handle) {
-    return util_http_close((httpcContext*) handle);
+    return http_close((httpcContext*) handle);
 }
 
 static Result action_install_cdn_get_src_size(void* data, u32 handle, u64* size) {
     u32 downloadSize = 0;
-    Result res = util_http_get_size((httpcContext*) handle, &downloadSize);
+    Result res = http_get_size((httpcContext*) handle, &downloadSize);
 
     *size = downloadSize;
     return res;
 }
 
 static Result action_install_cdn_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) {
-    return util_http_read((httpcContext*) handle, bytesRead, buffer, size);
+    return http_read((httpcContext*) handle, bytesRead, buffer, size);
 }
 
 static Result action_install_cdn_open_dst(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle) {
@@ -95,7 +97,7 @@ static Result action_install_cdn_open_dst(void* data, u32 index, void* initialRe
     if(index == 0) {
         installData->contentCount = tmd_get_content_count((u8*) initialReadBlock);
         if(installData->contentCount > CONTENTS_MAX) {
-            return R_FBI_OUT_OF_RANGE;
+            return R_APP_OUT_OF_RANGE;
         }
 
         for(u32 i = 0; i < installData->contentCount; i++) {

source/ui/section/action/installcias.c

@@ -12,6 +12,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -68,7 +69,7 @@ static Result action_install_cias_open_src(void* data, u32 index, u32* handle) {
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -101,7 +102,7 @@ static Result action_install_cias_close_src(void* data, u32 index, bool succeede
 
             util_free_path_utf8(fsPath);
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
     }
 
@@ -133,7 +134,7 @@ static Result action_install_cias_open_dst(void* data, u32 index, void* initialR
         }
 
         if(!installData->n3dsContinue) {
-            return R_FBI_WRONG_SYSTEM;
+            return R_APP_SKIPPED;
         }
     }
 

source/ui/section/action/installtickets.c

@@ -12,6 +12,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -64,7 +65,7 @@ static Result action_install_tickets_open_src(void* data, u32 index, u32* handle
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -97,7 +98,7 @@ static Result action_install_tickets_close_src(void* data, u32 index, bool succe
 
             util_free_path_utf8(fsPath);
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
     }
 

source/ui/section/action/installurl.c

@@ -11,6 +11,8 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
+#include "../../../core/http.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
 #include "../../../core/data/cia.h"
@@ -115,7 +117,7 @@ static Result action_install_url_open_src(void* data, u32 index, u32* handle) {
 
     httpcContext* context = (httpcContext*) calloc(1, sizeof(httpcContext));
     if(context != NULL) {
-        if(R_SUCCEEDED(res = util_http_open(context, installData->urls[index], true))) {
+        if(R_SUCCEEDED(res = http_open(context, installData->urls[index], true))) {
             *handle = (u32) context;
 
             installData->currContext = context;
@@ -123,7 +125,7 @@ static Result action_install_url_open_src(void* data, u32 index, u32* handle) {
             free(context);
         }
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -132,19 +134,19 @@ static Result action_install_url_open_src(void* data, u32 index, u32* handle) {
 static Result action_install_url_close_src(void* data, u32 index, bool succeeded, u32 handle) {
     ((install_url_data*) data)->currContext = NULL;
 
-    return util_http_close((httpcContext*) handle);
+    return http_close((httpcContext*) handle);
 }
 
 static Result action_install_url_get_src_size(void* data, u32 handle, u64* size) {
     u32 downloadSize = 0;
-    Result res = util_http_get_size((httpcContext*) handle, &downloadSize);
+    Result res = http_get_size((httpcContext*) handle, &downloadSize);
 
     *size = downloadSize;
     return res;
 }
 
 static Result action_install_url_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) {
-    return util_http_read((httpcContext*) handle, bytesRead, buffer, size);
+    return http_read((httpcContext*) handle, bytesRead, buffer, size);
 }
 
 
@@ -174,7 +176,7 @@ static Result action_install_url_open_dst(void* data, u32 index, void* initialRe
             }
 
             if(!installData->n3dsContinue) {
-                return R_FBI_WRONG_SYSTEM;
+                return R_APP_SKIPPED;
             }
         }
 
@@ -222,7 +224,7 @@ static Result action_install_url_open_dst(void* data, u32 index, void* initialRe
                 strncpy(installData->curr3dsxPath, installData->path3dsx, FILE_PATH_MAX);
             } else {
                 char filename[FILE_NAME_MAX];
-                if(R_FAILED(util_http_get_file_name(installData->currContext, filename, FILE_NAME_MAX))) {
+                if(R_FAILED(http_get_file_name(installData->currContext, filename, FILE_NAME_MAX))) {
                     util_get_path_file(filename, installData->urls[index], FILE_NAME_MAX);
                 }
 
@@ -240,14 +242,14 @@ static Result action_install_url_open_dst(void* data, u32 index, void* initialRe
 
                     util_free_path_utf8(path);
                 } else {
-                    res = R_FBI_OUT_OF_MEMORY;
+                    res = R_APP_OUT_OF_MEMORY;
                 }
             }
 
             FSUSER_CloseArchive(sdmcArchive);
         }
     } else {
-        res = R_FBI_BAD_DATA;
+        res = R_APP_BAD_DATA;
     }
 
     return res;
@@ -329,13 +331,11 @@ static Result action_install_url_restore(void* data, u32 index) {
 static bool action_install_url_error(void* data, u32 index, Result res, ui_view** errorView) {
     install_url_data* installData = (install_url_data*) data;
 
-    if(res != R_FBI_WRONG_SYSTEM) {
-        char* url = installData->urls[index];
-        if(strlen(url) > 38) {
-            *errorView = error_display_res(data, action_install_url_draw_top, res, "Failed to install from URL.\n%.35s...", url);
-        } else {
-            *errorView = error_display_res(data, action_install_url_draw_top, res, "Failed to install from URL.\n%.38s", url);
-        }
+    char* url = installData->urls[index];
+    if(strlen(url) > 38) {
+        *errorView = error_display_res(data, action_install_url_draw_top, res, "Failed to install from URL.\n%.35s...", url);
+    } else {
+        *errorView = error_display_res(data, action_install_url_draw_top, res, "Failed to install from URL.\n%.38s", url);
     }
 
     return true;

source/ui/section/action/newfolder.c

@@ -12,6 +12,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -41,7 +42,7 @@ static void action_new_folder_onresponse(ui_view* view, void* data, SwkbdButton
 
             util_free_path_utf8(fsPath);
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
 
         if(R_SUCCEEDED(res)) {

source/ui/section/action/pastecontents.c

@@ -12,6 +12,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/clipboard.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
@@ -100,7 +101,7 @@ static Result action_paste_contents_make_dst_directory(void* data, u32 index) {
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -117,7 +118,7 @@ static Result action_paste_contents_open_src(void* data, u32 index, u32* handle)
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -170,7 +171,7 @@ static Result action_paste_contents_open_dst(void* data, u32 index, void* initia
 
         util_free_path_utf8(fsPath);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;

source/ui/section/action/rename.c

@@ -13,6 +13,7 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -56,12 +57,12 @@ static void action_rename_onresponse(ui_view* view, void* data, SwkbdButton butt
 
                 util_free_path_utf8(dstFsPath);
             } else {
-                res = R_FBI_OUT_OF_MEMORY;
+                res = R_APP_OUT_OF_MEMORY;
             }
 
             util_free_path_utf8(srcFsPath);
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
 
         if(R_SUCCEEDED(res)) {

source/ui/section/dumpnand.c

@@ -12,6 +12,7 @@
 #include "../prompt.h"
 #include "../resources.h"
 #include "../ui.h"
+#include "../../core/error.h"
 #include "../../core/screen.h"
 #include "../../core/util.h"
 
@@ -58,7 +59,7 @@ static Result dumpnand_open_dst(void* data, u32 index, void* initialReadBlock, u
 
                 util_free_path_utf8(fsPath);
             } else {
-                res = R_FBI_OUT_OF_MEMORY;
+                res = R_APP_OUT_OF_MEMORY;
             }
         }
 

source/ui/section/remoteinstall.c

@@ -18,6 +18,7 @@
 #include "../prompt.h"
 #include "../resources.h"
 #include "../ui.h"
+#include "../../core/error.h"
 #include "../../core/linkedlist.h"
 #include "../../core/screen.h"
 #include "../../core/util.h"
@@ -462,7 +463,7 @@ static void remoteinstall_repeat_last_request() {
 
         free(textBuf);
     } else {
-        error_display_res(NULL, NULL, R_FBI_OUT_OF_MEMORY, "Failed to allocate URL text buffer.");
+        error_display_res(NULL, NULL, R_APP_OUT_OF_MEMORY, "Failed to allocate URL text buffer.");
     }
 }
 

source/ui/section/task/dataop.c

@@ -9,6 +9,8 @@
 #include "../../prompt.h"
 #include "../../resources.h"
 #include "../../ui.h"
+#include "../../../core/error.h"
+#include "../../../core/http.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
 #include "../../../core/task/task.h"
@@ -17,7 +19,7 @@ static Result task_data_op_check_running(data_op_data* data, u32 index, u32* src
     Result res = 0;
 
     if(task_is_quit_all() || svcWaitSynchronization(data->cancelEvent, 0) == 0) {
-        res = R_FBI_CANCELLED;
+        res = R_APP_CANCELLED;
     } else {
         bool suspended = svcWaitSynchronization(task_get_suspend_event(), 0) != 0;
         if(suspended) {
@@ -69,7 +71,7 @@ static Result task_data_op_copy(data_op_data* data, u32 index) {
                             res = data->closeDst(data->data, index, true, dstHandle);
                         }
                     } else {
-                        res = R_FBI_BAD_DATA;
+                        res = R_APP_BAD_DATA;
                     }
                 } else {
                     u8* buffer = (u8*) calloc(1, data->bufferSize);
@@ -136,7 +138,7 @@ static Result task_data_op_copy(data_op_data* data, u32 index) {
 
                         free(buffer);
                     } else {
-                        res = R_FBI_OUT_OF_MEMORY;
+                        res = R_APP_OUT_OF_MEMORY;
                     }
                 }
             }
@@ -179,15 +181,15 @@ static Result task_download_execute(const char* url, void* data, size_t write_ca
             curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &responseCode);
 
             if(responseCode >= 400) {
-                return R_FBI_HTTP_ERROR_BASE + ret;
+                return R_APP_HTTP_ERROR_BASE + ret;
             }
         } else {
-            res = R_FBI_CURL_ERROR_BASE + ret;
+            res = R_APP_CURL_ERROR_BASE + ret;
         }
 
         curl_easy_cleanup(curl);
     } else {
-        res = R_FBI_CURL_INIT_FAILED;
+        res = R_APP_CURL_INIT_FAILED;
     }
 
     return res;
@@ -216,7 +218,7 @@ static size_t task_download_sync_write_callback(char* ptr, size_t size, size_t n
 Result task_download_sync(const char* url, u32* downloadedSize, void* buf, size_t size) {
 #ifdef USE_CURL
     if(url == NULL || buf == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     Result res = 0;
@@ -233,10 +235,10 @@ Result task_download_sync(const char* url, u32* downloadedSize, void* buf, size_
     Result res = 0;
 
     httpcContext context;
-    if(R_SUCCEEDED(res = util_http_open(&context, url, true))) {
-        res = util_http_read(&context, downloadedSize, buf, size);
+    if(R_SUCCEEDED(res = http_open(&context, url, true))) {
+        res = http_read(&context, downloadedSize, buf, size);
 
-        Result closeRes = util_http_close(&context);
+        Result closeRes = http_close(&context);
         if(R_SUCCEEDED(res)) {
             res = closeRes;
         }
@@ -248,7 +250,7 @@ Result task_download_sync(const char* url, u32* downloadedSize, void* buf, size_
 
 Result task_download_json_sync(const char* url, json_t** json, size_t maxSize) {
     if(url == NULL || json == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     Result res = 0;
@@ -262,13 +264,13 @@ Result task_download_json_sync(const char* url, json_t** json, size_t maxSize) {
             if(parsed != NULL) {
                 *json = parsed;
             } else {
-                res = R_FBI_PARSE_FAILED;
+                res = R_APP_PARSE_FAILED;
             }
         }
 
         free(text);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -321,10 +323,10 @@ Result task_download_seed_sync(u64 titleId) {
 
                 u32 downloadedSize = 0;
                 if(R_SUCCEEDED(res = task_download_sync(url, &downloadedSize, seed, sizeof(seed))) && downloadedSize != sizeof(seed)) {
-                    res = R_FBI_BAD_DATA;
+                    res = R_APP_BAD_DATA;
                 }
             } else {
-                res = R_FBI_OUT_OF_RANGE;
+                res = R_APP_OUT_OF_RANGE;
             }
         }
 
@@ -332,7 +334,7 @@ Result task_download_seed_sync(u64 titleId) {
             res = FSUSER_AddSeed(titleId, seed);
         }
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -468,7 +470,7 @@ static Result task_data_op_download(data_op_data* data, u32 index) {
 
         free(buffer);
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -507,7 +509,10 @@ static void task_data_op_thread(void* arg) {
         data->result = res;
 
         if(R_FAILED(res)) {
-            if(res != R_FBI_CANCELLED) {
+            if(res == R_APP_CANCELLED) {
+                prompt_display_notify("Failure", "Operation cancelled.", COLOR_TEXT, NULL, NULL, NULL);
+                break;
+            } else if(res != R_APP_SKIPPED) {
                 ui_view* errorView = NULL;
                 bool proceed = data->error(data->data, data->processed, res, &errorView);
 
@@ -529,9 +534,6 @@ static void task_data_op_thread(void* arg) {
                         break;
                     }
                 }
-            } else {
-                prompt_display_notify("Failure", "Operation cancelled.", COLOR_TEXT, NULL, NULL, NULL);
-                break;
             }
         }
     }
@@ -545,7 +547,7 @@ static void task_data_op_thread(void* arg) {
 
 Result task_data_op(data_op_data* data) {
     if(data == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     data->processed = 0;
@@ -560,7 +562,7 @@ Result task_data_op(data_op_data* data) {
     Result res = 0;
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY))) {
         if(threadCreate(task_data_op_thread, data, 0x10000, 0x18, 1, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/ui/section/task/listextsavedata.c

@@ -8,6 +8,7 @@
 #include "uitask.h"
 #include "../../list.h"
 #include "../../resources.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -87,10 +88,10 @@ static Result task_populate_ext_save_data_from(populate_ext_save_data_data* data
                     } else {
                         free(item);
 
-                        res = R_FBI_OUT_OF_MEMORY;
+                        res = R_APP_OUT_OF_MEMORY;
                     }
                 } else {
-                    res = R_FBI_OUT_OF_MEMORY;
+                    res = R_APP_OUT_OF_MEMORY;
                 }
             }
         }
@@ -149,7 +150,7 @@ void task_clear_ext_save_data(linked_list* items) {
 
 Result task_populate_ext_save_data(populate_ext_save_data_data* data) {
     if(data == NULL || data->items == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     task_clear_ext_save_data(data->items);
@@ -161,7 +162,7 @@ Result task_populate_ext_save_data(populate_ext_save_data_data* data) {
     Result res = 0;
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY))) {
         if(threadCreate(task_populate_ext_save_data_thread, data, 0x10000, 0x19, 1, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/ui/section/task/listfiles.c

@@ -8,6 +8,7 @@
 #include "uitask.h"
 #include "../../list.h"
 #include "../../resources.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -148,10 +149,10 @@ Result task_create_file_item(list_item** out, FS_Archive archive, const char* pa
         } else {
             free(item);
 
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
     } else {
-        res = R_FBI_OUT_OF_MEMORY;
+        res = R_APP_OUT_OF_MEMORY;
     }
 
     return res;
@@ -245,7 +246,7 @@ static void task_populate_files_thread(void* arg) {
 
                             free(entries);
                         } else {
-                            res = R_FBI_OUT_OF_MEMORY;
+                            res = R_APP_OUT_OF_MEMORY;
                         }
 
                         FSDIR_Close(dirHandle);
@@ -253,7 +254,7 @@ static void task_populate_files_thread(void* arg) {
 
                     util_free_path_utf8(fsPath);
                 } else {
-                    res = R_FBI_OUT_OF_MEMORY;
+                    res = R_APP_OUT_OF_MEMORY;
                 }
             }
         }
@@ -306,7 +307,7 @@ void task_clear_files(linked_list* items) {
 
 Result task_populate_files(populate_files_data* data) {
     if(data == NULL || data->items == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     task_clear_files(data->items);
@@ -318,7 +319,7 @@ Result task_populate_files(populate_files_data* data) {
     Result res = 0;
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY))) {
         if(threadCreate(task_populate_files_thread, data, 0x10000, 0x19, 1, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/ui/section/task/listpendingtitles.c

@@ -7,6 +7,7 @@
 #include "uitask.h"
 #include "../../list.h"
 #include "../../resources.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -59,23 +60,23 @@ static Result task_populate_pending_titles_from(populate_pending_titles_data* da
                                 } else {
                                     free(item);
 
-                                    res = R_FBI_OUT_OF_MEMORY;
+                                    res = R_APP_OUT_OF_MEMORY;
                                 }
                             } else {
-                                res = R_FBI_OUT_OF_MEMORY;
+                                res = R_APP_OUT_OF_MEMORY;
                             }
                         }
                     }
 
                     free(pendingTitleInfos);
                 } else {
-                    res = R_FBI_OUT_OF_MEMORY;
+                    res = R_APP_OUT_OF_MEMORY;
                 }
             }
 
             free(pendingTitleIds);
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
     }
 
@@ -127,7 +128,7 @@ void task_clear_pending_titles(linked_list* items) {
 
 Result task_populate_pending_titles(populate_pending_titles_data* data) {
     if(data == NULL || data->items == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     task_clear_pending_titles(data->items);
@@ -139,7 +140,7 @@ Result task_populate_pending_titles(populate_pending_titles_data* data) {
     Result res = 0;
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY))) {
         if(threadCreate(task_populate_pending_titles_thread, data, 0x10000, 0x19, 1, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/ui/section/task/listsystemsavedata.c

@@ -7,6 +7,7 @@
 #include "uitask.h"
 #include "../../list.h"
 #include "../../resources.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -51,10 +52,10 @@ static void task_populate_system_save_data_thread(void* arg) {
                 } else {
                     free(item);
 
-                    res = R_FBI_OUT_OF_MEMORY;
+                    res = R_APP_OUT_OF_MEMORY;
                 }
             } else {
-                res = R_FBI_OUT_OF_MEMORY;
+                res = R_APP_OUT_OF_MEMORY;
             }
         }
     }
@@ -95,7 +96,7 @@ void task_clear_system_save_data(linked_list* items) {
 
 Result task_populate_system_save_data(populate_system_save_data_data* data) {
     if(data == NULL || data->items == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     task_clear_system_save_data(data->items);
@@ -107,7 +108,7 @@ Result task_populate_system_save_data(populate_system_save_data_data* data) {
     Result res = 0;
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY))) {
         if(threadCreate(task_populate_system_save_data_thread, data, 0x10000, 0x19, 1, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/ui/section/task/listtickets.c

@@ -7,6 +7,7 @@
 #include "uitask.h"
 #include "../../list.h"
 #include "../../resources.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -72,17 +73,17 @@ static void task_populate_tickets_thread(void* arg) {
                         } else {
                             free(item);
 
-                            res = R_FBI_OUT_OF_MEMORY;
+                            res = R_APP_OUT_OF_MEMORY;
                         }
                     } else {
-                        res = R_FBI_OUT_OF_MEMORY;
+                        res = R_APP_OUT_OF_MEMORY;
                     }
                 }
             }
 
             free(ticketIds);
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
     }
 
@@ -122,7 +123,7 @@ void task_clear_tickets(linked_list* items) {
 
 Result task_populate_tickets(populate_tickets_data* data) {
     if(data == NULL || data->items == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     task_clear_tickets(data->items);
@@ -134,7 +135,7 @@ Result task_populate_tickets(populate_tickets_data* data) {
     Result res = 0;
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY))) {
         if(threadCreate(task_populate_tickets_thread, data, 0x10000, 0x19, 1, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/ui/section/task/listtitledb.c

@@ -9,6 +9,7 @@
 #include "uitask.h"
 #include "../../list.h"
 #include "../../resources.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -150,10 +151,10 @@ static void task_populate_titledb_thread(void* arg) {
                         } else {
                             free(item);
 
-                            res = R_FBI_OUT_OF_MEMORY;
+                            res = R_APP_OUT_OF_MEMORY;
                         }
                     } else {
-                        res = R_FBI_OUT_OF_MEMORY;
+                        res = R_APP_OUT_OF_MEMORY;
                     }
                 }
             }
@@ -173,7 +174,7 @@ static void task_populate_titledb_thread(void* arg) {
 
             linked_list_destroy(&titles);
         } else {
-            res = R_FBI_BAD_DATA;
+            res = R_APP_BAD_DATA;
         }
 
         json_decref(root);
@@ -260,7 +261,7 @@ void task_clear_titledb(linked_list* items) {
 
 Result task_populate_titledb(populate_titledb_data* data) {
     if(data == NULL || data->items == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     task_clear_titledb(data->items);
@@ -276,7 +277,7 @@ Result task_populate_titledb(populate_titledb_data* data) {
             svcSignalEvent(data->resumeEvent);
 
             if(threadCreate(task_populate_titledb_thread, data, 0x10000, 0x19, 1, true) == NULL) {
-                res = R_FBI_THREAD_CREATE_FAILED;
+                res = R_APP_THREAD_CREATE_FAILED;
             }
         }
     }

source/ui/section/task/listtitles.c

@@ -8,6 +8,7 @@
 #include "uitask.h"
 #include "../../list.h"
 #include "../../resources.h"
+#include "../../../core/error.h"
 #include "../../../core/linkedlist.h"
 #include "../../../core/screen.h"
 #include "../../../core/util.h"
@@ -81,10 +82,10 @@ static Result task_populate_titles_add_ctr(populate_titles_data* data, FS_MediaT
             } else {
                 free(item);
 
-                res = R_FBI_OUT_OF_MEMORY;
+                res = R_APP_OUT_OF_MEMORY;
             }
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
     }
 
@@ -210,10 +211,10 @@ static Result task_populate_titles_add_twl(populate_titles_data* data, FS_MediaT
             } else {
                 free(item);
 
-                res = R_FBI_OUT_OF_MEMORY;
+                res = R_APP_OUT_OF_MEMORY;
             }
         } else {
-            res = R_FBI_OUT_OF_MEMORY;
+            res = R_APP_OUT_OF_MEMORY;
         }
     }
 
@@ -263,7 +264,7 @@ static Result task_populate_titles_from(populate_titles_data* data, FS_MediaType
 
                 free(titleIds);
             } else {
-                res = R_FBI_OUT_OF_MEMORY;
+                res = R_APP_OUT_OF_MEMORY;
             }
         }
     } else {
@@ -327,7 +328,7 @@ void task_clear_titles(linked_list* items) {
 
 Result task_populate_titles(populate_titles_data* data) {
     if(data == NULL || data->items == NULL) {
-        return R_FBI_INVALID_ARGUMENT;
+        return R_APP_INVALID_ARGUMENT;
     }
 
     task_clear_titles(data->items);
@@ -339,7 +340,7 @@ Result task_populate_titles(populate_titles_data* data) {
     Result res = 0;
     if(R_SUCCEEDED(res = svcCreateEvent(&data->cancelEvent, RESET_STICKY))) {
         if(threadCreate(task_populate_titles_thread, data, 0x10000, 0x19, 1, true) == NULL) {
-            res = R_FBI_THREAD_CREATE_FAILED;
+            res = R_APP_THREAD_CREATE_FAILED;
         }
     }
 

source/ui/section/update.c

@@ -13,6 +13,7 @@
 #include "../prompt.h"
 #include "../resources.h"
 #include "../ui.h"
+#include "../../core/error.h"
 #include "../../core/screen.h"
 #include "../../core/util.h"
 
@@ -54,14 +55,14 @@ static void update_check_update(ui_view* view, void* data, float* progress, char
                         strncpy(updateURL, url, DOWNLOAD_URL_MAX);
                         hasUpdate = true;
                     } else {
-                        res = R_FBI_BAD_DATA;
+                        res = R_APP_BAD_DATA;
                     }
                 }
             } else {
-                res = R_FBI_BAD_DATA;
+                res = R_APP_BAD_DATA;
             }
         } else {
-            res = R_FBI_BAD_DATA;
+            res = R_APP_BAD_DATA;
         }
 
         json_decref(json);

source/ui/ui.c

@@ -8,6 +8,7 @@
 #include "resources.h"
 #include "ui.h"
 #include "section/task/uitask.h"
+#include "../core/error.h"
 #include "../core/screen.h"
 #include "../core/util.h"
 #include "../core/data/smdh.h"
@@ -30,6 +31,8 @@ void ui_init() {
         svcCreateMutex(&ui_stack_mutex, false);
     }
 
+    resources_load();
+
     ui_fade_begin_time = osGetTime();
 }
 
@@ -43,13 +46,13 @@ void ui_exit() {
 ui_view* ui_create() {
     ui_view* view = (ui_view*) calloc(1, sizeof(ui_view));
     if(view == NULL) {
-        util_panic("Failed to allocate UI view.");
+        error_panic("Failed to allocate UI view.");
         return NULL;
     }
 
     Result res = 0;
     if(R_FAILED(res = svcCreateEvent(&view->active, RESET_STICKY))) {
-        util_panic("Failed to create view active event: 0x%08lX", res);
+        error_panic("Failed to create view active event: 0x%08lX", res);
 
         free(view);
         return NULL;