1 files changed, 8 insertions, 37 deletions

diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c
index 0600bef..69c6a52 100644
--- a/src/gulpin_shop.c
+++ b/src/gulpin_shop.c
@@ -4,38 +4,9 @@
 #include "memory.h"
 #include "text.h"
 #include "input.h"
+#include "menu.h"
+#include "gulpin_shop.h"
 
-struct unkStruct_Gulpin
-{
-    u8 fill0[0x22];
-    u16 unk22;
-};
-
-struct unkStruct_203B26C
-{
-// size: 0x18C
-    u32 unk0;
-    u32 unk4;
-    u32 unk8;
-    s16 unkC;
-    u8 unkE;
-    struct unkStruct_Gulpin * unk10;
-    u8 fill14[0x1C - 0x14];
-    u16 unk1C;
-    u8 fill20[0x28 - 0x20];
-    u32 unk28;
-    u8 fill2C[0x118 - 0x2C];
-    /* 0x118 */ struct OpenedFile *faceFile;
-    /* 0x11C */ u8 *faceData;
-    /* 0x120 */ u16 unk120;
-    u16 unk122;
-    u8 unk124;
-    u8 unk125;
-    u8 unk126;
-    u8 unk127;
-    struct OpenedFile **unk128;
-    struct UnkTextStruct2 unk12C[4]; 
-};
 extern struct unkStruct_203B26C *gUnknown_203B26C;
 extern const struct UnkTextStruct2 gUnknown_80DC11C;
 extern const struct UnkTextStruct2 gUnknown_80DC134;
@@ -47,7 +18,7 @@ extern void sub_801EDA4();
 extern void sub_801EDC0();
 extern void sub_801E980();
 extern void sub_801EA28();
-extern void sub_8012CAC(struct UnkTextStruct2 *, u32 *);
+extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *);
 extern void sub_801EBC4();
 
 u32 DisplayGulpinDialogueSprite(s32 param_1,s16 param_2,struct unkStruct_Gulpin *param_3)
@@ -85,7 +56,7 @@ u32 DisplayGulpinDialogueSprite(s32 param_1,s16 param_2,struct unkStruct_Gulpin
 
 u32 sub_801E8C0(void)
 {
-    switch(gUnknown_203B26C->unk4)
+    switch(gUnknown_203B26C->state)
     {
         case 0:
         case 1:
@@ -99,7 +70,7 @@ u32 sub_801E8C0(void)
             break;
         case 4:
             sub_801EDC0();
-            if(gUnknown_203B26C->unk4 == 5)
+            if(gUnknown_203B26C->state == 5)
                 return 3;
             break;
         case 5:
@@ -127,7 +98,7 @@ void sub_801E93C(void)
 
 void UpdateGulpinShopState(u32 newState)
 {
-    gUnknown_203B26C->unk4 = newState;
+    gUnknown_203B26C->state = newState;
     sub_801E980();
     sub_801EA28();
 }
@@ -137,13 +108,13 @@ void sub_801E980(void)
     s32 iVar2;
 
     sub_8006518(gUnknown_203B26C->unk12C);
-    switch(gUnknown_203B26C->unk4)
+    switch(gUnknown_203B26C->state)
     {
         case 2:
             sub_801EBC4();
             gUnknown_203B26C->unk12C[1] = gUnknown_80DC11C;
             gUnknown_203B26C->unk12C[2] = gUnknown_80DC134;
-            sub_8012CAC(&gUnknown_203B26C->unk12C[2], &gUnknown_203B26C->unk28);
+            sub_8012CAC(&gUnknown_203B26C->unk12C[2], gUnknown_203B26C->unk28);
             break;
         default:
             for(iVar2 = 0; iVar2 < 4; iVar2++)