Minor changes for UI version

Shadowtrance · Jun 7, 2016 · 5f9e490 · 5f9e490
1 parent 43c2208
commit 5f9e490
Show file tree

Hide file tree

Showing 154 changed files with 19 additions and 10 deletions.
diff --git a/Makefile b/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	:=	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))

diff --git a/resources/BrahmaAppInfo b/resources/BrahmaAppInfo
@@ -1,4 +1,4 @@
-APP_TITLE = Decrypt9
+APP_TITLE = Decrypt9UI
 APP_DESCRIPTION = Open source 3DS decryption & dumping tools.
 APP_AUTHOR = Archshift, d0k3, Shadowtrance & others
 

diff --git a/resources/BrahmaIcon.png b/resources/BrahmaIcon.png
diff --git a/resources/CakesROP/drunkenlogo.png b/resources/CakesROP/drunkenlogo.png
diff --git a/resources/D9UI/danger_e.bin b/resources/D9UI/danger_e.bin
diff --git a/resources/D9UI/danger_s.bin b/resources/D9UI/danger_s.bin
diff --git a/resources/d9logo.bin → resources/D9UI/debug_bg.bin b/resources/d9logo.bin → resources/D9UI/debug_bg.bin
diff --git a/resources/D9UI/done.bin b/resources/D9UI/done.bin
diff --git a/resources/D9UI/failed.bin b/resources/D9UI/failed.bin
diff --git a/resources/D9UI/logo.bin b/resources/D9UI/logo.bin
diff --git a/resources/D9UI/logo_b.bin b/resources/D9UI/logo_b.bin
diff --git a/resources/D9UI/menu0000.bin b/resources/D9UI/menu0000.bin
diff --git a/resources/D9UI/menu0001.bin b/resources/D9UI/menu0001.bin
diff --git a/resources/D9UI/menu0002.bin b/resources/D9UI/menu0002.bin
diff --git a/resources/D9UI/menu0003.bin b/resources/D9UI/menu0003.bin
diff --git a/resources/D9UI/menu0004.bin b/resources/D9UI/menu0004.bin
diff --git a/resources/D9UI/menu0005.bin b/resources/D9UI/menu0005.bin
diff --git a/resources/D9UI/menu0006.bin b/resources/D9UI/menu0006.bin
diff --git a/resources/D9UI/menu0007.bin b/resources/D9UI/menu0007.bin
diff --git a/resources/D9UI/menu0100.bin b/resources/D9UI/menu0100.bin
diff --git a/resources/D9UI/menu0101.bin b/resources/D9UI/menu0101.bin
diff --git a/resources/D9UI/menu0102.bin b/resources/D9UI/menu0102.bin
diff --git a/resources/D9UI/menu0103.bin b/resources/D9UI/menu0103.bin
diff --git a/resources/D9UI/menu0104.bin b/resources/D9UI/menu0104.bin
diff --git a/resources/D9UI/menu0105.bin b/resources/D9UI/menu0105.bin
diff --git a/resources/D9UI/menu0200.bin b/resources/D9UI/menu0200.bin
diff --git a/resources/D9UI/menu0201.bin b/resources/D9UI/menu0201.bin
diff --git a/resources/D9UI/menu0202.bin b/resources/D9UI/menu0202.bin
diff --git a/resources/D9UI/menu0203.bin b/resources/D9UI/menu0203.bin
diff --git a/resources/D9UI/menu0204.bin b/resources/D9UI/menu0204.bin
diff --git a/resources/D9UI/menu0205.bin b/resources/D9UI/menu0205.bin
diff --git a/resources/D9UI/menu0300.bin b/resources/D9UI/menu0300.bin
diff --git a/resources/D9UI/menu0301.bin b/resources/D9UI/menu0301.bin
diff --git a/resources/D9UI/menu0302.bin b/resources/D9UI/menu0302.bin
diff --git a/resources/D9UI/menu0303.bin b/resources/D9UI/menu0303.bin
diff --git a/resources/D9UI/menu0304.bin b/resources/D9UI/menu0304.bin
diff --git a/resources/D9UI/menu0305.bin b/resources/D9UI/menu0305.bin
diff --git a/resources/D9UI/menu0400.bin b/resources/D9UI/menu0400.bin
diff --git a/resources/D9UI/menu0401.bin b/resources/D9UI/menu0401.bin
diff --git a/resources/D9UI/menu0402.bin b/resources/D9UI/menu0402.bin
diff --git a/resources/D9UI/menu0403.bin b/resources/D9UI/menu0403.bin
diff --git a/resources/D9UI/menu0404.bin b/resources/D9UI/menu0404.bin
diff --git a/resources/D9UI/menu0405.bin b/resources/D9UI/menu0405.bin
diff --git a/resources/D9UI/menu0406.bin b/resources/D9UI/menu0406.bin
diff --git a/resources/D9UI/menu0407.bin b/resources/D9UI/menu0407.bin
diff --git a/resources/D9UI/menu0408.bin b/resources/D9UI/menu0408.bin
diff --git a/resources/D9UI/menu0409.bin b/resources/D9UI/menu0409.bin
diff --git a/resources/D9UI/menu0410.bin b/resources/D9UI/menu0410.bin
diff --git a/resources/D9UI/menu0500.bin b/resources/D9UI/menu0500.bin
diff --git a/resources/D9UI/menu0501.bin b/resources/D9UI/menu0501.bin
diff --git a/resources/D9UI/menu0502.bin b/resources/D9UI/menu0502.bin
diff --git a/resources/D9UI/menu0503.bin b/resources/D9UI/menu0503.bin
diff --git a/resources/D9UI/menu0504.bin b/resources/D9UI/menu0504.bin
diff --git a/resources/D9UI/menu0600.bin b/resources/D9UI/menu0600.bin
diff --git a/resources/D9UI/menu0601.bin b/resources/D9UI/menu0601.bin
diff --git a/resources/D9UI/menu0602.bin b/resources/D9UI/menu0602.bin
diff --git a/resources/D9UI/menu0603.bin b/resources/D9UI/menu0603.bin
diff --git a/resources/D9UI/menu0604.bin b/resources/D9UI/menu0604.bin
diff --git a/resources/D9UI/menu0605.bin b/resources/D9UI/menu0605.bin
diff --git a/resources/D9UI/menu0700.bin b/resources/D9UI/menu0700.bin
diff --git a/resources/D9UI/menu0701.bin b/resources/D9UI/menu0701.bin
diff --git a/resources/D9UI/menu0702.bin b/resources/D9UI/menu0702.bin
diff --git a/resources/D9UI/menu0703.bin b/resources/D9UI/menu0703.bin
diff --git a/resources/D9UI/menu0704.bin b/resources/D9UI/menu0704.bin
diff --git a/resources/D9UI/menu0800.bin b/resources/D9UI/menu0800.bin
diff --git a/resources/D9UI/menu0801.bin b/resources/D9UI/menu0801.bin
diff --git a/resources/D9UI/menu0802.bin b/resources/D9UI/menu0802.bin
diff --git a/resources/D9UI/menu0803.bin b/resources/D9UI/menu0803.bin
diff --git a/resources/D9UI/menu0804.bin b/resources/D9UI/menu0804.bin
diff --git a/resources/D9UI/menu0805.bin b/resources/D9UI/menu0805.bin
diff --git a/resources/D9UI/menu0806.bin b/resources/D9UI/menu0806.bin
diff --git a/resources/D9UI/menu0807.bin b/resources/D9UI/menu0807.bin
diff --git a/resources/D9UI/menu0900.bin b/resources/D9UI/menu0900.bin
diff --git a/resources/D9UI/menu0901.bin b/resources/D9UI/menu0901.bin
diff --git a/resources/D9UI/menu0902.bin b/resources/D9UI/menu0902.bin
diff --git a/resources/D9UI/menu0903.bin b/resources/D9UI/menu0903.bin
diff --git a/resources/D9UI/menu0904.bin b/resources/D9UI/menu0904.bin
diff --git a/resources/D9UI/menu0905.bin b/resources/D9UI/menu0905.bin
diff --git a/resources/D9UI/menu0906.bin b/resources/D9UI/menu0906.bin
diff --git a/resources/D9UI/menu0907.bin b/resources/D9UI/menu0907.bin
diff --git a/resources/D9UI/menu1000.bin b/resources/D9UI/menu1000.bin
diff --git a/resources/D9UI/menu1001.bin b/resources/D9UI/menu1001.bin
diff --git a/resources/D9UI/menu1002.bin b/resources/D9UI/menu1002.bin
diff --git a/resources/D9UI/menu1003.bin b/resources/D9UI/menu1003.bin
diff --git a/resources/D9UI/menu1004.bin b/resources/D9UI/menu1004.bin
diff --git a/resources/D9UI/menu1005.bin b/resources/D9UI/menu1005.bin
diff --git a/resources/D9UI/menu1006.bin b/resources/D9UI/menu1006.bin
diff --git a/resources/D9UI/menu1007.bin b/resources/D9UI/menu1007.bin
diff --git a/resources/D9UI/menu1100.bin b/resources/D9UI/menu1100.bin
diff --git a/resources/D9UI/menu1101.bin b/resources/D9UI/menu1101.bin
diff --git a/resources/D9UI/menu1102.bin b/resources/D9UI/menu1102.bin
diff --git a/resources/D9UI/menu1103.bin b/resources/D9UI/menu1103.bin
diff --git a/resources/D9UI/menu1104.bin b/resources/D9UI/menu1104.bin
diff --git a/resources/D9UI/menu1105.bin b/resources/D9UI/menu1105.bin
diff --git a/resources/D9UI/menu1200.bin b/resources/D9UI/menu1200.bin
diff --git a/resources/D9UI/menu1201.bin b/resources/D9UI/menu1201.bin
diff --git a/resources/D9UI/menu1202.bin b/resources/D9UI/menu1202.bin
diff --git a/resources/D9UI/menu1203.bin b/resources/D9UI/menu1203.bin
diff --git a/resources/D9UI/menu1204.bin b/resources/D9UI/menu1204.bin
diff --git a/resources/D9UI/menu1205.bin b/resources/D9UI/menu1205.bin
diff --git a/resources/D9UI/menu1206.bin b/resources/D9UI/menu1206.bin
diff --git a/resources/D9UI/menu1207.bin b/resources/D9UI/menu1207.bin
diff --git a/resources/D9UI/menu1208.bin b/resources/D9UI/menu1208.bin
diff --git a/resources/D9UI/menu1209.bin b/resources/D9UI/menu1209.bin
diff --git a/resources/D9UI/menu1210.bin b/resources/D9UI/menu1210.bin
diff --git a/resources/D9UI/menu1300.bin b/resources/D9UI/menu1300.bin
diff --git a/resources/D9UI/menu1301.bin b/resources/D9UI/menu1301.bin
diff --git a/resources/D9UI/menu1302.bin b/resources/D9UI/menu1302.bin
diff --git a/resources/D9UI/menu1303.bin b/resources/D9UI/menu1303.bin
diff --git a/resources/D9UI/menu1304.bin b/resources/D9UI/menu1304.bin
diff --git a/resources/D9UI/menu1305.bin b/resources/D9UI/menu1305.bin
diff --git a/resources/D9UI/menu1306.bin b/resources/D9UI/menu1306.bin
diff --git a/resources/D9UI/menu1307.bin b/resources/D9UI/menu1307.bin
diff --git a/resources/D9UI/menu1308.bin b/resources/D9UI/menu1308.bin
diff --git a/resources/D9UI/menu1309.bin b/resources/D9UI/menu1309.bin
diff --git a/resources/D9UI/menu1310.bin b/resources/D9UI/menu1310.bin
diff --git a/resources/D9UI/menu1400.bin b/resources/D9UI/menu1400.bin
diff --git a/resources/D9UI/menu1401.bin b/resources/D9UI/menu1401.bin
diff --git a/resources/D9UI/menu1402.bin b/resources/D9UI/menu1402.bin
diff --git a/resources/D9UI/menu1403.bin b/resources/D9UI/menu1403.bin
diff --git a/resources/D9UI/menu1404.bin b/resources/D9UI/menu1404.bin
diff --git a/resources/D9UI/menu1405.bin b/resources/D9UI/menu1405.bin
diff --git a/resources/D9UI/menu1406.bin b/resources/D9UI/menu1406.bin
diff --git a/resources/D9UI/menu1407.bin b/resources/D9UI/menu1407.bin
diff --git a/resources/D9UI/menu1408.bin b/resources/D9UI/menu1408.bin
diff --git a/resources/D9UI/menu1409.bin b/resources/D9UI/menu1409.bin
diff --git a/resources/D9UI/menu1410.bin b/resources/D9UI/menu1410.bin
diff --git a/resources/D9UI/menu1500.bin b/resources/D9UI/menu1500.bin
diff --git a/resources/D9UI/menu1501.bin b/resources/D9UI/menu1501.bin
diff --git a/resources/D9UI/menu1502.bin b/resources/D9UI/menu1502.bin
diff --git a/resources/D9UI/menu1503.bin b/resources/D9UI/menu1503.bin
diff --git a/resources/D9UI/menu1504.bin b/resources/D9UI/menu1504.bin
diff --git a/resources/D9UI/menu1505.bin b/resources/D9UI/menu1505.bin
diff --git a/resources/D9UI/menu1506.bin b/resources/D9UI/menu1506.bin
diff --git a/resources/D9UI/menu1507.bin b/resources/D9UI/menu1507.bin
diff --git a/resources/D9UI/menu1508.bin b/resources/D9UI/menu1508.bin
diff --git a/resources/D9UI/menu1509.bin b/resources/D9UI/menu1509.bin
diff --git a/resources/D9UI/menu1510.bin b/resources/D9UI/menu1510.bin
diff --git a/resources/D9UI/menu1600.bin b/resources/D9UI/menu1600.bin
diff --git a/resources/D9UI/menu1601.bin b/resources/D9UI/menu1601.bin
diff --git a/resources/D9UI/menu1602.bin b/resources/D9UI/menu1602.bin
diff --git a/resources/D9UI/menu1603.bin b/resources/D9UI/menu1603.bin
diff --git a/resources/D9UI/menu1604.bin b/resources/D9UI/menu1604.bin
diff --git a/resources/D9UI/menu1700.bin b/resources/D9UI/menu1700.bin
diff --git a/resources/D9UI/menu1701.bin b/resources/D9UI/menu1701.bin
diff --git a/resources/D9UI/menu1702.bin b/resources/D9UI/menu1702.bin
diff --git a/resources/D9UI/menu1703.bin b/resources/D9UI/menu1703.bin
diff --git a/resources/D9UI/menu1704.bin b/resources/D9UI/menu1704.bin
diff --git a/resources/D9UI/progress.bin b/resources/D9UI/progress.bin
diff --git a/resources/D9UI/unmount.bin b/resources/D9UI/unmount.bin
diff --git a/source/draw.h b/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

