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 /include/JSystem/J2DGraph | |
| 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 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPictureEx.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h index f138657749..e8252bb4f5 100644 --- a/include/JSystem/J2DGraph/J2DPictureEx.h +++ b/include/JSystem/J2DGraph/J2DPictureEx.h @@ -33,8 +33,8 @@ public: /* 803069D8 */ virtual void setCullBack(_GXCullMode); /* 803069B8 */ virtual void setAlpha(u8); /* 80303AB4 */ virtual void drawSelf(f32, f32, f32 (*)[3][4]); - /* 80306A24 */ virtual void isUsed(ResTIMG const*); - /* 803071A4 */ virtual void isUsed(ResFONT const*); + /* 80306A24 */ virtual bool isUsed(ResTIMG const*); + /* 803071A4 */ virtual bool isUsed(ResFONT const*); /* 80306A0C */ virtual void rewriteAlpha(); /* 803071C4 */ virtual void setAnimation(J2DAnmBase*); /* 80256064 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); } @@ -44,7 +44,7 @@ public: /* 80306B48 */ virtual void setAnimation(J2DAnmTevRegKey*); /* 80306B74 */ virtual void setAnimation(J2DAnmVisibilityFull*); /* 80306B7C */ virtual void setAnimation(J2DAnmVtxColor*); - /* 80306C70 */ virtual void animationPane(J2DAnmTransform const*); + /* 80306C70 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*); /* 80303640 */ virtual void initiate(ResTIMG const*, ResTLUT const*); /* 803039CC */ virtual bool prepareTexture(u8); /* 80306ED4 */ virtual bool append(ResTIMG const*, f32); @@ -84,8 +84,8 @@ public: /* 80306370 */ virtual bool setBlack(JUtility::TColor); /* 803063F8 */ virtual bool setWhite(JUtility::TColor); /* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 803068F8 */ virtual void getBlack() const; - /* 80306958 */ virtual void getWhite() const; + /* 803068F8 */ virtual JUtility::TColor getBlack() const; + /* 80306958 */ virtual JUtility::TColor getWhite() const; /* 80256034 */ virtual J2DMaterial* getMaterial() const { return mMaterial; } /* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]); /* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16, |