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_dan.cpp b/src/d/actor/d_a_obj_dan.cpp
index ed3d319128..3c5f1cc226 100644
--- a/src/d/actor/d_a_obj_dan.cpp
+++ b/src/d/actor/d_a_obj_dan.cpp
@@ -106,7 +106,7 @@ int daObjDAN_c::CreateHeap() {
     return 1;
 }
 
-static cPhs__Step daObjDAN_Create(fopAc_ac_c* i_this) {
+static cPhs_Step daObjDAN_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjDAN_c*>(i_this)->create();
 }
 
@@ -505,9 +505,9 @@ bool daObjDAN_c::CreateChk() {
     return true;
 }
 
-cPhs__Step daObjDAN_c::create() {
+cPhs_Step daObjDAN_c::create() {
     fopAcM_ct(this, daObjDAN_c);
-    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "I_Dan");
+    cPhs_Step step = dComIfG_resLoad(&mPhase, "I_Dan");
 
     if (step == cPhs_COMPLEATE_e) {
         mLocation = fopAcM_GetParam(this) & 0xf;