From 4dc0cd9d09d5a53bf6d68f0018a8053a1507ee9a Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 22 Mar 2025 21:00:51 -0400 Subject: 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 --- src/d/d_msg_object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/d/d_msg_object.cpp') diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 5ce6e2690a..6c29328a20 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -716,7 +716,7 @@ u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) { } if (i >= msgIndexCount) { - JUT_WARN(1937, "Message Index Not Exist!! %d", param_0) + JUT_WARN(1937, "Message Index Not Exist!! %d", param_1) rv = 612; } return rv; @@ -1364,7 +1364,7 @@ void dMsgObject_c::talkStartInit() { mpTalkHeap->getTotalFreeSize(); bool local_98 = false; if (mpOutFont == NULL) { - OS_REPORT("free size (0x%x)=====> %d\n", :mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize()); + OS_REPORT("free size (0x%x)=====> %d\n", mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize()); mpOutFont = new COutFont_c(0); JUT_ASSERT(3035, mpOutFont != 0); mpOutFont->createPane(); -- cgit v1.2.3