ActorItemSeller OK (#164)

4 files changed, 41 insertions, 29 deletions

diff --git a/include/Actor/ActorTypeId.hpp b/include/Actor/ActorTypeId.hpp
index b0c6a5ee..fc4a5b23 100644
--- a/include/Actor/ActorTypeId.hpp
+++ b/include/Actor/ActorTypeId.hpp
@@ -32,6 +32,10 @@ enum ActorTypeId_ {
     ActorTypeId_ShopItemGem            = 'ITSR',
     ActorTypeId_ShopItemTreasure       = 'ITTR',
 
+    ActorTypeId_ItemSeller1 = 'ITSN',
+    ActorTypeId_ItemSeller2 = 'ITS2',
+    ActorTypeId_ItemSeller3 = 'ITS3',
+
     ActorTypeId_RefillArrows   = 'FLAL',
     ActorTypeId_RefillBombs    = 'FLBM',
     ActorTypeId_RefillBombchus = 'FLBT',
diff --git a/include/Actor/Character/ActorCharacter.hpp b/include/Actor/Character/ActorCharacter.hpp
index c39e893e..b35f5a66 100644
--- a/include/Actor/Character/ActorCharacter.hpp
+++ b/include/Actor/Character/ActorCharacter.hpp
@@ -159,13 +159,19 @@ struct ActorCharacter_1d8_248 {
     }
 };
 
+struct ActorCharacter_1d8_230 {
+    /* 00 */ char mUnk_00[16];
+    /* 10 */ unk32 mUnk_10;
+    /* 14 */
+};
+
 class ActorCharacter_1d8 : public UnkStruct_ov000_020c5c2c {
 public:
     /* 000 (base) */
     /* 020 */ ActorCharacterModel mUnk_020;
     /* 0b0 */ ActorCharacter_1d8_b0 mUnk_0b0[2];
     /* 1b0 */ ActorCharacter_1d8_b0 mUnk_1b0;
-    /* 230 */ unk32 mUnk_230;
+    /* 230 */ const ActorCharacter_1d8_230 *mUnk_230;
     /* 234 */ unk32 mUnk_234;
     /* 238 */ unk32 mUnk_238;
     /* 23c */ unk32 mUnk_23c;
@@ -186,6 +192,7 @@ public:
         mUnk_240(0x1000),
         mUnk_244(0x11f) {}
 
+    void func_ov014_02145a74(unk32 param1, unk32 param2);
     void func_ov014_02145cac();
     void func_ov014_02145e48(unk32 param1);
     bool func_ov014_02145f0c(unk32 param1);
@@ -232,7 +239,7 @@ public:
     /* cc */ virtual void vfunc_cc() override;
     /* d0 */ virtual void vfunc_d0() override;
     /* ec */ virtual void vfunc_ec(unk32 param1);
-    /* f0 */ virtual void vfunc_f0(unk32 param1, unk32 param2);
+    /* f0 */ virtual void vfunc_f0(bool param1, unk32 param2);
     /* f4 */
 
     ActorCharacter();
@@ -246,7 +253,7 @@ public:
     bool func_ov014_02144e74();
 
     void func_ov014_02145178();
-    void func_ov014_021451f0(unk32 *param1);
+    void func_ov014_021451f0(const unk32 *param1);
     void func_ov014_02145258();
     unk32 func_ov014_021452b0();
     unk32 func_ov014_02145318();
@@ -290,7 +297,7 @@ public:
 
     /* 00 */ virtual ~ActorGenericCharacter() override;
     /* 08 */ virtual bool Init() override;
-    /* 68 */ virtual void vfunc_68() override;
+    /* 68 */ virtual void vfunc_68(unk32 param1, UnkStruct_020397f8 *param2) override;
     /* 80 */ virtual void vfunc_80() override;
     /* 84 */ virtual void vfunc_84() override;
     /* c0 */ virtual bool vfunc_c0() override;
diff --git a/include/Actor/Character/ActorItemSeller.hpp b/include/Actor/Character/ActorItemSeller.hpp
index 26ce1ad6..2440b4ce 100644
--- a/include/Actor/Character/ActorItemSeller.hpp
+++ b/include/Actor/Character/ActorItemSeller.hpp
@@ -27,16 +27,16 @@ public:
     /* 0c0 */ virtual bool vfunc_c0() override;
     /* 0c4 */ virtual void vfunc_c4() override;
     /* 0d4 */ virtual unk32 vfunc_d4() override;
-    /* 0f4 */ virtual void vfunc_f4()               = 0;
-    /* 0f8 */ virtual void vfunc_f8()               = 0;
-    /* 0fc */ virtual void vfunc_fc()               = 0;
-    /* 100 */ virtual void vfunc_100()              = 0;
-    /* 104 */ virtual void vfunc_104()              = 0;
-    /* 108 */ virtual void vfunc_108()              = 0;
-    /* 10c */ virtual void vfunc_10c()              = 0;
-    /* 110 */ virtual void vfunc_110()              = 0;
-    /* 114 */ virtual unk32 vfunc_114(unk32 param1) = 0;
-    /* 118 */ virtual void vfunc_118()              = 0;
+    /* 0f4 */ virtual unk32 GetPromptMessage()         = 0;
+    /* 0f8 */ virtual unk32 GetPurchaseMessage()       = 0;
+    /* 0fc */ virtual unk32 GetNotEnoughMoneyMessage() = 0;
+    /* 100 */ virtual unk32 GetGoodbyeMessage()        = 0;
+    /* 104 */ virtual unk32 GetInventoryFullMessage()  = 0;
+    /* 108 */ virtual void vfunc_108()                 = 0;
+    /* 10c */ virtual void vfunc_10c(bool param1)      = 0;
+    /* 110 */ virtual void vfunc_110()                 = 0;
+    /* 114 */ virtual unk32 vfunc_114(unk32 param1)    = 0;
+    /* 118 */ virtual bool vfunc_118()                 = 0;
     /* 11c */ virtual bool vfunc_11c();
     /* 120 */
 
@@ -71,19 +71,19 @@ class ActorItemSeller : public ActorItemSellerBase {
     /* 000 (base) */
     /* 484 */
 
-    /* 000 */ virtual ~ActorItemSeller() override;
+    /* 000 (implicit dtor) */
     /* 008 */ virtual bool Init() override;
     /* 0d4 */ virtual unk32 vfunc_d4() override;
-    /* 0f4 */ virtual void vfunc_f4() override;
-    /* 0f8 */ virtual void vfunc_f8() override;
-    /* 0fc */ virtual void vfunc_fc() override;
-    /* 100 */ virtual void vfunc_100() override;
-    /* 104 */ virtual void vfunc_104() override;
+    /* 0f4 */ virtual unk32 GetPromptMessage() override;
+    /* 0f8 */ virtual unk32 GetPurchaseMessage() override;
+    /* 0fc */ virtual unk32 GetNotEnoughMoneyMessage() override;
+    /* 100 */ virtual unk32 GetGoodbyeMessage() override;
+    /* 104 */ virtual unk32 GetInventoryFullMessage() override;
     /* 108 */ virtual void vfunc_108() override;
-    /* 10c */ virtual void vfunc_10c() override;
+    /* 10c */ virtual void vfunc_10c(bool param1) override;
     /* 110 */ virtual void vfunc_110() override;
     /* 114 */ virtual unk32 vfunc_114(unk32 param1) override;
-    /* 118 */ virtual void vfunc_118() override;
+    /* 118 */ virtual bool vfunc_118() override;
     /* 120 */
 };
 
@@ -118,16 +118,16 @@ public:
     /* 0d8 */ virtual unk32 vfunc_d8(unk32 param1) override;
     /* 0dc */ virtual unk32 vfunc_dc(unk32 param1) override;
     /* 0e0 */ virtual unk32 vfunc_e0(unk32 param1) override;
-    /* 0f4 */ virtual void vfunc_f4() override;
-    /* 0f8 */ virtual void vfunc_f8() override;
-    /* 0fc */ virtual void vfunc_fc() override;
-    /* 100 */ virtual void vfunc_100() override;
-    /* 104 */ virtual void vfunc_104() override;
+    /* 0f4 */ virtual unk32 GetPromptMessage() override;
+    /* 0f8 */ virtual unk32 GetPurchaseMessage() override;
+    /* 0fc */ virtual unk32 GetNotEnoughMoneyMessage() override;
+    /* 100 */ virtual unk32 GetGoodbyeMessage() override;
+    /* 104 */ virtual unk32 GetInventoryFullMessage() override;
     /* 108 */ virtual void vfunc_108() override;
-    /* 10c */ virtual void vfunc_10c() override;
+    /* 10c */ virtual void vfunc_10c(bool param1) override;
     /* 110 */ virtual void vfunc_110() override;
     /* 114 */ virtual unk32 vfunc_114(unk32 param1) override;
-    /* 118 */ virtual void vfunc_118() override;
+    /* 118 */ virtual bool vfunc_118() override;
     /* 11c */ virtual bool vfunc_11c() override;
 
     static ActorBeedle *Create();
diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp
index 41dc85ce..b8140223 100644
--- a/include/Message/MsgProc.hpp
+++ b/include/Message/MsgProc.hpp
@@ -125,6 +125,7 @@ public:
     unk32 func_ov000_0207bc48();
     void func_ov000_0207bc9c();
 
+    bool func_ov018_02160a54(unk32);
     bool func_ov018_02160a64(unk32, unk32);
 };
 extern UnkClass_027e0e28 data_027e0e28;