mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-27 06:45:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update dtk-template (#2453)

Browse Source 
* Update dtk-template

* Fix debug build

* Fix d_event_debug includes

* Progress reports: Enable function relocation diffing (data_value)

* Fix some diffs

* Fix a few more diffs

* More fixes
This commit is contained in:
LagoLunatic
2025-05-23 01:25:06 -04:00
committed by GitHub
parent 3c2a99e701
commit 0212d1d18e
23 changed files with 118 additions and 9262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JAudio2/JAISeMgr.cpp
-5
View File
@@ -336,8 +336,3 @@ int JAISeMgr::getNumActiveSe() const {
}
return sum;
}
u8 data_80451310[8];
/* 80451318-80451320 000818 0008+00 0/0 7/7 0/0 .sbss None */
u8 data_80451318[8];
src/JSystem/JAudio2/JASReport.cpp
-6
View File
@@ -52,9 +52,3 @@ void JASReport(const char * str, ...) {
sLineCount++;
}
}
/* ############################################################################################## */
/* 80451230-80451238 -00001 0008+00 0/0 6/6 0/0 .sbss None */
/* 80451230 0001+00 data_80451230 None */
/* 80451231 0007+00 data_80451231 None */
u8 struct_80451230[8];
src/d/actor/d_a_alink.cpp
+9 -9
View File
@@ -58,31 +58,31 @@ BOOL daAlink_c::getE3Zhint() {
}
/* 80452C50-80452C58 001250 0005+03 2/2 0/0 0/0 .sdata2 l_wArcName */
static const char l_wArcName[8] = "Wmdl";
static const char l_wArcName[] = "Wmdl";
/* 80452C58-80452C60 001258 0005+03 2/2 0/0 0/0 .sdata2 l_bArcName */
static const char l_bArcName[8] = "Bmdl";
static const char l_bArcName[] = "Bmdl";
/* 80452C60-80452C68 001260 0005+03 2/2 0/0 0/0 .sdata2 l_kArcName */
static const char l_kArcName[8] = "Kmdl";
static const char l_kArcName[] = "Kmdl";
/* 80452C68-80452C70 001268 0005+03 2/2 0/0 0/0 .sdata2 l_zArcName */
static const char l_zArcName[8] = "Zmdl";
static const char l_zArcName[] = "Zmdl";
/* 80452C70-80452C78 001270 0005+03 3/3 0/0 0/0 .sdata2 l_mArcName */
static const char l_mArcName[8] = "Mmdl";
static const char l_mArcName[] = "Mmdl";
/* 80452C78-80452C80 001278 0006+02 1/1 0/0 0/0 .sdata2 l_hyShdArcName */
static const char l_hyShdArcName[8] = "HyShd";
static const char l_hyShdArcName[] = "HyShd";
/* 80452C80-80452C88 001280 0006+02 1/1 0/0 0/0 .sdata2 l_cWShdArcName */
static const char l_cWShdArcName[8] = "CWShd";
static const char l_cWShdArcName[] = "CWShd";
/* 80452C88-80452C90 001288 0006+02 1/1 0/0 0/0 .sdata2 l_sWShdArcName */
static const char l_sWShdArcName[8] = "SWShd";
static const char l_sWShdArcName[] = "SWShd";
/* 80452C90-80452C98 001290 0006+02 7/7 0/0 0/0 .sdata2 l_arcName */
static const char l_arcName[8] = "Alink";
static const char l_arcName[] = "Alink";
/* 8009D884-8009D88C 0981C4 0008+00 0/0 0/0 13/13 .text getAlinkArcName__9daAlink_cFv */
const char* daAlink_c::getAlinkArcName() {
src/d/actor/d_a_b_ob.cpp
+1 -1
View File
@@ -1526,7 +1526,7 @@ static int fish_normal(b_ob_class* i_this) {
i_this->field_0x47b4 = 0;
} else {
i_this->mTargetMovePos.x = a_this->home.pos.x + cM_rndFX(2000.0f);
i_this->mTargetMovePos.y = a_this->home.pos.y + 1000.0f + cM_rndFX(2000.0f);
i_this->mTargetMovePos.y = a_this->home.pos.y + 1000.0f + cM_rndF(2000.0f);
i_this->mTargetMovePos.z = a_this->home.pos.z + cM_rndFX(2000.0f);
i_this->mTimers[0] = cM_rndF(30.0f) + 30.0f;
}
src/d/actor/d_a_npc.cpp
-5
View File
@@ -5198,11 +5198,6 @@ void daNpcF_c::setParam() {
/* empty function */
}
/* 80155BCC-80155BD0 15050C 0004+00 2/0 0/0 0/0 .text drawOtherMdls__8daNpcF_cFv */
void daNpcF_c::drawOtherMdls() {
/* empty function */
}
/* 80155BD0-80155BD8 150510 0008+00 2/0 0/0 0/0 .text drawDbgInfo__8daNpcF_cFv */
BOOL daNpcF_c::drawDbgInfo() {
return true;
src/d/actor/d_a_obj_item.cpp
+3 -6
View File
@@ -25,9 +25,6 @@ extern "C" void checkPlayerGet__8daItem_cFv();
// External References:
//
// cLib_calcTimer<u8>
extern "C" u8 func_80141AE8(u8*);
extern "C" extern void* __vt__16Z2SoundObjSimple[8];
extern "C" void __dl__FPv();
extern "C" void __dt__14Z2SoundObjBaseFv();
@@ -546,7 +543,7 @@ void daItem_c::procWaitGetDemoEvent() {
return;
}
if (func_80141AE8(&field_0x9c1) == 0 || checkItemGet(m_itemNo, 1)) {
if (cLib_calcTimer<u8>(&field_0x9c1) == 0 || checkItemGet(m_itemNo, 1)) {
if (fopAcM_delete(m_item_id)) {
// "Item: Get Item deleted because Get Demo was canceled\n"
OS_REPORT("アイテム：ゲットデモ中止されたので、ゲットアイテム削除しました\n");
@@ -645,7 +642,7 @@ void daItem_c::procMainSwOnWait() {
OS_REPORT("水面より下で発生wtr<%.2f>my<%.2f>\n", mAcch.m_wtr.GetHeight(), home.pos.y);
}
if (func_80141AE8(&mSwOnWaitTimer) == 0) {
if (cLib_calcTimer<u8>(&mSwOnWaitTimer) == 0) {
show();
procInitNormal();
}
@@ -1153,7 +1150,7 @@ int daItem_c::CountTimer() {
}
}
func_80141AE8(&mBoomWindTgTimer);
cLib_calcTimer<u8>(&mBoomWindTgTimer);
return 1;
}
src/d/actor/d_a_obj_lp.cpp
+1 -1
View File
@@ -349,7 +349,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
for (int i = 0; i < i_this->field_0xad98; i++) {
f32* mSize = i_this->field_0xad7c.getSize(i);
for (int j = 0; j < 3; j++) {
*mSize = 0.1f + 1.3f;
*mSize = 1.3f;
mSize++;
}
}
src/d/actor/d_a_obj_magLiftRot.cpp
+1 -1
View File
@@ -631,7 +631,7 @@ void daMagLiftRot_c::init_modeMove() {
void daMagLiftRot_c::modeMove() {
cLib_chaseF(&speedF, l_HIO.mMaxSpeed, l_HIO.mAcceleration);
if (cLib_addCalcAngleS(&current.angle.z, field_0x5e2, 1, fopAcM_GetSpeedF(this) * 182.0444f,
if (cLib_addCalcAngleS(&current.angle.z, field_0x5e2, 1, fopAcM_GetSpeedF(this) * 182.04445f,
1) == 0)
{
field_0x5e2 += 0x8000;
src/d/d_event_debug.cpp
+20 -9049
View File
File diff suppressed because it is too large Load Diff
src/d/d_file_select.cpp
+3
View File
@@ -4278,3 +4278,6 @@ void dFile_select3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz*
void dFile_select3D_c::calcViewMtx(Mtx param_0) {
cMtx_lookAt(param_0, &cXyz(0.0f, 0.0f, -1000.0f), &cXyz::Zero, &cXyz(0.0f, 1.0f, 0.0f), 0);
}
// Fakematch, should be defined in header but it gets put in the wrong TU
void J2DAnmTransform::getTransform(u16, J3DTransformInfo*) const {}
src/d/d_kankyo.cpp
+3 -3
View File
@@ -3057,9 +3057,9 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr
{
cLib_addCalc(&tevstr_p->field_0x344, 0.0f, 0.75f, 0.21f, 0.0001f);
} else if (tevstr_p->Type == 9 && player->getSinkShapeOffset() < -35.0f) {
cLib_addCalc(&tevstr_p->field_0x344, 0.0f, 0.1f, 0.001f, 0.00001f);
cLib_addCalc(&tevstr_p->field_0x344, 0.0f, 0.1f, 0.01f, 0.00001f);
} else if (tevstr_p->Type == 10 && player->getSinkShapeOffset() < -100.0f) {
cLib_addCalc(&tevstr_p->field_0x344, 0.0f, 0.1f, 0.001f, 0.00001f);
cLib_addCalc(&tevstr_p->field_0x344, 0.0f, 0.1f, 0.01f, 0.00001f);
} else if (init_timer != 0) {
tevstr_p->field_0x344 = kankyo->field_0x1238 +
(var_f31 * (kankyo->field_0x123c - kankyo->field_0x1238));
@@ -5001,7 +5001,7 @@ void dKy_fog_startendz_set(f32 param_0, f32 param_1, f32 ratio) {
ratio = 0.0f;
}
if (ratio < 0.0000000000001f) {
if (ratio < 0.0001f) {
ratio = 0.0f;
}
src/d/d_kankyo_rain.cpp
+1 -1
View File
@@ -4237,7 +4237,7 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) {
temp_f29 *= temp_f29 * temp_f29;
var_f28 += 1.0f + (3.0f * temp_f29);
if (var_f28 > 200.0f) {
var_f28 = 20.0f * (i / 2800.0f);
var_f28 = 20.0f * (i / 1200.0f);
}
static const GXColor star_col[] = {