Skip to content

Commit 800049a

Browse files
authored
d_a_e_kg equivalent except for action (#2321)
* Initial work on d_a_e_kg * d_a_e_kg 57% matching * d_a_e_kg 83% done with regalloc issue in action function * d_a_e_kg equivalent except for action
1 parent 569344c commit 800049a

File tree

2 files changed

+742
-642
lines changed

2 files changed

+742
-642
lines changed

include/d/actor/d_a_e_kg.h

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef D_A_E_KG_H
22
#define D_A_E_KG_H
3-
#include "f_op/f_op_actor_mng.h"
3+
#include "d/d_bg_s_acch.h"
4+
#include "d/d_cc_d.h"
5+
#include "d/d_cc_uty.h"
6+
#include "f_op/f_op_actor.h"
47

58
/**
69
* @ingroup actors-enemies
@@ -11,15 +14,54 @@
1114
*
1215
*/
1316
class e_kg_class : public fopEn_enemy_c {
14-
private:
15-
/* 0x5ac */ u8 field_0x5ac[0xa74 - 0x5ac];
17+
public:
18+
/* 0x5ac */ request_of_phase_process_class mPhase;
19+
/* 0x5b4 */ u8 field_0x5b4;
20+
/* 0x5b5 */ u8 field_0x5b5;
21+
/* 0x5b8 */ mDoExt_McaMorfSO* mpMorf;
22+
/* 0x5bc */ Z2CreatureEnemy mSound;
23+
/* 0x660 */ mDoExt_btpAnm* mpBtp;
24+
/* 0x664 */ f32 field_0x664;
25+
/* 0x668 */ int mResIndex;
26+
/* 0x66c */ s16 field_0x66c;
27+
/* 0x66e */ u8 field_0x66e[0x670 - 0x66e];
28+
/* 0x670 */ f32 field_0x670;
29+
/* 0x674 */ s16 field_0x674;
30+
/* 0x676 */ s16 mAction;
31+
/* 0x678 */ s16 field_0x678;
32+
/* 0x67a */ u8 field_0x67a[0x688 - 0x67a];
33+
/* 0x688 */ s16 field_0x688;
34+
/* 0x68a */ u8 field_0x68a[0x68c - 0x68a];
35+
/* 0x68c */ s16 mPlayerAngle;
36+
/* 0x690 */ f32 mPlayerDist;
37+
/* 0x694 */ s16 field_0x694[4];
38+
/* 0x69c */ s16 field_0x69c;
39+
/* 0x69e */ s16 field_0x69e;
40+
/* 0x6a0 */ int mShadowKey;
41+
/* 0x6a4 */ dBgS_AcchCir mAcchCir;
42+
/* 0x6e4 */ dBgS_ObjAcch mAcch;
43+
/* 0x8bc */ dCcD_Stts mStts;
44+
/* 0x8f8 */ dCcD_Sph mSph;
45+
/* 0xa30 */ dCcU_AtInfo mAtInfo;
46+
/* 0xa54 */ s16 field_0xa54;
47+
/* 0xa58 */ u32 field_0xa58;
48+
/* 0xa5c */ u32 mSmokeKey1;
49+
/* 0xa60 */ u32 mSmokeKey2;
50+
/* 0xa64 */ u8 field_0xa64[0xa70 - 0xa64];
51+
/* 0xa70 */ u8 field_0xa70;
1652
};
1753

1854
STATIC_ASSERT(sizeof(e_kg_class) == 0xa74);
1955

2056
class daE_KG_HIO_c {
57+
public:
2158
/* 806F7EEC */ daE_KG_HIO_c();
22-
/* 806F9EE8 */ ~daE_KG_HIO_c();
59+
/* 806F9EE8 */ virtual ~daE_KG_HIO_c() {}
60+
61+
/* 0x04 */ s8 field_0x4;
62+
/* 0x08 */ f32 mSize;
63+
/* 0x0c */ f32 field_0xc;
64+
/* 0x10 */ f32 mCheckRange;
2365
};
2466

2567

0 commit comments

Comments
 (0)