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_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp
index cd053b8791..60d50e393f 100644
--- a/src/d/actor/d_a_obj_syRock.cpp
+++ b/src/d/actor/d_a_obj_syRock.cpp
@@ -109,7 +109,7 @@ dCcD_SrcGObjInf const daSyRock_c::mCcDObjInfo = {
     {},  // mGObjCo
 };
 
-cPhs__Step daSyRock_c::create() {
+cPhs_Step daSyRock_c::create() {
     fopAcM_ct(this, daSyRock_c);
 
     if(getArg0() == TRUE) {
@@ -119,9 +119,9 @@ cPhs__Step daSyRock_c::create() {
             return cPhs_INIT_e;
     }
 
-    const cPhs__Step requestedPhaseProcess = static_cast<cPhs__Step>(dComIfG_resLoad(&mPhase, "syourock"));
+    const cPhs_Step requestedPhaseProcess = static_cast<cPhs_Step>(dComIfG_resLoad(&mPhase, "syourock"));
     if(requestedPhaseProcess == cPhs_COMPLEATE_e) {
-        const cPhs__Step bgCreatePhaseProcess = static_cast<cPhs__Step>(MoveBGCreate("syourock", 0x8, dBgS_MoveBGProc_TypicalRotY, 0x2100, NULL));
+        const cPhs_Step bgCreatePhaseProcess = static_cast<cPhs_Step>(MoveBGCreate("syourock", 0x8, dBgS_MoveBGProc_TypicalRotY, 0x2100, NULL));
         if(bgCreatePhaseProcess == cPhs_ERROR_e)
             return cPhs_ERROR_e;