mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

More debug fixes for 99% TUs (#3122)

Browse Source 
* d_a_e_hp debug code 100%

* d_a_npc_chin debug improvements

* d_a_npc_du debug code 100%

* d_a_npc_cdn3 debug code 100%

* d_a_e_rdy GCN symbol fixes

* d_a_kago debug code 100%

* d_a_e_oc debug code 100%

* d_a_e_yr debug code almost matching

* d_a_e_bg debug code 100%

* d_a_ykgr debug code 100%

* d_a_tag_hjump debug data fixes

* d_a_tag_attack_item debug data fixes

* d_a_e_df debug code 100%

* d_a_e_sh debug code 100%

* d_a_L7op_demo_dr debug code 100%

* d_a_L7low_dr debug code 100%

* d_a_e_sm2 debug code 100%

* d_a_movie_player debug code 100%

* d_a_e_st debug code 100%

* d_a_npc_aru debug code 100%

* d_a_e_yg debug code 100%

* d_a_door_spiral debug code 100%

* d_a_bg debug code 100% (still has .data issues)

* d_a_e_dn debug code 100%

* d_a_tag_attention debug code 100%

* d_a_e_bd debug code 100%

* d_a_tag_camera debug .rodata fix

* d_a_obj_movebox debug code 100% (array dtors are mismapped)

* d_a_mg_rod debug improvements

* d_a_e_rd debug symbol fixes
This commit is contained in:
Max Roncace
2026-03-11 06:07:19 -04:00
committed by GitHub
parent 56890c32e8
commit 2e75ea2444
75 changed files with 1673 additions and 1225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_sh.cpp
+25 -15
View File
@@ -748,21 +748,26 @@ static void action(e_sh_class* i_this) {
if (unkFlag1) {
fopAcM_OnStatus(enemy, 0);
i_this->enemy.attention_info.flags = fopAc_attn_CARRY_e;
//TODO: was this maybe hardcoded as just "4"?
#if PLATFORM_GCN
enemy->attention_info.flags = fopAc_attn_CARRY_e;
#else
enemy->attention_info.flags = fopAc_attn_UNK_4;
#endif
} else {
fopAcM_OffStatus(enemy, 0);
i_this->enemy.attention_info.flags = fopAc_attn_LOCK_e;
enemy->attention_info.flags = fopAc_attn_LOCK_e;
}
cMtx_YrotS(*calc_mtx, i_this->enemy.current.angle.y);
cMtx_YrotS(*calc_mtx, enemy->current.angle.y);
baseVec.x = 0.0f;
baseVec.y = 0.0f;
baseVec.z = i_this->enemy.speedF;
baseVec.z = enemy->speedF;
MtxPosition(&baseVec, &finalVec);
i_this->enemy.speed.x = finalVec.x;
i_this->enemy.speed.z = finalVec.z;
i_this->enemy.current.pos += enemy->speed;
i_this->enemy.speed.y = i_this->enemy.speed.y - (JREG_F(5) + 5.0f);
enemy->speed.x = finalVec.x;
enemy->speed.z = finalVec.z;
enemy->current.pos += enemy->speed;
enemy->speed.y = enemy->speed.y - (JREG_F(5) + 5.0f);
cXyz* ccMoveP = i_this->mStts.GetCCMoveP();
if (ccMoveP != NULL) {
@@ -777,10 +782,10 @@ static void action(e_sh_class* i_this) {
baseVec.z = -i_this->field_0x6a4;
cMtx_YrotS(*calc_mtx, i_this->field_0x6a8);
MtxPosition(&baseVec, &finalVec);
i_this->enemy.current.pos += finalVec;
enemy->current.pos += finalVec;
cLib_addCalc0(&i_this->field_0x6a4, 1.0f, 6.0f);
i_this->enemy.speedF = 0.0f;
enemy->speedF = 0.0f;
}
i_this->mObjAcch.CrrPos(dComIfG_Bgsp());
@@ -1187,7 +1192,7 @@ static int daE_SH_Create(fopAc_ac_c* i_this) {
int resLoadResult = dComIfG_resLoad(&sh->mPhase, "E_sh");
if (resLoadResult == cPhs_COMPLEATE_e) {
OS_REPORT("", fopAcM_GetParam(i_this));
OS_REPORT("E_sh PARAM %x\n", fopAcM_GetParam(i_this));
sh->field_0x5b4 = (u8)fopAcM_GetParam(i_this);
u8 bVar1 = (fopAcM_GetParam(i_this) & 0xff00) >> 8;
@@ -1205,21 +1210,26 @@ static int daE_SH_Create(fopAc_ac_c* i_this) {
sh->field_0x6b8 = (f32)bVar2 * 100.0f;
}
OS_REPORT("");
OS_REPORT("E_sh//////////////E_SH SET 1 !!\n");
if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x2960)) {
OS_REPORT("");
OS_REPORT("//////////////E_SH SET NON !!\n");
return cPhs_ERROR_e;
}
OS_REPORT("");
OS_REPORT("//////////////E_SH SET 2 !!\n");
if (!hio_set) {
sh->mInitState = 1;
hio_set = true;
l_HIO.mChild = mDoHIO_CREATE_CHILD("E_sh", &l_HIO);
l_HIO.mChild = mDoHIO_CREATE_CHILD("スタルハウンド", &l_HIO);
}
//TODO: was this maybe hardcoded as just "4"?
#if PLATFORM_GCN
i_this->attention_info.flags = fopAc_attn_CARRY_e;
#else
i_this->attention_info.flags = fopAc_attn_UNK_4;
#endif
fopAcM_SetMtx(i_this, sh->mAnm_p->getModel()->getBaseTRMtx());
fopAcM_SetMin(i_this, -200.0f, -200.0f, -200.0f);