diff --git a/include/waypoints.h b/include/waypoints.h index 3798eae9e..e6c3e8380 100644 --- a/include/waypoints.h +++ b/include/waypoints.h @@ -34,7 +34,7 @@ extern TrackPathPoint* gTrackRightPaths[]; **/ // PathPoint types? extern s16* gTrackSectionTypes[]; -// Based on analyse_angle_path this may be angles between path point +// Based on analyze_path_angle this may be angles between path point // gPathExpectedRotation[i] = atan2(path_point_i, path_point_i+1)? extern s16* gPathExpectedRotation[]; // No idea. Adjacency list? diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index fe12e3ea2..e0b162a1b 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -3465,8 +3465,8 @@ void init_course_path_point(void) { if (D_80163368[i] >= 2) { load_track_path(i); calculate_track_boundaries(i); - analyze_track_section(i); - analyse_angle_path(i); + analyze_track_sections(i); + analyze_path_angle(i); analyze_curved_path(i); } } @@ -3802,7 +3802,7 @@ f32 calculate_track_curvature(s32 pathIndex, u16 waypointIndex) { return -((temp_f10 * temp_f10_2) - (temp_f8_2 * temp_f8)) / (root2 * root1); } -void analyze_track_section(s32 pathIndex) { +void analyze_track_sections(s32 pathIndex) { f64 sectionCurvature; UNUSED s32 pad; s32 k; @@ -3877,7 +3877,7 @@ s16 calculate_angle_path(s32 pathIndex, s32 waypointIndex) { } // Populates gPathExpectedRotation -void analyse_angle_path(s32 pathIndex) { +void analyze_path_angle(s32 pathIndex) { s32 waypointIndex; u16* angle; diff --git a/src/code_80005FD0.h b/src/code_80005FD0.h index fbaace193..905381065 100644 --- a/src/code_80005FD0.h +++ b/src/code_80005FD0.h @@ -174,9 +174,9 @@ void init_players(void); void load_track_path(s32); void calculate_track_boundaries(s32); f32 calculate_track_curvature(s32, u16); -void analyze_track_section(s32); +void analyze_track_sections(s32); s16 calculate_angle_path(s32, s32); -void analyse_angle_path(s32); +void analyze_path_angle(s32); void analyze_curved_path(s32); f32 func_80010F40(f32, f32, f32, s32, s32); f32 func_80010FA0(f32, f32, f32, s32, s32);