diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-07-28 23:48:27 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-07-28 23:48:27 -0400 |
| commit | 8aac44688b6aaae64ba2b83d227f438b4159a97d (patch) | |
| tree | 04be9b8d34f5f7e6e7a2c7b3d808d1103df9c4fa /src/d/actor/d_a_ki.cpp | |
| parent | 8c07fc8579e527a05028d1409354fa138a9a7d72 (diff) | |
Cleanup some actors
Diffstat (limited to 'src/d/actor/d_a_ki.cpp')
| -rw-r--r-- | src/d/actor/d_a_ki.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 48696bd7..e1caf46b 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -21,6 +21,9 @@ #include "d/d_bg_s_lin_chk.h" #include "JSystem/JUtility/JUTReport.h" +#include "weak_bss_936_to_1036.h" // IWYU pragma: keep +#include "weak_data_1811.h" // IWYU pragma: keep + class kiHIO_c : public JORReflexible { public: kiHIO_c() { @@ -84,17 +87,11 @@ public: /* 0x58 */ f32 m58; }; // size = 0x5C -#include "weak_bss_3569.h" -#include "weak_bss_936_to_1036.h" - static bool hio_set; static kiHIO_c l_kiHIO; static s32 ki_all_count; static s32 ki_fight_count; -#include "weak_data_2100_2080.h" -#include "weak_data_1811.h" - static u16 ki_tex_anm_idx[] = {KI_BTP_AKE1, KI_BTP_TOJI1, KI_BTP_METOJI1, KI_BTP_GURU1}; static u16 ki_tex_max_frame[] = { 2, 2, 3, 2 }; static u8 ki_tex_loop[] = { 0, 0, 0, 0 }; @@ -202,7 +199,6 @@ BOOL ki_player_bg_check(ki_class* i_this) { /* 00000C58-00000F04 .text daKi_Draw__FP8ki_class */ static BOOL daKi_Draw(ki_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz sp08; if (i_this->m2D4 != 0) { return TRUE; @@ -712,7 +708,6 @@ s16 wall_angle_get(ki_class* i_this) { cXyz sp2C[2]; cXyz sp20; cXyz sp14; - cXyz sp08; cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); sp20.x = 0.0f; @@ -906,7 +901,7 @@ void ki_path_move(ki_class* i_this) { i_this->m2D6 = 1; } - case -1: + case -1: { i_this->mBehaviorType = 1; dPnt* point = &i_this->ppd->m_points[0]; point += i_this->m2D6; @@ -918,7 +913,7 @@ void ki_path_move(ki_class* i_this) { i_this->mPosMove.y = point->m_position.y + cM_rndFX(150.0f); i_this->mPosMove.z = point->m_position.z + cM_rndFX(150.0f); break; - + } case 1: f32 x = i_this->mPosMove.x - i_this->actor.current.pos.x; f32 y = i_this->mPosMove.y - i_this->actor.current.pos.y; @@ -1006,7 +1001,7 @@ static BOOL daKi_Execute(ki_class* i_this) { i_this->mDamageSphere.SetR(40.0f); i_this->m6AC.SetR(l_kiHIO.m58); - if (!l_kiHIO.m06 != 0) { + if (l_kiHIO.m06 == 0) { i_this->m540 = 0; for (i = 0; i < 4; i++) { |