general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

* typedef for cPhs_Step

* make sdk includes consistent

* d_menu_quit / d_msg_scrn_explain debug

* d_a_obj_testcube mostly done

* d_debug_pad mostly done

* jstudio tool library headers

* some JStudioCameraEditor headers

* d_jcam_editor mostly done

* try fixing some shield regressions

* d_bg_parts mostly done

* fix merge errors

* debug fix

15 files changed, 19 insertions, 17 deletions

diff --git a/include/SSystem/SComponent/c_API_controller_pad.h b/include/SSystem/SComponent/c_API_controller_pad.h
index a8476b8d29..36d8fa5a1f 100644
--- a/include/SSystem/SComponent/c_API_controller_pad.h
+++ b/include/SSystem/SComponent/c_API_controller_pad.h
@@ -1,7 +1,7 @@
 #ifndef C_API_CONTROLLER_PAD_
 #define C_API_CONTROLLER_PAD_
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 struct interface_of_controller_pad {
     /* 0x00 */ f32 mMainStickPosX;
@@ -35,4 +35,4 @@ struct interface_of_controller_pad {
 void cAPICPad_recalibrate(void);
 u32 cAPICPad_ANY_BUTTON(u32 param_0);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h
index 4d6a6cef3f..390a203e16 100644
--- a/include/SSystem/SComponent/c_bg_s_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_chk.h
@@ -1,7 +1,7 @@
 #ifndef C_BG_S_CHK_H
 #define C_BG_S_CHK_H
 
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 #include "f_pc/f_pc_base.h"
 #include "SSystem/SComponent/c_bg_s_grp_pass_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_pass_chk.h"
diff --git a/include/SSystem/SComponent/c_bg_s_poly_info.h b/include/SSystem/SComponent/c_bg_s_poly_info.h
index a0fbf35aba..214118476c 100644
--- a/include/SSystem/SComponent/c_bg_s_poly_info.h
+++ b/include/SSystem/SComponent/c_bg_s_poly_info.h
@@ -1,7 +1,7 @@
 #ifndef C_BG_S_POLY_INFO_H
 #define C_BG_S_POLY_INFO_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_pc/f_pc_manager.h"
 
 class cBgS_PolyInfo {
diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h
index 44a271052b..85233888a6 100644
--- a/include/SSystem/SComponent/c_bg_w.h
+++ b/include/SSystem/SComponent/c_bg_w.h
@@ -1,7 +1,7 @@
 #ifndef C_BG_W_H
 #define C_BG_W_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 class cBgW_BgId {
 private:
diff --git a/include/SSystem/SComponent/c_counter.h b/include/SSystem/SComponent/c_counter.h
index 975824eb9e..124d623fd0 100644
--- a/include/SSystem/SComponent/c_counter.h
+++ b/include/SSystem/SComponent/c_counter.h
@@ -1,7 +1,7 @@
 #ifndef C_COUNTER_H
 #define C_COUNTER_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 struct counter_class {
     u32 mCounter0;
diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h
index 4a29fb58b3..ac3d153a3d 100644
--- a/include/SSystem/SComponent/c_lib.h
+++ b/include/SSystem/SComponent/c_lib.h
@@ -2,7 +2,7 @@
 #define C_LIB_H_
 
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 #include "SSystem/SComponent/c_math.h"
 
 inline bool cLib_IsZero(f32 value) {
diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h
index 1db37b44a8..12303b9a65 100644
--- a/include/SSystem/SComponent/c_m3d.h
+++ b/include/SSystem/SComponent/c_m3d.h
@@ -2,7 +2,7 @@
 #define C_M3D_H_
 
 #include <cmath>
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 
 class cM3dGAab;
 class cM3dGCps;
diff --git a/include/SSystem/SComponent/c_m3d_g_cir.h b/include/SSystem/SComponent/c_m3d_g_cir.h
index e82f19b0de..8ad96fa2a6 100644
--- a/include/SSystem/SComponent/c_m3d_g_cir.h
+++ b/include/SSystem/SComponent/c_m3d_g_cir.h
@@ -1,7 +1,7 @@
 #ifndef C_M3D_G_CIR_H
 #define C_M3D_G_CIR_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 class cM2dGCir {
 public:
diff --git a/include/SSystem/SComponent/c_malloc.h b/include/SSystem/SComponent/c_malloc.h
index 9016215acf..bbcff9ae68 100644
--- a/include/SSystem/SComponent/c_malloc.h
+++ b/include/SSystem/SComponent/c_malloc.h
@@ -1,7 +1,7 @@
 #ifndef C_MALLOC_H
 #define C_MALLOC_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 class JKRHeap;
 
diff --git a/include/SSystem/SComponent/c_phase.h b/include/SSystem/SComponent/c_phase.h
index 2c2cd09e86..8b88d2f835 100644
--- a/include/SSystem/SComponent/c_phase.h
+++ b/include/SSystem/SComponent/c_phase.h
@@ -1,11 +1,13 @@
 #ifndef C_PHASE_H
 #define C_PHASE_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 typedef int (*cPhs__Handler)(void*);
 
-enum cPhs__Step {
+typedef int cPhs_Step;
+
+enum {
     /* 0x0 */ cPhs_INIT_e,
     /* 0x1 */ cPhs_LOADING_e,
     /* 0x2 */ cPhs_NEXT_e,
diff --git a/include/SSystem/SComponent/c_request.h b/include/SSystem/SComponent/c_request.h
index 8b1b377303..22bca520e8 100644
--- a/include/SSystem/SComponent/c_request.h
+++ b/include/SSystem/SComponent/c_request.h
@@ -1,7 +1,7 @@
 #ifndef C_REQUEST_H
 #define C_REQUEST_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 struct request_base_class {
     u8 flag0 : 1;
diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h
index 8b835807f3..0a2a9df11d 100644
--- a/include/SSystem/SComponent/c_sxyz.h
+++ b/include/SSystem/SComponent/c_sxyz.h
@@ -1,7 +1,7 @@
 #ifndef C_SXYZ_H
 #define C_SXYZ_H
 
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 
 struct SVec {
     s16 x, y, z;
diff --git a/include/SSystem/SComponent/c_tag.h b/include/SSystem/SComponent/c_tag.h
index 4c536cd7c5..9e9b4a894e 100644
--- a/include/SSystem/SComponent/c_tag.h
+++ b/include/SSystem/SComponent/c_tag.h
@@ -2,7 +2,7 @@
 #define C_TAG_H
 
 #include "SSystem/SComponent/c_node.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 typedef struct node_list_class node_list_class;
 typedef struct node_lists_tree_class node_lists_tree_class;
diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h
index 23b059be98..7876d12c3c 100644
--- a/include/SSystem/SComponent/c_xyz.h
+++ b/include/SSystem/SComponent/c_xyz.h
@@ -1,7 +1,7 @@
 #ifndef C_XYZ_H
 #define C_XYZ_H
 
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 #include <cmath>
 
 struct cXyz : Vec {
diff --git a/include/SSystem/SStandard/s_basic.h b/include/SSystem/SStandard/s_basic.h
index 3fea9ad699..d173a0bc77 100644
--- a/include/SSystem/SStandard/s_basic.h
+++ b/include/SSystem/SStandard/s_basic.h
@@ -1,7 +1,7 @@
 #ifndef S_BASIC_H
 #define S_BASIC_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue);
 void sBs_ClearArea(void* pPtr, u32 pNumBytes);