Skip to content

Commit

Permalink
smol progress
Browse files Browse the repository at this point in the history
  • Loading branch information
elijah-thomas774 committed Nov 22, 2024
1 parent 7bb27a1 commit f225f80
Show file tree
Hide file tree
Showing 4 changed files with 316 additions and 31 deletions.
2 changes: 1 addition & 1 deletion config/SOUE01/rels/d_a_obj_ivy_ropeNP/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ fn_256_A2C0 = .text:0x0000A2C0; // type:function size:0x488
fn_256_A750 = .text:0x0000A750; // type:function size:0x2E4
fn_256_AA40 = .text:0x0000AA40; // type:function size:0x64
fn_256_AAB0 = .text:0x0000AAB0; // type:function size:0x38
fn_256_AAF0 = .text:0x0000AAF0; // type:function size:0xA8
fn_256_AAF0__13dAcOivyRope_cFff = .text:0x0000AAF0; // type:function size:0xA8
fn_256_ABA0 = .text:0x0000ABA0; // type:function size:0x5C
fn_256_AC00 = .text:0x0000AC00; // type:function size:0x1FC
fn_256_AE00 = .text:0x0000AE00; // type:function size:0x4A8
Expand Down
42 changes: 25 additions & 17 deletions include/d/a/obj/d_a_obj_ivy_rope.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class dAcOivyRope_c : public dAcObjBase_c {
UNKTYPE fn_256_1240(UNKTYPE);
UNKTYPE fn_256_1480(UNKTYPE);
UNKTYPE fn_256_2160(UNKTYPE);
UNKTYPE fn_256_26B0(UNKTYPE);
void fn_256_26B0(int, bool, f32);
UNKTYPE fn_256_2C40(UNKTYPE);
UNKTYPE fn_256_2D00(UNKTYPE);
UNKTYPE fn_256_2DC0(UNKTYPE);
Expand Down Expand Up @@ -97,18 +97,18 @@ class dAcOivyRope_c : public dAcObjBase_c {
UNKTYPE fn_256_A040(UNKTYPE);
void fn_256_A2C0(bool);
bool fn_256_A750(bool bool0, f32 float0);
UNKTYPE fn_256_AA40(UNKTYPE);
UNKTYPE fn_256_AAB0(UNKTYPE);
UNKTYPE fn_256_AAF0(UNKTYPE);
UNKTYPE fn_256_ABA0(UNKTYPE);
UNKTYPE fn_256_AC00(UNKTYPE);
UNKTYPE fn_256_AE00(UNKTYPE);
UNKTYPE fn_256_B2B0(UNKTYPE);
UNKTYPE fn_256_BAB0(UNKTYPE);
UNKTYPE fn_256_BB70(UNKTYPE);
UNKTYPE fn_256_BE80(UNKTYPE);
UNKTYPE fn_256_BFF0(UNKTYPE);
UNKTYPE fn_256_C200(UNKTYPE);
f32 fn_256_AA40();
f32 fn_256_AAB0(f32, f32);
int fn_256_AAF0(f32, f32);
void fn_256_ABA0();
void fn_256_AC00();
void fn_256_AE00();
void fn_256_B2B0();
void fn_256_BAB0(mVec3_c &out, int idx, s16 xRot, s16 yRot);
void fn_256_BB70();
void fn_256_BE80();
void fn_256_BFF0(int, f32, f32);
f32 fn_256_C200(int);
void fn_256_C410();
bool fn_256_C6F0();
void fn_256_C740();
Expand Down Expand Up @@ -180,7 +180,10 @@ class dAcOivyRope_c : public dAcObjBase_c {
/* 0x FD4 */ s16 mField_0xFD4;
/* 0x FD6 */ s16 mField_0xFD6;
/* 0x FD8 */ s16 mField_0xFD8;
/* 0x FDA */ u8 _FD9[0xFE4 - 0xFDA];
/* 0x FDA */ mAng mField_0xFDA;
/* 0x FDC */ s16 mField_0xFDC;
/* 0x FDA */ u8 _FDE[0xFE2 - 0xFDE];
/* 0x FE2 */ s16 mField_0xFE2;
/* 0x FE4 */ u8 mDropsceneFlag;
/* 0x FE5 */ u8 mWoodTagSceneflag;
/* 0x FE6 */ u8 mSegmentCount;
Expand All @@ -198,7 +201,8 @@ class dAcOivyRope_c : public dAcObjBase_c {
/* 0x FF5 */ u8 mField_0xFF5;
/* 0x FF6 */ u8 mField_0xFF6;
/* 0x FF7 */ u8 mField_0xFF7;
/* 0x FF8 */ u8 _FE8[0x1005 - 0xFF8];
/* 0x FF8 */ u8 mField_0xFF8;
/* 0x FF9 */ u8 _FF9[0x1005 - 0xFF9];
/* 0x1005 */ u8 mField_0x1005;
/* 0x1006 */ u8 _1006[0x1010 - 0x1006];
/* 0x1010 */ mVec3_c mField_0x1010;
Expand All @@ -216,10 +220,14 @@ class dAcOivyRope_c : public dAcObjBase_c {
/* 0x103D */ u8 mField_0x103D;
/* 0x103E */ bool mDropped;
/* 0x1040 */ f32 mField_0x1040;
/* 0x1044 */ u8 _1044[0x105E - 0x1044];
/* 0x1044 */ u8 _1044[0x1050 - 0x1044];
/* 0x1050 */ f32 mField_0x1050;
/* 0x1054 */ u8 _1054[0x105E - 0x1054];
/* 0x105E */ u8 mField_0x105E;
/* 0x105F */ u8 mField_0x105F;
/* 0x1060 */ u8 _1060[0x1088 - 0x1060];
/* 0x1060 */ u8 _1060[0x1083 - 0x1060];
/* 0x1083 */ u8 mField_0x1083;
/* 0x1084 */ u8 _1084[0x1088 - 0x1084];
/* 0x1088 */ dCcD_Cps mCpsArr2[16];
/* 0x2788 */ mVec3_c *mPnts1;
/* 0x278C */ mVec3_c *mPnts2;
Expand Down
4 changes: 4 additions & 0 deletions include/m/m_mtx.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ class mMtx_c : public EGG::Matrix34f {
return ret;
}

void multVec(const mVec3_c &in, mVec3_c &out) const {
PSMTXMultVec(*this, in, out);
}

mMtx_c &operator+=(const mMtx_c &rhs) {
PSMTXConcat(*this, rhs, *this);
return *this;
Expand Down
Loading

0 comments on commit f225f80

Please sign in to comment.