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

1 files changed, 59 insertions, 58 deletions

diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index 3974c3fd2..37493e306 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -908,15 +908,16 @@ void render_hud_lap_3p_4p(s32 playerId) {
         if (D_801657F8 && gIsHUDVisible) {
             // draw_hud_2d_texture_32x8(playerHUD[playerId].lapX, playerHUD[playerId].lapY, (u8*)
             // common_texture_hud_lap);
-            draw_hud_2d_texture(playerHUD[playerId].lapX, playerHUD[playerId].lapY, 32, 8, common_texture_hud_lap);
+            draw_hud_2d_texture(playerHUD[playerId].lapX, playerHUD[playerId].lapY, 32, 8,
+                                (u8*) common_texture_hud_lap);
             draw_lap_count(playerHUD[playerId].lapX - 12, playerHUD[playerId].lapY + 4,
                            playerHUD[playerId].alsoLapCount);
         }
         if (gHUDModes == 2) {
             if (playerHUD[playerId].unk_74 && D_80165608) {
                 func_80047910(playerHUD[playerId].unk_6C, playerHUD[playerId].unk_6E, 0, 1.0f,
-                              (u8*) common_tlut_portrait_bomb_kart_and_question_mark, common_texture_portrait_bomb_kart,
-                              D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
+                              (u8*) common_tlut_portrait_bomb_kart_and_question_mark,
+                              (u8*) common_texture_portrait_bomb_kart, D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
             }
         }
     }
@@ -1233,7 +1234,7 @@ void func_8005A070(void) {
         }
     }
     func_8008C204();
-    func_8008C1E0(&D_80165678, (s32) &D_801655F0);
+    func_8008C1E0(&D_80165678, (s32) (uintptr_t) &D_801655F0);
 }
 
 void func_8005A14C(s32 playerId) {
@@ -2478,34 +2479,34 @@ void func_8005D1F4(s32 cameraId) {
 
 // Appears to load GP Mode race staging balloons and kart shadows.
 void func_8005D290(void) {
-    D_8018D420 = gTexture69B03C;
-    D_8018D424 = gTexture69B140;
-    D_8018D478 = gTexture69C1E8;
-    D_8018D480 = gTextureSpeechBubble;
-    D_8018D484 = gTextureMusicNote;
-    D_8018D48C = gTextureSmokePuff;
+    D_8018D420 = (u8*) gTexture69B03C;
+    D_8018D424 = (u8*) gTexture69B140;
+    D_8018D478 = (u8*) gTexture69C1E8;
+    D_8018D480 = (u8*) gTextureSpeechBubble;
+    D_8018D484 = (u8*) gTextureMusicNote;
+    D_8018D48C = (u8*) gTextureSmokePuff;
     D_8018D490 = D_8018D48C;
-    D_8018D4BC = gTextureBalloon1;
-    D_8018D4C0 = gTextureBalloon2;
-    D_8018D49C = gTexture69C9C4;
-    D_8018D4A0 = gTextureBoingExclamation;
-    D_8018D438 = gTexture69CB84;
-    D_8018D43C = gTexture69CCEC;
-    D_8018D440 = gTexture69CEB8;
-    D_8018D444 = gTexture69D148;
-    D_8018D448 = gTexture69D4E0;
-    D_8018D44C = gTexture69D8FC;
-    D_8018D450 = gTexture69DCB4;
-    D_8018D454 = gTexture69DFA0;
-    D_8018D458 = gTexture69E25C;
-    D_8018D45C = gTexture69E518;
-    D_8018D460 = gTexture69E7A8;
-    D_8018D464 = gTexture69EA18;
-    D_8018D468 = gTexture69EC54;
-    D_8018D46C = gTexture69EE38;
-    D_8018D470 = gTexture69EFE0;
-    gTextureLoadedLightningBolt0 = gTextureLightningBolt0;
-    gTextureLoadedLightningBolt1 = gTextureLightningBolt1;
+    D_8018D4BC = (u8*) gTextureBalloon1;
+    D_8018D4C0 = (u8*) gTextureBalloon2;
+    D_8018D49C = (u8*) gTexture69C9C4;
+    D_8018D4A0 = (u8*) gTextureBoingExclamation;
+    D_8018D438 = (u8*) gTexture69CB84;
+    D_8018D43C = (u8*) gTexture69CCEC;
+    D_8018D440 = (u8*) gTexture69CEB8;
+    D_8018D444 = (u8*) gTexture69D148;
+    D_8018D448 = (u8*) gTexture69D4E0;
+    D_8018D44C = (u8*) gTexture69D8FC;
+    D_8018D450 = (u8*) gTexture69DCB4;
+    D_8018D454 = (u8*) gTexture69DFA0;
+    D_8018D458 = (u8*) gTexture69E25C;
+    D_8018D45C = (u8*) gTexture69E518;
+    D_8018D460 = (u8*) gTexture69E7A8;
+    D_8018D464 = (u8*) gTexture69EA18;
+    D_8018D468 = (u8*) gTexture69EC54;
+    D_8018D46C = (u8*) gTexture69EE38;
+    D_8018D470 = (u8*) gTexture69EFE0;
+    gTextureLoadedLightningBolt0 = (u8*) gTextureLightningBolt0;
+    gTextureLoadedLightningBolt1 = (u8*) gTextureLightningBolt1;
 }
 
 void reset_player_particle_pool(Player* player) {
@@ -4919,7 +4920,7 @@ void render_player_ground_particles(Player* player, UNUSED s8 arg1, s16 arg2, s8
                                 G_TX_NOLOD, G_TX_NOLOD);
             func_8004B35C(primRed, primGreen, primBlue, 0x000000FF);
             gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2);
-            gSPVertex(gDisplayListHead++, D_800E8C00, 4, 0);
+            gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8C00, 4, 0);
             gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         }
         gMatrixEffectCount += 1;
