Miscellaneous match improvements (#2562)

Author: caseif

configure.py

@@ -1863,7 +1863,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_npc_ykm"),
     ActorRel(NonMatching, "d_a_npc_ykw"),
     ActorRel(NonMatching, "d_a_npc_zanb"),
-    ActorRel(NonMatching, "d_a_npc_zant"),
+    ActorRel(Equivalent, "d_a_npc_zant"), # weak func order
     ActorRel(NonMatching, "d_a_npc_zelR"),
     ActorRel(NonMatching, "d_a_npc_zelRo"),
     ActorRel(Equivalent, "d_a_npc_zelda"), # weak function order
@@ -2029,7 +2029,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_obj_lv6Tenbin"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv6TogeRoll"),
     ActorRel(NonMatching, "d_a_obj_lv6TogeTrap"),
-    ActorRel(NonMatching, "d_a_obj_lv6bemos"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv6bemos"),
     ActorRel(NonMatching, "d_a_obj_lv6bemos2"),
     ActorRel(NonMatching, "d_a_obj_lv6egate"),
     ActorRel(NonMatching, "d_a_obj_lv6elevta"),

include/d/actor/d_a_mant.h

@@ -11,24 +11,42 @@
  */
 
 class daMant_packet_c : public J3DPacket {
-    public:
-        /* 80861298 */ void draw();
-        /* 80862BA4 */ ~daMant_packet_c();
+public:
+    /* 80861298 */ void draw();
+    /* 80862BA4 */ ~daMant_packet_c();
+
+    /* 0x0010 */ Mtx mMtx;
+    /* 0x0040 */ Mtx mMtx2;
+    /* 0x0070 */ dKy_tevstr_c* mTevStr;
+    /* 0x0074 */ u8 field_0x74;
+    /* 0x0078 */ cXyz mPos[2][169];
+    /* 0x1050 */ cXyz mNrm[2][169];
+    /* 0x2028 */ u8 field_0x2028;
+    /* 0x2029 */ u8 mArg0;
+
+    daMant_packet_c() {
+        field_0x74 = 0;
+    }
+
+    cXyz* getPos() {
+        return &mPos[field_0x74][0];
+    }
+
+    cXyz* getNrm() {
+        return &mNrm[field_0x74][0];
+    }
+
+    void setTevStr(dKy_tevstr_c* tevStr) {
+        mTevStr = tevStr;
+    }
 
-        /* 0x0010 */ Mtx mMtx;
-        /* 0x0040 */ Mtx mMtx2;
-        /* 0x0070 */ dKy_tevstr_c* field_0x70;
-        /* 0x0074 */ u8 field_0x74;
-        /* 0x0075 */ u8 field_0x75[0x78 - 0x75];
-        /* 0x0078 */ cXyz mPos[338];
-        /* 0x1050 */ cXyz mNrm[338];
-        /* 0x2028 */ u8 field_0x2028;
-        /* 0x2029 */ u8 mArg0;
-        /* 0x202a */ u8 field_0x202a[0x202b - 0x202a];
+    MtxP getMtx2() {
+        return mMtx2;
+    }
 
-        cXyz* getPos() {
-            return this->mPos + this->field_0x74 * 0xa9;
-        }
+    MtxP getMtx() {
+        return mMtx;
+    }
 };
 struct mant_j_s {
     public:

include/d/actor/d_a_npc_zant.h

@@ -60,7 +60,7 @@ class daNpc_Zant_c : public daNpcT_c {
     static cutFunc mCutList[1];
 
 private:
-    /* 0xE40 */ u8 field_0xe40[0xe44- 0xe40];
+    /* 0xE40 */ u8 field_0xe40[0xe44 - 0xe40];
     /* 0xE44 */ dCcD_Cyl mCyl;
     /* 0xF80 */ u8 mType;
     /* 0xF81 */ u8 field_0xf81[0xf84 - 0xf81];
@@ -73,7 +73,7 @@ STATIC_ASSERT(sizeof(daNpc_Zant_c) == 0xfa0);
 
 class daNpc_Zant_Param_c {
 public:
-    /* 80B6E93C */ ~daNpc_Zant_Param_c() {};
+    /* 80B6E93C */ virtual ~daNpc_Zant_Param_c() {}
     struct Data {
         /* 0x00 */ f32 field_0x0;
         /* 0x04 */ f32 field_0x4;
@@ -112,11 +112,19 @@ class daNpc_Zant_Param_c {
         /* 0x7C */ f32 field_0x7c;
         /* 0x80 */ f32 field_0x80;
         /* 0x84 */ f32 field_0x84;
-        /* 0x88 */ f32 field_0x88;        
+        /* 0x88 */ f32 field_0x88;
     };
 
     static const Data m;
 };
 
+class daNpc_Zant_HIO_c {
+public:
+    virtual ~daNpc_Zant_HIO_c() {}
+
+#if DEBUG
+    daNpc_Zant_Param_c::Data param;
+#endif
+};
 
 #endif /* D_A_NPC_ZANT_H */

include/d/actor/d_a_tag_kmsg.h

@@ -70,7 +70,7 @@ struct daTag_KMsg_c : public fopAc_ac_c {
     }
 
     u32 getTalkAngle() {
-        u32 talkAngle = (fopAcM_GetParam(this) & 0xe0) >> 5;
+        u32 talkAngle = (fopAcM_GetParam(this) >> 5) & 0x7;
         if (talkAngle == 7) {
             return 0;
         } else {

include/m_Do/m_Do_mtx.h

@@ -100,6 +100,10 @@ inline void cMtx_multVecArray(Mtx mtx, const Vec* src, Vec* dst, u32 count) {
     mDoMtx_multVecArray(mtx, src, dst, count);
 }
 
+inline void cMtx_inverseTranspose(const Mtx a, Mtx b) {
+    mDoMtx_inverseTranspose(a, b);
+}
+
 inline void mDoMtx_multVecZero(CMtxP param_0, Vec* param_1) {
     param_1->x = param_0[0][3];
     param_1->y = param_0[1][3];