Skip to content

Commit

Permalink
progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@elijah-thomas774
elijah-thomas774 committed Nov 18, 2024
1 parent 8b39459 commit 7bb27a1
Show file tree
Hide file tree
Showing 18 changed files with 317 additions and 92 deletions.
1 change: 1 addition & 0 deletions config/SOUE01/rels/d_a_obj_ivy_ropeNP/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ REL/global_destructor_chain.c:
REL/d/a/obj/d_a_obj_ivy_rope.cpp:
.text start:0x000000F0 end:0x0000F2E8
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x00000310
.data start:0x00000000 end:0x000005D4
.bss start:0x00000008 end:0x000002A0
2 changes: 1 addition & 1 deletion config/SOUE01/rels/d_a_obj_ivy_ropeNP/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ fn_256_C980 = .text:0x0000C980; // type:function size:0x30
fn_256_C9B0 = .text:0x0000C9B0; // type:function size:0x384
fn_256_CD40 = .text:0x0000CD40; // type:function size:0xDC
fn_256_CE20 = .text:0x0000CE20; // type:function size:0x17C
fn_256_CFA0 = .text:0x0000CFA0; // type:function size:0xAC
fn_256_CFA0__13dAcOivyRope_cFb = .text:0x0000CFA0; // type:function size:0xAC
fn_256_D050 = .text:0x0000D050; // type:function size:0xB8
fn_256_D110 = .text:0x0000D110; // type:function size:0x94
fn_256_D1B0 = .text:0x0000D1B0; // type:function size:0xF8
Expand Down
1 change: 1 addition & 0 deletions include/c/c_lib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace cLib {

s32 targetAngleY(const mVec3_c &target, const mVec3_c &source);
f32 addCalcPosXZ(mVec3_c *src, const mVec3_c &target, f32 scale, f32 maxStep, f32 minStep);
f32 addCalcPos(mVec3_c *src, const mVec3_c &target, f32 scale, f32 maxStep, f32 minStep);

} // namespace cLib

