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_arrow.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_arrow.cpp')
| -rw-r--r-- | src/d/d_msg_scrn_arrow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp index c7e953709c..89a7e37e8c 100644 --- a/src/d/d_msg_scrn_arrow.cpp +++ b/src/d/d_msg_scrn_arrow.cpp @@ -7,10 +7,10 @@ /* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0)); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); OSInitFastCast(); @@ -25,10 +25,10 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mBpkFrame = 0.0f; mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); - JUT_ASSERT(mpParent_c != 0); + JUT_ASSERT(0, mpParent_c != 0); mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL); - JUT_ASSERT(mpArw_c != 0); + JUT_ASSERT(0, mpArw_c != 0); mpArw_c->hide(); mpArw_c->mPane->setAnimation(mpBck); @@ -36,7 +36,7 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen->search('yajinexl')->setAnimation(mpBpk); mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL); - JUT_ASSERT(mpDot_c != 0); + JUT_ASSERT(0, mpDot_c != 0); mpDot_c->hide(); mpScreen->search('yaj_end')->setAnimation(mpBpk); @@ -140,4 +140,4 @@ void dMsgScrnArrow_c::dotAnimeMove() { mpBpk->setFrame(mBpkFrame); mpScreen->animation(); -}
\ No newline at end of file +} |