Skip to content

Commit d0f89e4

Browse files
authored
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
1 parent 5a7b9f6 commit d0f89e4

File tree

2 files changed

+791
-768
lines changed

2 files changed

+791
-768
lines changed

include/d/actor/d_a_mant.h

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,59 @@
66
/**
77
* @ingroup actors-unsorted
88
* @class mant_class
9-
* @brief ???
10-
*
11-
* @details Related to Ganondorf Horseback Battle
9+
* @brief Ganondorf's Cloak
1210
*
1311
*/
12+
13+
class daMant_packet_c : public J3DPacket {
14+
public:
15+
/* 80861298 */ void draw();
16+
/* 80862BA4 */ ~daMant_packet_c();
17+
18+
/* 0x0010 */ Mtx mMtx;
19+
/* 0x0040 */ Mtx mMtx2;
20+
/* 0x0070 */ dKy_tevstr_c* field_0x70;
21+
/* 0x0074 */ u8 field_0x74;
22+
/* 0x0075 */ u8 field_0x75[0x78 - 0x75];
23+
/* 0x0078 */ cXyz mPos[338];
24+
/* 0x1050 */ cXyz mNrm[338];
25+
/* 0x2028 */ u8 field_0x2028;
26+
/* 0x2029 */ u8 mArg0;
27+
/* 0x202a */ u8 field_0x202a[0x202b - 0x202a];
28+
29+
cXyz* getPos() {
30+
return this->mPos + this->field_0x74 * 0xa9;
31+
}
32+
};
33+
struct mant_j_s {
34+
public:
35+
/* 80862AC0 */ ~mant_j_s();
36+
/* 80862B3C */ mant_j_s();
37+
38+
/* 0x0000 */ cXyz field_0x0[13];
39+
/* 0x009C */ cXyz field_0x9c[13];
40+
/* 0x0138 */ s16 field_0x0138;
41+
/* 0x013A */ s16 field_0x013a;
42+
/* 0x013C */ u8 field_0x013C[0x174 - 0x13C];
43+
/* 0x0174 */ f32 field_0x0174;
44+
/* 0x0178 */ f32 field_0x0178;
45+
/* 0x017C */ f32 field_0x017c;
46+
};
1447
class mant_class : public fopAc_ac_c {
1548
public:
16-
/* 0x0568 */ u8 field_0x568[0x395c - 0x568];
49+
/* 0x0568 */ u8 field_0x568[0x570 - 0x568];
50+
/* 0x0570 */ daMant_packet_c field_0x0570;
51+
/* 0x259C */ u8 field_0x259c;
52+
/* 0x259D */ u8 field_0x259D[0x25A0 - 0x259D];
53+
/* 0x25A0 */ u32 field_0x25a0;
54+
/* 0x2595 */ u8 field_0x25A5[0x25A8 - 0x25A5];
55+
/* 0x25A8 */ mant_j_s field_0x25a8[13];
56+
/* 0x3928 */ cXyz field_0x3928[2];
57+
/* 0x3940 */ cXyz field_0x3940;
58+
/* 0x394C */ f32 field_0x394c;
59+
/* 0x3950 */ f32 field_0x3950;
60+
/* 0x3954 */ f32 field_0x3954;
61+
/* 0x3958 */ f32 field_0x3958;
1762
/* 0x395C */ f32 field_0x395c;
1863
/* 0x3960 */ f32 field_0x3960;
1964
/* 0x3964 */ u8 field_0x3964;
@@ -22,22 +67,12 @@ class mant_class : public fopAc_ac_c {
2267
/* 0x3967 */ u8 field_0x3967;
2368
/* 0x3968 */ u8 field_0x3968;
2469
/* 0x3969 */ u8 field_0x3969;
25-
/* 0x396A */ u8 field_0x396A[0x39a4 - 0x396A];
70+
/* 0x396A */ u8 field_0x396A[0x399E - 0x396A];
71+
/* 0x399E */ s16 field_0x399e;
72+
/* 0x39A0 */ u8 field_0x39A0[0x39A4 - 0x39A0];
2673

2774
};
2875

2976
STATIC_ASSERT(sizeof(mant_class) == 0x39a4);
3077

31-
class daMant_packet_c : public fopAc_ac_c {
32-
public:
33-
/* 80861298 */ void draw();
34-
/* 80862BA4 */ ~daMant_packet_c();
35-
};
36-
37-
struct mant_j_s {
38-
public:
39-
/* 80862AC0 */ ~mant_j_s();
40-
/* 80862B3C */ mant_j_s();
41-
};
42-
4378
#endif /* D_A_MANT_H */

0 commit comments

Comments
 (0)