Move extern forward decls from cpps to headers

4 files changed, 2 insertions, 23 deletions

diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index dd7ce2b9..5aca93a2 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -16,13 +16,6 @@
 #include "dolphin/types.h"
 #include "string.h"
 
-extern bool isTexNoReg(void*);
-extern u16 getTexNoReg(void*);
-extern void loadTexNo(u32, const u16 &);
-
-extern void J3DGDSetTevColorS10(GXTevRegID, GXColorS10);
-extern void J3DGDSetTevKColor(GXTevKColorID, GXColor);
-
 int SizeOfLoadMatColors = 13;
 int SizeOfLoadAmbColors = 13;
 int SizeOfLoadColorChans = 21;
@@ -1347,8 +1340,6 @@ void J3DTevBlock16::diffTexCoordScale() {
     }
 }
 
-extern void patchTexNo_PtrToIdx(u32 texID, const u16& idx);
-
 /* 802E603C-802E6120       .text ptrToIndex__13J3DTevBlock16Fv */
 void J3DTevBlock16::ptrToIndex() {
     GDSetCurrOffset(mTexNoOffset);
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index e21ba6ef..3f369181 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -9,14 +9,11 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
+#include "JSystem/J3DGraphBase/J3DGD.h"
 #include "dolphin/gd/GDBase.h"
 #include "dolphin/gd/GDGeometry.h"
 #include "dolphin/types.h"
 
-extern void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList *, bool);
-extern void J3DFifoLoadPosMtxImm(Mtx, u32);
-extern void J3DFifoLoadNrmMtxImm(Mtx, u32);
-
 /* 802DD18C-802DD1FC       .text initialize__8J3DShapeFv */
 void J3DShape::initialize() {
     mMaterial = NULL;
diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
index 8d034a89..c2b56977 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
@@ -14,10 +14,6 @@
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 
-extern void J3DFifoLoadNrmMtxImm(Mtx, u32);
-extern void J3DFifoLoadNrmMtxImm3x3(Mtx33, u32);
-extern void J3DFifoLoadPosMtxImm(Mtx, u32);
-
 u32 J3DShapeMtx::sCurrentPipeline;
 
 /* 802DB9D8-802DBA1C       .text loadMtxIndx_PNGP__11J3DShapeMtxCFiUs */
diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp
index ac015403..e76222db 100644
--- a/src/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/src/JSystem/J3DGraphBase/J3DSys.cpp
@@ -8,15 +8,10 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DGD.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
+#include "JSystem/JRenderer/JRenderer.h"
 #include "dolphin/os/OS.h"
 #include "global.h"
 
-extern void JRNLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize);
-extern void makeTexCoordTable();
-extern void makeAlphaCmpTable();
-extern void makeZModeTable();
-extern void makeTevSwapTable();
-
 /* 802D8AA8-802D8B8C       .text __ct__6J3DSysFv */
 J3DSys::J3DSys() {
     makeTexCoordTable();