From df77eae2b31e75ae139191a08243a2fb49e21551 Mon Sep 17 00:00:00 2001
From: jdflyer <jdflyer10@gmail.com>
Date: Fri, 15 Mar 2024 01:35:29 -0600
Subject: [PATCH] Fix make game (#2097)

---
 include/JSystem/J2DGraph/J2DMaterialFactory.h          | 2 +-
 libs/JSystem/J2DGraph/J2DMaterialFactory.cpp           | 2 +-
 libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp     | 3 +--
 libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp | 3 +--
 tools/lcf.py                                           | 4 +++-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/include/JSystem/J2DGraph/J2DMaterialFactory.h
index 22d3702e74c..02936b0ad2a 100644
--- a/include/JSystem/J2DGraph/J2DMaterialFactory.h
+++ b/include/JSystem/J2DGraph/J2DMaterialFactory.h
@@ -142,7 +142,7 @@ private:
     /* 0x2C */ u16* field_0x2c;
     /* 0x30 */ _GXCullMode* field_0x30;
     /* 0x34 */ J2DTevOrderInfo* field_0x34;
-    /* 0x38 */ J2DGXColorS10* field_0x38;
+    /* 0x38 */ _GXColorS10* field_0x38;
     /* 0x3C */ GXColor* field_0x3c;
     /* 0x40 */ u8* field_0x40;
     /* 0x44 */ J2DTevStageInfo* field_0x44;
diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
index 41033b1b11a..870ef214033 100644
--- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -103,7 +103,7 @@ J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
     field_0x28 = JSUConvertOffsetToPtr<u16>(&param_0, (void*)param_0.field_0x38);
     field_0x2c = JSUConvertOffsetToPtr<u16>(&param_0, (void*)param_0.field_0x3c);
     field_0x34 = JSUConvertOffsetToPtr<J2DTevOrderInfo>(&param_0, (void*)param_0.field_0x40);
-    field_0x38 = JSUConvertOffsetToPtr<J2DGXColorS10>(&param_0, (void*)param_0.field_0x44);
+    field_0x38 = JSUConvertOffsetToPtr<_GXColorS10>(&param_0, (void*)param_0.field_0x44);
     field_0x3c = JSUConvertOffsetToPtr<GXColor>(&param_0, (void*)param_0.field_0x48);
     field_0x40 = JSUConvertOffsetToPtr<u8>(&param_0, (void*)param_0.field_0x4c);
     field_0x44 = JSUConvertOffsetToPtr<J2DTevStageInfo>(&param_0, (void*)param_0.field_0x50);
diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
index 3260c48006e..42cfc489f7c 100644
--- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
@@ -310,8 +310,7 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
     field_0x34 = JSUConvertOffsetToPtr<J3DTexMtxInfo>(&i_block, i_block.field_0x44);
     mpTexNo = JSUConvertOffsetToPtr<u16>(&i_block, i_block.mpTexNo);
     mpTevOrderInfo = JSUConvertOffsetToPtr<J3DTevOrderInfo>(&i_block, i_block.mpTevOrderInfo);
-    // mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor);
-    mpTevColor = func_802F41E8(&i_block, i_block.mpTevColor);
+    mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor);
     mpTevKColor = JSUConvertOffsetToPtr<GXColor>(&i_block, i_block.mpTevKColor);
     mpTevStageNum = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpTevStageNum);
     mpTevStageInfo = JSUConvertOffsetToPtr<J3DTevStageInfo>(&i_block, i_block.mpTevStageInfo);
diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
index 12a70d343d8..527ea32ce0e 100644
--- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
@@ -100,8 +100,7 @@ J3DMaterialFactory_v21::J3DMaterialFactory_v21(J3DMaterialBlock_v21 const& i_blo
     field_0x28 = JSUConvertOffsetToPtr<J3DTexMtxInfo>(&i_block, i_block.field_0x38);
     mpTexNo = JSUConvertOffsetToPtr<u16>(&i_block, i_block.mpTexNo);
     mpTevOrderInfo = JSUConvertOffsetToPtr<J3DTevOrderInfo>(&i_block, i_block.mpTevOrderInfo);
-    // mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor);
-    mpTevColor = func_802F41E8(&i_block, i_block.mpTevColor);
+    mpTevColor = JSUConvertOffsetToPtr<GXColorS10>(&i_block, i_block.mpTevColor);
     mpTevKColor = JSUConvertOffsetToPtr<GXColor>(&i_block, i_block.mpTevKColor);
     mpTevStageNum = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpTevStageNum);
     mpTevStageInfo = JSUConvertOffsetToPtr<J3DTevStageInfo>(&i_block, i_block.mpTevStageInfo);
diff --git a/tools/lcf.py b/tools/lcf.py
index 90fd43e18ca..398524a0c72 100644
--- a/tools/lcf.py
+++ b/tools/lcf.py
@@ -155,7 +155,9 @@ func_802FC800
 func_802FAA5C
 func_802782D0
 func_80301994
-func_80282284"""
+func_80282284
+func_802F42C0
+func_802F4260"""
 
 def lcf_generate(output_path,shiftable,map_file):
     """Script for generating .lcf files"""