mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-06 11:07:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous retail+debug fixes, link several new TUs (#2836)

Browse Source
This commit is contained in:
Max Roncace
2025-11-21 02:09:21 -05:00
committed by GitHub
parent f171287913
commit 81017cf22c
24 changed files with 1354 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_cblock.cpp
+158 -49
View File
@@ -5,25 +5,50 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "Z2AudioLib/Z2Instances.h"
#include "d/actor/d_a_obj_cblock.h"
#include "d/actor/d_a_player.h"
#include "d/d_cc_d.h"
#include "d/d_path.h"
#include "d/actor/d_a_player.h"
#include "Z2AudioLib/Z2Instances.h"
#include "d/d_s_play.h"
/* 80BC5A0C-80BC5A48 0000EC 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjCBlk_cFv */
void daObjCBlk_c::initBaseMtx() {
model1->setBaseScale(scale);
setBaseMtx();
}
#if DEBUG
#define TRAVEL_TIME (l_HIO.mTravelTime)
#define TRAVEL_DIST (l_HIO.mTravelDist)
#else
#define TRAVEL_TIME (13)
#define TRAVEL_DIST (50.0f)
#endif
/* 80BC5A48-80BC5ABC 000128 0074+00 1/1 0/0 0/0 .text setBaseMtx__11daObjCBlk_cFv */
void daObjCBlk_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y,current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
model1->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
class daObjCBlk_HIO_c : public mDoHIO_entry_c {
public:
daObjCBlk_HIO_c();
virtual ~daObjCBlk_HIO_c() {}
#if DEBUG
void genMessage(JORMContext*);
#endif
/* 0x06 */ u8 field_0x06;
/* 0x07 */ u8 field_0x07;
/* 0x08 */ u8 mWaitTime;
/* 0x09 */ u8 mTravelTime;
/* 0x0C */ f32 mGravity;
/* 0x10 */ f32 mTravelDist;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
};
/* 80BC6C9C-80BC6CA8 000054 000C+00 1/2 0/0 0/0 .bss l_chainOffset */
static cXyz l_chainOffset(0.0f, 105.0f, 30.0f);
/* 80BC6CB4-80BC6CC4 00006C 000C+04 0/1 0/0 0/0 .bss l_smokeSetOffset */
static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f);
#if !DEBUG
static s32 unused_bss_70 = 0;
#endif
/* ############################################################################################## */
/* 80BC6A38-80BC6A50 000000 0018+00 5/5 0/0 0/0 .rodata l_cull_box */
@@ -51,12 +76,55 @@ static dCcD_SrcCyl l_cyl_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
60.0f, // mRadius
300.0f // mHeight
} // mCyl
{0.0f, 0.0f, 0.0f}, // mCenter
60.0f, // mRadius
300.0f // mHeight
} // mCyl
};
#if DEBUG
daObjCBlk_HIO_c::daObjCBlk_HIO_c() {
field_0x06 = 0;
field_0x07 = 0;
mGravity = -6.0f;
mTravelDist = 50.0f;
mTravelTime = 13;
mWaitTime = 8;
field_0x14 = 35.0f;
field_0x18 = 35.0f;
field_0x1c = 15.0f;
}
static f32 dummy1() {
return 15.0f;
}
void daObjCBlk_HIO_c::genMessage(JORMContext* ctx) {
// "Chained block"
ctx->genLabel("チェーン付きブロック", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("重力", &mGravity, -10.0f, -0.1f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("移動時間", &mTravelTime, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("タメ時間", &mWaitTime, 0.0f, 10.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("移動距離", &mTravelDist, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
}
static daObjCBlk_HIO_c l_HIO;
#endif
/* 80BC5A0C-80BC5A48 0000EC 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjCBlk_cFv */
void daObjCBlk_c::initBaseMtx() {
model1->setBaseScale(scale);
setBaseMtx();
}
/* 80BC5A48-80BC5ABC 000128 0074+00 1/1 0/0 0/0 .text setBaseMtx__11daObjCBlk_cFv */
void daObjCBlk_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y,current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
model1->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80BC5ABC-80BC5CBC 00019C 0200+00 1/0 0/0 0/0 .text Create__11daObjCBlk_cFv */
int daObjCBlk_c::Create() {
u8 pathId = getPathID();
@@ -138,13 +206,6 @@ daObjCBlk_c::chain_s::~chain_s() {
daObjCBlk_c::chain_s::chain_s() {
}
static inline void dummylfunc() {
static daObjCBlk_c::modeFunc l_func[2] = {
&daObjCBlk_c::modeWait,
&daObjCBlk_c::modeWalk,
};
}
/* 80BC5E98-80BC6020 000578 0188+00 1/1 0/0 0/0 .text create__11daObjCBlk_cFv */
int daObjCBlk_c::create() {
fopAcM_ct(this, daObjCBlk_c);
@@ -155,6 +216,10 @@ int daObjCBlk_c::create() {
return rv;
}
OS_REPORT("CHAIN BLOCK:%x\n", fopAcM_GetParam(this));
#if DEBUG
l_HIO.entryHIO("チェーン付きブロック");
#endif
}
return rv;
}
@@ -165,6 +230,21 @@ int daObjCBlk_c::Execute(f32 (**mtx)[3][4]) {
return 1;
}
void daObjCBlk_c::block_mode_proc_call() {
static modeFunc l_func[2] = {
&daObjCBlk_c::modeWait,
&daObjCBlk_c::modeWalk,
};
(this->*(l_func[field_0xc1e]))();
}
#if DEBUG
static void dummy5() {
OS_REPORT("Delete -> ChainBlock(id=%d)\n");
OS_REPORT("Create -> ChainBlock(id=%d)\n");
}
#endif
/* 80BC6270-80BC627C 000950 000C+00 2/2 0/0 0/0 .text initWait__11daObjCBlk_cFv */
void daObjCBlk_c::initWait() {
field_0xc1f = 0;
@@ -183,18 +263,23 @@ void daObjCBlk_c::modeWait() {
mDoMtx_stack_c::multVec(&cStack_44, &cStack_44);
cStack_38.normalizeZP();
cStack_44.normalizeZP();
f32 dVar7 = fabs(cStack_38.inprod(cStack_44));
if (dVar7 > 0.95000005f) {
f32 inprod = cStack_38.inprod(cStack_44);
if (std::fabs(inprod) > 0.95000005f + KREG_F(4)) {
bVar1 = true;
}
if (field_0xc1c != 0 && field_0xc1e != 0) {
setPower(power);
if (bVar1) {
field_0xca3++;
if (!checkWall() && player->getBaseAnimeFrame() > 6.0f && player->getBaseAnimeFrame() < 8.0f &&
field_0xca3 > 8)
if (!checkWall() && player->getBaseAnimeFrame() > 6.0f && player->getBaseAnimeFrame() < 8.0f)
{
initWalk();
#if DEBUG
if (field_0xca3 > l_HIO.mWaitTime) {
#else
if (field_0xca3 > 8) {
#endif
initWalk();
}
}
}
} else {
@@ -204,21 +289,24 @@ void daObjCBlk_c::modeWait() {
/* 80BC6414-80BC6430 000AF4 001C+00 1/1 0/0 0/0 .text initWalk__11daObjCBlk_cFv */
void daObjCBlk_c::initWalk() {
walkTimer = 13;
field_0xca6 = 2520;
u8 travelTime = TRAVEL_TIME;
walkTimer = travelTime;
field_0xca6 = 0x7fff / travelTime;
field_0xc1f = 1;
}
/* 80BC6430-80BC65CC 000B10 019C+00 1/0 0/0 0/0 .text modeWalk__11daObjCBlk_cFv */
void daObjCBlk_c::modeWalk() {
u8 travelTime = TRAVEL_TIME;
f32 travelDist = TRAVEL_DIST;
cLib_calcTimer(&walkTimer);
f32 dVar5 = cM_scos(field_0xca6 * (13 - walkTimer));
dVar5 = (1.0f - dVar5) * 0.5f;
f32 dVar5 = (1.0f - cM_scos(field_0xca6 * (travelTime - walkTimer))) * 0.5f;
cXyz local_58(0.0f, 0.0f, 1.0f);
mDoMtx_stack_c::YrotS(home.angle.y);
mDoMtx_stack_c::multVec(&local_58, &local_58);
current.pos.x = home.pos.x + local_58.x * (50.0f * (field_0xca2 + dVar5));
current.pos.z = home.pos.z + local_58.z * (50.0f * (field_0xca2 + dVar5));
current.pos.x = home.pos.x + local_58.x * (travelDist * (field_0xca2 + dVar5));
current.pos.z = home.pos.z + local_58.z * (travelDist * (field_0xca2 + dVar5));
setPower(power);
fopAcM_seStartLevel(this, Z2SE_OBJ_CBLOCK_SLIDEMOVE, 0);
if (walkTimer == 0) {
@@ -227,9 +315,6 @@ void daObjCBlk_c::modeWalk() {
}
}
/* 80BC6C9C-80BC6CA8 000054 000C+00 1/2 0/0 0/0 .bss l_chainOffset */
static cXyz l_chainOffset(0.0f, 105.0f, 30.0f);
/* 80BC65CC-80BC6648 000CAC 007C+00 2/2 0/0 0/0 .text getChainBasePos__11daObjCBlk_cFP4cXyz */
void daObjCBlk_c::getChainBasePos(cXyz* pPos) {
*pPos = l_chainOffset;
@@ -241,24 +326,36 @@ void daObjCBlk_c::getChainBasePos(cXyz* pPos) {
/* 80BC6648-80BC66DC 000D28 0094+00 2/2 0/0 0/0 .text setPower__11daObjCBlk_cFf */
void daObjCBlk_c::setPower(f32 power) {
daPy_py_c* player = daPy_getPlayerActorClass();
chain_s* pChain = chains;
chain_s* pChain = chains + 5;
cXyz local_28;
local_28 = pChain[4].position - pChain[5].position;
local_28 = pChain[-1].position - pChain[0].position;
s16 angle = cM_atan2s(local_28.x, local_28.z);
player->setOutPower(power, angle, 0);
}
static f32 dummy() {
static f32 dummy2() {
f32 f0 = -6.0f;
#if DEBUG
f32 f1 = 3.0f / 20.0f;
#else
f32 f1 = 3.0f / 40.0f;
#endif
f32 f2 = 100.0f;
f32 f3 = 15.0f;
f32 f4 = 35.0f;
#if DEBUG
f32 f5 = 5.0f;
f32 f6 = 0.0f;
f32 f7 = 0.0f;
f32 f8 = 0.0f;
f32 f9 = 0.0f;
#else
f64 f5 = 0.5;
f64 f6 = 3.0;
f64 f7 = 0.0;
f32 f8 = 195.0f;
f32 f9 = 210.0f;
#endif
return f0 + f1 * (f2 - f3 * (f4 - f5 * (f6 - f7 * f8 - (f7 - f9))));
}
@@ -266,7 +363,7 @@ static f32 dummy() {
BOOL daObjCBlk_c::checkWall() {
cXyz acStack_30[2] = {cXyz(-95.0f, 5.0f, 1.0f), cXyz(95.0f, 5.0f, 1.0f)};
cXyz cStack_40(0.0f, 0.0f, 1.0f);
cStack_40.z = 50.0f;
cStack_40.z = TRAVEL_DIST;
BOOL rv = FALSE;
for (int i = 0; i < 2; i++) {
cXyz cStack_4c(acStack_30[i]);
@@ -276,6 +373,10 @@ BOOL daObjCBlk_c::checkWall() {
cStack_4c += current.pos;
mDoMtx_stack_c::multVec(&cStack_58, &cStack_58);
cStack_58 += cStack_4c;
#if DEBUG
field_0xcb0_debug[i] = cStack_4c;
field_0xcc8_debug[i] = cStack_58;
#endif
if (fopAcM_lc_c::lineCheck(&cStack_4c, &cStack_58, this)) {
rv = TRUE;
}
@@ -291,6 +392,9 @@ int daObjCBlk_c::Draw() {
/* 80BC6870-80BC68A4 000F50 0034+00 1/0 0/0 0/0 .text Delete__11daObjCBlk_cFv */
int daObjCBlk_c::Delete() {
dComIfG_resDelete(&phase, l_arcName);
#if DEBUG
l_HIO.removeHIO();
#endif
return 1;
}
@@ -308,19 +412,24 @@ static int daObjCBlk_Execute(daObjCBlk_c* i_this) {
/* 80BC68F0-80BC6910 000FD0 0020+00 1/0 0/0 0/0 .text daObjCBlk_Delete__FP11daObjCBlk_c
*/
static int daObjCBlk_Delete(daObjCBlk_c* i_this) {
fpc_ProcID unusedId = fopAcM_GetID(i_this);
return i_this->MoveBGDelete();
}
/* 80BC6910-80BC6930 000FF0 0020+00 1/0 0/0 0/0 .text daObjCBlk_Create__FP10fopAc_ac_c */
static int daObjCBlk_Create(fopAc_ac_c* i_this) {
fopAcM_GetID(i_this);
return static_cast<daObjCBlk_c*>(i_this)->create();
daObjCBlk_c* cblock = static_cast<daObjCBlk_c*>(i_this);
fpc_ProcID unusedId = fopAcM_GetID(i_this);
return cblock->create();
}
/* 80BC6CB4-80BC6CC4 00006C 000C+04 0/1 0/0 0/0 .bss l_smokeSetOffset */
static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f);
static s32 unused_bss_70 = 0;
#if DEBUG
static const u32 dummy3[3] = {
0xff0000ff,
0x0000ffff,
0x00ff00ff,
};
#endif
AUDIO_INSTANCES;