mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-04 01:03:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_carry work, setup static shape data (#1890)

Browse Source
This commit is contained in:
Pheenoh
2023-08-20 22:10:09 -06:00
committed by GitHub
parent cf0b47a5ba
commit 2d5c38e022
219 changed files with 6502 additions and 13711 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/cc/d_cc_d.h
+3
View File
@@ -222,6 +222,7 @@ class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase {
public:
/* 800839A0 */ void Set(dCcD_SrcGObjTg const&);
/* 80083BE8 */ virtual ~dCcD_GObjTg() {}
void SetSe(u8 se) { mSe = se; }
void SetVec(cXyz& vec) { mVec = vec; }
cXyz& GetVec() { return mVec; }
void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; }
@@ -288,11 +289,13 @@ public:
void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
void OffAtNoHitMark() { mGObjAt.OffSPrm(2); }
void OnTgNoHitMark() { mGObjTg.OnSPrm(4); }
void OffTgNoHitMark() { mGObjTg.OffSPrm(4); }
void OnAtNoConHit() { mGObjAt.OnSPrm(1); }
void OffAtNoConHit() { mGObjAt.OffSPrm(1); }
void OnTgNoConHit() { mGObjTg.OnSPrm(2); }
void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
void SetTgSe(u8 se) { mGObjTg.SetSe(se); }
void SetAtMtrl(u8 mtrl) { mGObjAt.SetMtrl(mtrl); }
void SetTgMtrl(u8 mtrl) { mGObjTg.SetMtrl(mtrl); }
fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); }
include/d/d_jnt_col.h
+2 -1
View File
@@ -13,7 +13,8 @@ public:
/* 0x0 */ u8 field_0x0;
/* 0x1 */ s8 mType;
/* 0x2 */ s16 mJntNum;
/* 0x4 */ u8 field_0x4[0xC - 0x4];
/* 0x4 */ u32 field_0x4;
/* 0x8 */ void* field_0x8;
};
class dJntCol_c {