diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-10 21:25:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-10 18:25:00 -0800 |
| commit | 23a1c940630435eaa0bbca45fb24156fc0d3db62 (patch) | |
| tree | c2b05e860562425bd3147046e19bcf8130ad4625 /include/JSystem | |
| parent | a02f72d8f3a87a2d2ddde062301d3639050e1e35 (diff) | |
Regalloc/debug/misc fixes (#2794)
* Fix "0" asserts
* More debug and regalloc fixes
* Fix PTMF syntax for compatibility with other compilers
* Fix some fakematches, link more TUs for J/P
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DTevs.h | 6 | ||||
| -rw-r--r-- | include/JSystem/JAudio2/JASHeapCtrl.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h index 845b94e89d..5eb407379d 100644 --- a/include/JSystem/J2DGraph/J2DTevs.h +++ b/include/JSystem/J2DGraph/J2DTevs.h @@ -564,7 +564,7 @@ struct J2DColorChanInfo { /* 0x0 */ u8 field_0x3; }; -inline u8 J2DCalcColorChanID(const J2DColorChanInfo& info) { return info.field_0x1; } +inline u16 J2DCalcColorChanID(u8 param_0) { return param_0; } extern const J2DColorChanInfo j2dDefaultColorChanInfo; /** @@ -577,11 +577,11 @@ public: setColorChanInfo(j2dDefaultColorChanInfo); } J2DColorChan(const J2DColorChanInfo& info) { - mColorChan = J2DCalcColorChanID(info); + mColorChan = J2DCalcColorChanID(info.field_0x1); } void setColorChanInfo(const J2DColorChanInfo& info) { - mColorChan = J2DCalcColorChanID(info); + mColorChan = J2DCalcColorChanID(info.field_0x1); } u16 getMatSrc() const { return mColorChan & 1; } diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/include/JSystem/JAudio2/JASHeapCtrl.h index 754e65361c..c6cc34ae30 100644 --- a/include/JSystem/JAudio2/JASHeapCtrl.h +++ b/include/JSystem/JAudio2/JASHeapCtrl.h @@ -215,7 +215,7 @@ public: chunk = chunk->getNextChunk(); } - JUT_PANIC(362,"Cannnot free for JASMemChunkPool") + JUT_PANIC(362, "Cannnot free for JASMemChunkPool"); } /* 0x18 */ MemoryChunk* field_0x18; |