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

Match daNpc_Jagar_c::chkToMotion (#2319)

This commit is contained in:
hatal175 2025-03-09 01:25:30 +02:00 committed by GitHub
parent a18a828463
commit 569344ccf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/d/actor/d_a_npc_jagar.h
View File

@ -123,14 +123,14 @@ public:
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
/* 80A1A274 */ s32 getEyeballMaterialNo();
/* 80A1A27C */ s32 getHeadJointNo();
/* 80A1A284 */ s32 getNeckJointNo();
/* 80A1A28C */ s32 getBackboneJointNo();
/* 80A1A274 */ s32 getEyeballMaterialNo() { return 1; }
/* 80A1A27C */ s32 getHeadJointNo() { return 4; }
/* 80A1A284 */ s32 getNeckJointNo() { return 3; }
/* 80A1A28C */ s32 getBackboneJointNo() { return 1; }
/* 80A1A294 */ BOOL checkChangeJoint(int param_1) { return param_1 == 4; }
/* 80A1A2A4 */ BOOL checkRemoveJoint(int param_1) { return param_1 == 8; }
/* 80A1A2B4 */ s32 getFootLJointNo();
/* 80A1A2BC */ s32 getFootRJointNo();
/* 80A1A2B4 */ s32 getFootLJointNo() { return 22; }
/* 80A1A2BC */ s32 getFootRJointNo() { return 26; }
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;

41
src/d/actor/d_a_npc_jagar.cpp
View File

@ -1172,12 +1172,7 @@ int daNpc_Jagar_c::chkChuMotion() {
/* 80A179F8-80A17A2C 0033D8 0034+00 1/1 0/0 0/0 .text chkToMotion__13daNpc_Jagar_cFv */
int daNpc_Jagar_c::chkToMotion() {
// NONMATCHING
u8 rv = 0;
if (mMotionSeqMngr.getNo() == 10 || mMotionSeqMngr.getNo() == 11 || mMotionSeqMngr.getNo() == 12 || mMotionSeqMngr.getNo() == 13) {
rv = 1;
}
return rv;
return mMotionSeqMngr.getNo() == 10 || mMotionSeqMngr.getNo() == 11 || mMotionSeqMngr.getNo() == 12 || mMotionSeqMngr.getNo() == 13;
}
/* 80A17A2C-80A1856C 00340C 0B40+00 1/0 0/0 0/0 .text wait__13daNpc_Jagar_cFPv */
@ -1558,40 +1553,6 @@ static int daNpc_Jagar_IsDelete(void* i_this) {
return 1;
}
/* 80A1A274-80A1A27C 005C54 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Jagar_cFv */
s32 daNpc_Jagar_c::getEyeballMaterialNo() {
return true;
}
/* 80A1A27C-80A1A284 005C5C 0008+00 1/0 0/0 0/0 .text getHeadJointNo__13daNpc_Jagar_cFv
*/
s32 daNpc_Jagar_c::getHeadJointNo() {
return 4;
}
/* 80A1A284-80A1A28C 005C64 0008+00 1/0 0/0 0/0 .text getNeckJointNo__13daNpc_Jagar_cFv
*/
s32 daNpc_Jagar_c::getNeckJointNo() {
return 3;
}
/* 80A1A28C-80A1A294 005C6C 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__13daNpc_Jagar_cFv */
long daNpc_Jagar_c::getBackboneJointNo() {
return 1;
}
/* 80A1A2B4-80A1A2BC 005C94 0008+00 1/0 0/0 0/0 .text getFootLJointNo__13daNpc_Jagar_cFv
*/
s32 daNpc_Jagar_c::getFootLJointNo() {
return 22;
}
/* 80A1A2BC-80A1A2C4 005C9C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__13daNpc_Jagar_cFv
*/
s32 daNpc_Jagar_c::getFootRJointNo() {
return 26;
}
/* 80A1AC10-80A1AC30 -00001 0020+00 1/0 0/0 0/0 .data daNpc_Jagar_MethodTable */
static actor_method_class daNpc_Jagar_MethodTable = {
(process_method_func)daNpc_Jagar_Create,