ActorItemSellerBase OK (#163)

* ActorItemSellerBase OK

* Fix broken matches

5 files changed, 54 insertions, 27 deletions

diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp
index ec589e51..f5e8513f 100644
--- a/include/Unknown/UnkStruct_02032f0c.hpp
+++ b/include/Unknown/UnkStruct_02032f0c.hpp
@@ -36,20 +36,20 @@ public:
     /* 20 */
 
     UnkSubClass1_02256FF8();
-    /* 00 */ virtual ~UnkSubClass1_02256FF8() override;
-    /* 08 */ virtual void vfunc_08(void) override;
-    /* 0c */ virtual void vfunc_0c(void) override;
-    /* 10 */ virtual void vfunc_10(void) override;
-    /* 14 */ virtual void vfunc_14(void) override;
-    /* 18 */ virtual void vfunc_18(void) override;
-    /* 1c */ virtual void vfunc_1c(void) override;
-    /* 20 */ virtual void vfunc_20(void) override;
-    /* 24 */ virtual void vfunc_24(void) override;
-    /* 28 */ virtual void vfunc_28(void) override;
-    /* 2c */ virtual void vfunc_2c(void) override;
-    /* 30 */ virtual void vfunc_30(void) override;
-    /* 34 */ virtual void vfunc_34(void) override;
-    /* 38 */ virtual void vfunc_38(void) override;
+    /* 00 */ virtual ~UnkSubClass1_02256FF8();
+    /* 08 */ virtual void vfunc_08(void);
+    /* 0c */ virtual void vfunc_0c(void);
+    /* 10 */ virtual void vfunc_10(void);
+    /* 14 */ virtual void vfunc_14(void);
+    /* 18 */ virtual void vfunc_18(void);
+    /* 1c */ virtual void vfunc_1c(void);
+    /* 20 */ virtual void vfunc_20(void);
+    /* 24 */ virtual void vfunc_24(void);
+    /* 28 */ virtual void vfunc_28(void);
+    /* 2c */ virtual void vfunc_2c(void);
+    /* 30 */ virtual void vfunc_30(void);
+    /* 34 */ virtual void vfunc_34(void);
+    /* 38 */ virtual void vfunc_38(void);
     /* 3c */
 };
 
@@ -90,7 +90,7 @@ public:
     /* 2c */ UnkStruct_MsgProc_Base_unk_2C **mUnk_2c;
     /* 30 */ s32 mUnk_30;
     /* 34 */ s32 mUnk_34;
-    /* 38 */ unk32 mUnk_38;
+    /* 38 */ void *mUnk_38;
     /* 3c */ unk16 mUnk_3c;
     /* 3e */ unk16 mUnk_3e;
     /* 40 */ unk32 mUnk_40;
@@ -133,7 +133,7 @@ public:
     /* 30 */ virtual void vfunc_30(void);
     /* 34 */ virtual unk32 vfunc_34(unk32 param_2);
     /* 38 */ virtual bool vfunc_38(void);
-    /* 3c */ virtual void vfunc_3C(unk32 param_2);
+    /* 3c */ virtual void vfunc_3C(u16 *param_2);
     /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3);
     /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY);
     /* 48 */ virtual void vfunc_48(void);
diff --git a/include/Unknown/UnkStruct_02037628.hpp b/include/Unknown/UnkStruct_02037628.hpp
new file mode 100644
index 00000000..4175dbc4
--- /dev/null
+++ b/include/Unknown/UnkStruct_02037628.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+#include <nds/math.h>
+
+struct UnkStruct_02037628 {
+    /* 00 */ PAD(0x00, 0x0c);
+    /* 0c */ u8 mUnk_0c;
+    /* 0d */ PAD(0x0d, 0x14);
+    /* 14 */ u8 mUnk_14;
+    /* 15 */ u8 mUnk_15;
+    /* 15 */ u8 mUnk_16;
+    /* 17 */
+
+    void func_02037628();
+    void func_020376c0(Vec3p *pos);
+};
diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp
index 1448176a..98720725 100644
--- a/include/Unknown/UnkStruct_020397f8.hpp
+++ b/include/Unknown/UnkStruct_020397f8.hpp
@@ -152,20 +152,21 @@ public:
     MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4);
     //! TODO: remove the function declarations that are not overridden
     /* 00 */ virtual ~MsgProc_Type3();
