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
+4 -4
View File
@@ -80,14 +80,14 @@ int daObjWindow_c::CreateHeap() {
return 1;
}
cPhs__Step daObjWindow_c::create1st() {
cPhs_Step daObjWindow_c::create1st() {
mType = getType();
if (mType == 0xff) {
mType = 0;
}
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
cPhs_Step step = dComIfG_resLoad(&mPhaseReq, l_arcName);
if (step == cPhs_COMPLEATE_e) {
step = (cPhs__Step)MoveBGCreate(l_arcName, 12, NULL, 0xee0, NULL);
step = MoveBGCreate(l_arcName, 12, NULL, 0xee0, NULL);
if (step == cPhs_ERROR_e) {
return step;
}
@@ -152,7 +152,7 @@ int daObjWindow_c::Delete() {
return 1;
}
static cPhs__Step daObjWindow_create1st(daObjWindow_c* i_this) {
static cPhs_Step daObjWindow_create1st(daObjWindow_c* i_this) {
fopAcM_ct(i_this, daObjWindow_c);
return i_this->create1st();
}