vr_box OK (#1663)

1 files changed, 177 insertions, 153 deletions

diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index 3472573ee..caebcec0b 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -456,7 +456,7 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
     s16 i;
     u8 skybox1Index;
     u8 skybox2Index;
-    uintptr_t start;
+    s32 pad;
     s32 skyboxConfig;
 
     switch (skyboxId) {
@@ -530,473 +530,497 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_BAZAAR:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_SP1a_staticSegmentRomStart;
-            size = (uintptr_t)_vr_SP1a_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_SP1a_staticSegmentRomEnd - (uintptr_t)_vr_SP1a_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1127);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1128);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1129);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_SP1a_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1129);
 
-            start = (uintptr_t)_vr_SP1a_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_SP1a_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_SP1a_pal_staticSegmentRomEnd - (uintptr_t)_vr_SP1a_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1132);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1133);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1134);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_SP1a_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1134);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_OVERCAST_SUNSET:
-            start = (uintptr_t)_vr_cloud2_staticSegmentRomStart;
-            size = (uintptr_t)_vr_cloud2_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_cloud2_staticSegmentRomEnd - (uintptr_t)_vr_cloud2_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1155);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1156);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1159);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_cloud2_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1159);
 
             skyboxCtx->staticSegments[1] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1162);
             ASSERT(skyboxCtx->staticSegments[1] != NULL, "vr_box->vr_box_staticSegment[1] != NULL", "../z_vr_box.c",
                    1163);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1166);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[1], (uintptr_t)_vr_cloud2_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1166);
 
-            start = (uintptr_t)_vr_cloud2_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_cloud2_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_cloud2_pal_staticSegmentRomEnd - (uintptr_t)_vr_cloud2_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size * 2, "../z_vr_box.c", 1170);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1171);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1173);
-            DMA_REQUEST_SYNC((u8*)skyboxCtx->palettes + size, start, size, "../z_vr_box.c", 1175);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_cloud2_pal_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1173);
+            DMA_REQUEST_SYNC((u8*)skyboxCtx->palettes + size, (uintptr_t)_vr_cloud2_pal_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1175);
             break;
+
         case SKYBOX_MARKET_ADULT:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_RUVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_RUVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_RUVR_staticSegmentRomEnd - (uintptr_t)_vr_RUVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1182);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1183);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1184);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_RUVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1184);
 
-            start = (uintptr_t)_vr_RUVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_RUVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_RUVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_RUVR_pal_staticSegmentRomStart;
             PRINTF("ＳＩＺＥ = %d\n", size);
 
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1188);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1189);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1190);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_RUVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1190);
             break;
+
         case SKYBOX_CUTSCENE_MAP:
-            start = (uintptr_t)_vr_holy0_staticSegmentRomStart;
-            size = (uintptr_t)_vr_holy0_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_holy0_staticSegmentRomEnd - (uintptr_t)_vr_holy0_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1196);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1197);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1200);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_holy0_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1200);
 
-            start = (uintptr_t)_vr_holy1_staticSegmentRomStart;
-            size = (uintptr_t)_vr_holy1_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_holy1_staticSegmentRomEnd - (uintptr_t)_vr_holy1_staticSegmentRomStart;
             skyboxCtx->staticSegments[1] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1203);
             ASSERT(skyboxCtx->staticSegments[1] != NULL, "vr_box->vr_box_staticSegment[1] != NULL", "../z_vr_box.c",
                    1204);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1207);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[1], (uintptr_t)_vr_holy1_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1207);
 
-            start = (uintptr_t)_vr_holy0_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_holy0_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_holy0_pal_staticSegmentRomEnd - (uintptr_t)_vr_holy0_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size * 2, "../z_vr_box.c", 1211);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1212);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1214);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_holy0_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1214);
             DMA_REQUEST_SYNC((u8*)skyboxCtx->palettes + size, (uintptr_t)_vr_holy1_pal_staticSegmentRomStart, size,
                              "../z_vr_box.c", 1216);
             break;
+
         case SKYBOX_HOUSE_LINK:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_LHVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_LHVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_LHVR_staticSegmentRomEnd - (uintptr_t)_vr_LHVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1226);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1227);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1228);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_LHVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1228);
 
-            start = (uintptr_t)_vr_LHVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_LHVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_LHVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_LHVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1231);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1232);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1233);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_LHVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1233);
             break;
+
         case SKYBOX_MARKET_CHILD_DAY:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_MDVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_MDVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_MDVR_staticSegmentRomEnd - (uintptr_t)_vr_MDVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1257);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1258);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1259);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_MDVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1259);
 
-            start = (uintptr_t)_vr_MDVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_MDVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_MDVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_MDVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1262);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1263);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1264);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_MDVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1264);
             break;
