diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-08-22 00:37:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-22 00:37:28 -0400 |
| commit | cb4fe5cf2766357f9bee2dc44ceed78bed6f7c42 (patch) | |
| tree | 824cf63f22c7e3a55ae397816548ee8027d39523 /src/JSystem | |
| parent | a32174dff6bbac81945505d8d86e125ce3443405 (diff) | |
| parent | e22f51b444aa88639801195bef3c5142a47e5515 (diff) | |
Merge pull request #860 from LagoLunatic/pch
Use precompiled header (dolzel.pch), fix weak data issues and weak function ordering issues
Diffstat (limited to 'src/JSystem')
| -rw-r--r-- | src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 5 | ||||
| -rw-r--r-- | src/JSystem/J3DU/J3DUClipper.cpp | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 161a205c..adf20758 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -14,11 +14,6 @@ #include "dolphin/types.h" #include "string.h" -inline GXAttnFn J3DColorChan::getAttnFn() { - u8 attnFnTbl[] = { GX_AF_NONE, GX_AF_SPEC, GX_AF_NONE, GX_AF_SPOT }; - return GXAttnFn(attnFnTbl[mChanCtrl >> 9 & 0x03]); -} - extern bool isTexNoReg(void*); extern u16 getTexNoReg(void*); extern void loadTexNo(u32, const u16 &); diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp index 4f761c66..ecb733bc 100644 --- a/src/JSystem/J3DU/J3DUClipper.cpp +++ b/src/JSystem/J3DU/J3DUClipper.cpp @@ -8,10 +8,7 @@ #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "math.h" -// Needed for the .rodata section to match. -static const f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; -static const f32 dummy2[3] = {1.0f, 1.0f, 1.0f}; -static const f32 dummy3[3] = {0.0f, 0.0f, 0.0f}; +#include "weak_bss_3569.h" // IWYU pragma: keep static const f32 Deg2Rad = 0.017453292f; |