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

Debug version now builds OK and all_source compiles (#2343)

Browse Source 
* Fix missing arg to JUT_ASSERT

* Fix some MWCC version diff errors

* Compile m_Do_ext, d_demo, actor_mng

* Add VSCode task to quickly switch between versions

* Unlink magLift for debug

* Update the hash of the debug dol

The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment.

The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol.

The DOL now builds OK.

* Fix all debug REL dtor splits

All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds.

* Add genMessage declarations to all HIO subclasses

* Fixing more compilation errors

* m_Do_mtx 100% on debug

Cannot be linked due to weak function name mangling?

* Improve various matches

* Fix all remaining compilation errors

* Fix new compilation errors from main

* Fix retail regression

* Link f_pc_profile_lst
This commit is contained in:
LagoLunatic
2025-03-22 21:00:51 -04:00
committed by GitHub
parent d0f89e41b1
commit 4dc0cd9d09
543 changed files with 1413 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_bg_w.cpp
+23 -23
View File
@@ -1237,9 +1237,9 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
cx1 -= sp50.x;
cy1 -= sp50.z;
JUT_ASSERT(pwi->GetPos()->x ==
JUT_ASSERT(0, pwi->GetPos()->x ==
pwi->GetWallCirP(cir_index)->GetCx());
JUT_ASSERT(pwi->GetPos()->z ==
JUT_ASSERT(0, pwi->GetPos()->z ==
pwi->GetWallCirP(cir_index)->GetCy());
f32 spE0 =
@@ -1250,12 +1250,12 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
f32 onx = -tri->m_plane.GetNP()->x;
f32 ony = -tri->m_plane.GetNP()->z;
JUT_ASSERT(!(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
JUT_ASSERT(0, !(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
if (spE0 < spE4) {
if (!(spE0 > spDC) && !(fabsf(spE0 - spDC) < 0.008f)) {
JUT_ASSERT(!(fpclassify(cx0) == 1));
JUT_ASSERT(!(fpclassify(cy0) == 1));
JUT_ASSERT(0, !(fpclassify(cx0) == 1));
JUT_ASSERT(0, !(fpclassify(cy0) == 1));
f32 spF0, spF4;
cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx0, cy0,
@@ -1263,8 +1263,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
pwi->GetPos()->x += cx0 - spF0;
pwi->GetPos()->z += cy0 - spF4;
JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
pwi->CalcMovePosWork();
pwi->SetWallCirHit(cir_index);
@@ -1276,8 +1276,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
pwi->SetWallHit();
}
} else if (!(spE4 > spDC) && !(fabsf(spE4 - spDC) < 0.008f)) {
JUT_ASSERT(!(fpclassify(cx1) == 1));
JUT_ASSERT(!(fpclassify(cy1) == 1));
JUT_ASSERT(0, !(fpclassify(cx1) == 1));
JUT_ASSERT(0, !(fpclassify(cy1) == 1));
f32 spF8, spFC;
cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx1, cy1,
@@ -1285,8 +1285,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
pwi->GetPos()->x += cx1 - spF8;
pwi->GetPos()->z += cy1 - spFC;
JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
pwi->CalcMovePosWork();
pwi->SetWallCirHit(cir_index);
@@ -1674,9 +1674,9 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
cx1 -= sp50.x;
cy1 -= sp50.z;
JUT_ASSERT(pwi->GetPos()->x ==
JUT_ASSERT(0, pwi->GetPos()->x ==
pwi->GetWallCirP(cir_index)->GetCx());
JUT_ASSERT(pwi->GetPos()->z ==
JUT_ASSERT(0, pwi->GetPos()->z ==
pwi->GetWallCirP(cir_index)->GetCy());
f32 spE0 =
@@ -1687,12 +1687,12 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
f32 onx = -tri->m_plane.GetNP()->x;
f32 ony = -tri->m_plane.GetNP()->z;
JUT_ASSERT(!(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
JUT_ASSERT(0, !(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
if (spE0 < spE4) {
if (!(spE0 > spDC) && !(fabsf(spE0 - spDC) < 0.008f)) {
JUT_ASSERT(!(fpclassify(cx0) == 1));
JUT_ASSERT(!(fpclassify(cy0) == 1));
JUT_ASSERT(0, !(fpclassify(cx0) == 1));
JUT_ASSERT(0, !(fpclassify(cy0) == 1));
f32 spF0, spF4;
cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx0, cy0,
@@ -1700,8 +1700,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
pwi->GetPos()->x += cx0 - spF0;
pwi->GetPos()->z += cy0 - spF4;
JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
pwi->CalcMovePosWork();
pwi->SetWallCirHit(cir_index);
@@ -1713,8 +1713,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
pwi->SetWallHit();
}
} else if (!(spE4 > spDC) && !(fabsf(spE4 - spDC) < 0.008f)) {
JUT_ASSERT(!(fpclassify(cx1) == 1));
JUT_ASSERT(!(fpclassify(cy1) == 1));
JUT_ASSERT(0, !(fpclassify(cx1) == 1));
JUT_ASSERT(0, !(fpclassify(cy1) == 1));
f32 spF8, spFC;
cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx1, cy1, onx,
@@ -1722,8 +1722,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
pwi->GetPos()->x += cx1 - spF8;
pwi->GetPos()->z += cy1 - spFC;
JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
pwi->CalcMovePosWork();
pwi->SetWallCirHit(cir_index);
@@ -2313,4 +2313,4 @@ dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) {
/* 80450F8A 0001+00 data_80450F8A None */
/* 80450F8B 0005+00 data_80450F8B None */
extern u8 struct_80450F88[8];
u8 struct_80450F88[8];
u8 struct_80450F88[8];