decompile trader

4 files changed, 31 insertions, 18 deletions

diff --git a/include/decoration.h b/include/decoration.h
index 7a6d8ef5a..2e72e305a 100755
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -289,16 +289,6 @@ extern u8 sub_8134194(u8); // src/decoration_inventory
 extern bool8 sub_81341D4(void); // src/decoration_inventory
 extern void sub_8134104(u8); // src/decoration_inventory
 extern bool8 sub_807D770(void);
-extern void sub_80F944C(void); // src/menu_helpers
-extern void sub_80F9480(u8 *, u8); // src/menu_helpers
-extern void sub_80F94A4(u8, u8 *, u8, s16); // src/menu_helpers
-extern void sub_80F94F8(u8 *); // src/menu_helpers
-extern void sub_80F9520(u8 *, u8); // src/menu_helpers
-extern void DestroyVerticalScrollIndicator(u8); // src/menu_helpers
-extern void CreateVerticalScrollIndicators(u8, u8, u8); // src/menu_helpers
-extern void LoadScrollIndicatorPalette(void); // src/menu_helpers
-extern void DisplayItemMessageOnField(u8, const u8 *, TaskFunc, u16); // src/menu_helpers
-extern void BuyMenuFreeMemory(void); // src/menu_helpers
 extern void sub_8109DAC(u8); // src/trader
 extern void ReshowPlayerPC(u8); // src/player_pc
 
@@ -310,6 +300,8 @@ void sub_80FE5AC(u8);
 void sub_80FE604(u8);
 void sub_80FE728(u8);
 void sub_80FE758(u8);
+void sub_80FE7A8(u8);
+void sub_80FE7D4(u8 *, u8);
 void sub_80FE868(u8);
 void sub_80FE948(u8);
 void sub_80FEABC(u8, u8);
@@ -317,6 +309,7 @@ void sub_80FEC94(u8);
 void sub_80FECB8(u8);
 void sub_80FECE0(u8);
 void sub_80FEF50(u8);
+bool8 sub_80FEFA4(void);
 void sub_80FF394(u16, u16, u16);
 void sub_80FF6AC(u8);
 void sub_80FF960(u8);
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h
index afc354237..e59a23008 100644
--- a/include/decoration_inventory.h
+++ b/include/decoration_inventory.h
@@ -2,9 +2,11 @@
 #define GUARD_DECORATION_INVENTORY_H
 
 void ClearDecorationInventories(void);
+s8 sub_8133F9C(u8);
 u8 sub_8133FE4(u8);
 u8 IsThereStorageSpaceForDecoration(u8);
 u8 sub_8134074(u8);
 s8 sub_81340A8(u8);
+u8 sub_8134194(u8);
 
 #endif // GUARD_DECORATION_INVENTORY_H
diff --git a/include/global.h b/include/global.h
index 0f5bcde6d..37d264c28 100644
--- a/include/global.h
+++ b/include/global.h
@@ -474,10 +474,20 @@ struct UnkMauvilleOldManStruct2
     u8 fillerF[0x2];
 }; /*size = 0x2C*/
 
+struct MauvilleOldManTrader
+{
+    u8 unk0;
+    u8 unk1[4];
+    u8 unk5[4][11];
+    u8 unk31;
+};
+
 typedef union OldMan
 {
     struct UnkMauvilleOldManStruct oldMan1;
     struct UnkMauvilleOldManStruct2 oldMan2;
+    struct MauvilleOldManTrader trader;
+    u8 filler[0x40];
 } OldMan;
 
 struct Unk_SB_Access_Struct1
@@ -611,7 +621,6 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2D8C*/ u8 unk2D8C[4];
     /*0x2D90*/ u8 filler_2D90[0x4];
     /*0x2D94*/ OldMan oldMan;
-    /*0x2DC0*/ u8 unk_2DC0[0x14];
     /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
     /*0x2DFC*/ u8 filler_2DFC[0x8];
     /*0x2E04*/ SB_Struct sbStruct;
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 1df5053e7..993d698bd 100755
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -9,22 +9,31 @@ struct YesNoFuncTable
     void (*noFunc)(u8);
 };
 
+void sub_80F9020(void);
+void DisplayItemMessageOnField(u8, const u8 *, TaskFunc, u16);
 void DoYesNoFuncWithChoice(u8, const struct YesNoFuncTable *);
 void sub_80F914C(u8, const struct YesNoFuncTable *);
-void DisplayItemMessageOnField(u8, const u8 *, TaskFunc, u16);
+u8 sub_80F9284(void);
+u8 sub_80F92BC(void);
+bool8 sub_80F92F4(u16);
+bool8 sub_80F931C(u16);
 bool8 sub_80F9344(void);
-u8 sub_80F9344(void);
 void sub_80F9368(void);
 void sub_80F9438(void);
 void sub_80F944C(void);
-void CreateVerticalScrollIndicators(u8, u8, u8); // include/decoration.h
-void sub_80F979C(u32, u32); // unknown args
+void sub_80F9480(u8 *, u8);
+void sub_80F94A4(u8, u8 *, s16, s16);
+void sub_80F94F8(u8 *);
+void sub_80F9520(u8 *, u8);
+void CreateVerticalScrollIndicators(u8, u16, u16);
+void sub_80F979C(u8, bool8);
 void DestroyVerticalScrollIndicator(u8);
-void BuyMenuFreeMemory(void);
-void sub_80F98DC(int);
-void sub_80F996C(u8);
 void LoadScrollIndicatorPalette(void);
+void BuyMenuFreeMemory(void);
 void sub_80F98A4(u8);
 void StartVerticalScrollIndicators(u8);
+void sub_80F98DC(u8);
+void PauseVerticalScrollIndicator(u8);
+void sub_80F9988(u8, u8);
 
 #endif // GUARD_MENU_HELPERS_H