some rename in ceremony (#647)

* rename ceremony

* apply some suggestion

* some rename

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
coco875
2024-09-15 22:41:39 +02:00
committed by GitHub
parent e6bdbec61e
commit b42cf5a59a
12 changed files with 448 additions and 377 deletions
-3
View File
@@ -56,9 +56,6 @@ typedef struct {
/* 0xB4 */ f32 unk_B4;
} Camera; /* size = 0xB8 */
typedef BAD_RETURN(s32) (*CameraEvent)(Camera* c);
typedef CameraEvent CutsceneShot;
void camera_init(f32, f32, f32, s16, u32, s32);
void func_8001CA10(Camera*);
void func_8001CA24(Player*, f32);
+2 -2
View File
@@ -3,8 +3,8 @@
/* Function Prototypes */
void setup_camera_podium_ceremony(void);
void func_802816B8(void);
void update_camera_podium_ceremony(void);
void init_camera_podium_ceremony(void);
// guPerspective params
+19 -20
View File
@@ -5426,26 +5426,25 @@ void func_80014D30(s32 cameraId, s32 pathIndex) {
(f32) temp_v0->posZ);
}
void func_80014DE4(s32 arg0) {
void func_80014DE4(s32 cameraIndex) {
s32 cameraId;
D_801646CC = 0;
D_80164678[arg0] = D_80164670[arg0];
D_80164678[cameraIndex] = D_80164670[cameraIndex];
if ((gModeSelection != 1) && ((gCourseIndexInCup == COURSE_ONE) || (gDemoMode == (u16) 1))) {
D_80164678[arg0] = 0;
} else if ((D_80164678[arg0] != 0) && (D_80164678[arg0] != (s16) 1) && (D_80164678[arg0] != 2) &&
(D_80164678[arg0] != 3)) {
D_80164678[arg0] = 0;
D_80164678[cameraIndex] = 0;
} 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[arg0] = -1;
D_80164680[cameraIndex] = -1;
D_80163238 = 0;
D_801646C0[arg0] = 0;
D_801646C0[cameraIndex] = 0;
D_801646C8 = 0;
D_801646D0[arg0].unk0 = 0;
D_801646D0[arg0].unk2 = 0;
D_801646D0[arg0].unk4 = 0;
D_801646D0[cameraIndex].unk0 = 0;
D_801646D0[cameraIndex].unk2 = 0;
D_801646D0[cameraIndex].unk4 = 0;
if ((gModeSelection == 1) && (D_8018EDFC == 0)) {
D_80164678[arg0] = 0;
D_80164678[cameraIndex] = 0;
}
for (cameraId = 0; cameraId < 4; cameraId++) {
@@ -5532,7 +5531,7 @@ f32 func_80014EE4(f32 arg0, s32 arg1) {
return arg0;
}
void func_800151A4(Camera* camera, s32 arg1) {
void calculate_camera_up_vector(Camera *camera, s32 cameraIndex) {
f32 xnorm;
f32 ynorm;
f32 znorm;
@@ -5543,7 +5542,7 @@ void func_800151A4(Camera* camera, s32 arg1) {
f32 sp28;
u16 thing;
thing = D_801646C0[arg1];
thing = D_801646C0[cameraIndex];
if (thing == 0) {
camera->up[0] = 0.0f;
camera->up[2] = 0.0f;
@@ -6665,10 +6664,10 @@ void func_80019890(s32 playerId, s32 cameraId) {
}
}
void func_80019B50(s32 arg0, u16 arg1) {
void func_80019B50(s32 cameraIndex, u16 arg1) {
u16 var_v0;
var_v0 = D_801646C0[arg0];
var_v0 = D_801646C0[cameraIndex];
if (var_v0 < arg1) {
if ((arg1 - var_v0) < 0x8000) {
var_v0 += 0x5A;
@@ -6692,10 +6691,10 @@ void func_80019B50(s32 arg0, u16 arg1) {
}
} else if ((var_v0 - arg1) >= 0x8000) {
var_v0 += 0x5A;
if (!arg0) {} // wtf?
if (!cameraIndex) {} // wtf?
}
}
D_801646C0[arg0] = (s16) var_v0;
D_801646C0[cameraIndex] = (s16) var_v0;
}
void func_80019C50(s32 arg0) {
@@ -6723,7 +6722,7 @@ void func_80019D2C(Camera* camera, Player* player, s32 arg2) {
playerId = camera->playerId;
if ((D_80163378 != 0) && (gCurrentCourseId == 8)) {
func_800151A4(camera, arg2);
calculate_camera_up_vector(camera, arg2);
nearestWaypoint = gNearestWaypointByPlayerId[playerId];
if (((nearestWaypoint >= 0x65) && (nearestWaypoint < 0xFA)) ||
((nearestWaypoint >= 0x1AF) && (nearestWaypoint < 0x226))) {
@@ -6959,7 +6958,7 @@ void func_8001A588(UNUSED u16* localD_80152300, Camera* camera, Player* player,
func_80019D2C(camera, player, cameraIndex);
} else {
D_801646C0[cameraIndex] = 0;
func_800151A4(camera, cameraIndex);
calculate_camera_up_vector(camera, cameraIndex);
}
switch ((u16) D_801646CC) {
case 1:
+1 -1
View File
@@ -194,7 +194,7 @@ void func_80014D30(s32, s32);
void func_80014DE4(s32);
f32 func_80014EE4(f32, s32);
void func_800151A4(Camera*, s32);
void calculate_camera_up_vector(Camera*, s32);
void func_8001530C(void);
void func_80015314(s32, f32, s32);
void func_80015390(Camera*, Player*, s32);
+2 -2
View File
@@ -11965,14 +11965,14 @@ void func_800AF270(struct_8018D9E0_entry* arg0) {
if (D_802874D8.unk1D >= 3) {
arg0->cursor = 4;
func_800CA0B8();
func_800C90F4(0U, (sp30 * 0x10) + 0x29008003);
func_800C90F4(0U, (sp30 * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x03));
func_800CA0A0();
} else {
arg0->cursor = 3;
func_8009A640(arg0->D_8018DEE0_index, 0, sp30,
segmented_to_virtual_dupe_2(gCharacterCelebrateAnimation[temp_v0]));
func_800CA0B8();
func_800C90F4(0U, (sp30 * 0x10) + 0x29008007);
func_800C90F4(0U, (sp30 * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80 ,0x07));
func_800CA0A0();
}
}
+3 -3
View File
@@ -8,8 +8,8 @@
#include "ceremony_and_credits.h"
#include "main.h"
void setup_camera_podium_ceremony(void) {
Camera* camera;
void update_camera_podium_ceremony(void) {
Camera *camera;
f32 x_dist;
f32 y_dist;
f32 z_dist;
@@ -26,7 +26,7 @@ void setup_camera_podium_ceremony(void) {
}
// GP podium ceremony camera settings?
void func_802816B8(void) {
void init_camera_podium_ceremony(void) {
cameras[0].pos[0] = -3133.0f;
cameras[0].pos[1] = 19.0f;
cameras[0].pos[2] = -467.0f;
File diff suppressed because it is too large Load Diff
+90 -86
View File
@@ -48,7 +48,7 @@ struct credits_data_1FA0 {
*
* See the sCutsceneVars[] array in camera.c for more details.
*/
struct CinematicCamera {
typedef struct {
/* 0x00 */ Vec3f pos;
/* 0x0C */ Vec3f lookAt;
/* 0x18 */ f32 unk18;
@@ -67,7 +67,7 @@ struct CinematicCamera {
/* 0x68 */ f32 unk68;
/* 0x6C */ s16 unk6C;
/* 0x6E */ s16 unk6E;
}; // size = 0x70
} CinematicCamera; // size = 0x70
struct struct_80282C40 {
s8 unk0;
@@ -99,15 +99,18 @@ struct CutsceneSplinePoint {
};
struct Cutscene {
/* 0x0 */ void (*shot)(struct CinematicCamera*);
/* 0x0 */ void (*shot)(CinematicCamera *);
/* 0x4 */ s16 duration;
/* 0x6 */ // s16 pad;
}; /* size = 0x8 */
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);
@@ -116,88 +119,89 @@ void vec3f_copy_return_dupe(Vec3f, Vec3f);
void vec3s_copy_dupe(Vec3s, Vec3s);
void func_80282040(void);
void func_80282048(void);
void func_80282050(Vec3f, Vec3f, s16);
void func_802820F8(Vec3f, Vec3f, s16);
s32 f32_lerp(f32*, f32, f32);
s32 func_80282200(Vec3s, s16, s16);
s32 set_transition_colour_fade_alpha_ending(f32*, f32, f32);
s32 func_80282364(s16*, s16, s16);
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);
void reset_spline(void);
void func_80282434(struct CinematicCamera*);
void func_80282454(Vec3f, Vec3f, f32*, s16*, s16*);
void func_80282504(Vec3f, Vec3f, f32, s16, s16);
void func_802825C8(Vec3f, Vec3f, Vec3f, Vec3s);
void func_80282700(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 func_80282D90(struct CinematicCamera*, struct struct_80286A04*, struct struct_80286A04*, s32);
void func_80282E58(struct CinematicCamera*, struct struct_80282C40*, s32);
void func_80282EAC(s32, struct CinematicCamera*, s16, s16, s16);
void func_80282F00(s16*, s16);
void func_80282F44(s32, struct CinematicCamera*, Camera*);
void func_802830B4(struct CinematicCamera*, s16, s16, s16);
void func_80283100(struct CinematicCamera*, f32*);
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 func_80283240(s16);
s32 cutscene_event(CameraEvent event, struct CinematicCamera*, s16, s16);
s32 cutscene_event(CameraEvent event, CinematicCamera *, s16, s16);
s32 func_80283330(s32);
s32 func_8028336C(struct CinematicCamera*, Camera*);
s32 func_80283428(void);
void func_80283968(struct CinematicCamera*);
void func_80283994(struct CinematicCamera*);
void func_802839B4(struct CinematicCamera*);
void func_802839CC(struct CinematicCamera*);
void func_802839E0(struct CinematicCamera*);
void play_sound_welcome(struct CinematicCamera*);
void func_80283A34(struct CinematicCamera*);
void play_sound_congratulation(struct CinematicCamera*);
void play_sound_balloon_pop(struct CinematicCamera*);
void play_sound_fish(struct CinematicCamera*);
void play_sound_fish_2(struct CinematicCamera*);
void play_sound_shoot_trophy(struct CinematicCamera*);
void play_sound_podium(struct CinematicCamera*);
void play_sound_trophy(struct CinematicCamera*);
void func_80283A54(struct CinematicCamera*);
void func_80283A7C(struct CinematicCamera*);
void func_80283B6C(struct CinematicCamera*);
void func_80283BA4(struct CinematicCamera*);
void func_80283BF0(struct CinematicCamera*);
void func_80283C14(struct CinematicCamera*);
void func_80283C38(struct CinematicCamera*);
void func_80283C58(struct CinematicCamera*);
void func_80283C78(struct CinematicCamera*);
void func_80283CA8(struct CinematicCamera*);
void func_80283CD0(struct CinematicCamera*);
void play_sound_farewell(struct CinematicCamera*);
void func_80283D2C(struct CinematicCamera*);
void func_80283EA0(struct CinematicCamera*);
void func_80283ED0(struct CinematicCamera*);
void func_80283EF8(struct CinematicCamera*);
void func_80283F6C(struct CinematicCamera*);
void func_80283FCC(struct CinematicCamera*);
void func_80283FF4(struct CinematicCamera*);
void func_80284068(struct CinematicCamera*);
void func_802840C8(struct CinematicCamera*);
void func_80284154(struct CinematicCamera*);
void func_80284184(struct CinematicCamera*);
void func_802841E8(struct CinematicCamera*);
void func_8028422C(struct CinematicCamera*);
void func_802842A8(struct CinematicCamera*);
void func_802842D8(struct CinematicCamera*);
void func_80284308(struct CinematicCamera*);
void func_80284418(struct CinematicCamera*);
void func_80284494(struct CinematicCamera*);
void func_802844FC(struct CinematicCamera*);
void func_8028454C(struct CinematicCamera*);
void func_802845EC(struct CinematicCamera*);
void func_8028461C(struct CinematicCamera*);
void func_80284648(struct CinematicCamera*);
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 func_802846AC(void);
void func_802846B4(struct CinematicCamera*);
void func_802846E4(struct CinematicCamera*);
void func_802847CC(struct CinematicCamera*);
void play_cutscene(struct CinematicCamera*);
void transition_sliding_borders(void);
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 */
@@ -205,9 +209,9 @@ extern s32 D_80283FCC;
extern s32 D_80283FF4;
extern f32 D_802856B0;
extern f32 D_802856B4;
extern f32 D_802856B8;
extern f32 gOrderedSizeSlidingBorders;
extern f32 D_802856BC;
extern f32 D_802856C0;
extern f32 gSizeSlidingBorders;
extern s32 D_802856C4;
extern s32 D_802856C8[]; // padding?
extern s16 sCutsceneShot;
@@ -215,7 +219,7 @@ extern s16 gCutsceneShotTimer;
extern s32 D_802876D4;
extern s32 D_802876D8;
extern s32 D_802876DC; // fake/padding? Or D8 is array?
extern struct CinematicCamera D_802876E0;
extern CinematicCamera D_802876E0;
extern struct struct_80283431 D_80287750[];
extern struct struct_80283430 D_80287818[];
extern struct struct_80283430 D_80287998[];
@@ -248,7 +252,7 @@ extern struct struct_80282C40 D_80285B90[];
extern struct struct_80282C40 D_80285BA8[];
extern struct struct_80282C40 D_80285C38[];
extern struct struct_80282C40 D_80285C74[];
extern struct Cutscene D_80285D10[];
extern struct Cutscene gCutScene[];
extern s16 D_80285D14;
extern s32 D_802876D4;
extern s32 D_802876D8;
+3 -3
View File
@@ -64,9 +64,9 @@ 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);
transition_sliding_borders();
render_object(PLAYER_ONE+SCREEN_MODE_1P);
render_player_snow_effect(PLAYER_ONE+SCREEN_MODE_1P);
ceremony_transition_sliding_borders();
func_80281C40();
init_rdp();
func_80093F10();
+1 -1
View File
@@ -154,7 +154,7 @@ void load_ceremony_cutscene(void) {
init_hud();
func_8001C05C();
balloons_and_fireworks_init();
func_802816B8();
init_camera_podium_ceremony();
func_80093E60();
D_801625F8 = (s32) gHeapEndPtr - gNextFreeMemoryAddress;
D_801625FC = ((f32) D_801625F8 / 1000.0f);
+1 -1
View File
@@ -88,7 +88,7 @@ void func_80281D00(void) {
func_80021B0C();
gSPDisplayList(gDisplayListHead++, VIRTUAL_TO_PHYSICAL2(&D_80284EE0));
func_80093F10();
transition_sliding_borders();
ceremony_transition_sliding_borders();
func_80281C40();
init_rdp();
}
+1 -1
View File
@@ -448,7 +448,7 @@ void func_80281540(void) {
void podium_ceremony_loop(void) {
gMatrixObjectCount = 0;
D_802874FC = 0;
setup_camera_podium_ceremony();
update_camera_podium_ceremony();
func_80028F70();
func_80022744();
func_80059AC8();