Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

1 files changed, 11 insertions, 2 deletions

diff --git a/include/menu.h b/include/menu.h
index 56865bcd9..d4a038920 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -8,6 +8,15 @@
 #define MENU_NOTHING_CHOSEN -2
 #define MENU_B_PRESSED -1
 
+enum
+{
+    SAVE_MENU_NAME,
+    SAVE_MENU_CAUGHT,
+    SAVE_MENU_PLAY_TIME,
+    SAVE_MENU_LOCATION,
+    SAVE_MENU_BADGES,
+};
+
 struct MenuAction
 {
     const u8 *text;
@@ -23,7 +32,7 @@ void FreeAllOverworldWindowBuffers(void);
 void InitStandardTextBoxWindows(void);
 void sub_8197200(void);
 u16 RunTextPrintersAndIsPrinter0Active(void);
-void sub_81973A4(void);
+void LoadMessageBoxAndBorderGfx(void);
 void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
 void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
 u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
@@ -80,7 +89,7 @@ void sub_819786C(u8 windowId, bool8 copyToVram);
 void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress);
 void RemoveStartMenuWindow(void);
 void DisplayYesNoMenuWithDefault(u8 initialCursorPos);
-void sub_819A344(u8 a0, u8 *dest, u8 color);
+void BufferSaveMenuText(u8 textId, u8 *dest, u8 color);
 void RemoveMapNamePopUpWindow(void);
 u8 GetMapNamePopUpWindowId(void);
 u8 AddMapNamePopUpWindow(void);