d_a_npc_shop_maro mostly matching

configure.py

@@ -1728,7 +1728,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_npc_shaman"),
     ActorRel(NonMatching, "d_a_npc_shoe"),
     ActorRel(NonMatching, "d_a_npc_shop0"),
-    ActorRel(NonMatching, "d_a_npc_shop_maro"),
+    ActorRel(Equivalent, "d_a_npc_shop_maro"),
     ActorRel(NonMatching, "d_a_npc_sola"),
     ActorRel(NonMatching, "d_a_npc_soldierA"),
     ActorRel(NonMatching, "d_a_npc_soldierB"),

include/d/actor/d_a_npc_shop_maro.h

@@ -1,7 +1,7 @@
 #ifndef D_A_NPC_SHOP_MARO_H
 #define D_A_NPC_SHOP_MARO_H
 
-#include "d/actor/d_a_npc.h"
+#include "d/d_shop_system.h"
 
 /**
  * @ingroup actors-npcs
@@ -11,14 +11,11 @@
  * @details
  *
  */
-class daNpc_shopMaro_c : public fopAc_ac_c {
+class daNpc_shopMaro_c : public dShopSystem_c {
 public:
-    /* 80AEBEB4 */ void create();
+    /* 80AEBEB4 */ int create();
     /* 80AEBF04 */ daNpc_shopMaro_c();
-    /* 80AEBF64 */ ~daNpc_shopMaro_c();
-
-private:
-    /* 0x568 */ u8 field_0x568[0xf7c - 0x568];
+    /* 80AEBF64 */ virtual ~daNpc_shopMaro_c();
 };
 
 STATIC_ASSERT(sizeof(daNpc_shopMaro_c) == 0xf7c);

include/d/d_shop_camera.h

@@ -60,15 +60,16 @@ struct ShopCam_action_c {
     /* 0xA4 */ cXyz field_0xa4;
     /* 0xB0 */ cXyz field_0xb0;
     /* 0xBC */ f32 field_0xbc;
-    /* 0x94 */ f32 field_0xc0;
-    /* 0x94 */ f32 field_0xc4;
-    /* 0x94 */ f32 field_0xc8;
-    /* 0x94 */ f32 field_0xcc;
-    /* 0x94 */ f32 field_0xd0;
+    /* 0xC0 */ f32 field_0xc0;
+    /* 0xC4 */ f32 field_0xc4;
+    /* 0xC8 */ f32 field_0xc8;
+    /* 0xCC */ f32 field_0xcc;
+    /* 0xD0 */ s16 field_0xd0;
+    /* 0xD2 */ s16 field_0xd2;
     /* 0xD4 */ s16 field_0xd4;
     /* 0xD6 */ s16 field_0xd6;
     /* 0xD8 */ s16 field_0xd8;
-    /* 0xD8 */ bool field_0xda;
+    /* 0xDA */ bool field_0xda;
 };
 
 #endif /* D_SHOP_D_SHOP_CAMERA_H */

include/d/d_shop_system.h

@@ -28,6 +28,44 @@ class dShopSystem_c : public daNpcT_c {
         ITEM_MAX_e = 7,
     };
 
+    dShopSystem_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
+             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, daNpcT_evtData_c const* param_7,
+             char** param_8) : daNpcT_c(param_1,param_2,param_3,param_4,param_5,param_6,param_7,param_8) {
+
+            mShopCamAction.field_0xc0 = 0.25f;
+            mShopCamAction.field_0xc4 = 20.0f;
+            mShopCamAction.field_0xc8 = 0.25f;
+            mShopCamAction.field_0xcc = 5.0f;
+            mShopCamAction.field_0xda = true;
+            mShopCamAction.field_0xd0 = 0;
+            mShopCamAction.field_0xd2 = 0;
+            mShopCamAction.field_0xd4 = -1;
+            mShopCamAction.field_0xd6 = 0;
+            mShopCamAction.field_0x7c.x = 0.0f;
+            mShopCamAction.field_0x7c.y = 0.0f;
+            mShopCamAction.field_0x7c.z = 0.0f;
+            mShopCamAction.field_0x88.x = 0.0f;
+            mShopCamAction.field_0x88.y = 0.0f;
+            mShopCamAction.field_0x88.z = 100.0f;
+            mShopCamAction.field_0x94 = 60.0f;
+            mShopCamAction.field_0xb0.x = 0.0f;
+            mShopCamAction.field_0xb0.y = 0.0f;
+            mShopCamAction.field_0xb0.z = 0.0f;
+            mShopCamAction.field_0xd8 = 0;
+            mShopCamAction.field_0x18 = NULL;
+            mShopCamAction.field_0x24 = NULL;
+            mShopCamAction.field_0x20 = NULL;
+            mShopCamAction.field_0x1c = NULL;
+            mShopCamAction.field_0x30 = NULL;
+            mShopCamAction.field_0x2c = NULL;
+            mShopCamAction.field_0x28 = NULL;
+            mShopCamAction.field_0x34 = NULL;
+            mShopCamAction.mCamAction = NULL;
+            initShopSystem();
+
+    }
+
     /* 80197338 */ void initShopSystem();
     /* 801975C0 */ void onFlag(int);
     /* 801975DC */ void offFlag(int);