d_a_obj_sword matching (#2349)

* d_a_obj_sword matching

* d_a_obj_sword -- Addressed PR comments

Author: samchat5

configure.py

@@ -2081,7 +2081,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_obj_swLight"),
     ActorRel(NonMatching, "d_a_obj_swchain"),
     ActorRel(Equivalent, "d_a_obj_swhang"), # vtable order
-    ActorRel(NonMatching, "d_a_obj_sword"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sword"),
     ActorRel(NonMatching, "d_a_obj_swpush2"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swspinner"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swturn"),

include/d/actor/d_a_obj_sword.h

@@ -1,7 +1,7 @@
 #ifndef D_A_OBJ_SWORD_H
 #define D_A_OBJ_SWORD_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "d/actor/d_a_itembase.h"
 
 /**
  * @ingroup actors-objects
@@ -11,25 +11,30 @@
  * @details
  *
  */
-class daObjSword_c : public fopAc_ac_c {
+class daObjSword_c : public daItemBase_c {
 public:
     /* 80CFD558 */ void initBaseMtx();
     /* 80CFD594 */ void setBaseMtx();
-    /* 80CFD600 */ void Create();
-    /* 80CFD67C */ void create();
-    /* 80CFDA14 */ void actionWait();
-    /* 80CFDA8C */ void initActionOrderGetDemo();
-    /* 80CFDB04 */ void actionOrderGetDemo();
-    /* 80CFDB80 */ void actionGetDemo();
-    /* 80CFDC1C */ void execute();
-    /* 80CFDD18 */ void draw();
-    /* 80CFDD6C */ void _delete();
+    /* 80CFD600 */ int Create();
+    /* 80CFD67C */ cPhs__Step create();
+    /* 80CFDA14 */ int actionWait();
+    /* 80CFDA8C */ int initActionOrderGetDemo();
+    /* 80CFDB04 */ int actionOrderGetDemo();
+    /* 80CFDB80 */ int actionGetDemo();
+    /* 80CFDC1C */ int execute();
+    /* 80CFDD18 */ int draw();
+    /* 80CFDD6C */ int _delete();
+
+    u8 getItemBit() { return fopAcM_GetParamBit(this, 0, 8); }
+    u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); }
+    void setStatus(u8 status) { mStatus = status; }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x938 - 0x568];
+    /* 0x92c */ u32 field_0x92c;
+    /* 0x930 */ fpc_ProcID mProcID;
+    /* 0x934 */ u8 mStatus;
 };
 
 STATIC_ASSERT(sizeof(daObjSword_c) == 0x938);
 
-
 #endif /* D_A_OBJ_SWORD_H */