From db3d5c90433a94747c23e48cf85badfc5286b07f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Sep 2019 12:33:01 -0400
Subject: Start berry_pouch decomp

---
 include/menu_helpers.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 7fe8c19b2..c18d4313e 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -3,6 +3,7 @@
 
 #include "global.h"
 #include "task.h"
+#include "window.h"
 
 struct YesNoFuncTable
 {
-- 
cgit v1.2.3


From b6c7c6523fedb21e5928fbaf8e01747f4283cfc1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Sep 2019 16:11:41 -0400
Subject: berry_pouch through sub_813D0E4

---
 include/graphics.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'include')

diff --git a/include/graphics.h b/include/graphics.h
index d8858b36f..9d4bdf177 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -998,4 +998,12 @@ extern const u16 gCreditsAllRightsReservedGfxPal[];
 extern const u8 gCreditsAllRightsReservedGfxTiles[];
 extern const u8 gCreditsAllRightsReservedGfxMap[];
 
+// berry_pouch
+extern const u8 gUnknown_8E8560C[];
+extern const u8 gUnknown_8E859D0[];
+extern const u8 gUnknown_8E85BA4[];
+extern const u8 gUnknown_8E85BF4[];
+extern const u8 gUnknown_8E85C1C[];
+extern const u8 gUnknown_8E85C44[];
+
 #endif //GUARD_GRAPHICS_H
-- 
cgit v1.2.3


From 0993cb64f7c3a4ff8827da72acc76afccca682e6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Sep 2019 20:27:41 -0400
Subject: Berry_pouch through sub_813D5BC

---
 include/strings.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/strings.h b/include/strings.h
index dfedb4afa..5c3cbb67b 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -315,4 +315,7 @@ extern const u8 gCreditsString_The_Royal_New_Zealand_Foundation_of_the_Blind_Gre
 extern const u8 gCreditsString_Graphic_Designer[];
 extern const u8 gCreditsString_Akira_Kinashi[];
 
+// berry_pouch
+extern const u8 gUnknown_8416716[];
+
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From b843b5529227e301895920b56585cf9ec69c9b53 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Sep 2019 21:35:20 -0400
Subject: berry_pouch through sub_813D940

---
 include/item.h    | 1 +
 include/strings.h | 1 +
 2 files changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/item.h b/include/item.h
index 0f0adbca8..f0aaa0f6c 100644
--- a/include/item.h
+++ b/include/item.h
@@ -77,5 +77,6 @@ u16 GetPcItemQuantity(u16 *);
 
 void ItemPcCompaction(void);
 void RemoveItemFromPC(u16 itemId, u16 quantity);
+void SortAndCompactBagPocket(struct BagPocket * pocket);
 
 #endif // GUARD_ITEM_H
diff --git a/include/strings.h b/include/strings.h
index 5c3cbb67b..c0863dffb 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -316,6 +316,7 @@ extern const u8 gCreditsString_Graphic_Designer[];
 extern const u8 gCreditsString_Akira_Kinashi[];
 
 // berry_pouch
+extern const u8 gUnknown_841670A[];
 extern const u8 gUnknown_8416716[];
 
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From e65487716a0afc3c48d712f706783c58cc82676c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Sep 2019 16:59:39 -0400
Subject: berry_pouch through sub_813E2B8

---
 include/party_menu.h | 1 +
 include/strings.h    | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/party_menu.h b/include/party_menu.h
index cd2a5bc37..bea5dcdde 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -81,5 +81,6 @@ void sub_8127DA8(u8 battlerId, u8 multiplayerFlag);
 void OpenPartyMenuInBattle(u8 arg);
 void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
 bool8 IsMultiBattle(void);
+void sub_8126EDC(void);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/strings.h b/include/strings.h
index c0863dffb..e60344731 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -94,6 +94,7 @@ extern const u8 gText_Pokemon[];
 extern const u8 gText_PkmnFainted3[];
 
 extern const u8 gOtherText_Use[];
+extern const u8 gOtherText_Toss[];
 extern const u8 gOtherText_Give[];
 extern const u8 gOtherText_Exit[];
 extern const u8 gText_ThreeHyphens[];
@@ -316,6 +317,9 @@ extern const u8 gCreditsString_Graphic_Designer[];
 extern const u8 gCreditsString_Akira_Kinashi[];
 
 // berry_pouch
+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[];
 
-- 
cgit v1.2.3


From 64362d3040b3defb722bf72203fda64b96da1e06 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Sep 2019 17:33:57 -0400
Subject: Berry Pouch rodata