Expand Down
2 changes: 1 addition & 1 deletion include/d/a/d_a_player.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class dAcPy_c : public dAcObjBase_c {
/* vt 0x0D8 */ virtual void getItemFromClawshotsMaybe();
/* vt 0x0DC */ virtual void vt_0x0DC(dAcBase_c *, mVec3_c &);
/* vt 0x0E0 */ virtual void isUsingBomb();
/* vt 0x0E4 */ virtual void vt_0x0E4();
/* vt 0x0E4 */ virtual mVec3_c &getCenterTranslation() const;
/* vt 0x0E8 */ virtual void vt_0x0E8();
/* vt 0x0EC */ virtual void vt_0x0EC();
/* vt 0x0F0 */ virtual void vt_0x0F0();
Expand Down
61 changes: 40 additions & 21 deletions include/d/a/obj/d_a_obj_ivy_rope.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,23 @@ class dAcOivyRope_c : public dAcObjBase_c {
UNKTYPE fn_256_BE80(UNKTYPE);
UNKTYPE fn_256_BFF0(UNKTYPE);
UNKTYPE fn_256_C200(UNKTYPE);
UNKTYPE fn_256_C410(UNKTYPE);
UNKTYPE fn_256_C6F0(UNKTYPE);
UNKTYPE fn_256_C740(UNKTYPE);
UNKTYPE fn_256_C810(UNKTYPE);
UNKTYPE fn_256_C960(UNKTYPE);
UNKTYPE fn_256_C980(UNKTYPE);
void fn_256_C410();
bool fn_256_C6F0();
void fn_256_C740();
void fn_256_C810(mVec3_c &pOut, int idx);
void fn_256_C960();
void fn_256_C980(f32, f32);
UNKTYPE fn_256_C9B0(UNKTYPE);
UNKTYPE fn_256_CD40(UNKTYPE);
UNKTYPE fn_256_CE20(UNKTYPE);
UNKTYPE fn_256_CFA0(UNKTYPE);
UNKTYPE fn_256_D050(UNKTYPE);
UNKTYPE fn_256_D110(UNKTYPE);
UNKTYPE fn_256_D1B0(UNKTYPE);
UNKTYPE fn_256_D2B0(UNKTYPE);
UNKTYPE fn_256_D3D0(UNKTYPE);
const mVec3_c &fn_256_D730(u32 idx); // Get Path Point
void fn_256_D7A0(u32, const mVec3_c &); // Set Path Point
void fn_256_CD40();
void fn_256_CE20(f32 *, f32 *, f32 *);
void fn_256_CFA0(bool);
void fn_256_D050();
void fn_256_D110();
void fn_256_D1B0();
void fn_256_D2B0();
void fn_256_D3D0(mVec3_c &pOut1, mVec3_c &pOut2, s16 param2, bool bool0, f32 float0);
const mVec3_c &fn_256_D730(s32 idx); // Get Path Point
void fn_256_D7A0(s32, const mVec3_c &); // Set Path Point
void fn_256_D850(); // Draw Shadow
void fn_256_DAA0(bool, bool, f32, f32);
void fn_256_DE80();
Expand All @@ -134,6 +134,10 @@ class dAcOivyRope_c : public dAcObjBase_c {
void fn_256_E3E0();
bool fn_256_E790();

bool checkSubtype(u32 sub) {
return mSubtype == sub;
}

private:
/* 0x 330 */ UNKWORD mField_0x330;
/* 0x 334 */ m3d::smdl_c mMdlArr[2];
Expand All @@ -158,15 +162,20 @@ class dAcOivyRope_c : public dAcObjBase_c {
/* 0x F50 */ mVec3_c mField_0xF50;
/* 0x F5C */ u8 _F5C[0xF68 - 0xF5C];
/* 0x F68 */ mVec3_c mField_0xF68;
/* 0x F74 */ u8 _F74[0xFAC - 0xF74];
/* 0x F74 */ u8 _F74[0xFA4 - 0xF74];
/* 0x FA4 */ f32 mField_0xFA4;
/* 0x FA8 */ f32 mField_0xFA8;
/* 0x FAC */ f32 mField_0xFAC;
/* 0x FB0 */ f32 mField_0xFB0;
/* 0x FB4 */ f32 mField_0xFB4;
/* 0x FB8 */ f32 mDistance;
/* 0x FBC */ f32 mOldDistance;
/* 0x FC0 */ u8 _FC0[0xFCC - 0xFC0];
/* 0x FC0 */ UNKWORD mField_0xFC0;
/* 0x FC4 */ f32 mField_0xFC4;
/* 0x FC8 */ UNKWORD mField_0xFC8;
/* 0x FCC */ mAng mField_0xFCC;
/* 0x FCE */ u8 _FCE[0xFD2 - 0xFCE];
/* 0x FCE */ u16 mField_0xFCE;
/* 0x FD0 */ u8 _FD0[0xFD2 - 0xFD0];
/* 0x FD2 */ s16 mField_0xFD2;
/* 0x FD4 */ s16 mField_0xFD4;
/* 0x FD6 */ s16 mField_0xFD6;
Expand All @@ -184,7 +193,14 @@ class dAcOivyRope_c : public dAcObjBase_c {
/* 0x FED */ u8 mEventIdx;
/* 0x FEE */ u8 mField_0xFEE;
/* 0x FEF */ u8 mField_0xFEF;
/* 0x FEE */ u8 _FEE[0x1010 - 0xFF0];
/* 0x FF0 */ u8 mField_0xFF0[4];
/* 0x FF4 */ u8 mField_0xFF4;
/* 0x FF5 */ u8 mField_0xFF5;
/* 0x FF6 */ u8 mField_0xFF6;
/* 0x FF7 */ u8 mField_0xFF7;
/* 0x FF8 */ u8 _FE8[0x1005 - 0xFF8];
/* 0x1005 */ u8 mField_0x1005;
/* 0x1006 */ u8 _1006[0x1010 - 0x1006];
/* 0x1010 */ mVec3_c mField_0x1010;
/* 0x101C */ mVec3_c mField_0x101C;
/* 0x1028 */ f32 mField_0x1028;
Expand All @@ -200,7 +216,10 @@ class dAcOivyRope_c : public dAcObjBase_c {
/* 0x103D */ u8 mField_0x103D;
/* 0x103E */ bool mDropped;
/* 0x1040 */ f32 mField_0x1040;
/* 0x1044 */ u8 _1044[0x1088 - 0x1044];
/* 0x1044 */ u8 _1044[0x105E - 0x1044];
/* 0x105E */ u8 mField_0x105E;
/* 0x105F */ u8 mField_0x105F;
/* 0x1060 */ u8 _1060[0x1088 - 0x1060];
/* 0x1088 */ dCcD_Cps mCpsArr2[16];
/* 0x2788 */ mVec3_c *mPnts1;
/* 0x278C */ mVec3_c *mPnts2;
Expand Down
23 changes: 20 additions & 3 deletions include/d/col/c/c_cc_d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ class cCcD_Stts {
};

struct cCcD_SrcGObjTgInfo {
/* 0x00 */ u16 mField_0x0;
/* 0x00 */ u8 mField_0x0;
/* 0x00 */ u8 mField_0x1;
/* 0x02 */ u16 mField_0x2;
};

Expand Down Expand Up @@ -633,6 +634,9 @@ class cCcD_ObjTg : public cCcD_GAtTgCoCommonBase {
void Set_0x4B(u8 val) {
mField_0x4B = val;
}
void SetInfo_0x1(u8 val) {
mSrc.mInfo.mField_0x1 = val;
}

void SetInfo_0x2(u16 val) {
mSrc.mInfo.mField_0x2 = val;
Expand Down Expand Up @@ -788,8 +792,14 @@ class cCcD_Obj {
mCo.OnSPrm(f);
}

void SetTgType(u32 flag) {
mTg.SetType(flag);
void SetTgType(u32 type) {
mTg.SetType(type);
}
void OnTgType(u32 type) {
mTg.OnType(type);
}
void OffTgType(u32 type) {
mTg.OffType(type);
}
void SetAtFlag(u32 flag) {
mAt.SetSPrm(flag);
Expand Down Expand Up @@ -905,12 +915,19 @@ class cCcD_Obj {
return mTg.MskSPrm(0x400);
}

void OnTg_0x200000() {
mTg.OnSPrm(0x200000);
}

void SetTg_0x4B(u8 val) {
mTg.Set_0x4B(val);
}
void SetTgInfo_0x2(u16 val) {
mTg.SetInfo_0x2(val);
}
void SetTgInfo_0x1(u8 val) {
mTg.SetInfo_0x1(val);
}

// Co

Expand Down
1 change: 0 additions & 1 deletion include/d/col/cc/d_cc_d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define D_CC_D_H

#include "d/col/c/c_cc_d.h"
#include "d/col/c/c_m3d.h"
#include "m/m_vec.h"

struct dCcD_SrcCps {
Expand Down
6 changes: 6 additions & 0 deletions include/m/m_mtx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ class mMtx_c : public EGG::Matrix34f {
return *this;
}

mVec3_c operator*(const mVec3_c &rhs) {
mVec3_c out;
PSMTXMultVec(*this, rhs, out);
return out;
}

public:
static mMtx_c Identity;
};
Expand Down
2 changes: 1 addition & 1 deletion src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ bool dAcOFlyingClawshotTarget_c::createHeap() {
// clang-format off
const cCcD_SrcGObj dAcOFlyingClawshotTarget_c::sColSrc = {
/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0},
/* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND), 0x1080111, {6, 0x407}, 0, 0},
/* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND), 0x1080111, {0,6, 0x407}, 0, 0},
/* mObjCo */ {0x0}
};
// clang-format on
Expand Down
Loading

0 comments on commit 7bb27a1

Please sign in to comment.