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

src/d/d_a/d_a_alink.cpp

@@ -13753,11 +13753,8 @@ asm void fopAcM_onSwitch(void) {
 #include "d/d_a/d_a_alink/asm/func_80141230.s"
 }
 
-// dComIfGs_isItemFirstBit__FUc
-// dComIfGs_isItemFirstBit(unsigned char)
-asm void dComIfGs_isItemFirstBit(void) {
-    nofralloc
-#include "d/d_a/d_a_alink/asm/func_80141264.s"
+int dComIfGs_isItemFirstBit(u8 i_no) {
+    return g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().isFirstBit(i_no);
 }
 
 // dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class

src/d/d_camera.cpp

@@ -1,6 +1,5 @@
 /* d_camera.cpp autogenerated by split.py v0.3 at 2021-01-02 08:13:10.853821 */
 
-#include "SComponent/c_angle/c_angle.h"
 #include "SComponent/c_bg_w.h"
 #include "SComponent/c_xyz.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
@@ -600,7 +599,7 @@ asm void _unnamed_d_camera_cpp__NS_rangef(void) {
 
 // __ct__7cSGlobeFv
 // cSGlobe::cSGlobe(void)
-asm void cSGlobe(void) {
+asm void __ct__7cSGlobeFv(void) {
     nofralloc
 #include "d/d_camera/asm/func_8016E420.s"
 }
@@ -1333,12 +1332,16 @@ asm void std_NS_fabsf(void) {
 #include "d/d_camera/asm/func_80182A3C.s"
 }
 
+extern "C" {
+
+// compiler generated from inline constructor
 // __ct__7cSAngleFv
 // cSAngle::cSAngle(void)
-asm cSAngle::cSAngle() {
+asm void __ct__7cSAngleFv(void) {
     nofralloc
 #include "d/d_camera/asm/func_80182A48.s"
 }
+}
 
 // R__7cSGlobeFf
 // cSGlobe::R(float)

src/d/d_save/d_save.cpp

@@ -1,5 +1,6 @@
 #include "d/d_save/d_save/d_save.h"
 
+#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 "os/OS.h"
@@ -41,8 +42,8 @@ void dSv_player_status_a_c::init() {
     this->mEquipment[3] = NO_ITEM;
     this->mEquipment[4] = NO_ITEM;
     this->mCurrentWallet = WALLET;
-    this->unk26 = 0;
-    this->unk27 = 0;
+    this->mMaxMagic = 0;
+    this->mCurrentMagic = 0;
     this->mMagicFlag = 0;
     this->unk29 = 0;
     this->unk30 = 0;
@@ -919,7 +920,7 @@ asm void dSv_player_info_c::init(void) {
 #endif
 
 void dSv_player_config_c::init(void) {
-    OSSoundMode os_mSoundMode;
+    u32 os_mSoundMode;
 
     this->unk0 = 1;
     os_mSoundMode = OSGetSoundMode();