Skip to content

Commit 2531faa

Browse files
caseifcaseif
committed
d_a_e_dk matching
1 parent 992e323 commit 2531faa

File tree

7 files changed

+1054
-915
lines changed

7 files changed

+1054
-915
lines changed

‎configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ def MatchingFor(*versions) -> bool:
16491649
ActorRel(MatchingFor("GZ2E01"), "d_a_e_db_leaf"),
16501650
ActorRel(NonMatching, "d_a_e_dd"),
16511651
ActorRel(Equivalent, "d_a_e_df"), # weak func order
1652-
ActorRel(NonMatching, "d_a_e_dk"),
1652+
ActorRel(MatchingFor("GZ2E01"), "d_a_e_dk"),
16531653
ActorRel(Equivalent, "d_a_e_dt"), # weak func order
16541654
ActorRel(NonMatching, "d_a_e_fb"),
16551655
ActorRel(NonMatching, "d_a_e_fk"),

‎include/JSystem/J3DGraphBase/J3DMatBlock.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,7 @@ struct J3DBlend : public J3DBlendInfo {
699699
J3DBlend(J3DBlendInfo const& info) : J3DBlendInfo(info) {}
700700

701701
void setType(u8 i_type) { mType = i_type; }
702+
void setSrcFactor(u8 i_factor) { mSrcFactor = i_factor; }
702703
void setDstFactor(u8 i_factor) { mDstFactor = i_factor; }
703704

704705
GXBlendMode getBlendMode() const { return (GXBlendMode)mType; }

‎include/d/actor/d_a_e_dk.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
*/
1919
class daE_DK_c : public fopEn_enemy_c {
2020
public:
21-
/* 806AA228 */ void draw();
22-
/* 806AA5C8 */ void setBck(int, u8, f32, f32);
23-
/* 806AA68C */ void setBckCore(int, u8, f32, f32);
24-
/* 806AA730 */ void setActionMode(int, int);
21+
/* 806AA228 */ int draw();
22+
/* 806AA5C8 */ void setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
23+
/* 806AA68C */ void setBckCore(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
24+
/* 806AA730 */ void setActionMode(int i_actionMode, int i_moveMode);
2525
/* 806AA73C */ void damage_check();
26-
/* 806AA8B0 */ void checkPlayerSearch();
27-
/* 806AAB18 */ void checkPlayerAttack(f32);
26+
/* 806AA8B0 */ bool checkPlayerSearch();
27+
/* 806AAB18 */ int checkPlayerAttack(f32);
2828
/* 806AAC24 */ void checkWaterHeight();
29-
/* 806AAD68 */ void SphBgcCallBack(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*);
29+
/* 806AAD68 */ static void SphBgcCallBack(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*);
3030
/* 806AAE10 */ void setElectricEffect();
3131
/* 806AB054 */ void setCoreDeadEffect();
3232
/* 806AB158 */ void setBodyDeadEffect();
@@ -39,10 +39,10 @@ class daE_DK_c : public fopEn_enemy_c {
3939
/* 806AC390 */ void action();
4040
/* 806AC5BC */ void mtx_set();
4141
/* 806AC754 */ void cc_set();
42-
/* 806AC968 */ void execute();
43-
/* 806ACA10 */ void _delete();
44-
/* 806ACAA4 */ void CreateHeap();
45-
/* 806ACE14 */ void create();
42+
/* 806AC968 */ int execute();
43+
/* 806ACA10 */ int _delete();
44+
/* 806ACAA4 */ int CreateHeap();
45+
/* 806ACE14 */ int create();
4646
/* 806AD0AC */ daE_DK_c();
4747

4848
private:
@@ -62,7 +62,7 @@ class daE_DK_c : public fopEn_enemy_c {
6262
/* 0x690 */ u8 field_0x690;
6363
/* 0x691 */ u8 field_0x691;
6464
/* 0x692 */ u8 field_0x692;
65-
/* 0x694 */ s16 field_0x694;
65+
/* 0x694 */ u16 field_0x694;
6666
/* 0x698 */ s32 field_0x698;
6767
/* 0x69C */ s32 field_0x69c;
6868
/* 0x6A0 */ u8 field_0x6a0;
@@ -82,9 +82,9 @@ class daE_DK_c : public fopEn_enemy_c {
8282
/* 0x964 */ dCcD_Sph mSphere;
8383
/* 0xA9C */ dCcD_Sph mAtSphere;
8484
/* 0xBD4 */ dCcD_Sph mCoreSphere;
85-
/* 0xD0C */ dCcU_AtInfo field_0xd0c;
86-
/* 0xD30 */ u32 mEffects[6];
87-
/* 0xD48 */ u8 field_0xD48[0xD50 - 0xD48];
85+
/* 0xD0C */ dCcU_AtInfo mAtInfo;
86+
/* 0xD30 */ u32 mElectricEffects[6];
87+
/* 0xD48 */ u32 mDeadEffects[2];
8888
/* 0xD50 */ u8 mHIOInit;
8989
};
9090

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

9898
void genMessage(JORMContext*);
9999

‎include/d/d_com_inf_game.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3862,28 +3862,28 @@ inline void dComIfGp_clearMesgCameraAttrInfo() {
38623862
g_dComIfG_gameInfo.play.clearMesgCamInfoBasicID();
38633863
}
38643864

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

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

3884-
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
3884+
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
38853885
const dKy_tevstr_c* param_3) {
3886-
return dComIfGp_particle_set(param_0, param_1, param_2, param_3, 0, 0, 0xFF, 0, 0xFFFFFFFF, 0,
3886+
return dComIfGp_particle_set(param_0, param_1, i_pos, param_3, 0, 0, 0xFF, 0, 0xFFFFFFFF, 0,
38873887
0, 0);
38883888
}
38893889

@@ -3921,45 +3921,45 @@ inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos,
39213921
NULL, NULL);
39223922
}
39233923

3924-
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
3924+
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
39253925
const csXyz* param_3, const cXyz* param_4) {
3926-
return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL,
3926+
return dComIfGp_particle_set(param_0, param_1, i_pos, param_3, param_4, 0xFF, NULL, -1, NULL,
39273927
NULL, NULL);
39283928
}
39293929

3930-
inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2,
3930+
inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* i_pos,
39313931
const dKy_tevstr_c* param_3, const GXColor* param_4,
39323932
const GXColor* param_5, f32 param_6, u8 param_7,
39333933
const csXyz* param_8, const cXyz* param_9,
39343934
dPa_levelEcallBack* param_10, s8 param_11,
39353935
const cXyz* param_12) {
39363936
return g_dComIfG_gameInfo.play.getParticle()->setNormal(
3937-
param_0, param_1, param_2, param_3, param_8, param_9, param_7, param_10, param_11, param_4,
3937+
param_0, param_1, i_pos, param_3, param_8, param_9, param_7, param_10, param_11, param_4,
39383938
param_5, param_12, param_6);
39393939
}
39403940

3941-
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1,
3941+
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* i_pos,
39423942
const dKy_tevstr_c* param_2,
39433943
const GXColor* param_3, const GXColor* param_4,
39443944
f32 param_5, u8 param_6, const csXyz* param_7,
39453945
const cXyz* param_8, dPa_levelEcallBack* param_9,
39463946
s8 param_10, const cXyz* param_11) {
3947-
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_7,
3947+
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, i_pos, param_2, param_7,
39483948
param_8, param_6, param_9, param_10,
39493949
param_3, param_4, param_11, param_5);
39503950
}
39513951

