attempt 1

- get rid of all the calls to abs(delta), though that would probably already be optimized by gcc
- only not allow drawing at the same time as swapping if the swapping happens on visible icons

.flask/meta.json

@@ -0,0 +1,5 @@
+{
+	"user": "astronautlevel2",
+	"name": "Anemone3DS",
+	"description": "A theme and boot splash manager for the Nintendo 3DS console"
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,39 +0,0 @@
----
-name: Bug report
-about: Found a bug? Report it here
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Description**
-A clear and concise description of what the bug is.
-
-**Steps to reproduce**
-***If you cannot reproduce the bug, please describe what you were doing in as much detail as possible***
-*If you were scanning using the QR scanner, ensure you include a link to the theme you were attempting to download.*
-
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-Add screenshots of any error screens you encountered. Bug reports without screenshots will take longer to solve, so we recommend you get some!
-
-
-**Crash dumps**
-If your bug causes a crash in Luma3DS, please upload any crash dumps generated. You can find these in `SD:/luma/dumps/armX` (`X = 9 or 11`) with the name Luma3DS's exception handlers give you.
-
-
-**System information**
-*System model* e.g. new3DS XL
-
-*System firmware version* e.g. 11.14.0 (this can be found in the System Settings applet by default)
-
-*Anemone3DS version* e.g. v2.2.0 (found in the bottom-left of Anemone3DS)
-
-*Luma3DS version* e.g. v10.2.1 (found in the menu when you hold Select on boot)
-
-
-**If you are not on the [latest version of Anemone3DS](https://github.com/astronautlevel2/Anemone3DS/releases/latest), your bug report will likely be closed. Ensure the bug occurs in the latest build!**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

CONTRIBUTORS.md

@@ -1,10 +1,10 @@
 # Main Contributors
 * Alex Taber ([@astronautlevel2](https://github.com/astronautlevel2))
-* Théo B. ([@LiquidFenrir](https://github.com/LiquidFenrir))
+* [@LiquidFenrir](https://github.com/LiquidFenrir)
 * Dawid Eckert ([@daedreth](https://github.com/daedreth))
 * Dylan G. ([@helloman892](https://github.com/helloman892))
 * Nils P. ([@ZetaDesigns](https://github.com/ZetaDesigns))
-* Matt Kenny ([@KennLDN](https://github.com/KennLDN))
+* Matt Kenny ([@mattkenster](https://github.com/mattkenster))
 
 # Minor Contributors
 * Nic ([@Wizzrobes](https://github.com/Wizzrobes))
@@ -16,8 +16,3 @@
 * Guillaume Gérard ([@GreatWizard](https://github.com/GreatWizard))
 * Joel ([@joel16](https://github.com/joel16))
 * [@thedax](https://github.com/thedax)
-* [@Wryyyong](https://github.com/Wryyyong)
-
-# Translation Contributors
-* [@cooolgamer](https://github.com/cooolgamer/) for French
-* Arth ([@iveurne](https://github.com/iveurne)) for Portugese

Makefile

@@ -89,8 +89,7 @@ CFLAGS	:=	-g -Wall -Wextra -O2 -mword-relocations \
 			-ffunction-sections \
 			$(ARCH)
 
-CFLAGS	+=	$(INCLUDE) -D__3DS__ -D_GNU_SOURCE -DVERSION="\"$(VERSION)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(VERSION)\"" -DAPP_TITLE="\"$(APP_TITLE)\""
+CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE -DVERSION="\"$(VERSION)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(VERSION)\"" -DAPP_TITLE="\"$(APP_TITLE)\""
-CFLAGS	+=	`arm-none-eabi-pkg-config --cflags-only-other vorbisidec libarchive jansson libpng`
 ifneq ($(strip $(CITRA_MODE)),)
 	CFLAGS += -DCITRA_MODE
 endif
@@ -100,7 +99,7 @@ CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-LIBS	:= `arm-none-eabi-pkg-config --libs libcurl vorbisidec libarchive jansson libpng` -lcitro2d -lcitro3d -lctru -lm
+LIBS	:= -lpng -lvorbisidec -logg -larchive -ljansson -lcitro2d -lcitro3d -lctrud -lm -lz
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -147,24 +146,13 @@ else
 endif
 #---------------------------------------------------------------------------------
 
-#---------------------------------------------------------------------------------
-ifeq ($(GFXBUILD),$(BUILD))
-#---------------------------------------------------------------------------------
 export T3XFILES		:=	$(GFXFILES:.t3s=.t3x)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-export ROMFS_T3XFILES	:=	$(patsubst %.t3s, $(GFXBUILD)/%.t3x, $(GFXFILES))
-export T3XHFILES		:=	$(patsubst %.t3s, $(BUILD)/%.h, $(GFXFILES))
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
 
 export OFILES_SOURCES 	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
 
 export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES)) \
 			$(PICAFILES:.v.pica=.shbin.o) $(SHLISTFILES:.shlist=.shbin.o) \
-			$(addsuffix .o,$(T3XFILES))
+			$(if $(filter $(BUILD),$(GFXBUILD)),$(addsuffix .o,$(T3XFILES)))
 
 export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
 
@@ -234,38 +222,17 @@ else
 endif
 
 #---------------------------------------------------------------------------------
-all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES) $(OUTDIR)
+all:
+	@mkdir -p $(BUILD) $(GFXBUILD) $(OUTDIR)
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 	@$(BANNERTOOL) makebanner $(BANNER_IMAGE_ARG) "$(BANNER_IMAGE)" $(BANNER_AUDIO_ARG) "$(BANNER_AUDIO)" -o "$(BUILD)/banner.bnr"
 	@$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -i "$(APP_ICON)" -f "$(ICON_FLAGS)" -o "$(BUILD)/icon.icn"
 	$(MAKEROM) -f cia -o "$(OUTPUT).cia" -target t -exefslogo $(MAKEROM_ARGS)
 
-$(BUILD):
-	@mkdir -p $@
-
-ifneq ($(GFXBUILD),$(BUILD))
-$(GFXBUILD):
-	@mkdir -p $@
-endif
-
-ifneq ($(DEPSDIR),$(BUILD))
-$(DEPSDIR):
-	@mkdir -p $@
-endif
-
-$(OUTDIR):
-	@mkdir -p $@
-
 #---------------------------------------------------------------------------------
 clean:
-	$(SILENTMSG) clean ...
+	@echo clean ...
-	@rm -fr $(BUILD) $(GFXBUILD) $(DEPSDIR) $(OUTDIR)
+	@rm -fr $(BUILD) $(GFXBUILD) $(OUTDIR)
-
-#---------------------------------------------------------------------------------
-$(GFXBUILD)/%.t3x	$(BUILD)/%.h	:	%.t3s
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@tex3ds -i $< -H $(BUILD)/$*.h -d $(DEPSDIR)/$*.d -o $(GFXBUILD)/$*.t3x
 
 #---------------------------------------------------------------------------------
 else
@@ -288,18 +255,42 @@ $(OUTPUT).elf	:	$(OFILES)
 	@$(bin2o)
 
 #---------------------------------------------------------------------------------
-.PRECIOUS	:	%.t3x %.shbin
+.PRECIOUS	:	%.t3x
-#---------------------------------------------------------------------------------
 %.t3x.o	%_t3x.h :	%.t3x
 #---------------------------------------------------------------------------------
-	$(SILENTMSG) $(notdir $<)
+	@$(bin2o)
-	$(bin2o)
 
 #---------------------------------------------------------------------------------
-%.shbin.o %_shbin.h : %.shbin
+# rules for assembling GPU shaders
 #---------------------------------------------------------------------------------
-	$(SILENTMSG) $(notdir $<)
+define shader-as
-	$(bin2o)
+	$(eval CURBIN := $*.shbin)
+	$(eval DEPSFILE := $(DEPSDIR)/$*.shbin.d)
+	echo "$(CURBIN).o: $< $1" > $(DEPSFILE)
+	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
+	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h
+	echo "extern const u32" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(CURBIN) | tr . _)`.h
+	picasso -o $(CURBIN) $1
+	bin2s $(CURBIN) | $(AS) -o $*.shbin.o
+endef
+
+%.shbin.o %_shbin.h : %.v.pica %.g.pica
+	@echo $(notdir $^)
+	@$(call shader-as,$^)
+
+%.shbin.o %_shbin.h : %.v.pica
+	@echo $(notdir $<)
+	@$(call shader-as,$<)
+
+%.shbin.o %_shbin.h : %.shlist
+	@echo $(notdir $<)
+	@$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)$(file)))
+
+#---------------------------------------------------------------------------------
+%.t3x	%.h	:	%.t3s
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@tex3ds -i $< -H $*.h -d $*.d -o $(TOPDIR)/$(GFXBUILD)/$*.t3x
 
 -include $(DEPSDIR)/*.d
 

README.md

@@ -1,17 +1,19 @@
 ![# 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.\
+To-do list here: https://trello.com/b/F1YSa1VK
 
 # Dependencies
  * 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).
  * 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 64-bit Windows binary of makerom is available [here](https://hm892.s-ul.eu/U0Irkqih).
 
 # Building
 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  
 `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`, and `3ds-libarchive` using `[sudo] [dkp-]pacman -S <package-name>`.  
+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`, and `3ds-libarchive` 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/`.
 

assets/sprites.t3s

@@ -11,18 +11,13 @@ battery4.png
 battery5.png
 browse.png
 charging.png
-install.png
+download.png
 exit.png
 installed.png
-menu.png
+list.png
-no_home.png
 preview.png
 select.png
 shuffle.png
 shuffle_no_bgm.png
 sort.png
 start.png
-qr.png
-bgm_only.png
-back.png
-dump.png

include/camera.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -30,24 +30,21 @@
 #include "common.h"
 
 typedef struct {
-    u16 * camera_buffer;
+    u16 *camera_buffer;
+    C2D_Image image;
+    C3D_Tex *tex;
+    Handle mutex;
+    volatile bool finished;
+    volatile bool success;
+    Handle cancel;
+    Handle started;
 
-    Handle event_stop;
+    bool capturing;
-    Thread cam_thread, ui_thread;
+    struct quirc* context;
-
-    LightEvent event_cam_info, event_ui_info;
-
-    CondVar cond;
-    LightLock mut;
-    u32 num_readers_active;
-    bool writer_waiting;
-    bool writer_active;
-
-    bool any_update;
-
-    struct quirc * context;
 } qr_data;
 
 bool init_qr(void);
+void exit_qr(qr_data *data);
+void take_picture(void);
 
 #endif

include/colors.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 
 typedef u32 Color;
 
-typedef enum {
+enum {
     COLOR_BACKGROUND, //silver-y black
     COLOR_ACCENT,
     COLOR_WHITE,

include/common.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -38,24 +38,12 @@
 #define DEBUG(...) fprintf(stderr, __VA_ARGS__)
 #define POS() DEBUG("%s (line %d)...\n", __func__, __LINE__)
 
-#define DEBUGPOS(...) do {\
+#define DEBUGPOS(...) \
         POS(); \
-        DEBUG(__VA_ARGS__); \
+        DEBUG(__VA_ARGS__)
-    } while(0)
-
-static inline int min(const int a, const int b)
-{
-    return a > b ? b : a;
-}
-static inline int max(const int a, const int b)
-{
-    return a < b ? b : a;
-}
 
 #define FASTSCROLL_WAIT 1e8
 
-#define BETWEEN(min, x, max) (min < x && x < max)
-
 typedef enum {
     MODE_THEMES = 0,
     MODE_SPLASHES,
@@ -63,14 +51,6 @@ typedef enum {
     MODE_AMOUNT,
 } EntryMode;
 
-typedef enum {
-    DRAW_MODE_LIST = 0,
-    DRAW_MODE_INSTALL,
-    DRAW_MODE_EXTRA,
-
-    DRAW_MODE_AMOUNT,
-} DrawMode;
-
 extern const char * main_paths[MODE_AMOUNT];
 extern const int entries_per_screen_v[MODE_AMOUNT];
 extern const int entries_per_screen_h[MODE_AMOUNT];

include/conversion.h

@@ -1,9 +0,0 @@
-#ifndef CONVERISON_H
-#define CONVERISON_H
-
-#include "common.h"
-
-size_t bin_to_abgr(char ** bufp, size_t size);
-size_t png_to_abgr(char ** bufp, size_t size, u32 *height);
-
-#endif

include/draw.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 
 #define MAX_LINES 10
 
-typedef enum InstallType_e {
+typedef enum {
     INSTALL_LOADING_THEMES,
     INSTALL_LOADING_SPLASHES,
     INSTALL_LOADING_ICONS,
@@ -55,9 +55,6 @@ typedef enum InstallType_e {
     INSTALL_LOADING_REMOTE_PREVIEW,
     INSTALL_LOADING_REMOTE_BGM,
 
-    INSTALL_DUMPING_THEME,
-    INSTALL_DUMPING_ALL_THEMES,
-
     INSTALL_NONE,
 } InstallType;
 
@@ -84,9 +81,6 @@ typedef enum {
     TEXT_INSTALL_LOADING_REMOTE_PREVIEW,
     TEXT_INSTALL_LOADING_REMOTE_BGM,
 
-    TEXT_INSTALL_DUMPING_THEME,
-    TEXT_INSTALL_DUMPING_ALL_THEMES,
-
     // Other text
     TEXT_VERSION,
 
@@ -131,7 +125,7 @@ typedef enum {
 #define BUTTONS_INFO_LINES 4
 #define BUTTONS_INFO_COLUNMNS 2
 
-typedef enum {
+enum {
     BUTTONS_Y_INFO = BUTTONS_START_Y+5,
 
     BUTTONS_Y_LINE_1 = BUTTONS_START_Y + BUTTONS_STEP*1,
@@ -149,8 +143,8 @@ typedef struct {
     const char * instructions[BUTTONS_INFO_LINES][BUTTONS_INFO_COLUNMNS];
 } Instructions_s;
 
-extern C3D_RenderTarget * top;
+extern C3D_RenderTarget* top;
-extern C3D_RenderTarget * bottom;
+extern C3D_RenderTarget* bottom;
 extern C2D_TextBuf staticBuf, dynamicBuf;
 
 extern C2D_Text text[TEXT_AMOUNT];
@@ -162,8 +156,8 @@ void start_frame(void);
 void end_frame(void);
 void set_screen(C3D_RenderTarget * screen);
 
-void throw_error(const char * error, ErrorLevel level);
+void throw_error(char* error, ErrorLevel level);
-bool draw_confirm(const char * conf_msg, Entry_List_s * list, DrawMode draw_mode);
+bool draw_confirm(const char* conf_msg, Entry_List_s* list);
 
 void draw_preview(C2D_Image preview, int preview_offset);
 
@@ -174,10 +168,9 @@ void draw_text(float x, float y, float z, float scaleX, float scaleY, Color colo
 void draw_text_wrap(float x, float y, float z, float scaleX, float scaleY, Color color, const char * text, float max_width);
 void draw_text_wrap_scaled(float x, float y, float z, Color color, const char * text, float max_scale, float min_scale, float max_width);
 void draw_text_center(gfxScreen_t target, float y, float z, float scaleX, float scaleY, Color color, const char * text);
-void draw_home(u64 start_time, u64 cur_time);
 
 void draw_base_interface(void);
-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);
-void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode draw_mode);
+void draw_interface(Entry_List_s* list, Instructions_s instructions);
 
 #endif

include/entries_list.h

@@ -1,106 +0,0 @@
-/*
-*   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#ifndef ENTRIES_LIST_H
-#define ENTRIES_LIST_H
-
-#include "common.h"
-#include <jansson.h>
-
-typedef enum {
-    SORT_NONE,
-
-    SORT_NAME,
-    SORT_AUTHOR,
-    SORT_PATH,
-} SortMode;
-
-typedef struct {
-    u16 path[0x106];
-    bool is_zip;
-    bool in_shuffle;
-    bool no_bgm_shuffle;
-    bool installed;
-    u32 placeholder_color; // doubles as not-info-loaded when == 0
-
-    json_int_t tp_download_id;
-    u16 name[0x41];
-    u16 desc[0x81];
-    u16 author[0x41];
-} Entry_s;
-
-typedef struct {
-    Tex3DS_SubTexture subtex;
-    u16 x, y;
-} Entry_Icon_s;
-
-typedef struct {
-    Entry_s * entries;
-    int entries_count;
-    int entries_capacity;
-
-    C3D_Tex icons_texture;
-    Entry_Icon_s * icons_info;
-
-    int previous_scroll;
-    int scroll;
-
-    int previous_selected;
-    int selected_entry;
-
-    int shuffle_count;
-
-    EntryMode mode;
-    int entries_per_screen_v; // rows of entries on 1 screen
-    int entries_per_screen_h; // columns of entries on 1 screen
-    int entries_loaded; // amount of entries on 1 screen
-    int entry_size; // size in pixels of an entry icon
-
-    SortMode current_sort;
-
-    json_int_t tp_current_page;
-    json_int_t tp_page_count;
-    char * tp_search;
-    const char * loading_path;
-} Entry_List_s;
-
-void sort_by_name(Entry_List_s * list);
-void sort_by_author(Entry_List_s * list);
-void sort_by_filename(Entry_List_s * list);
-
-void delete_entry(Entry_s * entry, bool is_file);
-// assumes list has been memset to 0
-typedef enum InstallType_e InstallType;
-Result load_entries(const char * loading_path, Entry_List_s * list, const InstallType loading_screen);
-u32 load_data(const char * filename, const Entry_s * entry, char ** buf);
-C2D_Image get_icon_at(Entry_List_s * list, size_t index);
-
-// assumes list doesn't have any elements yet
-void list_init_capacity(Entry_List_s * list, const int init_capacity);
-// assumes list has been inited with a non zero capacity
-ssize_t list_add_entry(Entry_List_s * list);
-
-#endif

include/fs.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,41 +29,18 @@
 
 #include "common.h"
 
-#define ILLEGAL_CHARS "><\"?;:/\\+,.|[=]*"
+FS_Archive ArchiveSD;
-
+FS_Archive ArchiveHomeExt;
-extern FS_Archive ArchiveSD;
+FS_Archive ArchiveThemeExt;
-extern FS_Archive ArchiveHomeExt;
-extern FS_Archive ArchiveThemeExt;
-
-typedef struct {
-    u32 enable : 1;
-    u32 browser: 1;
-    u32 stereoscopic : 1;
-    u32 media_share : 1;
-    u32 online : 1;
-    u32 streetpass : 1;
-    u32 friends : 1;
-    u32 dsdownload : 1;
-    u32 shopping : 1;
-    u32 videos : 1;
-    u32 miiverse : 1;
-    u32 post : 1;
-    u32 null : 19;
-    u32 coppa : 1;
-} Parental_Restrictions_s;
 
 Result open_archives(void);
 Result close_archives(void);
-Result load_parental_controls(Parental_Restrictions_s *restrictions);
 
-u32 file_to_buf(FS_Path path, FS_Archive archive, char ** buf);
+u32 file_to_buf(FS_Path path, FS_Archive archive, char** buf);
-u32 zip_memory_to_buf(const char * file_name, void * zip_memory, size_t zip_size, char ** buf);
+u32 zip_memory_to_buf(char *file_name, void * zip_memory, size_t zip_size, char ** buf);
-u32 zip_file_to_buf(const char * file_name, const u16 * zip_path, char ** buf);
+u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf);
-u32 decompress_lz_file(FS_Path file_name, FS_Archive archive, char ** buf);
-u32 compress_lz_file_fast(FS_Path path, FS_Archive archive, char * in_buf, u32 size);
 
-Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char * buf);
+Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf);
 void remake_file(FS_Path path, FS_Archive archive, u32 size);
-void save_zip_to_sd(char * filename, u32 size, char * buf, EntryMode mode);
 
 #endif

include/instructions.h

@@ -0,0 +1,145 @@
+/*
+*   This file is part of Anemone3DS
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
+*       * Requiring preservation of specified reasonable legal notices or
+*         author attributions in that material or in the Appropriate Legal
+*         Notices displayed by works containing it.
+*       * Prohibiting misrepresentation of the origin of that material,
+*         or requiring that modified versions of such material be marked in
+*         reasonable ways as different from the original version.
+*/
+
+#ifndef INSTRUCTIONS_H
+#define INSTRUCTIONS_H
+
+#include "draw.h"
+#include "colors.h"
+
+Instructions_s normal_instructions[MODE_AMOUNT] = {
+    {
+        .info_line = NULL,
+        .instructions = {
+            {
+                "\uE000 Hold to install",
+                "\uE001 Queue shuffle theme"
+            },
+            {
+                "\uE002 Hold for more",
+                "\uE003 Preview theme"
+            },
+            {
+                "\uE004 Switch to splashes",
+                "\uE005 Scan QR code"
+            },
+            {
+                "Exit",
+                "Delete from SD"
+            }
+        }
+    },
+    {
+        .info_line = NULL,
+        .instructions = {
+            {
+                "\uE000 Install splash",
+                "\uE001 Delete installed splash"
+            },
+            {
+                "\uE002 Hold for more",
+                "\uE003 Preview splash"
+            },
+            {
+                "\uE004 Switch to themes",
+                "\uE005 Scan QR code"
+            },
+            {
+                "Exit",
+                "Delete from SD"
+            }
+        }
+    }
+};
+
+Instructions_s install_instructions = {
+    .info_line = "Release \uE000 to cancel or hold \uE006 and release \uE000 to install",
+    .instructions = {
+        {
+            "\uE079 Normal install",
+            "\uE07A Shuffle install"
+        },
+        {
+            "\uE07B BGM-only install",
+            "\uE07C No-BGM install"
+        },
+        {
+            NULL,
+            NULL
+        },
+        {
+            "Exit",
+            NULL
+        }
+    }
+};
+
+Instructions_s extra_instructions[3] = {
+    {
+        .info_line = "Release \uE002 to cancel or hold \uE006 and release \uE002 to sort",
+        .instructions = {
+            {
+                "\uE079 Sort by name",
+                "\uE07A Sort by author"
+            },
+            {
+                "\uE07B Sort by filename",
+                NULL
+            },
+            {
+                NULL,
+                NULL
+            },
+            {
+                "Exit",
+                NULL
+            }
+        }
+    },
+    {
+        .info_line = "Release \uE002 to cancel or hold \uE006 and release \uE002 to do stuff",
+        .instructions = {
+            {
+                "\uE079 Jump in the list",
+                "\uE07A Reload broken icons"
+            },
+            {
+                "\uE07B Browse ThemePlaza",
+                NULL,
+            },
+            {
+                "\uE004 Sorting menu",
+                NULL
+            },
+            {
+                "Exit",
+                NULL
+            }
+        }
+    },
+};
+
+#endif

include/loading.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,16 +28,9 @@
 #define LOADING_H
 
 #include "common.h"
-#include "entries_list.h"
 #include "music.h"
 #include <jansson.h>
 
-// These values assume a horizontal orientation
-#define TOP_SCREEN_WIDTH 400
-#define BOTTOM_SCREEN_WIDTH 320
-#define SCREEN_HEIGHT 240
-#define SCREEN_COLOR_DEPTH 4
-
 enum ICON_IDS_OFFSET {
     ICONS_ABOVE = 0,
     ICONS_VISIBLE,
@@ -46,6 +39,14 @@ enum ICON_IDS_OFFSET {
     ICONS_OFFSET_AMOUNT,
 };
 
+typedef enum {
+    SORT_NONE,
+
+    SORT_NAME,
+    SORT_AUTHOR,
+    SORT_PATH,
+} SortMode;
+
 typedef struct {
     u8 _padding1[4 + 2 + 2];
 
@@ -54,26 +55,76 @@ typedef struct {
     u16 author[0x40];
 
     u8 _padding2[0x2000 - 0x200 + 0x30 + 0x8];
-    u16 small_icon[24 * 24];
+    u16 small_icon[24*24];
 
-    u16 big_icon[48 * 48];
+    u16 big_icon[48*48];
 } Icon_s;
 
+typedef struct {
+    u16 name[0x41];
+    u16 desc[0x81];
+    u16 author[0x41];
+
+    u32 placeholder_color;
+
+    u16 path[0x106];
+    bool is_zip;
+
+    bool in_shuffle;
+    bool no_bgm_shuffle;
+    bool installed;
+
+    json_int_t tp_download_id;
+} Entry_s;
+
+typedef struct {
+    Entry_s * entries;
+    int entries_count;
+
+    C2D_Image ** icons;
+
+    int previous_scroll;
+    int scroll;
+
+    int previous_selected;
+    int selected_entry;
+
+    int shuffle_count;
+
+    EntryMode mode;
+    int entries_per_screen_v;
+    int entries_per_screen_h;
+    int entries_loaded;
+    int entry_size;
+
+    SortMode current_sort;
+
+    json_int_t tp_current_page;
+    json_int_t tp_page_count;
+    char * tp_search;
+} Entry_List_s;
+
 typedef struct {
     void ** thread_arg;
     volatile bool run_thread;
 } Thread_Arg_s;
 
-void copy_texture_data(C3D_Tex * texture, const u16 * src, const Entry_Icon_s * current_icon);
+C2D_Image * loadTextureIcon(Icon_s *icon);
-void parse_smdh(Icon_s * icon, Entry_s * entry, const u16 * fallback_name);
+void parse_smdh(Icon_s *icon, Entry_s * entry, const u16 * fallback_name);
 
+void sort_by_name(Entry_List_s * list);
+void sort_by_author(Entry_List_s * list);
+void sort_by_filename(Entry_List_s * list);
 
-bool load_preview_from_buffer(char * row_pointers, u32 size, C2D_Image * preview_image, int * preview_offset, int height);
+void delete_entry(Entry_s * entry, bool is_file);
-bool load_preview(const Entry_List_s * list, C2D_Image * preview_image, int * preview_offset);
+Result load_entries(const char * loading_path, Entry_List_s * list);
+bool load_preview_from_buffer(void * buf, u32 size, C2D_Image * preview_image, int * preview_offset);
+bool load_preview(Entry_List_s list, C2D_Image * preview_image, int * preview_offset);
 void free_preview(C2D_Image preview_image);
-Result load_audio(const Entry_s *, audio_s *);
+Result load_audio(Entry_s, audio_s *);
 void load_icons_first(Entry_List_s * current_list, bool silent);
 void handle_scrolling(Entry_List_s * list);
 void load_icons_thread(void * void_arg);
+u32 load_data(char * filename, Entry_s entry, char ** buf);
 
 #endif

include/music.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 #include <tremor/ivorbisfile.h>
 #include <tremor/ivorbiscodec.h>
 
-#define BUF_TO_READ 48000 // How much data should be buffered at a time
+#define BUF_TO_READ 40960 // How much data should be buffered at a time
 
 typedef struct {
     OggVorbis_File vf;
@@ -42,14 +42,13 @@ typedef struct {
     float mix[12];
     u8 buf_pos;
     long data_read;
-    char * filebuf;
+    char *filebuf;
     u32 filesize;
     
     volatile bool stop;
-    Thread playing_thread;
+    Handle finished;
 } audio_s;
 
 void play_audio(audio_s *);
-void stop_audio(audio_s **);
 
 #endif

include/remote.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,9 +29,8 @@
 
 #include "common.h"
 #include "draw.h"
-#include <ctype.h>
 
-#define THEMEPLAZA_BASE_URL "http://themeplaza.art"
+#define THEMEPLAZA_BASE_URL "https://themeplaza.eu"
 #define THEMEPLAZA_API_URL "/api/anemone/v1"
 #define THEMEPLAZA_BASE_API_URL THEMEPLAZA_BASE_URL  THEMEPLAZA_API_URL
 
@@ -51,18 +50,7 @@
 
 #define CACHE_PATH_FORMAT            "/3ds/"  APP_TITLE  "/cache/%"  JSON_INTEGER_FORMAT
 
-typedef struct {
-    char *result_buf;
-    size_t result_written;
-    size_t result_sz;
-} curl_data;
-
-typedef struct {
-    char *filename;
-    char *mime_type;
-} curl_header;
-
 bool themeplaza_browser(EntryMode mode);
-Result http_get(const char * url, char ** filename, char ** buf, u32 * size, InstallType install_type, const char * acceptable_mime_types);
+u32 http_get(const char *url, char ** filename, char ** buf, InstallType install_type);
 
 #endif

include/splashes.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 #include "loading.h"
 
 void splash_delete(void);
-void splash_install(const Entry_s * splash);
+void splash_install(Entry_s splash);
 
 void splash_check_installed(void * void_arg);
 

include/themes.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -49,9 +49,8 @@ typedef struct {
     u8 _padding1[0x13b8];
     ThemeEntry_s theme_entry;
     ThemeEntry_s shuffle_themes[MAX_SHUFFLE_THEMES];
-    u8 shuffle_seedA[0xb];
+    u8 _padding2[0xb];
-    u8 shuffle;
+    bool shuffle;
-    u8 shuffle_seedB[0xa];
 } SaveData_dat_s;
 
 typedef struct {
@@ -64,20 +63,17 @@ typedef struct {
     u32 dlc_theme_content_index;
     u32 use_theme_cache;
 
-    u8 _padding1[0x338 - 8 * sizeof(u32)];
+    u8 _padding1[0x338 - 8*sizeof(u32)];
 
     u32 shuffle_body_sizes[MAX_SHUFFLE_THEMES];
     u32 shuffle_music_sizes[MAX_SHUFFLE_THEMES];
 } ThemeManage_bin_s;
 
-Result theme_install(Entry_s * theme);
+Result theme_install(Entry_s theme);
-Result no_bgm_install(Entry_s * theme);
+Result no_bgm_install(Entry_s theme);
-Result bgm_install(Entry_s * theme);
+Result bgm_install(Entry_s theme);
 
-Result shuffle_install(const Entry_List_s * themes);
+Result shuffle_install(Entry_List_s themes);
-
-Result dump_current_theme(void);
-Result dump_all_themes(void);
 
 void themes_check_installed(void * void_arg);
 

include/ui_strings.h

@@ -1,189 +0,0 @@
-/*
-*   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#ifndef UISTRINGS_H
-#define UISTRINGS_H
-
-#include "colors.h"
-#include "draw.h"
-#include "common.h"
-
-#define SPLASHES_STRINGS 2
-#define THEMES_STRINGS 6
-
-typedef struct {
-    const char *quit;
-    const char *thread_error;
-    const char *zip_not_theme_splash;
-    const char *file_not_zip;
-    const char *download_failed;
-} Camera_Strings_s;
-
-typedef struct {
-    const char *theme_mode;
-    const char *splash_mode;
-    const char *no_themes;
-    const char *no_splashes;
-    const char *qr_download;
-    const char *switch_splashes;
-    const char *switch_themes;
-    const char *quit;
-    const char *by;
-    const char *selected;
-    const char *sel;
-    const char *tp_theme_mode;
-    const char *tp_splash_mode;
-    const char *search;
-    const char *page;
-    const char *err_quit;
-    const char *warn_continue;
-    const char *yes_no;
-    const char *load_themes;
-    const char *load_splash;
-    const char *load_icons;
-    const char *install_splash;
-    const char *delete_splash;
-    const char *install_theme;
-    const char *install_shuffle;
-    const char *install_bgm;
-    const char *install_no_bgm;
-    const char *downloading;
-    const char *checking_dl;
-    const char *delete_sd;
-    const char *download_themes;
-    const char *download_splashes;
-    const char *download_preview;
-    const char *download_bgm;
-    const char *dump_single;
-    const char *dump_all_official;
-    float start_pos;
-    const char *shuffle;
-} Draw_Strings_s;
-
-typedef struct {
-    const char *illegal_input;
-    const char *new_or_overwrite;
-    const char *cancel;
-    const char *overwrite;
-    const char *rename;
-    const char *swkbd_fail;
-    const char *sd_full;
-    const char *fs_error;
-} FS_Strings_s;
-
-typedef struct {
-    const char *no_preview;
-} Loading_Strings_s;
-
-typedef struct {
-    const char *position_too_big;
-    const char *position_zero;
-    const char *jump_q;
-    const char *cancel;
-    const char *jump;
-    const char *no_theme_extdata;
-    const char *loading_qr;
-    const char *no_wifi;
-    const char *qr_homebrew;
-    const char *camera_broke;
-    const char *too_many_themes;
-    const char *not_enough_themes;
-    const char *uninstall_confirm;
-    const char *delete_confirm;
-} Main_Strings_s;
-
-typedef struct {
-    const char *no_results;
-    const char *check_wifi;
-    const char *new_page_big;
-    const char *new_page_zero;
-    const char *jump_page;
-    const char *cancel;
-    const char *jump;
-    const char *tags;
-    const char *search;
-    const char *parental_fail;
-    const char *zip_not_found;
-    const char *generic_httpc_error;
-    const char *http303_tp;
-    const char *http303;
-    const char *http404;
-    const char *http_err_url;
-    const char *http_errcode_generic;
-    const char *http401;
-    const char *http403;
-    const char *http407;
-    const char *http414;
-    const char *http418;
-    const char *http426;
-    const char *http451;
-    const char *http500;
-    const char *http502;
-    const char *http503;
-    const char *http504;
-    const char *http_unexpected;
-} Remote_Strings_s;
-
-typedef struct {
-    const char *no_splash_found;
-    const char *splash_disabled;
-} Splashes_Strings_s;
-
-typedef struct {
-    const char *no_body_found;
-    const char *mono_warn;
-    const char *illegal_char;
-    const char *name_folder;
-    const char *cancel;
-    const char *done;
-} Themes_Strings_s;
-
-typedef struct {
-    Instructions_s normal_instructions[MODE_AMOUNT];
-    Instructions_s install_instructions;
-    Instructions_s extra_instructions[3];
-    Camera_Strings_s camera;
-    Draw_Strings_s draw;
-    FS_Strings_s fs;
-    Loading_Strings_s loading;
-    Main_Strings_s main;
-    Remote_Strings_s remote;
-    Instructions_s remote_instructions[MODE_AMOUNT];
-    Instructions_s remote_extra_instructions;
-    Splashes_Strings_s splashes;
-    Themes_Strings_s themes;
-} Language_s;
-
-typedef enum {
-    LANGUAGE_EN,
-
-    LANGUAGE_AMOUNT,
-} Language_Name;
-
-Language_s init_strings(CFG_Language lang);
-extern Language_s language;
-
-#endif

include/unicode.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,9 +29,9 @@
 
 #include "common.h"
 
-ssize_t strulen(const u16 *, ssize_t);
+ssize_t strulen(const u16*, ssize_t);
-void struacat(u16 * input, const char * addition);
+void struacat(u16 *input, const char *addition);
-void printu(u16 * input);
+void printu(u16 *input);
-u16 * strucat(u16 * destination, const u16 * source);
+u16 *strucat(u16 *destination, const u16 *source);
 
 #endif

include/urls.h

@@ -1,88 +0,0 @@
-/*
-*   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-static char from_hex(char c)
-{
-    return isdigit(c) ? c - '0' : tolower(c) - 'a' + 10;
-}
-
-static char to_hex(char code)
-{
-    static char hex[] = "0123456789abcdef";
-    return hex[code & 15];
-}
-
-// ensure caller frees
-char * url_escape(char * url)
-{
-    char * ptr = url;
-    char * buf = malloc(3 * strlen(url) + 1);
-    char * ptr_buf = buf;
-
-    while (*ptr)
-    {
-        if (isalnum((int)*ptr) || strchr("-_.~", *ptr))
-            *ptr_buf++ = *ptr;
-        else if (*ptr == ' ')
-            *ptr_buf++ = '+';
-        else
-        {
-            *ptr_buf++ = '%';
-            *ptr_buf++ = to_hex(*ptr >> 4);
-            *ptr_buf++ = to_hex(*ptr & 15);
-        }
-        ptr++;
-    }
-    *ptr_buf = '\0';
-    return buf;
-}
-
-// ensure caller frees
-char * url_unescape(char * url)
-{
-    char * ptr = url;
-    char * buf = malloc(strlen(url) + 1);
-    char * ptr_buf = buf;
-
-    while (*ptr)
-    {
-        if (*ptr == '%')
-        {
-            if (ptr[1] && ptr[2])
-            {
-                *ptr_buf++ = from_hex(ptr[1]) << 4 | from_hex(ptr[2]);
-                ptr += 2;
-            }
-        }
-        else if (*ptr == '+')
-            *ptr_buf++ = ' ';
-        else
-            *ptr_buf++ = *ptr;
-        ptr++;
-    }
-    *ptr_buf = '\0';
-    return buf;
-}

source/camera.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -32,68 +32,32 @@
 #include "fs.h"
 #include "loading.h"
 #include "remote.h"
-#include "ui_strings.h"
 
 #include <archive.h>
 #include <archive_entry.h>
 
-static void start_read(qr_data * data)
+void exit_qr(qr_data *data)
 {
-    LightLock_Lock(&data->mut);
+    DEBUG("Exiting QR\n");
-    while(data->writer_waiting || data->writer_active)
+    svcSignalEvent(data->cancel);
-    {
+    while(!data->finished)
-        CondVar_WaitTimeout(&data->cond, &data->mut, 1000000);
+       svcSleepThread(1000000);
-    }
+    svcCloseHandle(data->cancel);
+    data->capturing = false;
 
-    AtomicIncrement(&data->num_readers_active);
+    free(data->camera_buffer);
-    LightLock_Unlock(&data->mut);
+    free(data->tex);
-}
+    quirc_destroy(data->context);
-static void stop_read(qr_data * data)
-{
-    LightLock_Lock(&data->mut);
-    AtomicDecrement(&data->num_readers_active);
-    if(data->num_readers_active == 0)
-    {
-        CondVar_Signal(&data->cond);
-    }
-    LightLock_Unlock(&data->mut);
-}
-static void start_write(qr_data * data)
-{
-    LightLock_Lock(&data->mut);
-    data->writer_waiting = true;
-
-    while(data->num_readers_active)
-    {
-        CondVar_WaitTimeout(&data->cond, &data->mut, 1000000);
-    }
-
-    data->writer_waiting = false;
-    data->writer_active = true;
-
-    LightLock_Unlock(&data->mut);
-}
-static void stop_write(qr_data * data)
-{
-    LightLock_Lock(&data->mut);
-
-    data->writer_active = false;
-    CondVar_Broadcast(&data->cond);
-
-    LightLock_Unlock(&data->mut);
 }
 
-static void capture_cam_thread(void * arg)
+void capture_cam_thread(void *arg) 
 {
-    qr_data * data = (qr_data *) arg;
+    qr_data *data = (qr_data *) arg;
-
+    Handle events[3] = {0};
-    Handle cam_events[3] = {0};
+    events[0] = data->cancel;
-    cam_events[0] = data->event_stop;
-
     u32 transferUnit;
-    const u32 bufsz = 400 * 240 * sizeof(u16);
-    u16 * buffer = linearAlloc(bufsz);
 
+    u16 *buffer = calloc(1, 400 * 240 * sizeof(u16));
     camInit();
     CAMU_SetSize(SELECT_OUT1, SIZE_CTR_TOP_LCD, CONTEXT_A);
     CAMU_SetOutputFormat(SELECT_OUT1, OUTPUT_RGB_565, CONTEXT_A);
@@ -102,42 +66,38 @@ static void capture_cam_thread(void * arg)
     CAMU_SetAutoExposure(SELECT_OUT1, true);
     CAMU_SetAutoWhiteBalance(SELECT_OUT1, true);
     CAMU_Activate(SELECT_OUT1);
-    CAMU_GetBufferErrorInterruptEvent(&cam_events[2], PORT_CAM1);
+    CAMU_GetBufferErrorInterruptEvent(&events[2], PORT_CAM1);
     CAMU_SetTrimming(PORT_CAM1, false);
     CAMU_GetMaxBytes(&transferUnit, 400, 240);
     CAMU_SetTransferBytes(PORT_CAM1, transferUnit, 400, 240);
     CAMU_ClearBuffer(PORT_CAM1);
-    CAMU_SetReceiving(&cam_events[1], buffer, PORT_CAM1, bufsz, transferUnit);
+    CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), (s16) transferUnit);
     CAMU_StartCapture(PORT_CAM1);
-
+    svcSignalEvent(data->started);
     bool cancel = false;
-
     while (!cancel) 
     {
         s32 index = 0;
-        svcWaitSynchronizationN(&index, cam_events, 3, false, U64_MAX);
+        svcWaitSynchronizationN(&index, events, 3, false, U64_MAX);
         switch(index) {
             case 0:
                 DEBUG("Cancel event received\n");
                 cancel = true;
                 break;
             case 1:
-                svcCloseHandle(cam_events[1]);
+                svcCloseHandle(events[1]);
-                cam_events[1] = 0;
+                events[1] = 0;
-
+                svcWaitSynchronization(data->mutex, U64_MAX);
-                start_write(data);
+                memcpy(data->camera_buffer, buffer, 400 * 240 * sizeof(u16));
-                memcpy(data->camera_buffer, buffer, bufsz);
+                GSPGPU_FlushDataCache(data->camera_buffer, 400 * 240 * sizeof(u16));
-                data->any_update = true;
+                svcReleaseMutex(data->mutex);
-                stop_write(data);
+                CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), transferUnit);
-
-                CAMU_SetReceiving(&cam_events[1], buffer, PORT_CAM1, bufsz, transferUnit);
                 break;
             case 2:
-                svcCloseHandle(cam_events[1]);
+                svcCloseHandle(events[1]);
-                cam_events[1] = 0;
+                events[1] = 0;
-
                 CAMU_ClearBuffer(PORT_CAM1);
-                CAMU_SetReceiving(&cam_events[1], buffer, PORT_CAM1, bufsz, transferUnit);
+                CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), transferUnit);
                 CAMU_StartCapture(PORT_CAM1);
                 break;
             default:
@@ -155,204 +115,120 @@ static void capture_cam_thread(void * arg)
     CAMU_ClearBuffer(PORT_CAM1);
     CAMU_Activate(SELECT_NONE);
     camExit();
-
+    free(buffer);
-    linearFree(buffer);
+    for(int i = 0; i < 3; i++) {
-    for(int i = 1; i < 3; i++)
+        if(events[i] != 0) {
-    {
+            svcCloseHandle(events[i]);
-        if(cam_events[i] != 0) {
+            events[i] = 0;
-            svcCloseHandle(cam_events[i]);
-            cam_events[i] = 0;
         }
     }
-
+    svcCloseHandle(data->mutex);
-    LightEvent_Signal(&data->event_cam_info);
+    data->finished = true;
 }
 
-static void update_ui(void * arg)
+void update_ui(void *arg)
 {
-    qr_data * data = (qr_data *) arg;
+    qr_data* data = (qr_data*) arg;
-    C3D_Tex tex;
 
-    static const Tex3DS_SubTexture subt3x = { 400, 240, 0.0f, 1.0f, 400.0f/512.0f, 1.0f - (240.0f/256.0f) };
+    while (!data->finished)
-    C3D_TexInit(&tex, 512, 256, GPU_RGB565);
-
-    C3D_TexSetFilter(&tex, GPU_LINEAR, GPU_LINEAR);
-
-    while(svcWaitSynchronization(data->event_stop, 2 * 1000 * 1000ULL) == 0x09401BFE) // timeout of 2ms occured, still have 14 for copy and render
     {
         draw_base_interface();
 
         // Untiled texture loading code adapted from FBI
-        start_read(data);
+        svcWaitSynchronization(data->mutex, U64_MAX);
-        if(data->any_update)
+        for(u32 x = 0; x < 400 && !data->finished; x++) {
+            for(u32 y = 0; y < 256 && !data->finished; y++) {
+                u32 dstPos = ((((y >> 3) * (512 >> 3) + (x >> 3)) << 6) + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3))) * sizeof(u16);
+                u32 srcPos = (y * 400 + x) * sizeof(u16);
+
+                memcpy(&((u8*) data->image.tex->data)[dstPos], &((u8*) data->camera_buffer)[srcPos], sizeof(u16));
+            }
+        }
+
+        svcReleaseMutex(data->mutex);
+
+        if (data->finished)
         {
-            for(u32 y = 0; y < 240; y++) {
-                const u32 srcPos = y * 400;
-                for(u32 x = 0; x < 400; x++) {
-                    const u32 dstPos = ((((y >> 3) * (512 >> 3) + (x >> 3)) << 6) + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3)));
-
-                    ((u16 *)tex.data)[dstPos] = data->camera_buffer[srcPos + x];
-                }
-            }
-            data->any_update = false;
-        }
-        stop_read(data);
-
-        C2D_DrawImageAt((C2D_Image){ &tex, &subt3x }, 0.0f, 0.0f, 0.4f, NULL, 1.0f, 1.0f);
-
-        set_screen(bottom);
-        draw_text_center(GFX_BOTTOM, 4, 0.5, 0.5, 0.5, colors[COLOR_WHITE], language.camera.quit);
             end_frame();
         }
 
-    C3D_TexDelete(&tex);
+        C2D_DrawImageAt(data->image, 0.0f, 0.0f, 0.4f, NULL, 1.0f, 1.0f);
-    LightEvent_Signal(&data->event_ui_info);
+
+        set_screen(bottom);
+        draw_text_center(GFX_BOTTOM, 4, 0.5, 0.5, 0.5, colors[COLOR_WHITE], "Press \uE005 To Quit");
+        end_frame();
+    }
 }
 
-static bool start_capture_cam(qr_data * data) 
+bool start_capture_cam(qr_data *data) 
 {
-    if((data->cam_thread = threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, false)) == NULL)
+    data->mutex = 0;
-    {
+    data->cancel = 0;
-        throw_error(language.camera.thread_error, ERROR_LEVEL_ERROR);
+    svcCreateEvent(&data->cancel, RESET_STICKY);
-        LightEvent_Signal(&data->event_cam_info);
+    svcCreateMutex(&data->mutex, false);
-        LightEvent_Signal(&data->event_ui_info);
+    if(threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, true) == NULL)
         return false;
-    }
+    svcWaitSynchronization(data->started, U64_MAX);
-    if((data->ui_thread = threadCreate(update_ui, data, 0x10000, 0x1A, 1, false)) == NULL)
+    if(threadCreate(update_ui, data, 0x10000, 0x1A, 1, true) == NULL)
     {
-        LightEvent_Signal(&data->event_ui_info);
+        exit_qr(data);
         return false;
     }
     return true;
 }
 
-static bool update_qr(qr_data * data, struct quirc_data * scan_data)
+void update_qr(qr_data *data)
 {
+    hidScanInput();
+    if (hidKeysDown() & (KEY_R | KEY_B | KEY_TOUCH)) {
+        exit_qr(data);
+        return;
+    }
+
+    if (!data->capturing) {
+        if(start_capture_cam(data))
+            data->capturing = true;
+        else {
+            exit_qr(data);
+            return;
+        }
+
+    }
+
+    if (data->finished) {
+        exit_qr(data);
+        return;
+    }
+
     int w;
     int h;
-    u8 * image = (u8 *)quirc_begin(data->context, &w, &h);
+    u8 *image = (u8*) quirc_begin(data->context, &w, &h);
-
+    for (ssize_t x = 0; x < w; x++) {
-    start_read(data);
+        for (ssize_t y = 0; y < h; y++) {
-    for (int y = 0; y < h; y++) {
+            u16 px = data->camera_buffer[y * 400 + x];
-        const int actual_y = y * w;
+            image[y * w + x] = (u8)(((((px >> 11) & 0x1F) << 3) + (((px >> 5) & 0x3F) << 2) + ((px & 0x1F) << 3)) / 3);
-        for (int x = 0; x < w; x++) {
-            const int actual_off = actual_y + x;
-            const u16 px = data->camera_buffer[actual_off];
-            image[actual_off] = (u8)(((((px >> 11) & 0x1F) << 3) + (((px >> 5) & 0x3F) << 2) + ((px & 0x1F) << 3)) / 3);
         }
     }
-    stop_read(data);
-
     quirc_end(data->context);
     if(quirc_count(data->context) > 0)
     {
         struct quirc_code code;
+        struct quirc_data scan_data;
         quirc_extract(data->context, 0, &code);
-        if (!quirc_decode(&code, scan_data))
+        if (!quirc_decode(&code, &scan_data))
         {
-            return true;
+            exit_qr(data);
-        }
-    }
 
-    return false;
-}
-
-static void start_qr(qr_data * data)
-{
-    svcCreateEvent(&data->event_stop, RESET_STICKY);
-    LightEvent_Init(&data->event_cam_info, RESET_STICKY);
-    LightEvent_Init(&data->event_ui_info, RESET_STICKY);
-    LightLock_Init(&data->mut);
-    CondVar_Init(&data->cond);
-
-    data->cam_thread = NULL;
-    data->ui_thread = NULL;
-    data->any_update = false;
-
-    data->context = quirc_new();
-    quirc_resize(data->context, 400, 240);
-    data->camera_buffer = calloc(1, 400 * 240 * sizeof(u16));
-}
-static void exit_qr(qr_data * data)
-{
-    svcSignalEvent(data->event_stop);
-
-    LightEvent_Wait(&data->event_ui_info);
-    LightEvent_Clear(&data->event_ui_info);
-    if(data->ui_thread != NULL)
-    {
-        threadJoin(data->ui_thread, U64_MAX);
-        threadFree(data->ui_thread);
-        data->ui_thread = NULL;
-    }
-
-    LightEvent_Wait(&data->event_cam_info);
-    LightEvent_Clear(&data->event_cam_info);
-    if(data->cam_thread != NULL)
-    {
-        threadJoin(data->cam_thread, U64_MAX);
-        threadFree(data->cam_thread);
-        data->cam_thread = NULL;
-    }
-
-    free(data->camera_buffer);
-    data->camera_buffer = NULL;
-    svcCloseHandle(data->event_stop);
-    data->event_stop = 0;
-}
-
-bool init_qr(void)
-{
-    qr_data data;
-
-    memset(&data, 0, sizeof(data));
-
-    start_qr(&data);
-
-    struct quirc_data * scan_data = calloc(1, sizeof(struct quirc_data)); 
-    const bool ready = start_capture_cam(&data);
-    bool finished = !ready;
-
-    while(!finished)
-    {
-        hidScanInput();
-        if (hidKeysDown() & (KEY_R | KEY_B | KEY_TOUCH))
-        {
-            break;
-        }
-
-        finished = update_qr(&data, scan_data);
-        svcSleepThread(50 * 1000 * 1000ULL); // only scan every 50ms
-    }
-
-    exit_qr(&data);
-
-    bool success = false;
-    if(finished && ready)
-    {
             draw_install(INSTALL_DOWNLOAD);
             char * zip_buf = NULL;
             char * filename = NULL;
-        u32 zip_size;
+            u32 zip_size = http_get((char*)scan_data.payload, &filename, &zip_buf, INSTALL_DOWNLOAD);
-
-        Result res = http_get((char*)scan_data->payload, &filename, &zip_buf, &zip_size, INSTALL_DOWNLOAD, "application/zip; application/x-zip-compressed");
-        if (R_FAILED(res))
-        {
-            free(filename);
-            free(zip_buf);
-            return false;
-        }
-        else if (R_DESCRIPTION(res) == RD_NO_DATA || R_DESCRIPTION(res) == RD_CANCEL_REQUESTED)
-        {
-            free(filename);
-            return true;
-        }
 
             if(zip_size != 0)
             {
                 draw_install(INSTALL_CHECKING_DOWNLOAD);
 
-            struct archive * a = archive_read_new();
+                struct archive *a = archive_read_new();
                 archive_read_support_format_zip(a);
 
                 int r = archive_read_open_memory(a, zip_buf, zip_size);
@@ -393,29 +269,59 @@ bool init_qr(void)
 
                     if(mode != MODE_AMOUNT)
                     {
-                    save_zip_to_sd(filename, zip_size, zip_buf, mode);
+                        char path_to_file[0x107] = {0};
-                    success = true;
+                        sprintf(path_to_file, "%s%s", main_paths[mode], filename);
+                        char * extension = strrchr(path_to_file, '.');
+                        if (extension == NULL || strcmp(extension, ".zip"))
+                            strcat(path_to_file, ".zip");
+
+                        remake_file(fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_size);
+                        buf_to_file(zip_size, fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_buf);
+                        data->success = true;
                     }
                     else
                     {
-                    throw_error(language.camera.zip_not_theme_splash, ERROR_LEVEL_WARNING);
+                        throw_error("Zip downloaded is neither\na splash nor a theme.", ERROR_LEVEL_WARNING);
                     }
                 }
                 else
                 {
-                throw_error(language.camera.file_not_zip, ERROR_LEVEL_WARNING);
+                    throw_error("File downloaded isn't a zip.", ERROR_LEVEL_WARNING);
                 }
-            free(zip_buf);
             }
             else
             {
-            throw_error(language.camera.download_failed, ERROR_LEVEL_WARNING);
+                throw_error("Download failed.", ERROR_LEVEL_WARNING);
             }
 
             free(filename);
+            free(zip_buf);
+        }   
     }
 
-    free(scan_data);
+}
-    quirc_destroy(data.context);
+
+bool init_qr(void)
+{
+    qr_data *data = calloc(1, sizeof(qr_data));
+    data->capturing = false;
+    data->finished = false;
+    svcCreateEvent(&data->started, RESET_STICKY);
+    
+    data->context = quirc_new();
+    quirc_resize(data->context, 400, 240);
+
+    data->camera_buffer = calloc(1, 400 * 240 * sizeof(u16));
+
+    data->tex = (C3D_Tex*)malloc(sizeof(C3D_Tex));
+    static const Tex3DS_SubTexture subt3x = { 512, 256, 0.0f, 1.0f, 1.0f, 0.0f };
+    data->image = (C2D_Image){ data->tex, &subt3x };
+    C3D_TexInit(data->image.tex, 512, 256, GPU_RGB565);
+    C3D_TexSetFilter(data->image.tex, GPU_LINEAR, GPU_LINEAR);
+
+    while (!data->finished) update_qr(data);
+    bool success = data->success;
+    free(data);
+
     return success;
 }

source/colors.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

source/conversion.c

@@ -1,129 +0,0 @@
-#include "conversion.h"
-#include "draw.h"
-
-#include <png.h>
-
-static void rotate_agbr_counterclockwise(char ** bufp, size_t size, size_t width)
-{
-    uint32_t * buf = (uint32_t*)*bufp;
-    uint32_t * out = malloc(size);
-
-    size_t pixel_count = (size/4);
-    size_t height = pixel_count/width;
-
-    for (uint32_t h = 0; h < height; ++h)
-    {
-        for (uint32_t w = 0; w < width; ++w)
-        {
-            size_t buf_index = (w + (h * width));
-            size_t out_index = (height * (width-1)) - (height * w) + h;
-
-            out[out_index] = buf[buf_index];
-        }
-    }
-
-    free(*bufp);
-    *bufp = (char*)out;
-}
-
-size_t bin_to_abgr(char ** bufp, size_t size)
-{
-    size_t out_size = (size / 3) * 4;
-    char* buf = malloc(out_size);
-
-    for (size_t i = 0, j = 0; i < size; i+=3, j+=4)
-    {
-        (buf+j)[0] = 0xFF;         // A
-        (buf+j)[1] = (*bufp+i)[0]; // B
-        (buf+j)[2] = (*bufp+i)[1]; // G
-        (buf+j)[3] = (*bufp+i)[2]; // R
-    }
-    free(*bufp);
-    *bufp = buf;
-
-    // splash screens contain the raw framebuffer to put on the screen
-    // because the screens are mounted at a 90 degree angle we also need to rotate
-    // the output
-    rotate_agbr_counterclockwise(bufp, out_size, 240);
-
-    return out_size;
-}
-
-size_t png_to_abgr(char ** bufp, size_t size, u32 *height)
-{
-    size_t out_size = 0;
-    if(size < 8 || png_sig_cmp((png_bytep)*bufp, 0, 8))
-    {
-        throw_error("Invalid preview.png", ERROR_LEVEL_WARNING);
-        return out_size;
-    }
-
-    uint32_t * buf = (uint32_t*)*bufp;
-
-    FILE * fp = fmemopen(buf, size, "rb");;
-    png_bytep * row_pointers = NULL;
-
-    png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-    png_infop info = png_create_info_struct(png);
-
-    png_init_io(png, fp);
-    png_read_info(png, info);
-
-    u32 width = png_get_image_width(png, info);
-    *height = png_get_image_height(png, info);
-
-    png_byte color_type = png_get_color_type(png, info);
-    png_byte bit_depth  = png_get_bit_depth(png, info);
-
-    // Read any color_type into 8bit depth, ABGR format.
-    // See http://www.libpng.org/pub/png/libpng-manual.txt
-
-    if(bit_depth == 16)
-        png_set_strip_16(png);
-
-    if(color_type == PNG_COLOR_TYPE_PALETTE)
-        png_set_palette_to_rgb(png);
-
-    // PNG_COLOR_TYPE_GRAY_ALPHA is always 8 or 16bit depth.
-    if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-        png_set_expand_gray_1_2_4_to_8(png);
-
-    if(png_get_valid(png, info, PNG_INFO_tRNS))
-        png_set_tRNS_to_alpha(png);
-
-    // These color_type don't have an alpha channel then fill it with 0xff.
-    if(color_type == PNG_COLOR_TYPE_RGB ||
-       color_type == PNG_COLOR_TYPE_GRAY ||
-       color_type == PNG_COLOR_TYPE_PALETTE)
-        png_set_add_alpha(png, 0xFF, PNG_FILLER_BEFORE);
-
-    if(color_type == PNG_COLOR_TYPE_GRAY ||
-       color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-        png_set_gray_to_rgb(png);
-
-    //output ABGR
-    png_set_bgr(png);
-    png_set_swap_alpha(png);
-
-    png_read_update_info(png, info);
-
-    row_pointers = malloc(sizeof(png_bytep) * *height);
-    out_size = sizeof(u32) * (width * *height);
-    u32 * out = malloc(out_size);
-    for(u32 y = 0; y < *height; y++)
-    {
-        row_pointers[y] = (png_bytep)(out + (width * y));
-    }
-
-    png_read_image(png, row_pointers);
-
-    png_destroy_read_struct(&png, &info, NULL);
-
-    if (fp) fclose(fp);
-    if (row_pointers) free(row_pointers);
-
-    free(*bufp);
-    *bufp = (char*)out;
-
-    return out_size;
-}

source/draw.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -27,14 +27,13 @@
 #include "draw.h"
 #include "unicode.h"
 #include "colors.h"
-#include "ui_strings.h"
 
 #include "sprites.h"
 
 #include <time.h>
 
-C3D_RenderTarget * top;
+C3D_RenderTarget* top;
-C3D_RenderTarget * bottom;
+C3D_RenderTarget* bottom;
 C2D_TextBuf staticBuf, dynamicBuf;
 static C2D_TextBuf widthBuf;
 
@@ -78,56 +77,54 @@ void init_screens(void)
 
     C2D_TextParse(&text[TEXT_VERSION], staticBuf, VERSION);
 
-    C2D_TextParse(&text[TEXT_THEME_MODE], staticBuf, language.draw.theme_mode);
+    C2D_TextParse(&text[TEXT_THEME_MODE], staticBuf, "Theme mode");
-    C2D_TextParse(&text[TEXT_SPLASH_MODE], staticBuf, language.draw.splash_mode);
+    C2D_TextParse(&text[TEXT_SPLASH_MODE], staticBuf, "Splash mode");
 
-    C2D_TextParse(&text[TEXT_NO_THEME_FOUND], staticBuf, language.draw.no_themes);
+    C2D_TextParse(&text[TEXT_NO_THEME_FOUND], staticBuf, "No theme found");
-    C2D_TextParse(&text[TEXT_NO_SPLASH_FOUND], staticBuf, language.draw.no_splashes);
+    C2D_TextParse(&text[TEXT_NO_SPLASH_FOUND], staticBuf, "No splash found");
 
-    C2D_TextParse(&text[TEXT_DOWNLOAD_FROM_QR], staticBuf, language.draw.qr_download);
+    C2D_TextParse(&text[TEXT_DOWNLOAD_FROM_QR], staticBuf, "Press \uE005 to download from QR");
 
-    C2D_TextParse(&text[TEXT_SWITCH_TO_SPLASHES], staticBuf, language.draw.switch_splashes);
+    C2D_TextParse(&text[TEXT_SWITCH_TO_SPLASHES], staticBuf, "Or \uE004 to switch to splashes");
-    C2D_TextParse(&text[TEXT_SWITCH_TO_THEMES], staticBuf, language.draw.switch_themes);
+    C2D_TextParse(&text[TEXT_SWITCH_TO_THEMES], staticBuf, "Or \uE004 to switch to themes");
 
-    C2D_TextParse(&text[TEXT_OR_START_TO_QUIT], staticBuf, language.draw.quit);
+    C2D_TextParse(&text[TEXT_OR_START_TO_QUIT], staticBuf, "Or        to quit");
 
-    C2D_TextParse(&text[TEXT_BY_AUTHOR], staticBuf, language.draw.by);
+    C2D_TextParse(&text[TEXT_BY_AUTHOR], staticBuf, "By ");
-    C2D_TextParse(&text[TEXT_SELECTED], staticBuf, language.draw.selected);
+    C2D_TextParse(&text[TEXT_SELECTED], staticBuf, "Selected:");
-    C2D_TextParse(&text[TEXT_SELECTED_SHORT], staticBuf, language.draw.sel);
+    C2D_TextParse(&text[TEXT_SELECTED_SHORT], staticBuf, "Sel.:");
 
-    C2D_TextParse(&text[TEXT_THEMEPLAZA_THEME_MODE], staticBuf, language.draw.tp_theme_mode);
+    C2D_TextParse(&text[TEXT_THEMEPLAZA_THEME_MODE], staticBuf, "ThemePlaza Theme mode");
-    C2D_TextParse(&text[TEXT_THEMEPLAZA_SPLASH_MODE], staticBuf, language.draw.tp_splash_mode);
+    C2D_TextParse(&text[TEXT_THEMEPLAZA_SPLASH_MODE], staticBuf, "ThemePlaza Splash mode");
 
-    C2D_TextParse(&text[TEXT_SEARCH], staticBuf, language.draw.search);
+    C2D_TextParse(&text[TEXT_SEARCH], staticBuf, "Search...");
-    C2D_TextParse(&text[TEXT_PAGE], staticBuf, language.draw.page);
+    C2D_TextParse(&text[TEXT_PAGE], staticBuf, "Page:");
 
-    C2D_TextParse(&text[TEXT_ERROR_QUIT], staticBuf, language.draw.err_quit);
+    C2D_TextParse(&text[TEXT_ERROR_QUIT], staticBuf, "Press \uE000 to quit.");
-    C2D_TextParse(&text[TEXT_ERROR_CONTINUE], staticBuf, language.draw.warn_continue);
+    C2D_TextParse(&text[TEXT_ERROR_CONTINUE], staticBuf, "Press \uE000 to continue.");
 
-    C2D_TextParse(&text[TEXT_CONFIRM_YES_NO], staticBuf, language.draw.yes_no);
+    C2D_TextParse(&text[TEXT_CONFIRM_YES_NO], staticBuf, "\uE000 Yes   \uE001 No");
 
-    C2D_TextParse(&text[TEXT_INSTALL_LOADING_THEMES], staticBuf, language.draw.load_themes);
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_THEMES], staticBuf, "Loading themes, please wait...");
-    C2D_TextParse(&text[TEXT_INSTALL_LOADING_SPLASHES], staticBuf, language.draw.load_splash);
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_SPLASHES], staticBuf, "Loading splashes, please wait...");
-    C2D_TextParse(&text[TEXT_INSTALL_LOADING_ICONS], staticBuf, language.draw.load_icons);
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_ICONS], staticBuf, "Loading icons, please wait...");
 
-    C2D_TextParse(&text[TEXT_INSTALL_SPLASH], staticBuf, language.draw.install_splash);
+    C2D_TextParse(&text[TEXT_INSTALL_SPLASH], staticBuf, "Installing a splash...");
-    C2D_TextParse(&text[TEXT_INSTALL_SPLASH_DELETE], staticBuf, language.draw.delete_splash);
+    C2D_TextParse(&text[TEXT_INSTALL_SPLASH_DELETE], staticBuf, "Deleting installed splash...");
 
-    C2D_TextParse(&text[TEXT_INSTALL_SINGLE], staticBuf, language.draw.install_theme);
+    C2D_TextParse(&text[TEXT_INSTALL_SINGLE], staticBuf, "Installing a single theme...");
-    C2D_TextParse(&text[TEXT_INSTALL_SHUFFLE], staticBuf, language.draw.install_shuffle);
+    C2D_TextParse(&text[TEXT_INSTALL_SHUFFLE], staticBuf, "Installing shuffle themes...");
-    C2D_TextParse(&text[TEXT_INSTALL_BGM], staticBuf, language.draw.install_bgm);
+    C2D_TextParse(&text[TEXT_INSTALL_BGM], staticBuf, "Installing BGM-only theme...");
-    C2D_TextParse(&text[TEXT_INSTALL_NO_BGM], staticBuf, language.draw.install_no_bgm);
+    C2D_TextParse(&text[TEXT_INSTALL_NO_BGM], staticBuf, "Installing theme without BGM...");
 
-    C2D_TextParse(&text[TEXT_INSTALL_DOWNLOAD], staticBuf, language.draw.downloading);
+    C2D_TextParse(&text[TEXT_INSTALL_DOWNLOAD], staticBuf, "Downloading...");
-    C2D_TextParse(&text[TEXT_INSTALL_CHECKING_DOWNLOAD], staticBuf, language.draw.checking_dl);
+    C2D_TextParse(&text[TEXT_INSTALL_CHECKING_DOWNLOAD], staticBuf, "Checking downloaded file...");
-    C2D_TextParse(&text[TEXT_INSTALL_ENTRY_DELETE], staticBuf, language.draw.delete_sd);
+    C2D_TextParse(&text[TEXT_INSTALL_ENTRY_DELETE], staticBuf, "Deleting from SD...");
 
-    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_THEMES], staticBuf, language.draw.download_themes);
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_THEMES], staticBuf, "Downloading theme list, please wait...");
-    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_SPLASHES], staticBuf, language.draw.download_splashes);
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_SPLASHES], staticBuf, "Downloading splash list, please wait...");
-    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_PREVIEW], staticBuf, language.draw.download_preview);
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_PREVIEW], staticBuf, "Downloading preview, please wait...");
-    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_BGM], staticBuf, language.draw.download_bgm);
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_BGM], staticBuf, "Downloading BGM, please wait...");
-    C2D_TextParse(&text[TEXT_INSTALL_DUMPING_THEME], staticBuf, language.draw.dump_single);
-    C2D_TextParse(&text[TEXT_INSTALL_DUMPING_ALL_THEMES], staticBuf, language.draw.dump_all_official);
 
     for(int i = 0; i < TEXT_AMOUNT; i++)
         C2D_TextOptimize(&text[i]);
@@ -168,15 +165,6 @@ 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);
 }
 
-void draw_home(u64 start_time, u64 cur_time)
-{
-    float time_sec = (cur_time - start_time)/1000.0f;
-    float alpha = fmin(-1.333f * time_sec * time_sec + 2.666f * time_sec, 1.0f); // Quadratic regression to create fade effect
-    C2D_ImageTint tint = {};
-    C2D_AlphaImageTint(&tint, alpha);
-    C2D_DrawImageAt(C2D_SpriteSheetGetImage(spritesheet, sprites_no_home_idx), (320-64)/2, (240-64)/2, 1.0f, &tint, 1.0f, 1.0f);
-}
-
 static void get_text_dimensions(const char * text, float scaleX, float scaleY, float * width, float * height)
 {
     C2D_Text c2d_text;
@@ -286,7 +274,7 @@ void draw_base_interface(void)
     set_screen(top);
 }
 
-void throw_error(const char * error, ErrorLevel level)
+void throw_error(char* error, ErrorLevel level)
 {
     Text bottom_text = TEXT_AMOUNT;
     Color text_color = COLOR_WHITE;
@@ -312,19 +300,19 @@ void throw_error(const char * error, ErrorLevel level)
 
         draw_base_interface();
         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], &text[bottom_text]);
+        draw_c2d_text_center(GFX_TOP, 150, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[bottom_text]);
         end_frame();
 
         if(kDown & KEY_A) break;
     }
 }
 
-bool draw_confirm(const char * conf_msg, Entry_List_s * list, DrawMode draw_mode)
+bool draw_confirm(const char* conf_msg, Entry_List_s* list)
 {
     while(aptMainLoop())
     {
         Instructions_s instructions = {0};
-        draw_interface(list, instructions, draw_mode);
+        draw_interface(list, instructions);
         set_screen(top);
         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], &text[TEXT_CONFIRM_YES_NO]);
@@ -369,7 +357,7 @@ void draw_loading_bar(u32 current, u32 max, InstallType type)
     draw_base_interface();
     draw_install_handler(type);
     set_screen(bottom);
-    double percent = 100 * ((double)current / (double)max);
+    double percent = 100*((double)current/(double)max);
     u32 width = (u32)percent;
     width *= 2;
     C2D_DrawRectSolid(60-1, 110-1, 0.5f, 200+2, 20+2, colors[COLOR_CURSOR]);
@@ -443,13 +431,13 @@ void draw_text_wrap(float x, float y, float z, float scaleX, float scaleY, Color
             continue;
         }
 
-        if((consumed = decode_utf8(&codepoint, (unsigned char *)text)) == -1)
+        if((consumed = decode_utf8(&codepoint, (unsigned char*)text)) == -1)
             break;
 
-        float character_width = scaleX * (fontGetCharWidthInfo(NULL, fontGlyphIndexFromCodePoint(NULL, codepoint))->charWidth);
+        float character_width = scaleX * (fontGetCharWidthInfo(fontGlyphIndexFromCodePoint(codepoint))->charWidth);
         if((current_width += character_width) > max_width)
         {
-            char * last_space = NULL;
+            char* last_space = NULL;
             for(int i = idx; i >= 0; i--)
             {
                 if(result[i] == ' ')
@@ -499,27 +487,27 @@ void draw_text_wrap_scaled(float x, float y, float z, Color color, const char *
 static void draw_entry_info(Entry_s * entry)
 {
     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], &text[TEXT_BY_AUTHOR]);
     float width = 0;
     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], author);
 
     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], title);
 
     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], 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)
 {
     draw_base_interface();
     EntryMode current_mode = list->mode;
 
-    C2D_Text * mode_string[MODE_AMOUNT] = {
+    C2D_Text* mode_string[MODE_AMOUNT] = {
         &text[TEXT_THEMEPLAZA_THEME_MODE],
         &text[TEXT_THEMEPLAZA_SPLASH_MODE],
     };
@@ -536,7 +524,7 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
 
     draw_c2d_text(7, 3, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[TEXT_SEARCH]);
 
-    draw_image(sprites_back_idx, 320-96, 0);
+    draw_image(sprites_list_idx, 320-96, 0);
     draw_image(sprites_exit_idx, 320-72, 0);
     draw_image(sprites_preview_idx, 320-48, 0);
 
@@ -552,7 +540,7 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
         current_entry = &list->entries[i];
 
         char name[0x41] = {0};
-        utf16_to_utf8((u8 *)name, current_entry->name, 0x40);
+        utf16_to_utf8((u8*)name, current_entry->name, 0x40);
 
         int vertical_offset = 0;
         int horizontal_offset = i - list->scroll;
@@ -564,16 +552,13 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
         vertical_offset += 24;
         horizontal_offset += 16;
 
-
+        if(!current_entry->placeholder_color)
-        if(current_entry->placeholder_color == 0)
         {
-            const C2D_Image image = get_icon_at(list, i);
+            C2D_Image * image = list->icons[i];
-            C2D_DrawImageAt(image, horizontal_offset, vertical_offset, 0.5f, NULL, 1.0f, 1.0f);
+            C2D_DrawImageAt(*image, horizontal_offset, vertical_offset, 0.5f, NULL, 1.0f, 1.0f);
         }
         else
-        {
             C2D_DrawRectSolid(horizontal_offset, vertical_offset, 0.5f, list->entry_size, list->entry_size, current_entry->placeholder_color);
-        }
 
         if(i == selected_entry)
         {
@@ -585,11 +570,6 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
         }
     }
 
-    if (extra_mode)
-    {
-        C2D_DrawRectSolid(0, 24, 0.6f, 320, 240-48, C2D_Color32(0, 0, 0, 128));
-    }
-
     char entries_count_str[0x20] = {0};
     sprintf(entries_count_str, "/%"  JSON_INTEGER_FORMAT, list->tp_page_count);
     float x = 316;
@@ -607,21 +587,21 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int e
     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)
 {
     draw_base_interface();
     EntryMode current_mode = list->mode;
 
-    C2D_Text * mode_string[MODE_AMOUNT] = {
+    C2D_Text* mode_string[MODE_AMOUNT] = {
         &text[TEXT_THEME_MODE],
         &text[TEXT_SPLASH_MODE],
     };
 
     draw_c2d_text_center(GFX_TOP, 4, 0.5f, 0.5f, 0.5f, colors[COLOR_WHITE], mode_string[current_mode]);
 
-    if(list->entries == NULL || list->entries_count == 0)
+    if(list->entries == NULL)
     {
-        C2D_Text * mode_found_string[MODE_AMOUNT] = {
+        C2D_Text* mode_found_string[MODE_AMOUNT] = {
             &text[TEXT_NO_THEME_FOUND],
             &text[TEXT_NO_SPLASH_FOUND],
         };
@@ -629,7 +609,7 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
         draw_c2d_text_center(GFX_TOP, 80, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], mode_found_string[current_mode]);
         draw_c2d_text_center(GFX_TOP, 110, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], &text[TEXT_DOWNLOAD_FROM_QR]);
 
-        C2D_Text * mode_switch_string[MODE_AMOUNT] = {
+        C2D_Text* mode_switch_string[MODE_AMOUNT] = {
             &text[TEXT_SWITCH_TO_SPLASHES],
             &text[TEXT_SWITCH_TO_THEMES],
         };
@@ -639,16 +619,18 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
 
         C2D_ImageTint yellow_tint;
         C2D_PlainImageTint(&yellow_tint, colors[COLOR_YELLOW], 1.0f);
-        C2D_SpriteSetPos(&sprite_start, language.draw.start_pos, 173);
+        C2D_SpriteSetPos(&sprite_start, 162, 173);
         C2D_SpriteSetScale(&sprite_start, 1.25f, 1.4f);
         C2D_DrawSpriteTinted(&sprite_start, &yellow_tint);
         C2D_SpriteSetScale(&sprite_start, 1.0f, 1.0f);
 
         set_screen(bottom);
 
-        draw_image(sprites_qr_idx, 320-96, 0);
+        draw_image(sprites_sort_idx, 320-144, 0);
-        draw_image(sprites_browse_idx, 320-72, 0);
+        draw_image(sprites_download_idx, 320-120, 0);
-        draw_image(sprites_exit_idx, 320-48, 0);
+        draw_image(sprites_browse_idx, 320-96, 0);
+        draw_image(sprites_exit_idx, 320-72, 0);
+        draw_image(sprites_preview_idx, 320-48, 0);
 
         draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
 
@@ -666,46 +648,23 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
     if(current_mode == MODE_THEMES)
     {
         char * shuffle_count_string = NULL;
-        asprintf(&shuffle_count_string, language.draw.shuffle, list->shuffle_count);
+        asprintf(&shuffle_count_string, "Shuffle: %i/10", list->shuffle_count);
         draw_text(7, 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);
     }
 
-    if (draw_mode == DRAW_MODE_LIST)
+    draw_image(sprites_sort_idx, 320-144, 0);
-    {
+    draw_image(sprites_download_idx, 320-120, 0);
-        draw_image(sprites_install_idx, 320-120, 0);
+    draw_image(sprites_browse_idx, 320-96, 0);
-        draw_image(sprites_qr_idx, 320-96, 0);
     draw_image(sprites_exit_idx, 320-72, 0);
     draw_image(sprites_preview_idx, 320-48, 0);
+
     draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
-        draw_image(sprites_menu_idx, 320-144, 0);
-        if (current_mode == MODE_THEMES)
-        {
-            draw_image(sprites_shuffle_idx, 320-168, 0);
-        }
-    }
-    else
-    {
-        if (draw_mode == DRAW_MODE_INSTALL)
-        {
-            draw_image(sprites_install_idx, 320-24, 0);
-            draw_image(sprites_shuffle_idx, 320-48, 0);
-            draw_image(sprites_shuffle_no_bgm_idx, 320-72, 0);
-            draw_image(sprites_bgm_only_idx, 320-96, 0);
-            draw_image(sprites_back_idx, 320-120, 0);
-        } else if (draw_mode == DRAW_MODE_EXTRA)
-        {
-            draw_image(sprites_browse_idx, 320-24, 0);
-            draw_image(sprites_dump_idx, 320-48, 0);
-            draw_image(sprites_sort_idx, 320-72, 0);
-            draw_image(sprites_back_idx, 320-96, 0);
-        }
-    }
 
     // Show arrows if there are themes out of bounds
     //----------------------------------------------------------------
     if(list->scroll > 0)
-        draw_image(sprites_arrow_up_idx, 136, 220);
+        draw_image(sprites_arrow_up_idx, 152, 4);
     if(list->scroll + list->entries_loaded < list->entries_count)
         draw_image(sprites_arrow_down_idx, 152, 220);
 
@@ -716,7 +675,7 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
         current_entry = &list->entries[i];
 
         char name[0x41] = {0};
-        utf16_to_utf8((u8 *)name, current_entry->name, 0x40);
+        utf16_to_utf8((u8*)name, current_entry->name, 0x40);
 
         int vertical_offset = i - list->scroll;
         int horizontal_offset = 0;
@@ -754,17 +713,14 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
             C2D_DrawSpriteTinted(&sprite_installed, &tint);
         }
 
-        if(current_entry->placeholder_color == 0)
+        if(!current_entry->placeholder_color)
         {
-            C2D_Image image;
+            C2D_Image * image = NULL;
-            if(list->entries_count > list->entries_loaded * ICONS_OFFSET_AMOUNT)
+            if(list->entries_count > list->entries_loaded*ICONS_OFFSET_AMOUNT)
-            {
+                image = list->icons[ICONS_VISIBLE*list->entries_loaded + (i - list->scroll)];
-                const int offset_to_visible_icons = ICONS_VISIBLE * list->entries_loaded;
-                image = get_icon_at(list, offset_to_visible_icons + (i - list->scroll));
-            }
             else
-                image = get_icon_at(list, i);
+                image = list->icons[i];
-            C2D_DrawImageAt(image, horizontal_offset, vertical_offset, 0.5f, NULL, 1.0f, 1.0f);
+            C2D_DrawImageAt(*image, horizontal_offset, vertical_offset, 0.5f, NULL, 1.0f, 1.0f);
         }
         else
         {
@@ -790,8 +746,4 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
         draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_SELECTED]);
     else
         draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_SELECTED_SHORT]);
-    if(draw_mode != DRAW_MODE_LIST)
-    {
-        C2D_DrawRectSolid(0, 24, 1.0f, 320, 240-48, C2D_Color32(0, 0, 0, 128));
-    }
 }

source/entries_list.c

@@ -1,231 +0,0 @@
-/*
-*   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-#include "entries_list.h"
-#include "loading.h"
-#include "draw.h"
-#include "fs.h"
-#include "unicode.h"
-
-void delete_entry(Entry_s * entry, bool is_file)
-{
-    if(is_file)
-        FSUSER_DeleteFile(ArchiveSD, fsMakePath(PATH_UTF16, entry->path));
-    else
-        FSUSER_DeleteDirectoryRecursively(ArchiveSD, fsMakePath(PATH_UTF16, entry->path));
-}
-
-u32 load_data(const char * filename, const Entry_s * entry, char ** buf)
-{
-    if(entry->is_zip)
-    {
-        return zip_file_to_buf(filename + 1, entry->path, buf); //the first character will always be '/' because of the other case
-    }
-    else
-    {
-        u16 path[0x106] = {0};
-        strucat(path, entry->path);
-        struacat(path, filename);
-
-        return file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, buf);
-    }
-}
-
-C2D_Image get_icon_at(Entry_List_s * list, size_t index)
-{
-    return (C2D_Image){
-        .tex = &list->icons_texture,
-        .subtex = &list->icons_info[index].subtex,
-    };
-}
-
-static int compare_entries_base(const Entry_s * const a, const Entry_s * const b)
-{
-    // entry->placeholder_color == 0 means it is not filled (no name, author, description)
-    // if a is filled and b is filled, return == 0
-    // if a is not filled and b is not filled, return == 0
-    // if a is not filled, return < 0
-    // if b is an unfilled entry, return > 0
-    return ((int)(a->placeholder_color != 0)) - ((int)(b->placeholder_color != 0));
-}
-
-typedef int (*sort_comparator)(const void *, const void *);
-static int compare_entries_by_name(const void * a, const void * b)
-{
-    const Entry_s * const entry_a = (const Entry_s *)a;
-    const Entry_s * const entry_b = (const Entry_s *)b;
-    const int base = compare_entries_base(entry_a, entry_b);
-    if(base)
-        return base;
-
-    return memcmp(entry_a->name, entry_b->name, 0x40 * sizeof(u16));
-}
-static int compare_entries_by_author(const void * a, const void * b)
-{
-    const Entry_s * const entry_a = (const Entry_s *)a;
-    const Entry_s * const entry_b = (const Entry_s *)b;
-    const int base = compare_entries_base(entry_a, entry_b);
-    if(base)
-        return base;
-
-    return memcmp(entry_a->author, entry_b->author, 0x40 * sizeof(u16));
-}
-static int compare_entries_by_filename(const void * a, const void * b)
-{
-    const Entry_s * const entry_a = (const Entry_s *)a;
-    const Entry_s * const entry_b = (const Entry_s *)b;
-    const int base = compare_entries_base(entry_a, entry_b);
-    if(base)
-        return base;
-
-    return memcmp(entry_a->path, entry_b->path, 0x106 * sizeof(u16));
-}
-
-static void sort_list(Entry_List_s * list, sort_comparator compare_entries)
-{
-    if(list->entries != NULL && list->entries != NULL)
-        qsort(list->entries, list->entries_count, sizeof(Entry_s), compare_entries); //alphabet sort
-}
-
-void sort_by_name(Entry_List_s * list)
-{
-    sort_list(list, compare_entries_by_name);
-    list->current_sort = SORT_NAME;
-}
-void sort_by_author(Entry_List_s * list)
-{
-    sort_list(list, compare_entries_by_author);
-    list->current_sort = SORT_AUTHOR;
-}
-void sort_by_filename(Entry_List_s * list)
-{
-    sort_list(list, compare_entries_by_filename);
-    list->current_sort = SORT_PATH;
-}
-
-#define LOADING_DIR_ENTRIES_COUNT 16
-static FS_DirectoryEntry loading_dir_entries[LOADING_DIR_ENTRIES_COUNT];
-Result load_entries(const char * loading_path, Entry_List_s * list, const InstallType loading_screen)
-{
-    Handle dir_handle;
-    Result res = FSUSER_OpenDirectory(&dir_handle, ArchiveSD, fsMakePath(PATH_ASCII, loading_path));
-    if(R_FAILED(res))
-    {
-        DEBUG("Failed to open folder: %s\n", loading_path);
-        return res;
-    }
-
-    list_init_capacity(list, LOADING_DIR_ENTRIES_COUNT);
-
-    u32 entries_read = LOADING_DIR_ENTRIES_COUNT;
-    while(entries_read == LOADING_DIR_ENTRIES_COUNT)
-    {
-        res = FSDIR_Read(dir_handle, &entries_read, LOADING_DIR_ENTRIES_COUNT, loading_dir_entries);
-        if(R_FAILED(res))
-            break;
-
-        for(u32 i = 0; i < entries_read; ++i)
-        {
-            const FS_DirectoryEntry * const dir_entry = &loading_dir_entries[i];
-            const bool is_zip = !strcmp(dir_entry->shortExt, "ZIP");
-            if(!(dir_entry->attributes & FS_ATTRIBUTE_DIRECTORY) && !is_zip)
-                continue;
-
-            const ssize_t new_entry_index = list_add_entry(list);
-            if(new_entry_index < 0)
-            {
-                // out of memory: still allow use of currently loaded entries.
-                // Many things might die, depending on the heap layout after
-                entries_read = 0;
-                break;
-            }
-
-            Entry_s * const current_entry = &list->entries[new_entry_index];
-            memset(current_entry, 0, sizeof(Entry_s));
-            struacat(current_entry->path, loading_path);
-            strucat(current_entry->path, dir_entry->name);
-            current_entry->is_zip = is_zip;
-        }
-    }
-
-    FSDIR_Close(dir_handle);
-
-    list->loading_path = loading_path;
-    const int loading_bar_ticks = list->entries_count / 10;
-
-    for(int i = 0, j = 0; i < list->entries_count; ++i)
-    {
-        // replaces (i % loading_bar_ticks) == 0
-        if(++j >= loading_bar_ticks)
-        {
-            j = 0;
-            draw_loading_bar(i, list->entries_count, loading_screen);
-        }
-        Entry_s * const current_entry = &list->entries[i];
-        char * buf = NULL;
-        u32 buflen = load_data("/info.smdh", current_entry, &buf);
-        parse_smdh(buflen == sizeof(Icon_s) ? (Icon_s *)buf : NULL, current_entry, current_entry->path + strlen(loading_path));
-        free(buf);
-    }
-
-    return res;
-}
-
-void list_init_capacity(Entry_List_s * list, const int init_capacity)
-{
-    list->entries = malloc(init_capacity * sizeof(Entry_s));
-    list->entries_capacity = init_capacity;
-}
-
-#define LIST_CAPACITY_THRESHOLD 512
-ssize_t list_add_entry(Entry_List_s * list)
-{
-    if(list->entries_count == list->entries_capacity)
-    {
-        int next_capacity = list->entries_capacity;
-        // expand by doubling until we hit LIST_CAPACITY_THRESHOLD
-        // then simply increment by that, to have less extra space leftover
-        if(next_capacity < LIST_CAPACITY_THRESHOLD)
-        {
-            next_capacity *= 2;
-        }
-        else
-        {
-            next_capacity += LIST_CAPACITY_THRESHOLD;
-        }
-
-        Entry_s * const new_list = realloc(list->entries, next_capacity * sizeof(Entry_s));
-        if(new_list == NULL)
-        {
-            return -1;
-        }
-
-        list->entries = new_list;
-        list->entries_capacity = next_capacity;
-    }
-
-    return list->entries_count++;
-}

source/fs.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -27,17 +27,11 @@
 #include <strings.h>
  
 #include "fs.h"
-#include "draw.h"
 #include "unicode.h"
-#include "ui_strings.h"
  
 #include <archive.h>
 #include <archive_entry.h>
  
-FS_Archive ArchiveSD;
-FS_Archive ArchiveHomeExt;
-FS_Archive ArchiveThemeExt;
-
 Result open_archives(void)
 {
     romfsInit();
@@ -65,10 +59,6 @@ Result open_archives(void)
             archive1 = 0x000002ce;
             archive2 = 0x00000098;
             break;
-        case 5:
-            archive1 = 0x000002cf;
-            archive2 = 0x000000a9;
-            break;
         default:
             archive1 = 0x00;
             archive2 = 0x00;
@@ -112,18 +102,7 @@ Result close_archives(void)
     return 0;
 }
  
-Result load_parental_controls(Parental_Restrictions_s *restrictions)
+u32 file_to_buf(FS_Path path, FS_Archive archive, char** buf)
-{
-    char parental_data[0xC0] = {0};
-    Result res;
-
-    if (R_FAILED(res = CFGU_GetConfigInfoBlk2(0xC0, 0x000C0000, &parental_data))) return res;
-    memcpy(restrictions, parental_data, 4);
-
-    return 0;
-}
-
-u32 file_to_buf(FS_Path path, FS_Archive archive, char ** buf)
 {
     Handle file;
     Result res = 0;
@@ -140,9 +119,9 @@ u32 file_to_buf(FS_Path path, FS_Archive archive, char ** buf)
     return (u32)size;
 }
 
-static u32 zip_to_buf(struct archive * a, const char * file_name, char ** buf)
+static u32 zip_to_buf(struct archive *a, char *file_name, char ** buf)
 {
-    struct archive_entry * entry;
+    struct archive_entry *entry;
 
     bool found = false;
     u64 file_size = 0;
@@ -168,9 +147,9 @@ static u32 zip_to_buf(struct archive * a, const char * file_name, char ** buf)
     return (u32)file_size;
 }
 
-u32 zip_memory_to_buf(const char * file_name, void * zip_memory, size_t zip_size, char ** buf)
+u32 zip_memory_to_buf(char *file_name, void * zip_memory, size_t zip_size, char ** buf)
 {
-    struct archive * a = archive_read_new();
+    struct archive *a = archive_read_new();
     archive_read_support_format_zip(a);
 
     int r = archive_read_open_memory(a, zip_memory, zip_size);
@@ -183,17 +162,16 @@ u32 zip_memory_to_buf(const char * file_name, void * zip_memory, size_t zip_size
     return zip_to_buf(a, file_name, buf);
 }
 
-u32 zip_file_to_buf(const char * file_name, const u16 * zip_path, char ** buf)
+u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf)
 {
     ssize_t len = strulen(zip_path, 0x106);
-    char * path = calloc(sizeof(char), len * sizeof(u16));
+    char *path = calloc(sizeof(char), len*sizeof(u16));
-    utf16_to_utf8((u8 *)path, zip_path, len * sizeof(u16));
+    utf16_to_utf8((u8*)path, zip_path, len*sizeof(u16));
 
-    struct archive * a = archive_read_new();
+    struct archive *a = archive_read_new();
     archive_read_support_format_zip(a);
 
     int r = archive_read_open_filename(a, path, 0x4000);
-    free(path);
     if(r != ARCHIVE_OK)
     {
         DEBUG("Invalid zip being opened\n");
@@ -203,7 +181,7 @@ u32 zip_file_to_buf(const char * file_name, const u16 * zip_path, char ** buf)
     return zip_to_buf(a, file_name, buf);
 }
 
-Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char * buf)
+Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf)
 {
     Handle handle;
     Result res = 0;
@@ -213,148 +191,6 @@ Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char * buf)
     return 0;
 }
  
-u32 decompress_lz_file(FS_Path file_name, FS_Archive archive, char ** buf)
-{
-    Handle handle;
-    Result res = 0;
-    if (R_FAILED(res = FSUSER_OpenFile(&handle, archive, file_name, FS_OPEN_READ, 0))) {
-        DEBUG("%lu\n", res);
-        return 0;
-    }
-    u64 size;
-    FSFILE_GetSize(handle, &size);
-
-    char * temp_buf = NULL;
-
-    if(size != 0)
-    {
-        temp_buf = calloc(1, size);
-        FSFILE_Read(handle, NULL, 0, temp_buf, size);
-    }
-    FSFILE_Close(handle);
-
-    if (temp_buf[0] != 0x11) {
-        free(temp_buf);
-        return 0;
-    }
-
-    u32 output_size = temp_buf[1] | ((temp_buf[2] << 8) & 0xFF00) | ((temp_buf[3] << 16) & 0xFF0000);
-    printf("%ld\n", output_size);
-
-
-    *buf = calloc(1, output_size);
-
-    u32 pos = 4;
-    u32 cur_written = 0;
-    u8 counter = 0;
-    u8 mask = 0;
-
-    while (cur_written < output_size)
-    {
-        if (counter == 0) // read mask
-        {
-            mask = temp_buf[pos++];
-            counter++;
-            continue;
-        }
-
-        if ((mask >> (8 - counter)) & 0x01) // compressed block
-        {
-            int len = 0;
-            int disp = 0;
-            switch (temp_buf[pos] >> 4)
-            {
-                case 0:
-                    len  = temp_buf[pos++] << 4;
-                    len |= temp_buf[pos] >> 4;
-                    len += 0x11;
-                    break;
-
-                case 1:
-                    len  = (temp_buf[pos++] & 0x0F) << 12;
-                    len |=  temp_buf[pos++] << 4;
-                    len |=  temp_buf[pos] >> 4;
-                    len += 0x111;
-                    break;
-
-                default:
-                    len  = (temp_buf[pos] >> 4) + 1;
-            }
-
-            disp  = (temp_buf[pos++] & 0x0F) << 8;
-            disp |=  temp_buf[pos++];
-
-            for (int i = 0; i < len; ++i)
-            {
-                *(*buf + cur_written + i) = *(*buf + cur_written - disp - 1 + i);
-            }
-
-            cur_written += len;
-        }
-        else // byte literal
-        {
-            *(*buf + cur_written) = temp_buf[pos++];
-            cur_written++;
-        }
-
-        if (++counter > 8) counter = 0;
-
-    }
-
-
-    free(temp_buf);
-
-    return cur_written;
-}
-
-// This is an awful algorithm to "compress" LZ11 data.
-// We do this instead of actual LZ11 compression because of time -
-// LZ11 requires a lot of mem searching which is painfully slow on 3DS.
-// This process is nearly instant but means the resulting file is actually larger
-// than the input file. I don't think this is a problem as the only file we compress like this
-// is the theme data installed to extdata in some rare cases, which means only 1 file at most
-// is ever compressed like this. I don't think 400 KB is that big a sacrifice for probably
-// half a minute or so of time save - I may change my mind on this in the future, especially
-// if i figure out a dynamic programming algorithm which ends up being significantly
-// faster. Otherwise, I think this is probably a fine implementation.
-
-u32 compress_lz_file_fast(FS_Path path, FS_Archive archive, char * in_buf, u32 size)
-{
-    char * output_buf = calloc(1, size * 2);
-    u32 output_size = 0;
-    u32 mask_pos = 0;
-    u32 bytes_processed = 0;
-    u8 counter = 0;
-
-    if (output_buf == NULL) return 0;
-
-    // Set header data for the LZ11 file - 0x11 is version (LZ11), next 3 bytes are size
-    output_buf[0] = 0x11;
-    output_buf[3] = (size & 0xFF0000) >> 16;
-    output_buf[2] = (size & 0xFF00) >> 8;
-    output_buf[1] = (size & 0xFF);
-
-    output_size += 4;
-
-    while (bytes_processed < size)
-    {
-        if (counter == 0)
-        {
-            mask_pos = output_size++;
-            output_buf[mask_pos] = 0;
-        }
-
-        output_buf[output_size++] = in_buf[bytes_processed++];
-
-        if (++counter == 8) counter = 0;
-    }
-
-    buf_to_file(output_size, path, archive, output_buf);
-    free(output_buf);
-
-    return output_size;
-}
-
 void remake_file(FS_Path path, FS_Archive archive, u32 size)
 {
     Handle handle;
@@ -364,122 +200,7 @@ void remake_file(FS_Path path, FS_Archive archive, u32 size)
         FSUSER_DeleteFile(archive, path);
     }
     FSUSER_CreateFile(archive, path, 0, size);
-    char * buf = calloc(size, 1);
+    char *buf = calloc(size, 1);
     buf_to_file(size, path, archive, buf);
     free(buf);
 }
-
-static SwkbdCallbackResult fat32filter(void * user, const char ** ppMessage, const char * text, size_t textlen)
-{
-    (void)textlen;
-    (void)user;
-
-    *ppMessage = language.fs.illegal_input;
-    if(strpbrk(text, ILLEGAL_CHARS))
-    {
-        DEBUG("illegal filename: %s\n", text);
-        return SWKBD_CALLBACK_CONTINUE;
-    }
-
-    return SWKBD_CALLBACK_OK;
-}
-
-// assumes the input buffer is a ZIP. if it isn't, why are you calling this?
-void save_zip_to_sd(char * filename, u32 size, char * buf, EntryMode mode)
-{
-    static char path_to_file[32761]; // FAT32 paths can be quite long.
-    const int max_chars = 250;
-    char new_filename[max_chars + 5]; // .zip + \0
-renamed:
-    sprintf(path_to_file, "%s%s", main_paths[mode], filename);
-
-    // filter out characters illegal in FAT32 filenames
-    char * curr_filename = path_to_file + strlen(main_paths[mode]);
-    char * illegal_char = curr_filename;
-    while ((illegal_char = strpbrk(illegal_char, ILLEGAL_CHARS)))
-    {
-        DEBUG("Illegal char found in filename: %c\n", *illegal_char);
-        if (*illegal_char == '.')
-        {
-            // skip initial . (this is allowed)
-            if (illegal_char == curr_filename)
-                continue;
-            // skip extension delimiter
-            if (strpbrk(illegal_char + 1, ".") == NULL)
-            {
-                illegal_char++;
-                continue;
-            }
-        }
-        *illegal_char = '-';
-    }
-
-    // ensure the extension is .zip
-    char * extension = strrchr(path_to_file, '.');
-    if (extension == NULL || strcmp(extension, ".zip"))
-        strcat(path_to_file, ".zip");
-
-    DEBUG("path: %s\n", path_to_file);
-    u16 utf16path[0x106] = {0};
-    utf8_to_utf16(utf16path, (u8 *) path_to_file, 0x106);
-    FS_Path path = fsMakePath(PATH_UTF16, utf16path);
-
-    // check if file already exists, and if it does, prompt the user
-    // to overwrite or change name (or exit)
-    Result res = FSUSER_CreateFile(ArchiveSD, path, 0, size);
-    if (R_FAILED(res))
-    {
-        if (res == (long)0xC82044BE)
-        {
-            DEBUG("File already exists\n");
-
-            SwkbdState swkbd;
-
-            swkbdInit(&swkbd, SWKBD_TYPE_NORMAL, 3, max_chars / 2);
-            swkbdSetHintText(&swkbd, language.fs.new_or_overwrite);
-            swkbdSetFeatures(&swkbd, SWKBD_PREDICTIVE_INPUT | SWKBD_DARKEN_TOP_SCREEN);
-
-            swkbdSetButton(&swkbd, SWKBD_BUTTON_LEFT, language.fs.cancel, false);
-            swkbdSetButton(&swkbd, SWKBD_BUTTON_MIDDLE, language.fs.overwrite, false);
-            swkbdSetButton(&swkbd, SWKBD_BUTTON_RIGHT, language.fs.rename, true);
-            swkbdSetValidation(&swkbd, SWKBD_NOTEMPTY_NOTBLANK, SWKBD_FILTER_CALLBACK, -1);
-            swkbdSetFilterCallback(&swkbd, &fat32filter, NULL);
-
-            SwkbdButton button = swkbdInputText(&swkbd, new_filename, max_chars);
-
-            switch (button)
-            {
-            case SWKBD_BUTTON_RIGHT:
-                DEBUG("Renaming to %s\n", new_filename);
-                strcat(new_filename, ".zip");
-                filename = new_filename;
-                goto renamed;
-            case SWKBD_BUTTON_MIDDLE:
-                // we good
-                DEBUG("Overwriting %s\n", filename);
-                break;
-            case SWKBD_BUTTON_LEFT:
-                // do nothing
-                DEBUG("File rename cancelled\n");
-                return;
-            case SWKBD_BUTTON_NONE:
-                DEBUG("SWKBD broke wtf??? :- %x\n", swkbdGetResult(&swkbd));
-                return throw_error(language.fs.swkbd_fail, ERROR_LEVEL_WARNING);
-            }
-        }
-        else if (res == (long)0xC86044D2)
-        {
-            DEBUG("SD card is full\n");
-            return throw_error(language.fs.sd_full, ERROR_LEVEL_WARNING);
-        }
-        else
-        {
-            DEBUG("error: %lx\n", res);
-            return throw_error(language.fs.fs_error, ERROR_LEVEL_ERROR);
-        }
-    }
-
-    DEBUG("Saving to SD: %s\n", path_to_file);
-    remake_file(path, ArchiveSD, size);
-    buf_to_file(size, path, ArchiveSD, buf);
-}

source/loading.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,53 +29,193 @@
 #include "unicode.h"
 #include "music.h"
 #include "draw.h"
-#include "conversion.h"
-#include "ui_strings.h"
 
 #include <png.h>
 
-void copy_texture_data(C3D_Tex * texture, const u16 * src, const Entry_Icon_s * current_icon)
+void delete_entry(Entry_s * entry, bool is_file)
 {
-    // pointer to rgb565, offset by the number of rows and columns specified by current_icon
+    if(is_file)
-    // (reminder that this is z order curve storage)
+        FSUSER_DeleteFile(ArchiveSD, fsMakePath(PATH_UTF16, entry->path));
-    u16 * dest = ((u16 *)texture->data) + (current_icon->y * texture->width) + (current_icon->x * 8);
+    else
-    for (int j = 0; j < 48; j += 8)
+        FSUSER_DeleteDirectoryRecursively(ArchiveSD, fsMakePath(PATH_UTF16, entry->path));
-    {
-        memcpy(dest, src, 48 * 8 * sizeof(u16));
-        src += 48 * 8;
-        dest += texture->width * 8;
-    }
-    GSPGPU_InvalidateDataCache(texture->data, texture->size);
 }
 
-void parse_smdh(Icon_s * icon, Entry_s * entry, const u16 * fallback_name)
+u32 load_data(char * filename, Entry_s entry, char ** buf)
+{
+    if(entry.is_zip)
+    {
+        return zip_file_to_buf(filename+1, entry.path, buf); //the first character will always be '/' because of the other case
+    }
+    else
+    {
+        u16 path[0x106] = {0};
+        strucat(path, entry.path);
+        struacat(path, filename);
+
+        return file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, buf);
+    }
+}
+
+// Function taken and adapted from https://github.com/BernardoGiordano/Checkpoint/blob/master/3ds/source/title.cpp
+C2D_Image * loadTextureIcon(Icon_s *icon)
+{
+    if(icon == NULL)
+        return NULL;
+
+    C2D_Image * image = calloc(1, sizeof(C2D_Image));
+    C3D_Tex* tex = malloc(sizeof(C3D_Tex));
+    static const Tex3DS_SubTexture subt3x = { 48, 48, 0.0f, 48/64.0f, 48/64.0f, 0.0f };
+    image->tex = tex;
+    image->subtex = &subt3x;
+    C3D_TexInit(image->tex, 64, 64, GPU_RGB565);
+
+    u16* dest = (u16*)image->tex->data + (64-48)*64;
+    u16* src = icon->big_icon;
+    for (int j = 0; j < 48; j += 8)
+    {
+        memcpy(dest, src, 48*8*sizeof(u16));
+        src += 48*8;
+        dest += 64*8;
+    }
+
+    return image;
+}
+
+void parse_smdh(Icon_s *icon, Entry_s * entry, const u16 * fallback_name)
 {
     if(icon == NULL)
     {
         memcpy(entry->name, fallback_name, 0x80);
-        utf8_to_utf16(entry->desc, (u8 *)"No description", 0x100);
+        utf8_to_utf16(entry->desc, (u8*)"No description", 0x100);
-        utf8_to_utf16(entry->author, (u8 *)"Unknown author", 0x80);
+        utf8_to_utf16(entry->author, (u8*)"Unknown author", 0x80);
         entry->placeholder_color = C2D_Color32(rand() % 255, rand() % 255, rand() % 255, 255);
         return;
     }
 
-    memcpy(entry->name, icon->name, 0x40 * sizeof(u16));
+    memcpy(entry->name, icon->name, 0x40*sizeof(u16));
-    memcpy(entry->desc, icon->desc, 0x80 * sizeof(u16));
+    memcpy(entry->desc, icon->desc, 0x80*sizeof(u16));
-    memcpy(entry->author, icon->author, 0x40 * sizeof(u16));
+    memcpy(entry->author, icon->author, 0x40*sizeof(u16));
-    entry->placeholder_color = 0;
 }
 
-static Icon_s * load_entry_icon(const Entry_s * entry)
+static void parse_entry_smdh(Entry_s * entry, const u16 * fallback_name)
 {
-    char * info_buffer = NULL;
+    char *info_buffer = NULL;
-    u32 size = load_data("/info.smdh", entry, &info_buffer);
+    u64 size = load_data("/info.smdh", *entry, &info_buffer);
-    if(size != sizeof(Icon_s))
+
+    if(!size)
     {
         free(info_buffer);
-        return NULL;
+        info_buffer = NULL;
     }
 
-    return (Icon_s *)info_buffer;
+    Icon_s * smdh = (Icon_s *)info_buffer;
+
+    parse_smdh(smdh, entry, fallback_name);
+}   
+
+static C2D_Image * load_entry_icon(Entry_s entry)
+{
+    char *info_buffer = NULL;
+    u64 size = load_data("/info.smdh", entry, &info_buffer);
+    if(!size) return NULL;
+
+    Icon_s * smdh = (Icon_s *)info_buffer;
+    return loadTextureIcon(smdh);
+}
+
+typedef int (*sort_comparator)(const void *, const void *);
+static int compare_entries_by_name(const void * a, const void * b)
+{
+    Entry_s *entry_a = (Entry_s *)a;
+    Entry_s *entry_b = (Entry_s *)b;
+
+    return memcmp(entry_a->name, entry_b->name, 0x40*sizeof(u16));
+}
+static int compare_entries_by_author(const void * a, const void * b)
+{
+    Entry_s *entry_a = (Entry_s *)a;
+    Entry_s *entry_b = (Entry_s *)b;
+
+    return memcmp(entry_a->author, entry_b->author, 0x40*sizeof(u16));
+}
+static int compare_entries_by_filename(const void * a, const void * b)
+{
+    Entry_s *entry_a = (Entry_s *)a;
+    Entry_s *entry_b = (Entry_s *)b;
+
+    return memcmp(entry_a->path, entry_b->path, 0x106*sizeof(u16));
+}
+
+static void sort_list(Entry_List_s * list, sort_comparator compare_entries)
+{
+    if(list->entries != NULL && list->entries != NULL)
+        qsort(list->entries, list->entries_count, sizeof(Entry_s), compare_entries); //alphabet sort
+}
+
+void sort_by_name(Entry_List_s * list)
+{
+    sort_list(list, compare_entries_by_name);
+    list->current_sort = SORT_NAME;
+}
+void sort_by_author(Entry_List_s * list)
+{
+    sort_list(list, compare_entries_by_author);
+    list->current_sort = SORT_AUTHOR;
+}
+void sort_by_filename(Entry_List_s * list)
+{
+    sort_list(list, compare_entries_by_filename);
+    list->current_sort = SORT_PATH;
+}
+
+Result load_entries(const char * loading_path, Entry_List_s * list)
+{
+    Handle dir_handle;
+    Result res = FSUSER_OpenDirectory(&dir_handle, ArchiveSD, fsMakePath(PATH_ASCII, loading_path));
+    if(R_FAILED(res))
+    {
+        DEBUG("Failed to open folder: %s\n", loading_path);
+        return res;
+    }
+
+    u32 entries_read = 1;
+
+    while(entries_read)
+    {
+        FS_DirectoryEntry dir_entry = {0};
+        res = FSDIR_Read(dir_handle, &entries_read, 1, &dir_entry);
+        if(R_FAILED(res) || entries_read == 0)
+            break;
+
+        if(!(dir_entry.attributes & FS_ATTRIBUTE_DIRECTORY) && strcmp(dir_entry.shortExt, "ZIP")) 
+            continue;
+
+        list->entries_count++;
+        Entry_s * new_list = realloc(list->entries, list->entries_count * sizeof(Entry_s));
+        if(new_list == NULL)
+        {
+            free(list->entries);
+            list->entries = NULL;
+            res = -1;
+            DEBUG("break\n");
+            break;
+        }
+        else
+            list->entries = new_list;
+
+        Entry_s * current_entry = &(list->entries[list->entries_count-1]);
+        memset(current_entry, 0, sizeof(Entry_s));
+
+        struacat(current_entry->path, loading_path);
+        strucat(current_entry->path, dir_entry.name);
+
+        current_entry->is_zip = !strcmp(dir_entry.shortExt, "ZIP");
+        parse_entry_smdh(current_entry, dir_entry.name);
+    }
+
+    FSDIR_Close(dir_handle);
+
+    return res;
 }
 
 void load_icons_first(Entry_List_s * list, bool silent)
@@ -87,7 +227,7 @@ void load_icons_first(Entry_List_s * list, bool silent)
 
     int starti = 0, endi = 0;
 
-    if(list->entries_count <= list->entries_loaded * ICONS_OFFSET_AMOUNT)
+    if(list->entries_count <= list->entries_loaded*ICONS_OFFSET_AMOUNT)
     {
         DEBUG("small load\n");
         // if the list is one that doesnt need swapping, load everything at once
@@ -97,44 +237,40 @@ void load_icons_first(Entry_List_s * list, bool silent)
     {
         DEBUG("extended load\n");
         // otherwise, load around to prepare for swapping
-        starti = list->scroll - list->entries_loaded * ICONS_VISIBLE;
+        starti = list->scroll - list->entries_loaded*ICONS_VISIBLE;
-        endi = starti + list->entries_loaded * ICONS_OFFSET_AMOUNT;
+        endi = starti + list->entries_loaded*ICONS_OFFSET_AMOUNT;
     }
 
-    for(int entry_i = starti, icon_i = 0; entry_i < endi; ++entry_i, ++icon_i)
+    list->icons = calloc(endi-starti, sizeof(C2D_Image*));
+
+    C2D_Image ** icons = list->icons;
+
+    for(int i = starti; i < endi; i++)
     {
         if(!silent)
-            draw_loading_bar(icon_i, endi-starti, INSTALL_LOADING_ICONS);
+            draw_loading_bar(i - starti, endi-starti, INSTALL_LOADING_ICONS);
 
-        int offset = entry_i;
+        int offset = i;
         if(offset < 0)
             offset += list->entries_count;
         if(offset >= list->entries_count)
             offset -= list->entries_count;
 
-        Entry_s * const current_entry = &list->entries[offset];
+        Entry_s current_entry = list->entries[offset];
-        Icon_s * const smdh = load_entry_icon(current_entry);
+        icons[i-starti] = load_entry_icon(current_entry);
-        if(smdh != NULL)
-        {
-            if(current_entry->placeholder_color == 0)
-                parse_smdh(smdh, current_entry, current_entry->path + strlen(list->loading_path));
-            copy_texture_data(&list->icons_texture, smdh->big_icon, &list->icons_info[icon_i]);
-            free(smdh);
-        }
     }
 }
 
-static void reverse(Entry_Icon_s a[], int sz) {
+static void reverse(C2D_Image * a[], int sz) {
     int i, j;
-    Entry_Icon_s tmp;
     for (i = 0, j = sz; i < j; i++, j--) {
-        memcpy(&tmp, &a[i], sizeof(Entry_Icon_s));
+        C2D_Image * tmp = a[i];
-        memcpy(&a[i], &a[j], sizeof(Entry_Icon_s));
+        a[i] = a[j];
-        memcpy(&a[j], &tmp, sizeof(Entry_Icon_s));
+        a[j] = tmp;
     }
 }
 
-static void rotate(Entry_Icon_s array[], int size, int amt) {
+static void rotate(C2D_Image * array[], int size, int amt) {
     if (amt < 0)
         amt = size + amt;
     reverse(array, size-amt-1);
@@ -152,11 +288,11 @@ void handle_scrolling(Entry_List_s * list)
         {
             int change = 0;
 
-            if(list->entries_count > list->entries_loaded * 2 && list->previous_scroll < list->entries_loaded && list->selected_entry >= list->entries_count - list->entries_loaded)
+            if(list->entries_count > list->entries_loaded*2 && list->previous_scroll < list->entries_loaded && list->selected_entry >= list->entries_count - list->entries_loaded)
             {
                 list->scroll = list->entries_count - list->entries_loaded;
             }
-            else if(list->entries_count > list->entries_loaded * 2 && list->selected_entry < list->entries_loaded && list->previous_selected >= list->entries_count - list->entries_loaded)
+            else if(list->entries_count > list->entries_loaded*2 && list->selected_entry < list->entries_loaded && list->previous_selected >= list->entries_count - list->entries_loaded)
             {
                 list->scroll = 0;
             }
@@ -200,47 +336,48 @@ static bool load_icons(Entry_List_s * current_list, Handle mutex)
 
     handle_scrolling(current_list);
 
-    if(current_list->entries_count <= current_list->entries_loaded * ICONS_OFFSET_AMOUNT || current_list->previous_scroll == current_list->scroll)
+    if(current_list->entries_count <= current_list->entries_loaded*ICONS_OFFSET_AMOUNT || current_list->previous_scroll == current_list->scroll)
         return false; // return if the list is one that doesnt need swapping, or if nothing changed
 
     #define SIGN(x) (x > 0 ? 1 : ((x < 0) ? -1 : 0))
 
     int delta = current_list->scroll - current_list->previous_scroll;
-    if(abs(delta) >= current_list->entries_count - current_list->entries_loaded * (ICONS_OFFSET_AMOUNT-1))
+    if(abs(delta) >= current_list->entries_count - current_list->entries_loaded*(ICONS_OFFSET_AMOUNT-1))
         delta = -SIGN(delta) * (current_list->entries_count - abs(delta));
 
+    int absdelta = abs(delta);
     int starti = current_list->scroll;
-    int endi = starti + abs(delta);
+    int endi = starti + absdelta;
 
     if(delta < 0)
     {
-        endi -= abs(delta) + 1;
+        endi -= absdelta + 1;
-        starti += abs(delta) - 1;
+        starti += absdelta - 1;
     }
 
     int ctr = 0;
-    Entry_s ** const entries = calloc(abs(delta), sizeof(Entry_s *));
+    Entry_s ** entries = calloc(absdelta, sizeof(Entry_s *));
-    int * const indexes = calloc(abs(delta), sizeof(int));
+    int * indexes = calloc(absdelta, sizeof(int));
     bool released = false;
 
-    Entry_Icon_s * const icons = current_list->icons_info;
+    C2D_Image ** icons = current_list->icons;
 
     for(int i = starti; i != endi; i++, ctr++)
     {
         int index = 0;
         int offset = i;
 
-        rotate(icons, ICONS_OFFSET_AMOUNT * current_list->entries_loaded, -SIGN(delta));
+        rotate(icons, ICONS_OFFSET_AMOUNT*current_list->entries_loaded, -1*SIGN(delta));
 
         if(delta > 0)
         {
-            index = current_list->entries_loaded * ICONS_OFFSET_AMOUNT - delta + i - starti;
+            index = current_list->entries_loaded*ICONS_OFFSET_AMOUNT - delta + i - starti;
-            offset += current_list->entries_loaded * ICONS_UNDER - delta;
+            offset += current_list->entries_loaded*ICONS_UNDER - delta;
         }
         else
         {
             index = 0 - delta - 1 + i - starti;
-            offset -= current_list->entries_loaded * ICONS_VISIBLE;
+            offset -= current_list->entries_loaded*ICONS_VISIBLE;
             i -= 2; //i-- twice to counter the i++, needed only for this case
         }
 
@@ -253,36 +390,54 @@ static bool load_icons(Entry_List_s * current_list, Handle mutex)
         indexes[ctr] = index;
     }
 
+    static int cutoff[] = {
+        0, // absdelta = 1
+        0, // absdelta = 2
+        0, // absdelta = 3
+        0, // absdelta = 4
+        1, // absdelta = 5, 1 visible to be replaced before allowing drawing
+        2, // absdelta = 6, 2 visible to be replaced before allowing drawing
+        3, // absdelta = 7, 3 visible to be replaced before allowing drawing
+    };
+    int actual_cutoff = cutoff[absdelta-1];
+    if(actual_cutoff == 0)
+    {
+        svcReleaseMutex(mutex);
+        released = true;
+        svcSleepThread(1e7);
+    }
+
+    if(delta > 0)
+    {
+        starti = 0;
+        endi = absdelta;
+    }
+    else
+    {
+        starti = absdelta-1;
+        endi = -1;
+    }
+
+    int change = SIGN(delta);
     #undef SIGN
 
-    if(abs(delta) <= current_list->entries_loaded)
+    for(int i = starti; i != endi; i += change)
+    {
+        Entry_s * current_entry = entries[i];
+        int index = indexes[i];
+
+        C2D_Image * image = icons[index];
+        C3D_TexDelete(image->tex);
+        free(image->tex);
+        free(image);
+
+        icons[index] = load_entry_icon(*current_entry);
+
+        if(!released && i == actual_cutoff)
         {
             svcReleaseMutex(mutex);
             released = true;
-    }
-
             svcSleepThread(1e7);
-    starti = 0;
-    endi = abs(delta);
-    for(int i = starti; i < endi; i++)
-    {
-        Entry_s * const current_entry = entries[i];
-        const int index = indexes[i];
-        const Entry_Icon_s * const current_icon = &icons[index];
-
-        Icon_s * const smdh = load_entry_icon(current_entry);
-        if(smdh != NULL)
-        {
-            if(current_entry->placeholder_color == 0)
-                parse_smdh(smdh, current_entry, current_entry->path + strlen(current_list->loading_path));
-            copy_texture_data(&current_list->icons_texture, smdh->big_icon, current_icon);
-            free(smdh);
-        }
-
-        if(!released && i > endi/2)
-        {
-            svcReleaseMutex(mutex);
-            released = true;
         }
     }
 
@@ -298,22 +453,92 @@ void load_icons_thread(void * void_arg)
 {
     Thread_Arg_s * arg = (Thread_Arg_s *)void_arg;
     Handle mutex = *(Handle *)arg->thread_arg[1];
-    do {
+    do
+    {
         svcWaitSynchronization(mutex, U64_MAX);
-        Entry_List_s * const current_list = *(Entry_List_s ** volatile)arg->thread_arg[0];
+        volatile Entry_List_s * current_list = *(volatile Entry_List_s **)arg->thread_arg[0];
-        const bool released = load_icons(current_list, mutex);
+        bool released = load_icons((Entry_List_s *)current_list, mutex);
         if(!released)
             svcReleaseMutex(mutex);
-    } while(arg->run_thread);
+    }
+    while(arg->run_thread);
 }
 
-bool load_preview_from_buffer(char * row_pointers, u32 size, C2D_Image * preview_image, int * preview_offset, int height)
+bool load_preview_from_buffer(void * buf, u32 size, C2D_Image * preview_image, int * preview_offset)
 {
-    int width = (uint32_t)((size / 4) / height);
+    if(size < 8 || png_sig_cmp(buf, 0, 8))
+    {
+        throw_error("Invalid preview.png", ERROR_LEVEL_WARNING);
+        return false;
+    }
+
+    png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+    png_infop info = png_create_info_struct(png);
+
+    if(setjmp(png_jmpbuf(png)))
+    {
+        png_destroy_read_struct(&png, &info, NULL);
+        return false;
+    }
+
+    FILE * fp = fmemopen(buf, size, "rb");
+
+    png_init_io(png, fp);
+    png_read_info(png, info);
+
+    int width = png_get_image_width(png, info);
+    int height = png_get_image_height(png, info);
+
+    png_byte color_type = png_get_color_type(png, info);
+    png_byte bit_depth  = png_get_bit_depth(png, info);
+
+    // Read any color_type into 8bit depth, ABGR format.
+    // See http://www.libpng.org/pub/png/libpng-manual.txt
+
+    if(bit_depth == 16)
+        png_set_strip_16(png);
+
+    if(color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_palette_to_rgb(png);
+
+    // PNG_COLOR_TYPE_GRAY_ALPHA is always 8 or 16bit depth.
+    if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+        png_set_expand_gray_1_2_4_to_8(png);
+
+    if(png_get_valid(png, info, PNG_INFO_tRNS))
+        png_set_tRNS_to_alpha(png);
+
+    // These color_type don't have an alpha channel then fill it with 0xff.
+    if(color_type == PNG_COLOR_TYPE_RGB ||
+       color_type == PNG_COLOR_TYPE_GRAY ||
+       color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_filler(png, 0xFF, PNG_FILLER_AFTER);
+
+    if(color_type == PNG_COLOR_TYPE_GRAY ||
+       color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+        png_set_gray_to_rgb(png);
+
+    //output ABGR
+    png_set_bgr(png);
+    png_set_swap_alpha(png);
+
+    png_read_update_info(png, info);
+
+    png_bytep * row_pointers = malloc(sizeof(png_bytep) * height);
+    for(int y = 0; y < height; y++) {
+        row_pointers[y] = (png_byte*)malloc(png_get_rowbytes(png,info));
+    }
+
+    png_read_image(png, row_pointers);
+
+    fclose(fp);
+    png_destroy_read_struct(&png, &info, NULL);
+
 
     free_preview(*preview_image);
 
-    C3D_Tex * tex = malloc(sizeof(C3D_Tex));
+    C3D_Tex* tex = malloc(sizeof(C3D_Tex));
     preview_image->tex = tex;
 
     Tex3DS_SubTexture * subt3x = malloc(sizeof(Tex3DS_SubTexture));
@@ -330,7 +555,7 @@ bool load_preview_from_buffer(char * row_pointers, u32 size, C2D_Image * preview
     memset(preview_image->tex->data, 0, preview_image->tex->size);
 
     for(int j = 0; j < height; j++) {
-        png_bytep row = (png_bytep)(row_pointers + (width * 4 * j));
+        png_bytep row = row_pointers[j];
         for(int i = 0; i < width; i++) {
             png_bytep px = &(row[i * 4]);
             u32 dst = ((((j >> 3) * (512 >> 3) + (i >> 3)) << 6) + ((i & 1) | ((j & 1) << 1) | ((i & 2) << 1) | ((j & 2) << 2) | ((i & 4) << 2) | ((j & 4) << 3))) * 4;
@@ -339,92 +564,37 @@ bool load_preview_from_buffer(char * row_pointers, u32 size, C2D_Image * preview
         }
     }
 
-    *preview_offset = (width - TOP_SCREEN_WIDTH) / 2;
+    *preview_offset = (width-400)/2;
 
     return true;
 }
 
 static u16 previous_path_preview[0x106] = {0};
-bool load_preview(const Entry_List_s * list, C2D_Image * preview_image, int * preview_offset)
+bool load_preview(Entry_List_s list, C2D_Image * preview_image, int * preview_offset)
 {
-    if(list->entries == NULL) return false;
+    if(list.entries == NULL) return false;
 
-    const Entry_s * entry = &list->entries[list->selected_entry];
+    Entry_s entry = list.entries[list.selected_entry];
 
-    if(!memcmp(&previous_path_preview, &entry->path, 0x106 * sizeof(u16))) return true;
+    if(!memcmp(&previous_path_preview, &entry.path, 0x106*sizeof(u16))) return true;
 
-    char * preview_buffer = NULL;
+    char *preview_buffer = NULL;
-    u32 size = load_data("/preview.png", entry, &preview_buffer);
+    u64 size = load_data("/preview.png", entry, &preview_buffer);
-    u32 height = 480;
 
-    if(size)
+    if(!size)
-    {
-        if (!(size = png_to_abgr(&preview_buffer, size, &height)))
-        {
-            return false;
-        }
-    }
-    else
     {
         free(preview_buffer);
-
+        throw_error("No preview found.", ERROR_LEVEL_WARNING);
-        const int top_size =  TOP_SCREEN_WIDTH * SCREEN_HEIGHT * SCREEN_COLOR_DEPTH;
-        const int out_size = top_size * 2;
-
-        char * rgba_buffer = malloc(out_size);
-        memset(rgba_buffer, 0, out_size);
-        bool found_splash = false;
-
-        // try to assembly a preview from the splash screens
-        size = load_data("/splash.bin", entry, &preview_buffer);
-        if (size)
-        {
-            found_splash = true;
-            bin_to_abgr(&preview_buffer, size);
-
-            memcpy(rgba_buffer, preview_buffer, top_size);
-            free(preview_buffer);
-        }
-
-        size = load_data("/splashbottom.bin", entry, &preview_buffer);
-        if (size)
-        {
-            found_splash = true;
-            bin_to_abgr(&preview_buffer, size);
-
-            const int buffer_width = TOP_SCREEN_WIDTH * SCREEN_COLOR_DEPTH;
-            const int bottom_buffer_width = BOTTOM_SCREEN_WIDTH * SCREEN_COLOR_DEPTH;
-            const int bottom_centered_offset = (TOP_SCREEN_WIDTH - BOTTOM_SCREEN_WIDTH) / 2;
-
-            // Store the bottom splash screen under the top splash and centered
-            for (int i = 0; i < SCREEN_HEIGHT; ++i)
-                memcpy(
-                    rgba_buffer + top_size + (buffer_width * i) + (bottom_centered_offset * SCREEN_COLOR_DEPTH),
-                    preview_buffer + (bottom_buffer_width * i),
-                    bottom_buffer_width
-                );
-    
-            free(preview_buffer);
-        }
-
-        if (!found_splash)
-        {
-            free(rgba_buffer);
-            throw_error(language.loading.no_preview, ERROR_LEVEL_WARNING);
         return false;
     }
 
-        size = out_size;
+    bool ret = load_preview_from_buffer(preview_buffer, size, preview_image, preview_offset);
-        preview_buffer = rgba_buffer;
-    }
-
-    bool ret = load_preview_from_buffer(preview_buffer, size, preview_image, preview_offset, height);
     free(preview_buffer);
 
     if(ret)
     {
         // mark the new preview as loaded for optimisation
-        memcpy(&previous_path_preview, &entry->path, 0x106 * sizeof(u16));
+        memcpy(&previous_path_preview, &entry.path, 0x106*sizeof(u16));
     }
 
     return ret;
@@ -435,11 +605,11 @@ void free_preview(C2D_Image preview)
     if(preview.tex)
         C3D_TexDelete(preview.tex);
     free(preview.tex);
-    free((Tex3DS_SubTexture *)preview.subtex);
+    free((Tex3DS_SubTexture*)preview.subtex);
 }
 
 // Initialize the audio struct
-Result load_audio(const Entry_s * entry, audio_s * audio) 
+Result load_audio(Entry_s entry, audio_s *audio) 
 {
     audio->filesize = load_data("/bgm.ogg", entry, &audio->filebuf);
     if (audio->filesize == 0) {
@@ -449,11 +619,12 @@ Result load_audio(const Entry_s * entry, audio_s * audio)
     }
 
     audio->mix[0] = audio->mix[1] = 1.0f; // Determines volume for the 12 (?) different outputs. See http://smealum.github.io/ctrulib/channel_8h.html#a30eb26f1972cc3ec28370263796c0444
+    svcCreateEvent(&audio->finished, RESET_STICKY);
 
     ndspChnSetInterp(0, NDSP_INTERP_LINEAR); 
     ndspChnSetMix(0, audio->mix); // See mix comment above
 
-    FILE * file = fmemopen(audio->filebuf, audio->filesize, "rb");
+    FILE *file = fmemopen(audio->filebuf, audio->filesize, "rb");
     DEBUG("<load_audio> Filesize: %ld\n", audio->filesize);
     if(file != NULL) 
     {
@@ -467,7 +638,7 @@ Result load_audio(const Entry_s * entry, audio_s * audio)
             return MAKERESULT(RL_FATAL, RS_INVALIDARG, RM_APPLICATION, RD_NO_DATA);
         }
 
-        vorbis_info * vi = ov_info(&audio->vf, -1);
+        vorbis_info *vi = ov_info(&audio->vf, -1);
         ndspChnSetRate(0, vi->rate);// Set sample rate to what's read from the ogg file
         if (vi->channels == 2) {
             DEBUG("<load_audio> Using stereo\n");

source/main.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2015-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -32,29 +32,25 @@
 #include "camera.h"
 #include "music.h"
 #include "remote.h"
-#include "ui_strings.h"
+#include "instructions.h"
 #include <time.h>
 
 bool quit = false;
 bool dspfirm = false;
-static audio_s * audio = NULL;
+audio_s * audio = NULL;
 static bool homebrew = false;
 static bool installed_themes = false;
-bool home_displayed = false;
-u64 time_home_pressed = 0;
 
 static Thread iconLoadingThread = {0};
 static Thread_Arg_s iconLoadingThread_arg = {0};
 static Handle update_icons_mutex;
 static bool released = false;
 
-static Thread install_check_threads[MODE_AMOUNT] = {0};
+static Thread installCheckThreads[MODE_AMOUNT] = {0};
-static Thread_Arg_s install_check_threads_arg[MODE_AMOUNT] = {0};
+static Thread_Arg_s installCheckThreads_arg[MODE_AMOUNT] = {0};
 
 static Entry_List_s lists[MODE_AMOUNT] = {0};
 
-Language_s language = {0};
-
 int __stacksize__ = 64 * 1024;
 Result archive_result;
 u32 old_time_limit;
@@ -85,6 +81,7 @@ static void init_services(void)
     dspfirm = !ndspInit();
     APT_GetAppCpuTimeLimit(&old_time_limit);
     APT_SetAppCpuTimeLimit(30);
+    // aptSetHomeAllowed(false);
     httpcInit(0);
     archive_result = open_archives();
     if(envIsHomebrew())
@@ -110,16 +107,7 @@ static void stop_install_check(void)
 {
     for(int i = 0; i < MODE_AMOUNT; i++)
     {
-        install_check_threads_arg[i].run_thread = false;
+        installCheckThreads_arg[i].run_thread = false;
-    }
-    for(int i = 0; i < MODE_AMOUNT; i++)
-    {
-        if(install_check_threads[i] == NULL)
-            continue;
-
-        threadJoin(install_check_threads[i], U64_MAX);
-        threadFree(install_check_threads[i]);
-        install_check_threads[i] = NULL;
     }
 }
 
@@ -133,18 +121,31 @@ static void exit_thread(void)
         svcWaitSynchronization(update_icons_mutex, U64_MAX);
         threadJoin(iconLoadingThread, U64_MAX);
         threadFree(iconLoadingThread);
-        iconLoadingThread = NULL;
     }
 }
 
+static void free_icons(Entry_List_s * list)
+{
+    int amount = list->entries_count;
+    if(list->entries_count > list->entries_loaded*ICONS_OFFSET_AMOUNT)
+        amount = list->entries_loaded*ICONS_OFFSET_AMOUNT;
+
+    for(int i = 0; i < amount; i++)
+    {
+        C3D_TexDelete(list->icons[i]->tex);
+        free(list->icons[i]->tex);
+        free(list->icons[i]);
+    }
+    free(list->icons);
+}
+
 void free_lists(void)
 {
     stop_install_check();
     for(int i = 0; i < MODE_AMOUNT; i++)
     {
-        Entry_List_s * const current_list = &lists[i];
+        Entry_List_s * current_list = &lists[i];
-        C3D_TexDelete(&current_list->icons_texture);
+        free_icons(current_list);
-        free(current_list->icons_info);
         free(current_list->entries);
         memset(current_list, 0, sizeof(Entry_List_s));
     }
@@ -155,7 +156,8 @@ void exit_function(bool power_pressed)
 {
     if(audio)
     {
-        stop_audio(&audio);
+        audio->stop = true;
+        svcWaitSynchronization(audio->finished, U64_MAX);
     }
     free_lists();
     svcCloseHandle(update_icons_mutex);
@@ -184,18 +186,6 @@ static void start_thread(void)
     }
 }
 
-static u32 next_or_equal_power_of_2(u32 v)
-{
-    v--;
-    v |= v >> 1;
-    v |= v >> 2;
-    v |= v >> 4;
-    v |= v >> 8;
-    v |= v >> 16;
-    v++;
-    return v;
-}
-
 static void load_lists(Entry_List_s * lists)
 {
     free_lists();
@@ -209,69 +199,37 @@ static void load_lists(Entry_List_s * lists)
 
         draw_install(loading_screen);
 
-        Entry_List_s * const current_list = &lists[i];
+        Entry_List_s * current_list = &lists[i];
         current_list->mode = i;
         current_list->entries_per_screen_v = entries_per_screen_v[i];
         current_list->entries_per_screen_h = 1;
         current_list->entries_loaded = current_list->entries_per_screen_v * current_list->entries_per_screen_h;
         current_list->entry_size = entry_size[i];
-
+        Result res = load_entries(main_paths[i], current_list);
-        const int x_component = max(current_list->entries_per_screen_h, current_list->entries_per_screen_v);
-        const int y_component = min(current_list->entries_per_screen_h, current_list->entries_per_screen_v);
-        // A texture must have power of 2 dimensions (not necessarily the same)
-        // so, get the power of two greater than or equal to:
-        // - the size of the largest length (row or column) of icons for the width
-        // - the size of all of those lengths to fit the total for the height
-        C3D_TexInit(&current_list->icons_texture,
-            next_or_equal_power_of_2(x_component * current_list->entry_size),
-            next_or_equal_power_of_2(y_component * current_list->entry_size * ICONS_OFFSET_AMOUNT),
-            GPU_RGB565);
-        C3D_TexSetFilter(&current_list->icons_texture, GPU_NEAREST, GPU_NEAREST);
-
-        const float inv_width = 1.0f / current_list->icons_texture.width;
-        const float inv_height = 1.0f / current_list->icons_texture.height;
-        current_list->icons_info = (Entry_Icon_s *)calloc(x_component * y_component * ICONS_OFFSET_AMOUNT, sizeof(Entry_Icon_s));
-        for(int j = 0; j < y_component * ICONS_OFFSET_AMOUNT; ++j)
-        {
-            const int index = j * x_component;
-            for(int h = 0; h < x_component; ++h)
-            {
-                Entry_Icon_s * const icon_info = &current_list->icons_info[index + h];
-                icon_info->x = h * current_list->entry_size;
-                icon_info->y = j * current_list->entry_size;
-                icon_info->subtex.width = current_list->entry_size;
-                icon_info->subtex.height = current_list->entry_size;
-                icon_info->subtex.left = icon_info->x * inv_width;
-                icon_info->subtex.top = 1.0f - (icon_info->y * inv_height);
-                icon_info->subtex.right = icon_info->subtex.left + (icon_info->subtex.width * inv_width);
-                icon_info->subtex.bottom = icon_info->subtex.top - (icon_info->subtex.height * inv_height);
-            }
-        }
-
-        Result res = load_entries(main_paths[i], current_list, loading_screen);
         if(R_SUCCEEDED(res))
         {
-            if(current_list->entries_count > current_list->entries_loaded * ICONS_OFFSET_AMOUNT)
+            if(current_list->entries_count > current_list->entries_loaded*ICONS_OFFSET_AMOUNT)
                 iconLoadingThread_arg.run_thread = true;
 
+            sort_by_name(current_list);
+
             DEBUG("total: %i\n", current_list->entries_count);
 
-            sort_by_name(current_list);
             load_icons_first(current_list, false);
 
-            void (*install_check_function)(void *) = NULL;
+            void (*install_check_function)(void*) = NULL;
             if(i == MODE_THEMES)
                 install_check_function = themes_check_installed;
             else if(i == MODE_SPLASHES)
                 install_check_function = splash_check_installed;
 
-            Thread_Arg_s * current_arg = &install_check_threads_arg[i];
+            Thread_Arg_s * current_arg = &installCheckThreads_arg[i];
             current_arg->run_thread = true;
-            current_arg->thread_arg = (void **)current_list;
+            current_arg->thread_arg = (void**)current_list;
 
             if(install_check_function != NULL)
             {
-                install_check_threads[i] = threadCreate(install_check_function, current_arg, __stacksize__, 0x3f, -2, false);
+                installCheckThreads[i] = threadCreate(install_check_function, current_arg, __stacksize__, 0x3f, -2, true);
                 svcSleepThread(1e8);
             }
         }
@@ -279,18 +237,17 @@ static void load_lists(Entry_List_s * lists)
     start_thread();
 }
 
-static SwkbdCallbackResult jump_menu_callback(void * entries_count, const char ** ppMessage, const char * text, size_t textlen)
+static SwkbdCallbackResult jump_menu_callback(void* entries_count, const char** ppMessage, const char* text, size_t textlen)
 {
-    (void)textlen;
     int typed_value = atoi(text);
-    if(typed_value > *(int *)entries_count)
+    if(typed_value > *(int*)entries_count)
     {
-        *ppMessage = language.main.position_too_big;
+        *ppMessage = "The new position has to be\nsmaller or equal to the\nnumber of entries!";
         return SWKBD_CALLBACK_CONTINUE;
     }
     else if(typed_value == 0)
     {
-        *ppMessage = language.main.position_zero;
+        *ppMessage = "The new position has to\nbe positive!";
         return SWKBD_CALLBACK_CONTINUE;
     }
     return SWKBD_CALLBACK_OK;
@@ -311,11 +268,11 @@ static void jump_menu(Entry_List_s * list)
     sprintf(numbuf, "%i", list->selected_entry);
     swkbdSetInitialText(&swkbd, numbuf);
 
-    sprintf(numbuf, language.main.jump_q);
+    sprintf(numbuf, "Where do you want to jump to?\nMay cause icons to reload.");
     swkbdSetHintText(&swkbd, numbuf);
 
-    swkbdSetButton(&swkbd, SWKBD_BUTTON_LEFT, language.main.cancel, false);
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_LEFT, "Cancel", false);
-    swkbdSetButton(&swkbd, SWKBD_BUTTON_RIGHT, language.main.jump, true);
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_RIGHT, "Jump", true);
     swkbdSetValidation(&swkbd, SWKBD_NOTEMPTY_NOTBLANK, 0, max_chars);
     swkbdSetFilterCallback(&swkbd, jump_menu_callback, &list->entries_count);
 
@@ -327,8 +284,6 @@ static void jump_menu(Entry_List_s * list)
         list->scroll = list->selected_entry;
         if(list->scroll >= list->entries_count - list->entries_loaded)
             list->scroll = list->entries_count - list->entries_loaded - 1;
-        if (list->scroll < 0)
-            list->scroll = 0;
     }
 }
 
@@ -379,9 +334,6 @@ int main(void)
 {
     srand(time(NULL));
     init_services();
-    CFG_Language lang;
-    CFGU_GetSystemLanguage(&lang);
-    language = init_strings(lang);
     init_screens();
 
     svcCreateMutex(&update_icons_mutex, true);
@@ -406,10 +358,9 @@ int main(void)
     bool preview_mode = false;
     int preview_offset = 0;
 
+    bool qr_mode = false;
     bool install_mode = false;
-    DrawMode draw_mode = DRAW_MODE_LIST;
     bool extra_mode = false;
-    int extra_index = 1;
     C2D_Image preview = {0};
 
     while(aptMainLoop())
@@ -421,16 +372,10 @@ int main(void)
             return 0;
         }
 
-        if (aptCheckHomePressRejected() && !home_displayed)
-        {
-            time_home_pressed = svcGetSystemTick() / CPU_TICKS_PER_MSEC;
-            home_displayed = true;
-        }
-
         #ifndef CITRA_MODE
         if(R_FAILED(archive_result) && current_mode == MODE_THEMES)
         {
-            throw_error(language.main.no_theme_extdata, ERROR_LEVEL_ERROR);
+            throw_error("Theme extdata does not exist!\nSet a default theme from the home menu.", ERROR_LEVEL_ERROR);
             quit = true;
             continue;
         }
@@ -443,15 +388,26 @@ int main(void)
 
         current_list = &lists[current_mode];
 
-        Instructions_s instructions = language.normal_instructions[current_mode];
+        Instructions_s instructions = normal_instructions[current_mode];
         if(install_mode)
-            instructions = language.install_instructions;
+            instructions = install_instructions;
         if(extra_mode)
         {
-            instructions = language.extra_instructions[extra_index];
+            int index = 1;
+            bool key_l = (kDown | kHeld) & KEY_L;
+            bool key_r = (kDown | kHeld) & KEY_R;
+            if(key_l ^ key_r)
+            {
+                if(key_l)
+                    index = 0;
+                // else if(key_r)  // uncomment when we use the right menu. we don't for now
+                    // index = 2;
+            }
+            instructions = extra_instructions[index];
         }
 
-        if(preview_mode)
+        if(qr_mode) take_picture();
+        else if(preview_mode) 
         {
             draw_preview(preview, preview_offset);
         }
@@ -471,71 +427,30 @@ int main(void)
                 svcWaitSynchronization(update_icons_mutex, U64_MAX);
             }
 
-            draw_interface(current_list, instructions, draw_mode);
+            draw_interface(current_list, instructions);
 
             svcSleepThread(1e7);
             released = false;
         }
 
-        if (home_displayed)
-        {
-            u64 cur_time = svcGetSystemTick() / CPU_TICKS_PER_MSEC;
-            draw_home(time_home_pressed, cur_time);
-            if (cur_time - time_home_pressed > 2000) home_displayed = false;
-        }
-
         end_frame();
 
         if(kDown & KEY_START) quit = true;
 
-        if(current_list->entries_count == 0)
+        if(!install_mode && !extra_mode)
         {
-            if (kDown & KEY_R)
+            if(!preview_mode && !qr_mode && kDown & KEY_L) //toggle between splashes and themes
-            {
-                goto enable_qr;
-            } else if (kDown & KEY_L)
-            {
-                goto switch_mode;
-            } else if (kDown & KEY_TOUCH)
-            {
-                touchPosition touch = {0};
-                hidTouchRead(&touch);
-
-                u16 x = touch.px;
-                u16 y = touch.py;
-                if (y < 24)
-                {
-                    if(BETWEEN(320-24, x, 320))
-                    {
-                        goto switch_mode;
-                    } else if(BETWEEN(320-48, x, 320-24))
-                    {
-                        quit = true;
-                        continue;
-                    } else if(BETWEEN(320-72, x, 320-48))
-                    {
-                        goto browse_themeplaza;
-                    } else if(BETWEEN(320-96, x, 320-72))
-                    {
-                        goto enable_qr;
-                    }
-                }
-            }
-        }
-        else if(!install_mode && !extra_mode)
-        {
-            if(!preview_mode && kDown & KEY_L) //toggle between splashes and themes
             {
                 switch_mode:
                 current_mode++;
                 current_mode %= MODE_AMOUNT;
                 continue;
             }
-            else if(!preview_mode && kDown & KEY_R) //toggle QR mode
+            else if(!qr_mode && !preview_mode && kDown & KEY_R) //toggle QR mode
             {
                 enable_qr:
                 draw_base_interface();
-                draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], language.main.loading_qr);
+                draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], "Loading QR Scanner...");
                 end_frame();
                 if(R_SUCCEEDED(camInit()))
                 {
@@ -551,25 +466,25 @@ int main(void)
                     }
                     else
                     {
-                        throw_error(language.main.no_wifi, ERROR_LEVEL_WARNING);
+                        throw_error("Please connect to Wi-Fi before scanning QR codes", ERROR_LEVEL_WARNING);
                     }
                 }
                 else
                 {
                     if(homebrew)
-                        throw_error(language.main.qr_homebrew, ERROR_LEVEL_WARNING);
+                        throw_error("QR scanning doesnt work from the Homebrew\nLauncher, use the ThemePlaza browser instead.", ERROR_LEVEL_WARNING);
                     else
-                        throw_error(language.main.camera_broke, ERROR_LEVEL_WARNING);
+                        throw_error("Your camera seems to have a problem,\nunable to scan QR codes.", ERROR_LEVEL_WARNING);
                 }
 
                 continue;
             }
-            else if(kDown & KEY_Y && current_list->entries != NULL) //toggle preview mode
+            else if(!qr_mode && kDown & KEY_Y && current_list->entries != NULL) //toggle preview mode
             {
                 toggle_preview:
                 if(!preview_mode)
                 {
-                    preview_mode = load_preview(current_list, &preview, &preview_offset);
+                    preview_mode = load_preview(*current_list, &preview, &preview_offset);
                     if(preview_mode)
                     {
                         end_frame();
@@ -578,7 +493,7 @@ int main(void)
                         if(current_mode == MODE_THEMES && dspfirm)
                         {
                             audio = calloc(1, sizeof(audio_s));
-                            Result r = load_audio(&current_list->entries[current_list->selected_entry], audio);
+                            Result r = load_audio(current_list->entries[current_list->selected_entry], audio);
                             if (R_SUCCEEDED(r)) play_audio(audio);
                             else audio = NULL;
                         }
@@ -589,7 +504,9 @@ int main(void)
                     preview_mode = false;
                     if(current_mode == MODE_THEMES && audio)
                     {
-                        stop_audio(&audio);
+                        audio->stop = true;
+                        svcWaitSynchronization(audio->finished, U64_MAX);
+                        audio = NULL;
                     }
                 }
                 continue;
@@ -599,13 +516,15 @@ int main(void)
                 preview_mode = false;
                 if(current_mode == MODE_THEMES && audio)
                 {
-                    stop_audio(&audio);
+                    audio->stop = true;
+                    svcWaitSynchronization(audio->finished, U64_MAX);
+                    audio = NULL;
                 }
                 continue;
             }
         }
 
-        if(preview_mode || current_list->entries == NULL)
+        if(qr_mode || preview_mode || current_list->entries == NULL)
             goto touch;
 
         int selected_entry = current_list->selected_entry;
@@ -613,55 +532,17 @@ int main(void)
 
         if(install_mode)
         {
-            if ((kDown | kHeld) & KEY_TOUCH)
+            if(kUp & KEY_A)
-            {
-                touchPosition touch = {0};
-                hidTouchRead(&touch);
-                u16 x = touch.px;
-                u16 y = touch.py;
-
-                if (kDown & KEY_TOUCH)
-                {
-                    if (y < 24)
-                    {
-                        if (BETWEEN(320-24, x, 320))
-                        {
-                            goto install_theme_single;
-                        } else if (BETWEEN(320-48, x, 320-24))
-                        {
-                            goto install_theme_shuffle;
-                        } else if (BETWEEN(320-72, x, 320-48))
-                        {
-                            goto install_theme_no_bgm;
-                        } else if (BETWEEN(320-96, x, 320-72))
-                        {
-                            goto install_theme_bgm_only;
-                        } else if (BETWEEN(320-120, x, 320-96))
-                        {
-                            goto install_leave;
-                        }
-                    }
-                }
-            }
-
-            if(kDown & KEY_B)
-            {
-                install_leave:
                 install_mode = false;
-                draw_mode = DRAW_MODE_LIST;
+            if(!install_mode)
-            }
+            {
-            else if(kDown & KEY_DLEFT)
+                if((kDown | kHeld) & KEY_DLEFT)
                 {
-                install_theme_bgm_only:
-                install_mode = false;
-                draw_mode = DRAW_MODE_LIST;
-                aptSetHomeAllowed(false);
                     draw_install(INSTALL_BGM);
-                if(R_SUCCEEDED(bgm_install(current_entry)))
+                    if(R_SUCCEEDED(bgm_install(*current_entry)))
                     {
                         for(int i = 0; i < current_list->entries_count; i++)
                         {
-            #define BETWEEN(min, x, max) (min < x && x < max)
                             Entry_s * theme = &current_list->entries[i];
                             if(theme == current_entry)
                                 theme->installed = true;
@@ -671,17 +552,12 @@ int main(void)
                         installed_themes = true;
                     }
                 }
-            else if(kDown & KEY_DUP)
+                else if((kDown | kHeld) & KEY_DUP)
                 {
-                install_theme_single:
-                install_mode = false;
-                draw_mode = DRAW_MODE_LIST;
-                aptSetHomeAllowed(false);
                     draw_install(INSTALL_SINGLE);
-                if(R_SUCCEEDED(theme_install(current_entry)))
+                    if(R_SUCCEEDED(theme_install(*current_entry)))
                     {
                         for(int i = 0; i < current_list->entries_count; i++)
-
                         {
                             Entry_s * theme = &current_list->entries[i];
                             if(theme == current_entry)
@@ -692,14 +568,10 @@ int main(void)
                         installed_themes = true;
                     }
                 }
-            else if(kDown & KEY_DRIGHT)
+                else if((kDown | kHeld) & KEY_DRIGHT)
                 {
-                install_theme_no_bgm:
-                install_mode = false;
-                draw_mode = DRAW_MODE_LIST;
-                aptSetHomeAllowed(false);
                     draw_install(INSTALL_NO_BGM);
-                if(R_SUCCEEDED(no_bgm_install(current_entry)))
+                    if(R_SUCCEEDED(no_bgm_install(*current_entry)))
                     {
                         for(int i = 0; i < current_list->entries_count; i++)
                         {
@@ -712,24 +584,20 @@ int main(void)
                         installed_themes = true;
                     }
                 }
-            else if(kDown & KEY_DDOWN)
+                else if((kDown | kHeld) & KEY_DDOWN)
                 {
-                install_theme_shuffle:
-                install_mode = false;
-                draw_mode = DRAW_MODE_LIST;
                     if(current_list->shuffle_count > MAX_SHUFFLE_THEMES)
                     {
-                    throw_error(language.main.too_many_themes, ERROR_LEVEL_WARNING);
+                        throw_error("You have too many themes selected.", ERROR_LEVEL_WARNING);
                     }
                     else if(current_list->shuffle_count < 2)
                     {
-                    throw_error(language.main.not_enough_themes, ERROR_LEVEL_WARNING);
+                        throw_error("You don't have enough themes selected.", ERROR_LEVEL_WARNING);
                     }
                     else
                     {
-                    aptSetHomeAllowed(false);
                         draw_install(INSTALL_SHUFFLE);
-                    Result res = shuffle_install(current_list);
+                        Result res = shuffle_install(*current_list);
                         if(R_FAILED(res)) DEBUG("shuffle install result: %lx\n", res);
                         else
                         {
@@ -748,59 +616,20 @@ int main(void)
                         }
                     }
                 }
+            }
             continue;
         }
         else if(extra_mode)
         {
-            if((kDown | kHeld) & KEY_TOUCH)
+            if(kUp & KEY_X)
-            {
-                touchPosition touch = {0};
-                hidTouchRead(&touch);
-                u16 x = touch.px;
-                u16 y = touch.py;
-                if (kDown & KEY_TOUCH)
-                {
-                    if (y < 24)
-                    {
-                        if (BETWEEN(320-24, x, 320))
-                        {
-                            goto browse_themeplaza;
-                        } else if (BETWEEN(320-48, x, 320-24))
-                        {
-                            goto dump_single;
-                        } else if (BETWEEN(320-72, x, 320-48))
-                        {
-                            switch (current_list->current_sort)
-                            {
-                                case SORT_NAME:
-                                    goto sort_author;
-                                    break;
-                                case SORT_AUTHOR:
-                                    goto sort_path;
-                                    break;
-                                case SORT_PATH:
-                                    goto sort_name;
-                                    break;
-                                default:
-                                    break;
-                            }
-                        } else if (BETWEEN(320-96, x, 320-72))
-                        {
                 extra_mode = false;
-                            extra_index = 1;
+            if(!extra_mode)
-                            draw_mode = DRAW_MODE_LIST;
-                        }
-                    }
-                }
-            }
-            else if(extra_index == 1)
             {
-                if(kDown & KEY_B)
+                bool key_l = (kDown | kHeld) & KEY_L;
+                bool key_r = (kDown | kHeld) & KEY_R;
+                if(!(key_l ^ key_r))
                 {
-                    extra_mode = false;
+                    if((kDown | kHeld) & KEY_DLEFT)
-                    draw_mode = DRAW_MODE_LIST;
-                }
-                else if(kDown & KEY_DLEFT)
                     {
                         browse_themeplaza:
                         if(themeplaza_browser(current_mode))
@@ -808,95 +637,38 @@ int main(void)
                             current_mode = MODE_THEMES;
                             load_lists(lists);
                         }
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
                     }
-                else if(kDown & KEY_DUP)
+                    else if((kDown | kHeld) & KEY_DUP)
                     {
                         jump:
                         jump_menu(current_list);
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
 
                     }
-                else if(kDown & KEY_DDOWN)
+                    else if((kDown | kHeld) & KEY_DDOWN)
                     {
                         load_icons_first(current_list, false);
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
                     }
-                else if (kDown & KEY_R)
+                }
+                else if(key_l)
                 {
-                    extra_index = 2;
+                    if((kDown | kHeld) & KEY_DLEFT)
-                }
-                else if(kDown & KEY_L)
-                {
-                    extra_index = 0;
-                }
-            }
-            else if(extra_index == 0)
-            {
-                if(kDown & KEY_DLEFT)
                     {
                         sort_path:
                         sort_by_filename(current_list);
                         load_icons_first(current_list, false);
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
                     }
-                else if(kDown & KEY_DUP)
+                    else if(((kDown | kHeld)) & KEY_DUP)
                     {
                         sort_name:
                         sort_by_name(current_list);
                         load_icons_first(current_list, false);
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
                     }
-                else if(kDown & KEY_DDOWN)
+                    else if(((kDown | kHeld)) & KEY_DDOWN)
                     {
                         sort_author:
                         sort_by_author(current_list);
                         load_icons_first(current_list, false);
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
                     }
-                else if (kDown & KEY_B)
-                {
-                    extra_index = 1;
-                }
-            }
-            else if(extra_index == 2)
-            {
-                if(kDown & KEY_DUP)
-                {
-                    dump_single:
-                    draw_install(INSTALL_DUMPING_THEME);
-                    Result res = dump_current_theme();
-                    if (R_FAILED(res)) DEBUG("Dump theme result: %lx\n", res);
-                    else load_lists(lists);
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
-                }
-                else if(kDown & KEY_DDOWN)
-                {
-                    draw_install(INSTALL_DUMPING_ALL_THEMES);
-                    Result res = dump_all_themes();
-                    if (R_FAILED(res)) DEBUG("Dump all themes result: %lx\n", res);
-                    else load_lists(lists);
-                    extra_mode = false;
-                    draw_mode = DRAW_MODE_LIST;
-                    extra_index = 1;
-                }
-                else if(kDown &KEY_B)
-                {
-                    extra_index = 1;
                 }
             }
             continue;
@@ -910,11 +682,10 @@ int main(void)
             {
                 case MODE_THEMES:
                     install_mode = true;
-                    draw_mode = DRAW_MODE_INSTALL;
                     break;
                 case MODE_SPLASHES:
                     draw_install(INSTALL_SPLASH);
-                    splash_install(current_entry);
+                    splash_install(*current_entry);
                     for(int i = 0; i < current_list->entries_count; i++)
                     {
                         Entry_s * splash = &current_list->entries[i];
@@ -936,7 +707,7 @@ int main(void)
                     toggle_shuffle(current_list);
                     break;
                 case MODE_SPLASHES:
-                    if(draw_confirm(language.main.uninstall_confirm, current_list, draw_mode))
+                    if(draw_confirm("Are you sure you would like to delete\nthe installed splash?", current_list))
                     {
                         draw_install(INSTALL_SPLASH_DELETE);
                         splash_delete();
@@ -949,11 +720,10 @@ int main(void)
         else if(kDown & KEY_X)
         {
             extra_mode = true;
-            draw_mode = DRAW_MODE_EXTRA;
         }
         else if(kDown & KEY_SELECT)
         {
-            if(draw_confirm(language.main.delete_confirm, current_list, draw_mode))
+            if(draw_confirm("Are you sure you would like to delete this?", current_list))
             {
                 draw_install(INSTALL_ENTRY_DELETE);
                 delete_entry(current_entry, current_entry->is_zip);
@@ -1012,49 +782,43 @@ int main(void)
             u16 x = touch.px;
             u16 y = touch.py;
 
-            u16 arrowStartX = 136;
+            u16 arrowStartX = 152;
             u16 arrowEndX = arrowStartX+16;
 
+            #define BETWEEN(min, x, max) (min < x && x < max)
 
             if(kDown & KEY_TOUCH)
             {
                 if(y < 24)
                 {
-                    if(BETWEEN(320-168, x, 320-144))
+                    if(current_list->entries != NULL && BETWEEN(arrowStartX, x, arrowEndX) && current_list->scroll > 0)
                     {
-                        if (current_mode == MODE_THEMES)
+                        change_selected(current_list, -current_list->entries_per_screen_v);
-                        {
-                            toggle_shuffle(current_list);
-                        }
                     }
                     else if(BETWEEN(320-144, x, 320-120))
                     {
-                        extra_mode = true;
+                        switch(current_list->current_sort)
-                        draw_mode = DRAW_MODE_EXTRA;
+                        {
+                            case SORT_NAME:
+                                goto sort_author;
+                                break;
+                            case SORT_AUTHOR:
+                                goto sort_path;
+                                break;
+                            case SORT_PATH:
+                                goto sort_name;
+                                break;
+                            default:
+                                break;
+                        }
                     }
                     else if(BETWEEN(320-120, x, 320-96))
                     {
-                        if (current_mode == MODE_THEMES)
+                        goto enable_qr;
-                        {
-                            install_mode = true;
-                            draw_mode = DRAW_MODE_INSTALL;
-                        } else if (current_mode == MODE_SPLASHES)
-                        {
-                            draw_install(INSTALL_SPLASH);
-                            splash_install(current_entry);
-                            for(int i = 0; i < current_list->entries_count; i++)
-                            {
-                                Entry_s * splash = &current_list->entries[i];
-                                if(splash == current_entry)
-                                    splash->installed = true;
-                                else
-                                    splash->installed = false;
-                            }
-                        }
                     }
                     else if(BETWEEN(320-96, x, 320-72))
                     {
-                        goto enable_qr;
+                        goto browse_themeplaza;
                     }
                     else if(BETWEEN(320-72, x, 320-48))
                     {
@@ -1071,11 +835,7 @@ int main(void)
                 }
                 else if(y >= 216)
                 {
-                    if(current_list->entries != NULL && BETWEEN(arrowStartX, x, arrowEndX) && current_list->scroll > 0)
+                    if(current_list->entries != NULL && BETWEEN(arrowStartX, x, arrowEndX) && current_list->scroll < current_list->entries_count - current_list->entries_per_screen_v)
-                    {
-                        change_selected(current_list, -current_list->entries_per_screen_v);
-                    }
-                    else if(current_list->entries != NULL && BETWEEN(arrowStartX + 16, x, arrowEndX + 16) && current_list->scroll < current_list->entries_count - current_list->entries_per_screen_v)
                     {
                         change_selected(current_list, current_list->entries_per_screen_v);
                     }
@@ -1091,7 +851,7 @@ int main(void)
                 {
                     for(int i = 0; i < current_list->entries_loaded; i++)
                     {
-                        u16 miny = 24 + current_list->entry_size * i;
+                        u16 miny = 24 + current_list->entry_size*i;
                         u16 maxy = miny + current_list->entry_size;
                         if(BETWEEN(miny, y, maxy) && current_list->scroll + i < current_list->entries_count)
                         {

source/music.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include "loading.h"
 
 // Play a given audio struct
-Result update_audio(audio_s * audio) 
+Result update_audio(audio_s *audio) 
 {
     u32 size = audio->wave_buf[audio->buf_pos].nsamples * 4 - audio->data_read;
     DEBUG("<update_audio> Audio Size: %ld\n", size);
@@ -36,7 +36,7 @@ Result update_audio(audio_s * audio)
     { 
         DEBUG("<update_audio> Attempting ov_read\n");
         int bitstream;
-        u32 read = ov_read(&audio->vf, (char *)audio->wave_buf[audio->buf_pos].data_vaddr + audio->data_read, size, &bitstream); // read 1 vorbis packet into wave buffer
+        u32 read = ov_read(&audio->vf, (char*)audio->wave_buf[audio->buf_pos].data_vaddr + audio->data_read, size, &bitstream); // read 1 vorbis packet into wave buffer
         DEBUG("<update_audio> ov_read successful\n");
 
         if (read <= 0) // EoF or error
@@ -64,31 +64,22 @@ Result update_audio(audio_s * audio)
     return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_APPLICATION, RD_SUCCESS);
 }
 
-void thread_audio(void * data) {
+void thread_audio(void* data) {
-    audio_s * audio = (audio_s *)data;
+    audio_s *audio = (audio_s*)data;
     while(!audio->stop) {
         update_audio(audio);
     }
-    ndspChnWaveBufClear(0);
-    ndspChnReset(0);
-    ov_clear(&audio->vf);
     free(audio->filebuf);
-    linearFree((void *)audio->wave_buf[0].data_vaddr);
+    ov_clear(&audio->vf);
-    linearFree((void *)audio->wave_buf[1].data_vaddr);
+    linearFree((void*)audio->wave_buf[0].data_vaddr);
-}
+    linearFree((void*)audio->wave_buf[1].data_vaddr);
-
+    while (audio->wave_buf[0].status != NDSP_WBUF_DONE || audio->wave_buf[1].status != NDSP_WBUF_DONE) svcSleepThread(1e7);
-void play_audio(audio_s * audio) {
+    svcSignalEvent(audio->finished);
-    audio->playing_thread = threadCreate(thread_audio, audio, 0x1000, 0x3F, 1, false);
+    svcSleepThread(1e8);
-}
+    svcCloseHandle(audio->finished);
-
-void stop_audio(audio_s ** audio_ptr) {
-    audio_s * audio = *audio_ptr;
-    if(audio->playing_thread)
-    {
-        audio->stop = true;
-        threadJoin(audio->playing_thread, U64_MAX);
-        threadFree(audio->playing_thread);
-    }
     free(audio);
-    *audio_ptr = NULL;
+}
+
+void play_audio(audio_s *audio) {
+    threadCreate(thread_audio, audio, 0x1000, 0x3F, 1, true);
 }

source/quirc/decode.c

@@ -576,11 +576,10 @@ static quirc_decode_error_t codestream_ecc(struct quirc_data *data,
 		&quirc_version_db[data->version];
 	const struct quirc_rs_params *sb_ecc = &ver->ecc[data->ecc_level];
 	struct quirc_rs_params lb_ecc;
-	const int lb_count =
+	int bc = ver->data_bytes / sb_ecc->bs;
-	    (ver->data_bytes - sb_ecc->bs * sb_ecc->ns) / (sb_ecc->bs + 1);
-	const int bc = lb_count + sb_ecc->ns;
-	const int ecc_offset = sb_ecc->dw * bc + lb_count;
 	int dst_offset = 0;
+	int lb_count = ver->data_bytes - bc * sb_ecc->bs;
+	int small_dw_total = bc * sb_ecc->dw;
 	int i;
 
 	memcpy(&lb_ecc, sb_ecc, sizeof(lb_ecc));
@@ -589,16 +588,22 @@ static quirc_decode_error_t codestream_ecc(struct quirc_data *data,
 
 	for (i = 0; i < bc; i++) {
 		uint8_t *dst = ds->data + dst_offset;
-		const struct quirc_rs_params *ecc =
+		const struct quirc_rs_params *ecc = sb_ecc;
-		    (i < sb_ecc->ns) ? sb_ecc : &lb_ecc;
-		const int num_ec = ecc->bs - ecc->dw;
 		quirc_decode_error_t err;
-		int j;
+		int j = 0;
+		int k;
 
-		for (j = 0; j < ecc->dw; j++)
+		for (k = 0; k < sb_ecc->dw; k++)
-			dst[j] = ds->raw[j * bc + i];
+			dst[j++] = ds->raw[k * bc + i];
-		for (j = 0; j < num_ec; j++)
+
-			dst[ecc->dw + j] = ds->raw[ecc_offset + j * bc + i];
+		if (i + lb_count >= bc) {
+			dst[j++] = ds->raw[small_dw_total + i - lb_count];
+			ecc = &lb_ecc;
+		}
+
+		for (k = 0; k < sb_ecc->bs - sb_ecc->dw; k++)
+			dst[j++] = ds->raw[small_dw_total + lb_count + i +
+					   k * bc];
 
 		err = correct_block(dst, ecc);
 		if (err)
@@ -724,10 +729,10 @@ static quirc_decode_error_t decode_alpha(struct quirc_data *data,
 	int bits = 13;
 	int count;
 
-	if (data->version < 10)
+	if (data->version < 7)
 		bits = 9;
-	else if (data->version < 27)
+	else if (data->version < 11)
-		bits = 11;
+		bits = 10;
 
 	count = take_bits(ds, bits);
 	if (data->payload_len + count + 1 > QUIRC_MAX_PAYLOAD)
@@ -790,18 +795,12 @@ static quirc_decode_error_t decode_kanji(struct quirc_data *data,
 
 	for (i = 0; i < count; i++) {
 		int d = take_bits(ds, 13);
-		int msB = d / 0xc0;
-		int lsB = d % 0xc0;
-		int intermediate = (msB << 8) | lsB;
 		uint16_t sjw;
 
-		if (intermediate + 0x8140 <= 0x9ffc) {
+		if (d + 0x8140 >= 0x9ffc)
-			/* bytes are in the range 0x8140 to 0x9FFC */
+			sjw = d + 0x8140;
-			sjw = intermediate + 0x8140;
+		else
-		} else {
+			sjw = d + 0xc140;
-			/* bytes are in the range 0xE040 to 0xEBBF */
-			sjw = intermediate + 0xc140;
-		}
 
 		data->payload[data->payload_len++] = sjw >> 8;
 		data->payload[data->payload_len++] = sjw & 0xff;
@@ -874,7 +873,7 @@ static quirc_decode_error_t decode_payload(struct quirc_data *data,
 done:
 
 	/* Add nul terminator to all payloads */
-	if (data->payload_len >= (int) sizeof(data->payload))
+	if ((unsigned int)data->payload_len >= sizeof(data->payload))
 		data->payload_len--;
 	data->payload[data->payload_len] = 0;
 

source/quirc/identify.c

@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -99,8 +98,8 @@ static void perspective_map(const double *c,
 	double x = (c[0]*u + c[1]*v + c[2]) / den;
 	double y = (c[3]*u + c[4]*v + c[5]) / den;
 
-	ret->x = (int) rint(x);
+	ret->x = rint(x);
-	ret->y = (int) rint(y);
+	ret->y = rint(y);
 }
 
 static void perspective_unmap(const double *c,
@@ -122,22 +121,146 @@ static void perspective_unmap(const double *c,
  * Span-based floodfill routine
  */
 
-#define FLOOD_FILL_MAX_DEPTH		128
-
 typedef void (*span_func_t)(void *user_data, int y, int left, int right);
 
-static void flood_fill_seed(struct quirc *q, int x, int y, int from, int to,
+#if 0 // recursive flood fill
-			    span_func_t func, void *user_data,
+
-			    int depth)
+#define FLOOD_FILL_MAX_DEPTH	4096
+
+struct flood_fill_params{
+	struct quirc *q;
+	int from;
+	int to;
+	span_func_t func;
+	void *user_data;
+};
+
+static struct flood_fill_params ffp;
+
+static void flood_fill_rec(int x, int y, int depth)
 {
 	int left = x;
 	int right = x;
 	int i;
-	quirc_pixel_t *row = q->pixels + y * q->w;
+	quirc_pixel_t *row = ffp.q->pixels + y * ffp.q->w;
 
-	if (depth >= FLOOD_FILL_MAX_DEPTH)
+	if (!depth)
 		return;
 
+	while (left > 0 && row[left - 1] == ffp.from)
+		left--;
+
+	while (right < ffp.q->w - 1 && row[right + 1] == ffp.from)
+		right++;
+
+	/* Fill the extent */
+	for (i = left; i <= right; i++)
+		row[i] = ffp.to;
+
+	if (ffp.func)
+		ffp.func(ffp.user_data, y, left, right);
+
+	/* Seed new flood-fills */
+	if (y > 0) {
+		row = ffp.q->pixels + (y - 1) * ffp.q->w;
+
+		for (i = left; i <= right; i++)
+			if (row[i] == ffp.from)
+				flood_fill_rec(i, y - 1, depth - 1);
+	}
+
+	if (y < ffp.q->h - 1) {
+		row = ffp.q->pixels + (y + 1) * ffp.q->w;
+
+		for (i = left; i <= right; i++)
+			if (row[i] == ffp.from)
+				flood_fill_rec(i, y + 1, depth - 1);
+	}
+}
+
+static void flood_fill_seed(struct quirc *q, int x, int y, int from, int to,
+				span_func_t func, void *user_data)
+{
+	ffp.q = q;
+	ffp.from = from;
+	ffp.to = to;
+	ffp.func = func;
+	ffp.user_data = user_data;
+
+	flood_fill_rec(x, y, FLOOD_FILL_MAX_DEPTH);
+}
+
+#else // stacked flood fill
+
+#define FILL_STACK_CHUNK_SIZE 0x400
+
+struct fill_stack_chunk{
+	int x[FILL_STACK_CHUNK_SIZE];
+	int y[FILL_STACK_CHUNK_SIZE];
+	struct fill_stack_chunk *prev;
+};
+
+struct fill_stack{
+	struct fill_stack_chunk *last_chunk;
+	int index;
+};
+
+static void fill_stack_init(struct fill_stack *s){
+	s->last_chunk = NULL;
+}
+
+static int fill_stack_is_empty(struct fill_stack *s){
+	return s->last_chunk == NULL;
+}
+
+static void fill_stack_push(struct fill_stack *s, int x, int y){
+	struct fill_stack_chunk *c;
+	if(s->last_chunk != NULL && s->index < FILL_STACK_CHUNK_SIZE - 1){
+		c = s->last_chunk;
+		s->index++;
+	}else{
+		c = (struct fill_stack_chunk*)malloc(sizeof(struct fill_stack_chunk));
+		if(c == NULL){
+			return;
+		}
+		c->prev = s->last_chunk;
+		s->last_chunk = c;
+		s->index = 0;
+	}
+	c->x[s->index] = x;
+	c->y[s->index] = y;
+}
+
+static void fill_stack_pop(struct fill_stack *s, int *px, int *py){
+	struct fill_stack_chunk *c = s->last_chunk;
+	if(c == NULL){
+		return;
+	}
+	*px = c->x[s->index];
+	*py = c->y[s->index];
+	if(s->index > 0){
+		s->index--;
+	}else{
+		s->last_chunk = c->prev;
+		s->index = FILL_STACK_CHUNK_SIZE - 1;
+		free(c);
+	}
+}
+
+static void flood_fill_seed(struct quirc *q, int start_x, int start_y, int from, int to,
+				span_func_t func, void *user_data)
+{
+	struct fill_stack s;
+	fill_stack_init(&s);
+	fill_stack_push(&s, start_x, start_y);
+
+	do{
+		int x = 0, y = 0;
+		fill_stack_pop(&s, &x, &y);
+
+		int left = x, right = x, i;
+		quirc_pixel_t *row = q->pixels + y * q->w;
+
 		while (left > 0 && row[left - 1] == from)
 			left--;
 
@@ -157,8 +280,7 @@ static void flood_fill_seed(struct quirc *q, int x, int y, int from, int to,
 
 			for (i = left; i <= right; i++)
 				if (row[i] == from)
-				flood_fill_seed(q, i, y - 1, from, to,
+					fill_stack_push(&s, i, y - 1);
-						func, user_data, depth + 1);
 		}
 
 		if (y < q->h - 1) {
@@ -166,64 +288,62 @@ static void flood_fill_seed(struct quirc *q, int x, int y, int from, int to,
 
 			for (i = left; i <= right; i++)
 				if (row[i] == from)
-				flood_fill_seed(q, i, y + 1, from, to,
+					fill_stack_push(&s, i, y + 1);
-						func, user_data, depth + 1);
 		}
+	}while(!fill_stack_is_empty(&s));
 }
+#endif
 
 /************************************************************************
  * Adaptive thresholding
  */
 
-static uint8_t otsu(const struct quirc *q)
+#define THRESHOLD_S_DEN		8
+#define THRESHOLD_T		5
+
+static void threshold(struct quirc *q)
 {
-	int numPixels = q->w * q->h;
+	int x, y;
+	int avg_w = 0;
+	int avg_u = 0;
+	int threshold_s = q->w / THRESHOLD_S_DEN;
+	quirc_pixel_t *row = q->pixels;
 
-	// Calculate histogram
+	for (y = 0; y < q->h; y++) {
-	const int HISTOGRAM_SIZE = 256;
+		int row_average[q->w];
-	unsigned int histogram[HISTOGRAM_SIZE];
+
-	memset(histogram, 0, (HISTOGRAM_SIZE) * sizeof(unsigned int));
+		memset(row_average, 0, sizeof(row_average));
-	uint8_t* ptr = q->image;
+
-	int length = numPixels;
+		for (x = 0; x < q->w; x++) {
-	while (length--) {
+			int w, u;
-		uint8_t value = *ptr++;
+
-		histogram[value]++;
+			if (y & 1) {
+				w = x;
+				u = q->w - 1 - x;
+			} else {
+				w = q->w - 1 - x;
+				u = x;
 			}
 
-	// Calculate weighted sum of histogram values
+			avg_w = (avg_w * (threshold_s - 1)) /
-	int sum = 0;
+				threshold_s + row[w];
-	for (int i = 0; i < HISTOGRAM_SIZE; ++i) {
+			avg_u = (avg_u * (threshold_s - 1)) /
-		sum += i * histogram[i];
+				threshold_s + row[u];
+
+			row_average[w] += avg_w;
+			row_average[u] += avg_u;
 		}
 
-	// Compute threshold
+		for (x = 0; x < q->w; x++) {
-	int sumB = 0;
+			if (row[x] < row_average[x] *
-	int q1 = 0;
+			    (100 - THRESHOLD_T) / (200 * threshold_s))
-	double max = 0;
+				row[x] = QUIRC_PIXEL_BLACK;
-	uint8_t threshold = 0;
+			else
-	for (int i = 0; i < HISTOGRAM_SIZE; ++i) {
+				row[x] = QUIRC_PIXEL_WHITE;
-		// Weighted background
-		q1 += histogram[i];
-		if (q1 == 0)
-			continue;
-
-		// Weighted foreground
-		const int q2 = numPixels - q1;
-		if (q2 == 0)
-			break;
-
-		sumB += i * histogram[i];
-		const double m1 = (double)sumB / q1;
-		const double m2 = ((double)sum - sumB) / q2;
-		const double m1m2 = m1 - m2;
-		const double variance = m1m2 * m1m2 * q1 * q2;
-		if (variance >= max) {
-			threshold = i;
-			max = variance;
-		}
 		}
 
-	return threshold;
+		row += q->w;
+	}
 }
 
 static void area_count(void *user_data, int y, int left, int right)
@@ -261,7 +381,7 @@ static int region_code(struct quirc *q, int x, int y)
 	box->seed.y = y;
 	box->capstone = -1;
 
-	flood_fill_seed(q, x, y, pixel, region, area_count, box, 0);
+	flood_fill_seed(q, x, y, pixel, region, area_count, box);
 
 	return region;
 }
@@ -331,7 +451,7 @@ static void find_region_corners(struct quirc *q,
 	psd.scores[0] = -1;
 	flood_fill_seed(q, region->seed.x, region->seed.y,
 			rcode, QUIRC_PIXEL_BLACK,
-			find_one_corner, &psd, 0);
+			find_one_corner, &psd);
 
 	psd.ref.x = psd.corners[0].x - psd.ref.x;
 	psd.ref.y = psd.corners[0].y - psd.ref.y;
@@ -349,7 +469,7 @@ static void find_region_corners(struct quirc *q,
 
 	flood_fill_seed(q, region->seed.x, region->seed.y,
 			QUIRC_PIXEL_BLACK, rcode,
-			find_other_corners, &psd, 0);
+			find_other_corners, &psd);
 }
 
 static void record_capstone(struct quirc *q, int ring, int stone)
@@ -422,7 +542,7 @@ static void finder_scan(struct quirc *q, int y)
 {
 	quirc_pixel_t *row = q->pixels + y * q->w;
 	int x;
-	int last_color = 0;
+	int last_color;
 	int run_length = 0;
 	int run_count = 0;
 	int pb[5];
@@ -768,7 +888,7 @@ static int fitness_all(const struct quirc *q, int index)
 
 	/* Check alignment patterns */
 	ap_count = 0;
-	while ((ap_count < QUIRC_MAX_ALIGNMENT) && info->apat[ap_count])
+	while (info->apat[ap_count])
 		ap_count++;
 
 	for (i = 1; i + 1 < ap_count; i++) {
@@ -854,7 +974,7 @@ static void rotate_capstone(struct quirc_capstone *cap,
 	struct quirc_point copy[4];
 	int j;
 	int best = 0;
-	int best_score = INT_MAX;
+	int best_score = 0;
 
 	for (j = 0; j < 4; j++) {
 		struct quirc_point *p = &cap->corners[j];
@@ -962,10 +1082,10 @@ static void record_qr_grid(struct quirc *q, int a, int b, int c)
 
 			flood_fill_seed(q, reg->seed.x, reg->seed.y,
 					qr->align_region, QUIRC_PIXEL_BLACK,
-					NULL, NULL, 0);
+					NULL, NULL);
 			flood_fill_seed(q, reg->seed.x, reg->seed.y,
 					QUIRC_PIXEL_BLACK, qr->align_region,
-					find_leftmost_to_line, &psd, 0);
+					find_leftmost_to_line, &psd);
 		}
 	}
 
@@ -1071,18 +1191,17 @@ static void test_grouping(struct quirc *q, int i)
 	test_neighbours(q, i, &hlist, &vlist);
 }
 
-static void pixels_setup(struct quirc *q, uint8_t threshold)
+static void pixels_setup(struct quirc *q)
 {
-	if (QUIRC_PIXEL_ALIAS_IMAGE) {
+	if (sizeof(*q->image) == sizeof(*q->pixels)) {
 		q->pixels = (quirc_pixel_t *)q->image;
+	} else {
+		int x, y;
+		for (y = 0; y < q->h; y++) {
+			for (x = 0; x < q->w; x++) {
+				q->pixels[y * q->w + x] = q->image[y * q->w + x];
+			}
 		}
-
-	uint8_t* source = q->image;
-	quirc_pixel_t* dest = q->pixels;
-	int length = q->w * q->h;
-	while (length--) {
-		uint8_t value = *source++;
-		*dest++ = (value < threshold) ? QUIRC_PIXEL_BLACK : QUIRC_PIXEL_WHITE;
 	}
 }
 
@@ -1104,8 +1223,8 @@ void quirc_end(struct quirc *q)
 {
 	int i;
 
-	uint8_t threshold = otsu(q);
+	pixels_setup(q);
-	pixels_setup(q, threshold);
+	threshold(q);
 
 	for (i = 0; i < q->h; i++)
 		finder_scan(q, i);

source/quirc/quirc.c

@@ -36,73 +36,34 @@ struct quirc *quirc_new(void)
 
 void quirc_destroy(struct quirc *q)
 {
+	if (q->image)
 		free(q->image);
-	/* q->pixels may alias q->image when their type representation is of the
+	if (sizeof(*q->image) != sizeof(*q->pixels))
-	   same size, so we need to be careful here to avoid a double free */
-	if (!QUIRC_PIXEL_ALIAS_IMAGE)
 		free(q->pixels);
+
 	free(q);
 }
 
 int quirc_resize(struct quirc *q, int w, int h)
 {
-	uint8_t		*image  = NULL;
+	uint8_t *new_image = realloc(q->image, w * h);
-	quirc_pixel_t	*pixels = NULL;
 
-	/*
+	if (!new_image)
-	 * XXX: w and h should be size_t (or at least unsigned) as negatives
+		return -1;
-	 * values would not make much sense. The downside is that it would break
-	 * both the API and ABI. Thus, at the moment, let's just do a sanity
-	 * check.
-	 */
-	if (w < 0 || h < 0)
-		goto fail;
 
-	/*
+	if (sizeof(*q->image) != sizeof(*q->pixels)) {
-	 * alloc a new buffer for q->image. We avoid realloc(3) because we want
+		size_t new_size = w * h * sizeof(quirc_pixel_t);
-	 * on failure to be leave `q` in a consistant, unmodified state.
+		quirc_pixel_t *new_pixels = realloc(q->pixels, new_size);
-	 */
+		if (!new_pixels)
-	image = calloc(w, h);
+			return -1;
-	if (!image)
+		q->pixels = new_pixels;
-		goto fail;
-
-	/* compute the "old" (i.e. currently allocated) and the "new"
-	   (i.e. requested) image dimensions */
-	size_t olddim = q->w * q->h;
-	size_t newdim = w * h;
-	size_t min = (olddim < newdim ? olddim : newdim);
-
-	/*
-	 * copy the data into the new buffer, avoiding (a) to read beyond the
-	 * old buffer when the new size is greater and (b) to write beyond the
-	 * new buffer when the new size is smaller, hence the min computation.
-	 */
-	(void)memcpy(image, q->image, min);
-
-	/* alloc a new buffer for q->pixels if needed */
-	if (!QUIRC_PIXEL_ALIAS_IMAGE) {
-		pixels = calloc(newdim, sizeof(quirc_pixel_t));
-		if (!pixels)
-			goto fail;
 	}
 
-	/* alloc succeeded, update `q` with the new size and buffers */
+	q->image = new_image;
 	q->w = w;
 	q->h = h;
-	free(q->image);
-	q->image = image;
-	if (!QUIRC_PIXEL_ALIAS_IMAGE) {
-		free(q->pixels);
-		q->pixels = pixels;
-	}
 
 	return 0;
-	/* NOTREACHED */
-fail:
-	free(image);
-	free(pixels);
-
-	return -1;
 }
 
 int quirc_count(const struct quirc *q)
@@ -123,6 +84,7 @@ static const char *const error_table[] = {
 
 const char *quirc_strerror(quirc_decode_error_t err)
 {
+	// note from Anemone3DS dev - L88 used to compare err >= 0, but err is always positive
 	if (err < sizeof(error_table) / sizeof(error_table[0]))
 		return error_table[err];
 

source/quirc/quirc.h

@@ -19,10 +19,6 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct quirc;
 
 /* Obtain the library version string. */
@@ -121,7 +117,7 @@ struct quirc_code {
 	 * is a bitmask giving the actual values of cells. If the cell
 	 * at (x, y) is black, then the following bit is set:
 	 *
-	 *     cell_bitmap[i >> 3] & (1 << (i & 7))
+	 *     cell_bitmap[i << 3] & (1 << (i & 7))
 	 *
 	 * where i = (y * size) + x.
 	 */
@@ -166,8 +162,4 @@ void quirc_extract(const struct quirc *q, int index,
 quirc_decode_error_t quirc_decode(const struct quirc_code *code,
 				  struct quirc_data *data);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

source/quirc/quirc_internal.h

@@ -32,10 +32,8 @@
 #define QUIRC_PERSPECTIVE_PARAMS	8
 
 #if QUIRC_MAX_REGIONS < UINT8_MAX
-#define QUIRC_PIXEL_ALIAS_IMAGE	1
 typedef uint8_t quirc_pixel_t;
 #elif QUIRC_MAX_REGIONS < UINT16_MAX
-#define QUIRC_PIXEL_ALIAS_IMAGE	0
 typedef uint16_t quirc_pixel_t;
 #else
 #error "QUIRC_MAX_REGIONS > 65534 is not supported"
@@ -100,9 +98,9 @@ struct quirc {
 #define QUIRC_MAX_ALIGNMENT   7
 
 struct quirc_rs_params {
-	int             bs; /* Small block size */
+	int             bs; /* Block size */
-	int             dw; /* Small data words */
+	int             dw; /* Data words */
-	int		ns; /* Number of small blocks */
+	int             ce; /* Correctable errors */
 };
 
 struct quirc_version_info {

source/quirc/version_db.c

@@ -22,400 +22,400 @@ const struct quirc_version_info quirc_version_db[QUIRC_MAX_VERSION + 1] = {
 		    .data_bytes = 26,
 		    .apat = {0},
 		    .ecc = {
-			    {.bs = 26, .dw = 16, .ns = 1},
+			    {.bs = 26, .dw = 16, .ce = 4},
-			    {.bs = 26, .dw = 19, .ns = 1},
+			    {.bs = 26, .dw = 19, .ce = 2},
-			    {.bs = 26, .dw = 9, .ns = 1},
+			    {.bs = 26, .dw = 9, .ce = 8},
-			    {.bs = 26, .dw = 13, .ns = 1}
+			    {.bs = 26, .dw = 13, .ce = 6}
 		    }
 	    },
 	    { /* Version 2 */
 		    .data_bytes = 44,
 		    .apat = {6, 18, 0},
 		    .ecc = {
-			    {.bs = 44, .dw = 28, .ns = 1},
+			    {.bs = 44, .dw = 28, .ce = 8},
-			    {.bs = 44, .dw = 34, .ns = 1},
+			    {.bs = 44, .dw = 34, .ce = 4},
-			    {.bs = 44, .dw = 16, .ns = 1},
+			    {.bs = 44, .dw = 16, .ce = 14},
-			    {.bs = 44, .dw = 22, .ns = 1}
+			    {.bs = 44, .dw = 22, .ce = 11}
 		    }
 	    },
 	    { /* Version 3 */
 		    .data_bytes = 70,
 		    .apat = {6, 22, 0},
 		    .ecc = {
-			    {.bs = 70, .dw = 44, .ns = 1},
+			    {.bs = 70, .dw = 44, .ce = 13},
-			    {.bs = 70, .dw = 55, .ns = 1},
+			    {.bs = 70, .dw = 55, .ce = 7},
-			    {.bs = 35, .dw = 13, .ns = 2},
+			    {.bs = 35, .dw = 13, .ce = 11},
-			    {.bs = 35, .dw = 17, .ns = 2}
+			    {.bs = 35, .dw = 17, .ce = 9}
 		    }
 	    },
 	    { /* Version 4 */
 		    .data_bytes = 100,
 		    .apat = {6, 26, 0},
 		    .ecc = {
-			    {.bs = 50, .dw = 32, .ns = 2},
+			    {.bs = 50, .dw = 32, .ce = 9},
-			    {.bs = 100, .dw = 80, .ns = 1},
+			    {.bs = 100, .dw = 80, .ce = 10},
-			    {.bs = 25, .dw = 9, .ns = 4},
+			    {.bs = 25, .dw = 9, .ce = 8},
-			    {.bs = 50, .dw = 24, .ns = 2}
+			    {.bs = 50, .dw = 24, .ce = 13}
 		    }
 	    },
 	    { /* Version 5 */
 		    .data_bytes = 134,
 		    .apat = {6, 30, 0},
 		    .ecc = {
-			    {.bs = 67, .dw = 43, .ns = 2},
+			    {.bs = 67, .dw = 43, .ce = 12},
-			    {.bs = 134, .dw = 108, .ns = 1},
+			    {.bs = 134, .dw = 108, .ce = 13},
-			    {.bs = 33, .dw = 11, .ns = 2},
+			    {.bs = 33, .dw = 11, .ce = 11},
-			    {.bs = 33, .dw = 15, .ns = 2}
+			    {.bs = 33, .dw = 15, .ce = 9}
 		    }
 	    },
 	    { /* Version 6 */
 		    .data_bytes = 172,
 		    .apat = {6, 34, 0},
 		    .ecc = {
-			    {.bs = 43, .dw = 27, .ns = 4},
+			    {.bs = 43, .dw = 27, .ce = 8},
-			    {.bs = 86, .dw = 68, .ns = 2},
+			    {.bs = 86, .dw = 68, .ce = 9},
-			    {.bs = 43, .dw = 15, .ns = 4},
+			    {.bs = 43, .dw = 15, .ce = 14},
-			    {.bs = 43, .dw = 19, .ns = 4}
+			    {.bs = 43, .dw = 19, .ce = 12}
 		    }
 	    },
 	    { /* Version 7 */
 		    .data_bytes = 196,
 		    .apat = {6, 22, 38, 0},
 		    .ecc = {
-			    {.bs = 49, .dw = 31, .ns = 4},
+			    {.bs = 49, .dw = 31, .ce = 9},
-			    {.bs = 98, .dw = 78, .ns = 2},
+			    {.bs = 98, .dw = 78, .ce = 10},
-			    {.bs = 39, .dw = 13, .ns = 4},
+			    {.bs = 39, .dw = 13, .ce = 13},
-			    {.bs = 32, .dw = 14, .ns = 2}
+			    {.bs = 32, .dw = 14, .ce = 9}
 		    }
 	    },
 	    { /* Version 8 */
 		    .data_bytes = 242,
 		    .apat = {6, 24, 42, 0},
 		    .ecc = {
-			    {.bs = 60, .dw = 38, .ns = 2},
+			    {.bs = 60, .dw = 38, .ce = 11},
-			    {.bs = 121, .dw = 97, .ns = 2},
+			    {.bs = 121, .dw = 97, .ce = 12},
-			    {.bs = 40, .dw = 14, .ns = 4},
+			    {.bs = 40, .dw = 14, .ce = 13},
-			    {.bs = 40, .dw = 18, .ns = 4}
+			    {.bs = 40, .dw = 18, .ce = 11}
 		    }
 	    },
 	    { /* Version 9 */
 		    .data_bytes = 292,
 		    .apat = {6, 26, 46, 0},
 		    .ecc = {
-			    {.bs = 58, .dw = 36, .ns = 3},
+			    {.bs = 58, .dw = 36, .ce = 11},
-			    {.bs = 146, .dw = 116, .ns = 2},
+			    {.bs = 146, .dw = 116, .ce = 15},
-			    {.bs = 36, .dw = 12, .ns = 4},
+			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 36, .dw = 16, .ns = 4}
+			    {.bs = 36, .dw = 16, .ce = 10}
 		    }
 	    },
 	    { /* Version 10 */
 		    .data_bytes = 346,
 		    .apat = {6, 28, 50, 0},
 		    .ecc = {
-			    {.bs = 69, .dw = 43, .ns = 4},
+			    {.bs = 69, .dw = 43, .ce = 13},
-			    {.bs = 86, .dw = 68, .ns = 2},
+			    {.bs = 86, .dw = 68, .ce = 9},
-			    {.bs = 43, .dw = 15, .ns = 6},
+			    {.bs = 43, .dw = 15, .ce = 14},
-			    {.bs = 43, .dw = 19, .ns = 6}
+			    {.bs = 43, .dw = 19, .ce = 12}
 		    }
 	    },
 	    { /* Version 11 */
 		    .data_bytes = 404,
 		    .apat = {6, 30, 54, 0},
 		    .ecc = {
-			    {.bs = 80, .dw = 50, .ns = 1},
+			    {.bs = 80, .dw = 50, .ce = 15},
-			    {.bs = 101, .dw = 81, .ns = 4},
+			    {.bs = 101, .dw = 81, .ce = 10},
-			    {.bs = 36, .dw = 12, .ns = 3},
+			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 50, .dw = 22, .ns = 4}
+			    {.bs = 50, .dw = 22, .ce = 14}
 		    }
 	    },
 	    { /* Version 12 */
 		    .data_bytes = 466,
 		    .apat = {6, 32, 58, 0},
 		    .ecc = {
-			    {.bs = 58, .dw = 36, .ns = 6},
+			    {.bs = 58, .dw = 36, .ce = 11},
-			    {.bs = 116, .dw = 92, .ns = 2},
+			    {.bs = 116, .dw = 92, .ce = 12},
-			    {.bs = 42, .dw = 14, .ns = 7},
+			    {.bs = 42, .dw = 14, .ce = 14},
-			    {.bs = 46, .dw = 20, .ns = 4}
+			    {.bs = 46, .dw = 20, .ce = 14}
 		    }
 	    },
 	    { /* Version 13 */
 		    .data_bytes = 532,
 		    .apat = {6, 34, 62, 0},
 		    .ecc = {
-			    {.bs = 59, .dw = 37, .ns = 8},
+			    {.bs = 59, .dw = 37, .ce = 11},
-			    {.bs = 133, .dw = 107, .ns = 4},
+			    {.bs = 133, .dw = 107, .ce = 13},
-			    {.bs = 33, .dw = 11, .ns = 12},
+			    {.bs = 33, .dw = 11, .ce = 11},
-			    {.bs = 44, .dw = 20, .ns = 8}
+			    {.bs = 44, .dw = 20, .ce = 12}
 		    }
 	    },
 	    { /* Version 14 */
 		    .data_bytes = 581,
 		    .apat = {6, 26, 46, 66, 0},
 		    .ecc = {
-			    {.bs = 64, .dw = 40, .ns = 4},
+			    {.bs = 65, .dw = 41, .ce = 12},
-			    {.bs = 145, .dw = 115, .ns = 3},
+			    {.bs = 109, .dw = 87, .ce = 11},
-			    {.bs = 36, .dw = 12, .ns = 11},
+			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 36, .dw = 16, .ns = 11}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 15 */
 		    .data_bytes = 655,
 		    .apat = {6, 26, 48, 70, 0},
 		    .ecc = {
-			    {.bs = 65, .dw = 41, .ns = 5},
+			    {.bs = 65, .dw = 41, .ce = 12},
-			    {.bs = 109, .dw = 87, .ns = 5},
+			    {.bs = 109, .dw = 87, .ce = 11},
-			    {.bs = 36, .dw = 12, .ns = 11},
+			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 54, .dw = 24, .ns = 5}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 16 */
 		    .data_bytes = 733,
 		    .apat = {6, 26, 50, 74, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ns = 7},
+			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 122, .dw = 98, .ns = 5},
+			    {.bs = 122, .dw = 98, .ce = 12},
-			    {.bs = 45, .dw = 15, .ns = 3},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 43, .dw = 19, .ns = 15}
+			    {.bs = 43, .dw = 19, .ce = 12}
 		    }
 	    },
 	    { /* Version 17 */
 		    .data_bytes = 815,
 		    .apat = {6, 30, 54, 78, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 10},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 135, .dw = 107, .ns = 1},
+			    {.bs = 135, .dw = 107, .ce = 14},
-			    {.bs = 42, .dw = 14, .ns = 2},
+			    {.bs = 42, .dw = 14, .ce = 14},
-			    {.bs = 50, .dw = 22, .ns = 1}
+			    {.bs = 50, .dw = 22, .ce = 14}
 		    }
 	    },
 	    { /* Version 18 */
 		    .data_bytes = 901,
 		    .apat = {6, 30, 56, 82, 0},
 		    .ecc = {
-			    {.bs = 69, .dw = 43, .ns = 9},
+			    {.bs = 69, .dw = 43, .ce = 13},
-			    {.bs = 150, .dw = 120, .ns = 5},
+			    {.bs = 150, .dw = 120, .ce = 15},
-			    {.bs = 42, .dw = 14, .ns = 2},
+			    {.bs = 42, .dw = 14, .ce = 14},
-			    {.bs = 50, .dw = 22, .ns = 17}
+			    {.bs = 50, .dw = 22, .ce = 14}
 		    }
 	    },
 	    { /* Version 19 */
 		    .data_bytes = 991,
 		    .apat = {6, 30, 58, 86, 0},
 		    .ecc = {
-			    {.bs = 70, .dw = 44, .ns = 3},
+			    {.bs = 70, .dw = 44, .ce = 13},
-			    {.bs = 141, .dw = 113, .ns = 3},
+			    {.bs = 141, .dw = 113, .ce = 14},
-			    {.bs = 39, .dw = 13, .ns = 9},
+			    {.bs = 39, .dw = 13, .ce = 13},
-			    {.bs = 47, .dw = 21, .ns = 17}
+			    {.bs = 47, .dw = 21, .ce = 13}
 		    }
 	    },
 	    { /* Version 20 */
 		    .data_bytes = 1085,
 		    .apat = {6, 34, 62, 90, 0},
 		    .ecc = {
-			    {.bs = 67, .dw = 41, .ns = 3},
+			    {.bs = 67, .dw = 41, .ce = 13},
-			    {.bs = 135, .dw = 107, .ns = 3},
+			    {.bs = 135, .dw = 107, .ce = 14},
-			    {.bs = 43, .dw = 15, .ns = 15},
+			    {.bs = 43, .dw = 15, .ce = 14},
-			    {.bs = 54, .dw = 24, .ns = 15}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 21 */
 		    .data_bytes = 1156,
 		    .apat = {6, 28, 50, 72, 92, 0},
 		    .ecc = {
-			    {.bs = 68, .dw = 42, .ns = 17},
+			    {.bs = 68, .dw = 42, .ce = 13},
-			    {.bs = 144, .dw = 116, .ns = 4},
+			    {.bs = 144, .dw = 116, .ce = 14},
-			    {.bs = 46, .dw = 16, .ns = 19},
+			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 50, .dw = 22, .ns = 17}
+			    {.bs = 50, .dw = 22, .ce = 14}
 		    }
 	    },
 	    { /* Version 22 */
 		    .data_bytes = 1258,
 		    .apat = {6, 26, 50, 74, 98, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 17},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 139, .dw = 111, .ns = 2},
+			    {.bs = 139, .dw = 111, .ce = 14},
-			    {.bs = 37, .dw = 13, .ns = 34},
+			    {.bs = 37, .dw = 13, .ce = 12},
-			    {.bs = 54, .dw = 24, .ns = 7}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 23 */
 		    .data_bytes = 1364,
 		    .apat = {6, 30, 54, 78, 102, 0},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ns = 4},
+			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 151, .dw = 121, .ns = 4},
+			    {.bs = 151, .dw = 121, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 16},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 11}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 24 */
 		    .data_bytes = 1474,
 		    .apat = {6, 28, 54, 80, 106, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ns = 6},
+			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 147, .dw = 117, .ns = 6},
+			    {.bs = 147, .dw = 117, .ce = 15},
-			    {.bs = 46, .dw = 16, .ns = 30},
+			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 11}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 25 */
 		    .data_bytes = 1588,
 		    .apat = {6, 32, 58, 84, 110, 0},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ns = 8},
+			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 132, .dw = 106, .ns = 8},
+			    {.bs = 132, .dw = 106, .ce = 13},
-			    {.bs = 45, .dw = 15, .ns = 22},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 7}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 26 */
 		    .data_bytes = 1706,
 		    .apat = {6, 30, 58, 86, 114, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 19},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 142, .dw = 114, .ns = 10},
+			    {.bs = 142, .dw = 114, .ce = 14},
-			    {.bs = 46, .dw = 16, .ns = 33},
+			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 50, .dw = 22, .ns = 28}
+			    {.bs = 50, .dw = 22, .ce = 14}
 		    }
 	    },
 	    { /* Version 27 */
 		    .data_bytes = 1828,
 		    .apat = {6, 34, 62, 90, 118, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ns = 22},
+			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 152, .dw = 122, .ns = 8},
+			    {.bs = 152, .dw = 122, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 12},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 53, .dw = 23, .ns = 8}
+			    {.bs = 53, .dw = 23, .ce = 15}
 		    }
 	    },
 	    { /* Version 28 */
 		    .data_bytes = 1921,
 		    .apat = {6, 26, 50, 74, 98, 122, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ns = 3},
+			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 147, .dw = 117, .ns = 3},
+			    {.bs = 147, .dw = 117, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 11},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 4}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 29 */
 		    .data_bytes = 2051,
 		    .apat = {6, 30, 54, 78, 102, 126, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ns = 21},
+			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 146, .dw = 116, .ns = 7},
+			    {.bs = 146, .dw = 116, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 19},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 53, .dw = 23, .ns = 1}
+			    {.bs = 73, .dw = 45, .ce = 14}
 		    }
 	    },
 	    { /* Version 30 */
 		    .data_bytes = 2185,
 		    .apat = {6, 26, 52, 78, 104, 130, 0},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ns = 19},
+			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 145, .dw = 115, .ns = 5},
+			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 23},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 15}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 31 */
 		    .data_bytes = 2323,
 		    .apat = {6, 30, 56, 82, 108, 134, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 2},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ns = 13},
+			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 23},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 42}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 32 */
 		    .data_bytes = 2465,
 		    .apat = {6, 34, 60, 86, 112, 138, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 10},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ns = 17},
+			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 19},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 10}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 33 */
 		    .data_bytes = 2611,
-		    .apat = {6, 30, 58, 86, 114, 142, 0},
+		    .apat = {6, 30, 58, 96, 114, 142, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 14},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ns = 17},
+			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 11},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 29}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 34 */
 		    .data_bytes = 2761,
 		    .apat = {6, 34, 62, 90, 118, 146, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 14},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ns = 13},
+			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 46, .dw = 16, .ns = 59},
+			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 44}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 35 */
 		    .data_bytes = 2876,
 		    .apat = {6, 30, 54, 78, 102, 126, 150},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ns = 12},
+			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 151, .dw = 121, .ns = 12},
+			    {.bs = 151, .dw = 121, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 22},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 39}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 36 */
 		    .data_bytes = 3034,
 		    .apat = {6, 24, 50, 76, 102, 128, 154},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ns = 6},
+			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 151, .dw = 121, .ns = 6},
+			    {.bs = 151, .dw = 121, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 2},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 46}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 37 */
 		    .data_bytes = 3196,
 		    .apat = {6, 28, 54, 80, 106, 132, 158},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 29},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 152, .dw = 122, .ns = 17},
+			    {.bs = 152, .dw = 122, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 24},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 49}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 38 */
 		    .data_bytes = 3362,
 		    .apat = {6, 32, 58, 84, 110, 136, 162},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ns = 13},
+			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 152, .dw = 122, .ns = 4},
+			    {.bs = 152, .dw = 122, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 42},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 48}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 39 */
 		    .data_bytes = 3532,
 		    .apat = {6, 26, 54, 82, 110, 138, 166},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ns = 40},
+			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 147, .dw = 117, .ns = 20},
+			    {.bs = 147, .dw = 117, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 10},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 43}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    },
 	    { /* Version 40 */
 		    .data_bytes = 3706,
 		    .apat = {6, 30, 58, 86, 114, 142, 170},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ns = 18},
+			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 148, .dw = 118, .ns = 19},
+			    {.bs = 148, .dw = 118, .ce = 15},
-			    {.bs = 45, .dw = 15, .ns = 20},
+			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ns = 34}
+			    {.bs = 54, .dw = 24, .ce = 15}
 		    }
 	    }
 };

source/splashes.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include "unicode.h"
 #include "fs.h"
 #include "draw.h"
-#include "ui_strings.h"
 
 void splash_delete(void)
 {
@@ -35,7 +34,7 @@ void splash_delete(void)
     remove("/luma/splashbottom.bin");
 }
 
-void splash_install(const Entry_s * splash)
+void splash_install(Entry_s splash)
 {
     char *screen_buf = NULL;
 
@@ -55,7 +54,7 @@ void splash_install(const Entry_s * splash)
 
     if(size == 0 && bottom_size == 0)
     {
-        throw_error(language.splashes.no_splash_found, ERROR_LEVEL_WARNING);
+        throw_error("No splash.bin or splashbottom.bin found.\nIs this a splash?", ERROR_LEVEL_WARNING);
     }
     else
     {
@@ -66,7 +65,7 @@ void splash_install(const Entry_s * splash)
             if(config_buf[0xC] == 0)
             {
                 free(config_buf);
-                throw_error(language.splashes.splash_disabled, ERROR_LEVEL_WARNING);
+                throw_error("WARNING: Splashes are disabled in Luma Config", ERROR_LEVEL_WARNING);
             }
         }
     }
@@ -104,8 +103,8 @@ void splash_check_installed(void * void_arg)
     for(int i = 0; i < list->entries_count && arg->run_thread; i++)
     {
         Entry_s * splash = &list->entries[i];
-        top_size = load_data("/splash.bin", splash, &top_buf);
+        top_size = load_data("/splash.bin", *splash, &top_buf);
-        bottom_size = load_data("/splashbottom.bin", splash, &bottom_buf);
+        bottom_size = load_data("/splashbottom.bin", *splash, &bottom_buf);
 
         if(!top_size && !bottom_size)
         {

source/themes.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,31 +28,29 @@
 #include "unicode.h"
 #include "fs.h"
 #include "draw.h"
-#include "ui_strings.h"
 
 #define BODY_CACHE_SIZE 0x150000
 #define BGM_MAX_SIZE 0x337000
 
-static Result install_theme_internal(const Entry_List_s * themes, int installmode)
+static Result install_theme_internal(Entry_List_s themes, int installmode)
 {
     Result res = 0;
-    char * music = NULL;
+    char* music = NULL;
     u32 music_size = 0;
     u32 shuffle_music_sizes[MAX_SHUFFLE_THEMES] = {0};
-    char * body = NULL;
+    char* body = NULL;
     u32 body_size = 0;
     u32 shuffle_body_sizes[MAX_SHUFFLE_THEMES] = {0};
-    bool mono_audio = false;
 
     if(installmode & THEME_INSTALL_SHUFFLE)
     {
-        if(themes->shuffle_count < 2)
+        if(themes.shuffle_count < 2)
         {
             DEBUG("not enough themes selected for shuffle\n");
             return MAKERESULT(RL_USAGE, RS_INVALIDARG, RM_COMMON, RD_INVALID_SELECTION);
         }
 
-        if(themes->shuffle_count > MAX_SHUFFLE_THEMES)
+        if(themes.shuffle_count > MAX_SHUFFLE_THEMES)
         {
             DEBUG("too many themes selected for shuffle\n");
             return MAKERESULT(RL_USAGE, RS_INVALIDARG, RM_COMMON, RD_INVALID_SELECTION);
@@ -69,20 +67,20 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
             FSUSER_OpenFile(&body_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), FS_OPEN_WRITE, 0);
         }
 
-        for(int i = 0; i < themes->entries_count; i++)
+        for(int i = 0; i < themes.entries_count; i++)
         {
-            const Entry_s * current_theme = &themes->entries[i];
+            Entry_s * current_theme = &themes.entries[i];
 
             if(current_theme->in_shuffle)
             {
                 if(installmode & THEME_INSTALL_BODY)
                 {
-                    body_size = load_data("/body_LZ.bin", current_theme, &body);
+                    body_size = load_data("/body_LZ.bin", *current_theme, &body);
                     if(body_size == 0)
                     {
                         free(body);
                         DEBUG("body not found\n");
-                        throw_error(language.themes.no_body_found, ERROR_LEVEL_WARNING);
+                        throw_error("No body_LZ.bin found - is this a theme?", ERROR_LEVEL_WARNING);
                         return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
                     }
 
@@ -110,7 +108,7 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
                     }
                     else
                     {
-                        music_size = load_data("/bgm.bcstm", current_theme, &music);
+                        music_size = load_data("/bgm.bcstm", *current_theme, &music);
 
                         if(music_size > BGM_MAX_SIZE)
                         {
@@ -118,14 +116,6 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
                             DEBUG("bgm too big\n");
                             return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
                         }
-
-                        if (music_size > 0)
-                        {
-                            if (music[0x62] == 1)
-                            {
-                                mono_audio = true;
-                            }
-                        }
                     }
 
                     shuffle_music_sizes[shuffle_count] = music_size;
@@ -172,7 +162,7 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
     }
     else
     {
-        const Entry_s * current_theme = &themes->entries[themes->selected_entry];
+        Entry_s current_theme = themes.entries[themes.selected_entry];
 
         if(installmode & THEME_INSTALL_BODY)
         {
@@ -181,7 +171,7 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
             {
                 free(body);
                 DEBUG("body not found\n");
-                throw_error(language.themes.no_body_found, ERROR_LEVEL_WARNING);
+                throw_error("No body_LZ.bin found - is this a theme?", ERROR_LEVEL_WARNING);
                 return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
             }
 
@@ -194,36 +184,17 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
         if(installmode & THEME_INSTALL_BGM)
         {
             music_size = load_data("/bgm.bcstm", current_theme, &music);
-            if (music_size > BGM_MAX_SIZE)
+            if(music_size > BGM_MAX_SIZE)
             {
                 free(music);
                 DEBUG("bgm too big\n");
                 return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
             }
 
-            if (music_size != 0)
-            {
-                if (music[0x62] == 1)
-                {
-                    mono_audio = true;
-                }
-
             remake_file(fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, BGM_MAX_SIZE);
             res = buf_to_file(music_size, fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, music);
             free(music);
 
-                char * body_buf = NULL;
-                u32 uncompressed_size = decompress_lz_file(fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, &body_buf);
-                if (body_buf[5] != 1)
-                {
-                    installmode |= THEME_INSTALL_BODY;
-                    body_buf[5] = 1;
-                    body_size = compress_lz_file_fast(fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, body_buf, uncompressed_size);
-                }
-                    
-                free(body_buf);
-            }
-
             if(R_FAILED(res)) return res;
         } else
         {
@@ -234,7 +205,7 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
     }
 
      //----------------------------------------
-    char * thememanage_buf = NULL;
+    char* thememanage_buf = NULL;
     file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf);
     ThemeManage_bin_s * theme_manage = (ThemeManage_bin_s *)thememanage_buf;
 
@@ -271,417 +242,65 @@ static Result install_theme_internal(const Entry_List_s * themes, int installmod
     //----------------------------------------
 
     //----------------------------------------
-    char * savedata_buf = NULL;
+    char* savedata_buf = NULL;
     u32 savedata_size = file_to_buf(fsMakePath(PATH_ASCII, "/SaveData.dat"), ArchiveHomeExt, &savedata_buf);
-    SaveData_dat_s * savedata = (SaveData_dat_s *)savedata_buf;
+    SaveData_dat_s* savedata = (SaveData_dat_s*)savedata_buf;
 
     memset(&savedata->theme_entry, 0, sizeof(ThemeEntry_s));
+    savedata->theme_entry.type = 3;
+    savedata->theme_entry.index = 0xff;
 
-    savedata->shuffle = (installmode & THEME_INSTALL_SHUFFLE) ? 1 : 0;
+    savedata->shuffle = (installmode & THEME_INSTALL_SHUFFLE);
-    memset(savedata->shuffle_themes, 0, sizeof(ThemeEntry_s) * MAX_SHUFFLE_THEMES);
     if(installmode & THEME_INSTALL_SHUFFLE)
     {
-        for(int i = 0; i < themes->shuffle_count; i++)
+        memset(savedata->shuffle_themes, 0, sizeof(ThemeEntry_s)*MAX_SHUFFLE_THEMES);
+        for(int i = 0; i < themes.shuffle_count; i++)
         {
             savedata->shuffle_themes[i].type = 3;
             savedata->shuffle_themes[i].index = i;
         }
-        const u8 shuffle_seed[0xB] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
-        memcpy(savedata->shuffle_seedA, shuffle_seed, 0xB);
-        memcpy(savedata->shuffle_seedB, shuffle_seed, 0xA);
-    }
-    else
-    {
-        savedata->theme_entry.type = 3;
-        savedata->theme_entry.index = 0xff;
     }
 
     res = buf_to_file(savedata_size, fsMakePath(PATH_ASCII, "/SaveData.dat"), ArchiveHomeExt, savedata_buf);
     free(savedata_buf);
     if(R_FAILED(res)) return res;
     //----------------------------------------
-    if (mono_audio)
+
-    {
-        throw_error(language.themes.mono_warn, ERROR_LEVEL_WARNING);
-    }
     return 0;
 }
 
-Result theme_install(Entry_s * theme)
+inline Result theme_install(Entry_s theme)
 {
     Entry_List_s list = {0};
     list.entries_count = 1;
-    list.entries = theme;
+    list.entries = &theme;
     list.selected_entry = 0;
-    return install_theme_internal(&list, THEME_INSTALL_BODY | THEME_INSTALL_BGM);
+    return install_theme_internal(list, THEME_INSTALL_BODY | THEME_INSTALL_BGM);
 }
 
-Result bgm_install(Entry_s * theme)
+inline Result bgm_install(Entry_s theme)
 {
     Entry_List_s list = {0};
     list.entries_count = 1;
-    list.entries = theme;
+    list.entries = &theme;
     list.selected_entry = 0;
-    return install_theme_internal(&list, THEME_INSTALL_BGM);
+    return install_theme_internal(list, THEME_INSTALL_BGM);
 }
 
-Result no_bgm_install(Entry_s * theme)
+inline Result no_bgm_install(Entry_s theme)
 {
     Entry_List_s list = {0};
     list.entries_count = 1;
-    list.entries = theme;
+    list.entries = &theme;
     list.selected_entry = 0;
-    return install_theme_internal(&list, THEME_INSTALL_BODY);
+    return install_theme_internal(list, THEME_INSTALL_BODY);
 }
 
-Result shuffle_install(const Entry_List_s * themes)
+inline Result shuffle_install(Entry_List_s themes)
 {
     return install_theme_internal(themes, THEME_INSTALL_SHUFFLE | THEME_INSTALL_BODY | THEME_INSTALL_BGM);
 }
 
-static SwkbdCallbackResult
-dir_name_callback(void * data, const char ** ppMessage, const char * text, size_t textlen)
-{
-    (void)textlen;
-    (void)data;
-    if(strpbrk(text, "><\"?;:/\\+,.|[=]"))
-    {
-        *ppMessage = language.themes.illegal_char;
-        return SWKBD_CALLBACK_CONTINUE;
-    }
-    return SWKBD_CALLBACK_OK;
-}
-
-Result dump_current_theme(void)
-{
-    const int max_chars = 255;
-    char * output_dir = calloc(max_chars + 1, sizeof(char));
-
-    SwkbdState swkbd;
-
-    swkbdInit(&swkbd, SWKBD_TYPE_WESTERN, 2, max_chars);
-    swkbdSetHintText(&swkbd, language.themes.name_folder);
-
-    swkbdSetButton(&swkbd, SWKBD_BUTTON_LEFT, language.themes.cancel, false);
-    swkbdSetButton(&swkbd, SWKBD_BUTTON_RIGHT, language.themes.done, true);
-    swkbdSetValidation(&swkbd, SWKBD_NOTEMPTY_NOTBLANK, 0, max_chars);
-    swkbdSetFilterCallback(&swkbd, dir_name_callback, NULL);
-
-    SwkbdButton button = swkbdInputText(&swkbd, output_dir, max_chars);
-
-    if (button != SWKBD_BUTTON_CONFIRM)
-    {
-        DEBUG("<dump_theme> Something went wrong with getting swkbd\n");
-        return MAKERESULT(RL_FATAL, RS_CANCELED, RM_UTIL, RD_CANCEL_REQUESTED);
-    }
-
-    u16 path[0x107] = { 0 };
-    struacat(path, "/themes/");
-    struacat(path, output_dir);
-    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, path), FS_ATTRIBUTE_DIRECTORY);
-
-    char * thememanage_buf = NULL;
-    file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf);
-    ThemeManage_bin_s * theme_manage = (ThemeManage_bin_s *)thememanage_buf;
-    u32 theme_size = theme_manage->body_size;
-    u32 bgm_size = theme_manage->music_size;
-    free(thememanage_buf);
-
-    char * temp_buf = NULL;
-    file_to_buf(fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, &temp_buf);
-    u16 path_output[0x107] = { 0 };
-    memcpy(path_output, path, 0x107);
-    struacat(path_output, "/body_LZ.bin");
-    remake_file(fsMakePath(PATH_UTF16, path_output), ArchiveSD, theme_size);
-    buf_to_file(theme_size, fsMakePath(PATH_UTF16, path_output), ArchiveSD, temp_buf);
-    free(temp_buf);
-    temp_buf = NULL;
-
-    file_to_buf(fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, &temp_buf);
-    memcpy(path_output, path, 0x107);
-    struacat(path_output, "/bgm.bcstm");
-    remake_file(fsMakePath(PATH_UTF16, path_output), ArchiveSD, bgm_size);
-    buf_to_file(bgm_size, fsMakePath(PATH_UTF16, path_output), ArchiveSD, temp_buf);
-    free(temp_buf);
-    temp_buf = NULL;
-
-    char * smdh_file = calloc(1, 0x36c0);
-    smdh_file[0] = 0x53; // SMDH magic
-    smdh_file[1] = 0x4d;
-    smdh_file[2] = 0x44;
-    smdh_file[3] = 0x48;
-
-    struacat((u16 *) (smdh_file + 0x8), output_dir);
-    struacat((u16 *) (smdh_file + 0x88), "No description");
-    struacat((u16 *) (smdh_file + 0x188), "Unknown Author");
-
-    free(output_dir);
-
-    u8 r = rand() % 255;
-    u8 g = rand() % 255;
-    u8 b = rand() % 255;
-
-    u16 color = ((r & 0b11111000) << 8) | ((g & 0b11111100) << 3) | (b >> 3);
-
-    for (int i = 0x2040; i < 0x36c0; i += 2)
-    {
-        *(smdh_file + i) = (color & 0xFF00) >> 8;
-        *(smdh_file + i + 1) = color & 0x00FF;
-    }
-    
-    memcpy(path_output, path, 0x107);
-    struacat(path_output, "/info.smdh");
-    remake_file(fsMakePath(PATH_UTF16, path_output), ArchiveSD, 0x36c0);
-    buf_to_file(0x36c0, fsMakePath(PATH_UTF16, path_output), ArchiveSD, smdh_file);
-
-    free(smdh_file);
-
-    return 0;
-}
-
-Result dump_all_themes(void)
-{
-    const u32 high_id = 0x0004008c;
-    u32 low_id = 0;
-    u8 regionCode, language;
-    Result res = CFGU_SecureInfoGetRegion(&regionCode);
-    if(R_FAILED(res))
-        return res;
-
-    res = CFGU_GetSystemLanguage(&language);
-    if(R_FAILED(res))
-        return res;
-
-    switch(regionCode)
-    {
-        case CFG_REGION_JPN:
-            low_id = 0x00008200;
-            break;
-        case CFG_REGION_USA:
-            low_id = 0x00008f00;
-            break;
-        case CFG_REGION_EUR:
-            low_id = 0x00009800;
-            break;
-        case CFG_REGION_KOR:
-            low_id = 0x0000a900;
-            break;
-        default:
-            return -1;
-    }
-
-    const char * region_arr[7] = {
-        "JPN",
-        "USA",
-        "EUR",
-        "AUS",
-        "CHN",
-        "KOR",
-        "TWN",
-    };
-
-    const char * language_arr[12] = {
-        "jp",
-        "en",
-        "fr",
-        "de",
-        "it",
-        "es",
-        "zh",
-        "ko",
-        "nl",
-        "pt",
-        "ru",
-        "tw",
-    };
-
-    res = amAppInit();
-    if(R_FAILED(res))
-        return res;
-
-    Icon_s * smdh_data = calloc(1, sizeof(Icon_s));
-    smdh_data->_padding1[0] = 0x53; // SMDH magic
-    smdh_data->_padding1[1] = 0x4d;
-    smdh_data->_padding1[2] = 0x44;
-    smdh_data->_padding1[3] = 0x48;
-
-    utf8_to_utf16(smdh_data->author, (u8 *)"Nintendo", 0x40);
-    utf8_to_utf16(smdh_data->desc, (u8 *)"Official theme. For personal use only. Do not redistribute.", 0x80);
-
-    for(u32 dlc_index = 0; dlc_index <= 0xFF; ++dlc_index)
-    {
-        const u64 titleId = ((u64)high_id << 32) | (low_id | dlc_index);
-
-        u32 count = 0;
-        res = AMAPP_GetDLCContentInfoCount(&count, MEDIATYPE_SD, titleId);
-        if(res == (Result)0xd8a083fa)
-        {
-            res = 0;
-            break;
-        }
-        else if(R_FAILED(res))
-        {
-            break;
-        }
-
-        AM_ContentInfo * contentInfos = calloc(count, sizeof(AM_ContentInfo));
-        u32 readcount = 0;
-        res = AMAPP_ListDLCContentInfos(&readcount, MEDIATYPE_SD, titleId, count, 0, contentInfos);
-        if(R_FAILED(res))
-        {
-            free(contentInfos);
-            break;
-        }
-
-        u32 archivePath[4] = {low_id | dlc_index, high_id, MEDIATYPE_SD, 0};
-        FS_Path ncch_path;
-        ncch_path.type = PATH_BINARY;
-        ncch_path.size = 0x10;
-        ncch_path.data = archivePath;
-
-        FS_Archive ncch_archive;
-        res = FSUSER_OpenArchive(&ncch_archive, ARCHIVE_SAVEDATA_AND_CONTENT, ncch_path);
-        if(R_FAILED(res))
-        {
-            free(contentInfos);
-            break;
-        }
-
-        u32 metadataPath[5] = {0, 0, 0, 0, 0};
-        FS_Path metadata_path;
-        metadata_path.type = PATH_BINARY;
-        metadata_path.size = 0x14;
-        metadata_path.data = metadataPath;
-
-        Handle metadata_fh;
-        res = FSUSER_OpenFile(&metadata_fh, ncch_archive, metadata_path, FS_OPEN_READ, 0);
-        if(R_FAILED(res))
-        {
-            FSUSER_CloseArchive(ncch_archive);
-            free(contentInfos);
-            break;
-        }
-
-        res = romfsMountFromFile(metadata_fh, 0, "meta");
-        if(R_FAILED(res))
-        {
-            FSFILE_Close(metadata_fh);
-            FSUSER_CloseArchive(ncch_archive);
-            free(contentInfos);
-            break;
-        }
-
-        char contentinfoarchive_path[40] = {0};
-        sprintf(contentinfoarchive_path, "meta:/ContentInfoArchive_%s_%s.bin", region_arr[regionCode], language_arr[language]);
-
-        FILE * fh = fopen(contentinfoarchive_path, "rb");
-
-        if(fh != NULL)
-        {
-            for(u32 i = 0; i < readcount; ++i)
-            {
-                if(i == 0) continue;
-                AM_ContentInfo * content = &contentInfos[i];
-                if((content->flags & (AM_CONTENT_DOWNLOADED | AM_CONTENT_OWNED)) == (AM_CONTENT_DOWNLOADED | AM_CONTENT_OWNED))
-                {
-                    long off = 0x8 + 0xC8 * i;
-                    fseek(fh, off, SEEK_SET);
-                    char content_data[0xc8] = {0};
-                    fread(content_data, 1, 0xc8, fh);
-                    u32 extra_index = 0;
-                    memcpy(&extra_index, content_data + 0xC0, 4);
-
-                    metadataPath[1] = content->index;
-
-                    Handle theme_fh;
-                    res = FSUSER_OpenFile(&theme_fh, ncch_archive, metadata_path, FS_OPEN_READ, 0);
-                    if(R_FAILED(res))
-                    {
-                        DEBUG("theme open romfs error: %08lx\n", res);
-                        break;
-                    }
-
-                    romfsMountFromFile(theme_fh, 0, "theme");
-
-                    char themename[0x41] = {0};
-                    memcpy(themename, content_data, 0x40);
-                    char * illegal_char = themename;
-                    while ((illegal_char = strpbrk(illegal_char, ILLEGAL_CHARS)))
-                    {
-                        *illegal_char = '-';
-                    }
-
-                    char path[0x107] = { 0 };
-                    sprintf(path, "/Themes/Dump-%02lx-%ld-%s", dlc_index, extra_index, themename);
-                    DEBUG("theme folder to create: %s\n", path);
-                    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, path), FS_ATTRIBUTE_DIRECTORY);
-
-                    memset(smdh_data->name, 0, sizeof(smdh_data->name));
-                    utf8_to_utf16(smdh_data->name, (u8 *)(content_data + 0), 0x40);
-
-                    FILE * theme_file = fopen("theme:/body_LZ.bin", "rb");
-                    if(theme_file)
-                    {
-                        fseek(theme_file, 0, SEEK_END);
-                        long theme_size = ftell(theme_file);
-                        fseek(theme_file, 0, SEEK_SET);
-                        char * theme_data = malloc(theme_size);
-                        fread(theme_data, 1, theme_size, theme_file);
-                        fclose(theme_file);
-
-                        char themepath[0x107] = {0};
-                        sprintf(themepath, "%s/body_LZ.bin", path);
-                        remake_file(fsMakePath(PATH_ASCII, themepath), ArchiveSD, theme_size);
-                        buf_to_file(theme_size, fsMakePath(PATH_ASCII, themepath), ArchiveSD, theme_data);
-                        free(theme_data);
-                    }
-
-                    FILE * bgm_file = fopen("theme:/bgm.bcstm", "rb");
-                    if(bgm_file)
-                    {
-                        fseek(bgm_file, 0, SEEK_END);
-                        long bgm_size = ftell(bgm_file);
-                        fseek(bgm_file, 0, SEEK_SET);
-                        char * bgm_data = malloc(bgm_size);
-                        fread(bgm_data, 1, bgm_size, bgm_file);
-                        fclose(bgm_file);
-
-                        char bgmpath[0x107] = {0};
-                        sprintf(bgmpath, "%s/bgm.bcstm", path);
-                        remake_file(fsMakePath(PATH_ASCII, bgmpath), ArchiveSD, bgm_size);
-                        buf_to_file(bgm_size, fsMakePath(PATH_ASCII, bgmpath), ArchiveSD, bgm_data);
-                        free(bgm_data);
-                    }
-
-                    romfsUnmount("theme");
-                    char icondatapath[0x107] = {0};
-                    sprintf(icondatapath, "meta:/icons/%ld.icn", extra_index);
-                    FILE * iconfile = fopen(icondatapath, "rb");
-                    fread(smdh_data->big_icon, 1, sizeof(smdh_data->big_icon), iconfile);
-                    fclose(iconfile);
-
-                    strcat(path, "/info.smdh");
-                    remake_file(fsMakePath(PATH_ASCII, path), ArchiveSD, 0x36c0);
-                    buf_to_file(0x36c0, fsMakePath(PATH_ASCII, path), ArchiveSD, (char *)smdh_data);
-                }
-            }
-
-            fclose(fh);
-            fh = NULL;
-        }
-        free(contentInfos);
-        contentInfos = NULL;
-
-        romfsUnmount("meta");
-        // don't need to close the file opened for the metadata, romfsUnmount took ownership
-        FSUSER_CloseArchive(ncch_archive);
-    }
-
-    free(smdh_data);
-    amExit();
-    return res;
-}
-
 void themes_check_installed(void * void_arg)
 {
     Thread_Arg_s * arg = (Thread_Arg_s *)void_arg;
@@ -689,25 +308,25 @@ void themes_check_installed(void * void_arg)
     if(list == NULL || list->entries == NULL) return;
 
     #ifndef CITRA_MODE
-    char * savedata_buf = NULL;
+    char* savedata_buf = NULL;
     u32 savedata_size = file_to_buf(fsMakePath(PATH_ASCII, "/SaveData.dat"), ArchiveHomeExt, &savedata_buf);
     if(!savedata_size) return;
-    SaveData_dat_s * savedata = (SaveData_dat_s *)savedata_buf;
+    SaveData_dat_s* savedata = (SaveData_dat_s*)savedata_buf;
     bool shuffle = savedata->shuffle;
     free(savedata_buf);
 
     #define HASH_SIZE_BYTES 256/8
     u8 body_hash[MAX_SHUFFLE_THEMES][HASH_SIZE_BYTES];
-    memset(body_hash, 0, MAX_SHUFFLE_THEMES * HASH_SIZE_BYTES);
+    memset(body_hash, 0, MAX_SHUFFLE_THEMES*HASH_SIZE_BYTES);
 
-    char * thememanage_buf = NULL;
+    char* thememanage_buf = NULL;
     u32 theme_manage_size = file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf);
     if(!theme_manage_size) return;
     ThemeManage_bin_s * theme_manage = (ThemeManage_bin_s *)thememanage_buf;
 
     u32 single_body_size = theme_manage->body_size;
     u32 shuffle_body_sizes[MAX_SHUFFLE_THEMES] = {0};
-    memcpy(shuffle_body_sizes, theme_manage->shuffle_body_sizes, sizeof(u32) * MAX_SHUFFLE_THEMES);
+    memcpy(shuffle_body_sizes, theme_manage->shuffle_body_sizes, sizeof(u32)*MAX_SHUFFLE_THEMES);
     free(thememanage_buf);
 
     if(shuffle)
@@ -718,7 +337,7 @@ void themes_check_installed(void * void_arg)
 
         for(int i = 0; i < MAX_SHUFFLE_THEMES; i++)
         {
-            FSUSER_UpdateSha256Context(body_buf + BODY_CACHE_SIZE * i, shuffle_body_sizes[i], body_hash[i]);
+            FSUSER_UpdateSha256Context(body_buf + BODY_CACHE_SIZE*i, shuffle_body_sizes[i], body_hash[i]);
         }
 
         free(body_buf);
@@ -739,7 +358,7 @@ void themes_check_installed(void * void_arg)
     {
         Entry_s * theme = &list->entries[i];
         char * theme_body = NULL;
-        u32 theme_body_size = load_data("/body_LZ.bin", theme, &theme_body);
+        u32 theme_body_size = load_data("/body_LZ.bin", *theme, &theme_body);
         if(!theme_body_size) return;
 
         u8 theme_body_hash[HASH_SIZE_BYTES];

source/unicode.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -26,42 +26,40 @@
 
 #include "unicode.h"
 
-ssize_t strulen(const u16 * input, ssize_t max_len)
+ssize_t strulen(const u16 *input, ssize_t max_len)
 {
     for (int i = 0; i < max_len; i++) if (input[i] == 0) return i;
     return max_len;
 }
 
-void struacat(u16 * input, const char * addition)
+void struacat(u16 *input, const char *addition)
 {
-    const ssize_t len = strulen(input, 0x106);
+    ssize_t len = strulen(input, 0x106);
-    const u16 stop_at = strlen(addition);
+    for (u16 i = len; i < strlen(addition) + len; i++) 
-    for (u16 i = 0; i < stop_at; i++) 
     {
-        input[i + len] = addition[i];
+        input[i] = addition[i - len];
     }
-    input[stop_at + len] = 0;
+    input[strlen(addition) + len] = 0;
 }
 
-void printu(u16 * input)
+void printu(u16 *input)
 {
     ssize_t in_len = strulen(input, 0x106);
     ssize_t buf_len = in_len + 1; // Plus 1 for proper null termination
-    wchar_t * buf = calloc(buf_len, sizeof(wchar_t));
+    wchar_t *buf = calloc(buf_len, sizeof(wchar_t));
-    utf16_to_utf32((u32 *)buf, input, buf_len);
+    utf16_to_utf32((u32*)buf, input, buf_len);
     char cbuf[0x106];
     sprintf(cbuf, "%ls\n", buf);
     DEBUG(cbuf);
     free(buf);
 }
 
-u16 * strucat(u16 * destination, const u16 * source)
+u16 *strucat(u16 *destination, const u16 *source)
 {
     ssize_t dest_len = strulen(destination, 0x106);
 
     ssize_t source_len = strulen(source, 0x106);
 
     memcpy(&destination[dest_len], source, source_len * sizeof(u16));
-    destination[min(dest_len + source_len, 0x106 - 1)] = 0;
     return destination;
 }