d_s_logo / d_s_play debug work, d_a_kago cleanup, misc cleanup (#3116)

* d_a_kago cleanup

* d_s_logo wii/shield work

* d_s_logo / d_s_play debug work

* fix missing profile class sizeof's

* fix phase->id values

* build fixes

* fix dCamera_c and camera profile
This commit is contained in:
TakaRikka
2026-03-01 13:19:48 -08:00
committed by GitHub
parent 6a48380461
commit 6e149819e1
49 changed files with 3113 additions and 1354 deletions
+1 -1
View File
@@ -406,7 +406,7 @@ actor_process_profile_definition g_profile_GRASS = {
fpcPi_CURRENT_e, // mListPrio
PROC_GRASS, // mProcName
&g_fpcLf_Method.base, // sub_method
0x00000570, // mSize
sizeof(daGrass_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
+1014 -1024
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1778,7 +1778,7 @@ actor_process_profile_definition g_profile_FSHOP = {
fpcPi_CURRENT_e, // mListPrio
PROC_FSHOP, // mProcName
&g_fpcLf_Method.base, // sub_method
0x00006B80, // mSize
sizeof(fshop_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
+1 -1
View File
@@ -5226,7 +5226,7 @@ actor_process_profile_definition g_profile_NPC_WRESTLER = {
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_WRESTLER, // mProcName
&g_fpcLf_Method.base, // sub_method
0xEA0, // mSize (fix this)
sizeof(daNpcWrestler_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
+1 -1
View File
@@ -618,7 +618,7 @@ actor_process_profile_definition g_profile_Obj_VolcanicBall = {
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_VolcanicBall, // mProcName
&g_fpcLf_Method.base, // sub_method
0x00002928, // mSize
sizeof(daObjVolcBall_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
+2 -2
View File
@@ -11212,7 +11212,7 @@ camera_process_profile_definition g_profile_CAMERA = {
fpcPi_CURRENT_e,
PROC_CAMERA,
&g_fpcLf_Method.base,
sizeof(dCamera_c),
sizeof(camera_class),
0,
0,
&g_fopVw_Method,
@@ -11233,7 +11233,7 @@ camera_process_profile_definition g_profile_CAMERA2 = {
fpcPi_CURRENT_e,
PROC_CAMERA2,
&g_fpcLf_Method.base,
sizeof(dCamera_c),
sizeof(camera_class),
0,
0,
&g_fopVw_Method,
+4 -4
View File
@@ -1287,7 +1287,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa
static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2,
(int (*)(void*))phase_3};
if (i_phase->id == cPhs_NEXT_e) {
if (i_phase->id == 2) {
return cPhs_COMPLEATE_e;
}
@@ -1335,7 +1335,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
static int (*l_method[3])(void*) = {(int (*)(void*))phase_01, (int (*)(void*))phase_02,
(int (*)(void*))phase_03};
if (i_phase->id == cPhs_NEXT_e) {
if (i_phase->id == 2) {
return cPhs_COMPLEATE_e;
}
@@ -1352,12 +1352,12 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
*/
int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* i_resName) {
JUT_ASSERT(1889, i_phase->id != 1);
if (i_phase->id != cPhs_NEXT_e) {
if (i_phase->id != 2) {
return 0;
}
int r30 = dComIfG_deleteObjectResMain(i_resName);
i_phase->id = cPhs_INIT_e;
i_phase->id = 0;
return 1;
}
+19
View File
@@ -111,3 +111,22 @@ u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* par
return 1;
}
#if VERSION == VERSION_SHIELD_DEBUG
void dPath_Ct() {
#if DEBUG
#endif
}
void dPath_Dt() {
#if DEBUG
#endif
}
void dPath_Move() {}
void dPath_Draw() {
#if DEBUG
#endif
}
#endif
+776 -116
View File
File diff suppressed because it is too large Load Diff
+944 -92
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1552,7 +1552,7 @@ u8 data_8074C56A_debug;
u8 data_8074C56B_debug;
u8 data_8074C56C_debug;
u32 dStage_roomControl_c::mProcID;
fpc_ProcID dStage_roomControl_c::mProcID;
s8 dStage_roomControl_c::mStayNo;
@@ -2485,7 +2485,7 @@ static void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) {
}
#if DEBUG
static void dStage_DebugDisp() {
void dStage_DebugDisp() {
if (data_8074C569_debug) {
JUTReport(30, 270, "envLayerSet: EnvRoom None");
}