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_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp
index 04877443cd..7461add608 100644
--- a/src/d/actor/d_a_obj_h_saku.cpp
+++ b/src/d/actor/d_a_obj_h_saku.cpp
@@ -80,15 +80,15 @@ int daObjH_Saku_c::CreateHeap() {
     return 1;
 }
 
-cPhs__Step daObjH_Saku_c::create() {
+cPhs_Step daObjH_Saku_c::create() {
     fopAcM_ct(this, daObjH_Saku_c);
 
-    cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
+    cPhs_Step phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
         int dzb_id = dComIfG_getObjctResName2Index(l_arcName, "H_Saku.dzb");
         JUT_ASSERT(113, dzb_id != -1);
 
-        phase = (cPhs__Step)MoveBGCreate(l_arcName, dzb_id, dBgS_MoveBGProc_TypicalRotY, 0x1320, NULL);
+        phase = MoveBGCreate(l_arcName, dzb_id, dBgS_MoveBGProc_TypicalRotY, 0x1320, NULL);
         if (phase == cPhs_ERROR_e) {
             return phase;
         }