diff --git a/source/main.c b/source/main.c
@@ -13,6 +13,10 @@
 #include "decryptor/selftest.h"
 #include "decryptor/xorpad.h"
 
+#ifdef USE_THEME
+#include "theme.h"
+#endif
+
 #define SUBMENU_START 6
 
 MenuInfo menu[] =
@@ -298,8 +302,12 @@ u32 InitializeD9()
 
     if (InitFS()) {
         Debug("Initializing SD card... success");
+        #ifdef USE_THEME
+        LoadThemeGfx(GFX_LOGO_B, false);
+        #else
         FileGetData("d9logo.bin", BOT_SCREEN0, 320 * 240 * 3, 0);
         memcpy(BOT_SCREEN1, BOT_SCREEN0, 320 * 240 * 3);
+        #endif
         SetupSector0x96Key0x11(); // Sector0x96 key - no effect on error level
         if (SetupTwlKey0x03() != 0) // TWL KeyX / KeyY
             errorlevel = 2;

diff --git a/source/theme.c b/source/theme.c
@@ -44,11 +44,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

diff --git a/source/theme.h b/source/theme.h
@@ -12,6 +12,7 @@
 #define GFX_DANGER_S  "danger_s.bin"
 #define GFX_DEBUG_BG  "debug_bg.bin"
 #define GFX_LOGO      "logo.bin"
+#define GFX_LOGO_B    "logo_b.bin"
 
 #define COLOR_RED           RGB(0xFF, 0x00, 0x00)
 #define COLOR_GREEN         RGB(0x00, 0xFF, 0x00)
@@ -20,16 +21,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