---
 include/graphics.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/graphics.h b/include/graphics.h
index 9d4bdf177..ce671246e 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 u8 gUnknown_8E8560C[];
+extern const u32 gUnknown_8E8560C[];
 extern const u8 gUnknown_8E859D0[];
 extern const u8 gUnknown_8E85BA4[];
 extern const u8 gUnknown_8E85BF4[];
-extern const u8 gUnknown_8E85C1C[];
+extern const u32 gUnknown_8E85C1C[];
 extern const u8 gUnknown_8E85C44[];
 
 #endif //GUARD_GRAPHICS_H
-- 
cgit v1.2.3


From 89be71dcb846b1d1eded569db6dd6709cc42201f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Sep 2019 18:06:49 -0400
Subject: berry_pouch through sub_813E8D4

---
 include/item.h    | 7 +++----
 include/strings.h | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/item.h b/include/item.h
index f0aaa0f6c..583a47cdc 100644
--- a/include/item.h
+++ b/include/item.h
@@ -64,13 +64,12 @@ u8 ItemId_GetSecondaryId(u16 itemId);
 u16 itemid_get_market_price(u16 itemId);
 void ClearItemSlotsInAllBagPockets(void);
 void ClearPCItemSlots(void);
-void CopyItemName(u16, u8 *);
 void sub_809A824(u16 itemId);
 bool8 AddBagItem(u16 itemId, u16 amount);
 
-void SortPocketAndPlaceHMsFirst(struct BagPocket *);
-u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1);
-u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1);
+void SortPocketAndPlaceHMsFirst(struct BagPocket * pocket);
+u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 itemId);
+u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 itemId);
 bool8 itemid_is_unique(u16 itemId);
 void BagPocketCompaction(struct ItemSlot * slots, u8 capacity);
 u16 GetPcItemQuantity(u16 *);
diff --git a/include/strings.h b/include/strings.h
index e60344731..a56139909 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -317,6 +317,7 @@ 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[];
-- 
cgit v1.2.3


From 8eea5b6d750a629c14a152c240f84b02b5e4f0c6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Sep 2019 19:47:38 -0400
Subject: Finish berry_pouch code decomp

---
 include/berry_pouch.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/berry_pouch.h b/include/berry_pouch.h
index 8e652225b..58f58fd99 100644
--- a/include/berry_pouch.h
+++ b/include/berry_pouch.h
@@ -6,7 +6,7 @@
 void BerryPouch_StartFadeToExitCallback(u8 taskId);
 void BerryPouch_SetExitCallback(void (*)(void));
 void InitBerryPouch(u8, void (*)(void), u8);
-void DisplayItemMessageInBerryPouch(u8 taskId, u8 bgId, const u8 * str, TaskFunc followUpFunc);
+void DisplayItemMessageInBerryPouch(u8 taskId, u8 fontId, const u8 * str, TaskFunc followUpFunc);
 void sub_813E2B8(u8 taskId);
 
 #endif //GUARD_BERRY_POUCH_H
-- 
cgit v1.2.3


From beedb8d73f40b045906f521b48f40367697b6ebb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Sep 2019 20:58:29 -0400
Subject: Tidy global namespace and document

---
 include/berry_pouch.h  | 17 ++++++++++++++---
 include/graphics.h     |  4 ++--
 include/menu_helpers.h |  2 +-
 include/strings.h      | 12 ++++++------
 4 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'include')

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
-- 
cgit v1.2.3


From 07064bd58603de0f0470bab373196a40fe5d929c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Sep 2019 21:04:25 -0400
Subject: Name extern berry pouch gfx

---
 include/graphics.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/graphics.h b/include/graphics.h
index 5c6f201db..a76607f40 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1000,10 +1000,10 @@ extern const u8 gCreditsAllRightsReservedGfxMap[];
 
 // berry_pouch
 extern const u32 gBerryPouchSpriteTiles[];
-extern const u8 gUnknown_8E859D0[];
-extern const u8 gUnknown_8E85BA4[];
-extern const u8 gUnknown_8E85BF4[];
+extern const u8 gBerryPouchBgGfx[];
+extern const u8 gBerryPouchBgPals[];
+extern const u8 gBerryPouchBgPal0FemaleOverride[];
 extern const u32 gBerryPouchSpritePalette[];
-extern const u8 gUnknown_8E85C44[];
+extern const u8 gBerryPouchBg1Tilemap[];
 
 #endif //GUARD_GRAPHICS_H
-- 
cgit v1.2.3