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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp
index c1ca119e2e..529eec4a89 100644
--- a/src/d/actor/d_a_e_tk_ball.cpp
+++ b/src/d/actor/d_a_e_tk_ball.cpp
@@ -396,13 +396,13 @@ static int daE_TK_BALL_Create(fopAc_ac_c* i_this) {
         actor->mType = TYPE_TK_BALL_WATER;
     }
 
-    cPhs__Step phase;
+    cPhs_Step phase;
     u32 size;
     if (actor->mType == TYPE_TK_BALL_WATER) {
-        phase = (cPhs__Step)dComIfG_resLoad(&actor->mPhaseReq, "E_tk");
+        phase = dComIfG_resLoad(&actor->mPhaseReq, "E_tk");
         size = 0x820;
     } else {
-        phase = (cPhs__Step)dComIfG_resLoad(&actor->mPhaseReq, "E_tk2");
+        phase = dComIfG_resLoad(&actor->mPhaseReq, "E_tk2");
         size = 0xEE0;
     }