From 39be31b758c6c7bed5a5cba929b45f50a6e23af7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 15:00:58 -0600 Subject: [PATCH] clang format (#681) Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> --- src/code_80005FD0.c | 5 +- src/code_80091750.c | 2 +- src/ending/camera_junk.c | 2 +- src/ending/ceremony_and_credits.h | 151 +++++++++++++++--------------- src/ending/code_80280000.c | 4 +- 5 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 16bc17042..3e2dd207e 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -5433,7 +5433,8 @@ void func_80014DE4(s32 cameraIndex) { D_80164678[cameraIndex] = D_80164670[cameraIndex]; if ((gModeSelection != 1) && ((gCourseIndexInCup == COURSE_ONE) || (gDemoMode == (u16) 1))) { D_80164678[cameraIndex] = 0; - } else if ((D_80164678[cameraIndex] != 0) && (D_80164678[cameraIndex] != (s16) 1) && (D_80164678[cameraIndex] != 2) && (D_80164678[cameraIndex] != 3)) { + } else if ((D_80164678[cameraIndex] != 0) && (D_80164678[cameraIndex] != (s16) 1) && + (D_80164678[cameraIndex] != 2) && (D_80164678[cameraIndex] != 3)) { D_80164678[cameraIndex] = 0; } D_80164680[cameraIndex] = -1; @@ -5531,7 +5532,7 @@ f32 func_80014EE4(f32 arg0, s32 arg1) { return arg0; } -void calculate_camera_up_vector(Camera *camera, s32 cameraIndex) { +void calculate_camera_up_vector(Camera* camera, s32 cameraIndex) { f32 xnorm; f32 ynorm; f32 znorm; diff --git a/src/code_80091750.c b/src/code_80091750.c index 32cd3c2a5..7b5176eff 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -11972,7 +11972,7 @@ void func_800AF270(struct_8018D9E0_entry* arg0) { func_8009A640(arg0->D_8018DEE0_index, 0, sp30, segmented_to_virtual_dupe_2(gCharacterCelebrateAnimation[temp_v0])); func_800CA0B8(); - func_800C90F4(0U, (sp30 * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80 ,0x07)); + func_800C90F4(0U, (sp30 * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x07)); func_800CA0A0(); } } diff --git a/src/ending/camera_junk.c b/src/ending/camera_junk.c index 8bd1bb12f..2d1baa920 100644 --- a/src/ending/camera_junk.c +++ b/src/ending/camera_junk.c @@ -9,7 +9,7 @@ #include "main.h" void update_camera_podium_ceremony(void) { - Camera *camera; + Camera* camera; f32 x_dist; f32 y_dist; f32 z_dist; diff --git a/src/ending/ceremony_and_credits.h b/src/ending/ceremony_and_credits.h index 58a326acd..86c6a5b07 100644 --- a/src/ending/ceremony_and_credits.h +++ b/src/ending/ceremony_and_credits.h @@ -99,18 +99,18 @@ struct CutsceneSplinePoint { }; struct Cutscene { - /* 0x0 */ void (*shot)(CinematicCamera *); + /* 0x0 */ void (*shot)(CinematicCamera*); /* 0x4 */ s16 duration; /* 0x6 */ // s16 pad; }; /* size = 0x8 */ -typedef void (*CameraEvent)(CinematicCamera *c); +typedef void (*CameraEvent)(CinematicCamera* c); typedef CameraEvent CutsceneShot; /* Function Prototypes */ void init_cinematic_camera(void); -s32 func_80283648(Camera *); +s32 func_80283648(Camera*); void vec3f_set_dupe(Vec3f, f32, f32, f32); void vec3s_set_dupe(Vec3s, s16, s16, s16); void vec3f_clear(Vec3f); @@ -121,86 +121,85 @@ void func_80282040(void); void func_80282048(void); void rotate_y_vec3f(Vec3f, Vec3f, s16); void rotate_x_vec3f(Vec3f, Vec3f, s16); -s32 f32_lerp(f32 *, f32, f32); -s32 ease_out_transition(s16 *, s16, s16); -s32 adjust_f32_value_transition(f32 *, f32, f32); -s32 adjust_s16_value_transition(s16 *, s16, s16); +s32 f32_lerp(f32*, f32, f32); +s32 ease_out_transition(s16*, s16, s16); +s32 adjust_f32_value_transition(f32*, f32, f32); +s32 adjust_s16_value_transition(s16*, s16, s16); void reset_spline(void); -void reset_spline_wrap(CinematicCamera *); -void calculate_distance_angle_y_and_angle_y_to_xz(Vec3f, Vec3f, f32 *, s16 *, s16 *); +void reset_spline_wrap(CinematicCamera*); +void calculate_distance_angle_y_and_angle_y_to_xz(Vec3f, Vec3f, f32*, s16*, s16*); void apply_distance_angle_y_and_angle_y_to_xz(Vec3f, Vec3f, f32, s16, s16); void aborting_cinematic_function(Vec3f, Vec3f, Vec3f, Vec3s); -void evaluate_cubic_spline(f32, Vec3f, f32 *, f32[], f32[], f32[], f32[]); -s32 move_point_along_spline(Vec3f, f32 *, struct struct_80283430[], s16 *, f32 *); -void func_80282BE4(struct struct_80283430 *, s8, u8, s8, Vec3s, s32); -void func_80282C40(struct struct_80283430 *, struct struct_80282C40 *, s32); -s32 move_cinematic_camera_along_spline(CinematicCamera *, struct struct_80286A04 *, - struct struct_80286A04 *, s32); -void func_80282E58(CinematicCamera *, struct struct_80282C40 *, s32); -void func_80282EAC(s32, CinematicCamera *, s16, s16, s16); -void func_80282F00(s16 *, s16); -void func_80282F44(s32, CinematicCamera *, Camera *); -void func_802830B4(CinematicCamera *, s16, s16, s16); -void func_80283100(CinematicCamera *, f32 *); +void evaluate_cubic_spline(f32, Vec3f, f32*, f32[], f32[], f32[], f32[]); +s32 move_point_along_spline(Vec3f, f32*, struct struct_80283430[], s16*, f32*); +void func_80282BE4(struct struct_80283430*, s8, u8, s8, Vec3s, s32); +void func_80282C40(struct struct_80283430*, struct struct_80282C40*, s32); +s32 move_cinematic_camera_along_spline(CinematicCamera*, struct struct_80286A04*, struct struct_80286A04*, s32); +void func_80282E58(CinematicCamera*, struct struct_80282C40*, s32); +void func_80282EAC(s32, CinematicCamera*, s16, s16, s16); +void func_80282F00(s16*, s16); +void func_80282F44(s32, CinematicCamera*, Camera*); +void func_802830B4(CinematicCamera*, s16, s16, s16); +void func_80283100(CinematicCamera*, f32*); void func_80283240(s16); -s32 cutscene_event(CameraEvent event, CinematicCamera *, s16, s16); +s32 cutscene_event(CameraEvent event, CinematicCamera*, s16, s16); s32 func_80283330(s32); -s32 func_8028336C(CinematicCamera *, Camera *); +s32 func_8028336C(CinematicCamera*, Camera*); s32 cinematic_stub(void); -void wrap_func_8028100C(CinematicCamera *); -void wrap_func_80280FFC(CinematicCamera *); -void animation_apears_sliding_borders(CinematicCamera *); -void animation_disapears_sliding_borders(CinematicCamera *); -void wrap_func_80092C80(CinematicCamera *); -void play_sound_welcome(CinematicCamera *); -void wrap_func_800CA0CC(CinematicCamera *); -void play_sound_congratulation(CinematicCamera *); -void play_sound_balloon_pop(CinematicCamera *); -void play_sound_fish(CinematicCamera *); -void play_sound_fish_2(CinematicCamera *); -void play_sound_shoot_trophy(CinematicCamera *); -void play_sound_podium(CinematicCamera *); -void play_sound_trophy(CinematicCamera *); -void func_80283A54(CinematicCamera *); -void func_80283A7C(CinematicCamera *); -void func_80283B6C(CinematicCamera *); -void func_80283BA4(CinematicCamera *); -void func_80283BF0(CinematicCamera *); -void func_80283C14(CinematicCamera *); -void wrap_func_800CB134(CinematicCamera *); -void wrap_func_800CB14C(CinematicCamera *); -void func_80283C78(CinematicCamera *); -void func_80283CA8(CinematicCamera *); -void func_80283CD0(CinematicCamera *); -void play_sound_farewell(CinematicCamera *); -void func_80283D2C(CinematicCamera *); -void func_80283EA0(CinematicCamera *); -void copy_player_two_in_camera(CinematicCamera *); -void lerp_player_two_in_camera(CinematicCamera *); -void func_80283F6C(CinematicCamera *); -void copy_player_three_in_camera(CinematicCamera *); -void lerp_player_three_in_camera(CinematicCamera *); -void func_80284068(CinematicCamera *); -void func_802840C8(CinematicCamera *); -void func_80284154(CinematicCamera *); -void func_80284184(CinematicCamera *); -void func_802841E8(CinematicCamera *); -void func_8028422C(CinematicCamera *); -void func_802842A8(CinematicCamera *); -void func_802842D8(CinematicCamera *); -void func_80284308(CinematicCamera *); -void func_80284418(CinematicCamera *); -void func_80284494(CinematicCamera *); -void func_802844FC(CinematicCamera *); -void func_8028454C(CinematicCamera *); -void func_802845EC(CinematicCamera *); -void func_8028461C(CinematicCamera *); -void func_80284648(CinematicCamera *); +void wrap_func_8028100C(CinematicCamera*); +void wrap_func_80280FFC(CinematicCamera*); +void animation_apears_sliding_borders(CinematicCamera*); +void animation_disapears_sliding_borders(CinematicCamera*); +void wrap_func_80092C80(CinematicCamera*); +void play_sound_welcome(CinematicCamera*); +void wrap_func_800CA0CC(CinematicCamera*); +void play_sound_congratulation(CinematicCamera*); +void play_sound_balloon_pop(CinematicCamera*); +void play_sound_fish(CinematicCamera*); +void play_sound_fish_2(CinematicCamera*); +void play_sound_shoot_trophy(CinematicCamera*); +void play_sound_podium(CinematicCamera*); +void play_sound_trophy(CinematicCamera*); +void func_80283A54(CinematicCamera*); +void func_80283A7C(CinematicCamera*); +void func_80283B6C(CinematicCamera*); +void func_80283BA4(CinematicCamera*); +void func_80283BF0(CinematicCamera*); +void func_80283C14(CinematicCamera*); +void wrap_func_800CB134(CinematicCamera*); +void wrap_func_800CB14C(CinematicCamera*); +void func_80283C78(CinematicCamera*); +void func_80283CA8(CinematicCamera*); +void func_80283CD0(CinematicCamera*); +void play_sound_farewell(CinematicCamera*); +void func_80283D2C(CinematicCamera*); +void func_80283EA0(CinematicCamera*); +void copy_player_two_in_camera(CinematicCamera*); +void lerp_player_two_in_camera(CinematicCamera*); +void func_80283F6C(CinematicCamera*); +void copy_player_three_in_camera(CinematicCamera*); +void lerp_player_three_in_camera(CinematicCamera*); +void func_80284068(CinematicCamera*); +void func_802840C8(CinematicCamera*); +void func_80284154(CinematicCamera*); +void func_80284184(CinematicCamera*); +void func_802841E8(CinematicCamera*); +void func_8028422C(CinematicCamera*); +void func_802842A8(CinematicCamera*); +void func_802842D8(CinematicCamera*); +void func_80284308(CinematicCamera*); +void func_80284418(CinematicCamera*); +void func_80284494(CinematicCamera*); +void func_802844FC(CinematicCamera*); +void func_8028454C(CinematicCamera*); +void func_802845EC(CinematicCamera*); +void func_8028461C(CinematicCamera*); +void func_80284648(CinematicCamera*); void func_802846AC(void); -void func_802846B4(CinematicCamera *); -void func_802846E4(CinematicCamera *); -void func_802847CC(CinematicCamera *); -void play_cutscene(CinematicCamera *); +void func_802846B4(CinematicCamera*); +void func_802846E4(CinematicCamera*); +void func_802847CC(CinematicCamera*); +void play_cutscene(CinematicCamera*); void ceremony_transition_sliding_borders(void); /* This is where I'd put my static data, if I had any */ diff --git a/src/ending/code_80280000.c b/src/ending/code_80280000.c index 05a1112cd..0a414e9a6 100644 --- a/src/ending/code_80280000.c +++ b/src/ending/code_80280000.c @@ -64,8 +64,8 @@ void func_80280038(void) { render_set_position(matrix, 0); render_course(D_800DC5EC); render_course_actors(D_800DC5EC); - render_object(PLAYER_ONE+SCREEN_MODE_1P); - render_player_snow_effect(PLAYER_ONE+SCREEN_MODE_1P); + render_object(PLAYER_ONE + SCREEN_MODE_1P); + render_player_snow_effect(PLAYER_ONE + SCREEN_MODE_1P); ceremony_transition_sliding_borders(); func_80281C40(); init_rdp();