Skip to content

Commit 41c72dc

Browse files
caseifcaseif
authored
d_a_e_hp almost matching (#2585)
1 parent a6802bf commit 41c72dc

File tree

17 files changed

+1339
-808
lines changed

17 files changed

+1339
-808
lines changed

‎config/GZ2E01/rels/d_a_e_hp/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global
122122
__vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global
123123
__vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global
124124
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
125-
lbl_200_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
125+
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
126126
@3921 = .bss:0x0000000C; // type:object size:0xC scope:local
127127
l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte

‎config/ShieldD/rels/d_a_e_hpD/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,5 @@ lbl_191_data_310 = .data:0x00000310; // type:object size:0x24
162162
@120215 = .data:0x00000538; // type:object size:0xC scope:local
163163
@120216 = .data:0x0000055C; // type:object size:0x11 scope:local data:string
164164
lbl_191_data_56D = .data:0x0000056D; // type:object size:0x8F
165-
lbl_191_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
165+
l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte
166166
l_HIO = .bss:0x00000004; // type:object size:0x14 scope:global data:byte

‎include/SSystem/SComponent/c_bg_s_lin_chk.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class cBgS_LinChk : public cBgS_Chk, public cBgS_PolyInfo {
3939
cXyz* GetCrossP() { return &mLin.GetEndP(); }
4040
cM3dGLin* GetLinP() { return &mLin; }
4141
bool ChkBackFlag() const { return mBackFlag; }
42-
void onBackFlag() { mBackFlag = true; }
42+
void OnBackFlag() { mBackFlag = true; }
4343
bool ChkFrontFlag() const { return mFrontFlag; }
44-
void onFrontFlag() { mFrontFlag = true; }
44+
void OnFrontFlag() { mFrontFlag = true; }
4545
bool GetPreWallChk() const { return mPreWallChk; }
4646
bool GetPreGroundChk() const { return mPreGroundChk; }
4747
bool GetPreRoofChk() const { return mPreRoofChk; }

‎include/d/actor/d_a_e_hb.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,12 @@ class e_hb_class {
7777

7878
STATIC_ASSERT(sizeof(e_hb_class) == 0x1268);
7979

80-
class daE_HB_HIO_c {
80+
class daE_HB_HIO_c : public JORReflexible {
8181
public:
82+
#if DEBUG
83+
virtual void genMessage(JORMContext*);
84+
#endif
85+
8286
/* 804FBD6C */ daE_HB_HIO_c();
8387
/* 805005D0 */ virtual ~daE_HB_HIO_c() {}
8488

‎include/d/actor/d_a_e_hp.h‎

Lines changed: 84 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef D_A_E_HP_H
22
#define D_A_E_HP_H
33

4+
#include "d/d_bg_s_acch.h"
5+
#include "d/d_cc_d.h"
6+
#include "d/d_cc_uty.h"
47
#include "f_op/f_op_actor_mng.h"
58

69
/**
@@ -12,14 +15,15 @@
1215
*
1316
*/
1417
class daE_HP_c : public fopEn_enemy_c {
15-
/* 806E5E30 */ void ctrlJoint(J3DJoint*, J3DModel*);
16-
/* 806E5ED0 */ void JointCallBack(J3DJoint*, int);
17-
/* 806E5F1C */ void LampCtrlJoint(J3DJoint*, J3DModel*);
18-
/* 806E5FCC */ void LampJointCallBack(J3DJoint*, int);
19-
/* 806E6018 */ void draw();
18+
public:
19+
/* 806E5E30 */ int ctrlJoint(J3DJoint*, J3DModel*);
20+
/* 806E5ED0 */ static int JointCallBack(J3DJoint*, int);
21+
/* 806E5F1C */ int LampCtrlJoint(J3DJoint*, J3DModel*);
22+
/* 806E5FCC */ static int LampJointCallBack(J3DJoint*, int);
23+
/* 806E6018 */ int draw();
2024
/* 806E6514 */ void setBck(int, u8, f32, f32);
2125
/* 806E65C0 */ void setActionMode(int, int);
22-
/* 806E65CC */ void mChkDistance(f32);
26+
/* 806E65CC */ bool mChkDistance(f32);
2327
/* 806E673C */ void damage_check();
2428
/* 806E6948 */ void executeWait();
2529
/* 806E6C74 */ void executeMove();
@@ -31,20 +35,86 @@ class daE_HP_c : public fopEn_enemy_c {
3135
/* 806E814C */ void action();
3236
/* 806E89C0 */ void mtx_set();
3337
/* 806E8DE0 */ void cc_set();
34-
/* 806E8FEC */ void execute();
35-
/* 806E9198 */ void _delete();
36-
/* 806E9240 */ void CreateHeap();
37-
/* 806E951C */ void create();
38+
/* 806E8FEC */ int execute();
39+
/* 806E9198 */ int _delete();
40+
/* 806E9240 */ int CreateHeap();
41+
/* 806E951C */ int create();
3842
/* 806E9900 */ daE_HP_c();
39-
private:
40-
/* 0x5ac */ u8 field_0x5ac[0xdfc - 0x5ac];
43+
44+
/* 0x5AC */ request_of_phase_process_class mPhaseReq;
45+
/* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
46+
/* 0x5B8 */ mDoExt_invisibleModel mInvModel;
47+
/* 0x5C0 */ J3DModel* mpModel;
48+
/* 0x5C4 */ mDoExt_McaMorf* mpMorf;
49+
/* 0x5C8 */ Z2CreatureEnemy mSound1;
50+
/* 0x66C */ Z2CreatureEnemy mSound2;
51+
/* 0x710 */ s32 mAction;
52+
/* 0x714 */ s32 movemode;
53+
/* 0x718 */ u32 field_0x718;
54+
/* 0x71C */ u8 field_0x71c;
55+
/* 0x71D */ u8 field_0x71d;
56+
/* 0x71E */ u8 field_0x71e;
57+
/* 0x71F */ u8 field_0x71f;
58+
/* 0x720 */ cXyz field_0x720;
59+
/* 0x72C */ cXyz field_0x72c;
60+
/* 0x738 */ cXyz field_0x738;
61+
/* 0x744 */ cXyz field_0x744;
62+
/* 0x750 */ cXyz field_0x750;
63+
/* 0x75C */ cXyz field_0x75c;
64+
/* 0x768 */ f32 field_0x768;
65+
/* 0x76C */ csXyz field_0x76c;
66+
/* 0x772 */ csXyz field_0x772;
67+
/* 0x778 */ s16 field_0x778;
68+
/* 0x77A */ u8 arg0;
69+
/* 0x77B */ u8 bitSw;
70+
/* 0x77C */ u8 field_0x77c;
71+
/* 0x780 */ s32 field_0x780;
72+
/* 0x784 */ u32 field_0x784;
73+
/* 0x788 */ u8 field_0x788;
74+
/* 0x789 */ u8 field_0x789;
75+
/* 0x78A */ u8 field_0x78a;
76+
/* 0x78B */ u8 field_0x78b;
77+
/* 0x78C */ u8 mNight;
78+
/* 0x78D */ u8 field_0x78d;
79+
/* 0x790 */ f32 field_0x790;
80+
/* 0x794 */ f32 field_0x794;
81+
/* 0x798 */ f32 field_0x798;
82+
/* 0x79C */ f32 mDisHani;
83+
/* 0x7A0 */ f32 field_0x7a0;
84+
/* 0x7A4 */ f32 field_0x7a4;
85+
/* 0x7A8 */ s16 field_0x7a8;
86+
/* 0x7AA */ s16 field_0x7aa;
87+
/* 0x7AC */ dBgS_AcchCir mAcchCir;
88+
/* 0x7EC */ dBgS_ObjAcch mObjAcch;
89+
/* 0x9C4 */ dCcD_Stts mStts;
90+
/* 0xA00 */ dCcD_Cyl mCyl1;
91+
/* 0xB3C */ dCcD_Cyl mCyl2;
92+
/* 0xC78 */ dCcD_Sph mSph;
93+
/* 0xDB0 */ dCcU_AtInfo mAtInfo;
94+
/* 0xDD4 */ s32 field_0xdd4[2];
95+
/* 0xDDC */ u32 field_0xddc;
96+
/* 0xDE0 */ cXyz field_0xde0;
97+
/* 0xDEC */ u8 field_0xdec[0xdf9 - 0xdec];
98+
/* 0xDF9 */ u8 field_0xdf9;
4199
};
42100

43101
STATIC_ASSERT(sizeof(daE_HP_c) == 0xdfc);
44102

45-
class daE_HP_HIO_c {
103+
class daE_HP_HIO_c : public JORReflexible {
104+
public:
46105
/* 806E5DEC */ daE_HP_HIO_c();
47-
/* 806E9D38 */ ~daE_HP_HIO_c();
106+
/* 806E9D38 */ virtual ~daE_HP_HIO_c() {}
107+
108+
#if DEBUG
109+
void genMessage(JORMContext*);
110+
#endif
111+
112+
s8 mChild;
113+
f32 modelSize;
114+
s16 waitTimeAfterAttack;
115+
s16 resurrectionTime;
116+
s16 attackDelayOnApproach;
117+
u8 rangeDisplay;
48118
};
49119

50120

‎include/d/actor/d_a_npc_ykm.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ class daNpc_ykM_Param_c : public JORReflexible {
4444

4545
/* 80B5D6C8 */ virtual ~daNpc_ykM_Param_c() {}
4646

47-
void genMessage(JORMContext*);
48-
4947
static daNpc_ykM_HIOParam const m;
5048
};
5149

‎include/d/d_com_inf_game.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3558,7 +3558,7 @@ inline int dComIfGp_evmng_startDemo(int param_0) {
35583558
return dComIfGp_getPEvtManager()->setStartDemo(param_0);
35593559
}
35603560

3561-
inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) {
3561+
inline void dComIfGp_event_setTalkPartner(void* i_actor) {
35623562
g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor);
35633563
}
35643564

‎include/d/d_event.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,13 @@ class dEvt_control_c {
105105
void setGtItm(u8 itemNo);
106106

107107
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
108-
BOOL runCheck() { return mEventStatus != 0; }
108+
BOOL runCheck() {
109+
#if DEBUG
110+
return mEventStatus != 0 || mDebugStb != 0;
111+
#else
112+
return mEventStatus != 0;
113+
#endif
114+
}
109115
f32 getCullRate() { return mCullRate; }
110116
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
111117
void onEventFlag(u16 flag) { mEventFlag |= flag; }

‎include/f_op/f_op_actor_mng.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos,
511511

512512
void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message);
513513

514-
void fopAcM_delete(fopAc_ac_c* i_actor);
514+
s32 fopAcM_delete(fopAc_ac_c* i_actor);
515515

516516
s32 fopAcM_delete(fpc_ProcID i_actorID);
517517

‎include/m_Do/m_Do_ext.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ class mDoExt_invJntPacket : public J3DPacket {
255255

256256
class mDoExt_invisibleModel {
257257
public:
258+
mDoExt_invisibleModel() {}
258259
/* 8000E53C */ int create(J3DModel* i_model, u8 param_1);
259260
/* 8000E6C8 */ void entryJoint(cXyz*);
260261
/* 8000E7C0 */ void entryDL(cXyz*);

0 commit comments

Comments
 (0)