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
@@ -19,7 +19,7 @@
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
daObj_Maki_HIO_c::daObj_Maki_HIO_c() {
field_0x4 = -1;
@@ -178,7 +178,7 @@ int useHeapInit(fopAc_ac_c* i_this) {
daObj_Maki_HIO_c l_HIO;
cPhs__Step daObj_Maki_Create(fopAc_ac_c* i_this) {
cPhs_Step daObj_Maki_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, obj_maki_class);
obj_maki_class* a_this = (obj_maki_class*)i_this;
static dCcD_SrcSph cc_sph_src = {
@@ -193,7 +193,7 @@ cPhs__Step daObj_Maki_Create(fopAc_ac_c* i_this) {
} // mSphAttr
};
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&a_this->mPhase, "Obj_maki");
cPhs_Step phase = dComIfG_resLoad(&a_this->mPhase, "Obj_maki");
if (phase == cPhs_COMPLEATE_e) {
a_this->field_0x57c = (u8)fopAcM_GetParam(a_this);
u32 cVar3 = fopAcM_GetParam(a_this) >> 0x18;