Merge branch 'master' of https://github.com/zeldaret/tp

15 files changed, 19 insertions, 34 deletions

diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 76ff4e1afa..5c2a7aef00 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -10,10 +10,10 @@
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
+#include "msl_c/math.h"
+#include "msl_c/string.h"
 
 extern "C" {
-double func_8036C668(double);
-int strcmp(const char*, const char*);
 void __ct__7cSAngleFRC7cSAngle(void);
 void __ct__7cSAngleFs(void);
 void __ct__7cSGlobeFRC4cXyz(void);
@@ -61,7 +61,6 @@ void mDoExt_createSolidHeapFromGameToCurrent_X1_(void);
 void mDoExt_J3DModel__create(void);
 void mDoExt_modelUpdateDL(void);
 void mDoExt_restoreCurrentHeap(void);
-void memcpy(void*, const void*, int);
 void Z2SeqMgr_NS_bgmNowBattle(void);
 }
 
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 5424b5b4ce..7bc20580d9 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -16,13 +16,12 @@
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic/m_Do_graphic.h"
+#include "msl_c/math.h"
+#include "msl_c/string.h"
 
 extern "C" {
 void fopCamM_GetParam__FP12camera_class(void);
 void __dt__8cM3dGLinFv(void);
-double func_8036C668(double);
-int func_80368954(char*, char*, u32);
-int strcmp(const char*, const char*);
 void __ami__7cSAngleFRC7cSAngle(void);
 void __amu__7cSAngleFf(void);
 void __apl__7cSAngleFRC7cSAngle(void);
diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp
index f56cdfce82..aea6393215 100644
--- a/src/d/d_com/d_com_inf_game.cpp
+++ b/src/d/d_com/d_com_inf_game.cpp
@@ -9,18 +9,17 @@
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
+#include "msl_c/string.h"
 
 extern "C" {
 bool dComIfGp_checkMapShow(void);
 BOOL dComIfGp_isLightDropMapVisible(void);
 BOOL isTransformLV__21dSv_player_status_b_cCFi(int);
-char* strcpy(char*, const char*);
 const char* dComIfGs_getWarpStageName(void);
 int dComIfGs_getWarpRoomNo(void);
 int dKy_daynight_check(void);
 int dStage_roomControl_c_NS_getZoneNo(int);
 int getTimerMode__14dComIfG_play_cFv(void);
-int strcmp(const char*, const char*);
 s16 dComIfGs_getWarpPlayerAngleY(void);
 u16 dComIfGs_getMaxLifeGauge(void);
 u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
@@ -280,7 +279,6 @@ void setBombNum__24dSv_player_item_record_cFUcUc(void);
 void setBottleNum__24dSv_player_item_record_cFUcUc(u8, u8);
 void setCollect__20dSv_player_collect_cFiUc(int, u8);
 void setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc(void);
-void* memset(void* dest, int ch, u32 count);
 void ct__13dComIfG_inf_cFv(void);
 }
 
diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp
index 7e37fd1950..6bcbd0e498 100644
--- a/src/d/d_item/d_item.cpp
+++ b/src/d/d_item/d_item.cpp
@@ -1,10 +1,10 @@
 #include "d/d_item/d_item/d_item.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
+#include "msl_c/string.h"
 
 extern "C" {
 int checkItemGet__FUci(u8, int);
-int func_80368954(char*, char*, u32);
 int item_getcheck_func_FISHING_ROD_1(void);
 u16 dComIfGs_getMaxLifeGauge(void);
 u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 813687af3a..5c7e41a5c8 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -7,14 +7,13 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_graphic/m_Do_graphic.h"
+#include "msl_c/math.h"
+#include "msl_c/string.h"
 #include "os/OS.h"
 
 extern "C" {
-double func_8036C028(double);
-double func_8036C590(double);
 int abs(int);
 int func_8036608C(const void*, const void*, u32);
-int strcmp(const char*, const char*);
 void __dl__FPv(void);
 void __mi__4cXyzCFRC3Vec(void);
 void __ml__4cXyzCFf(void);
@@ -135,7 +134,6 @@ void mDoGph_gInf_c_NS_bloom_c_NS_create(void);
 void mDoLib_project(void);
 void mDoMtx_inverseTranspose(void);
 void mDoMtx_lookAt(void);
-void memcpy(void*, const void*, int);
 void offEventBit__11dSv_event_cFUs(void);
 void SetPos__11cBgS_GndChkFPC4cXyz(void);
 void WIND_INF_ENTITY_NS_dtor(void);
@@ -144,7 +142,6 @@ void Z2EnvSeMgr_NS_dtor(void);
 void Z2EnvSeMgr_NS_resetScene(void);
 void Z2EnvSeMgr(void);
 void Z2SceneMgr_NS_load2ndDynamicWave(void);
-void* memset(void* dest, int ch, u32 count);
 }
 
 extern "C" {
diff --git a/src/d/d_kankyo/d_kankyo_rain.cpp b/src/d/d_kankyo/d_kankyo_rain.cpp
index c8403d2a18..fcba86f8ff 100644
--- a/src/d/d_kankyo/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo/d_kankyo_rain.cpp
@@ -6,10 +6,9 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "d/d_kankyo/d_kankyo.h"
 #include "global.h"
+#include "msl_c/math.h"
 
 extern "C" {
-double func_8036C028(double);
-double func_8036C590(double);
 double func_8036CA54(double);
 int dKy_daynight_check(void);
 int func_8036608C(const void*, const void*, u32);
@@ -66,7 +65,6 @@ void dStage_roomControl_c_NS_getStatusRoomDt(void);
 void fopKyM_create(void);
 void func_80361C24(void);
 void func_80361D60(void);
-void func_8036C720(void);
 void GXLoadPosMtxImm(void);
 void GXLoadTexMtxImm(void);
 void GXSetAlphaCompare(void);
diff --git a/src/d/d_meter2/d_meter2_info.cpp b/src/d/d_meter2/d_meter2_info.cpp
index 208dcd9f97..e989239a0c 100644
--- a/src/d/d_meter2/d_meter2_info.cpp
+++ b/src/d/d_meter2/d_meter2_info.cpp
@@ -3,10 +3,9 @@
 // #include "d/d_meter2/d_meter2_info/d_meter2_info.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
+#include "msl_c/string.h"
 
 extern "C" {
-char* strcpy(char*, const char*);
-int strcmp(const char*, const char*);
 u8 dComIfGs_getMixItemIndex(int);
 u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
 unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
@@ -48,7 +47,6 @@ void getItem__17dSv_player_item_cCFib(void);
 void isEventBit__11dSv_event_cCFUs(void);
 void isLetterGetFlag__17dSv_letter_info_cCFi(void);
 void isLightDropGetFlag__16dSv_light_drop_cCFUc(void);
-void memcpy(void*, const void*, int);
 void offFirstBit__21dSv_player_get_item_cFUc(void);
 void onLetterGetFlag__17dSv_letter_info_cFi(void);
 void readIdxResource__10JKRArchiveFPvUlUl(void);
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 0b9f93475a..95a49856e9 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -2,10 +2,10 @@
 #include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "d/d_save/d_save_init/d_save_init.h"
+#include "msl_c/string.h"
 #include "os/OS.h"
 
 extern "C" {
-char* strcpy(char*, const char*);
 int dStage_roomControl_c_NS_getZoneNo(int);
 u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
 u8 dComIfGs_getBottleMax(void);
@@ -32,7 +32,6 @@ void getVibration__19dSv_player_config_cFv(void);
 void init__10dSv_save_cFv(void);
 void isEventBit__11dSv_event_cCFUs(void);
 void isFirstBit__21dSv_player_get_item_cCFUc(void);
-void memcpy(void*, const void*, int);
 void offEventBit__11dSv_event_cFUs(void);
 void onEventBit__11dSv_event_cFUs(void);
 void setBombNum__24dSv_player_item_record_cFUcUc(void);
@@ -371,8 +370,8 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const {
                             return 0xFF;
                         }
                     }
-                    // 合成アイテム不定＝＝＝＞%d, %d\n
-                    // Uncertain combination item＝＝＝＞%d, %d\n
+                    // �����A�C�e���s�聁������%d, %d\n
+                    // Uncertain combination item��������%d, %d\n
                     OSReport_Error(lbl_80379234 + 9, item_id_2, item_id_1);
                 }
             }
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index f3585958b2..7803e6557b 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -59,7 +59,7 @@ void func_80361CE8(void);
 void func_80361D60(void);
 void func_803664DC(void);
 void func_803665BC(void);
-void func_80368AE8(void);
+void strncpy(void);
 void getSave__10dSv_info_cFi(void);
 void init__12dSv_danBit_cFSc(void);
 void init__20dStage_roomControl_cFvZone(void);
diff --git a/src/f/f_op/f_op_actor_mng.cpp b/src/f/f_op/f_op_actor_mng.cpp
index a05abba26f..2054613ad3 100644
--- a/src/f/f_op/f_op_actor_mng.cpp
+++ b/src/f/f_op/f_op_actor_mng.cpp
@@ -9,6 +9,7 @@
 #include "d/d_stage/d_stage.h"
 #include "f/f_op/f_op_actor_iter.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
+#include "msl_c/string.h"
 
 #define FLOAT_LABEL(x) (*(f32*)&x)
 
@@ -221,7 +222,6 @@ void func_8001E128(void);
 void func_8001E130(void);
 void func_8001E138(void);
 void func_80361C24(void);
-void func_80368924(void);
 void get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz(void);
 void isHeart__FUc(void);
 void l_HIO_NS_dtor(void);
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 5611244cf8..59609b45bb 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -2,6 +2,7 @@
 
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
+#include "msl_c/string.h"
 
 // additional symbols needed for m_Do_MemCard.cpp
 // autogenerated by split.py v0.4 at 2021-01-31 21:14:24.930190
@@ -53,7 +54,6 @@ void mDoMemCd_Ctrl_c_NS_setCardState(void);
 void mDoMemCd_Ctrl_c_NS_store(void);
 void mDoMemCd_Ctrl_c_NS_update(void);
 void mDoMemCd_main(void);
-void memcpy(void);
 }
 
 // additional symbols needed for m_Do_MemCard.cpp
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 7a5f903d58..9660b6038d 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -2,6 +2,7 @@
 
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
+#include "msl_c/string.h"
 
 // additional symbols needed for m_Do_MemCardRWmng.cpp
 // autogenerated by split.py v0.4 at 2021-01-31 21:17:23.731252
@@ -25,8 +26,6 @@ void mDoMemCdRWm_SetCardStat(void);
 void mDoMemCdRWm_SetCheckSumGameData(void);
 void mDoMemCdRWm_Store(void);
 void mDoMemCdRWm_TestCheckSumGameData(void);
-void memcpy(void);
-void memset(void);
 }
 
 // additional symbols needed for m_Do_MemCardRWmng.cpp
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index f36a1da745..66d16be5c9 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -1,6 +1,6 @@
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "JSystem/JUtility/JUTGamePad/JUTGamePad.h"
-#include "c/cLib.h"
+#include "SComponent/c_lib.h"
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 #include "m_Do/m_Do_main/m_Do_main.h"
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index bca0aef8fe..2b4bddadea 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -17,6 +17,7 @@
 #include "m_Do/m_Do_graphic/m_Do_graphic.h"
 #include "m_Do/m_Do_machine/m_Do_machine.h"
 #include "m_Do/m_Do_reset/m_Do_reset.h"
+#include "msl_c/string.h"
 
 extern float lbl_80451A00;
 extern float lbl_80451A04;
@@ -38,7 +39,6 @@ extern s8 lbl_80450B30;
 
 extern char lbl_803739A0[0x310];
 extern "C" {
-int strcmp(const char*, const char*);
 void cDyl_InitAsync(void);
 void CheckHeap1__9HeapCheckFv(void);
 void create__12JKRSolidHeapFUlP7JKRHeapb(void);
@@ -63,7 +63,6 @@ void JUTReport__FiiiPCce(void);
 void mDoDvdThd_callback_c_NS_create(void);
 void mDoMch_HeapCheckAll(void);
 void mDoMemCd_Ctrl_c_NS_update(void);
-void memcpy(void*, const void*, int);
 void read__8mDoCPd_cFv(void);
 void version_check__Fv(void);
 void main01__Fv(void);
diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp
index bce8ccd7e5..46cdf9204f 100644
--- a/src/m_Do/m_Do_mtx.cpp
+++ b/src/m_Do/m_Do_mtx.cpp
@@ -54,7 +54,6 @@ void outprod__4cXyzCFRC3Vec(void);
 extern u8 lbl_803DD4A0;
 extern u8 lbl_804505A8;
 extern u8 lbl_804505AC;
-extern u8 lbl_80450AEC;
 extern u8 lbl_80451B08;
 extern u8 lbl_80451B0C;
 extern u8 lbl_80451B10;