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
This commit is contained in:
TakaRikka
2026-01-24 23:36:23 -08:00
committed by GitHub
parent 6f73e18bd2
commit c9e2a73dda
612 changed files with 4052 additions and 1141 deletions
+3 -3
View File
@@ -2669,7 +2669,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return a_this->CreateHeap();
}
cPhs__Step daE_OC_c::create() {
cPhs_Step daE_OC_c::create() {
fopAcM_ct(this, daE_OC_c);
field_0x6b4 = fopAcM_GetParam(this) & 0xFF;
if (field_0x6b4 == 0xFF) {
@@ -2706,9 +2706,9 @@ cPhs__Step daE_OC_c::create() {
mName = "E_OC2";
}
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReqs[0], mName);
cPhs_Step phase = dComIfG_resLoad(&mPhaseReqs[0], mName);
if (phase == cPhs_COMPLEATE_e) {
phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReqs[1], "E_ocb");
phase = dComIfG_resLoad(&mPhaseReqs[1], "E_ocb");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_OC PARAM %x\n", fopAcM_GetParam(this));
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x2e40)) {