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_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp
index a743466f7a..ab8f014d15 100644
--- a/src/d/actor/d_a_obj_bosswarp.cpp
+++ b/src/d/actor/d_a_obj_bosswarp.cpp
@@ -151,9 +151,9 @@ int daObjBossWarp_c::CreateHeap() {
     return 1;
 }
 
-cPhs__Step daObjBossWarp_c::create() {
+cPhs_Step daObjBossWarp_c::create() {
     fopAcM_ct(this, daObjBossWarp_c);
-    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
+    cPhs_Step step = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (step == cPhs_COMPLEATE_e) {
         if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x18e0)) {
             return cPhs_ERROR_e;
@@ -657,7 +657,7 @@ static int daObjBossWarp_Delete(daObjBossWarp_c* i_this) {
     return i_this->_delete();
 }
 
-static cPhs__Step daObjBossWarp_Create(fopAc_ac_c* i_this) {
+static cPhs_Step daObjBossWarp_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjBossWarp_c*>(i_this)->create();
 }