Skip to content

d_a_npc_fguard equivalent #2595

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 5 commits into from
Aug 22, 2025
Merged

d_a_npc_fguard equivalent #2595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79bfe3f
almost matching
carter-ktb21 Aug 19, 2025
2fbd83d
Still have inline issue
carter-ktb21 Aug 20, 2025
e5c4803
equivalent
carter-ktb21 Aug 21, 2025
c14c25e
updated configure.py
carter-ktb21 Aug 21, 2025
bd17a42
fixed broken match
carter-ktb21 Aug 22, 2025
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 @@ -1780,7 +1780,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_npc_drainSol"),
ActorRel(NonMatching, "d_a_npc_du"),
ActorRel(NonMatching, "d_a_npc_fairy"),
ActorRel(NonMatching, "d_a_npc_fguard"),
ActorRel(Equivalent, "d_a_npc_fguard"), # weak func order
ActorRel(NonMatching, "d_a_npc_gnd"),
ActorRel(NonMatching, "d_a_npc_gra"),
ActorRel(NonMatching, "d_a_npc_grc"),
Expand Down
53 changes: 8 additions & 45 deletions include/d/actor/d_a_npc_cd2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,8 @@ inline s16 Cd2_HIO_atnOfs(int param_1) {
}

inline f32 Cd2_HIO_objScale(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mScale;
} else {
return l_Cd2_HIO.field_0x20c4[param_1 - 16].mScale;
}
return rv;
return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mScale : l_Cd2_HIO.field_0x20c4[param_1 - 16].mScale);

}

inline f32 Cd2_HIO_walkMaxSpeed(int param_1) {
Expand Down Expand Up @@ -151,53 +146,23 @@ inline f32 Cd2_HIO_maxSpeed(int param_1) {
}

inline f32 Cd2_HIO_anmPlaySpeed(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mAnmPlaySpeed;
} else {
return l_Cd2_HIO.field_0x20c4[param_1 - 16].mAnmPlaySpeed;
}
return rv;
return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mAnmPlaySpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mAnmPlaySpeed);
}

inline f32 Cd2_HIO_chkWallH(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mChkWallH;
} else {
rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].mChkWallH;
}
return rv;
return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mChkWallH : l_Cd2_HIO.field_0x20c4[param_1 - 16].mChkWallH;
}

inline f32 Cd2_HIO_chkWallR(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mChkWallR;
} else {
rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].mChkWallR;
}
return rv;
return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mChkWallR : l_Cd2_HIO.field_0x20c4[param_1 - 16].mChkWallR;
}

inline f32 Cd2_HIO_cylR(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mCylR;
} else {
rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].mCylR;
}
return rv;
return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mCylR : l_Cd2_HIO.field_0x20c4[param_1 - 16].mCylR;
}

inline f32 Cd2_HIO_cylH(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mCylH;
} else {
rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].mCylH;
}
return rv;
return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mCylH : l_Cd2_HIO.field_0x20c4[param_1 - 16].mCylH;
}

inline int Cd2_HIO_maxLmtX_BACKBONE(int param_1) {
Expand Down Expand Up @@ -407,9 +372,7 @@ class daNpcCd2_c : public fopAc_ac_c {
/* 0xAA4 */ int field_0xaa4;
/* 0xAA8 */ int mHitodamaEmitters[2];
/* 0xAB0 */ daTagEscape_c* mEscapeTag;
/* 0xAB4 */ f32 field_0xab4;
/* 0xAB8 */ f32 field_0xab8;
/* 0xABC */ f32 field_0xabc;
/* 0xAB4 */ cXyz field_0xab4;
/* 0xAC0 */ s16 field_0xac0;
/* 0xAC2 */ s16 field_0xac2;
/* 0xAC4 */ s16 field_0xac4;
Expand Down
37 changes: 20 additions & 17 deletions include/d/actor/d_a_npc_fguard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,34 @@
*
* @details
*
*/
*/

class daNpcFgd_c : public daNpcCd2_c {
public:
/* 809BA53C */ void initPosAngle(Vec&, s16);
/* 809BA584 */ void create();
/* 809BA584 */ cPhs__Step create();
/* 809BA730 */ void create_init();
/* 809BAA80 */ ~daNpcFgd_c();

void setAnime(int param_1) {
setAnm((J3DAnmTransformKey*)getAnmP(param_1, field_0xacc), 1.0f, 12.0f, 2, cM_rndF(5.0f), -1);
}

void offDrawFlag() {
field_0xad8 = 0;
}

void onDrawFlag() {
field_0xad8 = 1;
}
int getType() { return fopAcM_GetParam(this) & 0xFF; }
int getObjNum() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
inline int createHeap();
inline void initCollision();
int getFirstFlag() { return ((fopAcM_GetParam(this) >> 16) & 0xFF) != 0; }
void setAnime(int param_1) { setAnm((J3DAnmTransformKey*)getAnmP(param_1, mObjNum), 1.0f, 12.0f, 2, cM_rndF(5.0f), -1); }
inline void setBaseMtx();
inline void checkGroundHeight();
inline void setCollision();
inline int execute();
inline int draw();
void offDrawFlag() { mFlag = 0; }
void onDrawFlag() { mFlag = 1; }

/* 0xAC8 */ u32 field_0xac8;
/* 0xACC */ u32 field_0xacc;
/* 0xAC8 */ J3DModel* field_0xac8;
/* 0xACC */ int mObjNum;
/* 0xAD0 */ u32 field_0xad0;
/* 0xAD4 */ u32 field_0xad4;
/* 0xAD8 */ u8 field_0xad8;
/* 0xAD4 */ f32 field_0xad4;
/* 0xAD8 */ u8 mFlag;
};

#endif /* D_A_NPC_FGUARD_H */
10 changes: 5 additions & 5 deletions src/d/actor/d_a_npc_cd2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,12 +1824,12 @@ void daNpcCd2_c::setHitodamaParticle() {
};

field_0xac0 = (u16)(field_0xac2 * 2);
field_0xab4 = 8.0f * cM_ssin(field_0xac2);
field_0xab8 = 4.0f * cM_ssin(field_0xac0);
field_0xabc = field_0xab4 * -cM_ssin(shape_angle.y);
field_0xab4 = field_0xab4 * cM_scos(shape_angle.y);
field_0xab4.x = 8.0f * cM_ssin(field_0xac2);
field_0xab4.y = 4.0f * cM_ssin(field_0xac0);
field_0xab4.z = field_0xab4.x * -cM_ssin(shape_angle.y);
field_0xab4.x = field_0xab4.x * cM_scos(shape_angle.y);
field_0xac2 += 0x400;
cXyz local_28(eyePos.x + field_0xab4, eyePos.y + field_0xab8, eyePos.z + field_0xabc);
cXyz local_28(eyePos.x + field_0xab4.x, eyePos.y + field_0xab4.y, eyePos.z + field_0xab4.z);
for (int i = 0; i < 2; i++) {
mHitodamaEmitters[i] =
dComIfGp_particle_set(mHitodamaEmitters[i], id[i], &local_28, &shape_angle, 0);
Expand Down
Loading