Merge pull request #5 from pebri86/staging

redesigned osd menu
pebri86 · Aug 14, 2019 · 67b946f · 67b946f
2 parents d54f278 + 2e258f8
commit 67b946f
Show file tree

Hide file tree

Showing 21 changed files with 3,696 additions and 18,091 deletions.
diff --git a/esplay-gnuboy/main/display_gb.c b/esplay-gnuboy/main/display_gb.c
@@ -5,7 +5,6 @@
 #include "display_gb.h"
 #include "display.h"
 #include "disp_spi.h"
-#include "menu_tile.h"
 
 extern uint16_t *line[];
 

diff --git a/esplay-gnuboy/main/main.c b/esplay-gnuboy/main/main.c
@@ -188,6 +188,11 @@ void videoTask(void *arg)
                 SaveState();
                 break;
 
+            case MENU_LOAD:
+                display_show_hourglass();
+                LoadState();
+                break;
+
             case MENU_SAVE_EXIT:
                 display_show_hourglass();
                 SaveState();

diff --git a/esplay-gnuboy/main/menu.c b/esplay-gnuboy/main/menu.c
diff --git a/esplay-gnuboy/main/menu.h b/esplay-gnuboy/main/menu.h