Merge remote-tracking branch 'upstream/master' into work7

18 files changed, 19 insertions, 11 deletions

diff --git a/src/__start.c b/src/__start.c
index a022ef7430..5bc6f38431 100644
--- a/src/__start.c
+++ b/src/__start.c
@@ -1,3 +1,4 @@
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "init.h"
@@ -20,7 +21,6 @@ void OSInit();
 void OSResetSystem(s32, s32, s32);
 void __init_user();
 void DBInit();
-void exit();
 void InitMetroTRK();
 void InitMetroTRK_BBA();
 extern u8 data_804516D0;
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index ecc51364b2..fcf5b640c3 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -6,7 +6,7 @@
 #include "DynamicLink.h"
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dol2asm.h"
diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp
index ba658e20b2..73abec2c13 100644
--- a/src/d/d_eye_hl.cpp
+++ b/src/d/d_eye_hl.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "d/d_eye_hl.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "dolphin/os/OS.h"
 #include "dol2asm.h"
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 59e5e98dcd..cc186865e5 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -12,8 +12,8 @@
 #include "JSystem/J3DGraphLoader/J3DClusterLoader.h"
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "MSL_C/MSL_Common/Src/extras.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/mtx/mtx.h"
@@ -149,7 +149,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void memcmp();
 extern "C" extern void* __vt__14J3DMaterialAnm[4];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index 111de41c9d..7237f3678c 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/kankyo/d_kankyo.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/string.h"
 #include "SSystem/SComponent/c_counter.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/com/d_com_inf_game.h"
diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp
index b803a409a9..8630e948e1 100644
--- a/src/d/kankyo/d_kankyo_rain.cpp
+++ b/src/d/kankyo/d_kankyo_rain.cpp
@@ -5,6 +5,7 @@
 
 #include "d/kankyo/d_kankyo_rain.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_demo.h"
 #include "dol2asm.h"
@@ -169,7 +170,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void memcmp();
 extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */];
 extern "C" extern void* __vt__19dKankyo_star_Packet[5];
 extern "C" extern void* __vt__19dKankyo_snow_Packet[5];
diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp
index 19d038f3c2..0839605f1a 100644
--- a/src/d/kankyo/d_kankyo_wether.cpp
+++ b/src/d/kankyo/d_kankyo_wether.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/kankyo/d_kankyo_wether.h"
+#include "MSL_C/string.h"
 #include "Z2AudioLib/Z2EnvSeMgr.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/kankyo/d_kankyo.h"
@@ -210,7 +211,6 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void memcmp();
 extern "C" extern void* __vt__9J3DPacket[5];
 extern "C" extern dScnKy_env_light_c g_env_light;
 extern "C" extern Z2EnvSeMgr g_mEnvSeMgr;
diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp
index a8fc4babdc..a37283bc79 100644
--- a/src/d/menu/d_menu_collect.cpp
+++ b/src/d/menu/d_menu_collect.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_collect.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp
index bd0fb53db6..450dbd1ff6 100644
--- a/src/d/menu/d_menu_dmap.cpp
+++ b/src/d/menu/d_menu_dmap.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_dmap.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp
index 86a506e0bb..87bd3ccac6 100644
--- a/src/d/menu/d_menu_fmap.cpp
+++ b/src/d/menu/d_menu_fmap.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_fmap.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp
index d2eae18a4a..f54dbafc1f 100644
--- a/src/d/menu/d_menu_insect.cpp
+++ b/src/d/menu/d_menu_insect.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_insect.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp
index eb1c4af279..56c6f57215 100644
--- a/src/d/menu/d_menu_letter.cpp
+++ b/src/d/menu/d_menu_letter.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_letter.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp
index 4aaf5028dc..97bd179e30 100644
--- a/src/d/menu/d_menu_option.cpp
+++ b/src/d/menu/d_menu_option.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_option.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp
index fdab7a3d83..e31c1a152f 100644
--- a/src/d/menu/d_menu_ring.cpp
+++ b/src/d/menu/d_menu_ring.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_ring.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp
index 4eb93188d5..9ba5bb7c10 100644
--- a/src/d/menu/d_menu_skill.cpp
+++ b/src/d/menu/d_menu_skill.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_skill.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp
index a0c978719b..5ea2c86a5a 100644
--- a/src/d/s/d_s_room.cpp
+++ b/src/d/s/d_s_room.cpp
@@ -5,6 +5,7 @@
 
 #include "d/s/d_s_room.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/string.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/s/d_s_play.h"
@@ -104,7 +105,6 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void strnicmp();
 // extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */];
 // extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */];
 extern "C" u8 mStatus__20dStage_roomControl_c[65792];
diff --git a/src/init.c b/src/init.c
index f7e09b8a94..5faa950a12 100644
--- a/src/init.c
+++ b/src/init.c
@@ -4,6 +4,8 @@
 //
 
 #include "init.h"
+#include "MSL_C/stdlib.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -39,7 +41,6 @@ void __OSCacheInit();
 void OSResetSystem(s32, s32, s32);
 void __init_user();
 void DBInit();
-void exit();
 void TRK_fill_mem(void* dst, int val, size_t n);
 void InitMetroTRK();
 void InitMetroTRK_BBA();
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index aaa62569b5..5f39fed768 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -6,7 +6,7 @@
 #include "m_Do/m_Do_MemCard.h"
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JGadget/binary.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_ext.h"