Merge new_menu_helpers and menu

2018-02-07 00:07:42 -06:00
parent 18abda9dca
commit d396a8f89c
19 changed files with 510 additions and 554 deletions
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -6,7 +6,6 @@
 #include "menu.h"
 #include "task.h"
 #include "menu_helpers.h"
-#include "new_menu_helpers.h"
 #include "pokemon.h"
 #include "graphics.h"
 #include "malloc.h"