From 5571ec74e4191e00130a1f1c0b3851aaf6478321 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 28 Feb 2025 18:04:05 -0500 Subject: [PATCH] Document the second param to joint callback functions --- include/JSystem/J3DGraphAnimator/J3DNode.h | 17 +++++++++++++---- include/d/actor/d_a_obj_barrier.h | 2 +- src/JSystem/J3DGraphAnimator/J3DJoint.cpp | 4 ++-- src/JSystem/J3DGraphAnimator/J3DNode.cpp | 1 - src/d/actor/d_a_am.cpp | 4 ++-- src/d/actor/d_a_am2.cpp | 4 ++-- src/d/actor/d_a_bk.cpp | 8 ++++---- src/d/actor/d_a_fan.cpp | 4 ++-- src/d/actor/d_a_leaflift.cpp | 6 +++--- src/d/actor/d_a_lwood.cpp | 5 ++--- src/d/actor/d_a_mozo.cpp | 6 +++--- src/d/actor/d_a_npc_bs1.cpp | 4 ++-- src/d/actor/d_a_npc_btsw2.cpp | 4 ++-- src/d/actor/d_a_npc_ji1.cpp | 12 ++++++------ src/d/actor/d_a_npc_kamome.cpp | 4 ++-- src/d/actor/d_a_npc_md.cpp | 20 ++++++++++---------- src/d/actor/d_a_npc_nz.cpp | 16 ++++++++-------- src/d/actor/d_a_npc_os.cpp | 8 ++++---- src/d/actor/d_a_npc_people.cpp | 4 ++-- src/d/actor/d_a_npc_roten.cpp | 4 ++-- src/d/actor/d_a_obj_lpalm.cpp | 4 ++-- src/d/actor/d_a_obj_mknjd.cpp | 12 ++++++------ src/d/actor/d_a_player_fan.inc | 8 ++++---- src/d/actor/d_a_player_main.cpp | 12 ++++++------ src/d/actor/d_a_rd.cpp | 8 ++++---- src/d/actor/d_a_syan.cpp | 4 ++-- src/d/actor/d_a_toge.cpp | 4 ++-- src/d/actor/d_a_tornado.cpp | 8 ++++---- src/d/d_com_static.cpp | 4 ++-- 29 files changed, 104 insertions(+), 97 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DNode.h b/include/JSystem/J3DGraphAnimator/J3DNode.h index 954fde898..71998bb55 100644 --- a/include/JSystem/J3DGraphAnimator/J3DNode.h +++ b/include/JSystem/J3DGraphAnimator/J3DNode.h @@ -1,11 +1,19 @@ #ifndef J3DNODE_H #define J3DNODE_H -#include "dolphin/mtx/mtx.h" +#include "dolphin/types.h" class J3DNode; class J3DModelData; + typedef int (*J3DNodeCallBack)(J3DNode*, int); +// The second argument to a J3DNodeCallBack determines the timing that the callback was called at. +// In: Called after the current joint has been calced, but before its children and younger siblings have been calced. +// Out: Called after the current joint and its children have been calced, but before its younger siblings have been calced. +enum { + J3DNodeCBCalcTiming_In = 0, + J3DNodeCBCalcTiming_Out = 1, +}; class J3DNode { public: @@ -19,11 +27,12 @@ public: J3DNode(); void appendChild(J3DNode*); + J3DNodeCallBack getCallBack() { return mCallBack; } + void setCallBack(J3DNodeCallBack callback) { mCallBack = callback; } + J3DNode* getChild() { return mChild; } + // "Younger" sibling. The next node after this one that was appended to the same parent. J3DNode* getYounger() { return mYounger; } void setYounger(J3DNode* pYounger) { mYounger = pYounger; } - void setCallBack(J3DNodeCallBack callback) { mCallBack = callback; } - J3DNodeCallBack getCallBack() { return mCallBack; } - J3DNode* getChild() { return mChild; } /* 0x04 */ void* mCallBackUserData; /* 0x08 */ J3DNodeCallBack mCallBack; diff --git a/include/d/actor/d_a_obj_barrier.h b/include/d/actor/d_a_obj_barrier.h index b06aa474b..1244a7b4d 100644 --- a/include/d/actor/d_a_obj_barrier.h +++ b/include/d/actor/d_a_obj_barrier.h @@ -1,7 +1,7 @@ #ifndef D_A_OBJ_BARRIER_H #define D_A_OBJ_BARRIER_H -#include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_actor.h" #include "m_Do/m_Do_ext.h" #include "d/d_a_obj.h" diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp index 31f2ab631..4d0a67989 100644 --- a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -38,7 +38,7 @@ void J3DMtxCalcBasic::recursiveCalc(J3DNode* node) { mtxCalc.setBackupParentS(J3DSys::mParentS); node->calcIn(); if (node->getCallBack()) { - node->getCallBack()(node, 0); + node->getCallBack()(node, J3DNodeCBCalcTiming_In); } recursiveCalc(node->getChild()); MTXCopy(mtxCalc.getBackupMtx(), J3DSys::mCurrentMtx); @@ -46,7 +46,7 @@ void J3DMtxCalcBasic::recursiveCalc(J3DNode* node) { J3DSys::mParentS = mtxCalc.getBackupParentS(); node->calcOut(); if (node->getCallBack()) { - node->getCallBack()(node, 1); + node->getCallBack()(node, J3DNodeCBCalcTiming_Out); } recursiveCalc(node->getYounger()); } diff --git a/src/JSystem/J3DGraphAnimator/J3DNode.cpp b/src/JSystem/J3DGraphAnimator/J3DNode.cpp index 59e667aaf..bd91ec3ba 100644 --- a/src/JSystem/J3DGraphAnimator/J3DNode.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DNode.cpp @@ -4,7 +4,6 @@ // #include "JSystem/J3DGraphAnimator/J3DNode.h" -#include "dolphin/types.h" /* 802F5BA4-802F5BC8 .text __ct__7J3DNodeFv */ J3DNode::J3DNode() { diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 7b5459e9d..d7f44d351 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -35,8 +35,8 @@ enum Action { }; /* 00000078-0000021C .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 18e4f4f53..73076b51f 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -33,8 +33,8 @@ enum Action { }; /* 00000078-000001B0 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index cbe758ad8..207f18d38 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -260,8 +260,8 @@ static void ground_smoke_set(bk_class* i_this) { } /* 000011F0-00001454 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); int r28 = joint_check[jntNo]; @@ -318,8 +318,8 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) { } /* 00001454-00001564 .text nodeCallBack_P__FP7J3DNodei */ -static BOOL nodeCallBack_P(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack_P(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); int r30 = joint_check[jntNo]; diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 95bf6b641..efdb5b8ff 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -135,8 +135,8 @@ int daFan_c::Create() { } /* 00000640-000006F4 .text nodeCallBack__FP7J3DNodei */ -static int nodeCallBack(J3DNode* node, int timing) { - if (timing == 0) { +static int nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; u32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index bb9d879be..261177507 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -99,7 +99,7 @@ BOOL daLlift_c::CreateHeap() { return TRUE; } -static BOOL nodeCallBack(J3DNode* node, int idx); +static BOOL nodeCallBack(J3DNode* node, int calcTiming); /* 00000338-000005F8 .text CreateInit__9daLlift_cFv */ void daLlift_c::CreateInit() { @@ -164,8 +164,8 @@ s32 daLlift_c::_create() { } /* 00000918-000009C4 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int idx) { - if (!idx) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index 5a83263f9..674bfc3e3 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -62,12 +62,11 @@ BOOL daLwood_c::CreateInit() { } /* 000002E0-000004D8 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* joint, int timing) { - /* Nonmatching */ +static BOOL nodeCallBack(J3DNode* joint, int calcTiming) { if (mDoGph_gInf_c::isMonotone()) return TRUE; - if (timing == 0) { + if (calcTiming == J3DNodeCBCalcTiming_In) { u32 jntNo = ((J3DJoint*)joint)->getJntNo(); J3DModel* model = j3dSys.getModel(); daLwood_c* i_this = (daLwood_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 1e7423569..a39315af2 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -50,7 +50,7 @@ static BOOL daMozo_nodeCallBackFire(daMozo_c*, J3DModel*, J3DNode*, int) { } /* 00000728-0000078C .text daMozo_nodeCallBack__FP7J3DNodei */ -static BOOL daMozo_nodeCallBack(J3DNode* node, int idx) { +static BOOL daMozo_nodeCallBack(J3DNode* node, int calcTiming) { /* Nonmatching */ J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); @@ -58,8 +58,8 @@ static BOOL daMozo_nodeCallBack(J3DNode* node, int idx) { daMozo_c* i_this = (daMozo_c*)model->getUserArea(); switch (i_this->field_0x376) { - case 0: return daMozo_nodeCallBackBeam(i_this, model, node, idx); - case 1: return daMozo_nodeCallBackFire(i_this, model, node, idx); + case 0: return daMozo_nodeCallBackBeam(i_this, model, node, calcTiming); + case 1: return daMozo_nodeCallBackFire(i_this, model, node, calcTiming); } return TRUE; diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 6cf947677..db88c0976 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -153,8 +153,8 @@ static const int l_btp_ix_tbl[] = { }; /* 00000490-00000658 .text nodeCallBack_Bs__FP7J3DNodei */ -static BOOL nodeCallBack_Bs(J3DNode* node, int value) { - if (!value) { +static BOOL nodeCallBack_Bs(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Bs1_c* i_this = (daNpc_Bs1_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index ab2f8759d..178377c11 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -95,8 +95,8 @@ static const int l_btp_ix_tbl[] = { }; /* 000001A8-000003E0 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Btsw2_c* i_this = (daNpc_Btsw2_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 5615230a9..375c1fc8a 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -3031,10 +3031,10 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { } /* 0000DAB0-0000DC04 .text nodeCallBack1__FP7J3DNodei */ -static BOOL nodeCallBack1(J3DNode* node, int param_1) { +static BOOL nodeCallBack1(J3DNode* node, int calcTiming) { /* Nonmatching */ - if (!param_1) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Ji1_c* i_this = (daNpc_Ji1_c*)model->getUserArea(); @@ -3064,8 +3064,8 @@ static BOOL nodeCallBack1(J3DNode* node, int param_1) { } /* 0000DC04-0000DD68 .text nodeCallBack2__FP7J3DNodei */ -static BOOL nodeCallBack2(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack2(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Ji1_c* i_this = (daNpc_Ji1_c*)model->getUserArea(); @@ -3095,8 +3095,8 @@ static BOOL nodeCallBack2(J3DNode* node, int param_1) { } /* 0000DD68-0000DE90 .text nodeCallBack3__FP7J3DNodei */ -static BOOL nodeCallBack3(J3DNode* node, int param_1) { - if (param_1) { +static BOOL nodeCallBack3(J3DNode* node, int calcTiming) { + if (calcTiming != J3DNodeCBCalcTiming_In) { return true; } else { diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index d4d7fc1ba..8b0108a65 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -195,8 +195,8 @@ void daNpc_kam_c::setBaseMtx() { } /* 00000C00-00000CD0 .text headNodeCallBack__FP7J3DNodei */ -static int headNodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static int headNodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; J3DModel* model = j3dSys.getModel(); daNpc_kam_c* i_this = (daNpc_kam_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 4202f3092..19ca9aebd 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -472,8 +472,8 @@ s32 daNpc_Md_c::create() { } /* 000012C0-00001444 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Md_c* i_this = (daNpc_Md_c*)model->getUserArea(); @@ -503,8 +503,8 @@ static Vec waistVecDat[4] = { }; /* 00001444-0000154C .text waistNodeCallBack__FP7J3DNodei */ -static BOOL waistNodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL waistNodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Md_c* i_this = (daNpc_Md_c*)model->getUserArea(); @@ -527,10 +527,10 @@ static BOOL waistNodeCallBack(J3DNode* node, int param_1) { } /* 0000154C-0000160C .text armNodeCallBack__FP7J3DNodei */ -static BOOL armNodeCallBack(J3DNode* node, int param_1) { +static BOOL armNodeCallBack(J3DNode* node, int calcTiming) { // This handles copying the matrices of Medli's arms and wings from the body model to the // separate arm/wing models. - if (!param_1) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* armModel = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Md_c* i_this = (daNpc_Md_c*)armModel->getUserArea(); @@ -593,8 +593,8 @@ static BOOL hairCross(cXyz* i_r3, cXyz* i_r4, cXyz* i_r5) { } /* 00001CBC-00001D0C .text hairTopNodeCallBack__FP7J3DNodei */ -static BOOL hairTopNodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL hairTopNodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); daNpc_Md_c* i_this = (daNpc_Md_c*)model->getUserArea(); if (i_this) { @@ -649,8 +649,8 @@ static s16 baseAngleX[] = { }; /* 00001F5C-0000240C .text hairNodeCallBack__FP7J3DNodei */ -static BOOL hairNodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL hairNodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); daNpc_Md_c* i_this = (daNpc_Md_c*)model->getUserArea(); if (i_this) { diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 3d95bea5f..1797a4911 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -19,13 +19,13 @@ const char daNpc_Nz_c::m_arc_name[] = "NZ"; const char daNpc_Nz_c::m_bdl_arc_name[] = "Npcnz"; /* 000000EC-00000128 .text daNpcNz_NodeCallBack__FP7J3DNodei */ -static BOOL daNpcNz_NodeCallBack(J3DNode* node, int param_1) { - return reinterpret_cast(j3dSys.getModel()->getUserArea())->NodeCallBack(node, param_1); +static BOOL daNpcNz_NodeCallBack(J3DNode* node, int calcTiming) { + return reinterpret_cast(j3dSys.getModel()->getUserArea())->NodeCallBack(node, calcTiming); } /* 00000128-0000024C .text NodeCallBack__10daNpc_Nz_cFP7J3DNodei */ -BOOL daNpc_Nz_c::NodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +BOOL daNpc_Nz_c::NodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); @@ -50,13 +50,13 @@ BOOL daNpc_Nz_c::NodeCallBack(J3DNode* node, int param_1) { } /* 00000288-000002C4 .text daNpcNz_TailNodeCallBack__FP7J3DNodei */ -static BOOL daNpcNz_TailNodeCallBack(J3DNode* node, int param_1) { - return reinterpret_cast(j3dSys.getModel()->getUserArea())->TailNodeCallBack(node, param_1); +static BOOL daNpcNz_TailNodeCallBack(J3DNode* node, int calcTiming) { + return reinterpret_cast(j3dSys.getModel()->getUserArea())->TailNodeCallBack(node, calcTiming); } /* 000002C4-000003A4 .text TailNodeCallBack__10daNpc_Nz_cFP7J3DNodei */ -BOOL daNpc_Nz_c::TailNodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +BOOL daNpc_Nz_c::TailNodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); s32 idx = 0; diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 42fc95b12..0bc5c4766 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -185,8 +185,8 @@ s32 daNpc_Os_c::create() { } /* 00000748-000008CC .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpc_Os_c* i_this = (daNpc_Os_c*)model->getUserArea(); @@ -210,8 +210,8 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) { } /* 000008CC-00000988 .text tunoNodeCallBack__FP7J3DNodei */ -static BOOL tunoNodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL tunoNodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; J3DModel* model = j3dSys.getModel(); daNpc_Os_c* i_this = (daNpc_Os_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index 7bef9a33b..b650bdd40 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -4078,8 +4078,8 @@ daNpcPeople_c::daNpcPeople_c() { } /* 00000624-0000073C .text daNpc_People_nodeCallBack__FP7J3DNodei */ -static BOOL daNpc_People_nodeCallBack(J3DNode* node, int param_1) { - if(!param_1) { +static BOOL daNpc_People_nodeCallBack(J3DNode* node, int calcTiming) { + if(calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; J3DModel* model = j3dSys.getModel(); daNpcPeople_c* i_this = (daNpcPeople_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index a5dc55a01..b89d5a1d0 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -1555,8 +1555,8 @@ daNpcRoten_c::daNpcRoten_c() { } /* 000007B4-000008CC .text daNpc_Roten_nodeCallBack__FP7J3DNodei */ -static BOOL daNpc_Roten_nodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL daNpc_Roten_nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)node; daNpcRoten_c* i_this = (daNpcRoten_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index c77393db1..03d2de274 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -19,11 +19,11 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 00000098-00000164 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* joint, int timing) { +static BOOL nodeCallBack(J3DNode* joint, int calcTiming) { J3DModel* model = j3dSys.getModel(); s32 jntNo = ((J3DJoint*)joint)->getJntNo(); daObjLpalm_c* i_this = (daObjLpalm_c*)model->getUserArea(); - if (timing == 0 && (jntNo == 2 || jntNo == 3)) { + if (calcTiming == J3DNodeCBCalcTiming_In && (jntNo == 2 || jntNo == 3)) { mDoMtx_stack_c::copy(model->getAnmMtx(jntNo)); mDoMtx_stack_c::ZrotM(-0x4000); mDoMtx_stack_c::quatM(&i_this->mBaseQuat); diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 067482480..5d562f998 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -76,8 +76,8 @@ static u16 joint_number_table[20]; Mtx daObjMknjD::Act_c::M_tmp_mtx; /* 00000078-0000012C .text nodeCallBackL__FP7J3DNodei */ -static BOOL nodeCallBackL(J3DNode* i_node, int i_param2) { - if (i_param2 == 0) { +static BOOL nodeCallBackL(J3DNode* i_node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { int jntNo = static_cast(i_node)->getJntNo(); J3DModel* mdl = j3dSys.getModel(); @@ -97,8 +97,8 @@ static BOOL nodeCallBackL(J3DNode* i_node, int i_param2) { } /* 0000012C-000001E0 .text nodeCallBackR__FP7J3DNodei */ -static BOOL nodeCallBackR(J3DNode* i_node, int i_param2) { - if (i_param2 == 0) { +static BOOL nodeCallBackR(J3DNode* i_node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { int jntNo = static_cast(i_node)->getJntNo(); J3DModel* mdl = j3dSys.getModel(); @@ -118,8 +118,8 @@ static BOOL nodeCallBackR(J3DNode* i_node, int i_param2) { } /* 000001E0-000002B0 .text nodeCallBack_Hahen__FP7J3DNodei */ -static BOOL nodeCallBack_Hahen(J3DNode* i_node, int i_param2) { - if (i_param2 == 0) { +static BOOL nodeCallBack_Hahen(J3DNode* i_node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { int jntNo = static_cast(i_node)->getJntNo(); u16 shardIdx = joint_number_table[jntNo - 1]; diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 7ef49e835..2ad14c9db 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -31,8 +31,8 @@ void daPy_lk_c::fanJointCB(int) { } /* 8014BBE8-8014BC2C .text daPy_fanJointCallback__FP7J3DNodei */ -BOOL daPy_fanJointCallback(J3DNode* node, int param_1) { - if (!param_1) { +BOOL daPy_fanJointCallback(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = static_cast(node); s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); @@ -48,8 +48,8 @@ void daPy_lk_c::parachuteJointCB(int) { } /* 8014BD08-8014BD4C .text daPy_parachuteJointCallback__FP7J3DNodei */ -BOOL daPy_parachuteJointCallback(J3DNode* node, int param_1) { - if (!param_1) { +BOOL daPy_parachuteJointCallback(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = static_cast(node); s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 8859f4858..499f6da24 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -367,8 +367,8 @@ BOOL daPy_lk_c::auraJointCB0(int jntNo) { } /* 80103450-80103494 .text daPy_auraCallback__FP7J3DNodei */ -static BOOL daPy_auraCallback(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL daPy_auraCallback(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = static_cast(node); s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); @@ -407,8 +407,8 @@ BOOL daPy_lk_c::jointCB0(int) { } /* 80103EE4-80103F28 .text daPy_jointCallback0__FP7J3DNodei */ -static BOOL daPy_jointCallback0(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL daPy_jointCallback0(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = static_cast(node); s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); @@ -424,8 +424,8 @@ BOOL daPy_lk_c::jointCB1() { } /* 80104178-801041B4 .text daPy_jointCallback1__FP7J3DNodei */ -static BOOL daPy_jointCallback1(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL daPy_jointCallback1(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); daPy_lk_c* i_this = reinterpret_cast(model->getUserArea()); i_this->jointCB1(); diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 4914d4b19..2d7f6d887 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -120,8 +120,8 @@ fopAc_ac_c* daRd_c::_searchNearDeadRd(fopAc_ac_c* i_actor) { } /* 0000030C-00000358 .text nodeControl_CB__FP7J3DNodei */ -static BOOL nodeControl_CB(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeControl_CB(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); daRd_c* i_this = reinterpret_cast(model->getUserArea()); if (i_this) { @@ -157,8 +157,8 @@ BOOL daRd_c::_nodeControl(J3DNode* node, J3DModel* model) { } /* 00000550-0000059C .text nodeHeadControl_CB__FP7J3DNodei */ -static BOOL nodeHeadControl_CB(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL nodeHeadControl_CB(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); daRd_c* i_this = reinterpret_cast(model->getUserArea()); if (i_this) { diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index ed8a1aafc..3f2ab527e 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -17,9 +17,9 @@ static f32 b_pos_y[6] = { -560.0f, -760.0f, -630.0f, -710.0f, -670.0f, -690.0f } static f32 b_pos_z[6] = { 0.0f, 750.0f, 750.0f, 0.0f, -720.0f, -750.0f }; /* 000000EC-000002D4 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int timing) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { J3DJoint* joint = (J3DJoint*)node; - if (timing == 0) { + if (calcTiming == J3DNodeCBCalcTiming_In) { s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); syan_class* i_this = (syan_class*)model->getUserArea(); diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index c455b7b49..6a71b975a 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -88,8 +88,8 @@ BOOL daToge_c::CreateHeap() { } /* 00000290-00000348 .text nodeCallBack__FP7J3DNodei */ -static BOOL nodeCallBack(J3DNode* node, int timing) { - if (timing == 0) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; u32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 20220c7f9..f3f7c2a89 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -43,14 +43,14 @@ BOOL daTornado_c::jointCallBack(int jntNo) { return TRUE; } -static const float l_joint_scale[11] = { 0.1, 0.4, 0.7, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 }; -static const float joint_offset[11] = { 100.0, 200.0, 300.0, 400.0, 300.0, 300.0, 400.0, 500.0, 400.0, 500.0, 600.0 }; +static const float l_joint_scale[11] = { 0.1f, 0.4f, 0.7f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f }; +static const float joint_offset[11] = { 100.0f, 200.0f, 300.0f, 400.0f, 300.0f, 300.0f, 400.0f, 500.0f, 400.0f, 500.0f, 600.0f }; static daTornado_HIO_c0 l_HIO; /* 00000260-000002A4 .text daTornado_jointCallBack__FP7J3DNodei */ -static BOOL daTornado_jointCallBack(J3DNode* node, int param_1) { - if (!param_1) { +static BOOL daTornado_jointCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 8a85e7749..89c4c5925 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -428,8 +428,8 @@ void daTitle_proc_c::daTitle_Kirakira_Sound_flag_on() { } /* 80056CCC-80056DE0 .text daiItemNodeCallBack__13daStandItem_cFP7J3DNodei */ -BOOL daStandItem_c::daiItemNodeCallBack(J3DNode* node, int param_1) { - if (!param_1) { +BOOL daStandItem_c::daiItemNodeCallBack(J3DNode* node, int calcTiming) { + if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel();