mirror of
https://github.com/zeldaret/tp
synced 2026-06-21 08:31:53 -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:
+4
-4
@@ -1159,7 +1159,7 @@ SECTION_DATA extern void* __vt__7dName_c[3 + 3 /* padding */] = {
|
||||
/* 802505CC-80250CEC 24AF0C 0720+00 1/1 0/0 0/0 .text screenSet__7dName_cFv */
|
||||
void dName_c::screenSet() {
|
||||
nameIn.NameInScr = new J2DScreen();
|
||||
JUT_ASSERT(nameIn.NameInScr != 0);
|
||||
JUT_ASSERT(0, nameIn.NameInScr != 0);
|
||||
|
||||
archive = dComIfGp_getNameResArchive();
|
||||
nameIn.NameInScr->setPriority("zelda_player_name.blo", 0x100000, archive);
|
||||
@@ -1167,12 +1167,12 @@ void dName_c::screenSet() {
|
||||
nameIn.field_0x10 = nameIn.NameInScr->search('name_n');
|
||||
|
||||
void* bpk = JKRGetNameResource("zelda_player_name.bpk", archive);
|
||||
JUT_ASSERT(bpk != 0);
|
||||
JUT_ASSERT(0, bpk != 0);
|
||||
mCursorColorKey = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk);
|
||||
mCursorColorKey->searchUpdateMaterialID(nameIn.NameInScr);
|
||||
|
||||
void* btk = JKRGetNameResource("zelda_player_name.btk", archive);
|
||||
JUT_ASSERT(btk != 0);
|
||||
JUT_ASSERT(0, btk != 0);
|
||||
mCursorTexKey = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk);
|
||||
mCursorTexKey->searchUpdateMaterialID(nameIn.NameInScr);
|
||||
|
||||
@@ -1246,7 +1246,7 @@ void dName_c::screenSet() {
|
||||
mCharRow = 0;
|
||||
|
||||
mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL);
|
||||
JUT_ASSERT(mSelIcon != 0);
|
||||
JUT_ASSERT(0, mSelIcon != 0);
|
||||
mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f);
|
||||
|
||||
Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0);
|
||||
|
||||
Reference in New Issue
Block a user