3952-
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1,
3952+
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* i_pos,
39533953
const dKy_tevstr_c* param_2,
39543954
const GXColor* param_3, const GXColor* param_4,
39553955
f32 param_5, u8 param_6) {
3956-
return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6,
3956+
return dComIfGp_particle_setColor(param_0, i_pos, param_2, param_3, param_4, param_5, param_6,
39573957
NULL, NULL, NULL, -1, NULL);
39583958
}
39593959

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

‎include/d/d_particle.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -367,19 +367,19 @@ class dPa_control_c {
367367
void forceOnEventMove(u32 param_0) { field_0x210.forceOnEventMove(param_0); }
368368
JPABaseEmitter* getEmitter(u32 param_0) { return field_0x210.getEmitter(param_0); }
369369

370-
u32 setNormal(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
371-
const csXyz* param_4, const cXyz* param_5, u8 param_6,
372-
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
373-
const GXColor* param_10, const cXyz* param_11, f32 param_12) {
374-
return set(param_0, 0, param_1, param_2, param_3, param_4, param_5, param_6, param_7,
370+
u32 setNormal(u32 param_0, u16 param_1, const cXyz* i_pos, const dKy_tevstr_c* param_3,
371+
const csXyz* i_rotation, const cXyz* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7,
372+
s8 param_8, const GXColor* param_9, const GXColor* param_10, const cXyz* param_11,
373+
f32 param_12) {
374+
return set(param_0, 0, param_1, i_pos, param_3, i_rotation, i_scale, i_alpha, param_7,
375375
param_8, param_9, param_10, param_11, param_12);
376376
}
377377

378-
JPABaseEmitter* setNormal(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
379-
const csXyz* param_4, const cXyz* param_5, u8 param_6,
378+
JPABaseEmitter* setNormal(u16 param_1, const cXyz* i_pos, const dKy_tevstr_c* param_3,
379+
const csXyz* i_rotation, const cXyz* i_scale, u8 i_alpha,
380380
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
381381
const GXColor* param_10, const cXyz* param_11, f32 param_12) {
382-
return set(0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8,
382+
return set(0, param_1, i_pos, param_3, i_rotation, i_scale, i_alpha, param_7, param_8,
383383
param_9, param_10, param_11, param_12);
384384
}
385385

0 commit comments

Comments
 (0)