+
         case SKYBOX_MARKET_CHILD_NIGHT:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_MNVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_MNVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_MNVR_staticSegmentRomEnd - (uintptr_t)_vr_MNVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1271);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1272);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1273);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_MNVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1273);
 
-            start = (uintptr_t)_vr_MNVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_MNVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_MNVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_MNVR_pal_staticSegmentRomStart;
             PRINTF("ＳＩＺＥ = %d\n", size);
 
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1277);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1278);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1279);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_MNVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1279);
             break;
+
         case SKYBOX_HAPPY_MASK_SHOP:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_FCVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_FCVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_FCVR_staticSegmentRomEnd - (uintptr_t)_vr_FCVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1286);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1287);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1288);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_FCVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1288);
 
-            start = (uintptr_t)_vr_FCVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_FCVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_FCVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_FCVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1291);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1292);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1293);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_FCVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1293);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_HOUSE_KNOW_IT_ALL_BROTHERS:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_KHVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KHVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KHVR_staticSegmentRomEnd - (uintptr_t)_vr_KHVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1301);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1302);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1303);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_KHVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1303);
 
-            start = (uintptr_t)_vr_KHVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KHVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KHVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_KHVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1306);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1307);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1308);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_KHVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1308);
             break;
+
         case SKYBOX_HOUSE_OF_TWINS:
             skyboxCtx->drawType = SKYBOX_DRAW_256_3FACE;
 
-            start = (uintptr_t)_vr_K3VR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_K3VR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_K3VR_staticSegmentRomEnd - (uintptr_t)_vr_K3VR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1331);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1332);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1333);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_K3VR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1333);
 
-            start = (uintptr_t)_vr_K3VR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_K3VR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_K3VR_pal_staticSegmentRomEnd - (uintptr_t)_vr_K3VR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1336);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1337);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1338);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_K3VR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1338);
             break;
+
         case SKYBOX_STABLES:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_MLVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_MLVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_MLVR_staticSegmentRomEnd - (uintptr_t)_vr_MLVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1345);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1346);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1347);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_MLVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1347);
 
-            start = (uintptr_t)_vr_MLVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_MLVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_MLVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_MLVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1350);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1351);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1352);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_MLVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1352);
             break;
+
         case SKYBOX_HOUSE_KAKARIKO:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_KKRVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KKRVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KKRVR_staticSegmentRomEnd - (uintptr_t)_vr_KKRVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1359);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1360);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1361);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_KKRVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1361);
 
-            start = (uintptr_t)_vr_KKRVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KKRVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KKRVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_KKRVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1364);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1365);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1366);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_KKRVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1366);
             break;
+
         case SKYBOX_KOKIRI_SHOP:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_KSVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KSVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KSVR_staticSegmentRomEnd - (uintptr_t)_vr_KSVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1373);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1374);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1375);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_KSVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1375);
 
-            start = (uintptr_t)_vr_KSVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KSVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KSVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_KSVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1378);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1379);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1380);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_KSVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1380);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_GORON_SHOP:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_GLVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_GLVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_GLVR_staticSegmentRomEnd - (uintptr_t)_vr_GLVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1405);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1406);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1407);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_GLVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1407);
 
-            start = (uintptr_t)_vr_GLVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_GLVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_GLVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_GLVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1410);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1411);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1412);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_GLVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1412);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_ZORA_SHOP:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_ZRVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_ZRVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_ZRVR_staticSegmentRomEnd - (uintptr_t)_vr_ZRVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1420);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1421);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1422);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_ZRVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1422);
 
-            start = (uintptr_t)_vr_ZRVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_ZRVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_ZRVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_ZRVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1425);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1426);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1427);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_ZRVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1427);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_POTION_SHOP_KAKARIKO:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_DGVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_DGVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_DGVR_staticSegmentRomEnd - (uintptr_t)_vr_DGVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1451);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1452);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1453);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_DGVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1453);
 
-            start = (uintptr_t)_vr_DGVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_DGVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_DGVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_DGVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1456);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1457);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1458);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_DGVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1458);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_POTION_SHOP_MARKET:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_ALVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_ALVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_ALVR_staticSegmentRomEnd - (uintptr_t)_vr_ALVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1466);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1467);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1468);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_ALVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1468);
 
-            start = (uintptr_t)_vr_ALVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_ALVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_ALVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_ALVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1471);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1472);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1473);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_ALVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1473);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_BOMBCHU_SHOP:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_NSVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_NSVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_NSVR_staticSegmentRomEnd - (uintptr_t)_vr_NSVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1481);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1482);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1483);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_NSVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1483);
 
-            start = (uintptr_t)_vr_NSVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_NSVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_NSVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_NSVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1486);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1487);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1488);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_NSVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1488);
             skyboxCtx->rot.y = 0.8f;
             break;
