falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_e_hp almost matching (#2585)

This commit is contained in:
Max Roncace 2025-08-15 05:50:49 -04:00 committed by GitHub
parent a6802bf7a2
commit 41c72dc6d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 1341 additions and 810 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/GZ2E01/rels/d_a_e_hp/symbols.txt
View File

@ -122,6 +122,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global
__vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global
__vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_200_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
@3921 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte

2
config/ShieldD/rels/d_a_e_hpD/symbols.txt
View File

@ -162,5 +162,5 @@ lbl_191_data_310 = .data:0x00000310; // type:object size:0x24
@120215 = .data:0x00000538; // type:object size:0xC scope:local
@120216 = .data:0x0000055C; // type:object size:0x11 scope:local data:string
lbl_191_data_56D = .data:0x0000056D; // type:object size:0x8F
lbl_191_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x14 scope:global data:byte

4
include/SSystem/SComponent/c_bg_s_lin_chk.h
View File

@ -39,9 +39,9 @@ public:
cXyz* GetCrossP() { return &mLin.GetEndP(); }
cM3dGLin* GetLinP() { return &mLin; }
bool ChkBackFlag() const { return mBackFlag; }
void onBackFlag() { mBackFlag = true; }
void OnBackFlag() { mBackFlag = true; }
bool ChkFrontFlag() const { return mFrontFlag; }
void onFrontFlag() { mFrontFlag = true; }
void OnFrontFlag() { mFrontFlag = true; }
bool GetPreWallChk() const { return mPreWallChk; }
bool GetPreGroundChk() const { return mPreGroundChk; }
bool GetPreRoofChk() const { return mPreRoofChk; }

6
include/d/actor/d_a_e_hb.h
View File

@ -77,8 +77,12 @@ public:
STATIC_ASSERT(sizeof(e_hb_class) == 0x1268);
class daE_HB_HIO_c {
class daE_HB_HIO_c : public JORReflexible {
public:
#if DEBUG
virtual void genMessage(JORMContext*);
#endif
/* 804FBD6C */ daE_HB_HIO_c();
/* 805005D0 */ virtual ~daE_HB_HIO_c() {}

98
include/d/actor/d_a_e_hp.h
View File

@ -1,6 +1,9 @@
#ifndef D_A_E_HP_H
#define D_A_E_HP_H
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"
#include "f_op/f_op_actor_mng.h"
/**
@ -12,14 +15,15 @@
*
*/
class daE_HP_c : public fopEn_enemy_c {
/* 806E5E30 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 806E5ED0 */ void JointCallBack(J3DJoint*, int);
/* 806E5F1C */ void LampCtrlJoint(J3DJoint*, J3DModel*);
/* 806E5FCC */ void LampJointCallBack(J3DJoint*, int);
/* 806E6018 */ void draw();
public:
/* 806E5E30 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 806E5ED0 */ static int JointCallBack(J3DJoint*, int);
/* 806E5F1C */ int LampCtrlJoint(J3DJoint*, J3DModel*);
/* 806E5FCC */ static int LampJointCallBack(J3DJoint*, int);
/* 806E6018 */ int draw();
/* 806E6514 */ void setBck(int, u8, f32, f32);
/* 806E65C0 */ void setActionMode(int, int);
/* 806E65CC */ void mChkDistance(f32);
/* 806E65CC */ bool mChkDistance(f32);
/* 806E673C */ void damage_check();
/* 806E6948 */ void executeWait();
/* 806E6C74 */ void executeMove();
@ -31,20 +35,86 @@ class daE_HP_c : public fopEn_enemy_c {
/* 806E814C */ void action();
/* 806E89C0 */ void mtx_set();
/* 806E8DE0 */ void cc_set();
/* 806E8FEC */ void execute();
/* 806E9198 */ void _delete();
/* 806E9240 */ void CreateHeap();
/* 806E951C */ void create();
/* 806E8FEC */ int execute();
/* 806E9198 */ int _delete();
/* 806E9240 */ int CreateHeap();
/* 806E951C */ int create();
/* 806E9900 */ daE_HP_c();
private:
/* 0x5ac */ u8 field_0x5ac[0xdfc - 0x5ac];
/* 0x5AC */ request_of_phase_process_class mPhaseReq;
/* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
/* 0x5B8 */ mDoExt_invisibleModel mInvModel;
/* 0x5C0 */ J3DModel* mpModel;
/* 0x5C4 */ mDoExt_McaMorf* mpMorf;
/* 0x5C8 */ Z2CreatureEnemy mSound1;
/* 0x66C */ Z2CreatureEnemy mSound2;
/* 0x710 */ s32 mAction;
/* 0x714 */ s32 movemode;
/* 0x718 */ u32 field_0x718;
/* 0x71C */ u8 field_0x71c;
/* 0x71D */ u8 field_0x71d;
/* 0x71E */ u8 field_0x71e;
/* 0x71F */ u8 field_0x71f;
/* 0x720 */ cXyz field_0x720;
/* 0x72C */ cXyz field_0x72c;
/* 0x738 */ cXyz field_0x738;
/* 0x744 */ cXyz field_0x744;
/* 0x750 */ cXyz field_0x750;
/* 0x75C */ cXyz field_0x75c;
/* 0x768 */ f32 field_0x768;
/* 0x76C */ csXyz field_0x76c;
/* 0x772 */ csXyz field_0x772;
/* 0x778 */ s16 field_0x778;
/* 0x77A */ u8 arg0;
/* 0x77B */ u8 bitSw;
/* 0x77C */ u8 field_0x77c;
/* 0x780 */ s32 field_0x780;
/* 0x784 */ u32 field_0x784;
/* 0x788 */ u8 field_0x788;
/* 0x789 */ u8 field_0x789;
/* 0x78A */ u8 field_0x78a;
/* 0x78B */ u8 field_0x78b;
/* 0x78C */ u8 mNight;
/* 0x78D */ u8 field_0x78d;
/* 0x790 */ f32 field_0x790;
/* 0x794 */ f32 field_0x794;
/* 0x798 */ f32 field_0x798;
/* 0x79C */ f32 mDisHani;
/* 0x7A0 */ f32 field_0x7a0;
/* 0x7A4 */ f32 field_0x7a4;
/* 0x7A8 */ s16 field_0x7a8;
/* 0x7AA */ s16 field_0x7aa;
/* 0x7AC */ dBgS_AcchCir mAcchCir;
/* 0x7EC */ dBgS_ObjAcch mObjAcch;
/* 0x9C4 */ dCcD_Stts mStts;
/* 0xA00 */ dCcD_Cyl mCyl1;
/* 0xB3C */ dCcD_Cyl mCyl2;
/* 0xC78 */ dCcD_Sph mSph;
/* 0xDB0 */ dCcU_AtInfo mAtInfo;
/* 0xDD4 */ s32 field_0xdd4[2];
/* 0xDDC */ u32 field_0xddc;
/* 0xDE0 */ cXyz field_0xde0;
/* 0xDEC */ u8 field_0xdec[0xdf9 - 0xdec];
/* 0xDF9 */ u8 field_0xdf9;
};
STATIC_ASSERT(sizeof(daE_HP_c) == 0xdfc);
class daE_HP_HIO_c {
class daE_HP_HIO_c : public JORReflexible {
public:
/* 806E5DEC */ daE_HP_HIO_c();
/* 806E9D38 */ ~daE_HP_HIO_c();
/* 806E9D38 */ virtual ~daE_HP_HIO_c() {}
#if DEBUG
void genMessage(JORMContext*);
#endif
s8 mChild;
f32 modelSize;
s16 waitTimeAfterAttack;
s16 resurrectionTime;
s16 attackDelayOnApproach;
u8 rangeDisplay;
};

2
include/d/actor/d_a_npc_ykm.h
View File

@ -44,8 +44,6 @@ public:
/* 80B5D6C8 */ virtual ~daNpc_ykM_Param_c() {}
void genMessage(JORMContext*);
static daNpc_ykM_HIOParam const m;
};

2
include/d/d_com_inf_game.h
View File

@ -3558,7 +3558,7 @@ inline int dComIfGp_evmng_startDemo(int param_0) {
return dComIfGp_getPEvtManager()->setStartDemo(param_0);
}
inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) {
inline void dComIfGp_event_setTalkPartner(void* i_actor) {
g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor);
}

8
include/d/d_event.h
View File

@ -105,7 +105,13 @@ public:
void setGtItm(u8 itemNo);
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
BOOL runCheck() { return mEventStatus != 0; }
BOOL runCheck() {
#if DEBUG
return mEventStatus != 0 || mDebugStb != 0;
#else
return mEventStatus != 0;
#endif
}
f32 getCullRate() { return mCullRate; }
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
void onEventFlag(u16 flag) { mEventFlag |= flag; }

2
include/f_op/f_op_actor_mng.h
View File

@ -511,7 +511,7 @@ fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos,
void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message);
void fopAcM_delete(fopAc_ac_c* i_actor);
s32 fopAcM_delete(fopAc_ac_c* i_actor);
s32 fopAcM_delete(fpc_ProcID i_actorID);

1
include/m_Do/m_Do_ext.h
View File

@ -255,6 +255,7 @@ private:
class mDoExt_invisibleModel {
public:
mDoExt_invisibleModel() {}
/* 8000E53C */ int create(J3DModel* i_model, u8 param_1);
/* 8000E6C8 */ void entryJoint(cXyz*);
/* 8000E7C0 */ void entryDL(cXyz*);

2002
src/d/actor/d_a_e_hp.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/d/actor/d_a_e_zh.cpp
View File

@ -859,7 +859,7 @@ void daE_ZH_c::executeBallWait() {
spa4.z = WREG_F(1) + 2000.0f;
MtxPosition(&spa4, &spb0);
field_0x680 = spb0 + current.pos;
lin_chk.onBackFlag();
lin_chk.OnBackFlag();
lin_chk.Set(&current.pos, &field_0x680, this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {

4
src/d/actor/d_a_npc_moir.cpp
View File

@ -1391,7 +1391,7 @@ bool daNpcMoiR_c::talk(void* param_1) {
} else {
msgTimer = mMsgTimer;
if (ctrlMsgAnm(i_expression, i_actionID, this, FALSE)) {
OS_REPORT("レジスタンスモイ 表情番号=%d 動作番号=%d\n", i_expressionID, i_actionID); // "Resistance Moi Expression Number=%d Action Number=%d\n"
OS_REPORT("レジスタンスモイ 表情番号=%d 動作番号=%d\n", i_expression, i_actionID); // "Resistance Moi Expression Number=%d Action Number=%d\n"
setExpression(i_expression, -1.0f);
setMotion(i_actionID, -1.0f, 0);
} else if (msgTimer != 0 && mMsgTimer == 0) {
@ -1657,7 +1657,7 @@ BOOL daNpcMoiR_c::EvCut_Appear(int i_cutIndex) {
case '0005':
if (fopAcM_searchPlayerAngleY(this) == mCurAngle.y) {
if (talkProc(NULL, TRUE, NULL)) {
OS_REPORT("二択分岐 %s\n", getChoiceNo() == 0 ? "はい" : "いいえ");
OS_REPORT("二択分岐 %s\n", mFlow.getChoiceNo() == 0 ? "はい" : "いいえ");
if (mFlow.getChoiceNo() == 0) {
mOrderEvtNo = 3;

4
src/d/actor/d_a_tag_kmsg.cpp
View File

@ -197,8 +197,8 @@ int daTag_KMsg_c::Execute() {
vec54.z = vec60.z + 80.0f * angle.Cos();
dBgS_LinChk lin_chk;
lin_chk.ClrSttsWallOff();
lin_chk.onBackFlag();
lin_chk.onFrontFlag();
lin_chk.OnBackFlag();
lin_chk.OnFrontFlag();
lin_chk.Set(&vec54, &vec60, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cXyz vec48;

4
src/d/d_camera.cpp
View File

@ -3396,8 +3396,8 @@ bool dCamera_c::bumpCheck(u32 i_flags) {
* lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl */
bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linchk,
u32 i_flags) {
i_linchk->onBackFlag();
i_linchk->onFrontFlag();
i_linchk->OnBackFlag();
i_linchk->OnFrontFlag();
return lineBGCheck(i_start, i_end, i_linchk, i_flags);
}

4
src/d/d_event.cpp
View File

@ -558,10 +558,10 @@ int dEvt_control_c::entry() {
void dEvt_control_c::reset() {
if (field_0xec != 0xFF) {
fopAc_ac_c* pt1 = getPt1();
fopAc_ac_c* pt1_2 = pt1;
s16 eventIdx = dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1);
fopAc_ac_c* pt2 = getPt2();
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec);
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, getPt2(), eventIdx, field_0xec);
mChangeOK = pt1;
}

4
src/f_op/f_op_actor_mng.cpp
View File

@ -136,10 +136,10 @@ void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message) {}
/* 80019C7C-80019CB8 0145BC 003C+00 0/0 10/10 483/483 .text fopAcM_delete__FP10fopAc_ac_c
*/
void fopAcM_delete(fopAc_ac_c* i_actor) {
s32 fopAcM_delete(fopAc_ac_c* i_actor) {
// "Deleting Actor"
fopAcM_Log(i_actor, "アクターの削除");
fpcM_Delete(i_actor);
return fpcM_Delete(i_actor);
}
/* 80019CB8-80019D18 0145F8 0060+00 0/0 3/3 12/12 .text fopAcM_delete__FUi */