diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2023-12-15 09:16:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 01:16:24 -0700 |
| commit | 4e84f00a25cd66f43d16af55d5772075779fd23f (patch) | |
| tree | 7fa21457cba6aa9f4b3b9b36b4f3faa8a91e76f4 /src/code_80086E70.h | |
| parent | f4658efbbaef30f88c7f041899a4236bc227c1af (diff) | |
Rename Functions For Calculating Distance (#500)
* Rename functions for calculating an objects distance to player/camera
Diffstat (limited to 'src/code_80086E70.h')
| -rw-r--r-- | src/code_80086E70.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/code_80086E70.h b/src/code_80086E70.h index 9f6863596..86d7ab636 100644 --- a/src/code_80086E70.h +++ b/src/code_80086E70.h @@ -59,20 +59,20 @@ s32 func_80088538(s32); s32 func_8008861C(s32); void func_800886F4(s32); void func_800887C0(s32); -s32 func_80088880(s32, Player*); -s32 func_800888E8(s32, Player*); -u32 func_8008896C(s32, Camera*); -s32 func_800889D4(s32, Camera*); -s32 func_80088A58(s32, Player*, f32); -s32 func_80088AC0(s32, Player*, f32, f32); -s32 func_80088B40(s32, Player*, f32); -s32 func_80088BB8(s32, Camera*, f32); -s32 func_80088C20(s32, Camera*, f32, f32); -s32 func_80088CA0(s32, Camera*, f32); -s32 func_80088D18(s32, Player*); -s32 func_80088DA4(s32, Player*); -s32 func_80088E48(s32, Player*, f32); -s32 func_80088E98(s32, Player*, f32); +s32 get_horizontal_distance_to_player(s32, Player*); +s32 get_distance_to_player(s32, Player*); +u32 get_horizontal_distance_to_camera(s32, Camera*); +s32 get_distance_to_camera(s32, Camera*); +bool is_within_horizontal_distance_of_player(s32, Player*, f32); +s32 are_between_distance_2d(s32, Player*, f32, f32); +bool is_within_distance_to_player(s32, Player*, f32); +bool is_within_horizontal_distance_to_camera(s32, Camera*, f32); +s32 is_within_bounds_to_camera(s32, Camera*, f32, f32); +bool is_within_distance_to_camera(s32, Camera*, f32); +bool has_collided_horizontally_with_player(s32, Player*); +bool has_collided_with_player(s32, Player*); +bool has_collided_with_player_1d(s32, Player*, f32); +bool has_collided_with_player_and_within_height(s32, Player*, f32); f32 func_80088F54(s32, Player*); s32 func_80088F94(s32, Player*, f32); void func_80088FF0(Player*); |