mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-01 01:22:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_rd work

Browse Source
This commit is contained in:
LagoLunatic
2023-11-15 22:47:37 -05:00
parent 20aa2a94f0
commit 830635950d
6 changed files with 465 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+1
View File
@@ -518,6 +518,7 @@ public:
void OffCoSetBit() { mObjCo.ClrSet(); }
void SetTgType(u32 type) { mObjTg.SetType(type); }
void OnTgSPrmBit(u32 flag) { mObjTg.OnSPrmBit(flag); }
void OffTgSPrmBit(u32 flag) { mObjTg.OffSPrmBit(flag); }
void OffAtSetBit() { mObjAt.ClrSet(); }
void OnAtHitBit() { mObjAt.OnHitBit(); }
void OffAtHitBit() { mObjAt.OffHitBit(); }
include/d/actor/d_a_rd.h
+6 -4
View File
@@ -87,7 +87,7 @@ public:
bool checkPlayerInAttack();
bool checkPlayerInCry();
void lookBack();
void checkTgHit();
bool checkTgHit();
void setCollision();
void setIceCollision();
void setAttention();
@@ -161,8 +161,8 @@ public:
/* 0x6D8 */ s8 m6D8;
/* 0x6D9 */ s8 m6D9;
/* 0x6DA */ s8 m6DA;
/* 0x6DB */ u8 m6DB;
/* 0x6DC */ u8 m6DC;
/* 0x6DB */ s8 m6DB;
/* 0x6DC */ s8 m6DC;
/* 0x6DD */ u8 m6DD[0x6E0 - 0x6DD];
/* 0x6E0 */ enemyice mEnemyIce;
/* 0xA98 */ enemyfire mEnemyFire;
@@ -178,7 +178,9 @@ public:
/* 0xD1A */ s16 mD1A;
/* 0xD1C */ s16 mD1C;
/* 0xD1E */ s16 mD1E;
/* 0xD20 */ u8 mD20[0xD34 - 0xD20];
/* 0xD20 */ u8 mD20[0xD2E - 0xD20];
/* 0xD2E */ s16 mD2E;
/* 0xD30 */ u8 mD30[0xD34 - 0xD30];
/* 0xD34 */ bool mbIkari;
/* 0xD35 */ u8 mD35[0xD38 - 0xD35];
/* 0xD38 */ f32 mD38;
include/d/d_detect.h
+3 -3
View File
@@ -17,10 +17,10 @@ public:
void proc();
bool chk_quake(const cXyz*) const;
void set_quake(const cXyz*);
void chk_quake_area(const cXyz*) const;
bool chk_quake_area(const cXyz*) const;
void search_tag_light(void*, void*);
void chk_light(const cXyz*) const;
void chk_attention(cXyz*) const;
bool chk_light(const cXyz*) const;
bool chk_attention(cXyz*) const;
/* 0x00 */ dDetectPlace_c mPlace[1];
/* 0x10 */ s16 mTimer;
include/d/d_npc.h
+12 -12
View File
@@ -42,9 +42,9 @@ public:
// /* 0x06 */ s16 mBackboneLeftRightRot;
/* 0x08 */ s8 mHeadJntNum;
/* 0x09 */ s8 mBackboneJntNum;
/* 0x0A */ bool field_0x0A;
/* 0x0B */ u8 field_0x0B;
/* 0x0C */ u8 field_0x0C;
/* 0x0A */ bool mbTrn;
/* 0x0B */ bool mbHeadLock;
/* 0x0C */ bool mbBackBoneLock;
/* 0x0D */ u8 field_0x0D;
/* 0x0E */ s16 mMinAngles[2][2];
/* 0x16 */ s16 mMaxAngles[2][2];
@@ -65,8 +65,8 @@ public:
public:
dNpc_JntCtrl_c() {
field_0x0C = 0;
field_0x0B = 0;
mbBackBoneLock = false;
mbHeadLock = false;
}
s8 getHeadJntNum() { return mHeadJntNum; }
@@ -81,13 +81,13 @@ public:
void setHead_y(s16 angle) { mAngles[0][1] = angle; }
void setBackBone_x(s16 angle) { mAngles[1][0] = angle; }
void setBackBone_y(s16 angle) { mAngles[1][1] = angle; }
void onHeadLock() {}
void onBackBoneLock() {}
void offHeadLock() {}
void offBackBoneLock() {}
void setTrn() {}
void clrTrn() {}
void trnChk() {}
bool trnChk() { return mbTrn; }
void setTrn() { mbTrn = true; }
void clrTrn() { mbTrn = false; }
void onHeadLock() { mbHeadLock = true; }
void onBackBoneLock() { mbBackBoneLock = true; }
void offHeadLock() { mbHeadLock = false; }
void offBackBoneLock() { mbBackBoneLock = false; }
bool angCalcS(s16*, s16, s16, s16);
void limitter(s16*, s16, s16);