Tidy global namespace and document

4 files changed, 23 insertions, 12 deletions

diff --git a/include/berry_pouch.h b/include/berry_pouch.h
index 58f58fd99..cd9866d81 100644
--- a/include/berry_pouch.h
+++ b/include/berry_pouch.h
@@ -3,10 +3,21 @@
 
 #include "task.h"
 
+enum BerryPouchType
+{
+    BERRYPOUCH_FROMFIELD,
+    BERRYPOUCH_FROMPARTYGIVE,
+    BERRYPOUCH_FROMMARTSELL,
+    BERRYPOUCH_FROMPOKEMONSTORAGEPC,
+    BERRYPOUCH_FROMBATTLE,
+    BERRYPOUCH_FROMBERRYCRUSH,
+    BERRYPOUCH_NA
+};
+
 void BerryPouch_StartFadeToExitCallback(u8 taskId);
-void BerryPouch_SetExitCallback(void (*)(void));
-void InitBerryPouch(u8, void (*)(void), u8);
+void BerryPouch_SetExitCallback(void (*exitCallback)(void));
+void InitBerryPouch(u8 type, void (*savedCallback)(void), u8 allowSelect);
 void DisplayItemMessageInBerryPouch(u8 taskId, u8 fontId, const u8 * str, TaskFunc followUpFunc);
-void sub_813E2B8(u8 taskId);
+void Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu(u8 taskId);
 
 #endif //GUARD_BERRY_POUCH_H
diff --git a/include/graphics.h b/include/graphics.h
index ce671246e..5c6f201db 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -999,11 +999,11 @@ extern const u8 gCreditsAllRightsReservedGfxTiles[];
 extern const u8 gCreditsAllRightsReservedGfxMap[];
 
 // berry_pouch
-extern const u32 gUnknown_8E8560C[];
+extern const u32 gBerryPouchSpriteTiles[];
 extern const u8 gUnknown_8E859D0[];
 extern const u8 gUnknown_8E85BA4[];
 extern const u8 gUnknown_8E85BF4[];
-extern const u32 gUnknown_8E85C1C[];
+extern const u32 gBerryPouchSpritePalette[];
 extern const u8 gUnknown_8E85C44[];
 
 #endif //GUARD_GRAPHICS_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index c18d4313e..6ea771500 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -23,7 +23,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 palet
 void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 u8 GetLRKeysState(void);
 u8 sub_80BF66C(void);
-bool8 sub_80BF6A8(u16 itemId);
+bool8 itemid_link_can_give_berry(u16 itemId);
 bool8 itemid_80BF6D8_mail_related(u16 itemId);
 void ClearVramOamPltt(void);
 
diff --git a/include/strings.h b/include/strings.h
index a56139909..b0221b8e9 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -317,11 +317,11 @@ extern const u8 gCreditsString_Graphic_Designer[];
 extern const u8 gCreditsString_Akira_Kinashi[];
 
 // berry_pouch
-extern const u8 gUnknown_8416374[];
-extern const u8 gUnknown_84163DB[];
-extern const u8 gUnknown_84163F4[];
-extern const u8 gUnknown_8416409[];
-extern const u8 gUnknown_841670A[];
-extern const u8 gUnknown_8416716[];
+extern const u8 gText_TheStrVar1CantBeHeldHere[];
+extern const u8 gText_TossOutHowManyStrVar1s[];
+extern const u8 gText_ThrewAwayStrVar2StrVar1s[];
+extern const u8 gText_ThrowAwayStrVar2OfThisItemQM[];
+extern const u8 gText_BerryPouch[];
+extern const u8 gText_TheBerryPouchWillBePutAway[];
 
 #endif //GUARD_STRINGS_H