mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-14 11:53:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

ShieldD: Clean up a bunch of 99% matching TUs (#3113)

Browse Source 
* d_a_npc_ks debug code 100%

* d_a_npc_rafrel debug code 100%

* d_a_npc_inko minor improvements

* d_a_npc_gro debug code 100%

* d_a_npc_pachi_taro debug code 100%

* d_a_npc_passer debug code 100%

* d_a_npc_pachi_maro debug code 100%

* d_a_npc_post debug code 100%

* d_a_obj_bemos debug improvements

* d_a_obj_scannon_ten debug code 100%

* d_a_b_mgn debug code 100%

* d_a_e_fb debug code 100%

* d_a_e_gb debug code 100%

* d_a_e_hz debug code 100%

* d_a_e_cr_egg debug code 100%

* d_a_e_md debug code 100%

* d_a_e_wb debug code 100%

* d_a_obj_mirror_6pole debug code 100%

* d_a_obj_spinLift debug data fixes

* d_a_obj_pdwall debug data fixes

* d_a_obj_ss_drink debug code almost matching

* d_a_obj_poFire debug code 100%

* d_a_obj_picture debug code 100%

* d_a_obj_dust debug code 100%

* d_a_obj_fallobj debug code 100%

* d_a_obj_itamato debug code almost matching

* d_a_obj_syRock debug code 100%

* d_a_obj_katatsumuri debug code 100%

* d_a_obj_wood_statue debug code 100%

* d_a_obj_lv6egate debug code 100%

* d_a_tag_qs minor debug symbol fixes

* d_a_obj_twGate debug code 100%

* d_a_obj_lv6SwGate debug code 100%

* d_a_obj_lv6swturn debug code 100%

* d_a_obj_lv6Tenbin debug code 100%

* d_a_obj_kwheel01 debug code 100%

* Fix RTTI order regression (cM3dGCyl vs cBgS_*)
This commit is contained in:
Max Roncace
2026-02-28 15:13:57 -05:00
committed by GitHub
parent 29c96f5c65
commit a290c2d52c
92 changed files with 1767 additions and 1295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_passer.cpp
+28 -28
View File
@@ -8,6 +8,14 @@
#include "d/actor/d_a_npc_passer.h"
#include "d/d_s_play.h"
daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = {
{&daNpcPasser_c::initPath, &daNpcPasser_c::executePath},
{&daNpcPasser_c::initEscape, &daNpcPasser_c::executeEscape},
{&daNpcPasser_c::initFear, &daNpcPasser_c::executeFear},
{&daNpcPasser_c::initFight, &daNpcPasser_c::executeFight},
{&daNpcPasser_c::initRelief, &daNpcPasser_c::executeRelief},
};
daNpcPasser_c::~daNpcPasser_c() {
removeResrc(m_type, m_objNum);
@@ -473,14 +481,6 @@ void daNpcPasser_c::create_init() {
setBaseMtx();
}
daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = {
{&daNpcPasser_c::initPath, &daNpcPasser_c::executePath},
{&daNpcPasser_c::initEscape, &daNpcPasser_c::executeEscape},
{&daNpcPasser_c::initFear, &daNpcPasser_c::executeFear},
{&daNpcPasser_c::initFight, &daNpcPasser_c::executeFight},
{&daNpcPasser_c::initRelief, &daNpcPasser_c::executeRelief},
};
daNpcPasser_c::seqFunc* daNpcPasser_c::m_funcTbl[28] = {
daNpcPasser_c::m_seq00_funcTbl, daNpcPasser_c::m_seq01_funcTbl,
daNpcPasser_c::m_seq02_funcTbl, daNpcPasser_c::m_seq03_funcTbl,
@@ -703,29 +703,29 @@ void daNpcPasser_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4
}
void daNpcPasser_c::pathMoveF() {
f32 fVar1 = 0.0f;
f32 speed = 0.0f;
f32 fVar2 = 0.0f;
f32 maxSpeed = 0.0f;
f32 anmPlaySpeed = 0.0f;
f32 actualSpeed = 0.0f;
cXyz* ccMoveP = mStts.GetCCMoveP();
if (field_0xb1c == 2) {
fVar1 = Cd2_HIO_walkMaxSpeed(m_type);
fVar2 = Cd2_HIO_walkAnmPlaySpeed(m_type);
maxSpeed = Cd2_HIO_walkMaxSpeed(m_type);
anmPlaySpeed = Cd2_HIO_walkAnmPlaySpeed(m_type);
cLib_chaseF(&field_0xb10, 0.8f, 0.05f);
setSpeed(MREG_F(0) + 0.7f, fVar1, &field_0xb14, 0);
setSpeed(MREG_F(0) + 0.7f, fVar1, &speedF, 1);
setSpeed(MREG_F(0) + 0.7f, maxSpeed, &field_0xb14, 0);
setSpeed(MREG_F(0) + 0.7f, maxSpeed, &speedF, 1);
} else if (field_0xb1c == 1) {
fVar1 = Cd2_HIO_maxSpeed(m_type);
fVar2 = Cd2_HIO_anmPlaySpeed(m_type);
maxSpeed = Cd2_HIO_maxSpeed(m_type);
anmPlaySpeed = Cd2_HIO_anmPlaySpeed(m_type);
if (mActionIdx == 1) {
fVar1 *= 1.5f;
fVar2 *= 1.5f;
maxSpeed *= 1.5f;
anmPlaySpeed *= 1.5f;
}
cLib_chaseF(&field_0xb10, 1.0f, 0.05f);
setSpeed(MREG_F(0) + 0.7f, fVar1, &field_0xb14, 0);
setSpeed(MREG_F(0) + 0.7f, fVar1, &speedF, 1);
setSpeed(MREG_F(0) + 0.7f, maxSpeed, &field_0xb14, 0);
setSpeed(MREG_F(0) + 0.7f, maxSpeed, &speedF, 1);
} else if (field_0xb1c == 0) {
cLib_chaseF(&field_0xb10, 0.0f, 0.05f);
cLib_chaseF(&field_0xb14, 0.0f, 1.5f);
@@ -745,17 +745,17 @@ void daNpcPasser_c::pathMoveF() {
fopAcM_posMoveF(this, ccMoveP);
if (field_0xb1c != 0) {
fVar1 = field_0xb14 / fVar1;
if (fVar1 > 1.0f) {
fVar1 = 1.0f;
actualSpeed = field_0xb14 / maxSpeed;
if (actualSpeed > 1.0f) {
actualSpeed = 1.0f;
}
speed = fVar2 * fVar1;
if (speed < 0.6f) {
speed = 0.6f;
actualSpeed = anmPlaySpeed * actualSpeed;
if (actualSpeed < 0.6f) {
actualSpeed = 0.6f;
}
mpMorf->setPlaySpeed(speed);
mpMorf->setPlaySpeed(actualSpeed);
}
}