J2D structs + print / fix GX + MSL string headers (#157)

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

* remove msl_c/string.h

12 files changed, 1 insertions, 79 deletions

diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index 8eaab84536..296f216b53 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -3583,17 +3583,8 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
 extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag();
 extern "C" void JMAEulerToQuat__FsssP10Quaternion();
 extern "C" void GXClearVtxDesc();
-extern "C" void GXSetTexCoordGen2();
-extern "C" void GXSetCullMode();
-extern "C" void GXLoadLightObjImm();
 extern "C" void GXSetChanAmbColor();
-extern "C" void GXSetChanMatColor();
-extern "C" void GXSetNumIndStages();
-extern "C" void GXSetAlphaCompare();
-extern "C" void GXSetZMode();
-extern "C" void GXLoadPosMtxImm();
 extern "C" void GXLoadNrmMtxImm();
-extern "C" void GXSetCurrentMtx();
 extern "C" void __register_global_object();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp
index 2291f5c8cb..9249f54536 100644
--- a/src/d/a/d_a_player.cpp
+++ b/src/d/a/d_a_player.cpp
@@ -133,9 +133,6 @@ extern "C" void __ct__19J3DAnmTextureSRTKeyFv();
 extern "C" void __ct__16J3DAnmTexPatternFv();
 extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag();
 extern "C" void GXClearVtxDesc();
-extern "C" void GXSetNumIndStages();
-extern "C" void GXLoadPosMtxImm();
-extern "C" void GXSetCurrentMtx();
 extern "C" void _savegpr_27();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_27();
diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp
index 612735aeda..9f39275a30 100644
--- a/src/d/com/d_com_inf_game.cpp
+++ b/src/d/com/d_com_inf_game.cpp
@@ -9,7 +9,6 @@
 #include "d/meter/d_meter2_info.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "msl_c/string.h"
 
 //
 // Types:
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index b43b94e396..65b36253a7 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -259,37 +259,15 @@ extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs();
 extern "C" void draw__13J3DDrawBufferCFv();
 extern "C" void GXClearVtxDesc();
 extern "C" void GXSetArray();
-extern "C" void GXSetTexCoordGen2();
 extern "C" void GXPixModeSync();
 extern "C" void GXPeekZ();
-extern "C" void GXSetLineWidth();
 extern "C" void GXSetPointSize();
-extern "C" void GXSetCullMode();
-extern "C" void GXSetTexCopySrc();
-extern "C" void GXSetTexCopyDst();
-extern "C" void GXCopyTex();
-extern "C" void GXSetChanMatColor();
 extern "C" void GXGetTexObjWidth();
 extern "C" void GXGetTexObjHeight();
 extern "C" void GXGetTexObjWrapS();
 extern "C" void GXGetTexObjWrapT();
 extern "C" void GXGetTexObjTlut();
-extern "C" void GXSetNumIndStages();
-extern "C" void GXSetTevSwapModeTable();
-extern "C" void GXSetAlphaCompare();
-extern "C" void GXSetFog();
 extern "C" void GXSetColorUpdate();
-extern "C" void GXSetAlphaUpdate();
-extern "C" void GXSetZMode();
-extern "C" void GXSetZCompLoc();
-extern "C" void GXSetDither();
-extern "C" void GXSetProjection();
-extern "C" void GXLoadPosMtxImm();
-extern "C" void GXSetCurrentMtx();
-extern "C" void GXLoadTexMtxImm();
-extern "C" void GXSetViewport();
-extern "C" void GXSetScissor();
-extern "C" void GXSetClipMode();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
 extern "C" void _savefpr_26();
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index 4bd32ed79e..358a33acbc 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -39,8 +39,6 @@ struct dBgS_CamGndChk_Wtr {
 
 struct color_RGB_class {};
 
-struct _GXFogType {};
-
 struct Z2SeMgr {
     /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
 };
@@ -349,15 +347,7 @@ extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f();
 extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void GXInitLightAttn();
-extern "C" void GXInitLightSpot();
-extern "C" void GXInitLightDistAttn();
-extern "C" void GXInitLightPos();
-extern "C" void GXInitLightDir();
-extern "C" void GXInitLightColor();
-extern "C" void GXLoadLightObjImm();
 extern "C" void GXSetChanAmbColor();
-extern "C" void GXSetFog();
-extern "C" void GXSetFogRangeAdj();
 extern "C" void __register_global_object();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp
index 3a090963b0..ea1be62740 100644
--- a/src/d/menu/d_menu_window.cpp
+++ b/src/d/menu/d_menu_window.cpp
@@ -375,20 +375,7 @@ extern "C" void getTotalFreeSize__7JKRHeapFv();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void GXClearVtxDesc();
-extern "C" void GXSetTexCoordGen2();
 extern "C" void GXPixModeSync();
-extern "C" void GXSetCullMode();
-extern "C" void GXSetTexCopySrc();
-extern "C" void GXSetTexCopyDst();
-extern "C" void GXCopyTex();
-extern "C" void GXSetAlphaCompare();
-extern "C" void GXSetFog();
-extern "C" void GXSetFogRangeAdj();
-extern "C" void GXSetZMode();
-extern "C" void GXSetZCompLoc();
-extern "C" void GXSetDither();
-extern "C" void GXLoadPosMtxImm();
-extern "C" void GXSetCurrentMtx();
 extern "C" void __ptmf_scall();
 extern "C" void _savegpr_28();
 extern "C" void _savegpr_29();
diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp
index 27165ba702..3b89e0070a 100644
--- a/src/d/meter/d_meter2_info.cpp
+++ b/src/d/meter/d_meter2_info.cpp
@@ -8,7 +8,6 @@
 #include "d/save/d_save.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "msl_c/string.h"
 
 //
 // Forward References:
diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp
index a8c0ab5c2f..a963fd0cb8 100644
--- a/src/d/particle/d_particle.cpp
+++ b/src/d/particle/d_particle.cpp
@@ -562,23 +562,11 @@ extern "C" void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
 extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
 extern "C" void GXClearVtxDesc();
 extern "C" void GXInvalidateVtxCache();
-extern "C" void GXSetTexCoordGen2();
 extern "C" void GXFlush();
 extern "C" void GXEnableTexOffsets();
-extern "C" void GXSetCullMode();
-extern "C" void GXSetCoPlanar();
 extern "C" void GXSetChanAmbColor();
-extern "C" void GXSetChanMatColor();
-extern "C" void GXSetNumIndStages();
-extern "C" void GXSetAlphaCompare();
 extern "C" void GXSetColorUpdate();
-extern "C" void GXSetAlphaUpdate();
-extern "C" void GXSetZMode();
-extern "C" void GXSetZCompLoc();
-extern "C" void GXLoadPosMtxImm();
 extern "C" void GXLoadNrmMtxImm();
-extern "C" void GXSetCurrentMtx();
-extern "C" void GXSetClipMode();
 extern "C" void __register_global_object();
 extern "C" void __destroy_new_array();
 extern "C" void __construct_array();
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 8be4c29c98..adcfc1be3a 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -20,7 +20,6 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_lib.h"
 #include "msl_c/math.h"
-#include "msl_c/string.h"
 
 //
 // Types:
diff --git a/src/init.cpp b/src/init.cpp
index 6a5b0d1a27..f787ad2eea 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -33,7 +33,6 @@ SECTION_INIT void __init_registers();
 SECTION_INIT void __init_data();
 SECTION_INIT void __init_hardware();
 SECTION_INIT void __flush_cache();
-SECTION_INIT void memset();
 SECTION_INIT void __fill_mem();
 SECTION_INIT void TRK_memset();
 SECTION_INIT void TRK_memcpy();
@@ -147,7 +146,7 @@ SECTION_INIT asm void __flush_cache() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-SECTION_INIT asm void memset() {
+SECTION_INIT asm void* memset(void*, int, u32) {
     nofralloc
 #include "asm/init/memset.s"
 }
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index c11c6f628a..7e84af6951 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -163,8 +163,6 @@ struct dDlst_list_c {
     /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
 };
 
-struct _GXCompare {};
-
 struct JAISoundID {};
 
 struct Z2SoundHandlePool {};
@@ -563,8 +561,6 @@ extern "C" void GXSetArray();
 extern "C" void GXGetTexObjWidth();
 extern "C" void GXGetTexObjHeight();
 extern "C" void GXSetTexCoordScaleManually();
-extern "C" void GXSetNumIndStages();
-extern "C" void GXLoadPosMtxImm();
 extern "C" void GXLoadNrmMtxImm();
 extern "C" void __construct_new_array();
 extern "C" void _savegpr_15();
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 54bdb15d62..c3286e0f64 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -17,7 +17,6 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_graphic.h"
-#include "msl_c/string.h"
 
 //
 // Types: