From 6885c23c6733406b0d3ceabccf27b080fa770920 Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:43:51 +0200 Subject: [PATCH] fix ending typo (#651) --- src/ending/camera_junk.c | 2 +- src/ending/ceremony_and_credits.c | 24 ++++++++++++------------ src/ending/ceremony_and_credits.h | 2 +- src/ending/code_80280000.c | 6 +++--- src/ending/code_80280000.h | 2 +- src/ending/code_80281C40.h | 2 +- src/ending/credits.h | 2 +- src/ending/podium_ceremony_actors.c | 10 +++++----- src/ending/podium_ceremony_actors.h | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/ending/camera_junk.c b/src/ending/camera_junk.c index ec709d0ff..47b7033df 100644 --- a/src/ending/camera_junk.c +++ b/src/ending/camera_junk.c @@ -16,7 +16,7 @@ void setup_camera_podium_ceremony(void) { camera = &cameras[0]; func_80283648(camera); - + x_dist = camera->lookAt[0] - camera->pos[0]; y_dist = camera->lookAt[1] - camera->pos[1]; z_dist = camera->lookAt[2] - camera->pos[2]; diff --git a/src/ending/ceremony_and_credits.c b/src/ending/ceremony_and_credits.c index 4bd1add1e..bdee3dc6c 100644 --- a/src/ending/ceremony_and_credits.c +++ b/src/ending/ceremony_and_credits.c @@ -113,9 +113,9 @@ s32 f32_lerp(f32 *dest, f32 src, f32 lerp) { if (lerp > 1.0f) { lerp = 1.0f; } - + *dest = *dest + ((src - *dest) * lerp); - + if (src == *dest) { return 0; } @@ -133,7 +133,7 @@ UNUSED s32 func_80282200(Vec3s arg0, s16 arg1, s16 arg2) { temp_v0 += arg1; arg0[0] = temp_v0; } - + if (arg1 == arg0[0]) { return 0; } @@ -143,7 +143,7 @@ UNUSED s32 func_80282200(Vec3s arg0, s16 arg1, s16 arg2) { // Calculates fade in/out s32 set_transition_colour_fade_alpha_ending(f32 *arg0, f32 arg1, f32 arg2) { f32 temp_f0 = arg1 - *arg0; - + if (arg2 < 0.0f) { arg2 = -1.0f * arg2; } @@ -309,7 +309,7 @@ s32 move_point_along_spline(Vec3f p, f32 *arg1, struct struct_80283430 spline[], } func_80282700(u, p, arg1, controlPoints[0], controlPoints[1], controlPoints[2], controlPoints[3]); - + if (spline[*splineSegment + 1].unk2 != 0) { firstSpeed = 1.0f / spline[*splineSegment + 1].unk2; } @@ -356,7 +356,7 @@ void func_80282C40(struct struct_80283430 *arg0, struct struct_80282C40 *arg1, s s32 i = 0; s32 j = 0; func_80282BE4(&arg0[j], arg1[j].unk0, arg1[j].unk3, arg1[j].unk4, arg1[j].unk6, arg2); - + j++; goto dummy_label_888430; while(true) { @@ -372,7 +372,7 @@ dummy_label_888430: ; func_80282BE4(&arg0[j], arg1->unk0, arg1[i].unk3, arg1[i].unk4, arg1[i].unk6, arg2); func_80282BE4(&arg0[j + 1], arg1->unk0, 0, arg1[i].unk4, arg1[i].unk6, arg2); func_80282BE4(&arg0[j + 2], arg1->unk0, 0, arg1[i].unk4, arg1[i].unk6, arg2); - func_80282BE4(&arg0[j + 3], -1, 0, arg1[i].unk4, arg1[i].unk6, arg2); + func_80282BE4(&arg0[j + 3], -1, 0, arg1[i].unk4, arg1[i].unk6, arg2); break; } } @@ -727,7 +727,7 @@ void func_80283BF0(UNUSED struct CinematicCamera *camera) { func_800C8EF8(0x1A); } -// +// void func_80283C14(UNUSED struct CinematicCamera *camera) { func_800C8EF8(0x1B); } @@ -1584,7 +1584,7 @@ void func_802847CC(struct CinematicCamera *camera) { } #endif - if (gCutsceneShotTimer == sp2C) { + if (gCutsceneShotTimer == sp2C) { if (D_80286A04[D_800DC5E4].unk0 != 2) { func_80280268(D_80286A04[D_800DC5E4 + 1].unk1); } @@ -1631,7 +1631,7 @@ void play_cutscene(struct CinematicCamera *camera) { #undef CUTSCENE if ((cutsceneDuration != 0) && ((gCutsceneShotTimer & 0xC000) == 0)) { - + if (gCutsceneShotTimer < 16383) { gCutsceneShotTimer++; } @@ -1651,12 +1651,12 @@ void play_cutscene(struct CinematicCamera *camera) { reset_spline(); } } - + } /** * Scene transition - * + * * Sliding black borders that open horizontally to display scene. * Used at the beginning of award ceremony and throughout credits. */ diff --git a/src/ending/ceremony_and_credits.h b/src/ending/ceremony_and_credits.h index 3121c98f1..475a5278b 100644 --- a/src/ending/ceremony_and_credits.h +++ b/src/ending/ceremony_and_credits.h @@ -1,7 +1,7 @@ #ifndef CEREMONY_AND_CREDITS_H #define CEREMONY_AND_CREDITS_H -#include "common_structs.h" +#include #include "camera.h" struct struct_80283431 { diff --git a/src/ending/code_80280000.c b/src/ending/code_80280000.c index 28730e986..5054fe5bb 100644 --- a/src/ending/code_80280000.c +++ b/src/ending/code_80280000.c @@ -50,7 +50,7 @@ void func_80280038(void) { func_802A53A4(); init_rdp(); func_80057FC4(0); - + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, D_80150150, D_8015014C, 1.0f); gSPPerspNormalize(gDisplayListHead++, perspNorm); @@ -83,7 +83,7 @@ void func_80280268(s32 arg0) { void credits_loop(void) { Camera *camera = &cameras[0]; - + f32 temp_f12; f32 temp; f32 temp_f14; @@ -140,7 +140,7 @@ void load_credits(void) { load_course(gCurrentCourseId); D_8015F730 = gNextFreeMemoryAddress; set_segment_base_addr(0xB, (void *) decompress_segments((u8 *) CEREMONY_DATA_ROM_START, (u8 *) CEREMONY_DATA_ROM_END)); - + gCourseMinX = -0x15A1; gCourseMinY = -0x15A1; gCourseMinZ = -0x15A1; diff --git a/src/ending/code_80280000.h b/src/ending/code_80280000.h index dd71642d1..c9cdbb81e 100644 --- a/src/ending/code_80280000.h +++ b/src/ending/code_80280000.h @@ -1,7 +1,7 @@ #ifndef CODE_80280000_H #define CODE_80280000_H -#include "common_structs.h" +#include /* Function Prototypes */ diff --git a/src/ending/code_80281C40.h b/src/ending/code_80281C40.h index 50ccc4f4e..23f356284 100644 --- a/src/ending/code_80281C40.h +++ b/src/ending/code_80281C40.h @@ -1,5 +1,5 @@ #ifndef CODE_80281C40_H -#define CODE_80281C40_h +#define CODE_80281C40_H /* Function Prototypes */ diff --git a/src/ending/credits.h b/src/ending/credits.h index 277cf0196..40ac46bec 100644 --- a/src/ending/credits.h +++ b/src/ending/credits.h @@ -1,7 +1,7 @@ #ifndef CREDITS_H #define CREDITS_H -#include "PR/ultratypes.h" +#include #define SLIDE_RIGHT 0 #define SLIDE_LEFT 1 diff --git a/src/ending/podium_ceremony_actors.c b/src/ending/podium_ceremony_actors.c index dc6a224d6..260ffe234 100644 --- a/src/ending/podium_ceremony_actors.c +++ b/src/ending/podium_ceremony_actors.c @@ -90,7 +90,7 @@ void set_initial_position(CeremonyActor *actor) { actor->pos[0] = params->unk2[0]; actor->pos[1] = params->unk2[1]; actor->pos[2] = params->unk2[2]; - + // Place value in the high bits of s16. // Example: 85, 0b01010101 -> 0b0101010100000000 actor->unkA = params->unk8 << 8; @@ -149,7 +149,7 @@ u16 random_u16_credits(void) { temp1 = ((temp1 & 0x00FF) << 1) ^ sRandomSeed16; temp2 = (temp1 >> 1) ^ 0xFF80; - + if ((temp1 & 1) == 0) { if (temp2 == 43605) { sRandomSeed16 = 0; @@ -356,7 +356,7 @@ void spawn_firework_cone(s32 arg0, s32 arg1, s32 arg2) { cone->pos[0] = random_who_knows(0.0f) + arg0; cone->pos[1] = random_who_knows((f32) (D_802874B0[11] + 100)) + (f32) arg1; cone->pos[2] = random_who_knows((f32) (D_802874B0[12] + 700)) + (f32) arg2; - + num = 1.1f; // Wrap the counter from zero to three @@ -393,7 +393,7 @@ void spawn_timer(void) { } else if (D_802874D8.actorTimer == 2) { spawn_balloons(-0xC6C, (s32) ((f32) D_802874B0[10] + 210.0f), -0x1EF); } - + D_802874D8.actorTimer += 1; } @@ -475,7 +475,7 @@ void podium_ceremony_loop(void) { func_80281D00(); func_80281540(); #if DVDL - display_dvdl(); + display_dvdl(); #endif gDPFullSync(gDisplayListHead++); gSPEndDisplayList(gDisplayListHead++); diff --git a/src/ending/podium_ceremony_actors.h b/src/ending/podium_ceremony_actors.h index 85c3549e5..59d984559 100644 --- a/src/ending/podium_ceremony_actors.h +++ b/src/ending/podium_ceremony_actors.h @@ -1,7 +1,7 @@ #ifndef podium_ceremony_actors_H #define podium_ceremony_actors_H -#include "common_structs.h" +#include enum CeremonyActorType { Initial,