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/decoration.c
+++ b/src/decoration.c
@@ -20,7 +20,7 @@
 #include "field_map_obj.h"
 #include "list_menu.h"
 #include "menu_helpers.h"
-#include "new_menu_helpers.h"
+#include "menu.h"
 #include "menu_indicators.h"
 #include "sound.h"
 #include "event_scripts.h"