diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-09-16 09:01:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-16 09:01:55 -0600 |
| commit | 60ac50c9628d25968bfe367e1b4b6f030078be64 (patch) | |
| tree | e03a0d825cfe443adcf076cb643c20692151f431 /src/ending | |
| parent | 7adfdaa9abb18d76ae80f26bff58c2c4dc4f3f29 (diff) | |
| parent | 8fb42e50d70356300050048b57def3123e6d4552 (diff) | |
Merge branch 'main' into Caladius-patch-1Caladius-patch-1
Diffstat (limited to 'src/ending')
| -rw-r--r-- | src/ending/code_80280000.c | 2 | ||||
| -rw-r--r-- | src/ending/code_80281780.c | 6 | ||||
| -rw-r--r-- | src/ending/code_80281C40.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ending/code_80280000.c b/src/ending/code_80280000.c index 0ae8b934e..f6fd8690f 100644 --- a/src/ending/code_80280000.c +++ b/src/ending/code_80280000.c @@ -53,7 +53,7 @@ void func_80280038(Camera* camera) { gMatrixEffectCount = 0; gMatrixHudCount = 0; init_rdp(); - race_begin_viewport(gScreenOneCtx, 0); + race_begin_viewport(gScreenOneCtx); if ((CVarGetInteger("gDrawSky", true) == true)) { CM_RaceDrawSky(gScreenOneCtx, 0); func_80093A30(0); // Fill box for thunderbolt? diff --git a/src/ending/code_80281780.c b/src/ending/code_80281780.c index f361fa99c..b0c6ecaa2 100644 --- a/src/ending/code_80281780.c +++ b/src/ending/code_80281780.c @@ -28,7 +28,9 @@ // For init podium ceremony #include "ceremony_and_credits.h" -#define bcopy memcpy +// bcopy takes (src, dst); memcpy takes (dst, src), do not mix it up. +#undef bcopy +#define bcopy(src, dst, n) memmove(dst, src, n) u8 defaultCharacterIds[] = { 1, 2, 3, 4, 5, 6, 7, 0 }; @@ -94,8 +96,6 @@ void func_802818BC(void) { } void setup_podium_ceremony(void) { - Vec3f spawn = {0, 0, 0}; - clear_D_802874D8_actors(); gCurrentCourseId = TRACK_ROYAL_RACEWAY; diff --git a/src/ending/code_80281C40.c b/src/ending/code_80281C40.c index 08470accf..203e4f113 100644 --- a/src/ending/code_80281C40.c +++ b/src/ending/code_80281C40.c @@ -61,7 +61,7 @@ void func_80281D00(void) { Mat4 matrix; UNUSED s32 pad2[3]; - race_begin_viewport(gScreenOneCtx, 0); + race_begin_viewport(gScreenOneCtx); if ((CVarGetInteger("gDrawSky", true) == true)) { CM_RaceDrawSky(gScreenOneCtx, 0); func_80093A30(0); // Fill box for thunderbolt? |