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
@@ -284,7 +284,7 @@ daNpcMoiR_c::~daNpcMoiR_c() {
#endif
}
cPhs__Step daNpcMoiR_c::Create() {
cPhs_Step daNpcMoiR_c::Create() {
fopAcM_ct(this, daNpcMoiR_c);
if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 && dComIfG_play_c::getLayerNo(0) == 4) {
@@ -315,9 +315,9 @@ cPhs__Step daNpcMoiR_c::Create() {
}
mMsgNo = getMessageNo();
cPhs__Step phase = cPhs_ERROR_e;
cPhs_Step phase = cPhs_ERROR_e;
for (int i = 0; l_loadRes_list[mMode][i] >= 0; i++) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_arcNames[l_loadRes_list[mMode][i]]);
phase = dComIfG_resLoad(&mPhase[i], l_arcNames[l_loadRes_list[mMode][i]]);
if (phase != cPhs_COMPLEATE_e) {
return phase;
}