Skip to content

d_a_e_dk matching #2476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 1 commit into from
Jun 6, 2025
Merged

d_a_e_dk matching #2476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01"), "d_a_e_db_leaf"),
ActorRel(NonMatching, "d_a_e_dd"),
ActorRel(Equivalent, "d_a_e_df"), # weak func order
ActorRel(NonMatching, "d_a_e_dk"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_dk"),
ActorRel(Equivalent, "d_a_e_dt"), # weak func order
ActorRel(NonMatching, "d_a_e_fb"),
ActorRel(NonMatching, "d_a_e_fk"),
Expand Down
1 change: 1 addition & 0 deletions include/JSystem/J3DGraphBase/J3DMatBlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,7 @@ struct J3DBlend : public J3DBlendInfo {
J3DBlend(J3DBlendInfo const& info) : J3DBlendInfo(info) {}

void setType(u8 i_type) { mType = i_type; }
void setSrcFactor(u8 i_factor) { mSrcFactor = i_factor; }
void setDstFactor(u8 i_factor) { mDstFactor = i_factor; }

GXBlendMode getBlendMode() const { return (GXBlendMode)mType; }
Expand Down
32 changes: 16 additions & 16 deletions include/d/actor/d_a_e_dk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
*/
class daE_DK_c : public fopEn_enemy_c {
public:
/* 806AA228 */ void draw();
/* 806AA5C8 */ void setBck(int, u8, f32, f32);
/* 806AA68C */ void setBckCore(int, u8, f32, f32);
/* 806AA730 */ void setActionMode(int, int);
/* 806AA228 */ int draw();
/* 806AA5C8 */ void setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
/* 806AA68C */ void setBckCore(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
/* 806AA730 */ void setActionMode(int i_actionMode, int i_moveMode);
/* 806AA73C */ void damage_check();
/* 806AA8B0 */ void checkPlayerSearch();
/* 806AAB18 */ void checkPlayerAttack(f32);
/* 806AA8B0 */ bool checkPlayerSearch();
/* 806AAB18 */ int checkPlayerAttack(f32);
/* 806AAC24 */ void checkWaterHeight();
/* 806AAD68 */ void SphBgcCallBack(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*);
/* 806AAD68 */ static void SphBgcCallBack(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*);
/* 806AAE10 */ void setElectricEffect();
/* 806AB054 */ void setCoreDeadEffect();
/* 806AB158 */ void setBodyDeadEffect();
Expand All @@ -39,10 +39,10 @@ class daE_DK_c : public fopEn_enemy_c {
/* 806AC390 */ void action();
/* 806AC5BC */ void mtx_set();
/* 806AC754 */ void cc_set();
/* 806AC968 */ void execute();
/* 806ACA10 */ void _delete();
/* 806ACAA4 */ void CreateHeap();
/* 806ACE14 */ void create();
/* 806AC968 */ int execute();
/* 806ACA10 */ int _delete();
/* 806ACAA4 */ int CreateHeap();
/* 806ACE14 */ int create();
/* 806AD0AC */ daE_DK_c();

private:
Expand All @@ -62,7 +62,7 @@ class daE_DK_c : public fopEn_enemy_c {
/* 0x690 */ u8 field_0x690;
/* 0x691 */ u8 field_0x691;
/* 0x692 */ u8 field_0x692;
/* 0x694 */ s16 field_0x694;
/* 0x694 */ u16 field_0x694;
/* 0x698 */ s32 field_0x698;
/* 0x69C */ s32 field_0x69c;
/* 0x6A0 */ u8 field_0x6a0;
Expand All @@ -82,9 +82,9 @@ class daE_DK_c : public fopEn_enemy_c {
/* 0x964 */ dCcD_Sph mSphere;
/* 0xA9C */ dCcD_Sph mAtSphere;
/* 0xBD4 */ dCcD_Sph mCoreSphere;
/* 0xD0C */ dCcU_AtInfo field_0xd0c;
/* 0xD30 */ u32 mEffects[6];
/* 0xD48 */ u8 field_0xD48[0xD50 - 0xD48];
/* 0xD0C */ dCcU_AtInfo mAtInfo;
/* 0xD30 */ u32 mElectricEffects[6];
/* 0xD48 */ u32 mDeadEffects[2];
/* 0xD50 */ u8 mHIOInit;
};

Expand All @@ -93,7 +93,7 @@ STATIC_ASSERT(sizeof(daE_DK_c) == 0xd54);
class daE_DK_HIO_c : public JORReflexible {
public:
/* 806AA1EC */ daE_DK_HIO_c();
/* 806AD490 */ virtual ~daE_DK_HIO_c();
/* 806AD490 */ virtual ~daE_DK_HIO_c() {}

void genMessage(JORMContext*);

Expand Down
38 changes: 19 additions & 19 deletions include/d/d_com_inf_game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3862,28 +3862,28 @@ inline void dComIfGp_clearMesgCameraAttrInfo() {
g_dComIfG_gameInfo.play.clearMesgCamInfoBasicID();
}

inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
const dKy_tevstr_c* param_3, const csXyz* param_4,
const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7,
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
const dKy_tevstr_c* param_3, const csXyz* i_rotation,
const cXyz* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7,
s8 param_8, const GXColor* param_9, const GXColor* param_10,
const cXyz* param_11) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(
param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9,
param_0, param_1, i_pos, param_3, i_rotation, i_scale, i_alpha, param_7, param_8, param_9,
param_10, param_11, 1.0f);
}

inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
const csXyz* param_3, const cXyz* param_4, u8 param_5,
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
const csXyz* i_rotation, const cXyz* i_scale, u8 param_5,
dPa_levelEcallBack* param_6, s8 param_7, const GXColor* param_8,
const GXColor* param_9, const cXyz* param_10) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(
param_0, param_1, param_2, NULL, param_3, param_4, param_5, param_6, param_7, param_8,
param_0, param_1, i_pos, NULL, i_rotation, i_scale, param_5, param_6, param_7, param_8,
param_9, param_10, 1.0f);
}

inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
const dKy_tevstr_c* param_3) {
return dComIfGp_particle_set(param_0, param_1, param_2, param_3, 0, 0, 0xFF, 0, 0xFFFFFFFF, 0,
return dComIfGp_particle_set(param_0, param_1, i_pos, param_3, 0, 0, 0xFF, 0, 0xFFFFFFFF, 0,
0, 0);
}

Expand Down Expand Up @@ -3921,45 +3921,45 @@ inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos,
NULL, NULL);
}

inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
const csXyz* param_3, const cXyz* param_4) {
return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL,
return dComIfGp_particle_set(param_0, param_1, i_pos, param_3, param_4, 0xFF, NULL, -1, NULL,
NULL, NULL);
}

inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2,
inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* i_pos,
const dKy_tevstr_c* param_3, const GXColor* param_4,
const GXColor* param_5, f32 param_6, u8 param_7,
const csXyz* param_8, const cXyz* param_9,
dPa_levelEcallBack* param_10, s8 param_11,
const cXyz* param_12) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(
param_0, param_1, param_2, param_3, param_8, param_9, param_7, param_10, param_11, param_4,
param_0, param_1, i_pos, param_3, param_8, param_9, param_7, param_10, param_11, param_4,
param_5, param_12, param_6);
}

inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1,
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* i_pos,
const dKy_tevstr_c* param_2,
const GXColor* param_3, const GXColor* param_4,
f32 param_5, u8 param_6, const csXyz* param_7,
const cXyz* param_8, dPa_levelEcallBack* param_9,
s8 param_10, const cXyz* param_11) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_7,
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, i_pos, param_2, param_7,
param_8, param_6, param_9, param_10,
param_3, param_4, param_11, param_5);
}

inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1,
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* i_pos,
const dKy_tevstr_c* param_2,
const GXColor* param_3, const GXColor* param_4,
f32 param_5, u8 param_6) {
return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6,
return dComIfGp_particle_setColor(param_0, i_pos, param_2, param_3, param_4, param_5, param_6,
NULL, NULL, NULL, -1, NULL);
}

inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* param_1, u8 param_2, _GXColor& param_3,
inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* i_pos, u8 param_2, _GXColor& param_3,
_GXColor& param_4, int param_5, float param_6) {
g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0, param_1, 0, param_2, param_3, param_4,
g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0, i_pos, 0, param_2, param_3, param_4,
param_5, param_6);
}

Expand Down
16 changes: 8 additions & 8 deletions include/d/d_particle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,19 +367,19 @@ class dPa_control_c {
void forceOnEventMove(u32 param_0) { field_0x210.forceOnEventMove(param_0); }
JPABaseEmitter* getEmitter(u32 param_0) { return field_0x210.getEmitter(param_0); }

u32 setNormal(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
const csXyz* param_4, const cXyz* param_5, u8 param_6,
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
const GXColor* param_10, const cXyz* param_11, f32 param_12) {
return set(param_0, 0, param_1, param_2, param_3, param_4, param_5, param_6, param_7,
u32 setNormal(u32 param_0, u16 param_1, const cXyz* i_pos, const dKy_tevstr_c* param_3,
const csXyz* i_rotation, const cXyz* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7,
s8 param_8, const GXColor* param_9, const GXColor* param_10, const cXyz* param_11,
f32 param_12) {
return set(param_0, 0, param_1, i_pos, param_3, i_rotation, i_scale, i_alpha, param_7,
param_8, param_9, param_10, param_11, param_12);
}

JPABaseEmitter* setNormal(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
const csXyz* param_4, const cXyz* param_5, u8 param_6,
JPABaseEmitter* setNormal(u16 param_1, const cXyz* i_pos, const dKy_tevstr_c* param_3,
const csXyz* i_rotation, const cXyz* i_scale, u8 i_alpha,
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
const GXColor* param_10, const cXyz* param_11, f32 param_12) {
return set(0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8,
return set(0, param_1, i_pos, param_3, i_rotation, i_scale, i_alpha, param_7, param_8,
param_9, param_10, param_11, param_12);
}

Expand Down
Loading