Merge new_menu_helpers and menu

5 files changed, 26 insertions, 21 deletions

diff --git a/include/graphics.h b/include/graphics.h
index 5917e9d2a..bebf1724b 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2679,4 +2679,10 @@ extern const u8 gRaySceneKyogreRight_Pal[];
 extern const u8 gRaySceneRayquazaHover_Pal[];
 extern const u8 gRaySceneSplash_Pal[];
 
+//menu graphics
+extern const u16 gFireRedMenuElements1_Pal[16];
+extern const u16 gFireRedMenuElements2_Pal[16];
+extern const u16 gFireRedMenuElements3_Pal[16];
+extern const u8 gFireRedMenuElements_Gfx[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/menu.h b/include/menu.h
index 8f4ad686e..98b323e42 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_MENU_H
 #define GUARD_MENU_H
 
+#include "task.h"
 #include "text.h"
 #include "window.h"
 
@@ -16,6 +17,20 @@ struct MenuAction
     } func;
 };
 
+void sub_81971D0(void);
+void sub_8197200(void);
+void sub_81973A4(void);
+void NewMenuHelpers_DrawDialogueFrame(u8, u8);
+void sub_819746C(u8 windowId, bool8 copyToVram);
+void NewMenuHelpers_DrawStdWindowFrame(u8, u8);
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
+void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
+void sub_8197434(u8 a0, u8 a1);
+void SetStandardWindowBorderStyle(u8 a0, u8 a1);
+void sub_8197930(void);
+u8 GetPlayerTextSpeed(void);
+void sub_81978B0(u16 arg0);
+
 void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
 void sub_8198070(u8 windowId, bool8 copyToVram);
 void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 047adaf2a..7fae43e9c 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_MENU_HELPERS_H
 #define GUARD_MENU_HELPERS_H
 
+#include "task.h"
+
 // Exported type declarations
 
 struct YesNoFuncTable
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
deleted file mode 100644
index fb9a727dc..000000000
--- a/include/new_menu_helpers.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef GUARD_NEW_MENU_HELPERS_H
-#define GUARD_NEW_MENU_HELPERS_H
-
-#include "text.h"
-#include "task.h"
-
-void sub_81971D0(void);
-void sub_8197200(void);
-void sub_81973A4(void);
-void NewMenuHelpers_DrawDialogueFrame(u8, u8);
-void sub_819746C(u8 windowId, bool8 copyToVram);
-void NewMenuHelpers_DrawStdWindowFrame(u8, u8);
-u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
-void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
-void sub_8197434(u8 a0, u8 a1);
-void SetStandardWindowBorderStyle(u8 a0, u8 a1);
-void sub_8197930(void);
-u8 GetPlayerTextSpeed(void);
-void sub_81978B0(u16 arg0);
-
-#endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/strings.h b/include/strings.h
index 806a2e405..3bd69bb12 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -202,4 +202,7 @@ extern const u8 gText_ButtonMode[];
 extern const u8 gText_MaleSymbol[];
 extern const u8 gText_FemaleSymbol[];
 
+extern const u8 gText_SelectorArrow3[];
+extern const u8 gText_YesNo[];
+
 #endif //GUARD_STRINGS_H