Merge b968e5e into c37a444

skylersaleh · Sep 5, 2024 · b1e5e48 · b1e5e48
2 parents c37a444 + b968e5e
commit b1e5e48
Show file tree

Hide file tree

Showing 9 changed files with 32,686 additions and 796 deletions.
diff --git a/docs/skyemu-theme-default.png b/docs/skyemu-theme-default.png
diff --git a/docs/skyemu-theme-default.pxd b/docs/skyemu-theme-default.pxd
diff --git a/docs/skyemu-theme-mini.png b/docs/skyemu-theme-mini.png
diff --git a/docs/skyemu-theme-mini.pxd b/docs/skyemu-theme-mini.pxd
diff --git a/src/default_theme.h b/src/default_theme.h
diff --git a/src/localization.c b/src/localization.c
@@ -25,6 +25,10 @@
 // - "Save File"
 // - ICON_FK_CROSSHAIRS " Located Files"
 // - "GUI Scale"
+// - "Auto\0Vertical\0Horizontal\0Hybrid Large Top\0Hybrid Large Bottom\0Vertical Large Top\0Vertical Large Bottom\0Horizontal Large Top\0Horizontal Large Bottom\0\0"
+// - "NDS Screen Layout"
+// - "Never Overlap Screen"
+// - "Button Labels"
 
 // Strings removed in v4:
 // - "Controller"

diff --git a/src/main.c b/src/main.c
diff --git a/src/res.c b/src/res.c
@@ -1,5 +1,6 @@
 #include "res.h"
 #include "forkawesome.h"
+#include "default_theme.h"
 #ifdef UNICODE_GUI
 #include "noto.h"
 #include "noto_armenian.h"
@@ -15,6 +16,7 @@ const uint8_t* se_get_resource(int res_id, uint64_t* size){
   uint64_t sz_dummy = 0; 
   if(!size)size=&sz_dummy; 
   switch(res_id){
+    case SE_THEME_DEFAULT: *size = theme_default_png_len; return theme_default_png;
     case SE_FORKAWESOME: *size = forkawesome_compressed_size; return (uint8_t*)forkawesome_compressed_data;
     case SE_KARLA: *size = karla_compressed_size; return (uint8_t*)karla_compressed_data;
     case SE_SV_BASIC_MANUAL: *size = sv_basic_manual_compressed_size; return (uint8_t*)sv_basic_manual_compressed_data;

diff --git a/src/res.h b/src/res.h
@@ -10,6 +10,7 @@
 #define SE_NOTO_SANS 4
 #define SE_SV_BASIC_MANUAL 5
 #define SE_CACERT_PEM 6
+#define SE_THEME_DEFAULT 7
 
 const uint8_t* se_get_resource(int res_id, uint64_t* size);