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

diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp
index c17ac611dc..87de60ae46 100644
--- a/src/d/actor/d_a_obj_ito.cpp
+++ b/src/d/actor/d_a_obj_ito.cpp
@@ -592,12 +592,12 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-static cPhs__Step daObj_Ito_Create(fopAc_ac_c* a_this) {
+static cPhs_Step daObj_Ito_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, obj_ito_class);
     obj_ito_class* i_this = (obj_ito_class*)a_this;
     a_this = &i_this->actor;
 
-    cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "OBJ_ITO");
+    cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "OBJ_ITO");
     if (phase == cPhs_COMPLEATE_e) {
         OS_REPORT("OBJ_ITO PARAM %x\n", fopAcM_GetParam(a_this));