Move extern forward decls from cpps to headers

include/JSystem/J3DGraphBase/J3DGD.h

@@ -77,6 +77,7 @@ void J3DGDSetTevKColor(GXTevKColorID, GXColor);
 void J3DGDSetTevColorS10(GXTevRegID, GXColorS10);
 void J3DGDSetFog(GXFogType, f32, f32, f32, f32, GXColor);
 void J3DGDSetFogRangeAdj(u8, u16, GXFogAdjTable*);
+void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList*, bool);
 
 static inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) {
     GXFIFO.u8 = cmd;

include/JSystem/J3DGraphBase/J3DSys.h

@@ -163,4 +163,8 @@ public:
 extern u32 j3dDefaultViewNo;
 extern J3DSys j3dSys;
 
+void J3DFifoLoadNrmMtxImm(Mtx, u32);
+void J3DFifoLoadNrmMtxImm3x3(Mtx33, u32);
+void J3DFifoLoadPosMtxImm(Mtx, u32);
+
 #endif /* J3DSYS_H */

include/JSystem/J3DGraphBase/J3DTevs.h

@@ -207,5 +207,13 @@ struct J3DNBTScale : public J3DNBTScaleInfo {
 struct J3DTexCoord;
 void loadTexCoordGens(u32, J3DTexCoord*);
 void loadNBTScale(J3DNBTScale& param_0);
+bool isTexNoReg(void*);
+u16 getTexNoReg(void*);
+void loadTexNo(u32, const u16&);
+void makeTexCoordTable();
+void makeAlphaCmpTable();
+void makeZModeTable();
+void makeTevSwapTable();
+void patchTexNo_PtrToIdx(u32 texID, const u16& idx);
 
 #endif /* J3DTEVS_H */

include/JSystem/J3DGraphBase/J3DTransform.h

@@ -40,6 +40,7 @@ void J3DScaleNrmMtx33(Mtx33, const Vec&);
 void J3DMtxProjConcat(Mtx, Mtx, Mtx);
 void J3DPSMtx33Copy(Mtx3P src, Mtx3P dst);
 void J3DPSMtx33CopyFrom34(MtxP src, Mtx3P dst);
+void J3DPSMtxArrayConcat(Mtx, Mtx, Mtx, u32);
 
 inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* dst) {
 #ifdef __MWERKS__

include/JSystem/JRenderer/JRenderer.h

@@ -0,0 +1,8 @@
+#ifndef JRENDERER_H
+#define JRENDERER_H
+
+#include "dolphin/gx/GX.h"
+
+void JRNLoadTexCached(GXTexMapID id, u32 addr_even, GXTexCacheSize size_even, u32 addr_odd, GXTexCacheSize size_odd);
+
+#endif /* JRENDERER_H */

include/SSystem/SComponent/c_API.h

@@ -3,11 +3,10 @@
 
 #include "dolphin/types.h"
 
-typedef bool (*cAPIGph_Mthd)(void);
+typedef void (*cAPIGph_Mthd)(void);
 
-struct cAPIGph__Iface
-{
-    u8 * mpGInfo;
+struct cAPIGph__Iface {
+    void* mpGInfo;
     cAPIGph_Mthd mpCreate;
     cAPIGph_Mthd mpBeforeOfDraw;
     cAPIGph_Mthd mpAfterOfDraw;

include/d/d_auction_screen.h

@@ -2,6 +2,7 @@
 #define D_AUCTION_SCREEN_H
 
 #include "dolphin/types.h"
+#include "f_pc/f_pc_base.h"
 
 struct fopMsgM_pane_class;
 class J2DPane;
@@ -45,4 +46,15 @@ public:
     dAs_HIO_c();
 };
 
+void dAuction_screen_delete();
+void dAuction_screen_slotShow();
+void dAuction_screen_slotHide();
+void dAuction_screen_gaugeHide();
+void dAuction_screen_gaugeShow();
+void dAuction_screen_gaugeUp();
+void dAuction_screen_gaugeDown();
+void dAuction_screen_talkStart();
+void dAuction_screen_talkEnd();
+fpc_ProcID dAuction_screen_create();
+
 #endif /* D_AUCTION_SCREEN_H */

include/d/d_kankyo.h

@@ -466,5 +466,6 @@ BOOL dKy_daynighttact_stop_chk();
 void dKy_contrast_flg_set(u8);
 u8 dKy_contrast_flg_get();
 BOOL dKyr_player_overhead_bg_chk();
+void dKy_usonami_set(f32 param_0);
 
 #endif /* D_KANKYO_D_KANKYO_H */

include/d/d_msg.h

@@ -91,6 +91,6 @@ public:
     void* field_0x8;
 };
 
-extern JKRHeap* dMsg_getAgbWorkArea();
+JKRHeap* dMsg_getAgbWorkArea();
 
 #endif /* D_MSG_H */

include/d/d_npc.h

@@ -299,4 +299,6 @@ bool dNpc_chkLetterPassed();
 bool dNpc_setAnm_2(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileIdx, int soundFileIdx, const char* arcName);
 bool dNpc_chkAttn(fopAc_ac_c* i_this, cXyz destPos, f32 param_3, f32 param_4, f32 param_5, bool param_6);
 
+extern dCcD_SrcCyl dNpc_cyl_src;
+
 #endif /* D_NPC_H */

include/d/d_shop.h

@@ -269,5 +269,14 @@ extern __shop_items_set_data* Item_set_data_bshop_5[];
 extern __shop_items_set_data* Item_set_data_bshop_6[];
 extern __shop_items_set_data** Item_set_data_tbl[];
 extern Vec* Item_set_pos_data_tbl[];
+extern Vec Item_set_pos_data_dshop[];
+extern Vec Item_set_pos_data_bmshop1[];
+extern Vec Item_set_pos_data_bmshop2[];
+extern Vec Item_set_pos_data_bshop_3[];
+extern Vec Item_set_pos_data_bshop_4[];
+extern Vec Item_set_pos_data_bshop_5[];
+extern Vec Item_set_pos_data_bshop_6[];
+extern Vec Item_set_pos_data_bshop_7[];
+extern Vec Item_set_pos_data_rshop_0[];
 
 #endif /* D_SHOP_H */

include/dolphin/gx/GX.h

@@ -4,17 +4,19 @@
 #include "dolphin/gx/GXAttr.h" // IWYU pragma: export
 #include "dolphin/gx/GXBump.h" // IWYU pragma: export
 #include "dolphin/gx/GXDisplayList.h" // IWYU pragma: export
+#include "dolphin/gx/GXEnum.h" // IWYU pragma: export
 #include "dolphin/gx/GXFifo.h" // IWYU pragma: export
 #include "dolphin/gx/GXFrameBuf.h" // IWYU pragma: export
 #include "dolphin/gx/GXGeometry.h" // IWYU pragma: export
+#include "dolphin/gx/GXInit.h" // IWYU pragma: export
 #include "dolphin/gx/GXLight.h" // IWYU pragma: export
 #include "dolphin/gx/GXMisc.h" // IWYU pragma: export
 #include "dolphin/gx/GXPerf.h" // IWYU pragma: export
 #include "dolphin/gx/GXPixel.h" // IWYU pragma: export
+#include "dolphin/gx/GXStruct.h" // IWYU pragma: export
 #include "dolphin/gx/GXTev.h" // IWYU pragma: export
 #include "dolphin/gx/GXTexture.h" // IWYU pragma: export
 #include "dolphin/gx/GXTransform.h" // IWYU pragma: export
-#include "dolphin/gx/GXStruct.h" // IWYU pragma: export
 
 #include "dolphin/os/OSUtil.h"
 

include/m_Do/m_Do_graphic.h

@@ -5,6 +5,11 @@
 #include "dolphin/mtx/mtx.h"
 
 bool mDoGph_Create();
+bool mDoGph_BeforeOfDraw();
+bool mDoGph_AfterOfDraw();
+bool mDoGph_Painter();
+void mDoGph_BlankingON();
+void mDoGph_BlankingOFF();
 
 struct ResTIMG;