Resolve conflicts

include/item_menu.h

@@ -4,17 +4,48 @@
 // Exported type declarations
 struct BagStruct
 {
-    void *func;
-    u8 unk4;
+    void (*bagCallback)(void);
+    u8 location;
     u8 pocket;
     u8 unk6[2];
-    u16 unk8[5];
-    u16 unk12[5];
-    void *unk1C;
+    u16 cursorPosition[5];
+    u16 scrollPosition[5];
 };
 
 extern struct BagStruct gUnknown_0203CE58;
 
+struct UnkBagStruct
+{
+    void (*unk0)(void);
+    u8 unk4[0x800];
+    u8 unk804[12];
+    u8 unk810[7];
+    u8 unk817;
+    u8 unk818;
+    u8 unk819;
+    u8 unk81A;
+    u8 unk81B:4;
+    u8 unk81B_1:2;
+    u8 unk81B_3:1;
+    u8 unk81B_2:1;
+    u8 filler3[2];
+    u8 unk81E;
+    u8 unk81F;
+    const u8* unk820;
+    u8 unk824;
+    u8 unk825;
+    u8 filler[2];
+    u8 unk828;
+    u8 unk829[5];
+    u8 unk82E[6];
+    s16 unk834;
+    u8 filler4[0xE];
+    u8 unk844[32][32];
+    u8 filler2[4];
+};
+
+extern struct UnkBagStruct *gUnknown_0203CE54;
+
 // Exported RAM declarations
 
 extern u16 gSpecialVar_ItemId;