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

35 files changed, 231 insertions, 101 deletions

diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp
index bf7f07717a..60318ed15c 100644
--- a/libs/JSystem/J2DGraph/J2DManage.cpp
+++ b/libs/JSystem/J2DGraph/J2DManage.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/J2DGraph/J2DManage.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp
index 6dcde38036..dea6720967 100644
--- a/libs/JSystem/J2DGraph/J2DPrint.cpp
+++ b/libs/JSystem/J2DGraph/J2DPrint.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J2DGraph/J2DPrint.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -49,8 +50,6 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void strtol();
-extern "C" void strtoul();
 extern "C" u8 sSystemHeap__7JKRHeap[4];
 
 //
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp
index edc385fbd1..10fdc19796 100644
--- a/libs/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp
@@ -5,7 +5,7 @@
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/J2DGraph/J2DPrint.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
index 06d359ec41..d9a14fcc3b 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
@@ -270,6 +270,77 @@ asm int J3DFrameCtrl::checkPass(f32 pass_frame) {
 #endif
 
 /* 803289CC-80328E40 32330C 0474+00 0/0 3/3 0/0 .text            update__12J3DFrameCtrlFv */
+// matches with literals
+#ifdef NONMATCHING
+void J3DFrameCtrl::update() {
+    mState = 0;
+    mFrame += mRate;
+    switch (mAttribute) {
+    case 0:
+        if (mFrame < mStart) {
+            mFrame = mStart;
+            mRate = 0.0f;
+            mState |= 1;
+        }
+        if (mFrame >= mEnd) {
+            mFrame = mEnd - 0.001f;
+            mRate = 0.0f;
+            mState |= 1;
+        }
+        break;
+    case 1:
+        if (mFrame < mStart) {
+            mFrame = mStart;
+            mRate = 0.0f;
+            mState |= 1;
+        }
+        if (mFrame >= mEnd) {
+            mFrame = mStart;
+            mRate = 0.0f;
+            mState |= 1;
+        }
+        break;
+    case 2:
+        while (mFrame < mStart) {
+            mState |= 2;
+            if (mLoop - mStart <= 0.0f) {
+                break;
+            }
+            mFrame += mLoop - mStart;
+        }
+        while (mFrame >= mEnd) {
+            mState |= 2;
+            if (mEnd - mLoop <= 0.0f) {
+                break;
+            }
+            mFrame -= mEnd - mLoop;
+        }
+        break;
+    case 3:
+        if (mFrame >= mEnd) {
+            mFrame = mEnd - (mFrame - mEnd);
+            mRate = -mRate;
+        }
+        if (mFrame < mStart) {
+            mFrame = mStart - (mFrame - mStart);
+            mRate = 0.0f;
+            mState |= 1;
+        }
+        break;
+    case 4:
+        if (mFrame >= mEnd - 1.0f) {
+            mFrame = (mEnd - 1.0f) - (mFrame - (mEnd - 1.0f));
+            mRate = -mRate;
+        }
+        if (mFrame < mStart) {
+            mFrame = mStart - (mFrame - mStart);
+            mRate = -mRate;
+            mState |= 2;
+        }
+        break;
+    }
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -278,6 +349,7 @@ asm void J3DFrameCtrl::update() {
 #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/update__12J3DFrameCtrlFv.s"
 }
 #pragma pop
+#endif
 
 /* 80328E40-80328E90 323780 0050+00 0/0 3/3 0/0 .text            __ct__15J3DAnmTransformFsPfPsPf */
 // matches with literals
@@ -456,6 +528,29 @@ SECTION_DATA extern void* __vt__19J3DAnmTextureSRTKey[4] = {
 };
 
 /* 80329E5C-80329F14 32479C 00B8+00 0/0 2/2 0/0 .text            __ct__19J3DAnmTextureSRTKeyFv */
+// matches with literals
+#ifdef NONMATCHING
+J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() : J3DAnmBase(0) {
+    field_0xc = 0;
+    field_0x1a = 0;
+    field_0x18 = 0;
+    field_0x16 = 0;
+    field_0x14 = 0;
+    field_0x10 = 0;
+    field_0x24 = 0;
+    field_0x1c = 0;
+    field_0x20 = 0;
+    field_0x48 = 0;
+    field_0x46 = 0;
+    field_0x44 = 0;
+    field_0x4a = 0;
+    field_0x58 = 0;
+    field_0x54 = 0;
+    field_0x4c = 0;
+    field_0x50 = 0;
+    mTexMtxCalcType = 0;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -464,6 +559,7 @@ asm J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() {
 #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__19J3DAnmTextureSRTKeyFv.s"
 }
 #pragma pop
+#endif
 
 /* 80329F14-8032A184 324854 0270+00 0/0 1/1 0/0 .text
  * calcTransform__19J3DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo */
@@ -500,6 +596,17 @@ asm f32 J3DAnmClusterKey::getWeight(u16 param_0) const {
 #pragma pop
 
 /* 8032A29C-8032A30C 324BDC 0070+00 2/2 0/0 0/0 .text            __ct__14J3DAnmVtxColorFv */
+// matches with literals
+#ifdef NONMATCHING
+J3DAnmVtxColor::J3DAnmVtxColor() : J3DAnmBase(0) {
+    for (int i = 0; i < 2; i++) {
+        mAnmTableNum[i] = 0;
+    }
+    for (int i = 0; i < 2; i++) {
+        mAnmVtxColorIndexData[i] = 0;
+    }
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -508,16 +615,14 @@ asm J3DAnmVtxColor::J3DAnmVtxColor() {
 #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__14J3DAnmVtxColorFv.s"
 }
 #pragma pop
+#endif
 
 /* 8032A30C-8032A368 324C4C 005C+00 0/0 1/1 0/0 .text            __ct__18J3DAnmVtxColorFullFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm J3DAnmVtxColorFull::J3DAnmVtxColorFull() {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__18J3DAnmVtxColorFullFv.s"
+J3DAnmVtxColorFull::J3DAnmVtxColorFull() {
+    for (int i = 0; i < 2; i++) {
+        field_0x18[i] = 0;
+    }
 }
-#pragma pop
 
 /* 8032A368-8032A4E0 324CA8 0178+00 1/0 0/0 0/0 .text
  * getColor__18J3DAnmVtxColorFullCFUcUsP8_GXColor               */
@@ -531,14 +636,11 @@ asm void J3DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* param_2
 #pragma pop
 
 /* 8032A4E0-8032A53C 324E20 005C+00 0/0 1/1 0/0 .text            __ct__17J3DAnmVtxColorKeyFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm J3DAnmVtxColorKey::J3DAnmVtxColorKey() {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__17J3DAnmVtxColorKeyFv.s"
+J3DAnmVtxColorKey::J3DAnmVtxColorKey() {
+    for (int i = 0; i < 2; i++) {
+        field_0x18[i] = 0;
+    }
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 80456458-8045645C 004A58 0004+00 3/3 0/0 0/0 .sdata2          @1499 */
@@ -556,6 +658,10 @@ asm void J3DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, _GXColor* param_2)
 #pragma pop
 
 /* 8032A828-8032A8A4 325168 007C+00 2/2 0/0 0/0 .text            __ct__11J3DAnmColorFv */
+// matches with literals
+#ifdef NONMATCHING
+J3DAnmColor::J3DAnmColor() : J3DAnmBase(0), field_0xc(0), field_0xe(0), field_0x10(0), field_0x12(0), mUpdateMaterialNum(0), mUpdateMaterialID(NULL) {}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -564,6 +670,7 @@ asm J3DAnmColor::J3DAnmColor() {
 #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__11J3DAnmColorFv.s"
 }
 #pragma pop
+#endif
 
 /* 8032A8A4-8032A93C 3251E4 0098+00 0/0 1/1 0/0 .text
  * searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable    */
@@ -577,14 +684,13 @@ asm void J3DAnmColor::searchUpdateMaterialID(J3DMaterialTable* param_0) {
 #pragma pop
 
 /* 8032A93C-8032A990 32527C 0054+00 0/0 1/1 0/0 .text            __ct__15J3DAnmColorFullFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm J3DAnmColorFull::J3DAnmColorFull() {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__15J3DAnmColorFullFv.s"
+J3DAnmColorFull::J3DAnmColorFull() {
+    field_0x2c = 0;
+    field_0x30 = 0;
+    field_0x34 = 0;
+    field_0x38 = 0;
+    field_0x3c = 0;
 }
-#pragma pop
 
 /* 8032A990-8032AB00 3252D0 0170+00 1/0 0/0 0/0 .text getColor__15J3DAnmColorFullCFUsP8_GXColor */
 #pragma push
@@ -597,14 +703,13 @@ asm void J3DAnmColorFull::getColor(u16 param_0, _GXColor* param_1) const {
 #pragma pop
 
 /* 8032AB00-8032AB54 325440 0054+00 0/0 1/1 0/0 .text            __ct__14J3DAnmColorKeyFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm J3DAnmColorKey::J3DAnmColorKey() {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__14J3DAnmColorKeyFv.s"
+J3DAnmColorKey::J3DAnmColorKey() {
+    field_0x2c = 0;
+    field_0x30 = 0;
+    field_0x34 = 0;
+    field_0x38 = 0;
+    field_0x3c = 0;
 }
-#pragma pop
 
 /* 8032AB54-8032AE18 325494 02C4+00 1/0 0/0 0/0 .text getColor__14J3DAnmColorKeyCFUsP8_GXColor */
 #pragma push
@@ -617,6 +722,31 @@ asm void J3DAnmColorKey::getColor(u16 param_0, _GXColor* param_1) const {
 #pragma pop
 
 /* 8032AE18-8032AED8 325758 00C0+00 0/0 1/1 0/0 .text            __ct__15J3DAnmTevRegKeyFv */
+// matches with literals
+#ifdef NONMATCHING
+J3DAnmTevRegKey::J3DAnmTevRegKey() : J3DAnmBase(0) {
+    mKRegUpdateMaterialNum = 0;
+    mCRegUpdateMaterialNum = 0;
+    field_0x16 = 0;
+    field_0x14 = 0;
+    field_0x12 = 0;
+    field_0x10 = 0;
+    field_0x1e = 0;
+    field_0x1c = 0;
+    field_0x1a = 0;
+    field_0x18 = 0;
+    mKRegUpdateMaterialID = 0;
+    mCRegUpdateMaterialID = 0;
+    field_0x5c = 0;
+    field_0x58 = 0;
+    field_0x54 = 0;
+    field_0x50 = 0;
+    field_0x6c = 0;
+    field_0x68 = 0;
+    field_0x64 = 0;
+    field_0x60 = 0;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -625,8 +755,13 @@ asm J3DAnmTevRegKey::J3DAnmTevRegKey() {
 #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__15J3DAnmTevRegKeyFv.s"
 }
 #pragma pop
+#endif
 
 /* 8032AED8-8032AF50 325818 0078+00 0/0 2/2 0/0 .text            __ct__16J3DAnmTexPatternFv */
+// matches with literals
+#if NONMATCHING
+J3DAnmTexPattern::J3DAnmTexPattern() : J3DAnmBase(0), field_0xc(NULL), mAnmTable(NULL), field_0x14(0), mUpdateMaterialNum(0), field_0x18(NULL) {}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -635,6 +770,7 @@ asm J3DAnmTexPattern::J3DAnmTexPattern() {
 #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__16J3DAnmTexPatternFv.s"
 }
 #pragma pop
+#endif
 
 /* 8032AF50-8032B004 325890 00B4+00 0/0 1/1 72/72 .text getTexNo__16J3DAnmTexPatternCFUsPUs */
 #pragma push
@@ -648,47 +784,49 @@ asm void J3DAnmTexPattern::getTexNo(u16 param_0, u16* param_1) const {
 
 /* 8032B004-8032B09C 325944 0098+00 1/1 1/1 0/0 .text
  * searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* param_0) {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable.s"
+void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* param_0) {
+    for (u16 i = 0; i < mUpdateMaterialNum; i++) {
+        s32 r3 = param_0->getMaterialName()->getIndex(field_0x1c.getName(i));
+        if (r3 != -1) {
+            field_0x18[i] = r3;
+        } else {
+            field_0x18[i] = -1;
+        }
+    }
 }
-#pragma pop
 
 /* 8032B09C-8032B0C0 3259DC 0024+00 0/0 4/4 1/1 .text
  * searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData   */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DAnmTexPattern::searchUpdateMaterialID(J3DModelData* param_0) {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData.s"
+void J3DAnmTexPattern::searchUpdateMaterialID(J3DModelData* param_0) {
+    searchUpdateMaterialID(&param_0->getMaterialTable());
 }
-#pragma pop
 
 /* 8032B0C0-8032B1D4 325A00 0114+00 1/1 1/1 0/0 .text
  * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* param_0) {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable.s"
+void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* param_0) {
+    for (u16 i = 0; i < u16(field_0x14 / 3); i++) {
+        s32 r3 = param_0->getMaterialName()->getIndex(field_0x30.getName(i));
+        if (r3 != -1) {
+            mUpdateMaterialID[i] = r3;
+        } else {
+            mUpdateMaterialID[i] = -1;
+        }
+    }
+    for (u16 i = 0; i < u16(field_0x4a / 3); i++) {
+        s32 r3 = param_0->getMaterialName()->getIndex(field_0x64.getName(i));
+        if (r3 != -1) {
+            field_0x60[i] = r3;
+        } else {
+            field_0x60[i] = -1;
+        }
+    }
 }
-#pragma pop
 
 /* 8032B1D4-8032B1F8 325B14 0024+00 0/0 8/8 6/6 .text
  * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DModelData* param_0) {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData.s"
+void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DModelData* param_0) {
+    searchUpdateMaterialID(&param_0->getMaterialTable());
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 8045645C-80456460 004A5C 0004+00 1/1 0/0 0/0 .sdata2          @1817 */
@@ -736,14 +874,9 @@ asm void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* param_0) {
 
 /* 8032B87C-8032B8A0 3261BC 0024+00 0/0 9/9 4/4 .text
  * searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData    */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* param_0) {
-    nofralloc
-#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData.s"
+void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* param_0) {
+    searchUpdateMaterialID(&param_0->getMaterialTable());
 }
-#pragma pop
 
 /* 8032B8A0-8032BAD4 3261E0 0234+00 6/6 0/0 0/0 .text
  * J3DGetKeyFrameInterpolation<s>__FfP18J3DAnmKeyTableBasePs    */
diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
index 85f799d080..87770b6c21 100644
--- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -12,7 +12,7 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/os/OSCache.h"
diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index 94b407be05..64f0bb02ae 100644
--- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -5,7 +5,7 @@
 
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/os/OSCache.h"
diff --git a/libs/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/J3DGraphBase/J3DVertex.cpp
index 1356041e34..6d3e4e4ba5 100644
--- a/libs/JSystem/J3DGraphBase/J3DVertex.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DVertex.cpp
@@ -7,6 +7,7 @@
 #include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/JKernel/JKRHeap.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 #include "dolphin/types.h"
diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
index af19d207c4..5d6d4325d1 100644
--- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JAudio2/JASWaveArcLoader.h"
+#include "MSL_C/string.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp
index d794f1cc67..62cc69dfd8 100644
--- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp
+++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JAudio2/JAUSectionHeap.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -282,7 +283,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abort();
 extern "C" void fprintf();
 extern "C" extern void* __vt__11JASBankList[3 + 1 /* padding */];
 extern "C" extern void* __vt__7JASBank[5];
@@ -290,7 +290,6 @@ extern "C" extern void* __vt__12JASVoiceBank[5 + 1 /* padding */];
 extern "C" extern void* __vt__13JAISeqDataMgr[6];
 extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */];
 extern "C" extern void* __vt__32JAUStreamDataMgr_StreamFileTable[4];
-extern "C" extern void* __files[80];
 extern "C" extern u8 data_80450B50[4];
 extern "C" extern u8 data_80450B54[4];
 extern "C" extern u8 data_80450B58[4];
diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp
index b6482fc77c..5b2cb23561 100644
--- a/libs/JSystem/JKernel/JKRAramArchive.cpp
+++ b/libs/JSystem/JKernel/JKRAramArchive.cpp
@@ -9,8 +9,8 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRFile.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 
diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp
index 988c461361..7743207cce 100644
--- a/libs/JSystem/JKernel/JKRArchivePri.cpp
+++ b/libs/JSystem/JKernel/JKRArchivePri.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "MSL_C/MSL_Common/Src/ctype.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 
 /* ############################################################################################## */
 /* 80451420-80451428 000920 0004+04 1/1 5/5 0/0 .sbss            sCurrentDirID__10JKRArchive */
diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp
index 8597e6727e..9626f9eed3 100644
--- a/libs/JSystem/JKernel/JKRCompArchive.cpp
+++ b/libs/JSystem/JKernel/JKRCompArchive.cpp
@@ -9,8 +9,8 @@
 #include "JSystem/JKernel/JKRDvdArchive.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 
 //
diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp
index 405214c384..59fa399fd1 100644
--- a/libs/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 #include "global.h"
diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp
index 24da35f07f..d77e26ddcd 100644
--- a/libs/JSystem/JKernel/JKRFileCache.cpp
+++ b/libs/JSystem/JKernel/JKRFileCache.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JKernel/JKRFileFinder.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "MSL_C/MSL_Common/Src/ctype.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "global.h"
 
 /* 802D49B4-802D4AB4 2CF2F4 0100+00 0/0 2/2 0/0 .text mount__12JKRFileCacheFPCcP7JKRHeapPCc */
diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp
index c019a58b0c..c12ac92585 100644
--- a/libs/JSystem/JKernel/JKRFileLoader.cpp
+++ b/libs/JSystem/JKernel/JKRFileLoader.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/JKernel/JKRFileLoader.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "global.h"
 
diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp
index 5ec3502403..c4c3edf333 100644
--- a/libs/JSystem/JKernel/JKRMemArchive.cpp
+++ b/libs/JSystem/JKernel/JKRMemArchive.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 
 //
diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp
index ad6c49503a..795b9fc121 100644
--- a/libs/JSystem/JMessage/resource.cpp
+++ b/libs/JSystem/JMessage/resource.cpp
@@ -5,7 +5,7 @@
 
 #include "JSystem/JMessage/resource.h"
 #include "JSystem/JGadget/binary.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 
 //
diff --git a/libs/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/JParticle/JPAResourceManager.cpp
index ad0ceb8786..0334495374 100644
--- a/libs/JSystem/JParticle/JPAResourceManager.cpp
+++ b/libs/JSystem/JParticle/JPAResourceManager.cpp
@@ -6,7 +6,7 @@
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JParticle/JPAResource.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp
index eb41a55d3c..d51fd487fa 100644
--- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JStudio/JStudio/functionvalue.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "MSL_C/math.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -179,7 +180,6 @@ extern "C" void _savefpr_29();
 extern "C" void _restfpr_29();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_29();
-extern "C" void div();
 
 /* ############################################################################################## */
 /* 803C48E0-803C4900 021A00 0020+00 2/2 1/1 0/0 .data __vt__Q27JStudio22TFunctionValue_hermite */
diff --git a/libs/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/JSupport/JSUMemoryStream.cpp
index 7b4e6f5812..093be5330a 100644
--- a/libs/JSystem/JSupport/JSUMemoryStream.cpp
+++ b/libs/JSystem/JSupport/JSUMemoryStream.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/JSupport/JSUMemoryStream.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 
 /* 802DC520-802DC534 2D6E60 0014+00 0/0 3/3 0/0 .text setBuffer__20JSUMemoryInputStreamFPCvl */
 void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) {
diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp
index c949afb07d..a8a28998cf 100644
--- a/libs/JSystem/JUtility/JUTException.cpp
+++ b/libs/JSystem/JUtility/JUTException.cpp
@@ -7,8 +7,9 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDirectFile.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
-#include "MSL_C/MSL_Common/Src/float.h"
+#include "MSL_C/float.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/stdlib.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dol2asm.h"
 
@@ -61,7 +62,6 @@ extern "C" void fopen__13JUTDirectFileFPCc();
 extern "C" void fclose__13JUTDirectFileFv();
 extern "C" void fgets__13JUTDirectFileFPvi();
 extern "C" void print__10JUTConsoleFPCc();
-extern "C" long int strtol(const char* str, char** endptr, int base);
 extern "C" void __ct__13JUTDirectFileFv();
 extern "C" void __dt__13JUTDirectFileFv();
 extern "C" void _savegpr_16();
diff --git a/libs/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp
index 00cc32b420..ca2ff4ea1b 100644
--- a/libs/JSystem/JUtility/JUTNameTab.cpp
+++ b/libs/JSystem/JUtility/JUTNameTab.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "JSystem/JUtility/JUTNameTab.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 
 JUTNameTab::JUTNameTab() {
     setResource(NULL);
diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp
index f789657c2b..54dfcd6c91 100644
--- a/libs/SSystem/SComponent/c_lib.cpp
+++ b/libs/SSystem/SComponent/c_lib.cpp
@@ -5,8 +5,8 @@
 
 #include "SSystem/SComponent/c_lib.h"
 #include "JSystem/JMath/JMath.h"
-#include "MSL_C/MSL_Common/Src/string.h"
 #include "MSL_C/math.h"
+#include "MSL_C/string.h"
 #include "SSystem/SComponent/c_math.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dol2asm.h"
diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp
index 905cb2b887..9356e2a86f 100644
--- a/libs/Z2AudioLib/Z2AudioMgr.cpp
+++ b/libs/Z2AudioLib/Z2AudioMgr.cpp
@@ -5,6 +5,7 @@
 
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "JSystem/JAudio2/JASDriverIF.h"
+#include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -212,7 +213,6 @@ extern "C" void _restgpr_24();
 extern "C" void _restgpr_25();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abort();
 extern "C" void fprintf();
 extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */];
 extern "C" extern void* __vt__16JAIStreamAramMgr[5];
@@ -220,7 +220,6 @@ extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */];
 extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */];
 extern "C" extern void* __vt__16Z2AudioArcLoader[17 + 1 /* padding */];
 extern "C" extern void* __vt__11Z2SoundInfo[20];
-extern "C" extern void* __files[80];
 extern "C" extern u8 data_804341C4[16 + 4 /* padding */];
 extern "C" extern u8 data_804341E4[16 + 4 /* padding */];
 extern "C" f32 VOL_BGM_DEFAULT__7Z2Param;
diff --git a/libs/dolphin/ar/ar.c b/libs/dolphin/ar/ar.c
index 6f11a21f84..4dad7a2f07 100644
--- a/libs/dolphin/ar/ar.c
+++ b/libs/dolphin/ar/ar.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/ar/ar.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/base/PPCArch.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDBlock.c b/libs/dolphin/card/CARDBlock.c
index 011489d080..40ca946fde 100644
--- a/libs/dolphin/card/CARDBlock.c
+++ b/libs/dolphin/card/CARDBlock.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDBlock.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDCheck.c b/libs/dolphin/card/CARDCheck.c
index abd98491a7..a35974e8d6 100644
--- a/libs/dolphin/card/CARDCheck.c
+++ b/libs/dolphin/card/CARDCheck.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDCheck.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDCreate.c b/libs/dolphin/card/CARDCreate.c
index 01caf4025c..d391d501ec 100644
--- a/libs/dolphin/card/CARDCreate.c
+++ b/libs/dolphin/card/CARDCreate.c
@@ -4,8 +4,7 @@
 //
 
 #include "dolphin/card/CARDCreate.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDDir.c b/libs/dolphin/card/CARDDir.c
index 87d776574c..68d15bf9e6 100644
--- a/libs/dolphin/card/CARDDir.c
+++ b/libs/dolphin/card/CARDDir.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDDir.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDFormat.c b/libs/dolphin/card/CARDFormat.c
index d633512260..9532329bf7 100644
--- a/libs/dolphin/card/CARDFormat.c
+++ b/libs/dolphin/card/CARDFormat.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDFormat.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/card/CARDOpen.c b/libs/dolphin/card/CARDOpen.c
index 2321c21542..0a2d9fbde1 100644
--- a/libs/dolphin/card/CARDOpen.c
+++ b/libs/dolphin/card/CARDOpen.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/card/CARDOpen.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
diff --git a/libs/dolphin/dvd/dvd.c b/libs/dolphin/dvd/dvd.c
index 668e8a363d..db30119490 100644
--- a/libs/dolphin/dvd/dvd.c
+++ b/libs/dolphin/dvd/dvd.c
@@ -4,8 +4,7 @@
 //
 
 #include "dolphin/dvd/dvd.h"
-#include "MSL_C/MSL_Common/Src/mem.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/dvd/dvdlow.h"
 #include "dolphin/os/OS.h"
diff --git a/libs/dolphin/dvd/dvdidutils.c b/libs/dolphin/dvd/dvdidutils.c
index de95f3e481..21dd68a8f4 100644
--- a/libs/dolphin/dvd/dvdidutils.c
+++ b/libs/dolphin/dvd/dvdidutils.c
@@ -1,5 +1,5 @@
 #include "dolphin/dvd/dvdidutils.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dolphin/dvd/dvd.h"
 
 /* 8034BC04-8034BCFC 346544 00F8+00 0/0 1/1 0/0 .text            DVDCompareDiskID */
diff --git a/libs/dolphin/dvd/fstload.c b/libs/dolphin/dvd/fstload.c
index d39425eae6..50e45f4d5e 100644
--- a/libs/dolphin/dvd/fstload.c
+++ b/libs/dolphin/dvd/fstload.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/dvd/fstload.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/dvd/dvd.h"
 #include "dolphin/os/OS.h"
diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c
index 9716ad03b6..11235c960b 100644
--- a/libs/dolphin/pad/Pad.c
+++ b/libs/dolphin/pad/Pad.c
@@ -4,7 +4,7 @@
 //
 
 #include "dolphin/pad/Pad.h"
-#include "MSL_C/MSL_Common/Src/string.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/si/SIBios.h"
 #include "dolphin/si/SISamplingRate.h"