-    /* 08 */ virtual void vfunc_08(unk32 *param_2, unk32 *param_3) override;
-    /* 0c */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
-    /* 10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
+    //! TODO: Fix these overrides, they don't match base class
+    // /* 08 */ virtual void vfunc_08(unk32 *param_2, unk32 *param_3) override;
+    // /* 0c */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
+    // /* 10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
     /* 14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
-    /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param_2, unk32 param_3, unk32 param_4) override;
-    /* 1c */ virtual unk32 vfunc_1C(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) override;
-    /* 20 */ virtual void vfunc_20(void) override;
-    /* 24 */ virtual void vfunc_24(void) override;
+    // /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param_2, unk32 param_3, unk32 param_4) override;
+    // /* 1c */ virtual unk32 vfunc_1C(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) override;
+    // /* 20 */ virtual void vfunc_20(void) override;
+    // /* 24 */ virtual void vfunc_24(void) override;
     /* 28 */ virtual bool vfunc_28(void) override;
     /* 2c */ virtual void vfunc_2C(void) override;
     /* 30 */ virtual void vfunc_30(void) override;
     /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override;
     /* 38 */ virtual bool vfunc_38(void) override;
-    /* 3c */ virtual void vfunc_3C(unk32 param_2) override;
+    /* 3c */ virtual void vfunc_3C(u16 *param_2) override;
     /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
     /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
     /* 48 */ virtual void vfunc_48(void) override;
diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp
index 7cb67a00..7ad62946 100644
--- a/include/Unknown/UnkStruct_0203dae0.hpp
+++ b/include/Unknown/UnkStruct_0203dae0.hpp
@@ -105,7 +105,7 @@ public:
     //! TODO: fake?
     /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override;
     /* 38 */ virtual bool vfunc_38(void) override;
-    /* 3c */ virtual void vfunc_3C(unk32 param_2) override;
+    /* 3c */ virtual void vfunc_3C(u16 *param_2) override;
     /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
     /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
     /* 48 */ virtual void vfunc_48(void) override;
diff --git a/include/Unknown/UnkStruct_027e0dbc.hpp b/include/Unknown/UnkStruct_027e0dbc.hpp
index a5697c80..dc80545f 100644
--- a/include/Unknown/UnkStruct_027e0dbc.hpp
+++ b/include/Unknown/UnkStruct_027e0dbc.hpp
@@ -5,6 +5,12 @@
 
 #include "Game/GameMode.hpp"
 
+struct UnkStruct_027e0dbc_24 {
+    /* 00 */ PAD(0x00, 0x0b);
+    /* 0b */ u8 mUnk_0b;
+    /* 0c */
+};
+
 class UnkStruct_027e0dbc {
 public:
     /* 00 */ unk32 mUnk_00;
@@ -16,7 +22,7 @@ public:
     /* 18 */ unk32 mUnk_18;
     /* 1c */ unk32 mUnk_1c;
     /* 20 */ unk32 mUnk_20;
-    /* 24 */ unk32 mUnk_24;
+    /* 24 */ UnkStruct_027e0dbc_24 *mUnk_24;
     /* 28 */ unk32 mUnk_28;
     /* 2c */ unk32 mUnk_2c;
 
@@ -26,8 +32,9 @@ public:
     void func_ov000_0207b9dc();
     void func_ov000_0207b9c8();
     void func_ov000_0207b988(GameModeId modeId);
+    UnkStruct_027e0dbc_24 *GetUnk_24();
 
-    unk32 func_ov003_020f3d5c(unk32 param1);
+    bool func_ov003_020f3d5c(unk32 param1);
     void func_ov003_020f3d74(unk32 param1);
 };