diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-27 13:42:47 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-27 13:42:47 -0400 |
| commit | 3e20d8d7c7825ba873116e02f2ecbf18fb4b50d3 (patch) | |
| tree | 4be6a61fe410ca9e402cd8b8aac62fd2fb5ca208 /include | |
| parent | 300d820b7a88291a2b92dc1c0bbd6389a72b720b (diff) | |
d_a_bk stand2 matches
Diffstat (limited to 'include')
| -rw-r--r-- | include/c/c_damagereaction.h | 4 | ||||
| -rw-r--r-- | include/d/actor/d_a_bk.h | 10 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_search.h | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/include/c/c_damagereaction.h b/include/c/c_damagereaction.h index b6982dec..c4dc6702 100644 --- a/include/c/c_damagereaction.h +++ b/include/c/c_damagereaction.h @@ -165,7 +165,9 @@ public: /* 0x712 */ u8 m712; /* 0x713 */ u8 m713; /* 0x714 */ fopAc_ac_c* m714; - /* 0x718 */ u8 m718[0x71E - 0x718]; + /* 0x718 */ s16 m718; + /* 0x71A */ s16 m71A; + /* 0x71C */ u8 m71C[0x71E - 0x71C]; /* 0x71E */ s16 m71E; /* 0x720 */ f32 mMaxFallDistance; /* 0x724 */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_bk.h b/include/d/actor/d_a_bk.h index 55f40bdf..ea5cd0fa 100644 --- a/include/d/actor/d_a_bk.h +++ b/include/d/actor/d_a_bk.h @@ -53,7 +53,7 @@ public: /* 0x0314 */ s16 m0314; /* 0x0316 */ s16 m0316; /* 0x0318 */ u8 m0318; - /* 0x031C */ f32 m031C; + /* 0x031C */ f32 mPlayerDistance; /* 0x0320 */ cXyz m0320; /* 0x032C */ u8 m032C[0x0330 - 0x032C]; /* 0x0330 */ s16 m0330; @@ -120,8 +120,12 @@ public: /* 0x121D */ u8 m121D; /* 0x121E */ s8 m121E; /* 0x121F */ s8 m121F; - /* 0x1220 */ daObj_Search::Act_c* m1220; - /* 0x1224 */ u8 m1224[0x1230 - 0x1224]; + /* 0x1220 */ daObj_Search::Act_c* mpSearchLight; + /* 0x1224 */ s16 m1224; + /* 0x1226 */ u8 m1226[0x1228 - 0x1226]; + /* 0x1228 */ s16 m1228; + /* 0x122A */ s16 m122A; + /* 0x122C */ u8 m122C[0x1230 - 0x122A]; /* 0x1230 */ J3DMaterialTable* m1230; /* 0x1234 */ s8 m1234; /* 0x1235 */ u8 m1235[0x1264 - 0x1235]; diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h index 1204b6ea..29308558 100644 --- a/include/d/actor/d_a_obj_search.h +++ b/include/d/actor/d_a_obj_search.h @@ -19,8 +19,8 @@ namespace daObj_Search { void isSecond() {} void modeProcInit(int) {} - void setBkControl(bool) {} - void setChildId(uint) {} + void setBkControl(bool control) { mBkControl = control; } + void setChildId(uint id) { mChildId = id; } void _createHeap(); void searchCreateHeap(); @@ -67,7 +67,9 @@ namespace daObj_Search { public: /* Place member variables here */ /* 0x290 */ u8 m290[0x664 - 0x290]; - /* 0x664 */ u8 m664; + /* 0x664 */ bool mBkControl; + /* 0x665 */ u8 m665[0x84C - 0x665]; + /* 0x84C */ uint mChildId; }; class Bgc_c { |