J3D debug work (#2949)

* J3D debug work

* Clean up JSystem GXColor ctors, remove a couple fakematches

* Update symbols.txt

* Fix res include syntax

* Remove fakematch that isn't necessary anymore

* Fix some Shield regressions

5 files changed, 7 insertions, 7 deletions

diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt
index 8032ae73c2..25e27fcb71 100644
--- a/config/GZ2E01/symbols.txt
+++ b/config/GZ2E01/symbols.txt
@@ -26322,7 +26322,7 @@ j2dDefaultTevSwapModeTable = .sdata2:0x8045619C; // type:object size:0x4 scope:g
 j2dDefaultBlendInfo = .sdata2:0x804561A0; // type:object size:0x4 scope:global align:4 data:byte
 j2dDefaultPEBlockDither = .sdata2:0x804561A4; // type:object size:0x1 scope:global align:1 data:byte
 j2dDefaultColorChanInfo = .sdata2:0x804561A8; // type:object size:0x4 scope:global align:4
-data_804561AC = .sdata2:0x804561AC; // type:object size:0x1 scope:global align:1 data:byte
+j2dDefaultTevSwapTableID = .sdata2:0x804561AC; // type:object size:0x1 scope:global align:1 data:byte
 j2dDefaultAlphaCmp = .sdata2:0x804561AE; // type:object size:0x2 scope:global align:2 data:2byte
 @1943 = .sdata2:0x804561B0; // type:object size:0x4 scope:local align:4 data:float
 @1944 = .sdata2:0x804561B4; // type:object size:0x4 scope:local align:4 data:float
diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt
index 8c84aed393..f054d162fe 100644
--- a/config/GZ2J01/symbols.txt
+++ b/config/GZ2J01/symbols.txt
@@ -26331,7 +26331,7 @@ j2dDefaultTevSwapModeTable = .sdata2:0x804502BC; // type:object size:0x4 scope:g
 j2dDefaultBlendInfo = .sdata2:0x804502C0; // type:object size:0x4 scope:global align:4 data:byte
 j2dDefaultPEBlockDither = .sdata2:0x804502C4; // type:object size:0x1 data:byte
 j2dDefaultColorChanInfo = .sdata2:0x804502C8; // type:object size:0x4 scope:global align:4
-data_804561AC = .sdata2:0x804502CC; // type:object size:0x1 data:byte
+j2dDefaultTevSwapTableID = .sdata2:0x804502CC; // type:object size:0x1 data:byte
 j2dDefaultAlphaCmp = .sdata2:0x804502CE; // type:object size:0x2 scope:global align:2 data:2byte
 @1943 = .sdata2:0x804502D0; // type:object size:0x4 scope:local align:4 data:float
 @1944 = .sdata2:0x804502D4; // type:object size:0x4 scope:local align:4 data:float
diff --git a/config/GZ2P01/symbols.txt b/config/GZ2P01/symbols.txt
index 67b509b6ef..6d7825d565 100644
--- a/config/GZ2P01/symbols.txt
+++ b/config/GZ2P01/symbols.txt
@@ -26350,7 +26350,7 @@ j2dDefaultTevSwapModeTable = .sdata2:0x80458174; // type:object size:0x4 scope:g
 j2dDefaultBlendInfo = .sdata2:0x80458178; // type:object size:0x4 scope:global align:4 data:byte
 j2dDefaultPEBlockDither = .sdata2:0x8045817C; // type:object size:0x1 data:byte
 j2dDefaultColorChanInfo = .sdata2:0x80458180; // type:object size:0x4 scope:global align:4
-data_804561AC = .sdata2:0x80458184; // type:object size:0x1 data:byte
+j2dDefaultTevSwapTableID = .sdata2:0x80458184; // type:object size:0x1 data:byte
 j2dDefaultAlphaCmp = .sdata2:0x80458186; // type:object size:0x2 scope:global align:2 data:2byte
 @1943 = .sdata2:0x80458188; // type:object size:0x4 scope:local align:4 data:float
 @1944 = .sdata2:0x8045818C; // type:object size:0x4 scope:local align:4 data:float
diff --git a/config/Shield/symbols.txt b/config/Shield/symbols.txt
index 797b4a4194..ee6a502e1d 100644
--- a/config/Shield/symbols.txt
+++ b/config/Shield/symbols.txt
@@ -30090,9 +30090,9 @@ j2dDefaultTevColor = .sdata2:0x8050E2C0; // type:object size:0x8 scope:global da
 j2dDefaultTevKColor = .sdata2:0x8050E2C8; // type:object size:0x4 scope:global data:4byte hash:0xAF4A8463
 j2dDefaultTevSwapModeTable = .sdata2:0x8050E2CC; // type:object size:0x4 scope:global data:byte hash:0xDA12C67D
 j2dDefaultBlendInfo = .sdata2:0x8050E2D0; // type:object size:0x4 scope:global data:byte hash:0x2B1A967D
-lbl_8050E2D4 = .sdata2:0x8050E2D4; // type:object size:0x1 data:byte hash:0x6770EFB4
+j2dDefaultPEBlockDither = .sdata2:0x8050E2D4; // type:object size:0x1 data:byte hash:0x6770EFB4
 j2dDefaultColorChanInfo = .sdata2:0x8050E2D8; // type:object size:0x4 scope:global hash:0xB6183BC5
-lbl_8050E2DC = .sdata2:0x8050E2DC; // type:object size:0x1 data:byte hash:0x5BCEF69E
+j2dDefaultTevSwapTableID = .sdata2:0x8050E2DC; // type:object size:0x1 data:byte hash:0x5BCEF69E
 j2dDefaultAlphaCmp = .sdata2:0x8050E2DE; // type:object size:0x2 scope:global data:2byte hash:0x9193BBD8
 @37844 = .sdata2:0x8050E2E0; // type:object size:0x4 scope:local align:4 data:float hash:0xA082A5D9
 @37845 = .sdata2:0x8050E2E4; // type:object size:0x4 scope:local align:4 data:float hash:0xA082A5D8
diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt
index 98f26c03de..2d3922569d 100644
--- a/config/ShieldD/symbols.txt
+++ b/config/ShieldD/symbols.txt
@@ -69775,9 +69775,9 @@ j2dDefaultTevColor = .sdata2:0x80752878; // type:object size:0x8 scope:global ha
 j2dDefaultTevKColor = .sdata2:0x80752880; // type:object size:0x4 scope:global data:4byte hash:0xAF4A8463
 j2dDefaultTevSwapModeTable = .sdata2:0x80752884; // type:object size:0x4 scope:global hash:0xDA12C67D
 j2dDefaultBlendInfo = .sdata2:0x80752888; // type:object size:0x4 scope:global hash:0x2B1A967D
-lbl_8075288C = .sdata2:0x8075288C; // type:object size:0x1 data:byte hash:0x6770EFB4
+j2dDefaultPEBlockDither = .sdata2:0x8075288C; // type:object size:0x1 data:byte hash:0x6770EFB4
 j2dDefaultColorChanInfo = .sdata2:0x80752890; // type:object size:0x4 scope:global hash:0xB6183BC5
-lbl_80752894 = .sdata2:0x80752894; // type:object size:0x1 data:byte hash:0x5BCEF69E
+j2dDefaultTevSwapTableID = .sdata2:0x80752894; // type:object size:0x1 data:byte hash:0x5BCEF69E
 j2dDefaultAlphaCmp = .sdata2:0x80752896; // type:object size:0x2 scope:global data:2byte hash:0x9193BBD8
 @37802 = .sdata2:0x80752898; // type:object size:0x4 scope:local align:4 data:float hash:0xA082A55B
 @37803 = .sdata2:0x8075289C; // type:object size:0x4 scope:local align:4 data:float hash:0xA082A55A