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_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp
index f8f5123570..b7b47b5357 100644
--- a/src/d/actor/d_a_obj_burnbox.cpp
+++ b/src/d/actor/d_a_obj_burnbox.cpp
@@ -99,8 +99,8 @@ int daObjBurnBox_c::CreateHeap() {
     return 1;
 }
 
-cPhs__Step daObjBurnBox_c::create1st() {
-    cPhs__Step phaseStep = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, l_arcName[getType()]);
+cPhs_Step daObjBurnBox_c::create1st() {
+    cPhs_Step phaseStep = dComIfG_resLoad(&mPhaseReq, l_arcName[getType()]);
     if (phaseStep == cPhs_COMPLEATE_e) {
         int dzb_id = -1;
         u8 type = getType();
@@ -110,7 +110,7 @@ cPhs__Step daObjBurnBox_c::create1st() {
             dzb_id = 7;
         }
 
-        phaseStep = (cPhs__Step) MoveBGCreate(l_arcName[type], dzb_id, dBgS_MoveBGProc_TypicalRotY,
+        phaseStep = MoveBGCreate(l_arcName[type], dzb_id, dBgS_MoveBGProc_TypicalRotY,
                                              l_heap_size[type], NULL);
         if (phaseStep == cPhs_ERROR_e) {
             return phaseStep;