4 files changed, 37 insertions, 38 deletions
diff --git a/include/global.berry.h b/include/global.berry.h
index 6632e55e2..096d8b1d8 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -3,33 +3,33 @@
 
 struct Berry
 {
-    const u8 name[7];
-    u8 firmness;
-    u16 size;
-    u8 maxYield;
-    u8 minYield;
-    const u8 *description1;
-    const u8 *description2;
-    u8 stageDuration;
-    u8 spicy;
-    u8 dry;
-    u8 sweet;
-    u8 bitter;
-    u8 sour;
-    u8 smoothness;
+    /*0x00*/const u8 name[7];
+    /*0x07*/u8 firmness;
+    /*0x08*/u16 size;
+    /*0x0A*/u8 maxYield;
+    /*0x0B*/u8 minYield;
+    /*0x0C*/const u8 *description1;
+    /*0x10*/const u8 *description2;
+    /*0x14*/u8 stageDuration;
+    /*0x15*/u8 spicy;
+    /*0x16*/u8 dry;
+    /*0x17*/u8 sweet;
+    /*0x18*/u8 bitter;
+    /*0x19*/u8 sour;
+    /*0x1A*/u8 smoothness;
 };
 
 struct EnigmaBerry
 {
-    struct Berry berry;
-    u8 pic[(6 * 6) * TILE_SIZE_4BPP];
-    u16 palette[16];
-    u8 description1[45];
-    u8 description2[45];
-    u8 itemEffect[18];
-    u8 holdEffect;
-    u8 holdEffectParam;
-    u32 checksum;
+    /*0x000*/struct Berry berry;
+    /*0x01B*/u8 pic[(6 * 6) * TILE_SIZE_4BPP];
+    /*0x49C*/u16 palette[16];
+    /*0x4BC*/u8 description1[45];
+    /*0x4E9*/u8 description2[45];
+    /*0x516*/u8 itemEffect[18];
+    /*0x528*/u8 holdEffect;
+    /*0x529*/u8 holdEffectParam;
+    /*0x52C*/u32 checksum;
 };
 
 struct BattleEnigmaBerry
diff --git a/include/menu.h b/include/menu.h
index 3cf47b9b8..9a5ca62a0 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_MENU_H
 #define GUARD_MENU_H
 
+#include "task.h"
 #include "text.h"
 
 struct MenuAction
@@ -12,7 +13,7 @@ struct MenuAction
 struct MenuAction2
 {
     const u8 *text;
-    void (*func)(u8);
+    TaskFunc func;
 };
 
 extern const struct MenuAction gMenuYesNoItems[];
diff --git a/include/party_menu.h b/include/party_menu.h
index 8734cbe65..5eee17fd2 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -1,19 +1,14 @@
 #ifndef GUARD_PARTY_MENU_H
 #define GUARD_PARTY_MENU_H
 
+#include "menu.h"
 #include "task.h"
 
-struct PartyMenuItem
-{
-    const u8 *text;
-    TaskFunc func;
-};
-
 struct PartyPopupMenu
 {
-    u8 unk0;
-    u8 unk1;
-    const u8 *unk4;
+    /*0x0*/u8 numChoices; // number of menu choices
+    /*0x1*/u8 width; // menu width (number of characters it can fit horizontally)
+    /*0x4*/const u8 *items;  // menu item ids (ids for a MenuAction2 array)
 };
 
 // TODO: Unify these two structs
@@ -119,11 +114,9 @@ void PartyMenuTryPrintMonsHP(void);
 void nullsub_13(void);
 void PartyMenuDrawHPBars(void);
 void sub_806E6F0();
-void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, int);
-void sub_806E7D0(u8, const struct PartyPopupMenu *);
-TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
-void DoEvolutionStoneItemEffect(u8, u16, TaskFunc);
-u8 GetItemEffectType();
+void ShowPartyPopupMenu(u8 menuIndex, const struct PartyPopupMenu *menu, const struct MenuAction2 *menuActions, u8 cursorPos);
+void ClosePartyPopupMenu(u8 index, const struct PartyPopupMenu *menu);
+TaskFunc PartyMenuGetPopupMenuFunc(u8 menuIndex, const struct PartyPopupMenu *menus, const struct MenuAction2 *menuActions, u8 itemIndex);
 u8 sub_806E834(const u8 *message, u8 arg1);
 void sub_806E8D0(u8 taskId, u16 b, TaskFunc c);
 void party_menu_link_mon_held_item_object(u8);
@@ -169,6 +162,7 @@ void RedrawPokemonInfoInMenu(u8, struct Pokemon *);
 void Task_RareCandy3(u8);
 void TeachMonMoveInPartyMenu(u8);
 void DoEvolutionStoneItemEffect(u8 taskId, u16 evolutionStoneItem, TaskFunc c);
+u8 GetItemEffectType(u16 item);
 void sub_806CA60(u8 taskId);
 void sub_806CD5C(u8 taskId);
 void DoTakeMail(u8 taskId, TaskFunc func);
@@ -177,5 +171,6 @@ void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func);
 void sub_806D668(u8 partyID);
 void TaughtMove(u8 taskId);
 void StopTryingToTeachMove_806F588(u8 taskId);
+void sub_806E720(u8, u8 *, u8 *, const struct PartyPopupMenu *);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon_menu.h b/include/pokemon_menu.h
index 06f905577..1c8e6772f 100644
--- a/include/pokemon_menu.h
+++ b/include/pokemon_menu.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEMON_MENU_H
 #define GUARD_POKEMON_MENU_H
 
+#include "menu.h"
+
 #define POKEMENU_FIRST_FIELD_MOVE_ID 10
 
 enum
@@ -36,6 +38,7 @@ extern void (*gUnknown_03005CE4)(void);
 
 void sub_808B5B4(u32 taskID);
 void sub_8089A70(void);
+void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order);
 void sub_808A004(u8 taskID);
 void FieldCallback_Teleport(void);
 void sub_808AD58(void);