mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath
+5
View File
@@ -2,6 +2,7 @@
#define MSL_CMATH_H_
#include <float.h>
#include <arith.h>
#define NAN (*(float*) __float_nan)
#define HUGE_VALF (*(float*) __float_huge)
@@ -174,6 +175,10 @@ inline float abs(float x) {
return ::fabsf(x);
}
inline long abs(long x) {
return ::labs(x);
}
inline float fmod(float x, float y) {
return ::fmod(x, y);
}
src/SSystem/SComponent/c_phase.cpp
+2 -2
View File
@@ -6,12 +6,12 @@
#include "SSystem/SComponent/c_phase.h"
void cPhs_Reset(request_of_phase_process_class* phase) {
phase->id = cPhs_INIT_e;
phase->id = 0;
}
void cPhs_Set(request_of_phase_process_class* phase, cPhs__Handler* handlerTbl) {
phase->mpHandlerTable = handlerTbl;
phase->id = cPhs_INIT_e;
phase->id = 0;
}
void cPhs_UnCompleate(request_of_phase_process_class* phase) {
src/c/c_dylink.cpp
+4 -4
View File
@@ -1022,7 +1022,7 @@ int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) {
(request_of_phase_process_fn)cDylPhs::phase_03
};
if (i_phase->id == cPhs_NEXT_e) {
if (i_phase->id == 2) {
return cPhs_COMPLEATE_e;
}
@@ -1030,11 +1030,11 @@ int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) {
}
int cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 i_ProfName) {
JUT_ASSERT(460, i_phase->id != cPhs_LOADING_e);
JUT_ASSERT(460, i_phase->id != 1);
if (i_phase->id == cPhs_NEXT_e) {
if (i_phase->id == 2) {
int ret = cDyl_Unlink(i_ProfName);
i_phase->id = cPhs_INIT_e;
i_phase->id = 0;
return ret;
}
src/d/actor/d_a_grass.cpp
+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
src/d/actor/d_a_kago.cpp
+1014 -1024
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_mg_fshop.cpp
+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
src/d/actor/d_a_npc_wrestler.cpp
+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
src/d/actor/d_a_obj_volcball.cpp
+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
src/d/d_camera.cpp
+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,
src/d/d_com_inf_game.cpp
+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;
}
src/d/d_path.cpp
+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
src/d/d_s_logo.cpp
+776 -116
View File
File diff suppressed because it is too large Load Diff
src/d/d_s_play.cpp
+944 -92
View File
File diff suppressed because it is too large Load Diff
src/d/d_stage.cpp
+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");
}
src/f_op/f_op_actor_mng.cpp
+2 -2
View File
@@ -895,7 +895,7 @@ bool fopAcM_checkCullingBox(Mtx m, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z
return false;
}
static cull_box l_cullSizeBox[] = {
cull_box l_cullSizeBox[fopAc_CULLBOX_MAX_e] = {
{
{-40.0f, 0.0f, -40.0f},
{40.0f, 125.0f, 40.0f},
@@ -960,7 +960,7 @@ static cull_box l_cullSizeBox[] = {
#endif
};
static cull_sphere l_cullSizeSphere[] = {
cull_sphere l_cullSizeSphere[fopAc_CULLSPHERE_MAX_e] = {
{
{0.0f, 0.0f, 0.0f},
80.0f,
src/f_op/f_op_kankyo.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
static int fopKy_KANKYO_TYPE;
void fopKy_IsKankyo(void* i_this) {
fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type);
BOOL fopKy_IsKankyo(void* i_this) {
return fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type);
}
static int fopKy_Draw(void* i_this) {
src/f_op/f_op_kankyo_mng.cpp
+2 -2
View File
@@ -11,8 +11,8 @@ void dummy(fpcLyIt_JudgeFunc i_createFunc, void* i_this) {
fpcM_Search(i_createFunc, i_this);
}
void fopKyM_IsKy(void* i_this) {
fopKy_IsKankyo((fopKyM_prm_class*)i_this);
BOOL fopKyM_IsKy(void* i_this) {
return fopKy_IsKankyo((fopKyM_prm_class*)i_this);
}
fopKyM_prm_class* fopKyM_CreateAppend() {
src/m_Do/m_Do_audio.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ u8 mDoAud_zelAudio_c::mInitFlag;
u8 mDoAud_zelAudio_c::mResetFlag;
bool mDoAud_zelAudio_c::mBgmSet;
u8 mDoAud_zelAudio_c::mBgmSet;
void mDoAud_zelAudio_c::reset() {
mBgmSet = false;