6 files changed, 16 insertions, 9 deletions
diff --git a/include/field_specials.h b/include/field_specials.h
index a12fee575..0e4fdd787 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -8,5 +8,8 @@ u8 CountDigits(u16 number);
 void TV_PrintIntToStringVar(u8, int);
 u16 ScrSpecial_GetStarter(void);
 void sub_80CCB68(void);
+void nullsub_60(void);
+void nullsub_61(void);
+u8 ContextNpcGetTextColor(void);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/link.h b/include/link.h
index 33f04a42a..0ec32d8a0 100644
--- a/include/link.h
+++ b/include/link.h
@@ -206,5 +206,6 @@ void sub_800AA80(u8);
 void sub_80098D8(void);
 void CloseLink(void);
 bool8 sub_800A4BC(void);
+bool32 sub_800B270(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/mail_data.h b/include/mail_data.h
index 0275d8dc6..79a4a7851 100644
--- a/include/mail_data.h
+++ b/include/mail_data.h
@@ -10,6 +10,6 @@
 // Exported ROM declarations
 
 u16 sub_80D45E8(u16, u16 *);
-bool8 itemid_is_mail(u16 itemId);
+bool8 ItemIsMail(u16 itemId);
 
 #endif //GUARD_MAIL_DATA_H
diff --git a/include/menu.h b/include/menu.h
index fa8552484..bc45e7e61 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -2,10 +2,12 @@
 #define GUARD_MENU_H
 
 #include "global.h"
-
 #include "text.h"
 #include "window.h"
 
+#define MENU_NOTHING_CHOSEN -2
+#define MENU_B_PRESSED -1
+
 struct MenuAction
 {
     const u8 *text;
@@ -45,7 +47,7 @@ void sub_810F71C(void);
 void sub_810F740(void);
 u8 ProgramAndPlaceMenuCursorOnWindow(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPosition);
 void CreateYesNoMenu(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8);
-
+void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 a2, u8 a3);
 void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
 bool8 IsBlendTaskActive(void);
 void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 25ef3252e..93a4fe5d3 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -19,14 +19,14 @@ void sub_812225C(u16 *, u16 *, u8, u8);
 void sub_8122298(u16 *, u16 *, u8, u8, u8);
 void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
 bool8 sub_81221AC(void);
-bool16 sub_80BF518(u8 textPrinterId);
+bool16 RunTextPrinters_CheckActive(u8 textPrinterId);
 bool8 sub_80BF72C(void);
 bool8 MenuHelpers_LinkSomething(void);
-void VblankHblankHandlerSetZero(void);
-void InitBgReg(void);
+void SetVBlankHBlankCallbacksToNull(void);
+void ResetAllBgsCoordinatesAndBgCntRegs(void);
 u8 sub_80BF8E4(void);
-u8 sub_80BF848(s16 * a0, u16 a1);
+u8 AdjustQuantityAccordingToDPadInput(s16 * a0, u16 a1);
 void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
-void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate * unk1, u8 unk2, u8 unk3, u8 unk4, u8 unk5, u8 unk6, const struct YesNoFuncTable *ptrs);
+void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 
 #endif //GUARD_MENU_HELPERS_H
diff --git a/include/overworld.h b/include/overworld.h
index ab77542c2..fed1a33a5 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -61,7 +61,7 @@ void Overworld_SetSavedMusic(u16);
 void Overworld_ChangeMusicToDefault(void);
 void Overworld_ChangeMusicTo(u16);
 
-bool32 is_c1_link_related_active(void);
+bool32 IsUpdateLinkStateCBActive(void);
 
 void strange_npc_table_clear(void);
 const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16);
@@ -116,5 +116,6 @@ bool8 sub_8055FC4(void);
 bool8 is_light_level_8_or_9(u8 mapType);
 bool32 sub_8055C9C(void);
 void sub_8054D70(void);
+bool32 sub_8058244(void);
 
 #endif //GUARD_ROM4_H