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_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp
index 85cb7f5955..9e0b3a4a8f 100644
--- a/src/d/actor/d_a_obj_barDesk.cpp
+++ b/src/d/actor/d_a_obj_barDesk.cpp
@@ -46,12 +46,12 @@ int daBarDesk_c::CreateHeap() {
     return 1;
 }
 
-cPhs__Step daBarDesk_c::create() {
+cPhs_Step daBarDesk_c::create() {
     fopAcM_ct(this, daBarDesk_c);
     if (fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) {
         return cPhs_ERROR_e;
     }
-    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "KHdesk");
+    cPhs_Step step = dComIfG_resLoad(&mPhase, "KHdesk");
     if (step == cPhs_COMPLEATE_e) {
         if (MoveBGCreate("KHdesk", 7, dBgS_MoveBGProc_TypicalRotY, 0xe50, NULL) == cPhs_ERROR_e) {
             return cPhs_ERROR_e;
@@ -148,7 +148,7 @@ static int daBarDesk_Delete(daBarDesk_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-static cPhs__Step daBarDesk_Create(fopAc_ac_c* i_this) {
+static cPhs_Step daBarDesk_Create(fopAc_ac_c* i_this) {
     return static_cast<daBarDesk_c*>(i_this)->create();
 }