From c6f76e7240dde8bbcf40a88d6d88cf87cab616b4 Mon Sep 17 00:00:00 2001
From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com>
Date: Wed, 9 Apr 2025 16:45:30 -0400
Subject: Various JSystem work (#2383)

* JKernel and JStudio cleanup

* JMessage cleanup

* JAudio cleanup

* JASBNKParser work

* functionvalue work

* fvb work

* J2D and J3D cleanup

* steal from tww

* J2DPictureEx mostly done

* fix build
---
 src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/JSystem/J3DGraphBase/J3DMatBlock.cpp')

diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index 6af9f074db..4c0bfc8a43 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/J3DGraphBase/J3DGD.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
-#include "dol2asm.h"
 #include "dolphin/os.h"
 #include "string.h"
 #include "global.h"
@@ -359,8 +358,8 @@ void J3DColorBlockLightOff::load() {
     mColorChanOffset = GDGetCurrOffset();
     J3DGDWriteXFCmdHdr(0x100e, 4);
     mColorChan[0].load();
-    mColorChan[1].load();
     mColorChan[2].load();
+    mColorChan[1].load();
     mColorChan[3].load();
 }
 
@@ -376,8 +375,8 @@ void J3DColorBlockAmbientOn::load() {
     mColorChanOffset = GDGetCurrOffset();
     J3DGDWriteXFCmdHdr(0x100e, 4);
     mColorChan[0].load();
-    mColorChan[1].load();
     mColorChan[2].load();
+    mColorChan[1].load();
     mColorChan[3].load();
 }
 
@@ -390,8 +389,8 @@ void J3DColorBlockLightOn::load() {
     mColorChanOffset = GDGetCurrOffset();
     J3DGDWriteXFCmdHdr(0x100e, 4);
     mColorChan[0].load();
-    mColorChan[1].load();
     mColorChan[2].load();
+    mColorChan[1].load();
     mColorChan[3].load();
     for (u32 i = 0; i < 8; i++) {
         if (mLight[i] != NULL) {
@@ -423,8 +422,8 @@ void J3DColorBlockLightOff::patchLight() {
     GDOverflowCheck(SizeOfLoadColorChans);
     J3DGDWriteXFCmdHdr(0x100e, 4);
     mColorChan[0].load();
-    mColorChan[1].load();
     mColorChan[2].load();
+    mColorChan[1].load();
     mColorChan[3].load();
     void* end = GDGetCurrPointer();
     DCStoreRange(start, (u32)end - (u32)start);
@@ -453,8 +452,8 @@ void J3DColorBlockLightOn::patchLight() {
     GDOverflowCheck(SizeOfLoadColorChans);
     J3DGDWriteXFCmdHdr(0x100e, 4);
     mColorChan[0].load();
-    mColorChan[1].load();
     mColorChan[2].load();
+    mColorChan[1].load();
     mColorChan[3].load();
     for (u32 i = 0; i < 8; i++) {
         if (mLight[i] != NULL) {
@@ -484,8 +483,8 @@ void J3DColorBlockLightOff::diffColorChan() {
     GDOverflowCheck(SizeOfLoadColorChans);
     J3DGDWriteXFCmdHdr(0x100e, 4);
     mColorChan[0].load();
-    mColorChan[1].load();
     mColorChan[2].load();
+    mColorChan[1].load();
     mColorChan[3].load();
 }
 
@@ -521,8 +520,8 @@ void J3DColorBlockLightOn::diffColorChan() {
     GDOverflowCheck(SizeOfLoadColorChans);
     J3DGDWriteXFCmdHdr(0x100e, 4);
     mColorChan[0].load();
-    mColorChan[1].load();
     mColorChan[2].load();
+    mColorChan[1].load();
     mColorChan[3].load();
 }
 
-- 
cgit v1.2.3