mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-14 11:53:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_tbox.cpp
+9 -9
View File
@@ -101,7 +101,7 @@ daTbox_ModelInfo* daTbox_c::getModelInfo() {
static const u32 l_open_se_id[3] = { Z2SE_OBJ_TBOX_OPEN_A, Z2SE_OBJ_TBOX_OPEN_B, Z2SE_OBJ_TBOX_OPEN_C };
cPhs__Step daTbox_c::commonShapeSet() {
cPhs_Step daTbox_c::commonShapeSet() {
daTbox_ModelInfo* model_info = getModelInfo();
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mModelResNo);
@@ -170,15 +170,15 @@ cPhs__Step daTbox_c::commonShapeSet() {
return cPhs_COMPLEATE_e;
}
cPhs__Step daTbox_c::effectShapeSet() {
cPhs_Step daTbox_c::effectShapeSet() {
return cPhs_COMPLEATE_e;
}
cPhs__Step daTbox_c::envShapeSet() {
cPhs_Step daTbox_c::envShapeSet() {
return cPhs_COMPLEATE_e;
}
cPhs__Step daTbox_c::bgCheckSet() {
cPhs_Step daTbox_c::bgCheckSet() {
daTbox_ModelInfo* model_info = getModelInfo();
cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(model_info->mArcName, model_info->mOpenDzbResNo);
@@ -325,7 +325,7 @@ u32 daTbox_c::calcHeapSize() {
}
int daTbox_c::CreateHeap() {
cPhs__Step step = commonShapeSet();
cPhs_Step step = commonShapeSet();
if (step != cPhs_COMPLEATE_e) {
return false;
}
@@ -1781,7 +1781,7 @@ void daTbox_c::mode_exec() {
}
}
cPhs__Step daTbox_c::create1st() {
cPhs_Step daTbox_c::create1st() {
if (!mParamsInit) {
field_0x980 = home.angle.x;
field_0x982 = home.angle.z;
@@ -1796,12 +1796,12 @@ cPhs__Step daTbox_c::create1st() {
}
daTbox_ModelInfo* model_info = getModelInfo();
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, model_info->mArcName);
cPhs_Step step = dComIfG_resLoad(&mPhase, model_info->mArcName);
if (step != cPhs_COMPLEATE_e) {
return step;
}
step = (cPhs__Step)MoveBGCreate(model_info->mArcName, model_info->mClosedDzbResNo,
step = MoveBGCreate(model_info->mArcName, model_info->mClosedDzbResNo,
dBgS_MoveBGProc_TypicalRotY, calcHeapSize(), NULL);
if (step == cPhs_ERROR_e) {
return step;
@@ -1877,7 +1877,7 @@ int daTbox_c::Delete() {
return true;
}
cPhs__Step daTbox_create1st(daTbox_c* i_this) {
cPhs_Step daTbox_create1st(daTbox_c* i_this) {
fopAcM_ct(i_this, daTbox_c);
return i_this->create1st();
}