diff options
| author | TakaRikka <takarikka@outlook.com> | 2022-06-01 04:23:39 -0700 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2022-06-01 04:23:39 -0700 |
| commit | 32cea78625839c5285a5f22eec6e7bbeef005c3c (patch) | |
| tree | 6171308ac96c3cbb1917c43167ac09dc86135df1 /include/d/a | |
| parent | 3f22fa448376893fffd83815ecd4cdccb197f1a4 (diff) | |
format
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_alink.h | 2 | ||||
| -rw-r--r-- | include/d/a/d_a_npc.h | 10 | ||||
| -rw-r--r-- | include/d/a/d_a_player.h | 5 |
3 files changed, 5 insertions, 12 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index a1dc780d0f..1513caf469 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -2485,7 +2485,7 @@ private: /* 0x02118 */ daPy_anmHeap_c mAnmHeap5; /* 0x0212C */ daPy_anmHeap_c mAnmHeap6; /* 0x02140 */ daPy_anmHeap_c mAnmHeap7; - /* 0x02154 */ mDoExt_bckAnm field_0x2154; // issue here? + /* 0x02154 */ mDoExt_bckAnm field_0x2154; /* 0x02170 */ u8 field_0x2170[0x18]; /* 0x02188 */ dEyeHL_c mEyeHL1; /* 0x0219C */ dEyeHL_c mEyeHL2; diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index 18b6946743..ab76ef43d1 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -18,9 +18,7 @@ public: /* 801458C0 */ int play(u16, int*, f32*); /* 80145A24 */ s32 checkEndSequence(); - bool checkEntryNewMotion() { - return mStepNo == 0 && field_0x14 == -1; - } + bool checkEntryNewMotion() { return mStepNo == 0 && field_0x14 == -1; } private: /* 0x00 */ sequenceStepData_c* mpSeqData; @@ -318,9 +316,7 @@ public: /* 8014CCE8 */ virtual void changeBtk(int*, int*); /* 8014A628 */ virtual void setMotionAnm(int, f32, int); - bool checkHide() { - return !field_0xe25 && (!dComIfGs_wolfeye_effect_check() && field_0xa89); - } + bool checkHide() { return !field_0xe25 && (!dComIfGs_wolfeye_effect_check() && field_0xa89); } static u8 const mCcDObjData[48]; static u8 mCcDCyl[68]; @@ -448,7 +444,7 @@ public: /* 80152614 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80152654 */ void srchAttnActor1(void*, void*); /* 801526E8 */ void srchActor(void*, void*); - + /* 801528C8 */ void initialize(); /* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int); /* 80152B68 */ void getTexPtrnAnmP(char*, int); diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 491c90d572..64b84b96de 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -48,10 +48,7 @@ class daPy_anmHeap_c { public: enum daAlinkHEAP_TYPE {}; - /* 80140DCC */ void __defctor(); - daPy_anmHeap_c() { - __defctor(); - } + /* 80140DCC */ void __defctor(); // supposed to be the ctor? daPy_anmHeap_c(u32); ~daPy_anmHeap_c(); |