diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-03-22 21:00:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-22 18:00:51 -0700 |
| commit | 4dc0cd9d09d5a53bf6d68f0018a8053a1507ee9a (patch) | |
| tree | 285129a59d3939a79d1d2867413fe4a1fb5aa280 /src/d/d_msg_scrn_3select.cpp | |
| parent | d0f89e41b1c2dd8b434cf8a63278757b4fc8b84f (diff) | |
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
Diffstat (limited to 'src/d/d_msg_scrn_3select.cpp')
| -rw-r--r-- | src/d/d_msg_scrn_3select.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index d9dc0793fb..9b398d28aa 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -47,10 +47,10 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { static u32 unkdata[9] = {0}; mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_window_3menu.blo", 0x20000, dComIfGp_getMsgArchive(0)); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); OSInitFastCast(); @@ -72,11 +72,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mBtkFrame = 0.0f; mpSelectCursor = new dSelect_cursor_c(0, 1.0f, NULL); - JUT_ASSERT(mpSelectCursor != 0); + JUT_ASSERT(0, mpSelectCursor != 0); mpSelectCursor->setAlphaRate(0.0f); mpParent = new CPaneMgr(mpScreen, 'abc_n', 0, NULL); - JUT_ASSERT(mpParent != 0); + JUT_ASSERT(0, mpParent != 0); for (int i = 0; i < 3; i++) { mCursorPos[i].x = 0.0f; @@ -84,46 +84,46 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mCursorPos[i].z = 0.0f; mpSel_c[i] = new CPaneMgr(mpScreen, tag_name[i][0], 0, NULL); - JUT_ASSERT(mpSel_c[i] != 0); + JUT_ASSERT(0, mpSel_c[i] != 0); mpSel_c[i]->hide(); mpSelCld_c[i] = new CPaneMgr(mpScreen, tag_name[i][1], 0, NULL); - JUT_ASSERT(mpSelCld_c[i] != 0); + JUT_ASSERT(0, mpSelCld_c[i] != 0); mpSelCld_c[i]->getPanePtr()->setAnimation(mpAnmBtk); mpSelCldr_c[i] = new CPaneMgr(mpScreen, tag_name[i][2], 0, NULL); - JUT_ASSERT(mpSelCldr_c[i] != 0); + JUT_ASSERT(0, mpSelCldr_c[i] != 0); mpSelCldr_c[i]->getPanePtr()->setAnimation(mpAnmBtk); mpSelCldm_c[i] = new CPaneMgr(mpScreen, tag_name[i][3], 0, NULL); - JUT_ASSERT(mpSelCldm_c[i] != 0); + JUT_ASSERT(0, mpSelCldm_c[i] != 0); mpSelCldm_c[i]->getPanePtr()->setAnimation(mpAnmBpk); for (int j = 0; j < 5; j++) { mpSelCldw_c[j][i] = new CPaneMgr(mpScreen, tag_name[i][4 + j], 0, NULL); - JUT_ASSERT(mpSelCldw_c[j][i] != 0); + JUT_ASSERT(0, mpSelCldw_c[j][i] != 0); } mpSelPo_c[i] = new CPaneMgr(mpScreen, tag_name[i][9], 0, NULL); - JUT_ASSERT(mpSelPo_c[i] != 0); + JUT_ASSERT(0, mpSelPo_c[i] != 0); mpSelPo_c[i]->hide(); mpKahen_c[i] = new CPaneMgr(mpScreen, tag_name[i][10], 0, NULL); - JUT_ASSERT(mpKahen_c[i] != 0); + JUT_ASSERT(0, mpKahen_c[i] != 0); mpCursor_c[i] = new CPaneMgr(mpScreen, tag_name[i][11], 0, NULL); - JUT_ASSERT(mpCursor_c[i] != 0); + JUT_ASSERT(0, mpCursor_c[i] != 0); mCursorPos[i] = mpCursor_c[i]->getGlobalVtxCenter(true, 0); } mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t_e', 0, NULL); - JUT_ASSERT(mpTmSel_c[0] != 0); + JUT_ASSERT(0, mpTmSel_c[0] != 0); mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t_e', 0, NULL); - JUT_ASSERT(mpTmSel_c[1] != 0); + JUT_ASSERT(0, mpTmSel_c[1] != 0); mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t_e', 0, NULL); - JUT_ASSERT(mpTmSel_c[2] != 0); + JUT_ASSERT(0, mpTmSel_c[2] != 0); for (int i = 0; i < 3; i++) { ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, ""); @@ -229,17 +229,17 @@ bool dMsgScrn3Select_c::isSelect() { /* 80239C78-80239D08 2345B8 0090+00 0/0 5/5 0/0 .text setString__17dMsgScrn3Select_cFPcPcPc */ void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) { if (mpTmSel_c[0] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() > std::strlen(mpText0)); } if (mpTmSel_c[1] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringAllocByte() > std::strlen(mpText1)); } if (mpTmSel_c[2] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringAllocByte() > std::strlen(mpText2)); } @@ -259,17 +259,17 @@ void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) { /* 80239D08-80239D98 234648 0090+00 0/0 5/5 0/0 .text setRubyString__17dMsgScrn3Select_cFPcPcPc */ void dMsgScrn3Select_c::setRubyString(char* pText0, char* pText1, char* pText2) { if (mpTmrSel_c[0] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() > std::strlen(pText0)); } if (mpTmrSel_c[1] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringAllocByte() > std::strlen(pText1)); } if (mpTmrSel_c[2] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringAllocByte() > std::strlen(pText2)); } |
