From d0f89e41b1c2dd8b434cf8a63278757b4fc8b84f Mon Sep 17 00:00:00 2001
From: Carco_21 <144170194+carter-ktb21@users.noreply.github.com>
Date: Sat, 22 Mar 2025 05:16:25 -0400
Subject: d_a_mant almost done (#2335)

* d_a_mant Create almost equivalent

* Work on mant_move

* Remade d_a_mant branch

* d_a_mant ~76% matching

* daMant_packet_c::draw() 69% matching

* d_a_mant data matching and joint_control over 50% matching

* daMant_Execute looking better

* d_a_mant 92% equivalent

* Removed commented rodata
---
 include/d/actor/d_a_mant.h | 69 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/d/actor/d_a_mant.h b/include/d/actor/d_a_mant.h
index 21556b0afa..b1304a3c89 100644
--- a/include/d/actor/d_a_mant.h
+++ b/include/d/actor/d_a_mant.h
@@ -6,14 +6,59 @@
 /**
  * @ingroup actors-unsorted
  * @class mant_class
- * @brief ???
- *
- * @details Related to Ganondorf Horseback Battle
+ * @brief Ganondorf's Cloak
  *
  */
+
+class daMant_packet_c : public J3DPacket {
+    public:
+        /* 80861298 */ void draw();
+        /* 80862BA4 */ ~daMant_packet_c();
+
+        /* 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];
+
+        cXyz* getPos() {
+            return this->mPos + this->field_0x74 * 0xa9;
+        }
+};
+struct mant_j_s {
+    public:
+        /* 80862AC0 */ ~mant_j_s();
+        /* 80862B3C */ mant_j_s();
+    
+        /* 0x0000 */ cXyz field_0x0[13];
+        /* 0x009C */ cXyz field_0x9c[13];
+        /* 0x0138 */ s16 field_0x0138;
+        /* 0x013A */ s16 field_0x013a;
+        /* 0x013C */ u8 field_0x013C[0x174 - 0x13C];
+        /* 0x0174 */ f32 field_0x0174;
+        /* 0x0178 */ f32 field_0x0178;
+        /* 0x017C */ f32 field_0x017c;
+};
 class mant_class : public fopAc_ac_c {
 public:
-    /* 0x0568 */ u8 field_0x568[0x395c - 0x568];
+    /* 0x0568 */ u8 field_0x568[0x570 - 0x568];
+    /* 0x0570 */ daMant_packet_c field_0x0570;
+    /* 0x259C */ u8 field_0x259c;
+    /* 0x259D */ u8 field_0x259D[0x25A0 - 0x259D];
+    /* 0x25A0 */ u32 field_0x25a0;
+    /* 0x2595 */ u8 field_0x25A5[0x25A8 - 0x25A5];
+    /* 0x25A8 */ mant_j_s field_0x25a8[13];
+    /* 0x3928 */ cXyz field_0x3928[2];
+    /* 0x3940 */ cXyz field_0x3940;
+    /* 0x394C */ f32 field_0x394c;
+    /* 0x3950 */ f32 field_0x3950;
+    /* 0x3954 */ f32 field_0x3954;
+    /* 0x3958 */ f32 field_0x3958;
     /* 0x395C */ f32 field_0x395c;
     /* 0x3960 */ f32 field_0x3960;
     /* 0x3964 */ u8 field_0x3964;
@@ -22,22 +67,12 @@ public:
     /* 0x3967 */ u8 field_0x3967;
     /* 0x3968 */ u8 field_0x3968;
     /* 0x3969 */ u8 field_0x3969;
-    /* 0x396A */ u8 field_0x396A[0x39a4 - 0x396A];
+    /* 0x396A */ u8 field_0x396A[0x399E - 0x396A];
+    /* 0x399E */ s16 field_0x399e;
+    /* 0x39A0 */ u8 field_0x39A0[0x39A4 - 0x39A0];
     
 };
 
 STATIC_ASSERT(sizeof(mant_class) == 0x39a4);
 
-class daMant_packet_c : public fopAc_ac_c {
-public:
-    /* 80861298 */ void draw();
-    /* 80862BA4 */ ~daMant_packet_c();
-};
-
-struct mant_j_s {
-public:
-    /* 80862AC0 */ ~mant_j_s();
-    /* 80862B3C */ mant_j_s();
-};
-
 #endif /* D_A_MANT_H */
-- 
cgit v1.2.3