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

Misc obj linkage (#2773)

Browse Source
This commit is contained in:
YunataSavior
2025-11-05 19:48:31 -08:00
committed by GitHub
parent c428403198
commit 653ff8979c
13 changed files with 116 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_swhang.cpp
+8 -6
View File
@@ -10,6 +10,7 @@
#include "d/actor/d_a_player.h"
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
// NONMATCHING - dEvLib_callback_c issues
@@ -41,7 +42,8 @@ static u32 const l_heap_size[5] = {
/* 80CFB938-80CFB9D8 000078 00A0+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */
static int nodeCallBack(J3DJoint* pJoint, int param_2) {
if (param_2 == 0) {
int jntNo = pJoint->getJntNo();
J3DJoint* my_joint = pJoint;
int jntNo = my_joint->getJntNo();
J3DModel* model = j3dSys.getModel();
daObjSwHang_c* i_this = (daObjSwHang_c*)model->getUserArea();
cMtx_copy(model->getAnmMtx(jntNo), mDoMtx_stack_c::get());
@@ -65,8 +67,9 @@ void daObjSwHang_c::initBaseMtx() {
/* 80CFBA60-80CFBAC8 0001A0 0068+00 2/2 0/0 0/0 .text setBaseMtx__13daObjSwHang_cFv */
void daObjSwHang_c::setBaseMtx() {
f32 hang_length = mHangLength + KREG_F(10);
mDoMtx_stack_c::transS(current.pos.x,
current.pos.y - mHangLength,
current.pos.y - hang_length,
current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
@@ -110,7 +113,6 @@ static dCcD_SrcSph l_sph_src = {
};
/* 80CFD37C-80CFD3BC 0000C4 0040+00 0/1 0/0 0/0 .data l_sph_src2 */
#pragma force_active on
static dCcD_SrcSph l_sph_src2 = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x4000, 0x11}, 0x18}}, // mObj
@@ -134,7 +136,7 @@ int daObjSwHang_c::Create() {
}
initBaseMtx();
if (mpBgW != NULL) {
dComIfG_Bgsp().Regist(mpBgW, this);
bool unused_r25 = dComIfG_Bgsp().Regist(mpBgW, this);
mpBgW->Move();
}
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -499,7 +501,7 @@ int daObjSwHang_c::Draw() {
/* 80CFCD98-80CFCE0C 0014D8 0074+00 1/0 0/0 0/0 .text Delete__13daObjSwHang_cFv */
int daObjSwHang_c::Delete() {
if (mpBgW != NULL && mpBgW->ChkUsed()) {
dComIfG_Bgsp().Release(mpBgW);
bool unused_r29 = dComIfG_Bgsp().Release(mpBgW);
}
dComIfG_resDelete(&mPhase, l_arcName[mType]);
return 1;
@@ -525,7 +527,7 @@ static int daObjSwHang_MoveBGExecute(daObjSwHang_c* i_this) {
/* 80CFCF60-80CFCF8C 0016A0 002C+00 1/0 0/0 0/0 .text daObjSwHang_MoveBGDraw__FP13daObjSwHang_c */
static int daObjSwHang_MoveBGDraw(daObjSwHang_c* i_this) {
return i_this->Draw();
return i_this->MoveBGDraw();
}
static void dummy() {