mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-14 13:34:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_coach work (#2579)

Browse Source 
* data and class member work

* inline work

* got to SetCoachBlazing

* work on some calc functions

* all functions worked on

* pr cleanup

* more pr cleanup

* coach header cleanup
This commit is contained in:
Carco_21
2025-08-12 13:54:06 -04:00
committed by GitHub
parent 3f399388b3
commit ea8a95692f
14 changed files with 2482 additions and 1216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_coach.cpp
+2121 -1160
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_theB.cpp
+8 -8
View File
@@ -767,7 +767,7 @@ SECTION_RODATA static u8 const lit_4396[24] = {
COMPILER_STRIP_GATE(0x80B00E00, &lit_4396);
/* 80AFD508-80AFD5F0 000E88 00E8+00 0/0 0/0 2/2 .text getHandPos1__11daNpcTheB_cFi */
void daNpcTheB_c::getHandPos1(int param_0) {
cXyz daNpcTheB_c::getHandPos1(int param_1) {
// NONMATCHING
}
@@ -780,7 +780,7 @@ SECTION_RODATA static u8 const lit_4424[24] = {
COMPILER_STRIP_GATE(0x80B00E18, &lit_4424);
/* 80AFD5F0-80AFD6D8 000F70 00E8+00 0/0 0/0 2/2 .text getHandPos2__11daNpcTheB_cFi */
void daNpcTheB_c::getHandPos2(int param_0) {
cXyz daNpcTheB_c::getHandPos2(int param_1) {
// NONMATCHING
}
@@ -801,7 +801,7 @@ SECTION_DEAD static char const* const stringBase_80B0100E = "F_SP121";
#pragma pop
/* 80AFD6F0-80AFD938 001070 0248+00 2/1 0/0 0/0 .text main__11daNpcTheB_cFv */
void daNpcTheB_c::main() {
BOOL daNpcTheB_c::main() {
// NONMATCHING
}
@@ -816,7 +816,7 @@ SECTION_RODATA static f32 const lit_4581 = 1.0f / 5.0f;
COMPILER_STRIP_GATE(0x80B00E34, &lit_4581);
/* 80AFDAA4-80AFDB70 001424 00CC+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcTheB_cFv */
void daNpcTheB_c::ctrlBtk() {
BOOL daNpcTheB_c::ctrlBtk() {
// NONMATCHING
}
@@ -873,23 +873,23 @@ void daNpcTheB_c::setAttnPos() {
/* 80AFDEC0-80AFE0BC 001840 01FC+00 2/0 0/0 0/0 .text setExpressionAnm__11daNpcTheB_cFib
*/
void daNpcTheB_c::setExpressionAnm(int param_0, bool param_1) {
bool daNpcTheB_c::setExpressionAnm(int param_0, bool param_1) {
// NONMATCHING
}
/* 80AFE0BC-80AFE1BC 001A3C 0100+00 1/0 0/0 0/0 .text setExpressionBtp__11daNpcTheB_cFi
*/
void daNpcTheB_c::setExpressionBtp(int param_0) {
bool daNpcTheB_c::setExpressionBtp(int param_0) {
// NONMATCHING
}
/* 80AFE1BC-80AFE398 001B3C 01DC+00 1/0 0/0 0/0 .text setMotionAnm__11daNpcTheB_cFif */
bool daNpcTheB_c::setMotionAnm(int param_0, f32 param_1) {
void daNpcTheB_c::setMotionAnm(int param_0, f32 param_1) {
// NONMATCHING
}
/* 80AFE398-80AFE3A0 001D18 0008+00 1/0 0/0 0/0 .text drawDbgInfo__11daNpcTheB_cFv */
bool daNpcTheB_c::drawDbgInfo() {
BOOL daNpcTheB_c::drawDbgInfo() {
return false;
}
src/d/actor/d_a_tag_wljump.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ int daTagWljump_c::execute() {
mLandArea = point_p->mArg0 * 10.0f;
if (point_p->field_0x1 == 1) {
if (point_p->mArg2 == 1) {
shape_angle.z = 1;
} else {
shape_angle.z = 0;
src/d/d_bg_s_acch.cpp
+4 -4
View File
@@ -64,7 +64,7 @@ dBgS_Acch::dBgS_Acch() {
pm_speed = NULL;
m_ground_h = -1000000000.0f;
field_0x90 = 0.0f;
field_0x9c = 60.0f;
m_gnd_chk_offset = 60.0f;
field_0x94 = 0.0f;
field_0xb4 = 0;
field_0xb8 = 0.0f;
@@ -151,7 +151,7 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) {
if (!(m_flags & GRND_NONE)) {
cXyz grnd_pos;
grnd_pos = *pm_pos;
grnd_pos.y += field_0x94 + (field_0x9c - field_0x90);
grnd_pos.y += field_0x94 + (m_gnd_chk_offset - field_0x90);
if (!ChkGndThinCellingOff()) {
static dBgS_RoofChk tmpRoofChk;
@@ -367,12 +367,12 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
field_0xb8 = GetPos()->y;
field_0xc0 = 0;
f32 fvar12 = tmp2 + GetOldPos()->y;
f32 fvar1 = field_0x9c + GetPos()->y;
f32 fvar1 = m_gnd_chk_offset + GetPos()->y;
bool bvar2 = false;
OffLineCheckHit();
if (!ChkLineCheckNone() && !cM3d_IsZero(tmp) &&
(dvar10 > (tmp * tmp) || fvar12 > fvar1 || dvar11 > field_0x9c || ChkLineCheck()))
(dvar10 > (tmp * tmp) || fvar12 > fvar1 || dvar11 > m_gnd_chk_offset || ChkLineCheck()))
{
bvar2 = true;
LineCheck(i_bgs);
src/m_Do/m_Do_ext.cpp
+7 -7
View File
@@ -1753,8 +1753,8 @@ void mDoExt_McaMorf2::calc() {
} else {
field_0x40->getTransform(jnt_no, &spF0[1]);
sp18[0] = 1.0f - field_0x44;
sp18[1] = field_0x44;
sp18[0] = 1.0f - mAnmRate;
sp18[1] = mAnmRate;
var_r30->mScale.x = spF0[0].mScale.x * sp18[0]
+ spF0[1].mScale.x * sp18[1];
@@ -1810,8 +1810,8 @@ void mDoExt_McaMorf2::calc() {
mpAnm->getTransform(jnt_no, &spF0[0]);
field_0x40->getTransform(jnt_no, &spF0[1]);
sp10[0] = 1.0f - field_0x44;
sp10[1] = field_0x44;
sp10[0] = 1.0f - mAnmRate;
sp10[1] = mAnmRate;
sp80.mScale.x = spF0[0].mScale.x * sp10[0]
+ spF0[1].mScale.x * sp10[1];
@@ -1866,7 +1866,7 @@ void mDoExt_McaMorf2::setAnm(J3DAnmTransform* param_0, J3DAnmTransform* param_1,
int i_attr, f32 i_morf, f32 i_speed, f32 i_start, f32 i_end) {
mpAnm = param_0;
field_0x40 = param_1;
field_0x44 = param_2;
mAnmRate = param_2;
setStartFrame(i_start);
@@ -1912,9 +1912,9 @@ void mDoExt_McaMorf2::setAnm(J3DAnmTransform* param_0, J3DAnmTransform* param_1,
/* 80011FCC-800120A0 00C90C 00D4+00 0/0 0/0 2/2 .text setAnmRate__15mDoExt_McaMorf2Ff */
void mDoExt_McaMorf2::setAnmRate(f32 param_0) {
void* pBas = NULL;
field_0x44 = param_0;
mAnmRate = param_0;
if (mpSound != NULL) {
if (field_0x44 < 0.5f) {
if (mAnmRate < 0.5f) {
if (mpAnm != NULL) {
pBas = ((mDoExt_transAnmBas*)mpAnm)->getBas();
}