mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-04 13:30:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_zelda equivalent (#2528)

Browse Source
This commit is contained in:
Max Roncace
2025-07-11 19:00:18 +00:00
committed by GitHub
parent b83ff69589
commit 92e14253ca
114 changed files with 1165 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc.cpp
+148 -5
View File
@@ -1581,7 +1581,7 @@ BOOL daNpcT_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->onEyeMoveFlg();
mpMatAnm[0]->onEyeMoveFlag();
return TRUE;
}
@@ -1590,7 +1590,7 @@ BOOL daNpcT_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->offEyeMoveFlg();
mpMatAnm[0]->offEyeMoveFlag();
}
return FALSE;
@@ -1629,11 +1629,11 @@ void daNpcT_c::ctrlFaceMotion() {
setFaceMotionAnm(motionNo, true);
if (morfFrm < 0.0f) {
mpMorf[0]->setMorf(field_0xa80);
field_0xdfc = field_0xa80;
mpMorf[0]->setMorf(mExpressionMorfFrame);
field_0xdfc = mExpressionMorfFrame;
if (mpMorf[1]) {
mpMorf[1]->setMorf(field_0xa80);
mpMorf[1]->setMorf(mExpressionMorfFrame);
}
} else {
mpMorf[0]->setMorf(morfFrm);
@@ -2841,6 +2841,149 @@ BOOL daNpcT_chkTmpBit(u32 i_no) {
return dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[i_no]);
}
void daNpcT_cmnGenMessage(JORMContext* ctx, daNpcT_HIOParam* i_hioParam) {
ctx->genSlider("注目オフセット ", &i_hioParam->attention_offset,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("重力 ", &i_hioParam->gravity,
-100.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("スケ−ル ", &i_hioParam->scale,
0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("リアル影サイズ ", &i_hioParam->real_shadow_size,
0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("体重 ", &i_hioParam->weight,
0.0f, 255.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("高さ ", &i_hioParam->height,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("ひざ丈 ", &i_hioParam->knee_length,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("幅 ", &i_hioParam->width,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＸ角上限 ", &i_hioParam->body_angleX_max, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＸ角下限 ", &i_hioParam->body_angleX_min, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＹ角上限 ", &i_hioParam->body_angleY_max, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＹ角下限 ", &i_hioParam->body_angleY_min, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＸ角上限 ", &i_hioParam->head_angleX_max, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＸ角下限 ", &i_hioParam->head_angleX_min, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＹ角上限 ", &i_hioParam->head_angleY_max, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＹ角下限 ", &i_hioParam->head_angleY_min, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("首の移動割合 ", &i_hioParam->neck_rotation_ratio,
0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("補間フレ－ム ", &i_hioParam->morf_frame,
0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->startComboBox("会話距離 ", &i_hioParam->talk_distance,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 50", 0);
ctx->genComboBoxItem(" 100", 1);
ctx->genComboBoxItem(" 150", 2);
ctx->genComboBoxItem(" 200", 3);
ctx->genComboBoxItem(" 250", 4);
ctx->genComboBoxItem(" 300", 5);
ctx->genComboBoxItem(" 350", 6);
ctx->genComboBoxItem(" 400", 7);
ctx->genComboBoxItem(" 450", 8);
ctx->genComboBoxItem(" 500", 9);
ctx->genComboBoxItem(" 550", 10);
ctx->genComboBoxItem(" 600", 11);
ctx->genComboBoxItem(" 650", 12);
ctx->genComboBoxItem(" 700", 13);
ctx->genComboBoxItem(" 750", 14);
ctx->genComboBoxItem(" 800", 15);
ctx->genComboBoxItem(" 850", 16);
ctx->genComboBoxItem(" 900", 17);
ctx->genComboBoxItem(" 950", 18);
ctx->genComboBoxItem("1000", 19);
ctx->endComboBox();
ctx->startComboBox("会話角度 ", &i_hioParam->talk_angle,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 30", 0);
ctx->genComboBoxItem(" 45", 1);
ctx->genComboBoxItem(" 60", 2);
ctx->genComboBoxItem(" 90", 3);
ctx->genComboBoxItem(" 110", 4);
ctx->genComboBoxItem(" 135", 5);
ctx->genComboBoxItem(" 180", 6);
ctx->endComboBox();
ctx->startComboBox("注目距離 ", &i_hioParam->attention_distance,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 50", 0);
ctx->genComboBoxItem(" 100", 1);
ctx->genComboBoxItem(" 150", 2);
ctx->genComboBoxItem(" 200", 3);
ctx->genComboBoxItem(" 250", 4);
ctx->genComboBoxItem(" 300", 5);
ctx->genComboBoxItem(" 350", 6);
ctx->genComboBoxItem(" 400", 7);
ctx->genComboBoxItem(" 450", 8);
ctx->genComboBoxItem(" 500", 9);
ctx->genComboBoxItem(" 550", 10);
ctx->genComboBoxItem(" 600", 11);
ctx->genComboBoxItem(" 650", 12);
ctx->genComboBoxItem(" 700", 13);
ctx->genComboBoxItem(" 750", 14);
ctx->genComboBoxItem(" 800", 15);
ctx->genComboBoxItem(" 850", 16);
ctx->genComboBoxItem(" 900", 17);
ctx->genComboBoxItem(" 950", 18);
ctx->genComboBoxItem("1000", 19);
ctx->endComboBox();
ctx->startComboBox("注目角度 ", &i_hioParam->attention_angle,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 30", 0);
ctx->genComboBoxItem(" 45", 1);
ctx->genComboBoxItem(" 60", 2);
ctx->genComboBoxItem(" 90", 3);
ctx->genComboBoxItem(" 110", 4);
ctx->genComboBoxItem(" 135", 5);
ctx->genComboBoxItem(" 180", 6);
ctx->endComboBox();
ctx->genSlider("視界 ", &i_hioParam->fov,
0.0f, 180.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("サ－チ距離 ", &i_hioParam->search_distance,
0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("サ－チ高さ ", &i_hioParam->search_height,
-10000.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("サ－チ低さ ", &i_hioParam->search_depth,
-10000.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("？ ", &i_hioParam->attention_time,
0, 10000, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("？ ", &i_hioParam->damage_time,
0, 10000, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("表情 ", &i_hioParam->face_expression,
0, 0xff, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("動作 ", &i_hioParam->motion,
0, 0xff, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("注視モ－ド ", &i_hioParam->look_mode,
0, 0xff, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genCheckBox("デバグモ－ドＯＮ", &i_hioParam->debug_mode_ON, 1, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genCheckBox("デバグ情報ＯＮ ", &i_hioParam->debug_info_ON, 1, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("表情補間フレ－ム", &i_hioParam->expression_morf_frame,
0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最小ｘ ", &i_hioParam->box_min_x,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最小ｙ ", &i_hioParam->box_min_y,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最小ｚ ", &i_hioParam->box_min_z,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最大ｘ ", &i_hioParam->box_max_x,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最大ｙ ", &i_hioParam->box_max_y,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最大ｚ ", &i_hioParam->box_max_z,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱オフセット ", &i_hioParam->box_offset,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
}
/* 80392680-803926B0 01ECE0 0030+00 1/1 0/0 4/4 .rodata mCcDObjData__8daNpcT_c */
const dCcD_SrcGObjInf daNpcT_c::mCcDObjData = {
{0, {{0, 0, 0}, {0, 0x00}, {0x79}}},
src/d/actor/d_a_npc_aru.cpp
+2 -2
View File
@@ -117,7 +117,7 @@ extern "C" void func_809573B0(void* _this, f32, f32);
extern "C" void __sinit_d_a_npc_aru_cpp();
extern "C" void
__ct__11daNpc_Aru_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Aru_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Aru_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Aru_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Aru_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Aru_cFv();
@@ -1884,7 +1884,7 @@ daNpc_Aru_c::daNpc_Aru_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 809575B4-809575BC 005F14 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Aru_cFv */
s32 daNpc_Aru_c::getEyeballMaterialNo() {
u16 daNpc_Aru_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_bans.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ extern "C" void func_809679F4(void* _this, u8*);
extern "C" void __sinit_d_a_npc_bans_cpp();
extern "C" void
__ct__12daNpc_Bans_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Bans_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Bans_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Bans_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Bans_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Bans_cFv();
@@ -1662,7 +1662,7 @@ daNpc_Bans_c::daNpc_Bans_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80967BE4-80967BEC 005404 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Bans_cFv */
s32 daNpc_Bans_c::getEyeballMaterialNo() {
u16 daNpc_Bans_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_besu.cpp
+4 -4
View File
@@ -498,7 +498,7 @@ int daNpc_Besu_c::Draw() {
material->setMaterialAnm(matAnm);
}
return draw(FALSE, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 805379FC-80537A1C 000C9C 0020+00 1/1 0/0 0/0 .text
@@ -740,12 +740,12 @@ void daNpc_Besu_c::setParam() {
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Besu_Param_c::m.common.knee_length);
field_0xde8 = daNpc_Besu_Param_c::m.common.real_shadow_size;
mRealShadowSize = daNpc_Besu_Param_c::m.common.real_shadow_size;
if (chkNurse()) {
field_0xde8 = 500.0f;
mRealShadowSize = 500.0f;
}
field_0xa80 = daNpc_Besu_Param_c::m.common.expression_morf_frame;
mExpressionMorfFrame = daNpc_Besu_Param_c::m.common.expression_morf_frame;
mMorfFrames = daNpc_Besu_Param_c::m.common.morf_frame;
gravity = daNpc_Besu_Param_c::m.common.gravity;
}
src/d/actor/d_a_npc_bou.cpp
+3 -3
View File
@@ -288,7 +288,7 @@ int daNpc_Bou_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 8096D8A0-8096D8C0 000A00 0020+00 1/1 0/0 0/0 .text
@@ -480,8 +480,8 @@ void daNpc_Bou_c::setParam() {
mAttnFovY = daNpc_Bou_Param_c::m.field_0x50;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Bou_Param_c::m.field_0x18);
field_0xde8 = daNpc_Bou_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Bou_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Bou_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Bou_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Bou_Param_c::m.field_0x44;
gravity = daNpc_Bou_Param_c::m.field_0x04;
}
src/d/actor/d_a_npc_clerka.cpp
+2 -2
View File
@@ -98,7 +98,7 @@ extern "C" void func_80995544(void* _this, int*);
extern "C" void __sinit_d_a_npc_clerka_cpp();
extern "C" void
__ct__14daNpc_clerkA_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__14daNpc_clerkA_cFv();
extern "C" u16 getEyeballMaterialNo__14daNpc_clerkA_cFv();
extern "C" s32 getHeadJointNo__14daNpc_clerkA_cFv();
extern "C" s32 getNeckJointNo__14daNpc_clerkA_cFv();
extern "C" bool getBackboneJointNo__14daNpc_clerkA_cFv();
@@ -1302,7 +1302,7 @@ daNpc_clerkA_c::daNpc_clerkA_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80995694-8099569C 003254 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__14daNpc_clerkA_cFv */
s32 daNpc_clerkA_c::getEyeballMaterialNo() {
u16 daNpc_clerkA_c::getEyeballMaterialNo() {
return 3;
}
src/d/actor/d_a_npc_clerkb.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ extern "C" void __sinit_d_a_npc_clerkb_cpp();
extern "C" void
__ct__14daNpc_clerkB_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__5csXyzFv();
extern "C" s32 getEyeballMaterialNo__14daNpc_clerkB_cFv();
extern "C" u16 getEyeballMaterialNo__14daNpc_clerkB_cFv();
extern "C" s32 getHeadJointNo__14daNpc_clerkB_cFv();
extern "C" s32 getNeckJointNo__14daNpc_clerkB_cFv();
extern "C" bool getBackboneJointNo__14daNpc_clerkB_cFv();
@@ -1367,7 +1367,7 @@ extern "C" void __dt__5csXyzFv() {
}
/* 809997AC-809997B4 00396C 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__14daNpc_clerkB_cFv */
s32 daNpc_clerkB_c::getEyeballMaterialNo() {
u16 daNpc_clerkB_c::getEyeballMaterialNo() {
return 3;
}
src/d/actor/d_a_npc_clerkt.cpp
+2 -2
View File
@@ -95,7 +95,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_clerkt_cpp();
extern "C" void
__ct__13daNpcClerkT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpcClerkT_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpcClerkT_cFv();
extern "C" void checkChangeJoint__13daNpcClerkT_cFi();
extern "C" void checkRemoveJoint__13daNpcClerkT_cFi();
extern "C" s32 getBackboneJointNo__13daNpcClerkT_cFv();
@@ -1252,7 +1252,7 @@ daNpcClerkT_c::daNpcClerkT_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 8099D068-8099D070 003008 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpcClerkT_cFv */
s32 daNpcClerkT_c::getEyeballMaterialNo() {
u16 daNpcClerkT_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_doc.cpp
+2 -2
View File
@@ -94,7 +94,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_doc_cpp();
extern "C" void
__ct__11daNpc_Doc_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Doc_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Doc_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Doc_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Doc_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Doc_cFv();
@@ -1430,7 +1430,7 @@ daNpc_Doc_c::daNpc_Doc_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 809AA24C-809AA254 0036AC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Doc_cFv */
s32 daNpc_Doc_c::getEyeballMaterialNo() {
u16 daNpc_Doc_c::getEyeballMaterialNo() {
return 4;
}
src/d/actor/d_a_npc_fairy.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ __ct__13daNpc_Fairy_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPC
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballMaterialNo__13daNpc_Fairy_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Fairy_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Fairy_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Fairy_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Fairy_cFv();
@@ -2699,7 +2699,7 @@ extern "C" void __dt__8cM3dGAabFv() {
}
/* 809B9238-809B9240 007818 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Fairy_cFv */
s32 daNpc_Fairy_c::getEyeballMaterialNo() {
u16 daNpc_Fairy_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_fairy_seirei.cpp
+2 -2
View File
@@ -177,8 +177,8 @@ void daNpc_FairySeirei_c::setParam() {
mAttnFovY = daNpc_FairySeirei_Param_c::m[20];
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_FairySeirei_Param_c::m[6]);
field_0xde8 = daNpc_FairySeirei_Param_c::m[3];
field_0xa80 = daNpc_FairySeirei_Param_c::m[27];
mRealShadowSize = daNpc_FairySeirei_Param_c::m[3];
mExpressionMorfFrame = daNpc_FairySeirei_Param_c::m[27];
mMorfFrames = daNpc_FairySeirei_Param_c::m[17];
gravity = daNpc_FairySeirei_Param_c::m[1];
}
src/d/actor/d_a_npc_gnd.cpp
+6 -6
View File
@@ -78,7 +78,7 @@ extern "C" bool checkChangeJoint__8daNpcT_cFi();
extern "C" bool checkRemoveJoint__8daNpcT_cFi();
extern "C" s32 getFootLJointNo__8daNpcT_cFv();
extern "C" s32 getFootRJointNo__8daNpcT_cFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" bool checkChangeEvt__8daNpcT_cFv();
extern "C" bool evtEndProc__8daNpcT_cFv();
extern "C" void afterMoved__8daNpcT_cFv();
@@ -98,8 +98,8 @@ extern "C" void
__ct__11daNpc_Gnd_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballRMaterialNo__11daNpc_Gnd_cFv();
extern "C" s32 getEyeballLMaterialNo__11daNpc_Gnd_cFv();
extern "C" u16 getEyeballRMaterialNo__11daNpc_Gnd_cFv();
extern "C" u16 getEyeballLMaterialNo__11daNpc_Gnd_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Gnd_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Gnd_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Gnd_cFv();
@@ -715,7 +715,7 @@ int daNpc_Gnd_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 809BBF44-809BBF64 000A24 0020+00 1/1 0/0 0/0 .text
@@ -1205,12 +1205,12 @@ REGISTER_CTORS(0x809BE268, __sinit_d_a_npc_gnd_cpp);
// }
/* 809BE40C-809BE414 002EEC 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__11daNpc_Gnd_cFv */
s32 daNpc_Gnd_c::getEyeballRMaterialNo() {
u16 daNpc_Gnd_c::getEyeballRMaterialNo() {
return 3;
}
/* 809BE414-809BE41C 002EF4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__11daNpc_Gnd_cFv */
s32 daNpc_Gnd_c::getEyeballLMaterialNo() {
u16 daNpc_Gnd_c::getEyeballLMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_grm.cpp
+2 -2
View File
@@ -54,7 +54,7 @@ __ct__11daNpc_grM_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ2
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__4cXyzFv();
extern "C" s32 getEyeballMaterialNo__11daNpc_grM_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_grM_cFv();
extern "C" s32 getHeadJointNo__11daNpc_grM_cFv();
extern "C" s32 getNeckJointNo__11daNpc_grM_cFv();
extern "C" bool getBackboneJointNo__11daNpc_grM_cFv();
@@ -982,7 +982,7 @@ extern "C" void __dt__4cXyzFv() {
}
/* 809D5F98-809D5FA0 002018 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_grM_cFv */
s32 daNpc_grM_c::getEyeballMaterialNo() {
u16 daNpc_grM_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_grmc.cpp
+2 -2
View File
@@ -57,7 +57,7 @@ extern "C" s32 getNeckJointNo__12daNpc_grMC_cFv();
extern "C" bool getBackboneJointNo__12daNpc_grMC_cFv();
extern "C" void checkChangeJoint__12daNpc_grMC_cFi();
extern "C" void checkRemoveJoint__12daNpc_grMC_cFi();
extern "C" s32 getEyeballMaterialNo__12daNpc_grMC_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_grMC_cFv();
extern "C" void __dt__18daNpc_grMC_Param_cFv();
extern "C" static void func_809D905C();
extern "C" static void func_809D9064();
@@ -1004,7 +1004,7 @@ void daNpc_grMC_c::checkRemoveJoint(int param_0) {
}
/* 809D900C-809D9014 001CEC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_grMC_cFv */
s32 daNpc_grMC_c::getEyeballMaterialNo() {
u16 daNpc_grMC_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_hanjo.cpp
+3 -3
View File
@@ -340,7 +340,7 @@ int daNpc_Hanjo_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 809F9C20-809F9C40 000C80 0020+00 1/1 0/0 0/0 .text
@@ -486,8 +486,8 @@ void daNpc_Hanjo_c::setParam() {
mAttnFovY = daNpc_Hanjo_Param_c::m.field_0x50;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Hanjo_Param_c::m.field_0x18);
field_0xde8 = daNpc_Hanjo_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Hanjo_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Hanjo_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Hanjo_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Hanjo_Param_c::m.field_0x44;
gravity = daNpc_Hanjo_Param_c::m.field_0x04;
}
src/d/actor/d_a_npc_hoz.cpp
+2 -2
View File
@@ -116,7 +116,7 @@ extern "C" void func_80A063B4(void* _this, int*);
extern "C" void __sinit_d_a_npc_hoz_cpp();
extern "C" void
__ct__11daNpc_Hoz_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Hoz_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Hoz_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Hoz_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Hoz_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Hoz_cFv();
@@ -1770,7 +1770,7 @@ daNpc_Hoz_c::daNpc_Hoz_c(daNpcT_faceMotionAnmData_c const* param_1,
}
/* 80A065A4-80A065AC 005184 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Hoz_cFv */
s32 daNpc_Hoz_c::getEyeballMaterialNo() {
u16 daNpc_Hoz_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_jagar.cpp
+3 -3
View File
@@ -304,7 +304,7 @@ int daNpc_Jagar_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 80A15034-80A15054 000A14 0020+00 1/1 0/0 0/0 .text createHeapCallBack__13daNpc_Jagar_cFP10fopAc_ac_c */
@@ -460,8 +460,8 @@ void daNpc_Jagar_c::setParam() {
mAttnFovY = daNpc_Jagar_Param_c::m.field_0x50;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Jagar_Param_c::m.field_0x18);
field_0xde8 = daNpc_Jagar_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Jagar_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Jagar_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Jagar_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Jagar_Param_c::m.field_0x44;
gravity = daNpc_Jagar_Param_c::m.field_0x04;
}
src/d/actor/d_a_npc_kakashi.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ extern "C" s32 getFootLJointNo__8daNpcT_cFv();
extern "C" s32 getFootRJointNo__8daNpcT_cFv();
extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv();
extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void afterJntAnm__8daNpcT_cFi();
extern "C" void setAfterTalkMotion__8daNpcT_cFv();
extern "C" void afterMoved__8daNpcT_cFv();
src/d/actor/d_a_npc_kkri.cpp
+2 -2
View File
@@ -105,7 +105,7 @@ extern "C" void func_805531EC(void* _this, int, int);
extern "C" void __sinit_d_a_npc_kkri_cpp();
extern "C" void
__ct__12daNpc_Kkri_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Kkri_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Kkri_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Kkri_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Kkri_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Kkri_cFv();
@@ -1490,7 +1490,7 @@ daNpc_Kkri_c::daNpc_Kkri_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 805533E4-805533EC 004124 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Kkri_cFv */
s32 daNpc_Kkri_c::getEyeballMaterialNo() {
u16 daNpc_Kkri_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_kn.cpp
+3 -3
View File
@@ -3561,17 +3561,17 @@ daNpc_Kn_c::daNpc_Kn_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A3BD14-80A3BD1C 0113F4 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__10daNpc_Kn_cFv */
s32 daNpc_Kn_c::getEyeballMaterialNo() {
u16 daNpc_Kn_c::getEyeballMaterialNo() {
return false;
}
/* 80A3BD1C-80A3BD24 0113FC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__10daNpc_Kn_cFv */
int daNpc_Kn_c::getEyeballLMaterialNo() {
u16 daNpc_Kn_c::getEyeballLMaterialNo() {
return false;
}
/* 80A3BD24-80A3BD2C 011404 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__10daNpc_Kn_cFv */
s32 daNpc_Kn_c::getEyeballRMaterialNo() {
u16 daNpc_Kn_c::getEyeballRMaterialNo() {
return false;
}
src/d/actor/d_a_npc_kn_base.inc
+2 -2
View File
@@ -424,7 +424,7 @@ int daNpc_Kn_c::ctrlBtk() {
field_0xe31 = 0;
}
mpMatAnm->onEyeMoveFlg();
mpMatAnm->onEyeMoveFlag();
return 1;
}
@@ -433,7 +433,7 @@ int daNpc_Kn_c::ctrlBtk() {
field_0xe31 = 0;
}
mpMatAnm->offEyeMoveFlg();
mpMatAnm->offEyeMoveFlag();
}
return 0;
src/d/actor/d_a_npc_knj.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" bool checkChangeJoint__8daNpcT_cFi();
extern "C" bool checkRemoveJoint__8daNpcT_cFi();
src/d/actor/d_a_npc_kolin.cpp
+6 -6
View File
@@ -96,8 +96,8 @@ extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" void setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs();
extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv();
extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballLMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballRMaterialNo__8daNpcT_cFv();
extern "C" bool evtEndProc__8daNpcT_cFv();
extern "C" void afterMoved__8daNpcT_cFv();
extern "C" bool chkXYItems__8daNpcT_cFv();
@@ -114,7 +114,7 @@ extern "C" void func_8055A1E0(void* _this, int, int);
extern "C" void __sinit_d_a_npc_kolin_cpp();
extern "C" void
__ct__13daNpc_Kolin_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Kolin_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Kolin_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Kolin_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Kolin_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Kolin_cFv();
@@ -2023,14 +2023,14 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* 8055A10C-8055A114 00620C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv() {
extern "C" u16 getEyeballLMaterialNo__8daNpcT_cFv() {
return false;
}
/* 8055A114-8055A11C 006214 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballRMaterialNo() {
extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
extern "C" u16 getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
@@ -2138,7 +2138,7 @@ REGISTER_CTORS(0x8055A25C, __sinit_d_a_npc_kolin_cpp);
} */
/* 8055A498-8055A4A0 006598 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Kolin_cFv */
s32 daNpc_Kolin_c::getEyeballMaterialNo() {
u16 daNpc_Kolin_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_kolinb.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" s32 getFootLJointNo__8daNpcT_cFv();
extern "C" s32 getFootRJointNo__8daNpcT_cFv();
src/d/actor/d_a_npc_kyury.cpp
+2 -2
View File
@@ -98,7 +98,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_kyury_cpp();
extern "C" void
__ct__13daNpc_Kyury_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Kyury_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Kyury_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Kyury_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Kyury_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Kyury_cFv();
@@ -1391,7 +1391,7 @@ daNpc_Kyury_c::daNpc_Kyury_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A63800-80A63808 003820 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Kyury_cFv */
s32 daNpc_Kyury_c::getEyeballMaterialNo() {
u16 daNpc_Kyury_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_len.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ extern "C" void func_80A68BD0(void* _this, int, int);
extern "C" void __sinit_d_a_npc_len_cpp();
extern "C" void
__ct__11daNpc_Len_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Len_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Len_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Len_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Len_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Len_cFv();
@@ -1542,7 +1542,7 @@ daNpc_Len_c::daNpc_Len_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A68DE0-80A68DE8 004BA0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Len_cFv */
s32 daNpc_Len_c::getEyeballMaterialNo() {
u16 daNpc_Len_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_lud.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ extern "C" void func_80A6FAD4(void* _this, int*);
extern "C" void __sinit_d_a_npc_lud_cpp();
extern "C" void
__ct__11daNpc_Lud_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Lud_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Lud_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Lud_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Lud_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Lud_cFv();
@@ -1721,7 +1721,7 @@ daNpc_Lud_c::daNpc_Lud_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A6FCD0-80A6FCD8 005210 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Lud_cFv */
s32 daNpc_Lud_c::getEyeballMaterialNo() {
u16 daNpc_Lud_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_maro.cpp
+4 -4
View File
@@ -362,7 +362,7 @@ int daNpc_Maro_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 8055BFA0-8055BFC0 000B00 0020+00 1/1 0/0 0/0 .text
@@ -691,8 +691,8 @@ void daNpc_Maro_c::setParam() {
mAttnFovY = daNpc_Maro_Param_c::m.common.fov;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Maro_Param_c::m.common.knee_length);
field_0xde8 = daNpc_Maro_Param_c::m.common.real_shadow_size;
field_0xa80 = daNpc_Maro_Param_c::m.common.expression_morf_frame;
mRealShadowSize = daNpc_Maro_Param_c::m.common.real_shadow_size;
mExpressionMorfFrame = daNpc_Maro_Param_c::m.common.expression_morf_frame;
mMorfFrames = daNpc_Maro_Param_c::m.common.morf_frame;
gravity = daNpc_Maro_Param_c::m.common.gravity;
}
@@ -3478,7 +3478,7 @@ static int daNpc_Maro_IsDelete(void* i_this) {
static daNpc_Maro_Param_c l_HIO;
/* 80564970-80564978 0094D0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Maro_cFv */
s32 daNpc_Maro_c::getEyeballMaterialNo() {
u16 daNpc_Maro_c::getEyeballMaterialNo() {
return 1;
}
src/d/actor/d_a_npc_midp.cpp
+9 -9
View File
@@ -230,7 +230,7 @@ int daNpc_midP_c::Draw() {
modelData->getMaterialNodePointer(getEyeballRMaterialNo())->setMaterialAnm(mpMatAnm[1]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 0.0f, 1, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, 1, 0, 0);
}
/* 80A715D4-80A715F4 000A54 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_midP_cFP10fopAc_ac_c */
@@ -312,8 +312,8 @@ BOOL daNpc_midP_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->onEyeMoveFlg();
mpMatAnm[1]->onEyeMoveFlg();
mpMatAnm[0]->onEyeMoveFlag();
mpMatAnm[1]->onEyeMoveFlag();
return TRUE;
}
@@ -323,8 +323,8 @@ BOOL daNpc_midP_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->offEyeMoveFlg();
mpMatAnm[1]->offEyeMoveFlg();
mpMatAnm[0]->offEyeMoveFlag();
mpMatAnm[1]->offEyeMoveFlag();
}
return FALSE;
@@ -352,8 +352,8 @@ void daNpc_midP_c::setParam() {
mAttnFovY = daNpc_midP_Param_c::m.mAttnFovY;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_midP_Param_c::m.mWallH);
field_0xde8 = daNpc_midP_Param_c::m.field_0x0c;
field_0xa80 = daNpc_midP_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_midP_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_midP_Param_c::m.field_0x6c;
mMorfFrames = daNpc_midP_Param_c::m.mMorfFrames;
gravity = daNpc_midP_Param_c::m.mGravity;
}
@@ -647,12 +647,12 @@ static u8 lit_3811[12];
static u8 l_HIO[4];
/* 80A7390C-80A73914 002D8C 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__12daNpc_midP_cFv */
s32 daNpc_midP_c::getEyeballRMaterialNo() {
u16 daNpc_midP_c::getEyeballRMaterialNo() {
return 3;
}
/* 80A73914-80A7391C 002D94 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__12daNpc_midP_cFv */
s32 daNpc_midP_c::getEyeballLMaterialNo() {
u16 daNpc_midP_c::getEyeballLMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_moi.cpp
+6 -6
View File
@@ -438,7 +438,7 @@ int daNpc_Moi_c::Draw() {
}
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 80A74B80-80A74BA0 000D20 0020+00 1/1 0/0 0/0 .text
@@ -664,17 +664,17 @@ void daNpc_Moi_c::setParam() {
}
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Moi_Param_c::m.field_0x18);
field_0xde8 = daNpc_Moi_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_Moi_Param_c::m.field_0x0c;
if (mType == TYPE_1) {
field_0xde8 = 600.0f;
mRealShadowSize = 600.0f;
} else if (mType == TYPE_2) {
field_0xde8 = 600.0f;
mRealShadowSize = 600.0f;
if (field_0x166d) {
field_0xde8 = 800.0f;
mRealShadowSize = 800.0f;
}
}
gravity = daNpc_Moi_Param_c::m.field_0x04;
field_0xa80 = daNpc_Moi_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_Moi_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Moi_Param_c::m.field_0x44;
if (mType == TYPE_3) {
mAcch.SetGrndNone();
src/d/actor/d_a_npc_pachi_besu.cpp
+2 -2
View File
@@ -129,7 +129,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_pachi_besu_cpp();
extern "C" void
__ct__18daNpc_Pachi_Besu_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__18daNpc_Pachi_Besu_cFv();
extern "C" u16 getEyeballMaterialNo__18daNpc_Pachi_Besu_cFv();
extern "C" s32 getHeadJointNo__18daNpc_Pachi_Besu_cFv();
extern "C" s32 getNeckJointNo__18daNpc_Pachi_Besu_cFv();
extern "C" bool getBackboneJointNo__18daNpc_Pachi_Besu_cFv();
@@ -1931,7 +1931,7 @@ daNpc_Pachi_Besu_c::daNpc_Pachi_Besu_c(
/* 80A969C0-80A969C8 003D40 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__18daNpc_Pachi_Besu_cFv
*/
s32 daNpc_Pachi_Besu_c::getEyeballMaterialNo() {
u16 daNpc_Pachi_Besu_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_pachi_maro.cpp
+2 -2
View File
@@ -129,7 +129,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_pachi_maro_cpp();
extern "C" void
__ct__18daNpc_Pachi_Maro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__18daNpc_Pachi_Maro_cFv();
extern "C" u16 getEyeballMaterialNo__18daNpc_Pachi_Maro_cFv();
extern "C" s32 getHeadJointNo__18daNpc_Pachi_Maro_cFv();
extern "C" s32 getNeckJointNo__18daNpc_Pachi_Maro_cFv();
extern "C" bool getBackboneJointNo__18daNpc_Pachi_Maro_cFv();
@@ -1691,7 +1691,7 @@ daNpc_Pachi_Maro_c::daNpc_Pachi_Maro_c(
/* 80A9B7E0-80A9B7E8 003C40 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__18daNpc_Pachi_Maro_cFv
*/
s32 daNpc_Pachi_Maro_c::getEyeballMaterialNo() {
u16 daNpc_Pachi_Maro_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_pachi_taro.cpp
+2 -2
View File
@@ -146,7 +146,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_pachi_taro_cpp();
extern "C" void
__ct__18daNpc_Pachi_Taro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__18daNpc_Pachi_Taro_cFv();
extern "C" u16 getEyeballMaterialNo__18daNpc_Pachi_Taro_cFv();
extern "C" s32 getHeadJointNo__18daNpc_Pachi_Taro_cFv();
extern "C" s32 getNeckJointNo__18daNpc_Pachi_Taro_cFv();
extern "C" bool getBackboneJointNo__18daNpc_Pachi_Taro_cFv();
@@ -2352,7 +2352,7 @@ daNpc_Pachi_Taro_c::daNpc_Pachi_Taro_c(
/* 80AA1558-80AA1560 0053B8 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__18daNpc_Pachi_Taro_cFv
*/
s32 daNpc_Pachi_Taro_c::getEyeballMaterialNo() {
u16 daNpc_Pachi_Taro_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_post.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ extern "C" void func_80AACF2C(void* _this, f32, f32);
extern "C" void __sinit_d_a_npc_post_cpp();
extern "C" void
__ct__12daNpc_Post_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Post_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Post_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Post_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Post_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Post_cFv();
@@ -1705,7 +1705,7 @@ daNpc_Post_c::daNpc_Post_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AAD0D0-80AAD0D8 004530 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Post_cFv */
s32 daNpc_Post_c::getEyeballMaterialNo() {
u16 daNpc_Post_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_pouya.cpp
+2 -2
View File
@@ -99,7 +99,7 @@ extern "C" void func_80AB1DDC(void* _this, int*);
extern "C" void __sinit_d_a_npc_pouya_cpp();
extern "C" void
__ct__13daNpc_Pouya_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Pouya_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Pouya_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Pouya_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Pouya_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Pouya_cFv();
@@ -1586,7 +1586,7 @@ daNpc_Pouya_c::daNpc_Pouya_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AB1F54-80AB1F5C 004294 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Pouya_cFv */
s32 daNpc_Pouya_c::getEyeballMaterialNo() {
u16 daNpc_Pouya_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_raca.cpp
+2 -2
View File
@@ -98,7 +98,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_raca_cpp();
extern "C" void
__ct__12daNpc_Raca_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Raca_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Raca_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Raca_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Raca_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Raca_cFv();
@@ -1263,7 +1263,7 @@ daNpc_Raca_c::daNpc_Raca_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AB8DAC-80AB8DB4 0031EC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Raca_cFv */
s32 daNpc_Raca_c::getEyeballMaterialNo() {
u16 daNpc_Raca_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_saru.cpp
+3 -3
View File
@@ -302,7 +302,7 @@ int daNpc_Saru_c::Execute() {
/* 80AC0AA8-80AC0AEC 000768 0044+00 1/1 0/0 0/0 .text Draw__12daNpc_Saru_cFv */
int daNpc_Saru_c::Draw() {
return draw(FALSE, FALSE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC0AEC-80AC0B0C 0007AC 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_Saru_cFP10fopAc_ac_c */
@@ -463,8 +463,8 @@ void daNpc_Saru_c::setParam() {
mAttnFovY = daNpc_Saru_Param_c::m.mAttnFovy;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Saru_Param_c::m.mWallH);
field_0xde8 = daNpc_Saru_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Saru_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Saru_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Saru_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Saru_Param_c::m.mMorfFrames;
gravity = daNpc_Saru_Param_c::m.mGravity;
}
src/d/actor/d_a_npc_seib.cpp
+3 -3
View File
@@ -201,7 +201,7 @@ int daNpc_seiB_c::Draw() {
mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return draw(FALSE, TRUE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC5608-80AC5628 000608 0020+00 1/1 0/0 0/0 .text
@@ -269,9 +269,9 @@ void daNpc_seiB_c::setParam() {
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(mpParam->m.mWallH);
field_0xde8 = mpParam->m.field_0xc;
mRealShadowSize = mpParam->m.field_0xc;
gravity = mpParam->m.mGravity;
field_0xa80 = mpParam->m.field_0x6c;
mExpressionMorfFrame = mpParam->m.field_0x6c;
mMorfFrames = mpParam->m.mMorfFrames;
}
src/d/actor/d_a_npc_seic.cpp
+3 -3
View File
@@ -220,7 +220,7 @@ int daNpc_seiC_c::Draw() {
J3DMaterial* material = modelData->getMaterialNodePointer(getEyeballMaterialNo());
material->setMaterialAnm(matAnm);
}
return draw(FALSE, TRUE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC7A68-80AC7A88 000608 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_seiC_cFP10fopAc_ac_c */
@@ -290,9 +290,9 @@ void daNpc_seiC_c::setParam() {
mWallR = daNpc_seiC_Param_c::m.mWallR;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_seiC_Param_c::m.mWallH);
field_0xde8 = daNpc_seiC_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_seiC_Param_c::m.field_0x0c;
gravity = daNpc_seiC_Param_c::m.mGravity;
field_0xa80 = daNpc_seiC_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_seiC_Param_c::m.field_0x6c;
mMorfFrames = daNpc_seiC_Param_c::m.mMorfFrames;
}
src/d/actor/d_a_npc_seid.cpp
+3 -3
View File
@@ -221,7 +221,7 @@ int daNpc_seiD_c::Draw() {
J3DMaterial* material = modelData->getMaterialNodePointer(getEyeballMaterialNo());
material->setMaterialAnm(matAnm);
}
return draw(FALSE, TRUE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC9BA8-80AC9BC8 000608 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_seiD_cFP10fopAc_ac_c */
@@ -289,9 +289,9 @@ void daNpc_seiD_c::setParam() {
mWallR = daNpc_seiD_Param_c::m.mWallR;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_seiD_Param_c::m.mWallH);
field_0xde8 = daNpc_seiD_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_seiD_Param_c::m.field_0x0c;
gravity = daNpc_seiD_Param_c::m.mGravity;
field_0xa80 = daNpc_seiD_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_seiD_Param_c::m.field_0x6c;
mMorfFrames = daNpc_seiD_Param_c::m.mMorfFrames;
}
src/d/actor/d_a_npc_seira.cpp
+2 -2
View File
@@ -112,7 +112,7 @@ extern "C" void func_80ACFA44(void* _this, int, int);
extern "C" void __sinit_d_a_npc_seira_cpp();
extern "C" void
__ct__13daNpc_Seira_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Seira_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Seira_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Seira_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Seira_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Seira_cFv();
@@ -1690,7 +1690,7 @@ daNpc_Seira_c::daNpc_Seira_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80ACFC14-80ACFC1C 004534 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Seira_cFv */
s32 daNpc_Seira_c::getEyeballMaterialNo() {
u16 daNpc_Seira_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_seira2.cpp
+2 -2
View File
@@ -109,7 +109,7 @@ extern "C" void func_80AD46D4(void* _this, int, int);
extern "C" void __sinit_d_a_npc_seira2_cpp();
extern "C" void
__ct__14daNpc_Seira2_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__14daNpc_Seira2_cFv();
extern "C" u16 getEyeballMaterialNo__14daNpc_Seira2_cFv();
extern "C" s32 getHeadJointNo__14daNpc_Seira2_cFv();
extern "C" s32 getNeckJointNo__14daNpc_Seira2_cFv();
extern "C" bool getBackboneJointNo__14daNpc_Seira2_cFv();
@@ -1565,7 +1565,7 @@ daNpc_Seira2_c::daNpc_Seira2_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AD4884-80AD488C 003D64 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__14daNpc_Seira2_cFv */
s32 daNpc_Seira2_c::getEyeballMaterialNo() {
u16 daNpc_Seira2_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_seirei.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" bool checkChangeJoint__8daNpcT_cFi();
extern "C" bool checkRemoveJoint__8daNpcT_cFi();
src/d/actor/d_a_npc_shaman.cpp
+2 -3
View File
@@ -111,7 +111,7 @@ extern "C" void
__ct__11daNpc_Sha_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballMaterialNo__11daNpc_Sha_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Sha_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Sha_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Sha_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Sha_cFv();
@@ -271,7 +271,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
@@ -1955,7 +1954,7 @@ extern "C" void __dt__8cM3dGAabFv() {
}
/* 80AE6B1C-80AE6B24 003E3C 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Sha_cFv */
s32 daNpc_Sha_c::getEyeballMaterialNo() {
u16 daNpc_Sha_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_sola.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs();
extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
src/d/actor/d_a_npc_taro.cpp
+4 -4
View File
@@ -520,7 +520,7 @@ int daNpc_Taro_c::Draw() {
material->setMaterialAnm(matAnm);
}
return draw(FALSE, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 805669F8-80566A18 000C58 0020+00 1/1 0/0 0/0 .text
@@ -780,11 +780,11 @@ void daNpc_Taro_c::setParam() {
}
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Taro_Param_c::m.mWallH);
field_0xde8 = daNpc_Taro_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_Taro_Param_c::m.field_0x0c;
if (&daNpc_Taro_c::practice == mAction) {
field_0xde8 = 500.0f;
mRealShadowSize = 500.0f;
}
field_0xa80 = daNpc_Taro_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_Taro_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Taro_Param_c::m.mMorfFrames;
gravity = daNpc_Taro_Param_c::m.mGravity;
}
src/d/actor/d_a_npc_tkj.cpp
+2 -2
View File
@@ -97,7 +97,7 @@ extern "C" void
__ct__10daNpcTkj_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballMaterialNo__10daNpcTkj_cFv();
extern "C" u16 getEyeballMaterialNo__10daNpcTkj_cFv();
extern "C" s32 getHeadJointNo__10daNpcTkj_cFv();
extern "C" s32 getNeckJointNo__10daNpcTkj_cFv();
extern "C" s32 getBackboneJointNo__10daNpcTkj_cFv();
@@ -1204,7 +1204,7 @@ extern "C" void __dt__8cM3dGAabFv() {
}
/* 805764EC-805764F4 002EAC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__10daNpcTkj_cFv */
s32 daNpcTkj_c::getEyeballMaterialNo() {
u16 daNpcTkj_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_toby.cpp
+2 -2
View File
@@ -106,7 +106,7 @@ extern "C" void func_80B24728(void* _this, int*);
extern "C" void __sinit_d_a_npc_toby_cpp();
extern "C" void
__ct__12daNpc_Toby_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Toby_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Toby_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Toby_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Toby_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Toby_cFv();
@@ -2062,7 +2062,7 @@ daNpc_Toby_c::daNpc_Toby_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B24920-80B24928 0063C0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Toby_cFv */
s32 daNpc_Toby_c::getEyeballMaterialNo() {
u16 daNpc_Toby_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_uri.cpp
+3 -3
View File
@@ -334,7 +334,7 @@ int daNpc_Uri_c::Draw() {
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 80B27174-80B27194 000AB4 0020+00 1/1 0/0 0/0 .text
@@ -525,9 +525,9 @@ void daNpc_Uri_c::setParam() {
mAttnFovY = daNpc_Uri_Param_c::m.field_0x50;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Uri_Param_c::m.field_0x18);
field_0xde8 = daNpc_Uri_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_Uri_Param_c::m.field_0x0c;
gravity = daNpc_Uri_Param_c::m.field_0x04;
field_0xa80 = daNpc_Uri_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_Uri_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Uri_Param_c::m.field_0x44;
if (mType == TYPE_4) {
mAcch.SetGrndNone();
src/d/actor/d_a_npc_yamid.cpp
+2 -2
View File
@@ -99,7 +99,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_yamid_cpp();
extern "C" void
__ct__13daNpc_yamiD_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_yamiD_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_yamiD_cFv();
extern "C" s32 getHeadJointNo__13daNpc_yamiD_cFv();
extern "C" s32 getNeckJointNo__13daNpc_yamiD_cFv();
extern "C" bool getBackboneJointNo__13daNpc_yamiD_cFv();
@@ -1220,7 +1220,7 @@ daNpc_yamiD_c::daNpc_yamiD_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B45F34-80B45F3C 0030D4 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_yamiD_cFv */
s32 daNpc_yamiD_c::getEyeballMaterialNo() {
u16 daNpc_yamiD_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_yamis.cpp
+2 -2
View File
@@ -99,7 +99,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_yamis_cpp();
extern "C" void
__ct__13daNpc_yamiS_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_yamiS_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_yamiS_cFv();
extern "C" s32 getHeadJointNo__13daNpc_yamiS_cFv();
extern "C" s32 getNeckJointNo__13daNpc_yamiS_cFv();
extern "C" bool getBackboneJointNo__13daNpc_yamiS_cFv();
@@ -1220,7 +1220,7 @@ daNpc_yamiS_c::daNpc_yamiS_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B49598-80B495A0 003118 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_yamiS_cFv */
s32 daNpc_yamiS_c::getEyeballMaterialNo() {
u16 daNpc_yamiS_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_yamit.cpp
+2 -2
View File
@@ -101,7 +101,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_yamit_cpp();
extern "C" void
__ct__13daNpc_yamiT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_yamiT_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_yamiT_cFv();
extern "C" s32 getHeadJointNo__13daNpc_yamiT_cFv();
extern "C" s32 getNeckJointNo__13daNpc_yamiT_cFv();
extern "C" bool getBackboneJointNo__13daNpc_yamiT_cFv();
@@ -1236,7 +1236,7 @@ daNpc_yamiT_c::daNpc_yamiT_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B4CCF8-80B4CD00 0031F8 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_yamiT_cFv */
s32 daNpc_yamiT_c::getEyeballMaterialNo() {
u16 daNpc_yamiT_c::getEyeballMaterialNo() {
return true;
}
src/d/actor/d_a_npc_yelia.cpp
+3 -3
View File
@@ -488,7 +488,7 @@ int daNpc_Yelia_c::Draw() {
J3DModelData* model_data = mpMorf[0]->getModel()->getModelData();
model_data->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return draw(FALSE, FALSE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80B4DD08-80B4DD28 000AE8 0020+00 1/1 0/0 0/0 .text
@@ -631,9 +631,9 @@ void daNpc_Yelia_c::setParam() {
}
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(l_HIO.m.mWallH);
field_0xde8 = l_HIO.m.mShadowDepth;
mRealShadowSize = l_HIO.m.mShadowDepth;
gravity = l_HIO.m.mGravity;
field_0xa80 = l_HIO.m.field_0x6c;
mExpressionMorfFrame = l_HIO.m.field_0x6c;
mMorfFrames = l_HIO.m.mMorfFrames;
if (mType == TYPE_TWILIGHT || mType == TYPE_AFTER_ESCORT) {
mAcch.SetGrndNone();
src/d/actor/d_a_npc_ykm.cpp
+2 -2
View File
@@ -127,7 +127,7 @@ extern "C" void func_80B5D394(void* _this, int, int);
extern "C" void __sinit_d_a_npc_ykm_cpp();
extern "C" void
__ct__11daNpc_ykM_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_ykM_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_ykM_cFv();
extern "C" s32 getHeadJointNo__11daNpc_ykM_cFv();
extern "C" s32 getNeckJointNo__11daNpc_ykM_cFv();
extern "C" bool getBackboneJointNo__11daNpc_ykM_cFv();
@@ -2683,7 +2683,7 @@ daNpc_ykM_c::daNpc_ykM_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B5D688-80B5D690 00A288 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_ykM_cFv */
s32 daNpc_ykM_c::getEyeballMaterialNo() {
u16 daNpc_ykM_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_ykw.cpp
+2 -2
View File
@@ -118,7 +118,7 @@ extern "C" void func_80B678EC(void* _this, f32, f32);
extern "C" void __sinit_d_a_npc_ykw_cpp();
extern "C" void
__ct__11daNpc_ykW_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_ykW_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_ykW_cFv();
extern "C" s32 getHeadJointNo__11daNpc_ykW_cFv();
extern "C" s32 getNeckJointNo__11daNpc_ykW_cFv();
extern "C" bool getBackboneJointNo__11daNpc_ykW_cFv();
@@ -2483,7 +2483,7 @@ daNpc_ykW_c::daNpc_ykW_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B67B1C-80B67B24 008CFC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_ykW_cFv */
s32 daNpc_ykW_c::getEyeballMaterialNo() {
u16 daNpc_ykW_c::getEyeballMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_zanb.cpp
+2 -2
View File
@@ -95,7 +95,7 @@ extern "C" void
__ct__12daNpc_zanB_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballMaterialNo__12daNpc_zanB_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_zanB_cFv();
extern "C" s32 getHeadJointNo__12daNpc_zanB_cFv();
extern "C" s32 getNeckJointNo__12daNpc_zanB_cFv();
extern "C" bool getBackboneJointNo__12daNpc_zanB_cFv();
@@ -1201,7 +1201,7 @@ extern "C" void __dt__8cM3dGAabFv() {
}
/* 80B6BC18-80B6BC20 002DD8 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_zanB_cFv */
s32 daNpc_zanB_c::getEyeballMaterialNo() {
u16 daNpc_zanB_c::getEyeballMaterialNo() {
return 4;
}
src/d/actor/d_a_npc_zant.cpp
+3 -3
View File
@@ -187,7 +187,7 @@ int daNpc_Zant_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 0.0f, 1, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, 1, 0, 0);
}
/* 80B6C7E8-80B6C808 000728 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_Zant_cFP10fopAc_ac_c */
@@ -283,9 +283,9 @@ void daNpc_Zant_c::setParam() {
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Zant_Param_c::m.field_0x18);
field_0xde8 = daNpc_Zant_Param_c::m.field_0xc;
mRealShadowSize = daNpc_Zant_Param_c::m.field_0xc;
gravity = daNpc_Zant_Param_c::m.field_0x4;
field_0xa80 = daNpc_Zant_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_Zant_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Zant_Param_c::m.field_0x44;
}
src/d/actor/d_a_npc_zelR.cpp
+9 -9
View File
@@ -245,7 +245,7 @@ int daNpc_ZelR_c::Draw() {
modelData->getMaterialNodePointer(getEyeballRMaterialNo())->setMaterialAnm(mpMatAnm[1]);
}
return daNpcT_c::draw(0, 1, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 1, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 80B6F77C-80B6F79C 000A3C 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_ZelR_cFP10fopAc_ac_c */
@@ -344,8 +344,8 @@ BOOL daNpc_ZelR_c::ctrlBtk() {
mpMatAnm[1]->setNowOffsetX(cM_ssin(mJntAnm.getEyeAngleY()) * 0.2f);
mpMatAnm[1]->setNowOffsetY(cM_ssin(mJntAnm.getEyeAngleX()) * 0.2f);
mpMatAnm[0]->onEyeMoveFlg();
mpMatAnm[1]->onEyeMoveFlg();
mpMatAnm[0]->onEyeMoveFlag();
mpMatAnm[1]->onEyeMoveFlag();
return TRUE;
}
@@ -355,8 +355,8 @@ BOOL daNpc_ZelR_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->offEyeMoveFlg();
mpMatAnm[1]->offEyeMoveFlg();
mpMatAnm[0]->offEyeMoveFlag();
mpMatAnm[1]->offEyeMoveFlag();
}
@@ -381,9 +381,9 @@ void daNpc_ZelR_c::setParam() {
mWallR = l_HIO.m.mWallR;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(l_HIO.m.mWallH);
field_0xde8 = l_HIO.m.field_0xc;
mRealShadowSize = l_HIO.m.field_0xc;
gravity = l_HIO.m.mGravity;
field_0xa80 = l_HIO.m.field_0x6c;
mExpressionMorfFrame = l_HIO.m.field_0x6c;
mMorfFrames = l_HIO.m.mMorfFrames;
}
@@ -648,12 +648,12 @@ static int daNpc_ZelR_IsDelete(void* param_0) {
}
/* 80B71A34-80B71A3C 002CF4 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__12daNpc_ZelR_cFv */
s32 daNpc_ZelR_c::getEyeballRMaterialNo() {
u16 daNpc_ZelR_c::getEyeballRMaterialNo() {
return 3;
}
/* 80B71A3C-80B71A44 002CFC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__12daNpc_ZelR_cFv */
s32 daNpc_ZelR_c::getEyeballLMaterialNo() {
u16 daNpc_ZelR_c::getEyeballLMaterialNo() {
return 2;
}
src/d/actor/d_a_npc_zelRo.cpp
+5 -5
View File
@@ -79,7 +79,7 @@ extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" s32 getFootLJointNo__8daNpcT_cFv();
extern "C" s32 getFootRJointNo__8daNpcT_cFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" bool checkChangeEvt__8daNpcT_cFv();
extern "C" bool evtEndProc__8daNpcT_cFv();
extern "C" void afterMoved__8daNpcT_cFv();
@@ -98,8 +98,8 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_zelRo_cpp();
extern "C" void
__ct__13daNpc_ZelRo_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballRMaterialNo__13daNpc_ZelRo_cFv();
extern "C" s32 getEyeballLMaterialNo__13daNpc_ZelRo_cFv();
extern "C" u16 getEyeballRMaterialNo__13daNpc_ZelRo_cFv();
extern "C" u16 getEyeballLMaterialNo__13daNpc_ZelRo_cFv();
extern "C" s32 getHeadJointNo__13daNpc_ZelRo_cFv();
extern "C" s32 getNeckJointNo__13daNpc_ZelRo_cFv();
extern "C" bool getBackboneJointNo__13daNpc_ZelRo_cFv();
@@ -1171,12 +1171,12 @@ daNpc_ZelRo_c::daNpc_ZelRo_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B74BA8-80B74BB0 002CE8 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__13daNpc_ZelRo_cFv */
s32 daNpc_ZelRo_c::getEyeballRMaterialNo() {
u16 daNpc_ZelRo_c::getEyeballRMaterialNo() {
return 7;
}
/* 80B74BB0-80B74BB8 002CF0 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__13daNpc_ZelRo_cFv */
s32 daNpc_ZelRo_c::getEyeballLMaterialNo() {
u16 daNpc_ZelRo_c::getEyeballLMaterialNo() {
return 6;
}
src/d/actor/d_a_npc_zelda.cpp
+702 -1043
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_sekizoa.cpp
+3 -3
View File
@@ -333,7 +333,7 @@ int daObj_Sekizoa_c::Draw() {
{
temp_int = 1;
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 0.0f, temp_int, (mType == TYPE_6), 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, temp_int, (mType == TYPE_6), 0);
}
/* 80CCED74-80CCED94 000B14 0020+00 1/1 0/0 0/0 .text
@@ -503,8 +503,8 @@ void daObj_Sekizoa_c::setParam() {
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daObj_Sekizoa_Param_c::m.field_0x18);
field_0xde8 = daObj_Sekizoa_Param_c::m.field_0x0C;
field_0xa80 = daObj_Sekizoa_Param_c::m.field_0x6C;
mRealShadowSize = daObj_Sekizoa_Param_c::m.field_0x0C;
mExpressionMorfFrame = daObj_Sekizoa_Param_c::m.field_0x6C;
mMorfFrames = daObj_Sekizoa_Param_c::m.field_0x44;
gravity = daObj_Sekizoa_Param_c::m.field_0x04;
src/d/actor/d_a_peru.cpp
+4 -4
View File
@@ -346,9 +346,9 @@ void daPeru_c::reset() {
mWallR = daPeru_Param_c::m.field_0x00[7];
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daPeru_Param_c::m.field_0x00[6]);
field_0xde8 = daPeru_Param_c::m.field_0x00[3];
mRealShadowSize = daPeru_Param_c::m.field_0x00[3];
gravity = daPeru_Param_c::m.field_0x00[1];
field_0xa80 = daPeru_Param_c::m.field_0x64[2];
mExpressionMorfFrame = daPeru_Param_c::m.field_0x64[2];
mMorfFrames = daPeru_Param_c::m.field_0x00[17];
mActionFunc = NULL;
if (mpMatAnm[0] != NULL) {
@@ -381,9 +381,9 @@ void daPeru_c::setParam() {
mWallR = daPeru_Param_c::m.field_0x00[7];
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daPeru_Param_c::m.field_0x00[6]);
field_0xde8 = daPeru_Param_c::m.field_0x00[3];
mRealShadowSize = daPeru_Param_c::m.field_0x00[3];
gravity = daPeru_Param_c::m.field_0x00[1];
field_0xa80 = daPeru_Param_c::m.field_0x64[2];
mExpressionMorfFrame = daPeru_Param_c::m.field_0x64[2];
mMorfFrames = daPeru_Param_c::m.field_0x00[17];
}