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_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp
index ff81db4ecd..9ac731d7ac 100644
--- a/src/d/actor/d_a_obj_gra2.cpp
+++ b/src/d/actor/d_a_obj_gra2.cpp
@@ -250,13 +250,13 @@ daObj_GrA_c::~daObj_GrA_c() {
 #endif
 }
 
-cPhs__Step daObj_GrA_c::create() {
+cPhs_Step daObj_GrA_c::create() {
     int uVar1 = 0;
     fopAcM_ct(this, daObj_GrA_c);
 
     mMode = getMode();
     int i;
-    cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, getResName());
+    cPhs_Step phase = dComIfG_resLoad(&mPhase, getResName());
     if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
         return cPhs_ERROR_e;
     }
@@ -266,7 +266,7 @@ cPhs__Step daObj_GrA_c::create() {
     }
 
     for (i = 0; l_exloadRes_list[mMode][i] >= 0; i++) {
-        phase = (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_exloadRes_list[mMode][i]]);
+        phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_exloadRes_list[mMode][i]]);
         if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) {
             return cPhs_ERROR_e;
         }