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_light.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_light.cpp')
| -rw-r--r-- | src/d/d_msg_scrn_light.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp index 106a698a6b..d841385af4 100644 --- a/src/d/d_msg_scrn_light.cpp +++ b/src/d/d_msg_scrn_light.cpp @@ -129,10 +129,10 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { g_MsgScrnLight_HIO_c.updateColor(i_colorType); mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_message_window_text_light.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); OSInitFastCast(); @@ -146,7 +146,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { mBpkFrame = 0.0f; mpParent_c = new CPaneMgr(mpScreen, 'moya00', 0, NULL); - JUT_ASSERT(mpParent_c != 0); + JUT_ASSERT(0, mpParent_c != 0); mpParent_c->getPanePtr()->setAnimation(mpBck); mpParent_c->getPanePtr()->setAnimation(mpBpk); @@ -283,4 +283,4 @@ void dMsgScrnLight_c::drawCommon(f32 i_posX, f32 i_posY, f32 i_scaleX, f32 i_sca } mAlpha = i_alpha; -}
\ No newline at end of file +} |