Move extern forward decls from cpps to headers

22 files changed, 15 insertions, 73 deletions

diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
index 6d69352a..1bd00a12 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModel.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
@@ -594,8 +594,6 @@ void calcViewBaseMtx(MtxP viewMtx, const Vec& scale, const Mtx& baseMtx, MtxP ds
     MTXConcat(viewMtx, mtx, dstMtx);
 }
 
-extern void J3DPSMtxArrayConcat(Mtx, Mtx, Mtx, u32);
-
 /* 802EEBDC-802EEE30       .text calcDrawMtx__8J3DModelFv */
 void J3DModel::calcDrawMtx() {
     u16 i;
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();
diff --git a/src/JSystem/JRenderer/JRenderer.cpp b/src/JSystem/JRenderer/JRenderer.cpp
index ba9162f5..343632cb 100644
--- a/src/JSystem/JRenderer/JRenderer.cpp
+++ b/src/JSystem/JRenderer/JRenderer.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
+#include "JSystem/JRenderer/JRenderer.h"
 #include "dolphin/gx/GX.h"
 #include "JSystem/J3DGraphBase/J3DGD.h"
 
diff --git a/src/SSystem/SComponent/c_API.cpp b/src/SSystem/SComponent/c_API.cpp
index 2f8f5e8a..ea346096 100644
--- a/src/SSystem/SComponent/c_API.cpp
+++ b/src/SSystem/SComponent/c_API.cpp
@@ -1,15 +1,13 @@
 #include "SSystem/SComponent/c_API.h"
 #include "dolphin/types.h"
-
-extern u8 g_mDoGph_graphicInfo;
-extern bool mDoGph_Create();
-extern bool mDoGph_BeforeOfDraw();
-extern bool mDoGph_AfterOfDraw();
-extern bool mDoGph_Painter();
-extern bool mDoGph_BlankingON();
-extern bool mDoGph_BlankingOFF();
+#include "m_Do/m_Do_graphic.h"
 
 cAPIGph__Iface g_cAPI_Interface = {
-    &g_mDoGph_graphicInfo, mDoGph_Create,     mDoGph_BeforeOfDraw, mDoGph_AfterOfDraw,
-    mDoGph_Painter,        mDoGph_BlankingON, mDoGph_BlankingOFF,
+    /* mpGInfo        */ &g_mDoGph_graphicInfo,
+    /* mpCreate       */ (cAPIGph_Mthd)mDoGph_Create,
+    /* mpBeforeOfDraw */ (cAPIGph_Mthd)mDoGph_BeforeOfDraw,
+    /* mpAfterOfDraw  */ (cAPIGph_Mthd)mDoGph_AfterOfDraw,
+    /* mpPainter      */ (cAPIGph_Mthd)mDoGph_Painter,
+    /* mpBlankingOn   */ (cAPIGph_Mthd)mDoGph_BlankingON,
+    /* mpBlankingOff  */ (cAPIGph_Mthd)mDoGph_BlankingOFF,
 };
diff --git a/src/SSystem/SComponent/c_angle.cpp b/src/SSystem/SComponent/c_angle.cpp
index 0e7ebcb8..c320be5e 100644
--- a/src/SSystem/SComponent/c_angle.cpp
+++ b/src/SSystem/SComponent/c_angle.cpp
@@ -4,10 +4,9 @@
 //
 
 #include "SSystem/SComponent/c_angle.h"
+#include "SSystem/SComponent/c_math.h"
 #include "dolphin/types.h"
 
-extern f32 cM_atan2f(f32, f32);
-
 const cSAngle cSAngle::_0(static_cast<s16>(0));
 const cSAngle cSAngle::_1(static_cast<s16>(0xb6));
 const cSAngle cSAngle::_90(static_cast<s16>(0x4000));
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index f32963c8..c60173b2 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -5,6 +5,7 @@
 
 #include "d/dolzel.h" // IWYU pragma: keep
 #include "d/actor/d_a_agb.h"
+#include "d/d_msg.h"
 #include "d/res/res_agb.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
@@ -384,8 +385,6 @@ int daAgb_c::uploadPortCheckWait() {
     return 1;
 }
 
-extern JKRHeap* dMsg_getAgbWorkArea();
-
 /* 800CFB68-800CFC94       .text uploadSelect__7daAgb_cFv */
 int daAgb_c::uploadSelect() {
     if (l_msgCtrl.execute() == fopMsgStts_MSG_DISPLAYED_e) {
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
index bb7917e3..28d56836 100644
--- a/src/d/actor/d_a_auction.cpp
+++ b/src/d/actor/d_a_auction.cpp
@@ -13,6 +13,7 @@
 #include "d/d_priority.h"
 #include "d/res/res_pspl.h"
 #include "m_Do/m_Do_controller_pad.h"
+#include "d/d_auction_screen.h"
 
 struct NpcDatStruct {
     /* 0x00 */ f32 field_0x00;
@@ -187,17 +188,6 @@ static daAuction_c::ProcFunc_t moveProc[] = {
     &daAuction_c::executeStart,
 };
 
-extern void dAuction_screen_delete();
-extern void dAuction_screen_slotShow();
-extern void dAuction_screen_slotHide();
-extern void dAuction_screen_gaugeHide();
-extern void dAuction_screen_gaugeShow();
-extern void dAuction_screen_gaugeUp();
-extern void dAuction_screen_gaugeDown();
-extern void dAuction_screen_talkStart();
-extern void dAuction_screen_talkEnd();
-extern fpc_ProcID dAuction_screen_create();
-
 /* 000000EC-000002FC       .text __ct__11daAuction_cFv */
 daAuction_c::daAuction_c() {
     for (int i = 0; i < 8; i++) {
diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp
index d7579039..680dc106 100644
--- a/src/d/actor/d_a_npc_hi1.cpp
+++ b/src/d/actor/d_a_npc_hi1.cpp
@@ -9,8 +9,6 @@
 #include "d/d_priority.h"
 #include "d/res/res_hi.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 class daNpc_Hi1_HIO_c : public mDoHIO_entry_c{
 public:
     struct hio_prm_c {
diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp
index 2d9d13f1..25881442 100644
--- a/src/d/actor/d_a_npc_km1.cpp
+++ b/src/d/actor/d_a_npc_km1.cpp
@@ -92,8 +92,6 @@ static BOOL nodeCallBack_Km(J3DNode* i_node, int i_calcTiming) {
     return TRUE;
  }
 
-
-extern dCcD_SrcCyl dNpc_cyl_src;
 /* 0000032C-0000043C       .text createInit__11daNpc_Km1_cFv */
 bool daNpc_Km1_c::createInit() {
     mEventCut.setActorInfo2("Km1", this);
diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp
index e8248827..c32a010b 100644
--- a/src/d/actor/d_a_npc_ls1.cpp
+++ b/src/d/actor/d_a_npc_ls1.cpp
@@ -282,7 +282,6 @@ bool daNpc_Ls1_c::init_LS1_4() {
     return init_LS1_1();
 }
 
-extern dCcD_SrcCyl dNpc_cyl_src;
 /* 00000A60-00000C6C       .text createInit__11daNpc_Ls1_cFv */
 bool daNpc_Ls1_c::createInit() {
     for (int i = 0; i < ARRAY_SSIZE(mEventIDTbl); i++) {
diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index cb9880a2..69a7a1df 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -20,8 +20,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 static char* l_npc_staff_id[] = {
     "Uo1",
     "Uo2",
diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp
index b2bced6d..c9e2452d 100644
--- a/src/d/actor/d_a_npc_photo.cpp
+++ b/src/d/actor/d_a_npc_photo.cpp
@@ -19,11 +19,8 @@
 #include "d/d_picture_box.h"
 #include "d/actor/d_a_tag_photo.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 const char daNpcPhoto_c::m_arcname[] = "Auc";
 
-
 static const char* l_arcname_tbl[] = {
     "Po"
 };
diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp
index 117d8894..e27f63e6 100644
--- a/src/d/actor/d_a_npc_roten.cpp
+++ b/src/d/actor/d_a_npc_roten.cpp
@@ -16,8 +16,6 @@
 #include "d/d_a_obj.h"
 #include "d/d_snap.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 static const char* l_arcname_tbl[] = {
     "Ro",
     "Ro",
diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp
index e25e8a17..8d7be605 100644
--- a/src/d/actor/d_a_npc_rsh1.cpp
+++ b/src/d/actor/d_a_npc_rsh1.cpp
@@ -1015,7 +1015,6 @@ static BOOL daNpc_Rsh1_checkRotenItemGet(int i_itemNo) {
     return roten_item_get_check;
 }
 
-extern Vec Item_set_pos_data_rshop_0[];
 /* 000023A8-00002568       .text createShopList__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::createShopList() {
     csXyz temp(0, home.angle.y, 0);
diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp
index cff7802b..a1e5cf26 100644
--- a/src/d/actor/d_a_npc_tc.cpp
+++ b/src/d/actor/d_a_npc_tc.cpp
@@ -978,7 +978,6 @@ void daNpc_Tc_c::getArg() {
     mType = TYPE_NORMAL;
 }
 
-extern dCcD_SrcCyl dNpc_cyl_src;
 /* 00001C98-0000202C       .text createInit__10daNpc_Tc_cFv */
 void daNpc_Tc_c::createInit() {
 #if VERSION > VERSION_DEMO
diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp
index 8a88563a..7a01db94 100644
--- a/src/d/actor/d_a_npc_zl1.cpp
+++ b/src/d/actor/d_a_npc_zl1.cpp
@@ -17,9 +17,6 @@
 #include "d/res/res_zl.h"
 #include "d/d_snap.h"
 
-
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 class daNpc_Zl1_HIO_c : public mDoHIO_entry_c{
 public:
 struct hio_prm_c {
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 27ab5b3c..25b18f3c 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -36,8 +36,6 @@ public:
     /* 0x16 */ s16 field_0x16;
 };
 
-extern dScnPly_reg_HIO_c g_regHIO;
-
 const char daObjTpost_c::m_arc_name[] = "Toripost";
 
 const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index 9d6319a6..874c661c 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -66,8 +66,6 @@ s8 pos_around[8][2] = {
     {-1,  1},  {-1,  0},
 };
 
-extern void dKy_usonami_set(f32 param_0);
-
 /* 8015B0A4-8015B0FC       .text Pos2Index__25daSea_WaterHeightInfo_MngFfPf */
 int daSea_WaterHeightInfo_Mng::Pos2Index(f32 v, f32* dst) {
     f32 f = 450000.0f;
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index 036af422..6fbbb92a 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -5,6 +5,7 @@
 
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_tbox.h"
+#include "d/d_npc.h"
 #include "d/res/res_dalways.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_s_acch.h"
@@ -31,8 +32,6 @@
 #define FUNC_TYPE_EXTRA_SAVE_INFO 7
 #define FUNC_TYPE_EXTRA_SAVE_INFO_SPAWN 8
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 static daTbox_HIO_c l_HIO;
 
 static daTbox_c::modelInfo l_modelInfo[] = {