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_do.cpp b/src/d/actor/d_a_do.cpp
index 420c0baf39..f8632be6c9 100644
--- a/src/d/actor/d_a_do.cpp
+++ b/src/d/actor/d_a_do.cpp
@@ -2402,11 +2402,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
+static cPhs_Step daDo_Create(fopAc_ac_c* i_this) {
     do_class* _this = static_cast<do_class*>(i_this);
     fopAcM_ct(i_this, do_class);
 
-    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "Do");
+    cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "Do");
 
     if (step == cPhs_COMPLEATE_e) {
         _this->mParam0 = fopAcM_GetParam(i_this) & 7;