Merge branch 'master' into link

2018-02-11 19:22:06 -05:00
parent f39053ee30 14a76793e5
commit ea347199a2
429 changed files with 56348 additions and 62508 deletions
@@ -2,6 +2,18 @@
 #define GUARD_item_menu_H

 // Exported type declarations
+struct BagStruct
+{
+    void *func;
+    u8 unk4;
+    u8 pocket;
+    u8 unk6[2];
+    u16 unk8[5];
+    u16 unk12[5];
+    void *unk1C;
+};
+
+extern struct BagStruct gUnknown_0203CE58;

 // Exported RAM declarations

@@ -10,5 +22,6 @@ extern u16 gSpecialVar_ItemId;
 // Exported ROM declarations
 void sub_81AAC50(void);
 void sub_81AAC70(void);
+void bag_menu_mail_related(void);

 #endif //GUARD_item_menu_H