mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-30 15:43:19 -04:00
Debug version now builds OK and all_source compiles (#2343)
* 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:
@@ -294,7 +294,7 @@ int daItem_c::_daItem_create() {
|
||||
{
|
||||
// "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n"
|
||||
OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo);
|
||||
JUT_ASSERT(0);
|
||||
JUT_ASSERT(0, 0);
|
||||
return cPhs_ERROR_e;
|
||||
} else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 ||
|
||||
m_itemNo == fpcNm_ITEM_BOMB_30)
|
||||
@@ -526,7 +526,7 @@ void daItem_c::procInitGetDemoEvent() {
|
||||
|
||||
m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this),
|
||||
NULL, NULL);
|
||||
JUT_ASSERT(m_item_id != fpcM_ERROR_PROCESS_ID_e);
|
||||
JUT_ASSERT(0, m_item_id != fpcM_ERROR_PROCESS_ID_e);
|
||||
|
||||
setStatus(STATUS_WAIT_GET_DEMO_EVENT_e);
|
||||
}
|
||||
@@ -1181,7 +1181,7 @@ void daItem_c::initFlag() {
|
||||
default:
|
||||
// "Item: Set Type<%d>\n"
|
||||
OS_REPORT("アイテム:セットタイプ<%d>\n", type);
|
||||
JUT_ASSERT(0);
|
||||
JUT_ASSERT(0, 0);
|
||||
case TYPE_LAUNCH_e:
|
||||
case TYPE_LAUNCH_SMALL_e:
|
||||
case TYPE_LAUNCH_FROM_PLAYER_e:
|
||||
@@ -1232,7 +1232,7 @@ void daItem_c::initScale() {
|
||||
scale.setall(0.0f);
|
||||
break;
|
||||
default:
|
||||
JUT_ASSERT(0);
|
||||
JUT_ASSERT(0, 0);
|
||||
case TYPE_FIXED_PLACE_e:
|
||||
case TYPE_WAIT_e:
|
||||
case TYPE_SIMPLE_GET_e:
|
||||
|
||||
Reference in New Issue
Block a user