From 9e7ff75bcdf20c57e5a31319c8f365a770fffd7a Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 30 Nov 2022 16:58:43 -0500 Subject: [PATCH] Renamed unknown_070110 to math_util --- asm/{unknown_070110.s => math_util.s} | 78 +++++++++---------- asm/{unknown_070110 => math_util}/arctan2_f.s | 0 .../area_triangle_2d.s | 0 asm/{unknown_070110 => math_util}/atan2s.s | 0 .../bad_int_sqrt.s | 0 .../calc_dyn_lighting_for_level_segment.s | 0 .../clear_status_register_flags.s | 0 asm/{unknown_070110 => math_util}/coss.s | 0 asm/{unknown_070110 => math_util}/coss_f.s | 0 asm/{unknown_070110 => math_util}/dmacopy2.s | 0 .../f32_matrix_dot.s | 0 .../f32_matrix_from_position.s | 0 .../f32_matrix_from_rotation_and_scale.s | 0 .../f32_matrix_from_scale.s | 0 .../f32_matrix_mult.s | 0 .../f32_matrix_scale.s | 0 .../f32_matrix_to_s16_matrix.s | 0 .../f32_matrix_to_s32_matrix.s | 0 .../f32_matrix_y_scale.s | 0 .../f32_vec3_apply_object_rotation.s | 0 .../f32_vec3_apply_object_rotation2.s | 0 .../f32_vec3_apply_object_rotation3.s | 0 .../get_D_800DD430.s | 0 asm/{unknown_070110 => math_util}/guMtxXFMF.s | 0 .../object_transform_to_matrix.s | 0 .../object_transform_to_matrix_2.s | 0 .../point_triangle_2d_xz_intersection.s | 0 asm/{unknown_070110 => math_util}/rng.s | 0 .../s16_matrix_rotate.s | 0 .../s16_matrix_to_s32_matrix.s | 0 .../s16_vec3_apply_object_rotation.s | 0 .../s16_vec3_mult_by_s32_matrix.s | 0 .../s16_vec3_mult_by_s32_matrix_full.s | 0 .../s32_matrix_cell_sqrt.s | 0 .../s32_matrix_to_s16_matrix.s | 0 .../set_D_800DD430.s | 0 .../set_breakpoint.s | 0 .../set_status_register_flags.s | 0 asm/{unknown_070110 => math_util}/sins_2.s | 0 asm/{unknown_070110 => math_util}/sins_f.s | 0 src/camera.h | 10 +-- src/game.h | 4 +- src/memory.h | 4 +- src/object_functions.h | 4 +- 44 files changed, 50 insertions(+), 50 deletions(-) rename asm/{unknown_070110.s => math_util.s} (85%) rename asm/{unknown_070110 => math_util}/arctan2_f.s (100%) rename asm/{unknown_070110 => math_util}/area_triangle_2d.s (100%) rename asm/{unknown_070110 => math_util}/atan2s.s (100%) rename asm/{unknown_070110 => math_util}/bad_int_sqrt.s (100%) rename asm/{unknown_070110 => math_util}/calc_dyn_lighting_for_level_segment.s (100%) rename asm/{unknown_070110 => math_util}/clear_status_register_flags.s (100%) rename asm/{unknown_070110 => math_util}/coss.s (100%) rename asm/{unknown_070110 => math_util}/coss_f.s (100%) rename asm/{unknown_070110 => math_util}/dmacopy2.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_dot.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_from_position.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_from_rotation_and_scale.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_from_scale.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_mult.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_scale.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_to_s16_matrix.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_to_s32_matrix.s (100%) rename asm/{unknown_070110 => math_util}/f32_matrix_y_scale.s (100%) rename asm/{unknown_070110 => math_util}/f32_vec3_apply_object_rotation.s (100%) rename asm/{unknown_070110 => math_util}/f32_vec3_apply_object_rotation2.s (100%) rename asm/{unknown_070110 => math_util}/f32_vec3_apply_object_rotation3.s (100%) rename asm/{unknown_070110 => math_util}/get_D_800DD430.s (100%) rename asm/{unknown_070110 => math_util}/guMtxXFMF.s (100%) rename asm/{unknown_070110 => math_util}/object_transform_to_matrix.s (100%) rename asm/{unknown_070110 => math_util}/object_transform_to_matrix_2.s (100%) rename asm/{unknown_070110 => math_util}/point_triangle_2d_xz_intersection.s (100%) rename asm/{unknown_070110 => math_util}/rng.s (100%) rename asm/{unknown_070110 => math_util}/s16_matrix_rotate.s (100%) rename asm/{unknown_070110 => math_util}/s16_matrix_to_s32_matrix.s (100%) rename asm/{unknown_070110 => math_util}/s16_vec3_apply_object_rotation.s (100%) rename asm/{unknown_070110 => math_util}/s16_vec3_mult_by_s32_matrix.s (100%) rename asm/{unknown_070110 => math_util}/s16_vec3_mult_by_s32_matrix_full.s (100%) rename asm/{unknown_070110 => math_util}/s32_matrix_cell_sqrt.s (100%) rename asm/{unknown_070110 => math_util}/s32_matrix_to_s16_matrix.s (100%) rename asm/{unknown_070110 => math_util}/set_D_800DD430.s (100%) rename asm/{unknown_070110 => math_util}/set_breakpoint.s (100%) rename asm/{unknown_070110 => math_util}/set_status_register_flags.s (100%) rename asm/{unknown_070110 => math_util}/sins_2.s (100%) rename asm/{unknown_070110 => math_util}/sins_f.s (100%) diff --git a/asm/unknown_070110.s b/asm/math_util.s similarity index 85% rename from asm/unknown_070110.s rename to asm/math_util.s index c35dff6c..c6583ede 100644 --- a/asm/unknown_070110.s +++ b/asm/math_util.s @@ -9,45 +9,45 @@ .set noreorder # dont insert nops after branches .set gp=64 # 64-bit instructions are used -.include "asm/unknown_070110/clear_status_register_flags.s" # If D_800DD430 != 0 THEN Set an interrupt? -.include "asm/unknown_070110/set_status_register_flags.s" # If D_800DD430 != 0 THEN __osRestoreInt - void set_status_register_flags(u32); -.include "asm/unknown_070110/set_D_800DD430.s" # Set D_800DD430 -.include "asm/unknown_070110/get_D_800DD430.s" # UNUSED - Get D_800DD430 -.include "asm/unknown_070110/s32_matrix_to_s16_matrix.s" # UNUSED -.include "asm/unknown_070110/f32_matrix_to_s32_matrix.s" -.include "asm/unknown_070110/guMtxXFMF.s" # It's possible the funcs from this point and above are unidentified libultra -.include "asm/unknown_070110/f32_matrix_dot.s" # Floating Point Matrix Math -.include "asm/unknown_070110/f32_matrix_mult.s" # Floating Point Matrix Math -.include "asm/unknown_070110/f32_matrix_to_s16_matrix.s" # Floating Point Matrix Math -.include "asm/unknown_070110/rng.s" -.include "asm/unknown_070110/s16_matrix_rotate.s" # 16 bit Matrix Math? -.include "asm/unknown_070110/s16_matrix_to_s32_matrix.s" # 16 bit a0 struct/array to 32 bit a1? UNUSED? -.include "asm/unknown_070110/s16_vec3_mult_by_s32_matrix_full.s" # UNUSED -.include "asm/unknown_070110/s16_vec3_mult_by_s32_matrix.s" # -.include "asm/unknown_070110/object_transform_to_matrix.s" # Floating Point Matrix and ObjectTransform * -.include "asm/unknown_070110/f32_matrix_scale.s" -.include "asm/unknown_070110/f32_matrix_y_scale.s" -.include "asm/unknown_070110/object_transform_to_matrix_2.s" -.include "asm/unknown_070110/f32_matrix_from_rotation_and_scale.s" -.include "asm/unknown_070110/s16_vec3_apply_object_rotation.s" -.include "asm/unknown_070110/f32_vec3_apply_object_rotation.s" -.include "asm/unknown_070110/f32_vec3_apply_object_rotation2.s" -.include "asm/unknown_070110/f32_vec3_apply_object_rotation3.s" -.include "asm/unknown_070110/point_triangle_2d_xz_intersection.s" -.include "asm/unknown_070110/f32_matrix_from_position.s" # Floating Point Matrix Values -.include "asm/unknown_070110/f32_matrix_from_scale.s" -.include "asm/unknown_070110/atan2s.s" -.include "asm/unknown_070110/arctan2_f.s" -.include "asm/unknown_070110/s32_matrix_cell_sqrt.s" # UNUSED -.include "asm/unknown_070110/bad_int_sqrt.s" # UNUSED Run a sqrtf on a 32 bit int? -.include "asm/unknown_070110/sins_f.s" -.include "asm/unknown_070110/coss_f.s" -.include "asm/unknown_070110/coss.s" # Weird case of one function with two entrance points. Sinewave related? Includes: sins -.include "asm/unknown_070110/sins_2.s" # Similar to above, and has UNUSED coss_2 -.include "asm/unknown_070110/calc_dyn_lighting_for_level_segment.s" # UNUSED -.include "asm/unknown_070110/area_triangle_2d.s" # Floating Point Math with sqrt -.include "asm/unknown_070110/set_breakpoint.s" # UNUSED - -.include "asm/unknown_070110/dmacopy2.s" # Uses mips3 instructions to copy data from s64 values arg0 to arg1 in a loop +.include "asm/math_util/clear_status_register_flags.s" # If D_800DD430 != 0 THEN Set an interrupt? +.include "asm/math_util/set_status_register_flags.s" # If D_800DD430 != 0 THEN __osRestoreInt - void set_status_register_flags(u32); +.include "asm/math_util/set_D_800DD430.s" # Set D_800DD430 +.include "asm/math_util/get_D_800DD430.s" # UNUSED - Get D_800DD430 +.include "asm/math_util/s32_matrix_to_s16_matrix.s" # UNUSED +.include "asm/math_util/f32_matrix_to_s32_matrix.s" +.include "asm/math_util/guMtxXFMF.s" # It's possible the funcs from this point and above are unidentified libultra +.include "asm/math_util/f32_matrix_dot.s" # Floating Point Matrix Math +.include "asm/math_util/f32_matrix_mult.s" # Floating Point Matrix Math +.include "asm/math_util/f32_matrix_to_s16_matrix.s" # Floating Point Matrix Math +.include "asm/math_util/rng.s" +.include "asm/math_util/s16_matrix_rotate.s" # 16 bit Matrix Math? +.include "asm/math_util/s16_matrix_to_s32_matrix.s" # 16 bit a0 struct/array to 32 bit a1? UNUSED? +.include "asm/math_util/s16_vec3_mult_by_s32_matrix_full.s" # UNUSED +.include "asm/math_util/s16_vec3_mult_by_s32_matrix.s" # +.include "asm/math_util/object_transform_to_matrix.s" # Floating Point Matrix and ObjectTransform * +.include "asm/math_util/f32_matrix_scale.s" +.include "asm/math_util/f32_matrix_y_scale.s" +.include "asm/math_util/object_transform_to_matrix_2.s" +.include "asm/math_util/f32_matrix_from_rotation_and_scale.s" +.include "asm/math_util/s16_vec3_apply_object_rotation.s" +.include "asm/math_util/f32_vec3_apply_object_rotation.s" +.include "asm/math_util/f32_vec3_apply_object_rotation2.s" +.include "asm/math_util/f32_vec3_apply_object_rotation3.s" +.include "asm/math_util/point_triangle_2d_xz_intersection.s" +.include "asm/math_util/f32_matrix_from_position.s" # Floating Point Matrix Values +.include "asm/math_util/f32_matrix_from_scale.s" +.include "asm/math_util/atan2s.s" +.include "asm/math_util/arctan2_f.s" +.include "asm/math_util/s32_matrix_cell_sqrt.s" # UNUSED +.include "asm/math_util/bad_int_sqrt.s" # UNUSED Run a sqrtf on a 32 bit int? +.include "asm/math_util/sins_f.s" +.include "asm/math_util/coss_f.s" +.include "asm/math_util/coss.s" # Weird case of one function with two entrance points. Sinewave related? Includes: sins +.include "asm/math_util/sins_2.s" # Similar to above, and has UNUSED coss_2 +.include "asm/math_util/calc_dyn_lighting_for_level_segment.s" # UNUSED +.include "asm/math_util/area_triangle_2d.s" # Floating Point Math with sqrt +.include "asm/math_util/set_breakpoint.s" # UNUSED - +.include "asm/math_util/dmacopy2.s" # Uses mips3 instructions to copy data from s64 values arg0 to arg1 in a loop .section .data diff --git a/asm/unknown_070110/arctan2_f.s b/asm/math_util/arctan2_f.s similarity index 100% rename from asm/unknown_070110/arctan2_f.s rename to asm/math_util/arctan2_f.s diff --git a/asm/unknown_070110/area_triangle_2d.s b/asm/math_util/area_triangle_2d.s similarity index 100% rename from asm/unknown_070110/area_triangle_2d.s rename to asm/math_util/area_triangle_2d.s diff --git a/asm/unknown_070110/atan2s.s b/asm/math_util/atan2s.s similarity index 100% rename from asm/unknown_070110/atan2s.s rename to asm/math_util/atan2s.s diff --git a/asm/unknown_070110/bad_int_sqrt.s b/asm/math_util/bad_int_sqrt.s similarity index 100% rename from asm/unknown_070110/bad_int_sqrt.s rename to asm/math_util/bad_int_sqrt.s diff --git a/asm/unknown_070110/calc_dyn_lighting_for_level_segment.s b/asm/math_util/calc_dyn_lighting_for_level_segment.s similarity index 100% rename from asm/unknown_070110/calc_dyn_lighting_for_level_segment.s rename to asm/math_util/calc_dyn_lighting_for_level_segment.s diff --git a/asm/unknown_070110/clear_status_register_flags.s b/asm/math_util/clear_status_register_flags.s similarity index 100% rename from asm/unknown_070110/clear_status_register_flags.s rename to asm/math_util/clear_status_register_flags.s diff --git a/asm/unknown_070110/coss.s b/asm/math_util/coss.s similarity index 100% rename from asm/unknown_070110/coss.s rename to asm/math_util/coss.s diff --git a/asm/unknown_070110/coss_f.s b/asm/math_util/coss_f.s similarity index 100% rename from asm/unknown_070110/coss_f.s rename to asm/math_util/coss_f.s diff --git a/asm/unknown_070110/dmacopy2.s b/asm/math_util/dmacopy2.s similarity index 100% rename from asm/unknown_070110/dmacopy2.s rename to asm/math_util/dmacopy2.s diff --git a/asm/unknown_070110/f32_matrix_dot.s b/asm/math_util/f32_matrix_dot.s similarity index 100% rename from asm/unknown_070110/f32_matrix_dot.s rename to asm/math_util/f32_matrix_dot.s diff --git a/asm/unknown_070110/f32_matrix_from_position.s b/asm/math_util/f32_matrix_from_position.s similarity index 100% rename from asm/unknown_070110/f32_matrix_from_position.s rename to asm/math_util/f32_matrix_from_position.s diff --git a/asm/unknown_070110/f32_matrix_from_rotation_and_scale.s b/asm/math_util/f32_matrix_from_rotation_and_scale.s similarity index 100% rename from asm/unknown_070110/f32_matrix_from_rotation_and_scale.s rename to asm/math_util/f32_matrix_from_rotation_and_scale.s diff --git a/asm/unknown_070110/f32_matrix_from_scale.s b/asm/math_util/f32_matrix_from_scale.s similarity index 100% rename from asm/unknown_070110/f32_matrix_from_scale.s rename to asm/math_util/f32_matrix_from_scale.s diff --git a/asm/unknown_070110/f32_matrix_mult.s b/asm/math_util/f32_matrix_mult.s similarity index 100% rename from asm/unknown_070110/f32_matrix_mult.s rename to asm/math_util/f32_matrix_mult.s diff --git a/asm/unknown_070110/f32_matrix_scale.s b/asm/math_util/f32_matrix_scale.s similarity index 100% rename from asm/unknown_070110/f32_matrix_scale.s rename to asm/math_util/f32_matrix_scale.s diff --git a/asm/unknown_070110/f32_matrix_to_s16_matrix.s b/asm/math_util/f32_matrix_to_s16_matrix.s similarity index 100% rename from asm/unknown_070110/f32_matrix_to_s16_matrix.s rename to asm/math_util/f32_matrix_to_s16_matrix.s diff --git a/asm/unknown_070110/f32_matrix_to_s32_matrix.s b/asm/math_util/f32_matrix_to_s32_matrix.s similarity index 100% rename from asm/unknown_070110/f32_matrix_to_s32_matrix.s rename to asm/math_util/f32_matrix_to_s32_matrix.s diff --git a/asm/unknown_070110/f32_matrix_y_scale.s b/asm/math_util/f32_matrix_y_scale.s similarity index 100% rename from asm/unknown_070110/f32_matrix_y_scale.s rename to asm/math_util/f32_matrix_y_scale.s diff --git a/asm/unknown_070110/f32_vec3_apply_object_rotation.s b/asm/math_util/f32_vec3_apply_object_rotation.s similarity index 100% rename from asm/unknown_070110/f32_vec3_apply_object_rotation.s rename to asm/math_util/f32_vec3_apply_object_rotation.s diff --git a/asm/unknown_070110/f32_vec3_apply_object_rotation2.s b/asm/math_util/f32_vec3_apply_object_rotation2.s similarity index 100% rename from asm/unknown_070110/f32_vec3_apply_object_rotation2.s rename to asm/math_util/f32_vec3_apply_object_rotation2.s diff --git a/asm/unknown_070110/f32_vec3_apply_object_rotation3.s b/asm/math_util/f32_vec3_apply_object_rotation3.s similarity index 100% rename from asm/unknown_070110/f32_vec3_apply_object_rotation3.s rename to asm/math_util/f32_vec3_apply_object_rotation3.s diff --git a/asm/unknown_070110/get_D_800DD430.s b/asm/math_util/get_D_800DD430.s similarity index 100% rename from asm/unknown_070110/get_D_800DD430.s rename to asm/math_util/get_D_800DD430.s diff --git a/asm/unknown_070110/guMtxXFMF.s b/asm/math_util/guMtxXFMF.s similarity index 100% rename from asm/unknown_070110/guMtxXFMF.s rename to asm/math_util/guMtxXFMF.s diff --git a/asm/unknown_070110/object_transform_to_matrix.s b/asm/math_util/object_transform_to_matrix.s similarity index 100% rename from asm/unknown_070110/object_transform_to_matrix.s rename to asm/math_util/object_transform_to_matrix.s diff --git a/asm/unknown_070110/object_transform_to_matrix_2.s b/asm/math_util/object_transform_to_matrix_2.s similarity index 100% rename from asm/unknown_070110/object_transform_to_matrix_2.s rename to asm/math_util/object_transform_to_matrix_2.s diff --git a/asm/unknown_070110/point_triangle_2d_xz_intersection.s b/asm/math_util/point_triangle_2d_xz_intersection.s similarity index 100% rename from asm/unknown_070110/point_triangle_2d_xz_intersection.s rename to asm/math_util/point_triangle_2d_xz_intersection.s diff --git a/asm/unknown_070110/rng.s b/asm/math_util/rng.s similarity index 100% rename from asm/unknown_070110/rng.s rename to asm/math_util/rng.s diff --git a/asm/unknown_070110/s16_matrix_rotate.s b/asm/math_util/s16_matrix_rotate.s similarity index 100% rename from asm/unknown_070110/s16_matrix_rotate.s rename to asm/math_util/s16_matrix_rotate.s diff --git a/asm/unknown_070110/s16_matrix_to_s32_matrix.s b/asm/math_util/s16_matrix_to_s32_matrix.s similarity index 100% rename from asm/unknown_070110/s16_matrix_to_s32_matrix.s rename to asm/math_util/s16_matrix_to_s32_matrix.s diff --git a/asm/unknown_070110/s16_vec3_apply_object_rotation.s b/asm/math_util/s16_vec3_apply_object_rotation.s similarity index 100% rename from asm/unknown_070110/s16_vec3_apply_object_rotation.s rename to asm/math_util/s16_vec3_apply_object_rotation.s diff --git a/asm/unknown_070110/s16_vec3_mult_by_s32_matrix.s b/asm/math_util/s16_vec3_mult_by_s32_matrix.s similarity index 100% rename from asm/unknown_070110/s16_vec3_mult_by_s32_matrix.s rename to asm/math_util/s16_vec3_mult_by_s32_matrix.s diff --git a/asm/unknown_070110/s16_vec3_mult_by_s32_matrix_full.s b/asm/math_util/s16_vec3_mult_by_s32_matrix_full.s similarity index 100% rename from asm/unknown_070110/s16_vec3_mult_by_s32_matrix_full.s rename to asm/math_util/s16_vec3_mult_by_s32_matrix_full.s diff --git a/asm/unknown_070110/s32_matrix_cell_sqrt.s b/asm/math_util/s32_matrix_cell_sqrt.s similarity index 100% rename from asm/unknown_070110/s32_matrix_cell_sqrt.s rename to asm/math_util/s32_matrix_cell_sqrt.s diff --git a/asm/unknown_070110/s32_matrix_to_s16_matrix.s b/asm/math_util/s32_matrix_to_s16_matrix.s similarity index 100% rename from asm/unknown_070110/s32_matrix_to_s16_matrix.s rename to asm/math_util/s32_matrix_to_s16_matrix.s diff --git a/asm/unknown_070110/set_D_800DD430.s b/asm/math_util/set_D_800DD430.s similarity index 100% rename from asm/unknown_070110/set_D_800DD430.s rename to asm/math_util/set_D_800DD430.s diff --git a/asm/unknown_070110/set_breakpoint.s b/asm/math_util/set_breakpoint.s similarity index 100% rename from asm/unknown_070110/set_breakpoint.s rename to asm/math_util/set_breakpoint.s diff --git a/asm/unknown_070110/set_status_register_flags.s b/asm/math_util/set_status_register_flags.s similarity index 100% rename from asm/unknown_070110/set_status_register_flags.s rename to asm/math_util/set_status_register_flags.s diff --git a/asm/unknown_070110/sins_2.s b/asm/math_util/sins_2.s similarity index 100% rename from asm/unknown_070110/sins_2.s rename to asm/math_util/sins_2.s diff --git a/asm/unknown_070110/sins_f.s b/asm/math_util/sins_f.s similarity index 100% rename from asm/unknown_070110/sins_f.s rename to asm/math_util/sins_f.s diff --git a/src/camera.h b/src/camera.h index 7d3df7f1..0aa1d4f9 100644 --- a/src/camera.h +++ b/src/camera.h @@ -108,11 +108,11 @@ typedef struct unk80068514_arg4 { Gfx *unk8[1]; } unk80068514_arg4; -//TODO: Figure out where these functions live: unknown_070110? - void f32_matrix_to_s16_matrix(Matrix *, Matrix *); //unknown_070110 - void f32_matrix_from_position(Matrix *, f32, f32, f32); //From unknown_070110 - void object_transform_to_matrix_2(Matrix *, ObjectTransform *); // Non Matching unknown_070110? - void f32_matrix_mult(Matrix *, Matrix *, Matrix *); // Non Matching unknown_070110? +//TODO: Figure out where these functions live: math_util? + void f32_matrix_to_s16_matrix(Matrix *, Matrix *); //math_util + void f32_matrix_from_position(Matrix *, f32, f32, f32); //From math_util + void object_transform_to_matrix_2(Matrix *, ObjectTransform *); // Non Matching math_util? + void f32_matrix_mult(Matrix *, Matrix *, Matrix *); // Non Matching math_util? void func_80066060(s32 arg0, s32 arg1); void set_viewport_tv_type(s8 arg0); diff --git a/src/game.h b/src/game.h index 61898068..b5bb1f62 100644 --- a/src/game.h +++ b/src/game.h @@ -77,8 +77,8 @@ extern u16 *gVideoCurrFramebuffer; extern s32 gVideoLastFramebuffer; extern s32 gVideoLastDepthBuffer; -void f32_matrix_to_s16_matrix(Matrix *, Matrix *); //unknown_070110 -void f32_matrix_from_position(Matrix *, f32, f32, f32); //From unknown_070110 +void f32_matrix_to_s16_matrix(Matrix *, Matrix *); //math_util +void f32_matrix_from_position(Matrix *, f32, f32, f32); //From math_util void dmacopy2(s32 videoLastFrameBuffer, s32 VideoCurrFrameBuffer, s32 size); s16 func_8006ABB4(s32 arg0); diff --git a/src/memory.h b/src/memory.h index d002d768..3d403744 100644 --- a/src/memory.h +++ b/src/memory.h @@ -73,8 +73,8 @@ typedef struct unk800B7D10 { //Functions below don't have files or matches yet unk800B7D10 *get_stack_pointer(void); // Non Matching with own file? -s32 *clear_status_register_flags(void); // Non Matching unknown_070110 -void set_status_register_flags(s32*); // Non Matching unknown_070110 +s32 *clear_status_register_flags(void); // Non Matching math_util +void set_status_register_flags(s32*); // Non Matching math_util void init_main_memory_pool(void); MemoryPoolSlot *new_sub_memory_pool(s32 poolDataSize, s32 numSlots); diff --git a/src/object_functions.h b/src/object_functions.h index fc84177f..bc33cc95 100644 --- a/src/object_functions.h +++ b/src/object_functions.h @@ -226,8 +226,8 @@ extern u32 osTvType; f32 sins_f(s16); // No idea where it's located f32 coss_f(s16); // No idea where it's located -s32 get_random_number_from_range(s32, s32); // Non Matching src/unknown_070110.c -s32 atan2s(s32, s32); // Non Matching src/unknown_070110.c +s32 get_random_number_from_range(s32, s32); // Non Matching src/math_util.c +s32 atan2s(s32, s32); // Non Matching src/math_util.c void obj_init_fireball_octoweapon(Object *obj, LevelObjectEntry_Fireball_Octoweapon *entry); void obj_init_lasergun(Object *obj, LevelObjectEntry_Lasergun *entry);