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
@@ -84,13 +84,13 @@ int daLv2Candle_c::CreateHeap() {
return true;
}
cPhs__Step daLv2Candle_c::create() {
cPhs_Step daLv2Candle_c::create() {
fopAcM_ct(this, daLv2Candle_c);
mModelType = getModelType();
if (mModelType == 0xf) {
mModelType = 0;
}
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_resNameIdx[mModelType]);
cPhs_Step step = dComIfG_resLoad(&mPhase, l_resNameIdx[mModelType]);
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x1000)) {
return cPhs_ERROR_e;
@@ -382,7 +382,7 @@ static int daLv2Candle_Delete(daLv2Candle_c* i_this) {
return i_this->Delete();
}
static cPhs__Step daLv2Candle_Create(fopAc_ac_c* i_this) {
static cPhs_Step daLv2Candle_Create(fopAc_ac_c* i_this) {
return static_cast<daLv2Candle_c*>(i_this)->create();
}