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

Work on d_a_npc_taro (#2386)

Browse Source
This commit is contained in:
hatal175
2025-04-11 02:42:52 +03:00
committed by GitHub
parent 35bd1ba3a2
commit d2e615f431
14 changed files with 3628 additions and 3222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc.cpp
+7 -7
View File
@@ -855,8 +855,8 @@ void daNpcT_JntAnm_c::calcJntRad(f32 param_0, f32 param_1, f32 param_2) {
* setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs */
void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, s16 i_angle) {
if (i_actor2 && i_actor1) {
field_0xc[0] = 10922.0f;
field_0xc[1] = 7281.0f;
mPower[0] = 10922.0f;
mPower[1] = 7281.0f;
field_0x16 = fopAcM_searchActorAngleY(i_actor1, i_actor2) - i_angle;
mStagger = 0x4000;
}
@@ -866,14 +866,14 @@ void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, s
void daNpcT_DmgStagger_c::calc(BOOL param_0) {
cXyz vec1, vec2;
mDoMtx_stack_c::YrotS(field_0x16);
cLib_addCalc2(&field_0xc[1], 0.0f, 0.1f, 125.0f);
cLib_addCalc2(&field_0xc[0], 0.0f, 0.1f, 125.0f);
cLib_addCalc2(&mPower[1], 0.0f, 0.1f, 125.0f);
cLib_addCalc2(&mPower[0], 0.0f, 0.1f, 125.0f);
for (int i = 0; i < 2; i++) {
vec1.set(0.0f, 0.0f, field_0xc[i] * cM_ssin(mStagger));
vec1.set(0.0f, 0.0f, mPower[i] * cM_ssin(mStagger));
mDoMtx_stack_c::multVec(&vec1, &vec2);
field_0x0[i].x = -vec2.z;
field_0x0[i].z = -vec2.x;
mAngle[i].x = -vec2.z;
mAngle[i].z = -vec2.x;
}
if (mStagger != 0) {
src/d/actor/d_a_npc_len.cpp
+1 -1
View File
@@ -1146,7 +1146,7 @@ SECTION_DEAD static char const* const stringBase_80A6906E = "R_SP109";
/* 80A660D8-80A661B4 001E98 00DC+00 1/1 0/0 6/6 .text
* checkStartDemo13StbEvt__11daNpc_Len_cFP10fopAc_ac_cfffffff */
void daNpc_Len_c::checkStartDemo13StbEvt(fopAc_ac_c* param_0, f32 param_1, f32 param_2,
BOOL daNpc_Len_c::checkStartDemo13StbEvt(fopAc_ac_c* param_0, f32 param_1, f32 param_2,
f32 param_3, f32 param_4, f32 param_5, f32 param_6,
f32 param_7) {
// NONMATCHING
src/d/actor/d_a_npc_maro.cpp
+13 -25
View File
@@ -1772,12 +1772,12 @@ void daNpc_Maro_c::setParam() {
}
/* 8055CB14-8055CC9C 001674 0188+00 1/0 0/0 0/0 .text checkChangeEvt__12daNpc_Maro_cFv */
void daNpc_Maro_c::checkChangeEvt() {
BOOL daNpc_Maro_c::checkChangeEvt() {
// NONMATCHING
}
/* 8055CC9C-8055CCD8 0017FC 003C+00 1/0 0/0 0/0 .text evtEndProc__12daNpc_Maro_cFv */
void daNpc_Maro_c::evtEndProc() {
BOOL daNpc_Maro_c::evtEndProc() {
// NONMATCHING
}
@@ -1797,12 +1797,12 @@ void daNpc_Maro_c::srchActors() {
}
/* 8055D0D8-8055D1F4 001C38 011C+00 1/0 0/0 0/0 .text evtTalk__12daNpc_Maro_cFv */
void daNpc_Maro_c::evtTalk() {
BOOL daNpc_Maro_c::evtTalk() {
// NONMATCHING
}
/* 8055D1F4-8055D368 001D54 0174+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_Maro_cFv */
void daNpc_Maro_c::evtCutProc() {
BOOL daNpc_Maro_c::evtCutProc() {
// NONMATCHING
}
@@ -1852,8 +1852,8 @@ void daNpc_Maro_c::setCollision() {
}
/* 8055DA70-8055DA78 0025D0 0008+00 1/0 0/0 0/0 .text drawDbgInfo__12daNpc_Maro_cFv */
bool daNpc_Maro_c::drawDbgInfo() {
return false;
BOOL daNpc_Maro_c::drawDbgInfo() {
return FALSE;
}
/* 8055DA78-8055DAD8 0025D8 0060+00 1/0 0/0 0/0 .text drawOtherMdl__12daNpc_Maro_cFv */
@@ -1863,13 +1863,13 @@ void daNpc_Maro_c::drawOtherMdl() {
/* 8055DAD8-8055DB64 002638 008C+00 1/0 0/0 0/0 .text
* getFaceMotionAnm__12daNpc_Maro_cF26daNpcT_faceMotionAnmData_c */
void daNpc_Maro_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) {
daNpcT_faceMotionAnmData_c daNpc_Maro_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) {
// NONMATCHING
}
/* 8055DB64-8055DBF0 0026C4 008C+00 1/0 0/0 0/0 .text
* getMotionAnm__12daNpc_Maro_cF22daNpcT_motionAnmData_c */
void daNpc_Maro_c::getMotionAnm(daNpcT_motionAnmData_c param_0) {
daNpcT_motionAnmData_c daNpc_Maro_c::getMotionAnm(daNpcT_motionAnmData_c param_0) {
// NONMATCHING
}
@@ -2473,21 +2473,9 @@ void __sinit_d_a_npc_maro_cpp() {
REGISTER_CTORS(0x805646B8, __sinit_d_a_npc_maro_cpp);
#pragma pop
/* 805648A4-80564970 009404 00CC+00 1/1 0/0 0/0 .text
* __ct__12daNpc_Maro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc
*/
daNpc_Maro_c::daNpc_Maro_c(daNpcT_faceMotionAnmData_c const* param_0,
daNpcT_motionAnmData_c const* param_1,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2,
int param_3,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_4,
int param_5, daNpcT_evtData_c const* param_6, char** param_7) {
// NONMATCHING
}
/* 80564970-80564978 0094D0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Maro_cFv */
s32 daNpc_Maro_c::getEyeballMaterialNo() {
return true;
return 1;
}
/* 80564978-80564980 0094D8 0008+00 1/0 0/0 0/0 .text getHeadJointNo__12daNpc_Maro_cFv */
@@ -2501,19 +2489,19 @@ s32 daNpc_Maro_c::getNeckJointNo() {
}
/* 80564988-80564990 0094E8 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__12daNpc_Maro_cFv */
bool daNpc_Maro_c::getBackboneJointNo() {
return true;
s32 daNpc_Maro_c::getBackboneJointNo() {
return 1;
}
/* 80564990-805649A0 0094F0 0010+00 1/0 0/0 0/0 .text checkChangeJoint__12daNpc_Maro_cFi
*/
void daNpc_Maro_c::checkChangeJoint(int param_0) {
BOOL daNpc_Maro_c::checkChangeJoint(int param_0) {
// NONMATCHING
}
/* 805649A0-805649B0 009500 0010+00 1/0 0/0 0/0 .text checkRemoveJoint__12daNpc_Maro_cFi
*/
void daNpc_Maro_c::checkRemoveJoint(int param_0) {
BOOL daNpc_Maro_c::checkRemoveJoint(int param_0) {
// NONMATCHING
}
src/d/actor/d_a_npc_taro.cpp
+3310 -3066
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_zant.cpp
+1
View File
@@ -4,6 +4,7 @@
*/
#include "d/actor/d_a_npc_zant.h"
#include "SSystem/SComponent/c_counter.h"
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_counter.h"
src/d/d_com_static.cpp
+2 -2
View File
@@ -241,8 +241,8 @@ void daNpcKakashi_setSwdTutorialStep(u8 iEvtNum) {
/* 800316E0-80031718 02C020 0038+00 0/0 1/1 4/4 .text daNpcKakashi_getSwdTutorialStep__Fv
*/
int daNpcKakashi_getSwdTutorialStep() {
return dComIfGs_getTmpReg(0xFF0F);
u8 daNpcKakashi_getSwdTutorialStep() {
return dComIfGs_getTmpReg(0xFF0F) & 0xff;
}
/* 80031718-80031754 02C058 003C+00 0/0 1/1 0/0 .text daNpcKakashi_getSwdTutorialResult__Fv */