diff options
| author | Max Roncace <me@caseif.net> | 2025-12-22 18:41:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-22 15:41:19 -0800 |
| commit | 9767e76ba049ce20ac0d2236758f050bcd36d90f (patch) | |
| tree | 30519a089779dd789f5564adef5afb27a163a190 /src/JSystem | |
| parent | 8fece471c6d5203aa09d5c280584096adc1b8539 (diff) | |
GCN data 100% matching (#2987)
* Update GZ2J01 symbols from linked DOL
* GCN data 100% matching
* Run dtk apply
Diffstat (limited to 'src/JSystem')
| -rw-r--r-- | src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 2 | ||||
| -rw-r--r-- | src/JSystem/JAudio2/JASDrumSet.cpp | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 6aa780fdfe..6256c376af 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -295,8 +295,6 @@ static u32 SizeOfLoadAmbColors = 13; static u32 SizeOfLoadColorChans = 21; -static u8 sdata_padding[4] = {}; - static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans; void J3DColorBlockLightOff::load() { diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp index 9f9ec63059..1aca5e0cf8 100644 --- a/src/JSystem/JAudio2/JASDrumSet.cpp +++ b/src/JSystem/JAudio2/JASDrumSet.cpp @@ -21,13 +21,11 @@ void JASDrumSet::newPercArray(u8 param_0, JKRHeap* param_1) { } } -static JASOscillator::Data osc; - -static JASOscillator::Data* oscp; - -static s8 data_80451274[4]; - bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const { + static JASOscillator::Data osc; + static JASOscillator::Data* oscp; + static s8 data_80451274; + if (field_0x4 == NULL) { return false; } @@ -54,9 +52,9 @@ bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const osc.mScale = 1.0f; osc._14 = 0.0f; - if (data_80451274[0] == 0) { + if (data_80451274 == 0) { oscp = &osc; - data_80451274[0] = 1; + data_80451274 = 1; } param_2->field_0x14 = &oscp; |