From 5020395dfd34d4dc846e3ea228f6271bfca1c72a Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Sun, 24 Oct 2021 14:35:00 -0700
Subject: J2D structs + print / fix GX + MSL string headers (#157)

* J2D structs + print / fix GX + MSL string headers

* remove msl_c/string.h
---
 include/JSystem/J3DGraphBase/J3DMatBlock.h | 2 +-
 include/JSystem/J3DGraphBase/J3DStruct.h   | 2 +-
 include/JSystem/J3DGraphBase/J3DSys.h      | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'include/JSystem/J3DGraphBase')

diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index c62fa07850..589571f3fb 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "dolphin/gx/GXTexture.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
 
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index a9ba9f82f4..ce4ab4b4e5 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -2,7 +2,7 @@
 #define J3DSTRUCT_H
 
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/gx/GXTexture.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 class J3DLightInfo {
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index b5b91f4136..75a181eab4 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -1,7 +1,7 @@
 #ifndef J3DSYS_H
 #define J3DSYS_H
 
-#include "dolphin/gx/GXTexture.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
 
@@ -11,8 +11,6 @@ enum J3DError {
     kJ3DError_Alloc = 4,
 };
 
-struct _GXTexCacheSize {};
-
 class J3DMtxCalc;
 class J3DModel;
 class J3DMatPacket;
-- 
cgit v1.2.3