WIP Compilation

16 files changed, 116 insertions, 120 deletions

diff --git a/src/actors/banana/render.inc.c b/src/actors/banana/render.inc.c
index e148cb767..ee7220421 100644
--- a/src/actors/banana/render.inc.c
+++ b/src/actors/banana/render.inc.c
@@ -1,13 +1,13 @@
 #include <actors.h>
 #include <code_800029B0.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 
 /**
  * @brief Render the banana actor
- * 
- * @param camera 
- * @param arg1 
- * @param banana 
+ *
+ * @param camera
+ * @param arg1
+ * @param banana
  */
 void render_actor_banana(Camera *camera, UNUSED Mat4 arg1, struct BananaActor *banana) {
     UNUSED s32 pad[2];
diff --git a/src/actors/blue_and_red_shells/render.inc.c b/src/actors/blue_and_red_shells/render.inc.c
index 42bf7ca82..c0dc24c8f 100644
--- a/src/actors/blue_and_red_shells/render.inc.c
+++ b/src/actors/blue_and_red_shells/render.inc.c
@@ -1,12 +1,12 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 
 /**
  * @brief Render the red shell actor
- * 
- * @param camera 
- * @param matrix 
- * @param shell 
+ *
+ * @param camera
+ * @param matrix
+ * @param shell
  */
 void render_actor_red_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
     gDPLoadTLUT_pal256(gDisplayListHead++, &gTLUTRedShell); // set texture
@@ -15,10 +15,10 @@ void render_actor_red_shell(Camera *camera, Mat4 matrix, struct ShellActor *shel
 
 /**
  * @brief Render the blue shell actor
- * 
- * @param camera 
- * @param matrix 
- * @param shell 
+ *
+ * @param camera
+ * @param matrix
+ * @param shell
  */
 void render_actor_blue_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
     gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_blue_shell); // set texture
diff --git a/src/actors/box_truck/render.inc.c b/src/actors/box_truck/render.inc.c
index 794dd305e..f429144c1 100644
--- a/src/actors/box_truck/render.inc.c
+++ b/src/actors/box_truck/render.inc.c
@@ -1,5 +1,5 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include <defines.h>
 #include "courses/toads_turnpike/course_data.h"
@@ -8,9 +8,9 @@
  * @brief Renders the box truck actor.
  * Actor used in Toad's Turnpike.
  * His update are made in vehicle.
- * 
- * @param arg0 
- * @param arg1 
+ *
+ * @param arg0
+ * @param arg1
  */
 void render_actor_box_truck(Camera *arg0, struct Actor *arg1) {
     UNUSED s32 pad[6];
diff --git a/src/actors/cow/render.inc.c b/src/actors/cow/render.inc.c
index 3800fbbbc..58042e389 100644
--- a/src/actors/cow/render.inc.c
+++ b/src/actors/cow/render.inc.c
@@ -1,16 +1,16 @@
 #include <camera.h>
 #include <actors.h>
 #include <main.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "courses/moo_moo_farm/course_data.h"
 
 /**
  * @brief Renders the cow actor.
  * Actor used in Moo Moo Farm.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_cow(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     if (is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f) < 0) { return; }
diff --git a/src/actors/fake_item_box/render.inc.c b/src/actors/fake_item_box/render.inc.c
index 30ef468d4..e01de10a8 100644
--- a/src/actors/fake_item_box/render.inc.c
+++ b/src/actors/fake_item_box/render.inc.c
@@ -1,13 +1,13 @@
 #include <actors.h>
 #include <code_800029B0.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 
 /**
  * @brief Renders the fake item box actor.
- * 
- * @param camera 
- * @param fakeItemBox 
+ *
+ * @param camera
+ * @param fakeItemBox
  */
 void render_actor_fake_item_box(Camera *camera, struct FakeItemBox *fakeItemBox) {
     Vec3s someRot;
diff --git a/src/actors/falling_rock/update.inc.c b/src/actors/falling_rock/update.inc.c
index b10a9b26f..15f9e589d 100644
--- a/src/actors/falling_rock/update.inc.c
+++ b/src/actors/falling_rock/update.inc.c
@@ -4,9 +4,7 @@
 #include "courses/choco_mountain/course_data.h"
 
 void func_8029CF0C(struct ActorSpawnData *spawnData, struct FallingRock *rock) {
-    s32 segment = SEGMENT_NUMBER2(spawnData);
-    s32 offset = SEGMENT_OFFSET(spawnData);
-    struct ActorSpawnData *temp_v0 = (struct ActorSpawnData *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset);
+    struct ActorSpawnData *temp_v0 = (struct ActorSpawnData *) spawnData;
     Vec3s sp24 = {60, 120, 180};
     temp_v0 += rock->unk_06;
     rock->respawnTimer = sp24[rock->unk_06]; // * 2
@@ -20,14 +18,12 @@ void func_8029CF0C(struct ActorSpawnData *spawnData, struct FallingRock *rock) {
 /**
  * @brief Spawns falling rocks.
  * Used in Choco Mountain.
- * 
- * @param spawnData 
+ *
+ * @param spawnData
  */
 void spawn_falling_rocks(struct ActorSpawnData *spawnData) {
-    s32 addr = SEGMENT_NUMBER2(spawnData);
-    s32 offset = SEGMENT_OFFSET(spawnData);
     // Casting this to prevent warning does not work.
-    struct ActorSpawnData *temp_s0 = (struct ActorSpawnData *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[addr] + offset);
+    struct ActorSpawnData *temp_s0 = spawnData;
     struct FallingRock *temp_v1;
     Vec3f startingPos;
     Vec3f startingVelocity;
@@ -52,8 +48,8 @@ void spawn_falling_rocks(struct ActorSpawnData *spawnData) {
 /**
  * @brief Updates the falling rock actor.
  * Actor used in Choco Mountain.
- * 
- * @param rock 
+ *
+ * @param rock
  */
 void update_actor_falling_rocks(struct FallingRock *rock) {
     Vec3f unkVec;
diff --git a/src/actors/green_shell/render.inc.c b/src/actors/green_shell/render.inc.c
index 627e62886..e5432f9bc 100644
--- a/src/actors/green_shell/render.inc.c
+++ b/src/actors/green_shell/render.inc.c
@@ -1,14 +1,14 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include <assets/common_data.h>
 
 /**
  * @brief Renders the green shell actor.
- * 
- * @param camera 
- * @param matrix 
- * @param shell 
+ *
+ * @param camera
+ * @param matrix
+ * @param shell
  */
 void render_actor_green_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
     gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_green_shell); // set texture
diff --git a/src/actors/kiwano_fruit/render.inc.c b/src/actors/kiwano_fruit/render.inc.c
index b6d4c16bd..eef9bd5c9 100644
--- a/src/actors/kiwano_fruit/render.inc.c
+++ b/src/actors/kiwano_fruit/render.inc.c
@@ -1,15 +1,15 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include "courses/dks_jungle_parkway/course_data.h"
 
 /**
  * @brief Renders the kiwano fruit actor.
  * Actor used in DK's Jungle Parkway.
- * 
- * @param camera 
- * @param arg1 
- * @param actor 
+ *
+ * @param camera
+ * @param arg1
+ * @param actor
  */
 void render_actor_kiwano_fruit(UNUSED Camera *camera, Mat4 arg1, struct Actor *actor) {
     uintptr_t addr;
diff --git a/src/actors/paddle_boat/render.inc.c b/src/actors/paddle_boat/render.inc.c
index 379b7455d..bf2c4006d 100644
--- a/src/actors/paddle_boat/render.inc.c
+++ b/src/actors/paddle_boat/render.inc.c
@@ -1,20 +1,20 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 #include <actor_types.h>
 #include "camera.h"
 #include "main.h"
 #include "actors.h"
 #include "courses/all_course_data.h"
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 
 /**
  * @brief Renders the paddle boat actor.
  * Actor used in DK's Jungle Parkway.
- * 
- * @param arg0 
- * @param boat 
- * @param arg2 
- * @param pathCounter 
+ *
+ * @param arg0
+ * @param boat
+ * @param arg2
+ * @param pathCounter
  */
 void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED Mat4 arg2, u16 pathCounter) {
     UNUSED s32 pad[3];
@@ -25,7 +25,7 @@ void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED
     f32 temp;
 
     if ((pathCounter > 20) && (pathCounter < 25)) { return; }
-    
+
     temp = is_within_render_distance(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f);
 
     if (temp < 0.0f) { return; }
diff --git a/src/actors/paddle_boat/update.inc.c b/src/actors/paddle_boat/update.inc.c
index 386e634d0..fdb596388 100644
--- a/src/actors/paddle_boat/update.inc.c
+++ b/src/actors/paddle_boat/update.inc.c
@@ -1,12 +1,12 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <actor_types.h>
 
 /**
  * @brief Updates the paddle boat actor.
  * Actor used in DK's Jungle Parkway.
  * Rotate only the paddle wheel, for position and rotation of the boat it's in vehicle.
- * 
- * @param boat 
+ *
+ * @param boat
  */
 void update_actor_paddle_boat(struct PaddleWheelBoat *boat) {
     boat->wheelRot += 0x38E;
diff --git a/src/actors/piranha_plant/render.inc.c b/src/actors/piranha_plant/render.inc.c
index 525c73b01..8be53d488 100644
--- a/src/actors/piranha_plant/render.inc.c
+++ b/src/actors/piranha_plant/render.inc.c
@@ -1,16 +1,16 @@
 #include <actors.h>
 #include <main.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include "courses/mario_raceway/course_data.h"
 #include "courses/royal_raceway/course_data.h"
 
 /**
  * @brief Renders the piranha plant actor.
  * Actor used in Mario Raceway and Royal Raceway.
- * 
- * @param arg0 
- * @param arg1 
- * @param arg2 
+ *
+ * @param arg0
+ * @param arg1
+ * @param arg2
  */
 void render_actor_piranha_plant(Camera *arg0, Mat4 arg1, struct PiranhaPlant *arg2) {
     UNUSED s32 pad;
diff --git a/src/actors/railroad_crossing/render.inc.c b/src/actors/railroad_crossing/render.inc.c
index b87d6a695..e21894b0f 100644
--- a/src/actors/railroad_crossing/render.inc.c
+++ b/src/actors/railroad_crossing/render.inc.c
@@ -1,14 +1,14 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include "courses/kalimari_desert/course_data.h"
 
 /**
  * @brief Renders the railroad crossing actor.
  * Actor used in Kalimari Desert.
- * 
- * @param arg0 
- * @param rr_crossing 
+ *
+ * @param arg0
+ * @param rr_crossing
  */
 void render_actor_railroad_crossing(Camera *arg0, struct RailroadCrossing *rr_crossing) {
     UNUSED Vec3s sp80 = {0, 0, 0};
diff --git a/src/actors/school_bus/render.inc.c b/src/actors/school_bus/render.inc.c
index 163e258ee..82de0926f 100644
--- a/src/actors/school_bus/render.inc.c
+++ b/src/actors/school_bus/render.inc.c
@@ -1,5 +1,5 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include <defines.h>
 
@@ -7,9 +7,9 @@
  * @brief Renders the school bus actor.
  * Actor used in Toad's Turnpike.
  * His update are made in vehicle.
- * 
- * @param arg0 
- * @param arg1 
+ *
+ * @param arg0
+ * @param arg1
  */
 void render_actor_school_bus(Camera *arg0, struct Actor *arg1) {
     UNUSED s32 pad[6];
diff --git a/src/actors/train/render.inc.c b/src/actors/train/render.inc.c
index d4fab764a..ff6596c6b 100644
--- a/src/actors/train/render.inc.c
+++ b/src/actors/train/render.inc.c
@@ -1,5 +1,5 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include "courses/kalimari_desert/course_data.h"
 
@@ -7,9 +7,9 @@
  * @brief Renders the train engine actor.
  * Actor used in Kalimari Desert.
  * His update position are made in vehicle.
- * 
- * @param camera 
- * @param actor 
+ *
+ * @param camera
+ * @param actor
  */
 void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     UNUSED s32 pad[2];
diff --git a/src/actors/trees/render.inc.c b/src/actors/trees/render.inc.c
index 9fe162160..5521e787e 100644
--- a/src/actors/trees/render.inc.c
+++ b/src/actors/trees/render.inc.c
@@ -1,15 +1,15 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include <assets/common_data.h>
 #include "courses/all_course_data.h"
 
 /**
  * @brief Renders the tree actor in Mario rawceay.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_mario_raceway(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -36,10 +36,10 @@ void render_actor_tree_mario_raceway(Camera *camera, Mat4 arg1, struct Actor *ar
 
 /**
  * @brief Renders the tree actor in Yoshi Valley.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_yoshi_valley(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -66,10 +66,10 @@ void render_actor_tree_yoshi_valley(Camera *camera, Mat4 arg1, struct Actor *arg
 
 /**
  * @brief Renders the tree actor in Royal Raceway.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_royal_raceway(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -96,10 +96,10 @@ void render_actor_tree_royal_raceway(Camera *camera, Mat4 arg1, struct Actor *ar
 
 /**
  * @brief Renders the tree actor in Moo Moo Farm.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_moo_moo_farm(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -154,10 +154,10 @@ void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
 
 /**
  * @brief Renders the tree actor in Bowser's Castle.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -184,10 +184,10 @@ void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *ar
 
 /**
  * @brief Renders the bush actor in Bowser's Castle.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -214,10 +214,10 @@ void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *ar
 
 /**
  * @brief Renders the tree actor in Frappe Snowland.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -243,10 +243,10 @@ void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *
 
 /**
  * @brief Renders the a first variant of cactus in Kalimari Desert.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -272,10 +272,10 @@ void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct
 
 /**
  * @brief Renders the a second variant of cactus in Kalimari Desert.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
@@ -301,10 +301,10 @@ void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct
 
 /**
  * @brief Renders the a third variant of cactus in Kalimari Desert.
- * 
- * @param camera 
- * @param arg1 
- * @param arg2 
+ *
+ * @param camera
+ * @param arg1
+ * @param arg2
  */
 void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
     f32 temp_f0;
diff --git a/src/actors/wario_sign/render.inc.c b/src/actors/wario_sign/render.inc.c
index 84216470f..1572d940b 100644
--- a/src/actors/wario_sign/render.inc.c
+++ b/src/actors/wario_sign/render.inc.c
@@ -1,14 +1,14 @@
 #include <actors.h>
-#include <PR/gbi.h>
+#include <libultra/gbi.h>
 #include <main.h>
 #include "courses/wario_stadium/course_data.h"
 
 /**
  * @brief Renders the Wario sign actor.
  * Used in Wario Stadium.
- * 
- * @param arg0 
- * @param arg1 
+ *
+ * @param arg0
+ * @param arg1
  */
 void render_actor_wario_sign(Camera *arg0, struct Actor *arg1) {
     Mat4 sp38;