Skip to content

Commit 3758c1f

Browse files
author
‎ ‎ ‎
committed
d_a_gnd - 99% matching
1 parent 311717d commit 3758c1f

File tree

3 files changed

+2725
-85
lines changed

3 files changed

+2725
-85
lines changed

‎include/d/actor/d_a_gnd.h‎

Lines changed: 121 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,131 @@
11
#ifndef D_A_GND_H
22
#define D_A_GND_H
33

4+
#include "JSystem/JParticle/JPAEmitter.h"
5+
#include "d/d_bg_s_acch.h"
6+
#include "d/d_cc_d.h"
7+
#include "d/d_particle.h"
48
#include "f_op/f_op_actor.h"
9+
#include "m_Do/m_Do_ext.h"
510

611
struct gnd_ke_s {
7-
8-
};
12+
/* 0x000 */ cXyz m000[20];
13+
/* 0x0F0 */ cXyz m0F0[20];
14+
}; // Size: 0x1E0
915

10-
class gnd_class : public fopEn_enemy_c {
11-
public:
12-
/* 0x02AC */ u8 m02AC[0x13CF - 0x02AC];
13-
/* 0x13CF */ u8 mNextParryOpeningType;
14-
/* 0x13D0 */ u8 m13D0;
15-
/* 0x13D1 */ u8 m13D1;
16-
/* 0x13D2 */ u8 m13D2[0x15E4 - 0x13D2];
17-
};
18-
19-
class daGnd_HIO_c {
20-
public:
21-
daGnd_HIO_c();
16+
struct gnd_class {
17+
enum Move_Type_e {
18+
Move_Type_MOVE0_e = 0,
19+
Move_Type_ATTACK0_e = 1,
20+
Move_Type_ATTACK1_e = 2,
21+
Move_Type_ATTACK2_e = 3,
22+
Move_Type_ATTACKPZ_e = 4,
23+
Move_Type_ATTACK_LAST_e = 5,
24+
Move_Type_DEFENCE0_e = 10,
25+
Move_Type_DAMAGE_e = 11,
26+
Move_Type_DEMOWAIT_e = 20,
27+
Move_Type_YAWAIT_e = 21,
28+
Move_Type_FINISH_e = 30,
29+
};
2230

23-
public:
24-
/* Place member variables here */
25-
};
31+
/* 0x0000 */ fopEn_enemy_c actor;
32+
/* 0x02AC */ request_of_phase_process_class mPhase;
33+
/* 0x02B4 */ u8 m02B4;
34+
/* 0x02B5 */ u8 m02B5[0x02B8 - 0x02B5];
35+
/* 0x02B8 */ mDoExt_McaMorf* mpMorf;
36+
/* 0x02BC */ mDoExt_btkAnm* m02BC;
37+
/* 0x02C0 */ mDoExt_brkAnm* m02C0;
38+
/* 0x02C4 */ mDoExt_btpAnm* m02C4;
39+
/* 0x02C8 */ u32 m02C8;
40+
/* 0x02CC */ s16 m02CC;
41+
/* 0x02CE */ s16 mMoveType;
42+
/* 0x02D0 */ s16 mAnmType;
43+
/* 0x02D2 */ u8 m02D2[0x02D4 - 0x02D2];
44+
/* 0x02D4 */ cXyz m02D4;
45+
/* 0x02E0 */ cXyz m02E0;
46+
/* 0x02EC */ u8 m02EC[0x02F0 - 0x02EC];
47+
/* 0x02F0 */ f32 m02F0;
48+
/* 0x02F4 */ f32 m02F4;
49+
/* 0x02F8 */ f32 m02F8;
50+
/* 0x02FC */ u8 m02FC[0x0302 - 0x02FC];
51+
/* 0x0302 */ s16 m0302[2]; // 0 = mDamageTimer
52+
/* 0x0306 */ u8 m0306[0x30C - 0x0306];
53+
/* 0x030C */ s16 mDamageInvulnerabilityTimer1;
54+
/* 0x030E */ s16 mDamageInvulnerabilityTimer2;
55+
/* 0x0310 */ f32 m0310;
56+
/* 0x0314 */ s16 m0314;
57+
/* 0x0316 */ u8 m0316[0x0318 - 0x0316];
58+
/* 0x0318 */ s16 m0318;
59+
/* 0x031A */ s16 m031A;
60+
/* 0x031C */ s8 m031C;
61+
/* 0x031D */ u8 m031D[0x0320 - 0x031D];
62+
/* 0x0320 */ dKy_tevstr_c m0320;
63+
/* 0x03D0 */ u8 m03A6[0x03D4 - 0x03D0];
64+
/* 0x03D4 */ s8 m03D4;
65+
/* 0x03D5 */ s8 mBlockHitCount;
66+
/* 0x03D6 */ s8 mBlockHit;
67+
/* 0x03D7 */ s8 m03D7;
68+
/* 0x03D8 */ s8 m03D8;
69+
/* 0x03D9 */ s8 m03D9;
70+
/* 0x03DA */ s8 m03DA;
71+
/* 0x03DB */ s8 m03DB;
72+
/* 0x03DC */ s8 m03DC;
73+
/* 0x03DD */ u8 m03DD[0x03DE - 0x03DD];
74+
/* 0x03DE */ s16 m03DE;
75+
/* 0x03E0 */ f32 m03E0;
76+
/* 0x03E4 */ gnd_ke_s m03E4[4];
77+
/* 0x0B64 */ mDoExt_3DlineMat0_c m0B64;
78+
/* 0x0B80 */ dBgS_AcchCir mAcchCir;
79+
/* 0x0BC0 */ dBgS_ObjAcch mAcch;
80+
/* 0x0D84 */ dCcD_Stts mStts;
81+
/* 0x0DC0 */ dCcD_Cyl mDamageCyl;
82+
/* 0x0EF0 */ dCcD_Sph mHeadSph;
83+
/* 0x101C */ dCcD_Sph mChestSph;
84+
/* 0x1148 */ dCcD_Sph mSwordSphs[2];
85+
/* 0x13A0 */ cXyz m13A0[2];
86+
/* 0x13B8 */ s8 m13B8[2];
87+
/* 0x13B8 */ u8 m13BA[0x13BC - 0x13BA];
88+
/* 0x13BC */ s32 m13BC[2];
89+
/* 0x13C4 */ f32 m13C4[2];
90+
/* 0x13CC */ s8 m13CC[2];
91+
/* 0x13CE */ s8 m13CE;
92+
/* 0x13CF */ u8 mNextParryOpeningType;
93+
/* 0x13D0 */ s8 mParryTimer;
94+
/* 0x13D1 */ s8 m13D1;
95+
/* 0x13D2 */ u8 m13D2[0x13D4 - 0x13D2];
96+
/* 0x13D4 */ JPABaseEmitter* mpAttackEffEmitter[5];
97+
/* 0x13E8 */ u8 m13E8[0x13EC - 0x13E8];
98+
/* 0x13EC */ JPABaseEmitter* m13EC;
99+
/* 0x13F0 */ JPABaseEmitter* m13F0[2];
100+
/* 0x13F8 */ s16 m13F8[2];
101+
/* 0x13FC */ u8 m13FC[0x1426 - 0x13FC];
102+
/* 0x1426 */ s16 m1426;
103+
/* 0x1428 */ f32 m1428;
104+
/* 0x142C */ s16 m142C;
105+
/* 0x142E */ s16 m142E;
106+
/* 0x1430 */ JPABaseEmitter* m1430[2];
107+
/* 0x1438 */ u8 m1438[0x14A8 - 0x1438];
108+
/* 0x14A8 */ cXyz m14A8[15];
109+
/* 0x155C */ s16 m155C;
110+
/* 0x155E */ s16 m155E;
111+
/* 0x1560 */ s16 m1560;
112+
/* 0x1562 */ s8 m1562;
113+
/* 0x1563 */ u8 m1563[0x1564 - 0x1563];
114+
/* 0x1564 */ cXyz m1564;
115+
/* 0x1570 */ cXyz m1570;
116+
/* 0x157C */ cXyz m157C;
117+
/* 0x1588 */ cXyz m1588;
118+
/* 0x1594 */ u8 m1594[0x15A0 - 0x1594];
119+
/* 0x15A0 */ f32 m15A0;
120+
/* 0x15A4 */ f32 m15A4;
121+
/* 0x15A8 */ f32 m15A8;
122+
/* 0x15AC */ f32 m15AC;
123+
/* 0x15B0 */ u8 m15B0;
124+
/* 0x15B0 */ u8 m15B1[0x15B4 - 0x15B1];
125+
/* 0x15B4 */ dPa_rippleEcallBack m15B4;
126+
/* 0x15C8 */ cXyz m15C8[2];
127+
/* 0x15E0 */ u8 m15E0;
128+
/* 0x15E1 */ u8 m15E1[0x15E4 - 0x15E1];
129+
}; // Size: 0x15E4
26130

27131
#endif /* D_A_GND_H */

‎include/d/actor/d_a_pz.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ class daPz_c : public fopNpc_npc_c {
107107
/* 0x06D6 */ u8 m06D6[0x073E - 0x06D6];
108108
/* 0x073E */ u8 mbEyesFollowGanondorf;
109109
/* 0x073F */ u8 m073F;
110-
/* 0x0740 */ u8 m0740[0x076C - 0x0740];
110+
/* 0x0740 */ s8 m0740;
111+
/* 0x0741 */ u8 m0741[0x076C - 0x0741];
111112
/* 0x076C */ request_of_phase_process_class mPhs;
112113
/* 0x0774 */ u32 m0774;
113114
/* 0x0778 */ mDoExt_invisibleModel mInvisibleModel;

0 commit comments

Comments
 (0)