mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-04 10:26:16 -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:
@@ -32,6 +32,7 @@ JKRExpHeap* JFWSystem::systemHeap;
|
||||
|
||||
/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */
|
||||
void JFWSystem::firstInit() {
|
||||
JUT_ASSERT(80, rootHeap == 0);
|
||||
OSInit();
|
||||
DVDInit();
|
||||
rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false);
|
||||
@@ -51,15 +52,15 @@ u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000;
|
||||
|
||||
/* 80450784-80450788 000204 0004+00 1/1 0/0 0/0 .sdata streamPriority__Q29JFWSystem11CSetUpParam
|
||||
*/
|
||||
u32 JFWSystem::CSetUpParam::streamPriority = 8;
|
||||
s32 JFWSystem::CSetUpParam::streamPriority = 8;
|
||||
|
||||
/* 80450788-8045078C 000208 0004+00 1/1 0/0 0/0 .sdata decompPriority__Q29JFWSystem11CSetUpParam
|
||||
*/
|
||||
u32 JFWSystem::CSetUpParam::decompPriority = 7;
|
||||
s32 JFWSystem::CSetUpParam::decompPriority = 7;
|
||||
|
||||
/* 8045078C-80450790 00020C 0004+00 1/1 0/0 0/0 .sdata aPiecePriority__Q29JFWSystem11CSetUpParam
|
||||
*/
|
||||
u32 JFWSystem::CSetUpParam::aPiecePriority = 6;
|
||||
s32 JFWSystem::CSetUpParam::aPiecePriority = 6;
|
||||
|
||||
/* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */
|
||||
ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12;
|
||||
@@ -92,6 +93,8 @@ static u8 sInitCalled;
|
||||
/* 80271D18-80272040 26C658 0328+00 0/0 1/1 0/0 .text init__9JFWSystemFv */
|
||||
// NONMATCHING - regalloc, equivalent
|
||||
void JFWSystem::init() {
|
||||
JUT_ASSERT(101, sInitCalled == false);
|
||||
|
||||
if (rootHeap == NULL) {
|
||||
firstInit();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user