5 files changed, 46 insertions, 2 deletions
diff --git a/include/menu.h b/include/menu.h
new file mode 100644
index 000000000..c8aafcb30
--- /dev/null
+++ b/include/menu.h
@@ -0,0 +1,18 @@
+#ifndef GUARD_MENU_H
+#define GUARD_MENU_H
+
+#include "text.h"
+
+struct MenuAction
+{
+   const u8 *text;
+   u8 (*func)();
+};
+
+struct MenuAction2
+{
+    const u8 *text;
+    void (*func)(u8);
+};
+
+#endif // GUARD_MENU_H
diff --git a/include/safari_zone.h b/include/safari_zone.h
new file mode 100644
index 000000000..0649bab6a
--- /dev/null
+++ b/include/safari_zone.h
@@ -0,0 +1,20 @@
+#ifndef GUARD_SAFARI_ZONE_H
+#define GUARD_SAFARI_ZONE_H
+
+extern u8 gNumSafariBalls;
+
+bool32 GetSafariZoneFlag(void);
+void SetSafariZoneFlag(void);
+void ResetSafariZoneFlag(void);
+
+void EnterSafariMode(void);
+void ExitSafariMode(void);
+
+bool8 SafariZoneTakeStep(void);
+void SafariZoneRetirePrompt(void);
+
+void SafariZoneGetPokeblockNameInFeeder(void);
+struct Pokeblock *SafariZoneGetActivePokeblock(void);
+void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index);
+
+#endif // GUARD_SAFARI_ZONE_H
diff --git a/include/start_menu.h b/include/start_menu.h
new file mode 100644
index 000000000..6c7cb3237
--- /dev/null
+++ b/include/start_menu.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_START_MENU_H
+#define GUARD_START_MENU_H
+
+void AppendToList(u8* list, u8* pos, u8 newEntry);
+
+#endif // GUARD_START_MENU_H
diff --git a/include/text.h b/include/text.h
index 3641548aa..2c5bf7bee 100644
--- a/include/text.h
+++ b/include/text.h
@@ -91,7 +91,7 @@ extern u8 gStringVar4[];
 
 void SetFontsPointer(const struct FontInfo *fonts);
 void DeactivateAllTextPrinters (void);
-u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
+u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 void RunTextPrinters(void);
 bool8 IsTextPrinterActive(u8 id);
diff --git a/include/window.h b/include/window.h
index 6f5f55c11..36a71a1e0 100644
--- a/include/window.h
+++ b/include/window.h
@@ -31,7 +31,7 @@ struct Window
 };
 
 bool16 InitWindows(struct WindowTemplate *templates);
-u16 AddWindow(struct WindowTemplate *template);
+u16 AddWindow(const struct WindowTemplate *template);
 int AddWindowWithoutTileMap(struct WindowTemplate *template);
 void RemoveWindow(u8 windowId);
 void FreeAllWindowBuffers(void);