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_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp
index 75bb7fd32f..83285c0c80 100644
--- a/src/d/actor/d_a_obj_mirror_chain.cpp
+++ b/src/d/actor/d_a_obj_mirror_chain.cpp
@@ -477,10 +477,10 @@ void daObjMirrorChain_c::create_init() {
     initBaseMtx();
 }
 
-cPhs__Step daObjMirrorChain_c::create() {
+cPhs_Step daObjMirrorChain_c::create() {
     fopAcM_ct(this, daObjMirrorChain_c);
 
-    cPhs__Step phase_state = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
+    cPhs_Step phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
         if (!fopAcM_entrySolidHeap(this, createSolidHeap, 0x71b0)) {
             return cPhs_ERROR_e;
@@ -491,7 +491,7 @@ cPhs__Step daObjMirrorChain_c::create() {
     return phase_state;
 }
 
-static cPhs__Step daObjMirrorChain_Create(fopAc_ac_c* i_this) {
+static cPhs_Step daObjMirrorChain_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return ((daObjMirrorChain_c*)i_this)->create();
 }