summaryrefslogtreecommitdiff
path: root/src/math_util_2.h
diff options
context:
space:
mode:
authorcoco875 <59367621+coco875@users.noreply.github.com>2023-10-08 00:31:48 +0200
committerGitHub <noreply@github.com>2023-10-07 16:31:48 -0600
commitd8cfed94913f06e31f48b3e63f3e12cfa9907405 (patch)
tree395598dcf9e71e6948f6ded563e47cbaa9d7028c /src/math_util_2.h
parent2b74bbbcefe396564a55357eda094fc8c8baf36a (diff)
Various Naming (#445)
* Mass renames
Diffstat (limited to 'src/math_util_2.h')
-rw-r--r--src/math_util_2.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/math_util_2.h b/src/math_util_2.h
index 104425cdf..f56a12ee2 100644
--- a/src/math_util_2.h
+++ b/src/math_util_2.h
@@ -7,9 +7,9 @@
/* Function Prototypes */
// Unused functions
-void func_80040E50(s32*, s32);
-void func_80040E60(s32*,s32);
-void func_80040E74(s32*, s32);
+void operator_or(s32*, s32);
+void operator_and_not(s32*,s32);
+void operator_xor(s32*, s32);
s32 func_80040E84(s32*, s32);
s32 func_80040EA4(s32*, s32);
s32 f32_step_up_towards_alternate(f32*, f32, f32*);
@@ -19,7 +19,7 @@ s32 s32_step_down_towards_alternate(s32*, s32, s32*);
s32 s16_step_up_towards_alternate(s16*, s16, s16*);
s32 s16_step_down_towards_alternate(s16*, s16, s16*);
s32 s32_step_towards(s32*, s32, s32);
-s32 func_80041608(f32, f32, f32, f32, f32);
+s32 is_within_distance_2d(f32, f32, f32, f32, f32);
s32 func_80041680(f32, f32);
s32 func_800416AC(f32, f32);
void func_80041F54(s32, s32);
@@ -32,8 +32,8 @@ void func_8004252C(Mat4, u16, u16);
void mtxf_mult_first_column(Mat4, f32);
void mtxf_mult_second_column(Mat4, f32);
void mtxf_mult_third_column(Mat4, f32);
-void func_80042B5C(Vec3f, Vec3f, Vec3s);
-void func_80042EB8(Vec3f, Vec3f, f32);
+void vec3f_rotate(Vec3f, Vec3f, Vec3s);
+void rsp_set_matrix_diff_translation_scale(Vec3f, Vec3f, f32);
void vec3f_copy(Vec3f, Vec3f);
@@ -48,9 +48,9 @@ s32 u16_step_down_towards(u16*, s32, s32);
s32 s16_step_towards(s16*, s16, s16);
s32 f32_step_towards(f32*, f32, f32);
void func_80041480(s16*, s16, s16, s16*);
-Vec3f *vec3f_set_dupe_2_electric_boogaloo(Vec3f, f32, f32, f32);
-Vec3f *func_80041530(Vec3f dest);
-Vec3f *func_80041594(Vec3f, Vec3f, Vec3f);
+Vec3f *vec3f_set_xyz(Vec3f, f32, f32, f32);
+Vec3f *vec3f_normalize(Vec3f dest);
+Vec3f *vec3f_cross_product(Vec3f, Vec3f, Vec3f);
s32 func_80041658(f32, f32);
f32 func_800416D8(f32, f32, u16);
f32 func_80041724(f32, f32, u16);
@@ -70,15 +70,15 @@ void func_80041D24(void);
void func_80041D34(void);
void func_80041EF4(void);
void func_80042330(s32, s32, u16, f32);
-void func_800425D0(Mat4, Vec3f, Vec3su, f32);
-void func_80042760(Mat4, Vec3f, Vec3f, f32);
-void func_800427DC(s32, Mat4);
-void func_80042A20(Mat4, Vec3f, Vec3f, u16, f32);
-void func_80042D14(Vec3f, Vec3f, Vec3s);
-void func_80042E00(Vec3f, Vec3su, f32);
-void func_80042F70(Vec3f, Vec3su, f32);
-void func_80043050(Vec3f, Vec3f, f32);
-void func_80043104(s32);
+void mtxf_set_matrix_transformation(Mat4, Vec3f, Vec3su, f32);
+void mtxf_set_matrix_scale_transl(Mat4, Vec3f, Vec3f, f32);
+void mtxf_set_matrix_gObjectList(s32, Mat4);
+void set_transform_matrix(Mat4, Vec3f, Vec3f, u16, f32);
+void vec3f_rotate_x_y(Vec3f, Vec3f, Vec3s);
+void rsp_set_matrix_transformation(Vec3f, Vec3su, f32);
+void rsp_set_matrix_transformation_inverted_x_y_orientation(Vec3f, Vec3su, f32);
+void rsp_set_matrix_transl_rot_scale(Vec3f, Vec3f, f32);
+void rsp_set_matrix_gObjectList(s32);
/* This is where I'd put my static data, if I had any */