@@ -4987,7 +4988,7 @@ UNUSED void func_80066714(Player* player, UNUSED s32 arg1, s16 arg2, s8 arg3) {
                             G_TX_NOLOD, G_TX_NOLOD);
         func_8004B35C(red, green, blue, alpha);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2);
-        gSPVertex(gDisplayListHead++, D_800E8B00, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8B00, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5082,12 +5083,12 @@ void func_80066BAC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
             gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0,
                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                 G_TX_NOLOD, G_TX_NOLOD);
-            gSPVertex(gDisplayListHead++, &D_800E8900a[0][player->particlePool0[arg2].red], 4, 0);
+            gSPVertex(gDisplayListHead++, (uintptr_t) &D_800E8900a[0][player->particlePool0[arg2].red], 4, 0);
             gSPDisplayList(gDisplayListHead++, common_square_plain_render);
             gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt1, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0,
                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                 G_TX_NOLOD, G_TX_NOLOD);
-            gSPVertex(gDisplayListHead++, &D_800E8900a[1][player->particlePool0[arg2].red], 4, 0);
+            gSPVertex(gDisplayListHead++, (uintptr_t) &D_800E8900a[1][player->particlePool0[arg2].red], 4, 0);
             gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         } else {
             gSPDisplayList(gDisplayListHead++, D_0D008DB8);
@@ -5096,12 +5097,12 @@ void func_80066BAC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
             gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt1, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0,
                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                 G_TX_NOLOD, G_TX_NOLOD);
-            gSPVertex(gDisplayListHead++, &D_800E8900a[0][player->particlePool0[arg2].red], 4, 0);
+            gSPVertex(gDisplayListHead++, (uintptr_t) &D_800E8900a[0][player->particlePool0[arg2].red], 4, 0);
             gSPDisplayList(gDisplayListHead++, common_square_plain_render);
             gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0,
                                 G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
                                 G_TX_NOLOD, G_TX_NOLOD);
-            gSPVertex(gDisplayListHead++, &D_800E8900a[1][player->particlePool0[arg2].red], 4, 0);
+            gSPVertex(gDisplayListHead++, (uintptr_t) &D_800E8900a[1][player->particlePool0[arg2].red], 4, 0);
             gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         }
         gMatrixEffectCount += 1;
