diff options
| author | Carco_21 <144170194+carter-ktb21@users.noreply.github.com> | 2025-12-08 15:12:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-08 22:12:20 +0200 |
| commit | bff59822934bdac049c0bcb6475842ca2c09fead (patch) | |
| tree | 6ca36e44406b307c52ee5cf7b2d09839507158f5 /include | |
| parent | 7820b4590ea598e58899fa6e6b737632de7629ab (diff) | |
almost matching (#2933)
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_e_sm2.h | 9 | ||||
| -rw-r--r-- | include/f_op/f_op_actor_mng.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/d/actor/d_a_e_sm2.h b/include/d/actor/d_a_e_sm2.h index bf16a45f98..5ea841ea1b 100644 --- a/include/d/actor/d_a_e_sm2.h +++ b/include/d/actor/d_a_e_sm2.h @@ -36,7 +36,8 @@ enum daE_SM2_ACTION { * * @details * - */ +*/ + class e_sm2_class { public: bool checkYellow() { return type == TYPE_YELLOW; } @@ -63,9 +64,9 @@ public: /* 0x68E */ s16 combine_off_timer; /* 0x690 */ s16 angle_to_pl; /* 0x694 */ f32 dist_to_pl; - /* 0x698 */ u8 field_0x698[0x6A4 - 0x698]; - /* 0x6A4 */ s16 field_0x6a4; - /* 0x6A6 */ s16 field_0x6a6; + /* 0x698 */ cXyz field_0x698; + /* 0x6A4 */ s16 mCurrentAngleYTarget; + /* 0x6A6 */ s16 mCurrentAngleYTargetStep; /* 0x6A8 */ s8 field_0x6a8; /* 0x6A9 */ u8 field_0x6a9; /* 0x6AA */ u8 field_0x6aa; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 955da52ad1..b5a11a6beb 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -86,6 +86,7 @@ struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { #if DEBUG void removeHIO(const fopAc_ac_c* i_this) { removeHIO(*i_this); } void removeHIO(const fopAc_ac_c& i_this) { removeHIO(i_this.base); } + void removeHIO(const fopEn_enemy_c& i_this) { removeHIO(i_this.base); } void removeHIO(const leafdraw_class& i_this) { removeHIO(i_this.base); } void removeHIO(const base_process_class& i_this) { removeHIO(i_this.state); } void removeHIO(const state_class& state) { |