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, 1 insertions, 1 deletions

diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp
index 65fe8a4493..2494a2f534 100644
--- a/src/d/actor/d_a_obj_rock.cpp
+++ b/src/d/actor/d_a_obj_rock.cpp
@@ -105,7 +105,7 @@ static int daObj_Rock_Create(fopAc_ac_c* i_this) {
     obj_rock_class* a_this = static_cast<obj_rock_class*>(i_this);
     fopAcM_ct(a_this, obj_rock_class);
 
-    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, "Obj_rock");
+    cPhs_Step step = dComIfG_resLoad(&a_this->mPhaseReq, "Obj_rock");
     if (step == cPhs_COMPLEATE_e) {
         a_this->mPatchRockNum = fopAcM_GetParam(a_this);
         a_this->mRockSpacing = fopAcM_GetParamBit(a_this, 8, 8);