+
         case SKYBOX_HOUSE_RICHARD:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_IPVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_IPVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_IPVR_staticSegmentRomEnd - (uintptr_t)_vr_IPVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1512);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1513);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1514);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_IPVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1514);
 
-            start = (uintptr_t)_vr_IPVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_IPVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_IPVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_IPVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1517);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1518);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1519);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_IPVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1519);
             break;
+
         case SKYBOX_HOUSE_IMPA:
             skyboxCtx->drawType = SKYBOX_DRAW_256_4FACE;
 
-            start = (uintptr_t)_vr_LBVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_LBVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_LBVR_staticSegmentRomEnd - (uintptr_t)_vr_LBVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1526);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1527);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1528);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_LBVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1528);
 
-            start = (uintptr_t)_vr_LBVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_LBVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_LBVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_LBVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1531);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1532);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1533);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_LBVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1533);
             break;
+
         case SKYBOX_TENT:
             skyboxCtx->drawType = SKYBOX_DRAW_256_3FACE;
 
-            start = (uintptr_t)_vr_TTVR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_TTVR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_TTVR_staticSegmentRomEnd - (uintptr_t)_vr_TTVR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1540);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1541);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1542);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_TTVR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1542);
 
-            start = (uintptr_t)_vr_TTVR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_TTVR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_TTVR_pal_staticSegmentRomEnd - (uintptr_t)_vr_TTVR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1545);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1546);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1547);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_TTVR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1547);
             break;
+
         case SKYBOX_HOUSE_MIDO:
             skyboxCtx->drawType = SKYBOX_DRAW_256_3FACE;
 
-            start = (uintptr_t)_vr_K4VR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_K4VR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_K4VR_staticSegmentRomEnd - (uintptr_t)_vr_K4VR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1560);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1561);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1562);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_K4VR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1562);
 
-            start = (uintptr_t)_vr_K4VR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_K4VR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_K4VR_pal_staticSegmentRomEnd - (uintptr_t)_vr_K4VR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1565);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1566);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1567);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_K4VR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1567);
             break;
+
         case SKYBOX_HOUSE_SARIA:
             skyboxCtx->drawType = SKYBOX_DRAW_256_3FACE;
 
-            start = (uintptr_t)_vr_K5VR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_K5VR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_K5VR_staticSegmentRomEnd - (uintptr_t)_vr_K5VR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1574);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1575);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1576);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_K5VR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1576);
 
-            start = (uintptr_t)_vr_K5VR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_K5VR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_K5VR_pal_staticSegmentRomEnd - (uintptr_t)_vr_K5VR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1579);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1580);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1581);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_K5VR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1581);
             break;
+
         case SKYBOX_HOUSE_ALLEY:
             skyboxCtx->drawType = SKYBOX_DRAW_256_3FACE;
 
-            start = (uintptr_t)_vr_KR3VR_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KR3VR_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KR3VR_staticSegmentRomEnd - (uintptr_t)_vr_KR3VR_staticSegmentRomStart;
             skyboxCtx->staticSegments[0] = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1588);
             ASSERT(skyboxCtx->staticSegments[0] != NULL, "vr_box->vr_box_staticSegment[0] != NULL", "../z_vr_box.c",
                    1589);
 
-            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1590);
+            DMA_REQUEST_SYNC(skyboxCtx->staticSegments[0], (uintptr_t)_vr_KR3VR_staticSegmentRomStart, size,
+                             "../z_vr_box.c", 1590);
 
-            start = (uintptr_t)_vr_KR3VR_pal_staticSegmentRomStart;
-            size = (uintptr_t)_vr_KR3VR_pal_staticSegmentRomEnd - start;
+            size = (uintptr_t)_vr_KR3VR_pal_staticSegmentRomEnd - (uintptr_t)_vr_KR3VR_pal_staticSegmentRomStart;
             skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1593);
             ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1594);
 
-            DMA_REQUEST_SYNC(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1595);
+            DMA_REQUEST_SYNC(skyboxCtx->palettes, (uintptr_t)_vr_KR3VR_pal_staticSegmentRomStart, size, "../z_vr_box.c",
+                             1595);
             break;
+
         case SKYBOX_UNSET_27:
             break;
     }
 }
 
 void Skybox_Init(GameState* state, SkyboxContext* skyboxCtx, s16 skyboxId) {
-    PlayState* play = (PlayState*)state;
-
     skyboxCtx->drawType = SKYBOX_DRAW_128;
     skyboxCtx->rot.x = skyboxCtx->rot.y = skyboxCtx->rot.z = 0.0f;
 
     // DMA required assets based on skybox id
-    Skybox_Setup(play, skyboxCtx, skyboxId);
+    Skybox_Setup((PlayState*)state, skyboxCtx, skyboxId);
     PRINTF("\n\n\n＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊\n\n\n"
            "ＴＹＰＥ＝%d"
            "\n\n\n＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊\n\n\n",