@@ -5203,12 +5204,12 @@ void render_player_onomatopoeia_whrrrr(Player* player, UNUSED s8 arg1, f32 arg2,
         gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaWhrrrr1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                             G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
                             G_TX_NOLOD, G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E8840, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8840, 4, 0);
         gSPDisplayList(gDisplayListHead++, common_square_plain_render);
         gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaWhrrrr2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                             G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
                             G_TX_NOLOD, G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E8800, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8800, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5293,12 +5294,12 @@ void render_player_onomatopoeia_crash(Player* player, UNUSED s8 arg1, UNUSED f32
         gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaCrash1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                             G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
                             G_TX_NOLOD, G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E8880, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8880, 4, 0);
         gSPDisplayList(gDisplayListHead++, common_square_plain_render);
         gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaCrash2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                             G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
                             G_TX_NOLOD, G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E88C0, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E88C0, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5323,12 +5324,12 @@ void func_80068724(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8
         gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E8A00, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8A00, 4, 0);
         gSPDisplayList(gDisplayListHead++, common_square_plain_render);
         gDPLoadTextureBlock(gDisplayListHead++, gTextureLoadedLightningBolt1, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 64, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E8A40, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8A40, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5361,7 +5362,7 @@ void render_player_onomatopoeia_boing(Player* player, UNUSED s8 arg1, UNUSED f32
                             G_TX_NOLOD, G_TX_NOLOD);
         func_8004B35C(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-        gSPVertex(gDisplayListHead++, D_800E8B40, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8B40, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5385,12 +5386,12 @@ void render_player_onomatopoeia_pomp(Player* player, UNUSED s8 arg1, UNUSED f32
         gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaPoomp1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E8B80, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8B80, 4, 0);
         gSPDisplayList(gDisplayListHead++, common_square_plain_render);
         gDPLoadTextureBlock(gDisplayListHead++, gTextureOnomatopoeiaPoomp2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                             G_TX_NOLOD);
-        gSPVertex(gDisplayListHead++, D_800E8BC0, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8BC0, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5418,7 +5419,7 @@ void func_800691B8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
                             G_TX_NOLOD, G_TX_NOLOD);
         func_8004B35C(0xFF, 0xFF, 0, alpha);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-        gSPVertex(gDisplayListHead++, D_800E87C0, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E87C0, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount++;
     }
@@ -5489,7 +5490,7 @@ void render_wall_bonk_star_particles(Player* player, UNUSED s8 arg1, s16 arg2, s
                             G_TX_NOLOD, G_TX_NOLOD);
         func_8004B35C(0x000000FF, 0x000000FF, 0, alpha);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-        gSPVertex(gDisplayListHead++, D_800E87C0, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E87C0, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5516,7 +5517,7 @@ void func_80069938(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
                             G_TX_NOLOD, G_TX_NOLOD);
         func_8004B35C(0x000000FF, 0x000000FF, 0, alpha);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-        gSPVertex(gDisplayListHead++, D_800E87C0, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E87C0, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5572,7 +5573,7 @@ void func_80069DB8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
                             G_TX_NOLOD, G_TX_NOLOD);
         func_8004B35C(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-        gSPVertex(gDisplayListHead++, D_800E8740, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8740, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount += 1;
     }
@@ -5598,7 +5599,7 @@ void func_8006A01C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
                             G_TX_NOLOD, G_TX_NOLOD);
         func_8004B35C(0xFF, 0xFF, 0xFF, 0xFF);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-        gSPVertex(gDisplayListHead++, D_0D008B78, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_0D008B78, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         gMatrixEffectCount++;
     }
@@ -5630,7 +5631,7 @@ void func_8006A280(Player* player, s8 playerId, s16 arg2, s8 screenId) {
                                G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
         func_8004B414(red, green, blue, 0x000000FF);
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-        gSPVertex(gDisplayListHead++, D_800E8780, 4, 0);
+        gSPVertex(gDisplayListHead++, (uintptr_t) D_800E8780, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
         FrameInterpolation_RecordCloseChild();
         gMatrixEffectCount += 1;
@@ -5742,7 +5743,7 @@ void func_8006A7C0(Player* player, f32 arg1, f32 arg2, s8 arg3, s8 arg4) {
         move_s16_towards(&D_8018D890[arg3][arg4], 0, 0.1f);
         move_s16_towards(&D_8018D860[arg3][arg4], 0, 0.1f);
         if (gPlayerBalloonDepartingTimer[arg3][arg4] >= 0x78) {
-            set_player_balloon_to_gone((s32) player, arg3, arg4);
+            set_player_balloon_to_gone((s32) (uintptr_t) player, arg3, arg4);
         }
     }
 }
@@ -5828,12 +5829,12 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) {
     gDPLoadTextureBlock(gDisplayListHead++, gTextureBalloon1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                         G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                         G_TX_NOLOD);
-    gSPVertex(gDisplayListHead++, gBalloonVertexPlane1, 4, 0);
+    gSPVertex(gDisplayListHead++, (uintptr_t) gBalloonVertexPlane1, 4, 0);
     gSPDisplayList(gDisplayListHead++, common_square_plain_render);
     gDPLoadTextureBlock(gDisplayListHead++, gTextureBalloon2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                         G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                         G_TX_NOLOD);
-    gSPVertex(gDisplayListHead++, gBalloonVertexPlane2, 4, 0);
+    gSPVertex(gDisplayListHead++, (uintptr_t) gBalloonVertexPlane2, 4, 0);
     gSPDisplayList(gDisplayListHead++, common_square_plain_render);
     gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF);
 
@@ -5955,14 +5956,14 @@ void render_balloon(Vec3f arg0, f32 arg1, s16 arg2, s16 arg3) {
     gDPLoadTextureBlock(gDisplayListHead++, gTextureBalloon1, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                         G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                         G_TX_NOLOD);
-    gSPVertex(gDisplayListHead++, gBalloonVertexPlane1, 4, 0);
+    gSPVertex(gDisplayListHead++, (uintptr_t) gBalloonVertexPlane1, 4, 0);
     gSPDisplayList(gDisplayListHead++, common_square_plain_render);
     // D_8018D4C0 is correct. But interestingly, IDO seems to set "-0x40" to a different register so the texture still
     // looks fine.
     gDPLoadTextureBlock(gDisplayListHead++, gTextureBalloon2, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0,
                         G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                         G_TX_NOLOD);
-    gSPVertex(gDisplayListHead++, gBalloonVertexPlane2, 4, 0);
+    gSPVertex(gDisplayListHead++, (uintptr_t) gBalloonVertexPlane2, 4, 0);
     gSPDisplayList(gDisplayListHead++, common_square_plain_render);
     gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF);
     gMatrixEffectCount += 1;
@@ -6018,7 +6019,7 @@ void func_8006C294(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) {
                         G_TX_NOLOD);
     func_8004B35C(red, green, blue, alpha);
     gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
-    gSPVertex(gDisplayListHead++, D_800E87C0, 4, 0);
+    gSPVertex(gDisplayListHead++, (uintptr_t) D_800E87C0, 4, 0);
     gSPDisplayList(gDisplayListHead++, D_0D008DA0);
     gMatrixEffectCount += 1;
 }