Merge branch 'main' into Caladius-patch-1Caladius-patch-1

6 files changed, 8 insertions, 8 deletions

diff --git a/src/actors/fake_item_box/render.inc.c b/src/actors/fake_item_box/render.inc.c
index 0b7ec41f3..e705a90ef 100644
--- a/src/actors/fake_item_box/render.inc.c
+++ b/src/actors/fake_item_box/render.inc.c
@@ -26,7 +26,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox)
     f32 someMultiplier;
 
     size_t actorIdx = CM_FindActorIndex((struct Actor*)fakeItemBox);
-    if (-1 == actorIdx) {
+    if (-1 == (s32) actorIdx) {
         printf("[render_actor_fake_item_box] Could not find fake item box for FI, skipping!\n");
         return;
     }
diff --git a/src/actors/green_shell/update.inc.c b/src/actors/green_shell/update.inc.c
index 15d4f4c15..53b89a492 100644
--- a/src/actors/green_shell/update.inc.c
+++ b/src/actors/green_shell/update.inc.c
@@ -183,7 +183,7 @@ void update_actor_green_shell(struct ShellActor* shell) {
             break;
         case GREEN_SHELL_HIT_A_RACER:
             // Somehow, this fake match affects stack management up in case 2
-            shell->velocity[1] -= (0, 0.3f);
+            shell->velocity[1] -= 0.3f;
             if (shell->velocity[1] < -5.0f) {
                 shell->velocity[1] = -5.0f;
             }
diff --git a/src/actors/item_box/render.inc.c b/src/actors/item_box/render.inc.c
index c1ea76b11..c9134b23e 100644
--- a/src/actors/item_box/render.inc.c
+++ b/src/actors/item_box/render.inc.c
@@ -28,7 +28,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) {
     f32 someMultiplier;
 
     size_t actorIdx = CM_FindActorIndex((struct Actor*)item_box);
-    if (-1 == actorIdx) {
+    if (-1 == (s32) actorIdx) {
         printf("[render_actor_item_box] Could not find item box for FI, skipping!\n");
         return;
     }
diff --git a/src/actors/kiwano_fruit/render.inc.c b/src/actors/kiwano_fruit/render.inc.c
index 9aea3b2e5..069030a68 100644
--- a/src/actors/kiwano_fruit/render.inc.c
+++ b/src/actors/kiwano_fruit/render.inc.c
@@ -34,13 +34,13 @@ void render_actor_kiwano_fruit(UNUSED Camera* camera, Mat4 arg1, struct Actor* a
     size_t idx = (actor->rot[0] << 0xA) / ResourceGetTexSizeByName(gTextureDksJungleParkwayKiwanoFruit1);
     switch(idx) {
         case 0:
-            addr = gTextureDksJungleParkwayKiwanoFruit1;
+            addr = (uintptr_t) gTextureDksJungleParkwayKiwanoFruit1;
             break;
         case 1:
-            addr = gTextureDksJungleParkwayKiwanoFruit2;
+            addr = (uintptr_t) gTextureDksJungleParkwayKiwanoFruit2;
             break;
         case 2:
-            addr = gTextureDksJungleParkwayKiwanoFruit3;
+            addr = (uintptr_t) gTextureDksJungleParkwayKiwanoFruit3;
             break;
     }
 
diff --git a/src/actors/piranha_plant/render.inc.c b/src/actors/piranha_plant/render.inc.c
index 2fba23716..2850dc0a7 100644
--- a/src/actors/piranha_plant/render.inc.c
+++ b/src/actors/piranha_plant/render.inc.c
@@ -26,7 +26,7 @@ const char* sPiranhaPlantTextures[] = {
  */
 void render_actor_piranha_plant(Camera* camera, Mat4 arg1, struct PiranhaPlant* arg2) {
     UNUSED s32 pad;
-    u8* addr;
+    UNUSED u8* addr;
     s16 temp_lo = camera - camera1;
     s16 animationFrame; // unconfirmed
     s16 temp = arg2->flags;
diff --git a/src/actors/yoshi_egg/render.inc.c b/src/actors/yoshi_egg/render.inc.c
index 7bb2cc884..2a1ed1dc6 100644
--- a/src/actors/yoshi_egg/render.inc.c
+++ b/src/actors/yoshi_egg/render.inc.c
@@ -20,7 +20,7 @@ void render_actor_yoshi_egg(Camera* camera, Mat4 arg1, struct YoshiValleyEgg* eg
     f32 temp_f0;
 
     size_t actorIdx = CM_FindActorIndex((struct Actor*) egg);
-    if (-1 == actorIdx) {
+    if (-1 == (s32) actorIdx) {
         printf("[render_actor_yoshi_egg] Could not find actor for FI, skipping\n");
         return;
     }