mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-30 00:47:05 -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_map.cpp
+26 -26
View File
@@ -98,7 +98,7 @@ int renderingAmap_c::getDispType() const {
disp_type = 5;
break;
default:
JUT_ASSERT(0);
JUT_ASSERT(0, 0);
break;
}
@@ -336,7 +336,7 @@ GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) {
*color = borderColor1;
break;
default:
JUT_ASSERT(0);
JUT_ASSERT(0, 0);
break;
}
} else {
@@ -357,7 +357,7 @@ const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) {
const GXColor* color;
if (isDrawOutSideTrim() && field_0x38 != 2) {
JUT_ASSERT(m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0])));
JUT_ASSERT(0, m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0])));
color = &colorTable[m_outSideBlackLineCnt];
} else {
color = getLineColor(param_0, param_1);
@@ -427,7 +427,7 @@ int renderingAmap_c::getStayType() const {
* isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi */
bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2,
int param_3) const {
JUT_ASSERT(i_data != 0);
JUT_ASSERT(0, i_data != 0);
bool var_r31 = false;
int disp_type = getDispType();
@@ -443,7 +443,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
switch (group_no) {
case 0:
if (stay_type == 1) {
JUT_ASSERT(i_data->mNo != 255);
JUT_ASSERT(0, i_data->mNo != 255);
if (var_r23 && i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo) && param_1) {
var_r31 = true;
@@ -492,7 +492,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
}
if (temp_r23_2) {
JUT_ASSERT(i_data->mNo != 255);
JUT_ASSERT(0, i_data->mNo != 255);
bool temp_r23_3 = false;
if (i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo)) {
temp_r23_3 = true;
@@ -592,7 +592,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
}
break;
default:
JUT_ASSERT(0);
JUT_ASSERT(0, 0);
break;
}
@@ -621,7 +621,7 @@ bool dMap_c::isSpecialOutline() {
/* 8002974C-800297A8 02408C 005C+00 1/1 0/0 0/0 .text copyPalette__6dMap_cFv */
void dMap_c::copyPalette() {
JUT_ASSERT(m_res != 0);
JUT_ASSERT(0, m_res != 0);
cLib_memCpy(m_res, m_res_src, sizeof(dMap_HIO_prm_res_dst_s::m_res->palette_data));
if (getStayType() == 0) {
@@ -680,7 +680,7 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
field_0x90 = 0;
m_res = new (0x20) dMap_prm_res_s;
JUT_ASSERT(m_res != 0);
JUT_ASSERT(0, m_res != 0);
dMap_HIO_prm_res_dst_s::m_res = m_res;
@@ -696,12 +696,12 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
int buffer_size = GXGetTexBufferSize(param_2, param_3, 9, GX_FALSE, 0);
mImage_p = new (0x20) u8[buffer_size];
JUT_ASSERT(mImage_p != 0);
JUT_ASSERT(0, mImage_p != 0);
renderingDAmap_c::init(mImage_p, mTexSizeX, mTexSizeY, mTexSizeX, mTexSizeY);
mResTIMG = new (0x20) ResTIMG;
JUT_ASSERT(mResTIMG != 0);
JUT_ASSERT(0, mResTIMG != 0);
makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33);
}
@@ -732,7 +732,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
f32 var_f2 = 0.0f;
f32 var_f3 = 0.0f;
JUT_ASSERT(i_roomNo >= 0);
JUT_ASSERT(0, i_roomNo >= 0);
if (i_roomNo >= 0) {
f32 temp_f31 = dMpath_c::getMinX();
@@ -746,7 +746,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
f32 sp8 = 0.0f;
dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo);
JUT_ASSERT(fileList2_p != 0);
JUT_ASSERT(0, fileList2_p != 0);
if (fileList2_p != NULL) {
dMapInfo_n::getRoomMinMaxXZ(i_roomNo, &sp14, &sp10, &spC, &sp8);
@@ -754,7 +754,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
switch (getDispType()) {
default:
JUT_ASSERT(0);
JUT_ASSERT(0, 0);
case 4:
case 0:
var_f0 = temp_f31;
@@ -841,7 +841,7 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
f32 var_f31 = 0.0f;
f32 var_f30 = 0.0f;
JUT_ASSERT(i_roomNo >= 0);
JUT_ASSERT(0, i_roomNo >= 0);
if (i_roomNo >= 0) {
f32 sp14 = 0.0f;
@@ -865,11 +865,11 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
/* 80029E1C-80029F84 02475C 0168+00 1/1 0/0 0/0 .text calcMapCmPerTexel__6dMap_cFiPf */
void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
JUT_ASSERT(i_roomNo >= 0);
JUT_ASSERT(ip_cmPerTexel != 0);
JUT_ASSERT(0, i_roomNo >= 0);
JUT_ASSERT(0, ip_cmPerTexel != 0);
f32 cmPerTexel = 0.0f;
JUT_ASSERT(mTexSizeY != 0);
JUT_ASSERT(0, mTexSizeY != 0);
if (i_roomNo >= 0) {
if (getStayType() == 0) {
@@ -893,7 +893,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
f32 var_f31 = 0.0f;
stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
JUT_ASSERT(pstag != 0);
JUT_ASSERT(0, pstag != 0);
if (pstag != NULL) {
var_f31 = pstag->field_0x20;
@@ -907,7 +907,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
}
}
JUT_ASSERT(cmPerTexel != 0.0f);
JUT_ASSERT(0, cmPerTexel != 0.0f);
if (ip_cmPerTexel != NULL) {
*ip_cmPerTexel = cmPerTexel;
@@ -942,7 +942,7 @@ inline void getRGBA_RGB5A3(const dMpath_RGB5A3_palDt_s& palette, u8& r, u8& g, u
/* 80029F84-8002A064 0248C4 00E0+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFif */
void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
int pixel;
u8 scaled_a = 0;
@@ -970,8 +970,8 @@ void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
/* 8002A064-8002A148 0249A4 00E4+00 2/2 0/0 0/0 .text copyPalette__6dMap_cFiif */
void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
JUT_ASSERT(i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER);
JUT_ASSERT(i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER);
JUT_ASSERT(0, i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER);
JUT_ASSERT(0, i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER);
int pixel;
u8 scaled_a = 0;
@@ -999,7 +999,7 @@ void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
/* 8002A148-8002A1BC 024A88 0074+00 1/0 0/0 0/0 .text setAmapPaletteColor__6dMap_cFiUcUcUcUc */
void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_scaledA) {
JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
int pixel;
if (i_scaledA >= 0xE0) {
@@ -1102,7 +1102,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
switch (getDispType()) {
default:
case 0:
JUT_ASSERT(0);
JUT_ASSERT(0, 0);
break;
case 5:
field_0x8e = 2;
@@ -1301,4 +1301,4 @@ dTres_c::typeGroupData_c* dMap_c::getNextData(dTres_c::typeGroupData_c* param_0)
// TODO: this is supposed to be auto-generated, but its not getting put in the right order
void dDlst_base_c::draw() {
/* empty function */
}
}