Skip to content

Commit 712025f

Browse files
authored
d_a_e_dd equivalent (#2587)
* initial work * took out unneeded nonmatching comment * d_a_e_dd equivalent * pr cleanup
1 parent 0e8d06c commit 712025f

File tree

3 files changed

+1788
-893
lines changed

3 files changed

+1788
-893
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ def MatchingFor(*versions) -> bool:
16611661
ActorRel(MatchingFor("GZ2E01"), "d_a_e_cr_egg"),
16621662
ActorRel(Equivalent, "d_a_e_db"), # weak func order
16631663
ActorRel(MatchingFor("GZ2E01"), "d_a_e_db_leaf"),
1664-
ActorRel(NonMatching, "d_a_e_dd"),
1664+
ActorRel(Equivalent, "d_a_e_dd"), # weak func order
16651665
ActorRel(Equivalent, "d_a_e_df"), # weak func order
16661666
ActorRel(MatchingFor("GZ2E01"), "d_a_e_dk"),
16671667
ActorRel(Equivalent, "d_a_e_dt"), # weak func order

include/d/actor/d_a_e_dd.h

Lines changed: 81 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#ifndef D_A_E_DD_H
22
#define D_A_E_DD_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 "d/d_path.h"
37
#include "f_op/f_op_actor_mng.h"
48

59
/**
@@ -9,17 +13,88 @@
913
*
1014
* @details
1115
*
12-
*/
13-
class e_dd_class : public fopEn_enemy_c {
14-
private:
15-
/* 0x5ac */ u8 field_0x5ac[0xe94 - 0x5ac];
16+
*/
17+
class e_dd_class {
18+
public:
19+
/* 0x000 */ fopEn_enemy_c actor;
20+
/* 0x5AC */ request_of_phase_process_class mPhase;
21+
/* 0x5B4 */ u8 field_0x5b4;
22+
/* 0x5B5 */ u8 field_0x5b5;
23+
/* 0x5B6 */ u8 field_0x5b6;
24+
/* 0x5B8 */ dPath* mpPath;
25+
/* 0x5BC */ s8 field_0x5bc;
26+
/* 0x5BD */ s8 field_0x5bd;
27+
/* 0x5C0 */ mDoExt_McaMorfSO* mpModelMorf;
28+
/* 0x5C4 */ Z2CreatureEnemy mSound;
29+
/* 0x668 */ mDoExt_brkAnm* mpBrkAnms[5];
30+
/* 0x67C */ int field_0x67c;
31+
/* 0x680 */ u8 field_0x680[0x684 - 0x680];
32+
/* 0x684 */ int mAnm;
33+
/* 0x688 */ s16 field_0x688;
34+
/* 0x68A */ s16 mAction;
35+
/* 0x68C */ s16 field_0x68c;
36+
/* 0x690 */ cXyz field_0x690;
37+
/* 0x69C */ s16 field_0x69c;
38+
/* 0x69E */ u8 field_0x69e[0x6a0 - 0x69e];
39+
/* 0x6A0 */ s16 field_0x6a0;
40+
/* 0x6A4 */ f32 field_0x6a4;
41+
/* 0x6A8 */ s16 field_0x6a8;
42+
/* 0x6AA */ s16 field_0x6aa[4];
43+
/* 0x6B2 */ s16 field_0x6b2;
44+
/* 0x6B4 */ u32 mShadowKey;
45+
/* 0x6B8 */ s16 field_0x6b8;
46+
/* 0x6BA */ s16 field_0x6ba;
47+
/* 0x6BC */ s16 field_0x6bc;
48+
/* 0x6BE */ s16 field_0x6be;
49+
/* 0x6C0 */ s16 field_0x6c0;
50+
/* 0x6C4 */ f32 field_0x6c4;
51+
/* 0x6C8 */ u8 field_0x6c8[0x6d0 - 0x6c8];
52+
/* 0x6D0 */ s8 field_0x6d0;
53+
/* 0x6D1 */ s8 field_0x6d1;
54+
/* 0x6D2 */ u8 field_0x6d2;
55+
/* 0x6D3 */ s8 field_0x6d3;
56+
/* 0x6D4 */ s8 field_0x6d4;
57+
/* 0x6D6 */ csXyz field_0x6d6;
58+
/* 0x6DC */ cXyz field_0x6dc;
59+
/* 0x6E8 */ dBgS_AcchCir mAcchCir;
60+
/* 0x728 */ dBgS_ObjAcch mObjAcch;
61+
/* 0x900 */ dCcD_Stts mStts;
62+
/* 0x93C */ dCcD_Sph mFireSph;
63+
/* 0xA74 */ dCcD_Sph field_0xa74[3];
64+
/* 0xE1C */ dCcU_AtInfo mAtInfo;
65+
/* 0xE40 */ cXyz field_0xe40;
66+
/* 0xE4C */ cXyz field_0xe4c;
67+
/* 0xE58 */ s8 field_0xe58;
68+
/* 0xE59 */ s8 field_0xe59;
69+
/* 0xE5A */ s8 field_0xe5a;
70+
/* 0xE5B */ s8 field_0xe5b;
71+
/* 0xE5C */ f32 field_0xe5c;
72+
/* 0xE60 */ u32 field_0xe60;
73+
/* 0xE64 */ u32 field_0xe64;
74+
/* 0xE68 */ u32 field_0xe68[4];
75+
/* 0xE78 */ u32 field_0xe78;
76+
/* 0xE7C */ u32 field_0xe7c[2];
77+
/* 0xE84 */ u8 field_0xe84[0xe90 - 0xe84];
78+
/* 0xE90 */ u8 field_0xe90;
1679
};
1780

1881
STATIC_ASSERT(sizeof(e_dd_class) == 0xe94);
1982

20-
class daE_DD_HIO_c {
83+
class daE_DD_HIO_c : public JORReflexible {
84+
public:
2185
/* 806A226C */ daE_DD_HIO_c();
22-
/* 806A6D08 */ ~daE_DD_HIO_c();
86+
/* 806A6D08 */ virtual ~daE_DD_HIO_c() {}
87+
88+
/* ドドンゴ - Dodongo */
89+
/* 0x04 */ s8 field_0x4;
90+
/* 0x08 */ f32 basic_size; // 基本サイズ - Basic Size
91+
/* 0x0C */ f32 walk_speed; // 歩速度 - Walk Speed
92+
/* 0x10 */ f32 run_speed; // 走速度 - Run Speed
93+
/* 0x14 */ f32 search_area; // サーチエリア - Search Area
94+
/* 0x18 */ f32 flame_distance; // 炎距離 - Flame Distance
95+
/* 0x1C */ f32 horned_head; // 首曲角 - Horned Head
96+
/* 0x20 */ s16 flame_time; // 炎時間 - Flame Time
97+
/* 0x24 */ f32 flame_mot_speed; // 炎モーション速 - Flame Motion Speed
2398
};
2499

25100

0 commit comments

Comments
 (0)