mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-31 07:45:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc work (#2306)

Browse Source
This commit is contained in:
Caroline Madsen
2025-02-23 17:43:25 -05:00
committed by GitHub
parent f628e2e6ff
commit c1d444de70
89 changed files with 2058 additions and 2945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc.cpp
+1497 -1326
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_bans.cpp
-15
View File
@@ -1533,16 +1533,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80967910-80967918 005130 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80967918-80967920 005138 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80967920-80967928 005140 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1563,11 +1553,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80967938-8096793C 005158 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 8096793C-80967944 00515C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_besu.cpp
-15
View File
@@ -2190,16 +2190,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 8053E2AC-8053E2B4 00754C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 8053E2B4-8053E2BC 007554 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 8053E2BC-8053E2C4 00755C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -2220,11 +2210,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 8053E2D4-8053E2D8 007574 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 8053E2D8-8053E2E0 007578 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_bou.cpp
+4 -19
View File
@@ -1113,7 +1113,7 @@ void daNpc_Bou_c::setParam() {
}
/* 8096DF9C-8096E0EC 0010FC 0150+00 1/0 0/0 0/0 .text checkChangeEvt__11daNpc_Bou_cFv */
bool daNpc_Bou_c::checkChangeEvt() {
BOOL daNpc_Bou_c::checkChangeEvt() {
// NONMATCHING
}
@@ -1138,17 +1138,17 @@ void daNpc_Bou_c::srchActors() {
}
/* 8096E27C-8096E31C 0013DC 00A0+00 1/0 0/0 0/0 .text evtTalk__11daNpc_Bou_cFv */
bool daNpc_Bou_c::evtTalk() {
BOOL daNpc_Bou_c::evtTalk() {
// NONMATCHING
}
/* 8096E31C-8096E324 00147C 0008+00 1/0 0/0 0/0 .text evtEndProc__11daNpc_Bou_cFv */
bool daNpc_Bou_c::evtEndProc() {
BOOL daNpc_Bou_c::evtEndProc() {
return true;
}
/* 8096E324-8096E3EC 001484 00C8+00 1/0 0/0 0/0 .text evtCutProc__11daNpc_Bou_cFv */
bool daNpc_Bou_c::evtCutProc() {
BOOL daNpc_Bou_c::evtCutProc() {
// NONMATCHING
}
@@ -1548,16 +1548,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 809724C4-809724CC 005624 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 809724CC-809724D4 00562C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 809724D4-809724DC 005634 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1572,11 +1562,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 809724E4-809724E8 005644 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 809724E8-809724F0 005648 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_clerka.cpp
-20
View File
@@ -1171,16 +1171,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 8099546C-80995474 00302C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80995474-8099547C 003034 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 8099547C-80995484 00303C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1195,22 +1185,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 8099548C-80995494 00304C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80995494-8099549C 003054 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 8099549C-809954A0 00305C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 809954A0-809954A8 003060 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_clerkb.cpp
-20
View File
@@ -1236,16 +1236,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80999528-80999530 0036E8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80999530-80999538 0036F0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80999538-80999540 0036F8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1260,22 +1250,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80999548-80999550 003708 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80999550-80999558 003710 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80999558-8099955C 003718 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 8099955C-80999564 00371C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_clerkt.cpp
-20
View File
@@ -1126,16 +1126,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 8099CE5C-8099CE64 002DFC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 8099CE64-8099CE6C 002E04 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 8099CE6C-8099CE74 002E0C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1150,22 +1140,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 8099CE7C-8099CE84 002E1C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 8099CE84-8099CE8C 002E24 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 8099CE8C-8099CE90 002E2C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 8099CE90-8099CE98 002E30 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_doc.cpp
-5
View File
@@ -1331,11 +1331,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 809AA080-809AA084 0034E0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 809AA084-809AA09C 0034E4 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */
// void daNpcT_c::decTmr() {
extern "C" void decTmr__8daNpcT_cFv() {
src/d/actor/d_a_npc_fairy.cpp
-10
View File
@@ -2581,16 +2581,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 809B8DC8-809B8DD0 0073A8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 809B8DD0-809B8DD8 0073B0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 809B8DD8-809B8DE0 0073B8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
src/d/actor/d_a_npc_fairy_seirei.cpp
-45
View File
@@ -825,31 +825,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80541A78-80541A80 001BF8 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 80541A80-80541A88 001C00 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80541A88-80541A90 001C08 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 80541A90-80541A98 001C10 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80541A98-80541AA0 001C18 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80541AA0-80541AA8 001C20 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -864,32 +839,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80541AB8-80541ABC 001C38 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80541ABC-80541AC4 001C3C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80541AC4-80541ACC 001C44 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80541ACC-80541AD0 001C4C 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */
void daNpcT_c::setAfterTalkMotion() {
/* empty function */
}
/* 80541AD0-80541AD4 001C50 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80541AD4-80541ADC 001C54 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_gnd.cpp
-20
View File
@@ -1046,32 +1046,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 809BE19C-809BE1A4 002C7C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 809BE1A4-809BE1AC 002C84 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 809BE1B4-809BE1BC 002C94 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 809BE1BC-809BE1C4 002C9C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 809BE1C4-809BE1C8 002CA4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 809BE1C8-809BE1D0 002CA8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_grm.cpp
-20
View File
@@ -1148,11 +1148,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 809D68C0-809D68C8 002940 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 809D68C8-809D69E4 002948 011C+00 1/1 0/0 0/0 .text setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs */
// void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f32 param_3,
// s16 param_4) {
@@ -1200,16 +1195,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 809D6BF0-809D6BF8 002C70 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 809D6BF8-809D6C00 002C78 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 809D6C00-809D6C08 002C80 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1224,11 +1209,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 809D6C10-809D6C14 002C90 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 809D6C14-809D6C1C 002C94 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_grmc.cpp
-20
View File
@@ -1183,16 +1183,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 809D9C1C-809D9C24 0028FC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 809D9C24-809D9C2C 002904 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 809D9C2C-809D9C34 00290C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1207,22 +1197,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 809D9C3C-809D9C44 00291C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 809D9C44-809D9C4C 002924 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 809D9C4C-809D9C50 00292C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 809D9C50-809D9C58 002930 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_hanjo.cpp
+179 -179
View File
@@ -769,7 +769,7 @@ int daNpc_Hanjo_c::create() {
l_motionSequenceData, 4, l_evtList, l_resNameList);
mType = getType();
field_0xa7c = getFlowNodeNo();
field_0xa89 = 0;
mTwilight = 0;
int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (rv == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (uint)mType,
@@ -785,28 +785,28 @@ int daNpc_Hanjo_c::create() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox2(this, modelData);
field_0x580.init(&current.pos, &eyePos, 3, 1);
field_0x9c0.init(&field_0x68c, 60.0f, 0.0f);
mSound.init(&current.pos, &eyePos, 3, 1);
field_0x9c0.init(&mAcch, 60.0f, 0.0f);
reset();
field_0x68c.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1,
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1,
&field_0x8a0, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this),
fopAcM_GetShapeAngle_p(this));
field_0x864.Init(daNpc_Hanjo_Param_c::m.field_0x10, 0, this);
mCcStts.Init(daNpc_Hanjo_Param_c::m.field_0x10, 0, this);
mCyl1.Set(mCcDCyl);
mCyl1.SetStts(&field_0x864);
mCyl1.SetStts(&mCcStts);
mCyl1.SetTgHitCallback(tgHitCallBack);
mCyl2.Set(mCcDCyl);
mCyl2.SetStts(&field_0x864);
field_0x68c.CrrPos(dComIfG_Bgsp());
field_0x930 = field_0x68c.m_gnd;
field_0xdf4 = field_0x68c.GetGroundH();
if (field_0xdf4 != -1e9f) {
mCyl2.SetStts(&mCcStts);
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.GetGroundH();
if (mGroundH != -1e9f) {
setEnvTevColor();
setRoomNo();
}
for (int i = 0; i < 4; i ++) {
mStones[i].getSphP()->Set(*(dCcD_SrcSph*)&mStoneCcDSph);
mStones[i].getSphP()->SetStts(&field_0x864);
mStones[i].getSphP()->SetStts(&mCcStts);
}
field_0xa88 = 1;
Execute();
@@ -832,7 +832,7 @@ int daNpc_Hanjo_c::CreateHeap() {
if (modelData == NULL) {
return 0;
}
mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &field_0x580,
mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound,
0x80000, 0x11020284);
if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) {
return 0;
@@ -842,8 +842,8 @@ int daNpc_Hanjo_c::CreateHeap() {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
field_0x96c = new daNpcT_MatAnm_c();
if (field_0x96c == NULL) {
mpMatAnm = new daNpcT_MatAnm_c();
if (mpMatAnm == NULL) {
return 0;
}
switch (mType) {
@@ -914,9 +914,9 @@ int daNpc_Hanjo_c::Execute() {
/* 809F9B8C-809F9C20 000BEC 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Hanjo_cFv */
int daNpc_Hanjo_c::Draw() {
if (field_0x96c != NULL) {
if (mpMatAnm != NULL) {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(field_0x96c);
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
}
@@ -981,8 +981,8 @@ int daNpc_Hanjo_c::isDelete() {
void daNpc_Hanjo_c::reset() {
csXyz acStack_20;
int iVar1 = (u8*)&field_0x1728 - (u8*)&field_0x16e0;
if (field_0x96c != NULL) {
field_0x96c->initialize();
if (mpMatAnm != NULL) {
mpMatAnm->initialize();
}
initialize();
for (int i = 0; i < 4; i++) {
@@ -1058,7 +1058,7 @@ void daNpc_Hanjo_c::setParam() {
attention_info.flags = 0xa;
scale.set(daNpc_Hanjo_Param_c::m.field_0x08, daNpc_Hanjo_Param_c::m.field_0x08,
daNpc_Hanjo_Param_c::m.field_0x08);
field_0x864.SetWeight(daNpc_Hanjo_Param_c::m.field_0x10);
mCcStts.SetWeight(daNpc_Hanjo_Param_c::m.field_0x10);
field_0xdec = daNpc_Hanjo_Param_c::m.field_0x14;
field_0xdf0 = daNpc_Hanjo_Param_c::m.field_0x1c;
field_0xdf8 = daNpc_Hanjo_Param_c::m.field_0x50;
@@ -1072,12 +1072,12 @@ void daNpc_Hanjo_c::setParam() {
/* 809FA1C4-809FA3B8 001224 01F4+00 1/0 0/0 0/0 .text checkChangeEvt__13daNpc_Hanjo_cFv
*/
bool daNpc_Hanjo_c::checkChangeEvt() {
BOOL daNpc_Hanjo_c::checkChangeEvt() {
if (!chkAction(&daNpc_Hanjo_c::talk)) {
field_0xe2e[0] = 0;
if (dComIfGp_event_chkTalkXY()) {
if (dComIfGp_evmng_ChkPresentEnd()) {
field_0xe30 = 1;
mEvtNo = 1;
evtChange();
}
return true;
@@ -1110,7 +1110,7 @@ bool daNpc_Hanjo_c::checkChangeEvt() {
}
if (sVar3 != 0) {
field_0xe30 = sVar3;
mEvtNo = sVar3;
evtChange();
return true;
}
@@ -1118,9 +1118,9 @@ bool daNpc_Hanjo_c::checkChangeEvt() {
break;
case TYPE_3:
if (daNpcT_chkEvtBit(0x24d)) {
field_0xe30 = 3;
mEvtNo = 3;
} else {
field_0xe30 = 2;
mEvtNo = 2;
}
evtChange();
return 1;
@@ -1133,7 +1133,7 @@ bool daNpc_Hanjo_c::checkChangeEvt() {
/* 809FA3B8-809FA45C 001418 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Hanjo_cFv */
void daNpc_Hanjo_c::setAfterTalkMotion() {
int iVar2 = 7;
switch(field_0xb50.getNo()) {
switch(mFaceMotionSeqMngr.getNo()) {
case 1:
iVar2 = 5;
break;
@@ -1146,7 +1146,7 @@ void daNpc_Hanjo_c::setAfterTalkMotion() {
iVar2 = 6;
break;
}
field_0xb50.setNo(iVar2, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
}
/* 809FA45C-809FA55C 0014BC 0100+00 1/1 0/0 0/0 .text srchActors__13daNpc_Hanjo_cFv */
@@ -1176,7 +1176,7 @@ void daNpc_Hanjo_c::srchActors() {
}
/* 809FA55C-809FA5FC 0015BC 00A0+00 1/0 0/0 0/0 .text evtTalk__13daNpc_Hanjo_cFv */
bool daNpc_Hanjo_c::evtTalk() {
BOOL daNpc_Hanjo_c::evtTalk() {
if (chkAction(&daNpc_Hanjo_c::talk)) {
(this->*field_0x16ec)(NULL);
} else {
@@ -1186,7 +1186,7 @@ bool daNpc_Hanjo_c::evtTalk() {
}
/* 809FA5FC-809FA6C4 00165C 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpc_Hanjo_cFv */
bool daNpc_Hanjo_c::evtCutProc() {
BOOL daNpc_Hanjo_c::evtCutProc() {
int staffId = dComIfGp_getEventManager().getMyStaffId("Hanjo", this, -1);
if (staffId != -1) {
field_0xdac = staffId;
@@ -1208,10 +1208,10 @@ void daNpc_Hanjo_c::action() {
if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != PROC_NPC_TK || mType != TYPE_1))
{
field_0xd08.setParam(this,
hitActor, field_0xd78.y);
hitActor, mCurAngle.y);
setDamage(0, 7, 0);
field_0xdb8 = 0;
field_0xba8.lookNone(1);
mDamageTimerStart = 0;
mJntAnm.lookNone(1);
}
}
if (field_0xd08.checkRebirth()) {
@@ -1238,7 +1238,7 @@ void daNpc_Hanjo_c::beforeMove() {
if (checkHide()) {
fopAcM_OnStatus(this, 0x8000000);
}
if (checkHide() || field_0xe2b != 0) {
if (checkHide() || mNoDraw != 0) {
attention_info.flags = 0;
}
for (int i = 0; i < 4; i++) {
@@ -1246,8 +1246,8 @@ void daNpc_Hanjo_c::beforeMove() {
if (cM3d_IsZero(mStones[i].getSpeedF()) == false) {
oldPos = mStones[i].getOld();
pos = mStones[i].getPos();
field_0xae0.Set(&oldPos, &pos, this);
if (!dComIfG_Bgsp().LineCross(&field_0xae0)) {
mLinChk.Set(&oldPos, &pos, this);
if (!dComIfG_Bgsp().LineCross(&mLinChk)) {
if (!mStones[i].getSphP()->ChkCoHit()) {
continue;
}
@@ -1382,25 +1382,25 @@ void daNpc_Hanjo_c::setAttnPos() {
cXyz cStack_38(-10.0f, 10.0f, 0.0f);
cXyz cStack_44;
field_0xd08.calc(0);
f32 dVar8 = cM_s2rad(field_0xd78.y - field_0xd7e.y);
f32 dVar8 = cM_s2rad(mCurAngle.y - field_0xd7e.y);
J3DModel* model = mpMorf[0]->getModel();
field_0xba8.setParam(this, model, &cStack_38, getBackboneJointNo(), getNeckJointNo(),
mJntAnm.setParam(this, model, &cStack_38, getBackboneJointNo(), getNeckJointNo(),
getHeadJointNo(), daNpc_Hanjo_Param_c::m.field_0x24, daNpc_Hanjo_Param_c::m.field_0x20,
daNpc_Hanjo_Param_c::m.field_0x2c, daNpc_Hanjo_Param_c::m.field_0x28,
daNpc_Hanjo_Param_c::m.field_0x34, daNpc_Hanjo_Param_c::m.field_0x30,
daNpc_Hanjo_Param_c::m.field_0x3c, daNpc_Hanjo_Param_c::m.field_0x38,
daNpc_Hanjo_Param_c::m.field_0x40, dVar8, NULL);
field_0xba8.calcJntRad(0.2f, 1.0f, dVar8);
mJntAnm.calcJntRad(0.2f, 1.0f, dVar8);
setMtx();
mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo()));
mDoMtx_stack_c::multVec(&cStack_38, &eyePos);
field_0xba8.setEyeAngleX(eyePos, 1.0f, 0);
field_0xba8.setEyeAngleY(eyePos, field_0xd78.y, 1, 1.0f, 0);
mJntAnm.setEyeAngleX(eyePos, 1.0f, 0);
mJntAnm.setEyeAngleY(eyePos, mCurAngle.y, 1, 1.0f, 0);
cStack_38.set(0.0f, 0.0f, 20.0f);
cStack_38.y = daNpc_Hanjo_Param_c::m.field_0x00;
if (field_0x1721 != 0) {
cStack_38.set(0.0f, 170.0f, -10.0f);
} else if (field_0xb74.getNo() == 2) {
} else if (mMotionSeqMngr.getNo() == 2) {
cStack_38.set(0.0f, 170.0f, -20.0f);
}
if (1.0f <= mpMorf[0]->getMorfRatio()) {
@@ -1410,7 +1410,7 @@ void daNpc_Hanjo_c::setAttnPos() {
cStack_44 *= 1.0f - mpMorf[0]->getMorfRatio();
cStack_38 = cStack_38 + cStack_44;
}
mDoMtx_stack_c::YrotS(field_0xd78.y);
mDoMtx_stack_c::YrotS(mCurAngle.y);
mDoMtx_stack_c::multVec(&cStack_38, &cStack_38);
attention_info.position = current.pos + cStack_38;
static cXyz prtclScl(1.0f, 1.0f, 1.0f);
@@ -1426,7 +1426,7 @@ void daNpc_Hanjo_c::setCollision() {
if (field_0xe25 == 0) {
u32 tgType = 0xd8fbfdff;
u32 tgSPrm = 0x1f;
if (field_0xa89 != 0) {
if (mTwilight != 0) {
tgType = 0;
tgSPrm = 0;
} else {
@@ -1442,7 +1442,7 @@ void daNpc_Hanjo_c::setCollision() {
cStack_4c.set(0.0f, 0.0f, 0.0f);
f32 cylHeight = field_0xdec;
f32 cylRadius = field_0xdf0;
mDoMtx_stack_c::YrotS(field_0xd78.y);
mDoMtx_stack_c::YrotS(mCurAngle.y);
mDoMtx_stack_c::multVec(&cStack_4c, &cStack_4c);
cStack_4c += current.pos;
mCyl1.SetH(cylHeight);
@@ -1581,13 +1581,13 @@ int daNpc_Hanjo_c::setAction(int (daNpc_Hanjo_c::*action)(void*)) {
/* 809FB7A0-809FB90C 002800 016C+00 2/2 0/0 0/0 .text initShoot__13daNpc_Hanjo_cFi */
void daNpc_Hanjo_c::initShoot(int param_1) {
if (param_1 != 0) {
field_0xb50.setNo( 7, -1.0f, 0, 0);
field_0xb74.setNo( 16, 0.0f, 1, 0);
field_0xba8.lookNone(1);
mFaceMotionSeqMngr.setNo( 7, -1.0f, 0, 0);
mMotionSeqMngr.setNo( 16, 0.0f, 1, 0);
mJntAnm.lookNone(1);
} else {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(15, -1.0f, 0, 0);
field_0xba8.lookNone(0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(15, -1.0f, 0, 0);
mJntAnm.lookNone(0);
}
}
@@ -1596,8 +1596,8 @@ int daNpc_Hanjo_c::shoot(int param_1) {
csXyz cStack_60;
f32 dVar13 = daNpc_Hanjo_Param_c::m.field_0x98;
s16 sVar9 = cM_deg2s(daNpc_Hanjo_Param_c::m.field_0x9c);
if (field_0xb74.getNo() == 16 || field_0xb74.getNo() == 15) {
switch(field_0xb74.getStepNo()) {
if (mMotionSeqMngr.getNo() == 16 || mMotionSeqMngr.getNo() == 15) {
switch(mMotionSeqMngr.getStepNo()) {
case 0:
dVar13 = mpMorf[0]->getFrame();
if (36.0f < dVar13 && field_0x170c == -1) {
@@ -1641,8 +1641,8 @@ int daNpc_Hanjo_c::shoot(int param_1) {
/* 809FBB94-809FBC3C 002BF4 00A8+00 2/2 0/0 0/0 .text initDive__13daNpc_Hanjo_cFv */
void daNpc_Hanjo_c::initDive() {
field_0xb50.setNo(6, -1.0f, 0, 0);
field_0xb74.setNo(18, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(6, -1.0f, 0, 0);
mMotionSeqMngr.setNo(18, -1.0f, 0, 0);
speed.y = daNpc_Hanjo_Param_c::m.field_0x8c;
field_0x1721 = 1;
}
@@ -1655,7 +1655,7 @@ void daNpc_Hanjo_c::dive() {
cLib_chaseF(&speedF, 0.0f, 0.1f);
} else {
if (field_0x1720 == 0) {
field_0x580.startCreatureSound(Z2SE_CM_BODYFALL_WATER_M, 0, 0xffffffff);
mSound.startCreatureSound(Z2SE_CM_BODYFALL_WATER_M, 0, 0xffffffff);
speedF *= 0.5f;
field_0x1720 = 1;
} else if (field_0x171f == 0) {
@@ -1669,9 +1669,9 @@ void daNpc_Hanjo_c::dive() {
if (0.0f < speed.y && local_34 < current.pos.y + daNpc_Hanjo_Param_c::m.field_0xa8)
{
field_0x171f = 1;
if (field_0xb74.getNo() == 18) {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(19, -1.0f, 0, 0);
if (mMotionSeqMngr.getNo() == 18) {
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(19, -1.0f, 0, 0);
}
field_0x171c = 0;
speed.y = 0;
@@ -1697,14 +1697,14 @@ void daNpc_Hanjo_c::dive() {
gravity = 0;
}
}
if (field_0xb74.getNo() == 18) {
if (mMotionSeqMngr.getNo() == 18) {
if (field_0x1720 != 0 && field_0x171f == 0 && 0.0f < speed.y) {
if (local_34 - current.pos.y < 260.0f && field_0xb74.getNo() == 18) {
if (local_34 - current.pos.y < 260.0f && mMotionSeqMngr.getNo() == 18) {
if (cM3d_IsZero(mpMorf[0]->getPlaySpeed())) {
mpMorf[0]->setPlaySpeed(1.0f);
}
}
} else if ((field_0xb74.getNo() == 18) && mpMorf[0]->checkFrame(18.0f)) {
} else if ((mMotionSeqMngr.getNo() == 18) && mpMorf[0]->checkFrame(18.0f)) {
mpMorf[0]->setPlaySpeed(0.0f);
}
}
@@ -1715,23 +1715,23 @@ int daNpc_Hanjo_c::lookround(s16 param_1) {
if (field_0x171e != 0) {
cLib_addCalcAngleS2(&current.angle.y, param_1, 4, 0x800);
shape_angle.y = current.angle.y;
field_0xd78.y = shape_angle.y;
if (field_0xb74.getNo() != 14) {
field_0xb74.setNo(14, -1.0f, 0, 0);
mCurAngle.y = shape_angle.y;
if (mMotionSeqMngr.getNo() != 14) {
mMotionSeqMngr.setNo(14, -1.0f, 0, 0);
} else {
if (field_0xb74.checkEndSequence()) {
s16 angleDiff = param_1 - field_0xd78.y;
if (mMotionSeqMngr.checkEndSequence()) {
s16 angleDiff = param_1 - mCurAngle.y;
s16 absDiff = abs(angleDiff);
if (absDiff <= cM_deg2s(4.0f)) {
field_0xb74.setNo(0, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
field_0x171e = 0;
} else {
field_0xb74.setNo(14, 0.0f, 1, 0);
mMotionSeqMngr.setNo(14, 0.0f, 1, 0);
}
}
}
} else {
s16 angleDiff = param_1 - field_0xd78.y;
s16 angleDiff = param_1 - mCurAngle.y;
s16 absDiff = abs(angleDiff);
if (absDiff > cM_deg2s(90.0f)) {
field_0x171e = 1;
@@ -1786,7 +1786,7 @@ int daNpc_Hanjo_c::cutConversationAboutSaru(int staffIdx) {
case 0:
field_0xdc8 = fopAcM_searchPlayerAngleY(this);
if (checkStep()) {
mStepNo = 0;
mStepMode = 0;
}
break;
case 1:
@@ -1798,8 +1798,8 @@ int daNpc_Hanjo_c::cutConversationAboutSaru(int staffIdx) {
rv = 1;
break;
case 1:
field_0xba8.lookPlayer(0);
if (field_0xdc8 != field_0xd78.y) {
mJntAnm.lookPlayer(0);
if (field_0xdc8 != mCurAngle.y) {
step(field_0xdc8, 7, 14, 15, 0);
} else {
rv = 1;
@@ -1831,16 +1831,16 @@ int daNpc_Hanjo_c::cutConversation(int param_1) {
if (dComIfGp_getEventManager().getIsAddvance(param_1)) {
switch(iVar9) {
case 0:
field_0xb74.setNo(0, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
initTalk(field_0xa7c, NULL);
field_0xb98.entry(daPy_getPlayerActorClass());
mPlayerActorMngr.entry(daPy_getPlayerActorClass());
break;
case 1:
case 2:
case 3:
if (iVar9 == 2) {
initTalk(field_0xa7c, NULL);
field_0xb98.entry(daPy_getPlayerActorClass());
mPlayerActorMngr.entry(daPy_getPlayerActorClass());
}
if (iVar6 == 1) {
fopAc_ac_c* actor_p =field_0x10c8[0].getActorP();
@@ -1853,26 +1853,26 @@ int daNpc_Hanjo_c::cutConversation(int param_1) {
int local_38[2] = {-1, -1};
switch(iVar9) {
case 0:
field_0xba8.lookPlayer(0);
if (field_0xdc8 == field_0xd78.y) {
mJntAnm.lookPlayer(0);
if (field_0xdc8 == mCurAngle.y) {
rv = 1;
} else if (step(field_0xdc8, 7, 0xe, 0xf, 0)) {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
}
break;
case 1:
case 2:
case 3:
field_0xba8.lookPlayer(0);
mJntAnm.lookPlayer(0);
if (iVar9 == 2) {
field_0xba8.lookNone(0);
mJntAnm.lookNone(0);
}
if ((iVar9 == 3 && field_0xdc8 != field_0xd78.y) &&
if ((iVar9 == 3 && field_0xdc8 != mCurAngle.y) &&
step(field_0xdc8, -1, -1, 15, 0))
{
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
}
local_38[0] = iVar7;
if (talkProc(local_38, 0, NULL, 0)) {
@@ -1922,12 +1922,12 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) {
field_0xdc4 = 0;
break;
case 3:
field_0xb50.setNo(6, -1.0f, 0,
mFaceMotionSeqMngr.setNo(6, -1.0f, 0,
0);
field_0xb74.setNo(17, -1.0f,
mMotionSeqMngr.setNo(17, -1.0f,
0, 0);
field_0xdc4 = 1;
field_0x580.startCreatureVoice(Z2SE_M077_HANJO_05, -1);
mSound.startCreatureVoice(Z2SE_M077_HANJO_05, -1);
break;
case 4:
field_0x1724 = 0;
@@ -1979,14 +1979,14 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) {
}
break;
case 3:
field_0xba8.lookNone(0);
mJntAnm.lookNone(0);
if (field_0x10e8.getDstPosH(current.pos, &cStack_6c, field_0x10e8.mpRoomPath->m_num, 4)) {
rv = 1;
} else {
cLib_addCalcAngleS2(&current.angle.y, cLib_targetAngleY(&current.pos, &cStack_6c), 4, 0x800);
shape_angle.y = current.angle.y;
field_0xd78.y = current.angle.y;
field_0xd7e.y = field_0xd78.y;
mCurAngle.y = current.angle.y;
field_0xd7e.y = mCurAngle.y;
cLib_chaseF(&speedF,
daNpc_Hanjo_Param_c::m.field_0x90, 0.5f);
if (field_0xdc4 != 0 &&
@@ -2049,9 +2049,9 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
switch (local_b4) {
case 0:
daNpcT_offTmpBit(0x27);
field_0xb50.setNo(7, 0.0f, 0, 0);
field_0xb74.setNo(11, 0.0f, 1, 0);
field_0xba8.lookNone(1);
mFaceMotionSeqMngr.setNo(7, 0.0f, 0, 0);
mMotionSeqMngr.setNo(11, 0.0f, 1, 0);
mJntAnm.lookNone(1);
home.angle.y += 0x8000;
setAngle(home.angle.y);
initTalk(0xcf, NULL);
@@ -2074,7 +2074,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
field_0xdc4 = iVar7;
break;
case 4:
field_0xb74.setNo(13, -1.0f, 0, 0);
mMotionSeqMngr.setNo(13, -1.0f, 0, 0);
break;
case 5:
field_0xdc4 = iVar7;
@@ -2087,7 +2087,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
field_0x1722 = 1;
break;
case 99:
field_0xb74.setNo(13, 0.0, 1,
mMotionSeqMngr.setNo(13, 0.0, 1,
0);
dComIfGs_onSaveSwitch(0x2b);
actor_p = field_0x10c8[2].getActorP();
@@ -2113,7 +2113,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
}
break;
case 2:
field_0xba8.lookCamera(0);
mJntAnm.lookCamera(0);
if (talkProc(NULL, 0, NULL, 0) && mFlow.checkEndFlow()) {
rv = 1;
}
@@ -2121,12 +2121,12 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
case 3:
if (field_0xdc4 != 0) {
if (cLib_calcTimer(&field_0xdc4) == 0) {
field_0xb74.setNo(12, 8.0f, 0, 0);
mMotionSeqMngr.setNo(12, 8.0f, 0, 0);
actor_p = field_0x10c8[2].getActorP();
JUT_ASSERT(3068, 0 != actor_p);
((daNPC_TK_c*)actor_p)->setHanjoHand();
}
} else if (field_0xb74.checkEndSequence()) {
} else if (mMotionSeqMngr.checkEndSequence()) {
rv = 1;
} else if (mpMorf[0]->checkFrame(8.0f)) {
Z2GetAudioMgr()->seStart(Z2SE_PLAY_REED_TOBIKUSA, &current.pos, 0, 0, 1.0f, 1.0f,
@@ -2134,7 +2134,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
}
break;
case 4:
field_0xba8.lookNone(0);
mJntAnm.lookNone(0);
actor_p = field_0x10c8[2].getActorP();
JUT_ASSERT(3090, 0 != actor_p);
if (((daNPC_TK_c*)actor_p)->isHanjoHand()) {
@@ -2142,7 +2142,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
}
break;
case 5:
field_0xba8.lookCamera(0);
mJntAnm.lookCamera(0);
if (cLib_calcTimer(&field_0xdc4) == 0) {
rv = 1;
}
@@ -2201,11 +2201,11 @@ int daNpc_Hanjo_c::cutDive(int param_1) {
}
break;
case 2:
field_0xb50.setNo(6, -1.0f, 0, 0);
field_0xb74.setNo(17, -1.0f, 0,
mFaceMotionSeqMngr.setNo(6, -1.0f, 0, 0);
mMotionSeqMngr.setNo(17, -1.0f, 0,
0);
field_0xba8.lookNone(1);
field_0x580.startCreatureVoice(Z2SE_M077_HANJO_05, -1);
mJntAnm.lookNone(1);
mSound.startCreatureVoice(Z2SE_M077_HANJO_05, -1);
break;
case 3:
initDive();
@@ -2215,8 +2215,8 @@ int daNpc_Hanjo_c::cutDive(int param_1) {
switch(iVar5) {
case 0:
if (cLib_calcTimer(&field_0xdc4) == 0) {
field_0xba8.lookPlayer(0);
if (field_0xdc8 == field_0xd78.y) {
mJntAnm.lookPlayer(0);
if (field_0xdc8 == mCurAngle.y) {
rv = 1;
} else if (mType == TYPE_1) {
step(field_0xdc8, 7, 10, 0xf, 0);
@@ -2232,13 +2232,13 @@ int daNpc_Hanjo_c::cutDive(int param_1) {
break;
case 2:
cStack_2c.set(0.0f, 0.0f, 50.0f);
mDoMtx_stack_c::YrotS(field_0xd78.y);
mDoMtx_stack_c::YrotS(mCurAngle.y);
mDoMtx_stack_c::multVec(&cStack_2c, &cStack_2c);
cStack_2c += current.pos;
cStack_2c.y = attention_info.position.y;
field_0x930.SetPos(&cStack_2c);
f32 dVar7 = dComIfG_Bgsp().GroundCross(&field_0x930);
if ((dVar7 - field_0xdf4) < -daNpc_Hanjo_Param_c::m.field_0x18) {
mGndChk.SetPos(&cStack_2c);
f32 dVar7 = dComIfG_Bgsp().GroundCross(&mGndChk);
if ((dVar7 - mGroundH) < -daNpc_Hanjo_Param_c::m.field_0x18) {
rv = 1;
}
if (mType == TYPE_1) {
@@ -2253,7 +2253,7 @@ int daNpc_Hanjo_c::cutDive(int param_1) {
}
cLib_addCalcAngleS2(&current.angle.y, cStack_34.y, 4, 0x800);
shape_angle.y = current.angle.y;
field_0xd78.y = current.angle.y;
mCurAngle.y = current.angle.y;
cLib_chaseF(&speedF, daNpc_Hanjo_Param_c::m.field_0x90, 1.0f);
break;
case 3:
@@ -2277,22 +2277,22 @@ int daNpc_Hanjo_c::wait(void* param_0) {
switch (mType) {
case TYPE_0:
if (field_0x1721 != 0) {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(19, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(19, -1.0f, 0, 0);
} else {
field_0xb50.setNo(7, -1.0f, 0, 0);
if (field_0xb98.getActorP() != NULL || daNpcT_chkEvtBit(0xab) ||
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
if (mPlayerActorMngr.getActorP() != NULL || daNpcT_chkEvtBit(0xab) ||
daNpcT_chkEvtBit(0xb7))
{
field_0xb74.setNo(0, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
} else {
field_0xb74.setNo(2, -1.0f, 0, 0);
mMotionSeqMngr.setNo(2, -1.0f, 0, 0);
}
}
break;
default:
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
break;
}
field_0xe22 = 2;
@@ -2304,7 +2304,7 @@ int daNpc_Hanjo_c::wait(void* param_0) {
daNpc_Hanjo_Param_c::m.field_0x54, 150.0f,
-150.0f, 0)) {
if (daPy_getPlayerActorClass()->checkBeeChildDrink()) {
field_0xe32 = 1;
mSpeakEvent = 1;
field_0x1723 = 1;
}
}
@@ -2317,7 +2317,7 @@ int daNpc_Hanjo_c::wait(void* param_0) {
daPy_getPlayerActorClass()->checkAutoJump() ||
daPy_getPlayerActorClass()->checkWolfTriggerJump())
{
field_0xe30 = 10;
mEvtNo = 10;
}
}
}
@@ -2325,25 +2325,25 @@ int daNpc_Hanjo_c::wait(void* param_0) {
if (!field_0xd08.checkStagger()) {
if (mType == TYPE_0) {
if ((daNpcT_chkEvtBit(0xab) ||
daNpcT_chkEvtBit(0xb7)) && field_0x1721 == 0 && field_0xb74.getNo() == 2)
daNpcT_chkEvtBit(0xb7)) && field_0x1721 == 0 && mMotionSeqMngr.getNo() == 2)
{
field_0xb74.setNo(0, -1.0, 0, 0);
mMotionSeqMngr.setNo(0, -1.0, 0, 0);
}
} else if (mType == TYPE_3) {
field_0xb98.remove();
mPlayerActorMngr.remove();
}
if (field_0xb98.getActorP() != NULL) {
field_0xba8.lookPlayer(0);
if (!chkActorInSight(field_0xb98.getActorP(), field_0xdf8,
field_0xd78.y)) {
field_0xba8.lookNone(0);
if (mPlayerActorMngr.getActorP() != NULL) {
mJntAnm.lookPlayer(0);
if (!chkActorInSight(mPlayerActorMngr.getActorP(), field_0xdf8,
mCurAngle.y)) {
mJntAnm.lookNone(0);
}
if (!srchPlayerActor() && home.angle.y == field_0xd78.y) {
if (!srchPlayerActor() && home.angle.y == mCurAngle.y) {
field_0xe22 = 1;
}
} else {
field_0xba8.lookNone(0);
if (home.angle.y != field_0xd78.y) {
mJntAnm.lookNone(0);
if (home.angle.y != mCurAngle.y) {
if (field_0xe34 != 0) {
if (field_0x1721 != 0) {
if (step(home.angle.y, -1, -1, 15, 0)) {
@@ -2363,12 +2363,12 @@ int daNpc_Hanjo_c::wait(void* param_0) {
srchPlayerActor();
}
}
switch(field_0xba8.getMode()) {
switch(mJntAnm.getMode()) {
case 1:
switch (mType) {
case TYPE_0:
if (field_0x1721 == 0 && field_0xb74.getNo() == 2) {
field_0xb74.setNo(0, -1.0f, 0, 0);
if (field_0x1721 == 0 && mMotionSeqMngr.getNo() == 2) {
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
}
break;
}
@@ -2378,7 +2378,7 @@ int daNpc_Hanjo_c::wait(void* param_0) {
case TYPE_3:
fopAc_ac_c* actor_p = field_0x10c8[1].getActorP();
if (actor_p != NULL) {
field_0xba8.lookActor(actor_p, -40.0f, 0);
mJntAnm.lookActor(actor_p, -40.0f, 0);
}
break;
}
@@ -2400,11 +2400,11 @@ int daNpc_Hanjo_c::throwStone(void* param_0) {
case 1:
if (!field_0xd08.checkStagger()) {
if (daNpcT_chkEvtBit(0x8b)) {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
} else {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(2, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(2, -1.0f, 0, 0);
field_0x1704 = cLib_getRndValue(sVar4 * 0.5f, sVar4 * 1.5f);
}
field_0xe22 = 2;
@@ -2414,16 +2414,16 @@ int daNpc_Hanjo_c::throwStone(void* param_0) {
if (chkPointInArea(daPy_getPlayerActorClass()->current.pos, current.pos,
daNpc_Hanjo_Param_c::m.field_0xa4, 1000.0f, -1000.0f, 0) == false)
{
field_0xe30 = 8;
mEvtNo = 8;
}
}
if (!field_0xd08.checkStagger()) {
if (daNpcT_chkEvtBit(0x8b)) {
field_0xba8.lookPlayer(0);
mJntAnm.lookPlayer(0);
lookround(fopAcM_searchPlayerAngleY(this));
} else {
field_0xba8.lookNone(0);
if (home.angle.y != field_0xd78.y) {
mJntAnm.lookNone(0);
if (home.angle.y != mCurAngle.y) {
if (field_0xe34 != 0) {
if (step(home.angle.y, 7, 14, 15, 0)) {
field_0xe22 = 1;
@@ -2443,7 +2443,7 @@ int daNpc_Hanjo_c::throwStone(void* param_0) {
} else {
if (shoot(0)) {
if (field_0x1708 != 0) {
field_0xb74.setNo(15, -1.0f, 1, 0);
mMotionSeqMngr.setNo(15, -1.0f, 1, 0);
cLib_calcTimer(&field_0x1708);
field_0x170c = 0xffffffff;
} else {
@@ -2475,21 +2475,21 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
if (!field_0xd08.checkStagger()) {
if (mType == 1) {
if (daNpcT_chkEvtBit(0xcf)) {
field_0xb50.setNo(0, -1.0f, 0, 0);
field_0xb74.setNo(13, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
mMotionSeqMngr.setNo(13, -1.0f, 0, 0);
field_0x1714 = 0;
} else {
if (field_0x1714 != 0) {
field_0xb50.setNo(0, -1.0f, 0, 0);
field_0xb74.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
} else {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(2, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(2, -1.0f, 0, 0);
}
}
} else {
field_0xb50.setNo(0, -1.0f, 0, 0);
field_0xb74.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
}
field_0x1710 = cLib_getRndValue(dVar8 * 0.5f, dVar8 * 1.5f);
field_0xe22 = 2;
@@ -2508,7 +2508,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
daTag_EvtArea_c* evtArea = (daTag_EvtArea_c*)field_0x10c8[3].getActorP();
if (evtArea != NULL) {
if (evtArea->chkPointInArea(daPy_getPlayerActorClass()->current.pos)) {
field_0xe30 = 9;
mEvtNo = 9;
}
}
}
@@ -2518,24 +2518,24 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
daPy_getPlayerActorClass()->checkAutoJump() ||
daPy_getPlayerActorClass()->checkWolfTriggerJump())
{
field_0xe30 = 10;
mEvtNo = 10;
}
}
if (!field_0xd08.checkStagger()) {
if (mType == 1) {
field_0xb98.remove();
mPlayerActorMngr.remove();
}
if (field_0xb98.getActorP() != NULL) {
field_0xba8.lookPlayer(0);
if (!chkActorInSight(field_0xb98.getActorP(), field_0xdf8, field_0xd78.y)) {
field_0xba8.lookNone(0);
if (mPlayerActorMngr.getActorP() != NULL) {
mJntAnm.lookPlayer(0);
if (!chkActorInSight(mPlayerActorMngr.getActorP(), field_0xdf8, mCurAngle.y)) {
mJntAnm.lookNone(0);
}
if (!srchPlayerActor() && home.angle.y == field_0xd78.y) {
if (!srchPlayerActor() && home.angle.y == mCurAngle.y) {
field_0xe22 = 1;
}
} else {
field_0xba8.lookNone(0);
if (home.angle.y != field_0xd78.y) {
mJntAnm.lookNone(0);
if (home.angle.y != mCurAngle.y) {
if (field_0xe34 != 0) {
if (step(home.angle.y, 7, 14, 15, 0)) {
field_0xe22 = 1;
@@ -2553,10 +2553,10 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
if (actor_p != NULL) {
field_0x1722 = commandToHawk();
if (field_0x1722 != 0) {
field_0xba8.lookPlayer(0);
if (field_0xb74.getNo() != 11) {
field_0xb50.setNo(7, -1.0f, 0, 0);
field_0xb74.setNo(11, -1.0f, 0, 0);
mJntAnm.lookPlayer(0);
if (mMotionSeqMngr.getNo() != 11) {
mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0);
mMotionSeqMngr.setNo(11, -1.0f, 0, 0);
}
} else {
if (dVar1 != 0) {
@@ -2564,18 +2564,18 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
field_0xe22 = 1;
} else {
if (field_0x1714 != 0) {
field_0xba8.lookNone(0);
if (field_0xb74.getStepNo() > 0) {
mJntAnm.lookNone(0);
if (mMotionSeqMngr.getStepNo() > 0) {
field_0x1714++;
field_0x1714 &= 1;
field_0xe22 = 1;
}
} else {
field_0xba8.lookActor(actor_p, 0.0, 0);
mJntAnm.lookActor(actor_p, 0.0, 0);
if (((daNPC_TK_c*)actor_p)->isHanjoHand() &&
cLib_calcTimer(&field_0x1710) == 0)
{
field_0xb74.setNo(9, -1.0, 0, 0);
mMotionSeqMngr.setNo(9, -1.0, 0, 0);
field_0x1714 = field_0x1714 + 1;
field_0x1714 &= 1;
}
@@ -2611,8 +2611,8 @@ int daNpc_Hanjo_c::talk(void* param_0) {
case 0:
case 1:
if (!field_0xd08.checkStagger()) {
if (mType == TYPE_0 && field_0xb74.getNo() == 2) {
field_0xb74.setNo(0, -1.0f, 0, 0);
if (mType == TYPE_0 && mMotionSeqMngr.getNo() == 2) {
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
}
if (field_0x1723 != 0) {
initTalk(44, NULL);
@@ -2624,18 +2624,18 @@ int daNpc_Hanjo_c::talk(void* param_0) {
}
case 2:
if (!field_0xd08.checkStagger()) {
if (field_0xa89 != 0 || field_0xdc8 == field_0xd78.y) {
if (mTwilight != 0 || field_0xdc8 == mCurAngle.y) {
if (talkProc(NULL, 0, NULL, 0) && mFlow.checkEndFlow()) {
field_0xb98.entry(daPy_getPlayerActorClass());
mPlayerActorMngr.entry(daPy_getPlayerActorClass());
dComIfGp_event_reset();
field_0xe22 = 3;
}
field_0xba8.lookPlayer(0);
if (field_0xa89 != 0) {
field_0xba8.lookNone(0);
mJntAnm.lookPlayer(0);
if (mTwilight != 0) {
mJntAnm.lookNone(0);
}
} else {
field_0xba8.lookPlayer(0);
mJntAnm.lookPlayer(0);
if (field_0x1721 != 0) {
step(field_0xdc8, -1, -1, 15, 0);
} else {
src/d/actor/d_a_npc_hoz.cpp
+4 -24
View File
@@ -1225,22 +1225,22 @@ void daNpc_Hoz_c::srchActors() {
}
/* 80A02374-80A023EC 000F54 0078+00 1/0 0/0 0/0 .text checkChangeEvt__11daNpc_Hoz_cFv */
bool daNpc_Hoz_c::checkChangeEvt() {
BOOL daNpc_Hoz_c::checkChangeEvt() {
// NONMATCHING
}
/* 80A023EC-80A024D0 000FCC 00E4+00 1/0 0/0 0/0 .text evtTalk__11daNpc_Hoz_cFv */
bool daNpc_Hoz_c::evtTalk() {
BOOL daNpc_Hoz_c::evtTalk() {
// NONMATCHING
}
/* 80A024D0-80A0260C 0010B0 013C+00 2/0 0/0 0/0 .text evtEndProc__11daNpc_Hoz_cFv */
bool daNpc_Hoz_c::evtEndProc() {
BOOL daNpc_Hoz_c::evtEndProc() {
// NONMATCHING
}
/* 80A0260C-80A026D4 0011EC 00C8+00 1/0 0/0 0/0 .text evtCutProc__11daNpc_Hoz_cFv */
bool daNpc_Hoz_c::evtCutProc() {
BOOL daNpc_Hoz_c::evtCutProc() {
// NONMATCHING
}
@@ -1645,16 +1645,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A062EC-80A062F4 004ECC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A062F4-80A062FC 004ED4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A062FC-80A06304 004EDC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1669,16 +1659,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80A0630C-80A06310 004EEC 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80A06310-80A06314 004EF0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A06314-80A0632C 004EF4 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */
// void daNpcT_c::decTmr() {
extern "C" void decTmr__8daNpcT_cFv() {
src/d/actor/d_a_npc_jagar.cpp
-5
View File
@@ -1696,11 +1696,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A19F98-80A19F9C 005978 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A19F9C-80A19FA4 00597C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_kakashi.cpp
-40
View File
@@ -1371,31 +1371,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 8054E640-8054E648 0033C0 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 8054E648-8054E650 0033C8 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 8054E650-8054E658 0033D0 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 8054E658-8054E660 0033D8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 8054E660-8054E668 0033E0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 8054E668-8054E670 0033E8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1410,21 +1385,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 8054E680-8054E684 003400 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 8054E684-8054E688 003404 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */
void daNpcT_c::setAfterTalkMotion() {
/* empty function */
}
/* 8054E688-8054E68C 003408 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 8054E68C-8054E694 00340C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_kkri.cpp
-20
View File
@@ -1348,16 +1348,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 805530F8-80553100 003E38 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80553100-80553108 003E40 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80553108-80553110 003E48 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1372,22 +1362,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80553118-8055311C 003E58 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 8055311C-80553124 003E5C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80553124-80553128 003E64 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80553128-80553130 003E68 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_knj.cpp
-50
View File
@@ -795,31 +795,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A45304-80A4530C 001E84 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 80A4530C-80A45314 001E8C 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80A45314-80A4531C 001E94 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 80A4531C-80A45324 001E9C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A45324-80A4532C 001EA4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A4532C-80A45334 001EAC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -834,37 +809,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80A4533C-80A45340 001EBC 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80A45340-80A45348 001EC0 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80A45348-80A45350 001EC8 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A45350-80A45354 001ED0 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */
void daNpcT_c::setAfterTalkMotion() {
/* empty function */
}
/* 80A45354-80A45358 001ED4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A45358-80A4535C 001ED8 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */
void daNpcT_c::setCollision() {
/* empty function */
}
/* 80A4535C-80A45364 001EDC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_kolin.cpp
+3 -8
View File
@@ -1254,7 +1254,7 @@ void daNpc_Kolin_c::setParam() {
/* 80555118-8055523C 001218 0124+00 1/0 0/0 0/0 .text checkChangeEvt__13daNpc_Kolin_cFv
*/
bool daNpc_Kolin_c::checkChangeEvt() {
BOOL daNpc_Kolin_c::checkChangeEvt() {
// NONMATCHING
}
@@ -1274,12 +1274,12 @@ void daNpc_Kolin_c::srchActors() {
}
/* 80555448-805554E8 001548 00A0+00 1/0 0/0 0/0 .text evtTalk__13daNpc_Kolin_cFv */
bool daNpc_Kolin_c::evtTalk() {
BOOL daNpc_Kolin_c::evtTalk() {
// NONMATCHING
}
/* 805554E8-805555B0 0015E8 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpc_Kolin_cFv */
bool daNpc_Kolin_c::evtCutProc() {
BOOL daNpc_Kolin_c::evtCutProc() {
// NONMATCHING
}
@@ -2040,11 +2040,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 8055A124-8055A128 006224 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 8055A128-8055A130 006228 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_kolinb.cpp
-20
View File
@@ -1075,16 +1075,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A4835C-80A48364 002ABC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A48364-80A4836C 002AC4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A4836C-80A48374 002ACC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1099,22 +1089,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80A4837C-80A48380 002ADC 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80A48380-80A48388 002AE0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A48388-80A4838C 002AE8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A4838C-80A48394 002AEC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_kyury.cpp
-15
View File
@@ -1265,16 +1265,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A635C8-80A635D0 0035E8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A635D0-80A635D8 0035F0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A635D8-80A635E0 0035F8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1295,11 +1285,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A635F0-80A635F4 003610 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A635F4-80A635FC 003614 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_len.cpp
-5
View File
@@ -1427,11 +1427,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A68B10-80A68B14 0048D0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A68B14-80A68B2C 0048D4 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */
// void daNpcT_c::decTmr() {
extern "C" void decTmr__8daNpcT_cFv() {
src/d/actor/d_a_npc_lud.cpp
-15
View File
@@ -1598,16 +1598,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A6FA0C-80A6FA14 004F4C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A6FA14-80A6FA1C 004F54 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A6FA1C-80A6FA24 004F5C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1628,11 +1618,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A6FA34-80A6FA38 004F74 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A6FA38-80A6FA40 004F78 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_maro.cpp
-5
View File
@@ -2389,11 +2389,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80564654-80564658 0091B4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80564658-80564660 0091B8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_midp.cpp
-20
View File
@@ -1014,32 +1014,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A73698-80A736A0 002B18 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A736A0-80A736A8 002B20 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A736B0-80A736B8 002B30 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80A736B8-80A736C0 002B38 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A736C0-80A736C4 002B40 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A736C4-80A736CC 002B44 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_moi.cpp
-5
View File
@@ -2041,11 +2041,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80A7AAD4-80A7AAD8 006C74 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80A7AAD8-80A7AAE0 006C78 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_pachi_besu.cpp
-10
View File
@@ -1805,16 +1805,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A966C8-80A966D0 003A48 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A966D0-80A966D8 003A50 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A966D8-80A966E0 003A58 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
src/d/actor/d_a_npc_pachi_maro.cpp
-10
View File
@@ -1573,16 +1573,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80A9B548-80A9B550 0039A8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80A9B550-80A9B558 0039B0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80A9B558-80A9B560 0039B8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
src/d/actor/d_a_npc_pachi_taro.cpp
-15
View File
@@ -2232,16 +2232,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AA1268-80AA1270 0050C8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AA1270-80AA1278 0050D0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AA1278-80AA1280 0050D8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -2256,11 +2246,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80AA1288-80AA128C 0050E8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AA128C-80AA1294 0050EC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_pouya.cpp
-15
View File
@@ -1462,16 +1462,6 @@ extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs() {
// NONMATCHING
}
/* 80AB1D14-80AB1D1C 004054 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AB1D1C-80AB1D24 00405C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AB1D24-80AB1D2C 004064 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1492,11 +1482,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AB1D3C-80AB1D40 00407C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AB1D40-80AB1D48 004080 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_raca.cpp
-10
View File
@@ -1145,22 +1145,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80AB8BA8-80AB8BB0 002FE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80AB8BB0-80AB8BB8 002FF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AB8BB8-80AB8BBC 002FF8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AB8BBC-80AB8BC4 002FFC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_saru.cpp
-15
View File
@@ -1357,16 +1357,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AC41EC-80AC41F4 003EAC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AC41F4-80AC41FC 003EB4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AC41FC-80AC4204 003EBC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1388,11 +1378,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AC421C-80AC4220 003EDC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AC4220-80AC4228 003EE0 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_seib.cpp
-49
View File
@@ -808,30 +808,6 @@ extern "C" void __dt__12J3DFrameCtrlFv() {
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AC6E14-80AC6E1C 001E14 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 80AC6E1C-80AC6E24 001E1C 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80AC6E24-80AC6E2C 001E24 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 80AC6E2C-80AC6E34 001E2C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AC6E34-80AC6E3C 001E34 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AC6E3C-80AC6E44 001E3C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
@@ -847,37 +823,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80AC6E4C-80AC6E50 001E4C 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80AC6E50-80AC6E58 001E50 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80AC6E58-80AC6E60 001E58 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AC6E60-80AC6E64 001E60 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */
void daNpcT_c::setAfterTalkMotion() {
/* empty function */
}
/* 80AC6E64-80AC6E68 001E64 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AC6E68-80AC6E6C 001E68 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */
void daNpcT_c::setCollision() {
/* empty function */
}
/* 80AC6E6C-80AC6E74 001E6C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_seic.cpp
-50
View File
@@ -801,31 +801,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AC900C-80AC9014 001BAC 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 80AC9014-80AC901C 001BB4 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80AC901C-80AC9024 001BBC 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 80AC9024-80AC902C 001BC4 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AC902C-80AC9034 001BCC 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AC9034-80AC903C 001BD4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -840,37 +815,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80AC9044-80AC9048 001BE4 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80AC9048-80AC9050 001BE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80AC9050-80AC9058 001BF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AC9058-80AC905C 001BF8 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */
void daNpcT_c::setAfterTalkMotion() {
/* empty function */
}
/* 80AC905C-80AC9060 001BFC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AC9060-80AC9064 001C00 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */
void daNpcT_c::setCollision() {
/* empty function */
}
/* 80AC9064-80AC906C 001C04 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_seid.cpp
-50
View File
@@ -801,31 +801,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80ACB14C-80ACB154 001BAC 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 80ACB154-80ACB15C 001BB4 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80ACB15C-80ACB164 001BBC 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 80ACB164-80ACB16C 001BC4 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80ACB16C-80ACB174 001BCC 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80ACB174-80ACB17C 001BD4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -840,37 +815,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80ACB184-80ACB188 001BE4 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80ACB188-80ACB190 001BE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80ACB190-80ACB198 001BF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80ACB198-80ACB19C 001BF8 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */
void daNpcT_c::setAfterTalkMotion() {
/* empty function */
}
/* 80ACB19C-80ACB1A0 001BFC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80ACB1A0-80ACB1A4 001C00 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */
void daNpcT_c::setCollision() {
/* empty function */
}
/* 80ACB1A4-80ACB1AC 001C04 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_seira.cpp
-15
View File
@@ -1585,16 +1585,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80ACF970-80ACF978 004290 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80ACF978-80ACF980 004298 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80ACF980-80ACF988 0042A0 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1615,11 +1605,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80ACF998-80ACF99C 0042B8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80ACF99C-80ACF9A4 0042BC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_seira2.cpp
-20
View File
@@ -1436,16 +1436,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AD45E8-80AD45F0 003AC8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AD45F0-80AD45F8 003AD0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AD45F8-80AD4600 003AD8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1460,22 +1450,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80AD4608-80AD4610 003AE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80AD4610-80AD4618 003AF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AD4618-80AD461C 003AF8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AD461C-80AD4624 003AFC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_seirei.cpp
-45
View File
@@ -956,31 +956,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AD7A64-80AD7A6C 002424 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 80AD7A6C-80AD7A74 00242C 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80AD7A74-80AD7A7C 002434 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 80AD7A7C-80AD7A84 00243C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AD7A84-80AD7A8C 002444 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AD7A8C-80AD7A94 00244C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -995,32 +970,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80AD7A9C-80AD7AA0 00245C 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80AD7AA0-80AD7AA8 002460 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AD7AA8-80AD7AAC 002468 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */
void daNpcT_c::setAfterTalkMotion() {
/* empty function */
}
/* 80AD7AAC-80AD7AB0 00246C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AD7AB0-80AD7AB4 002470 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */
void daNpcT_c::setCollision() {
/* empty function */
}
/* 80AD7AB4-80AD7ABC 002474 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_shaman.cpp
-15
View File
@@ -1802,16 +1802,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AE6364-80AE636C 003684 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AE636C-80AE6374 00368C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AE6374-80AE637C 003694 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1832,11 +1822,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AE638C-80AE6390 0036AC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AE6390-80AE6398 0036B0 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_sola.cpp
-25
View File
@@ -905,16 +905,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80AEEDFC-80AEEE04 00233C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80AEEE04-80AEEE0C 002344 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80AEEE0C-80AEEE14 00234C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -929,27 +919,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80AEEE1C-80AEEE20 00235C 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80AEEE20-80AEEE28 002360 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80AEEE28-80AEEE30 002368 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80AEEE30-80AEEE34 002370 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80AEEE34-80AEEE3C 002374 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_taro.cpp
-5
View File
@@ -2972,11 +2972,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80571190-80571194 00B3F0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80571194-8057119C 00B3F4 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_tkj.cpp
-25
View File
@@ -1061,16 +1061,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80576248-80576250 002C08 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80576250-80576258 002C10 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80576258-80576260 002C18 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1085,27 +1075,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80576268-8057626C 002C28 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 8057626C-80576274 002C2C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80576274-8057627C 002C34 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 8057627C-80576280 002C3C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80576280-80576288 002C40 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_toby.cpp
-5
View File
@@ -1976,11 +1976,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B24698-80B2469C 006138 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B2469C-80B246B4 00613C 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */
// void daNpcT_c::decTmr() {
extern "C" void decTmr__8daNpcT_cFv() {
src/d/actor/d_a_npc_uri.cpp
-5
View File
@@ -1813,11 +1813,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B2CA78-80B2CA7C 0063B8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B2CA7C-80B2CA84 0063BC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_yamid.cpp
-20
View File
@@ -1100,16 +1100,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B45D1C-80B45D24 002EBC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B45D24-80B45D2C 002EC4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B45D2C-80B45D34 002ECC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1124,16 +1114,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80B45D3C-80B45D44 002EDC 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80B45D44-80B45D48 002EE4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B45D48-80B45D50 002EE8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_yamis.cpp
-20
View File
@@ -1100,16 +1100,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B49380-80B49388 002F00 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B49388-80B49390 002F08 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B49390-80B49398 002F10 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1124,16 +1114,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80B493A0-80B493A8 002F20 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80B493A8-80B493AC 002F28 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B493AC-80B493B4 002F2C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_yamit.cpp
-20
View File
@@ -1116,16 +1116,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B4CAE0-80B4CAE8 002FE0 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B4CAE8-80B4CAF0 002FE8 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B4CAF0-80B4CAF8 002FF0 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1140,16 +1130,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80B4CB00-80B4CB08 003000 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80B4CB08-80B4CB0C 003008 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B4CB0C-80B4CB14 00300C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_yelia.cpp
-15
View File
@@ -1662,16 +1662,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B51F38-80B51F40 004D18 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B51F40-80B51F48 004D20 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B51F48-80B51F50 004D28 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1692,11 +1682,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B51F60-80B51F64 004D40 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B51F64-80B51F7C 004D44 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */
// void daNpcT_c::decTmr() {
extern "C" void decTmr__8daNpcT_cFv() {
src/d/actor/d_a_npc_ykm.cpp
-10
View File
@@ -2432,16 +2432,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B5D2B4-80B5D2BC 009EB4 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B5D2BC-80B5D2C4 009EBC 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B5D2C4-80B5D2CC 009EC4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
src/d/actor/d_a_npc_zanb.cpp
-15
View File
@@ -1063,16 +1063,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B6B9A4-80B6B9AC 002B64 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B6B9AC-80B6B9B4 002B6C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B6B9B4-80B6B9BC 002B74 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1093,11 +1083,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B6B9CC-80B6B9D0 002B8C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B6B9D0-80B6B9D8 002B90 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_zant.cpp
-35
View File
@@ -903,37 +903,12 @@ extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs() {
// NONMATCHING
}
/* 80B6E694-80B6E69C 0025D4 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */
s32 daNpcT_c::getHeadJointNo() {
return -1;
}
/* 80B6E69C-80B6E6A4 0025DC 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80B6E6A4-80B6E6AC 0025E4 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */
s32 daNpcT_c::getBackboneJointNo() {
return -1;
}
/* 80B6E6AC-80B6E6B0 0025EC 0004+00 1/0 0/0 0/0 .text ctrlSubFaceMotion__8daNpcT_cFi */
// void daNpcT_c::ctrlSubFaceMotion(int param_0) {
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B6E6C0-80B6E6C8 002600 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B6E6C8-80B6E6D0 002608 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B6E6D0-80B6E6D8 002610 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -948,22 +923,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80B6E6E0-80B6E6E8 002620 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80B6E6E8-80B6E6F0 002628 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B6E6F0-80B6E6F4 002630 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B6E6F4-80B6E6FC 002634 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_zelR.cpp
-25
View File
@@ -1047,43 +1047,18 @@ extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs() {
// NONMATCHING
}
/* 80B7182C-80B71834 002AEC 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80B71834-80B71838 002AF4 0004+00 1/0 0/0 0/0 .text ctrlSubFaceMotion__8daNpcT_cFi */
// void daNpcT_c::ctrlSubFaceMotion(int param_0) {
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B71838-80B71840 002AF8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B71840-80B71848 002B00 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B71850-80B71858 002B10 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80B71858-80B71860 002B18 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B71860-80B71864 002B20 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B71864-80B7186C 002B24 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_zelRo.cpp
-20
View File
@@ -1053,32 +1053,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B749AC-80B749B4 002AEC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B749B4-80B749BC 002AF4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B749C4-80B749CC 002B04 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80B749CC-80B749D4 002B0C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B749D4-80B749D8 002B14 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B749D8-80B749E0 002B18 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_npc_zelda.cpp
-15
View File
@@ -1070,27 +1070,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80B77CA4-80B77CAC 002C64 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80B77CAC-80B77CB4 002C6C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80B77CBC-80B77CC4 002C7C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80B77CC4-80B77CC8 002C84 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80B77CC8-80B77CD0 002C88 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_obj_sekizoa.cpp
-20
View File
@@ -2169,27 +2169,12 @@ void daNpcT_JntAnm_c::setEyeAngleX(cXyz param_0, f32 param_1, s16 param_2) {
// NONMATCHING
}
/* 80CD57A4-80CD57AC 007544 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */
s32 daNpcT_c::getNeckJointNo() {
return -1;
}
/* 80CD57AC-80CD57B0 00754C 0004+00 1/0 0/0 0/0 .text ctrlSubFaceMotion__8daNpcT_cFi */
//void daNpcT_c::ctrlSubFaceMotion(int param_0) {
void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80CD57C0-80CD57C8 007560 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80CD57C8-80CD57D0 007568 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80CD57D0-80CD57D8 007570 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -2210,11 +2195,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80CD57E8-80CD57EC 007588 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80CD57EC-80CD57F4 00758C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_peru.cpp
-25
View File
@@ -1656,16 +1656,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* empty function */
}
/* 80D4BCB0-80D4BCB8 004EB0 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootLJointNo() {
return -1;
}
/* 80D4BCB8-80D4BCC0 004EB8 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */
s32 daNpcT_c::getFootRJointNo() {
return -1;
}
/* 80D4BCC0-80D4BCC8 004EC0 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
@@ -1680,27 +1670,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
/* 80D4BCD0-80D4BCD4 004ED0 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */
void daNpcT_c::afterJntAnm(int param_0) {
/* empty function */
}
/* 80D4BCD4-80D4BCDC 004ED4 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */
bool daNpcT_c::checkChangeEvt() {
return false;
}
/* 80D4BCDC-80D4BCE4 004EDC 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */
// bool daNpcT_c::evtEndProc() {
extern "C" bool evtEndProc__8daNpcT_cFv() {
return true;
}
/* 80D4BCE4-80D4BCE8 004EE4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */
void daNpcT_c::afterMoved() {
/* empty function */
}
/* 80D4BCE8-80D4BCF0 004EE8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */
// bool daNpcT_c::chkXYItems() {
extern "C" bool chkXYItems__8daNpcT_cFv() {
src/d/actor/d_a_tag_chgrestart.cpp
+2 -3
View File
@@ -60,9 +60,8 @@ s32 daTagChgRestart_c::execute() {
u8 playerNo = daTagChgRestart_prm::getPlayerNo(this);
if (playerNo != 0xFF) {
dStage_roomStatus_c* roomStatusDt =
dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this));
stage_actor_class* player_data = roomStatusDt->mRoomDt.getPlayer();
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this));
stage_actor_class* player_data = roomDt->getPlayer();
stage_actor_data_class* entry_p = player_data->mEntries;
for (int i = 0; i < player_data->mEntryNum; i++) {
src/d/actor/d_a_talk.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ int daTalk_c::execute() {
}
} else {
if (fopAcM_searchPlayerDistanceXZ(this) >
dAttention_c::i_getDistTable(attention_info.distances[fopAc_attn_TALK_e]).mDistMaxRelease)
dAttention_c::getDistTable(attention_info.distances[fopAc_attn_TALK_e]).mDistMaxRelease)
{
mMessageID = -1;
fopAcM_delete(this);
src/d/actor/d_a_tbox.cpp
+3 -3
View File
@@ -1536,14 +1536,14 @@ void daTbox_c::settingDropDemoCamera() {
player_camera->mCamera.SetTrimSize(maptooldata->field_0x1);
dStage_roomStatus_c* roomdt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this));
dStage_roomDt_c* roomdt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this));
JUT_ASSERT(0xB8E, roomdt != 0);
stage_camera_class* stage_camera = roomdt->mRoomDt.getCamera();
stage_camera_class* stage_camera = roomdt->getCamera();
stage_camera2_data_class* stage_camera_data = stage_camera->mEntries;
stage_camera_data += maptooldata->field_0x16;
stage_arrow_class* stage_arrow = roomdt->mRoomDt.getArrow();
stage_arrow_class* stage_arrow = roomdt->getArrow();
stage_arrow_data_class* stage_arrow_data = stage_arrow->mEntries;
stage_arrow_data += stage_camera_data->field_0x10;
src/d/actor/d_a_vrbox.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ static int daVrbox_Draw(vrbox_class* i_this) {
if (dComIfGp_roomControl_getStayNo() >= 0) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo();
filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo();
}
if (filelist_p != NULL) {
src/d/actor/d_a_vrbox2.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
if (dComIfGp_roomControl_getStayNo() >= 0) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo();
filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo();
}
if (filelist_p != NULL) {
src/d/actor/d_flower.inc
+2 -2
View File
@@ -600,7 +600,7 @@ void dFlower_packet_c::draw() {
int sp4C = 6;
if (dComIfGp_roomControl_getStatusRoomDt(i) != NULL) {
sp4C = dComIfGp_roomControl_getStatusRoomDt(i)->mRoomDt.getLightVecInfoNum();
sp4C = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum();
}
if (dKy_SunMoon_Light_Check() == TRUE && sp4C < 2) {
@@ -689,7 +689,7 @@ void dFlower_packet_c::draw() {
int sp7C = 0;
if (dComIfGp_roomControl_getStatusRoomDt(i) != NULL) {
sp2C = dComIfGp_roomControl_getStatusRoomDt(i)->mRoomDt.getLightVecInfoNum();
sp2C = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum();
}
if (dKy_SunMoon_Light_Check() == TRUE && sp2C < 2) {
src/d/actor/d_grass.inc
+1 -1
View File
@@ -597,7 +597,7 @@ void dGrass_packet_c::draw() {
GFSetTevColorS10(GX_TEVREG1, sp98);
if (dComIfGp_roomControl_getStatusRoomDt(i) != NULL) {
sp48 = dComIfGp_roomControl_getStatusRoomDt(i)->mRoomDt.getLightVecInfoNum();
sp48 = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum();
}
if (dKy_SunMoon_Light_Check() == TRUE && sp48 < 2) {
src/d/d_camera.cpp
+5 -5
View File
@@ -963,9 +963,9 @@ void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_c
int sp108 = 0xFF;
int sp10C = dComIfGp_roomControl_getStayNo();
dStage_roomStatus_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(sp10C);
dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(sp10C);
if (room_dt != NULL) {
dStage_FileList_dt_c* filelist = room_dt->mRoomDt.getFileListInfo();
dStage_FileList_dt_c* filelist = room_dt->getFileListInfo();
if (filelist != NULL) {
sp108 = dStage_FileList_dt_GetDefaultCamera(filelist);
}
@@ -2323,9 +2323,9 @@ int dCamera_c::onRoomChange(s32 i_roomNo) {
setFlag(0x1000);
int var_r29 = 0xFF;
dStage_roomStatus_c* room_status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
if (room_status != NULL) {
dStage_FileList_dt_c* filelist = room_status->mRoomDt.getFileListInfo();
dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
if (room_dt != NULL) {
dStage_FileList_dt_c* filelist = room_dt->getFileListInfo();
if (filelist != NULL) {
var_r29 = dStage_FileList_dt_GetDefaultCamera(filelist);
}
src/d/d_com_inf_game.cpp
+6 -6
View File
@@ -1169,24 +1169,24 @@ bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_ang
/* 8002D25C-8002D2AC 027B9C 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomCamera__Fi */
stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo) {
dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
if (status == NULL) {
if (room_dt == NULL) {
return NULL;
}
return status->mRoomDt.getCamera();
return room_dt->getCamera();
}
/* 8002D2AC-8002D2FC 027BEC 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomArrow__Fi */
stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) {
dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
if (status == NULL) {
if (room_dt == NULL) {
return NULL;
}
return status->mRoomDt.getArrow();
return room_dt->getArrow();
}
/* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */
src/d/d_envse.cpp
+1 -1
View File
@@ -190,7 +190,7 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par
/* 80183480-801835A0 17DDC0 0120+00 1/1 0/0 0/0 .text execute__8dEnvSe_cFv */
int dEnvSe_c::execute() {
s32 roomNo = dComIfGp_roomControl_getStayNo();
dStage_roomDt_c* roomDt_p = &dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt;
dStage_roomDt_c* roomDt_p = dComIfGp_roomControl_getStatusRoomDt(roomNo);
if (roomDt_p == NULL) {
return 1;
src/d/d_event.cpp
+12 -12
View File
@@ -1160,24 +1160,24 @@ dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 mapToolID, s32 roomN
return NULL;
}
dStage_roomStatus_c* room = dComIfGp_roomControl_getStatusRoomDt(roomNo);
if (room != NULL) {
dStage_MapEventInfo_c* roomDt = room->mRoomDt.getMapEventInfo();
dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(roomNo);
if (room_dt != NULL) {
dStage_MapEventInfo_c* roomInfo = room_dt->getMapEventInfo();
if (roomDt != NULL) {
for (int i = 0; i < roomDt->mCount; i++) {
if (mapToolID == roomDt->mData[i].field_0x4) {
return &roomDt->mData[i];
if (roomInfo != NULL) {
for (int i = 0; i < roomInfo->mCount; i++) {
if (mapToolID == roomInfo->mData[i].field_0x4) {
return &roomInfo->mData[i];
}
}
}
}
dStage_MapEventInfo_c* stageDt = dComIfGp_getStage()->getMapEventInfo();
if (stageDt != NULL) {
for (int i = 0; i < stageDt->mCount; i++) {
if (mapToolID == stageDt->mData[i].field_0x4) {
return &stageDt->mData[i];
dStage_MapEventInfo_c* stageInfo = dComIfGp_getStage()->getMapEventInfo();
if (stageInfo != NULL) {
for (int i = 0; i < stageInfo->mCount; i++) {
if (mapToolID == stageInfo->mData[i].field_0x4) {
return &stageInfo->mData[i];
}
}
}
src/d/d_event_data.cpp
+1 -1
View File
@@ -146,7 +146,7 @@ static int dEvDt_Next_Stage(int index, int wipe_type) {
if (room_no == -1) {
info = dComIfGp_getStageSclsInfo();
} else {
info = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo();
info = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo();
}
if (info != NULL && id >= 0 && id < info->numEntries) {
src/d/d_event_manager.cpp
+2 -2
View File
@@ -43,8 +43,8 @@ const char* dEvent_exception_c::getEventName() {
};
s32 roomNo = dComIfGp_roomControl_getStayNo();
dStage_roomStatus_c* roomStatus = dComIfGp_roomControl_getStatusRoomDt(roomNo);
dStage_MapEventInfo_c* eventInfo = roomStatus->mRoomDt.getMapEventInfo();
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo);
dStage_MapEventInfo_c* eventInfo = roomDt->getMapEventInfo();
if (mEventInfoIdx == -1) {
return "(!NO REGIST!)";
}
src/d/d_kankyo.cpp
+14 -14
View File
@@ -4294,8 +4294,8 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) {
dKy_tevstr_c* room_tevstr = dComIfGp_roomControl_getTevStr(room_no);
if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) {
stage_pure_lightvec_info_class* room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo();
int room_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum();
stage_pure_lightvec_info_class* room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo();
int room_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum();
if (room_light_info_num > 6) {
room_light_info_num = 6;
}
@@ -4309,7 +4309,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) {
room_light_info++;
}
room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo();
room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo();
if (dKy_SunMoon_Light_Check() == TRUE && room_light_info == NULL) {
lightMask |= lightMaskData[2];
lightMask |= lightMaskData[3];
@@ -4513,7 +4513,7 @@ void dKy_setLight_nowroom_grass(char room_no, f32 light_ratio) {
MtxP view_mtx = j3dSys.getViewMtx();
if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) {
dStage_FileList_dt_c* filelist = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getFileListInfo();
dStage_FileList_dt_c* filelist = dComIfGp_roomControl_getStatusRoomDt(room_no)->getFileListInfo();
if (filelist == NULL) {
return;
}
@@ -4587,8 +4587,8 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) {
if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) {
J3DLightInfo* light;
stage_pure_lightvec_info_class* room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo();
int room_light_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum();
stage_pure_lightvec_info_class* room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo();
int room_light_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum();
if (room_light_num > 6) {
room_light_num = 6;
}
@@ -4602,7 +4602,7 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) {
room_lights++;
}
room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo();
room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo();
for (int i = 0; i < 6; i++) {
light = &tevstr_p->mLights[i].getLightInfo();
@@ -5416,8 +5416,8 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p
sp40 = g_env_light.dungeonlight[i].mColor;
} else if (dComIfGp_roomControl_getStatusRoomDt(sp38) != NULL) {
stage_light_info_p =
dComIfGp_roomControl_getStatusRoomDt(sp38)->mRoomDt.getLightVecInfo();
sp30 = dComIfGp_roomControl_getStatusRoomDt(sp38)->mRoomDt.getLightVecInfoNum();
dComIfGp_roomControl_getStatusRoomDt(sp38)->getLightVecInfo();
sp30 = dComIfGp_roomControl_getStatusRoomDt(sp38)->getLightVecInfoNum();
if (i < sp30) {
sp40 = g_env_light.dungeonlight[i].mColor;
} else {
@@ -5459,14 +5459,14 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p
stage_pure_lightvec_info_class* stage_light_info_p;
if (param_1 != NULL && param_1->room_no >= 0) {
stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(param_1->room_no)
->mRoomDt.getLightVecInfo();
->getLightVecInfo();
sp3C = dComIfGp_roomControl_getStatusRoomDt(param_1->room_no)
->mRoomDt.getLightVecInfoNum();
->getLightVecInfoNum();
} else {
s32 room_no = dComIfGp_roomControl_getStayNo(); // fakematch, fixes instruction order
stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo();
stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo();
room_no = dComIfGp_roomControl_getStayNo(); // fakematch, fixes instruction order
sp3C = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum();
sp3C = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum();
}
f32 var_f27;
@@ -5659,7 +5659,7 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) {
return 0;
}
stage_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum();
stage_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum();
if (stage_light_info_num < 0 || stage_light_info_num > 6) {
stage_light_info_num = 6;
}
src/d/d_kankyo_rain.cpp
+2 -2
View File
@@ -1891,7 +1891,7 @@ void vrkumo_move() {
dStage_FileList_dt_c* filelist = NULL;
if (dComIfGp_roomControl_getStayNo() >= 0) {
filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->mRoomDt.getFileListInfo();
filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo();
}
if (filelist != NULL) {
@@ -4605,7 +4605,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
f32 sp70 = 0.0f;
dStage_FileList_dt_c* filelist = NULL;
if (dComIfGp_roomControl_getStayNo() >= 0) {
filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->mRoomDt.getFileListInfo();
filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo();
}
if (filelist != NULL) {
src/d/d_kankyo_wether.cpp
+3 -3
View File
@@ -1260,7 +1260,7 @@ void dKyw_wind_set() {
if (dComIfGp_roomControl_getStayNo() >= 0) {
fili_p = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())
->mRoomDt.getFileListInfo();
->getFileListInfo();
}
var_r30 = 0;
@@ -1273,7 +1273,7 @@ void dKyw_wind_set() {
if (dComIfGp_roomControl_getStatusRoomDt(var_r4) != NULL) {
s32 var_r4_2 = dComIfGp_roomControl_getStayNo();
dStage_Lbnk_c* lbnk_p =
dComIfGp_roomControl_getStatusRoomDt(var_r4_2)->mRoomDt.getLbnk();
dComIfGp_roomControl_getStatusRoomDt(var_r4_2)->getLbnk();
if (lbnk_p != NULL) {
dStage_Lbnk_dt_c* data_p = lbnk_p->entries;
@@ -1322,7 +1322,7 @@ void dKyw_wind_set() {
if (dComIfGp_roomControl_getStatusRoomDt(var_r4_3) != NULL) {
s32 var_r4_4 = dComIfGp_roomControl_getStayNo();
dStage_Lbnk_c* lbnk_p =
dComIfGp_roomControl_getStatusRoomDt(var_r4_4)->mRoomDt.getLbnk();
dComIfGp_roomControl_getStatusRoomDt(var_r4_4)->getLbnk();
if (lbnk_p != NULL) {
dStage_Lbnk_dt_c* data_p = lbnk_p->entries;
src/d/d_meter_map.cpp
+2 -2
View File
@@ -35,7 +35,7 @@ int dMeterMap_c::getMapDispSizeTypeNo() {
s32 stayNo = dComIfGp_roomControl_getStayNo();
dStage_FileList_dt_c* fList =
dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo();
dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo();
if (fList != NULL) {
uvar6 = dStage_FileList_dt_getMiniMap(fList);
}
@@ -593,4 +593,4 @@ void dMeterMap_c::keyCheck() {
}
}
}
}
}
src/d/d_msg_flow.cpp
+4 -4
View File
@@ -593,7 +593,7 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) {
if (daAlink_getAlinkActorClass()->getMidnaMsgNum() == 0xFFFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
msgNum =
dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo()->mMsg;
dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo()->mMsg;
} else {
msgNum = daAlink_getAlinkActorClass()->getMidnaMsgNum();
daAlink_getAlinkActorClass()->setMidnaMsg();
@@ -1615,10 +1615,10 @@ int dMsgFlow_c::event019(mesg_flow_node_event*, fopAc_ac_c*) {
int dMsgFlow_c::event020(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) {
int prm0 = getParam(flow_node->params);
daPy_py_c* player = daPy_getPlayerActorClass();
dStage_roomStatus_c* room = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(actor));
stage_actor_data_class* actor_data = room->mRoomDt.getPlayer()->mEntries;
dStage_roomDt_c* room = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(actor));
stage_actor_data_class* actor_data = room->getPlayer()->mEntries;
for (int i = 0; i < room->mRoomDt.getPlayerNum(); i++, actor_data++) {
for (int i = 0; i < room->getPlayerNum(); i++, actor_data++) {
if ((u8)actor_data->mAngle.z == prm0) {
player->setPlayerPosAndAngle(&actor_data->mSpawnPos, player->current.angle.y, 0);
break;
src/d/d_path.cpp
+7 -7
View File
@@ -22,12 +22,12 @@ dPath* dPath_GetRoomPath(int path_index, int room_no) {
if (room_no == -1) {
path = dComIfGp_getStage()->getPath2Inf();
} else {
dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomSt == NULL) {
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomDt == NULL) {
return NULL;
}
path = roomSt->mRoomDt.getPath2Inf();
path = roomDt->getPath2Inf();
}
if (path == NULL || path_index < 0 || path_index >= path->m_num) {
@@ -45,12 +45,12 @@ dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) {
if (room_no == -1) {
path = dComIfGp_getStage()->getPath2Inf();
} else {
dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomSt == NULL) {
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(room_no);
if (roomDt == NULL) {
return NULL;
}
path = roomSt->mRoomDt.getPath2Inf();
path = roomDt->getPath2Inf();
}
int next_id = p_path->m_nextID;
@@ -110,4 +110,4 @@ u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* par
*param_2 = path->field_0x4;
return 1;
}
}
src/d/d_s_room.cpp
+4 -4
View File
@@ -138,7 +138,7 @@ static bool isCreating(fpc_ProcID param_0) {
/* 8025B1D0-8025B2EC 255B10 011C+00 1/1 0/0 0/0 .text loadDemoArchive__Fi */
static int loadDemoArchive(int room_no) {
if (*dStage_roomControl_c::getDemoArcName() == 0) {
dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLbnk();
dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLbnk();
if (lbnk != NULL) {
dStage_Lbnk_dt_c* entries = lbnk->entries;
@@ -293,7 +293,7 @@ inline const char* setArcName(room_of_scene_class* i_room) {
static int dScnRoom_Delete(room_of_scene_class* i_this) {
int roomNo = fopScnM_GetParam(i_this);
dComIfGp_roomControl_setStatusFlag(roomNo, 0);
dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt.init();
dComIfGp_roomControl_getStatusRoomDt(roomNo)->init();
if (mDoRst::isReset() || !dComIfGp_isEnableNextStage() ||
strcmp(dComIfGp_getNextStageName(), dComIfGp_getStartStageName()) ||
@@ -307,7 +307,7 @@ static int dScnRoom_Delete(room_of_scene_class* i_this) {
}
}
dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt.init();
dComIfGp_roomControl_getStatusRoomDt(roomNo)->init();
dComIfGp_getPEvtManager()->roomFinish(roomNo);
return 1;
}
@@ -367,7 +367,7 @@ static int phase_2(room_of_scene_class* i_this) {
dComIfGp_roomControl_setZoneNo(roomNo, dComIfGs_createZone(roomNo));
}
i_this->mpRoomDt = &dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt;
i_this->mpRoomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo);
i_this->mpRoomDt->setRoomNo(roomNo);
i_this->mpDzrRes = dComIfG_getStageRes(arcName, "room.dzr");
src/d/d_shop_system.cpp
+9 -80
View File
@@ -940,13 +940,13 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
if (i_flow->doFlow(actor, NULL, 0)) {
int itemNo;
if (mFlow.getEventId(&itemNo) == 1) {
if (field_0xd90 == -1) {
field_0xd90 = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1,
if (mItemId == -1) {
mItemId = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1,
-1, NULL, NULL);
}
if (fpcEx_IsExist(field_0xd90)) {
field_0xe30 = 1;
if (fpcEx_IsExist(mItemId)) {
mEvtNo = 1;
evtChange();
return 1;
} else {
@@ -1244,15 +1244,15 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
int itemNo;
if (mFlow.getEventId(&itemNo) == 1) {
if (i_flow->doFlow(actor, NULL, 0)) {
if (field_0xd90 == -1) {
field_0xd90 =
if (mItemId == -1) {
mItemId =
fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
}
if (fpcEx_IsExist(field_0xd90)) {
if (fpcEx_IsExist(mItemId)) {
offFlag(8);
setSoldOutItemHide();
field_0xe30 = 1;
mEvtNo = 1;
evtChange();
return 2;
}
@@ -1303,7 +1303,7 @@ int dShopSystem_c::seq_finish(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
/* 8019A0C0-8019A0D0 194A00 0010+00 1/0 0/0 0/0 .text
* seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */
bool dShopSystem_c::seq_event(fopAc_ac_c*, dMsgFlow_c*) {
return field_0xe30 == 0;
return mEvtNo == 0;
}
/* 8019A0D0-8019A158 194A10 0088+00 0/0 0/0 9/9 .text shop_init__13dShopSystem_cFb */
@@ -1659,74 +1659,3 @@ bool dShopSystem_c::checkRightTrigger(STControl* i_stick) {
bool dShopSystem_c::dpdMove() {
return false;
}
#pragma nosyminline on
// Need 0x78 bytes of padding with no symbol between process and dShopSystem_c::__vtable
// This is likely caused by the vtables of abstract base classes getting put there and then stripped out.
// Not sure which abstract base class could go there though, so we simulate it with some dummy classes for now.
class dummy_abstract_class {
public:
virtual void virt_func_0() = 0;
virtual void virt_func_1() = 0;
virtual void virt_func_2() = 0;
virtual void virt_func_3() = 0;
virtual void virt_func_4() = 0;
virtual void virt_func_5() = 0;
virtual void virt_func_6() = 0;
virtual void virt_func_7() = 0;
virtual void virt_func_8() = 0;
virtual void virt_func_9() = 0;
virtual void virt_func_10() = 0;
virtual void virt_func_11() = 0;
virtual void virt_func_12() = 0;
virtual void virt_func_13() = 0;
virtual void virt_func_14() = 0;
virtual void virt_func_15() = 0;
virtual void virt_func_16() = 0;
virtual void virt_func_17() = 0;
virtual void virt_func_18() = 0;
virtual void virt_func_19() = 0;
virtual void virt_func_20() = 0;
virtual void virt_func_21() = 0;
virtual void virt_func_22() = 0;
virtual void virt_func_23() = 0;
virtual void virt_func_24() = 0;
virtual void virt_func_25() = 0;
virtual void virt_func_26() = 0;
virtual void virt_func_27() = 0;
};
class dummy_child_class : dummy_abstract_class {
virtual void virt_func_0();
virtual void virt_func_1();
virtual void virt_func_2();
virtual void virt_func_3();
virtual void virt_func_4();
virtual void virt_func_5();
virtual void virt_func_6();
virtual void virt_func_7();
virtual void virt_func_8();
virtual void virt_func_9();
virtual void virt_func_10();
virtual void virt_func_11();
virtual void virt_func_12();
virtual void virt_func_13();
virtual void virt_func_14();
virtual void virt_func_15();
virtual void virt_func_16();
virtual void virt_func_17();
virtual void virt_func_18();
virtual void virt_func_19();
virtual void virt_func_20();
virtual void virt_func_21();
virtual void virt_func_22();
virtual void virt_func_23();
virtual void virt_func_24();
virtual void virt_func_25();
virtual void virt_func_26();
virtual void virt_func_27();
};
static dummy_child_class dummy() {
dummy_child_class temp;
return temp;
}
src/d/d_stage.cpp
+4 -4
View File
@@ -194,11 +194,11 @@ void dStage_roomControl_c::initZone() {
/* 80024384-800243B0 01ECC4 002C+00 2/2 27/27 6/6 .text getStatusRoomDt__20dStage_roomControl_cFi
*/
dStage_roomStatus_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) {
dStage_roomDt_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) {
if (i_statusIdx < 0 || i_statusIdx >= 0x40) {
return NULL;
}
return &mStatus[i_statusIdx];
return &mStatus[i_statusIdx].mRoomDt;
}
// clang-format off
@@ -2685,7 +2685,7 @@ int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no, s16 angle,
if (room_no == -1) {
scls = dComIfGp_getStageSclsInfo();
} else {
scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo();
scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo();
}
if (scls == NULL) {
@@ -2736,7 +2736,7 @@ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3,
if (room_no == -1) {
scls = dComIfGp_getStageSclsInfo();
} else {
scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo();
scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo();
}
if (scls == NULL) {
src/f_op/f_op_actor.cpp
+2 -2
View File
@@ -177,13 +177,13 @@ static int fopAc_Create(void* i_this) {
int roomNo = dComIfGp_roomControl_getStayNo();
if (roomNo >= 0) {
dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt.getFileListInfo();
dComIfGp_roomControl_getStatusRoomDt(roomNo)->getFileListInfo();
}
dStage_FileList_dt_c* filelist = NULL;
if (a_this->home.roomNo >= 0) {
filelist =
dComIfGp_roomControl_getStatusRoomDt(a_this->home.roomNo)->mRoomDt.getFileListInfo();
dComIfGp_roomControl_getStatusRoomDt(a_this->home.roomNo)->getFileListInfo();
}
if (filelist != NULL) {