summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2025-07-03 06:36:53 -0600
committerGitHub <noreply@github.com>2025-07-03 06:36:53 -0600
commitf9d2b51a53046b8ae9f15a11e969e466fa0e741a (patch)
treea8187ef33fce034a4b6bdc620f5c5d78403d8662 /src
parent99689a3f70d8cb38178f92b87ecdcdbbdb200429 (diff)
Clear Podium Actors, Path debug info (#405)
* Various Changes * Update code_80005FD0.c * Update code_80005FD0.c
Diffstat (limited to 'src')
-rw-r--r--src/code_80005FD0.c2
-rw-r--r--src/ending/ceremony_and_credits.c2
-rw-r--r--src/ending/ceremony_and_credits.h1
-rw-r--r--src/ending/code_80281780.c5
-rw-r--r--src/ending/podium_ceremony_actors.c4
-rw-r--r--src/ending/podium_ceremony_actors.h1
6 files changed, 13 insertions, 2 deletions
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c
index 14098e7bf..c05617ee4 100644
--- a/src/code_80005FD0.c
+++ b/src/code_80005FD0.c
@@ -3728,6 +3728,8 @@ void load_track_path(s32 pathIndex) {
if (!bInvalidPath) {
var_v0 = func_80011014(pathDest, path, sp24, pathIndex);
gPathCountByPathIndex[pathIndex] = (u16) var_v0;
+ } else {
+ printf("PathTable is invalid. It has %d path points\n It may also be missing the end tag.\n", i);
}
}
}
diff --git a/src/ending/ceremony_and_credits.c b/src/ending/ceremony_and_credits.c
index fd8b2405c..3fa30a4d7 100644
--- a/src/ending/ceremony_and_credits.c
+++ b/src/ending/ceremony_and_credits.c
@@ -28,7 +28,7 @@
f32 D_802856B0 = 98.0f;
f32 D_802856B4 = 12.0f;
f32 gOrderedSizeSlidingBorders = 52.0f;
-f32 D_802856BC = 52.0f;
+static const f32 D_802856BC = 52.0f;
f32 gSizeSlidingBorders = 0.0f;
s32 D_802856C4 = 0;
diff --git a/src/ending/ceremony_and_credits.h b/src/ending/ceremony_and_credits.h
index c84d33691..201c953e0 100644
--- a/src/ending/ceremony_and_credits.h
+++ b/src/ending/ceremony_and_credits.h
@@ -209,7 +209,6 @@ extern s32 D_80283FF4;
extern f32 D_802856B0;
extern f32 D_802856B4;
extern f32 gOrderedSizeSlidingBorders;
-extern f32 D_802856BC;
extern f32 gSizeSlidingBorders;
extern s32 D_802856C4;
extern s32 D_802856C8[]; // padding?
diff --git a/src/ending/code_80281780.c b/src/ending/code_80281780.c
index 83d75a63d..2cddad580 100644
--- a/src/ending/code_80281780.c
+++ b/src/ending/code_80281780.c
@@ -24,6 +24,9 @@
#include <string.h>
#include "port/Game.h"
+// For init podium ceremony
+#include "ceremony_and_credits.h"
+
#define bcopy memcpy
u8 defaultCharacterIds[] = { 1, 2, 3, 4, 5, 6, 7, 0 };
@@ -92,6 +95,8 @@ void func_802818BC(void) {
void setup_podium_ceremony(void) {
Camera* camera = &cameras[0];
+ clear_podium_actors();
+
gCurrentCourseId = COURSE_ROYAL_RACEWAY;
SelectPodiumCeremony();
D_800DC5B4 = (u16) 1;
diff --git a/src/ending/podium_ceremony_actors.c b/src/ending/podium_ceremony_actors.c
index 04edd018f..a80aeb129 100644
--- a/src/ending/podium_ceremony_actors.c
+++ b/src/ending/podium_ceremony_actors.c
@@ -132,6 +132,10 @@ CeremonyActor* new_actor(ActorInitParams* arg0) {
return actor;
}
+void clear_podium_actors() {
+ memset(&sPodiumActorList, 0, sizeof(CeremonyActor));
+}
+
u16 random_u16_credits(void) {
u16 temp1, temp2;
diff --git a/src/ending/podium_ceremony_actors.h b/src/ending/podium_ceremony_actors.h
index fb3499c71..f7646bb24 100644
--- a/src/ending/podium_ceremony_actors.h
+++ b/src/ending/podium_ceremony_actors.h
@@ -100,6 +100,7 @@ void func_80281530(void);
void func_80281538(void);
void func_80281540(void);
void podium_ceremony_loop(void);
+void clear_podium_actors(void);
extern struct_D_802874D8 D_802874D8;
extern CeremonyActor* sPodiumActorList;