Courses (#54)

* valley

* beach

* sherbet & rainbow

* fix ceremony

* Fix parser for course displaylists

* Fix crash near end of ceremony

* Clean rock

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>

4 files changed, 12 insertions, 15 deletions

diff --git a/src/actors/falling_rock/update.inc.c b/src/actors/falling_rock/update.inc.c
index a2842883f..da3c8c9dc 100644
--- a/src/actors/falling_rock/update.inc.c
+++ b/src/actors/falling_rock/update.inc.c
@@ -6,12 +6,10 @@
 void func_8029CF0C(struct ActorSpawnData *spawnData, struct FallingRock *rock) {
     struct ActorSpawnData *temp_v0 = (struct ActorSpawnData *) LOAD_ASSET(spawnData);
     Vec3s sp24 = {60, 120, 180};
-    temp_v0 += rock->unk_06;
-    //! @todo: fix this sp24[rock->unk_06] results in crash
-    rock->respawnTimer = sp24[0]; // * 2
-    rock->pos[0] = (f32) temp_v0->pos[0] * gCourseDirection;
-    rock->pos[1] = (f32) temp_v0->pos[1] + 10.0f;
-    rock->pos[2] = (f32) temp_v0->pos[2];
+    rock->respawnTimer = sp24[rock->unk_06]; // * 2
+    rock->pos[0] = (f32) temp_v0[rock->unk_06].pos[0] * gCourseDirection;
+    rock->pos[1] = (f32) temp_v0[rock->unk_06].pos[1] + 10.0f;
+    rock->pos[2] = (f32) temp_v0[rock->unk_06].pos[2];
     vec3f_set(rock->velocity, 0, 0, 0);
     vec3s_set(rock->rot, 0, 0, 0);
 }
diff --git a/src/actors/paddle_boat/render.inc.c b/src/actors/paddle_boat/render.inc.c
index 1fc5244c7..cebe7a046 100644
--- a/src/actors/paddle_boat/render.inc.c
+++ b/src/actors/paddle_boat/render.inc.c
@@ -5,7 +5,7 @@
 #include "main.h"
 #include "actors.h"
 #include "courses/all_course_data.h"
-//#include <assets/dks_jungle_parkway_data.h>
+#include <assets/dks_jungle_parkway_data.h>
 #include <libultra/gbi.h>
 
 /**
diff --git a/src/actors/palm_tree/render.inc.c b/src/actors/palm_tree/render.inc.c
index 5728f78db..1d80f901a 100644
--- a/src/actors/palm_tree/render.inc.c
+++ b/src/actors/palm_tree/render.inc.c
@@ -1,6 +1,6 @@
 #include <actors.h>
 #include <main.h>
-#include "courses/koopa_troopa_beach/course_data.h"
+#include <assets/koopa_troopa_beach_data.h>
 
 /**
  * @brief Renders the palm tree actor.
@@ -34,23 +34,23 @@ void render_actor_palm_tree(Camera *arg0, UNUSED Mat4 arg1, struct PalmTree *arg
 
             switch(arg2->variant) {
                 case 0:
-                    gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk1);
+                    gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_dl_tree_trunk1);
                     gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-                    gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top1);
+                    gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_dl_tree_top1);
                     gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
                     break;
 
                 case 1:
-                    gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk2);
+                    gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_dl_tree_trunk2);
                     gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-                    gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top2);
+                    gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_dl_tree_top2);
                     gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
                     break;
 
                 case 2:
-                    gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk3);
+                    gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_dl_tree_trunk3);
                     gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-                    gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top3);
+                    gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_dl_tree_top3);
                     gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
                     break;
 
diff --git a/src/actors/yoshi_egg/render.inc.c b/src/actors/yoshi_egg/render.inc.c
index 4ee09392d..b86e4ee5f 100644
--- a/src/actors/yoshi_egg/render.inc.c
+++ b/src/actors/yoshi_egg/render.inc.c
@@ -2,7 +2,6 @@
 #include <actors.h>
 #include <defines.h>
 #include <main.h>
-#include "courses/yoshi_valley/course_data.h"
 
 /**
  * @brief Renders the Yoshi egg actor.