Minor changes for UI version

Makefile

@@ -16,7 +16,7 @@ include $(DEVKITARM)/ds_rules
 # INCLUDES is a list of directories containing header files
 # SPECS is the directory containing the important build and link files
 #---------------------------------------------------------------------------------
-export TARGET	:=	Decrypt9WIP
+export TARGET	:=	Decrypt9UI
 BUILD		:=	build
 SOURCES		:=	source source/fatfs source/decryptor source/abstraction
 DATA		:=	data
@@ -25,7 +25,7 @@ INCLUDES	:=	include source source/fatfs
 #---------------------------------------------------------------------------------
 # THEME: if set to anything, name of the themes file folder inside resources
 #---------------------------------------------------------------------------------
-THEME	:=	
+THEME	:=	/D9UI
 
 #---------------------------------------------------------------------------------
 # options for code generation
@@ -161,7 +161,6 @@ release:
 	@-cp $(OUTPUT).nds $(RELEASE)
 	@-cp $(OUTPUT).3dsx $(RELEASE)/$(TARGET)
 	@-cp $(OUTPUT).smdh $(RELEASE)/$(TARGET)
-	@-cp $(CURDIR)/resources/d9logo.bin $(RELEASE)/d9logo.bin
 	@cp $(CURDIR)/scripts/*.py $(RELEASE)/scripts
 	@cp $(CURDIR)/README.md $(RELEASE)
 	@-[ ! -n "$(strip $(THEME))" ] || (mkdir $(RELEASE)/$(THEME) && cp $(CURDIR)/resources/$(THEME)/*.bin $(RELEASE)/$(THEME))

resources/BrahmaAppInfo

@@ -1,6 +1,6 @@
-APP_TITLE = Decrypt9
+APP_TITLE = Decrypt9UI
 APP_DESCRIPTION = Open source 3DS decryption & dumping tools.
 APP_AUTHOR = Archshift, d0k3, Shadowtrance & others
 
 PAYLOAD_MEM = 1
-VOODOO = 0x3F
+VOODOO = 0xF

source/draw.h

@@ -16,6 +16,7 @@
 #define COLOR_BLACK         RGB(0x00, 0x00, 0x00)
 #define COLOR_WHITE         RGB(0xFF, 0xFF, 0xFF)
 #define COLOR_TRANSPARENT   RGB(0xFF, 0x00, 0xEF) // otherwise known as 'super fuchsia'
+#define COLOR_FBLUE         RGB(0x26, 0x60, 0x95) // matches the menu gfx text color
 
 #ifndef USE_THEME
 #define STD_COLOR_BG   COLOR_BLACK

source/theme.c

@@ -38,11 +38,11 @@ void LoadThemeGfxLogo(void) {
     LoadThemeGfx(GFX_LOGO, LOGO_TOP);
     #if defined LOGO_TEXT_X && defined LOGO_TEXT_Y
     u32 emunand_state = CheckEmuNand();
-    DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y -  0, LOGO_TOP, "SD card: %lluMB/%lluMB & %s", RemainingStorageSpace() / 1024 / 1024, TotalStorageSpace() / 1024 / 1024, (emunand_state == EMUNAND_READY) ? "EmuNAND ready" : (emunand_state == EMUNAND_GATEWAY) ? "GW EmuNAND" : (emunand_state == EMUNAND_REDNAND) ? "RedNAND" : (emunand_state > 3) ? "MultiNAND" : "no EmuNAND");
-    DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y - 10, LOGO_TOP, "Game directory: %s", GAME_DIR);
+    DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y -  8, LOGO_TOP, "SD card: %lluMB/%lluMB & %s", RemainingStorageSpace() / 1024 / 1024, TotalStorageSpace() / 1024 / 1024, (emunand_state == EMUNAND_READY) ? "EmuNAND ready" : (emunand_state == EMUNAND_GATEWAY) ? "GW EmuNAND" : (emunand_state == EMUNAND_REDNAND) ? "RedNAND" : (emunand_state > 3) ? "MultiNAND" : "no EmuNAND");
+    DrawStringF(LOGO_TEXT_X + 56, LOGO_TEXT_Y - 28, LOGO_TOP, "Game directory: %s", GAME_DIR);
     #ifdef WORK_DIR
     if (DirOpen(WORK_DIR)) {
-        DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y - 20, LOGO_TOP, "Work directory: %s", WORK_DIR);
+        DrawStringF(LOGO_TEXT_X + 48, LOGO_TEXT_Y - 18, LOGO_TOP, "Work directory: %s", WORK_DIR);
         DirClose();
     }
     #endif

source/theme.h

@@ -20,16 +20,16 @@
 #define COLOR_PURPLE        RGB(0x66, 0x00, 0xFF)
 
 #define LOGO_TOP        true
-#define LOGO_TEXT_X     10
+#define LOGO_TEXT_X     50
 #define LOGO_TEXT_Y     SCREEN_HEIGHT - 10
 #define LOGO_COLOR_BG   COLOR_TRANSPARENT
-#define LOGO_COLOR_FONT COLOR_WHITE
+#define LOGO_COLOR_FONT COLOR_FBLUE
 
 #define ALT_PROGRESS // use alternative progress indicator if defined
 #define PRG_COLOR_BG   LOGO_COLOR_BG
 #define PRG_COLOR_FONT LOGO_COLOR_FONT
 #define PRG_START_X    20
-#define PRG_START_Y    10
+#define PRG_START_Y    210
 #define PRG_BARWIDTH   280 // must be multiple of 8
 
 #define STD_COLOR_BG   LOGO_COLOR_BG