diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2025-09-19 11:32:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-19 21:32:38 +0300 |
| commit | 9306edbec673e5fc10aff269e112c6a524bd3cb2 (patch) | |
| tree | 56de3d3c4b7add9b7ee2bf2d353678edfd83cded /include | |
| parent | 11ebeb3fe04496ec46ab30a5aebb424f2b1175e3 (diff) | |
d_a_obj_lv6bemos2 OK (#2672)
* d_a_obj_lv6bemos2 OK
* Forgot to remove NONMATCHING comment
* Link d_a_obj_lv6bemos2 for JP
---------
Co-authored-by: Max Roncace <me@caseif.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_obj_lv6bemos2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/d/actor/d_a_obj_lv6bemos2.h b/include/d/actor/d_a_obj_lv6bemos2.h index 7f7173af3c..a2c00efe83 100644 --- a/include/d/actor/d_a_obj_lv6bemos2.h +++ b/include/d/actor/d_a_obj_lv6bemos2.h @@ -27,7 +27,7 @@ public: /* 80C7EE50 */ void action(); /* 80C7F2A4 */ void calcBeam(); /* 80C7F904 */ int checkFindPlayer(); - /* 80C7FA54 */ int checkSearchPlayer(); + /* 80C7FA54 */ s8 checkSearchPlayer(); /* 80C7FBA4 */ f32 getSearchDistance(); /* 80C7FBFC */ f32 getBeamSearchDistance(); /* 80C7FC54 */ void effect_proc(); @@ -62,7 +62,7 @@ public: u8 getSearchDist() { return fopAcM_GetParamBit(this, 0x1C, 4); } u16 getBeamSearchDist() { return field_0xa32 & 15; } - BOOL checkLockOnCamera() { return (field_0xa32 & 0x8000) >> 15; } + u8 checkLockOnCamera() { return (field_0xa32 & 0x8000) >> 15; } /* 0x568 */ request_of_phase_process_class mPhase; /* 0x5A8 */ J3DModel* mBeamosModel; |