Use intptr types in more code files (#1385)

* Use intptr types for segments and a few system files

* Use intptr types for more dma rom addresses

* Use intptr types in data referring to rom files

* Update and cleanup a few message casts

* Change sys_cfb functions and debugHeapStart to use pointers

* Update graph.c for the sys_cfb return type change

15 files changed, 185 insertions, 181 deletions

diff --git a/src/code/graph.c b/src/code/graph.c
index fc41f1a61..c7bd56756 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -24,7 +24,7 @@ UCodeInfo D_8012D248[3] = {
 
 void Graph_FaultClient(void) {
     void* nextFb = osViGetNextFramebuffer();
-    void* newFb = (void*)((SysCfb_GetFbPtr(0) != (u32)nextFb) ? SysCfb_GetFbPtr(0) : SysCfb_GetFbPtr(1));
+    void* newFb = (SysCfb_GetFbPtr(0) != nextFb) ? SysCfb_GetFbPtr(0) : SysCfb_GetFbPtr(1);
 
     osViSwapBuffer(newFb);
     Fault_WaitForInput();
@@ -95,7 +95,7 @@ void Graph_InitTHGA(GraphicsContext* gfxCtx) {
     gfxCtx->overlayBuffer = pool->overlayBuffer;
     gfxCtx->workBuffer = pool->workBuffer;
 
-    gfxCtx->curFrameBuffer = (u16*)SysCfb_GetFbPtr(gfxCtx->fbIdx % 2);
+    gfxCtx->curFrameBuffer = SysCfb_GetFbPtr(gfxCtx->fbIdx % 2);
     gfxCtx->unk_014 = 0;
 }
 
diff --git a/src/code/main.c b/src/code/main.c
index b3c9d6465..c8d78ccca 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -9,7 +9,7 @@ PreNmiBuff* gAppNmiBufferPtr;
 Scheduler gScheduler;
 PadMgr gPadMgr;
 IrqMgr gIrqMgr;
-u32 gSegments[NUM_SEGMENTS];
+uintptr_t gSegments[NUM_SEGMENTS];
 OSThread sGraphThread;
 STACK(sGraphStack, 0x1800);
 STACK(sSchedStack, 0x600);
@@ -37,9 +37,9 @@ void Main(void* arg) {
     IrqMgrClient irqClient;
     OSMesgQueue irqMgrMsgQueue;
     OSMesg irqMgrMsgBuf[60];
-    u32 systemHeapStart;
-    u32 fb;
-    u32 debugHeapStart;
+    uintptr_t systemHeapStart;
+    uintptr_t fb;
+    void* debugHeapStart;
     u32 debugHeapSize;
     s16* msg;
 
@@ -50,21 +50,21 @@ void Main(void* arg) {
     PreNmiBuff_Init(gAppNmiBufferPtr);
     Fault_Init();
     SysCfb_Init(0);
-    systemHeapStart = (u32)gSystemHeap;
-    fb = SysCfb_GetFbPtr(0);
+    systemHeapStart = (uintptr_t)gSystemHeap;
+    fb = (uintptr_t)SysCfb_GetFbPtr(0);
     gSystemHeapSize = fb - systemHeapStart;
     // "System heap initalization"
     osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize);
     SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap
     if (osMemSize >= 0x800000) {
         debugHeapStart = SysCfb_GetFbEnd();
-        debugHeapSize = PHYS_TO_K0(0x600000) - debugHeapStart;
+        debugHeapSize = PHYS_TO_K0(0x600000) - (uintptr_t)debugHeapStart;
     } else {
         debugHeapSize = 0x400;
-        debugHeapStart = (u32)SystemArena_MallocDebug(debugHeapSize, "../main.c", 565);
+        debugHeapStart = SystemArena_MallocDebug(debugHeapSize, "../main.c", 565);
     }
     osSyncPrintf("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize);
-    DebugArena_Init((void*)debugHeapStart, debugHeapSize);
+    DebugArena_Init(debugHeapStart, debugHeapSize);
     func_800636C0();
 
     R_ENABLE_ARENA_DBG = 0;
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 1bd8fa22a..a37634be7 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -1,11 +1,11 @@
 #include "global.h"
 
-u32 sSysCfbFbPtr[2];
-u32 sSysCfbEnd;
+uintptr_t sSysCfbFbPtr[2];
+uintptr_t sSysCfbEnd;
 
 void SysCfb_Init(s32 n64dd) {
     u32 screenSize;
-    u32 tmpFbEnd;
+    uintptr_t tmpFbEnd;
 
     if (osMemSize >= 0x800000) {
         // "8MB or more memory is installed"
@@ -42,13 +42,13 @@ void SysCfb_Reset(void) {
     sSysCfbEnd = 0;
 }
 
-u32 SysCfb_GetFbPtr(s32 idx) {
+void* SysCfb_GetFbPtr(s32 idx) {
     if (idx < 2) {
-        return sSysCfbFbPtr[idx];
+        return (void*)sSysCfbFbPtr[idx];
     }
-    return 0;
+    return NULL;
 }
 
-u32 SysCfb_GetFbEnd(void) {
-    return sSysCfbEnd;
+void* SysCfb_GetFbEnd(void) {
+    return (void*)sSysCfbEnd;
 }
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index ccffed09b..f7b37812e 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -2661,7 +2661,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
     ActorInit* actorInit;
     s32 objBankIndex;
     ActorOverlay* overlayEntry;
-    u32 temp;
+    uintptr_t temp;
     char* name;
     u32 overlaySize;
 
diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c
index 331e900af..22fa580d7 100644
--- a/src/code/z_actor_dlftbls.c
+++ b/src/code/z_actor_dlftbls.c
@@ -24,8 +24,8 @@
 
 // Actor Overlay Table definition
 #define DEFINE_ACTOR(name, _1, allocType, nameString) \
-    { (u32)_ovl_##name##SegmentRomStart,              \
-      (u32)_ovl_##name##SegmentRomEnd,                \
+    { (uintptr_t)_ovl_##name##SegmentRomStart,        \
+      (uintptr_t)_ovl_##name##SegmentRomEnd,          \
       _ovl_##name##SegmentStart,                      \
       _ovl_##name##SegmentEnd,                        \
       NULL,                                           \
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index 7375b1460..440949b42 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -27,7 +27,7 @@ void Interface_Init(PlayState* play) {
         interfaceCtx->cDownAlpha = interfaceCtx->cRightAlpha = interfaceCtx->healthAlpha = interfaceCtx->startAlpha =
             interfaceCtx->magicAlpha = 0;
 
-    parameterSize = (u32)_parameter_staticSegmentRomEnd - (u32)_parameter_staticSegmentRomStart;
+    parameterSize = (uintptr_t)_parameter_staticSegmentRomEnd - (uintptr_t)_parameter_staticSegmentRomStart;
 
     // "Permanent PARAMETER Segment = %x"
     osSyncPrintf("常駐ＰＡＲＡＭＥＴＥＲセグメント=%x\n", parameterSize);
@@ -37,7 +37,7 @@ void Interface_Init(PlayState* play) {
     osSyncPrintf("parameter->parameterSegment=%x\n", interfaceCtx->parameterSegment);
 
     ASSERT(interfaceCtx->parameterSegment != NULL, "parameter->parameterSegment != NULL", "../z_construct.c", 161);
-    DmaMgr_SendRequest1(interfaceCtx->parameterSegment, (u32)_parameter_staticSegmentRomStart, parameterSize,
+    DmaMgr_SendRequest1(interfaceCtx->parameterSegment, (uintptr_t)_parameter_staticSegmentRomStart, parameterSize,
                         "../z_construct.c", 162);
 
     interfaceCtx->doActionSegment = GameState_Alloc(&play->state, 0x480, "../z_construct.c", 166);
@@ -55,8 +55,8 @@ void Interface_Init(PlayState* play) {
         doActionOffset = 0x5700;
     }
 
-    DmaMgr_SendRequest1(interfaceCtx->doActionSegment, (u32)_do_action_staticSegmentRomStart + doActionOffset, 0x300,
-                        "../z_construct.c", 174);
+    DmaMgr_SendRequest1(interfaceCtx->doActionSegment, (uintptr_t)_do_action_staticSegmentRomStart + doActionOffset,
+                        0x300, "../z_construct.c", 174);
 
     if (gSaveContext.language == LANGUAGE_ENG) {
         doActionOffset = 0x480;
@@ -66,8 +66,8 @@ void Interface_Init(PlayState* play) {
         doActionOffset = 0x5B80;
     }
 
-    DmaMgr_SendRequest1(interfaceCtx->doActionSegment + 0x300, (u32)_do_action_staticSegmentRomStart + doActionOffset,
-                        0x180, "../z_construct.c", 178);
+    DmaMgr_SendRequest1(interfaceCtx->doActionSegment + 0x300,
+                        (uintptr_t)_do_action_staticSegmentRomStart + doActionOffset, 0x180, "../z_construct.c", 178);
 
     interfaceCtx->iconItemSegment = GameState_Alloc(&play->state, 0x4000, "../z_construct.c", 190);
 
@@ -83,30 +83,30 @@ void Interface_Init(PlayState* play) {
 
     if (gSaveContext.equips.buttonItems[0] < 0xF0) {
         DmaMgr_SendRequest1(interfaceCtx->iconItemSegment,
-                            (u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000, 0x1000,
-                            "../z_construct.c", 198);
+                            (uintptr_t)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000,
+                            0x1000, "../z_construct.c", 198);
     } else if (gSaveContext.equips.buttonItems[0] != 0xFF) {
         DmaMgr_SendRequest1(interfaceCtx->iconItemSegment,
-                            (u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000, 0x1000,
-                            "../z_construct.c", 203);
+                            (uintptr_t)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[0] * 0x1000,
+                            0x1000, "../z_construct.c", 203);
     }
 
     if (gSaveContext.equips.buttonItems[1] < 0xF0) {
         DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x1000,
-                            (u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[1] * 0x1000, 0x1000,
-                            "../z_construct.c", 209);
+                            (uintptr_t)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[1] * 0x1000,
+                            0x1000, "../z_construct.c", 209);
     }
 
     if (gSaveContext.equips.buttonItems[2] < 0xF0) {
         DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x2000,
-                            (u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[2] * 0x1000, 0x1000,
-                            "../z_construct.c", 214);
+                            (uintptr_t)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[2] * 0x1000,
+                            0x1000, "../z_construct.c", 214);
     }
 
     if (gSaveContext.equips.buttonItems[3] < 0xF0) {
         DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x3000,
-                            (u32)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[3] * 0x1000, 0x1000,
-                            "../z_construct.c", 219);
+                            (uintptr_t)_icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[3] * 0x1000,
+                            0x1000, "../z_construct.c", 219);
     }
 
     osSyncPrintf("ＥＶＥＮＴ＝%d\n", ((void)0, gSaveContext.timer1State));
diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c
index 236893183..e8e2f9280 100644
--- a/src/code/z_effect_soft_sprite_dlftbls.c
+++ b/src/code/z_effect_soft_sprite_dlftbls.c
@@ -19,15 +19,15 @@
 #undef DEFINE_EFFECT_SS_UNSET
 
 // Effect SS Overlay Table definition
-#define DEFINE_EFFECT_SS(name, _1)         \
-    {                                      \
-        (u32)_ovl_##name##SegmentRomStart, \
-        (u32)_ovl_##name##SegmentRomEnd,   \
-        _ovl_##name##SegmentStart,         \
-        _ovl_##name##SegmentEnd,           \
-        NULL,                              \
-        &name##_InitVars,                  \
-        1,                                 \
+#define DEFINE_EFFECT_SS(name, _1)               \
+    {                                            \
+        (uintptr_t)_ovl_##name##SegmentRomStart, \
+        (uintptr_t)_ovl_##name##SegmentRomEnd,   \
+        _ovl_##name##SegmentStart,               \
+        _ovl_##name##SegmentEnd,                 \
+        NULL,                                    \
+        &name##_InitVars,                        \
+        1,                                       \
     },
 
 #define DEFINE_EFFECT_SS_UNSET(_0) { 0 },
diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c
index 55da621a7..bfce66248 100644
--- a/src/code/z_game_dlftbls.c
+++ b/src/code/z_game_dlftbls.c
@@ -1,9 +1,9 @@
 #include "global.h"
 
-#define GAMESTATE_OVERLAY(name, init, destroy, size)                                                         \
-    {                                                                                                        \
-        NULL, (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \
-            _ovl_##name##SegmentEnd, NULL, init, destroy, NULL, NULL, 0, size                                \
+#define GAMESTATE_OVERLAY(name, init, destroy, size)                                                     \
+    {                                                                                                    \
+        NULL, (uintptr_t)_ovl_##name##SegmentRomStart, (uintptr_t)_ovl_##name##SegmentRomEnd,            \
+            _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, NULL, init, destroy, NULL, NULL, 0, size \
     }
 #define GAMESTATE_OVERLAY_INTERNAL(init, destroy, size) \
     { NULL, 0, 0, NULL, NULL, NULL, init, destroy, NULL, NULL, 0, size }
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index 6da1c4833..65784c99d 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "vt.h"
 
-#define KALEIDO_OVERLAY(name, nameString)                                                                    \
-    {                                                                                                        \
-        NULL, (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \
-            _ovl_##name##SegmentEnd, 0, nameString,                                                          \
+#define KALEIDO_OVERLAY(name, nameString)                                                     \
+    {                                                                                         \
+        NULL, (uintptr_t)_ovl_##name##SegmentRomStart, (uintptr_t)_ovl_##name##SegmentRomEnd, \
+            _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, 0, nameString,                \
     }
 
 KaleidoMgrOverlay gKaleidoMgrOverlayTable[] = {
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index c8201c9d7..c631cc3dc 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -131,7 +131,8 @@ void Map_InitData(PlayState* play, s16 room) {
             osSyncPrintf(VT_RST);
             sEntranceIconMapIndex = extendedMapIndex;
             DmaMgr_SendRequest1(interfaceCtx->mapSegment,
-                                (u32)_map_grand_staticSegmentRomStart + gMapData->owMinimapTexOffset[extendedMapIndex],
+                                (uintptr_t)_map_grand_staticSegmentRomStart +
+                                    gMapData->owMinimapTexOffset[extendedMapIndex],
                                 gMapData->owMinimapTexSize[mapIndex], "../z_map_exp.c", 309);
             interfaceCtx->unk_258 = mapIndex;
             break;
@@ -159,7 +160,7 @@ void Map_InitData(PlayState* play, s16 room) {
                          mapIndex, VREG(30));
             osSyncPrintf(VT_RST);
             DmaMgr_SendRequest1(play->interfaceCtx.mapSegment,
-                                (u32)_map_i_staticSegmentRomStart +
+                                (uintptr_t)_map_i_staticSegmentRomStart +
                                     ((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * 0xFF0),
                                 0xFF0, "../z_map_exp.c", 346);
             R_COMPASS_OFFSET_X = gMapData->roomCompassOffsetX[mapIndex][room];
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index 564ddc01e..32f9f5736 100644
--- a/src/code/z_map_mark.c
+++ b/src/code/z_map_mark.c
@@ -16,8 +16,8 @@ typedef struct {
 
 typedef struct {
     /* 0x00 */ void* loadedRamAddr; // original name: "allocp"
-    /* 0x04 */ u32 vromStart;
-    /* 0x08 */ u32 vromEnd;
+    /* 0x04 */ uintptr_t vromStart;
+    /* 0x08 */ uintptr_t vromEnd;
     /* 0x0C */ void* vramStart;
     /* 0x10 */ void* vramEnd;
     /* 0x14 */ void* vramTable;
@@ -44,8 +44,8 @@ static MapMarkInfo sMapMarkInfoTable[] = {
 
 static MapMarkDataOverlay sMapMarkDataOvl = {
     NULL,
-    (u32)_ovl_map_mark_dataSegmentRomStart,
-    (u32)_ovl_map_mark_dataSegmentRomEnd,
+    (uintptr_t)_ovl_map_mark_dataSegmentRomStart,
+    (uintptr_t)_ovl_map_mark_dataSegmentRomEnd,
     _ovl_map_mark_dataSegmentStart,
     _ovl_map_mark_dataSegmentEnd,
     gMapMarkDataTable,
diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c
index dc9f6622a..fe574e50b 100644
--- a/src/code/z_message_PAL.c
+++ b/src/code/z_message_PAL.c
@@ -1167,8 +1167,8 @@ void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) {
         R_TEXTBOX_ICON_YPOS = y + 6;
         R_TEXTBOX_ICON_SIZE = 32;
         DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
-                            (u32)_icon_item_staticSegmentRomStart + (itemId * 0x1000), 0x1000, "../z_message_PAL.c",
-                            1473);
+                            (uintptr_t)_icon_item_staticSegmentRomStart + (itemId * 0x1000), 0x1000,
+                            "../z_message_PAL.c", 1473);
         // "Item 32-0"
         osSyncPrintf("アイテム32-0\n");
     } else {
@@ -1176,8 +1176,8 @@ void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) {
         R_TEXTBOX_ICON_YPOS = y + 10;
         R_TEXTBOX_ICON_SIZE = 24;
         DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
-                            (u32)_icon_item_24_staticSegmentRomStart + (itemId - ITEM_MEDALLION_FOREST) * 0x900, 0x900,
-                            "../z_message_PAL.c", 1482);
+                            (uintptr_t)_icon_item_24_staticSegmentRomStart + (itemId - ITEM_MEDALLION_FOREST) * 0x900,
+                            0x900, "../z_message_PAL.c", 1482);
         // "Item 24"
         osSyncPrintf("アイテム24＝%d (%d) {%d}\n", itemId, itemId - ITEM_KOKIRI_EMERALD, 84);
     }
@@ -1535,10 +1535,11 @@ void Message_Decode(PlayState* play) {
             msgCtx->textboxBackgroundYOffsetIdx = (font->msgBuf[msgCtx->msgBufPos + 3] & 0xF0) >> 4;
             msgCtx->textboxBackgroundUnkArg = font->msgBuf[msgCtx->msgBufPos + 3] & 0xF;
             DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
-                                (u32)_message_texture_staticSegmentRomStart + msgCtx->textboxBackgroundIdx * 0x900,
+                                (uintptr_t)_message_texture_staticSegmentRomStart +
+                                    msgCtx->textboxBackgroundIdx * 0x900,
                                 0x900, "../z_message_PAL.c", 1830);
             DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900,
-                                (u32)_message_texture_staticSegmentRomStart +
+                                (uintptr_t)_message_texture_staticSegmentRomStart +
                                     (msgCtx->textboxBackgroundIdx + 1) * 0x900,
                                 0x900, "../z_message_PAL.c", 1834);
             msgCtx->msgBufPos += 3;
@@ -1635,23 +1636,23 @@ void Message_OpenText(PlayState* play, u16 textId) {
     if (sTextIsCredits) {
         Message_FindCreditsMessage(play, textId);
         msgCtx->msgLength = font->msgLength;
-        DmaMgr_SendRequest1(font->msgBuf, (u32)(_staff_message_data_staticSegmentRomStart + font->msgOffset),
+        DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset,
                             font->msgLength, "../z_message_PAL.c", 1954);
     } else {
         if (gSaveContext.language == LANGUAGE_ENG) {
             Message_FindMessage(play, textId);
             msgCtx->msgLength = font->msgLength;
-            DmaMgr_SendRequest1(font->msgBuf, (u32)(_nes_message_data_staticSegmentRomStart + font->msgOffset),
+            DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset,
                                 font->msgLength, "../z_message_PAL.c", 1966);
         } else if (gSaveContext.language == LANGUAGE_GER) {
             Message_FindMessage(play, textId);
             msgCtx->msgLength = font->msgLength;
-            DmaMgr_SendRequest1(font->msgBuf, (u32)(_ger_message_data_staticSegmentRomStart + font->msgOffset),
+            DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_ger_message_data_staticSegmentRomStart + font->msgOffset,
                                 font->msgLength, "../z_message_PAL.c", 1978);
         } else {
             Message_FindMessage(play, textId);
             msgCtx->msgLength = font->msgLength;
-            DmaMgr_SendRequest1(font->msgBuf, (u32)(_fra_message_data_staticSegmentRomStart + font->msgOffset),
+            DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_fra_message_data_staticSegmentRomStart + font->msgOffset,
                                 font->msgLength, "../z_message_PAL.c", 1990);
         }
     }
@@ -1662,10 +1663,10 @@ void Message_OpenText(PlayState* play, u16 textId) {
     // "Text Box Type"
     osSyncPrintf("吹き出し種類＝%d\n", msgCtx->textBoxType);
     if (textBoxType < TEXTBOX_TYPE_NONE_BOTTOM) {
-        DmaMgr_SendRequest1(
-            msgCtx->textboxSegment,
-            (u32)(_message_staticSegmentRomStart + (messageStaticIndices[textBoxType] * MESSAGE_STATIC_TEX_SIZE)),
-            MESSAGE_STATIC_TEX_SIZE, "../z_message_PAL.c", 2006);
+        DmaMgr_SendRequest1(msgCtx->textboxSegment,
+                            (uintptr_t)_message_staticSegmentRomStart +
+                                (messageStaticIndices[textBoxType] * MESSAGE_STATIC_TEX_SIZE),
+                            MESSAGE_STATIC_TEX_SIZE, "../z_message_PAL.c", 2006);
         if (textBoxType == TEXTBOX_TYPE_BLACK) {
             msgCtx->textboxColorRed = 0;
             msgCtx->textboxColorGreen = 0;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 2d56bb9a0..416ff89cd 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -1277,7 +1277,8 @@ void Interface_LoadItemIcon1(PlayState* play, u16 button) {
 
     osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, 1);
     DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, interfaceCtx->iconItemSegment + button * 0x1000,
-                        (u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
+                        (uintptr_t)_icon_item_staticSegmentRomStart +
+                            (gSaveContext.equips.buttonItems[button] * 0x1000),
                         0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1171);
     osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
 }
@@ -1287,7 +1288,8 @@ void Interface_LoadItemIcon2(PlayState* play, u16 button) {
 
     osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, 1);
     DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_180, interfaceCtx->iconItemSegment + button * 0x1000,
-                        (u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
+                        (uintptr_t)_icon_item_staticSegmentRomStart +
+                            (gSaveContext.equips.buttonItems[button] * 0x1000),
                         0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1193);
     osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
 }
@@ -2085,8 +2087,8 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 l
         osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, 1);
         DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160,
                             interfaceCtx->doActionSegment + (loadOffset * DO_ACTION_TEX_SIZE),
-                            (u32)_do_action_staticSegmentRomStart + (action * DO_ACTION_TEX_SIZE), DO_ACTION_TEX_SIZE,
-                            0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2145);
+                            (uintptr_t)_do_action_staticSegmentRomStart + (action * DO_ACTION_TEX_SIZE),
+                            DO_ACTION_TEX_SIZE, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2145);
         osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
     } else {
         gSegments[7] = VIRTUAL_TO_PHYSICAL(interfaceCtx->doActionSegment);
@@ -2148,8 +2150,8 @@ void Interface_LoadActionLabelB(PlayState* play, u16 action) {
 
     osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, 1);
     DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE,
-                        (u32)_do_action_staticSegmentRomStart + (action * DO_ACTION_TEX_SIZE), DO_ACTION_TEX_SIZE, 0,
-                        &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2228);
+                        (uintptr_t)_do_action_staticSegmentRomStart + (action * DO_ACTION_TEX_SIZE), DO_ACTION_TEX_SIZE,
+                        0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2228);
     osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
 
     interfaceCtx->unk_1FA = true;
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index d316652cb..5baafb6f9 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -80,7 +80,7 @@ void Sample_LoadTitleStatic(SampleState* this) {
     u32 size = _title_staticSegmentRomEnd - _title_staticSegmentRomStart;
 
     this->staticSegment = GameState_Alloc(&this->state, size, "../z_sample.c", 163);
-    DmaMgr_SendRequest1(this->staticSegment, (u32)_title_staticSegmentRomStart, size, "../z_sample.c", 164);
+    DmaMgr_SendRequest1(this->staticSegment, (uintptr_t)_title_staticSegmentRomStart, size, "../z_sample.c", 164);
 }
 
 void Sample_Init(GameState* thisx) {
diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index 707acea2b..bae4ff331 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -449,16 +449,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_BAZAAR:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_SP1a_staticSegmentRomStart;
-            size = (u32)_vr_SP1a_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_SP1a_staticSegmentRomStart;
+            size = (uintptr_t)_vr_SP1a_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1129);
 
-            start = (u32)_vr_SP1a_pal_staticSegmentRomStart;
-            size = (u32)_vr_SP1a_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_SP1a_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_SP1a_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -466,8 +466,8 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
             skyboxCtx->rot.y = 0.8f;
             break;
         case SKYBOX_OVERCAST_SUNSET:
-            start = (u32)_vr_cloud2_staticSegmentRomStart;
-            size = (u32)_vr_cloud2_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_cloud2_staticSegmentRomStart;
+            size = (uintptr_t)_vr_cloud2_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
@@ -480,8 +480,8 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1166);
 
-            start = (u32)_vr_cloud2_pal_staticSegmentRomStart;
-            size = (u32)_vr_cloud2_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_cloud2_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_cloud2_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -491,16 +491,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_MARKET_ADULT:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_RUVR_staticSegmentRomStart;
-            size = (u32)_vr_RUVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_RUVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_RUVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1184);
 
-            start = (u32)_vr_RUVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_RUVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_RUVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_RUVR_pal_staticSegmentRomEnd - start;
             osSyncPrintf("ＳＩＺＥ = %d\n", size);
 
             skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1188);
@@ -509,44 +509,44 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
             DmaMgr_SendRequest1(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1190);
             break;
         case SKYBOX_CUTSCENE_MAP:
-            start = (u32)_vr_holy0_staticSegmentRomStart;
-            size = (u32)_vr_holy0_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_holy0_staticSegmentRomStart;
+            size = (uintptr_t)_vr_holy0_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1200);
 
-            start = (u32)_vr_holy1_staticSegmentRomStart;
-            size = (u32)_vr_holy1_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_holy1_staticSegmentRomStart;
+            size = (uintptr_t)_vr_holy1_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[1] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[1], start, size, "../z_vr_box.c", 1207);
 
-            start = (u32)_vr_holy0_pal_staticSegmentRomStart;
-            size = (u32)_vr_holy0_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_holy0_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_holy0_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->palettes, start, size, "../z_vr_box.c", 1214);
-            DmaMgr_SendRequest1((u8*)skyboxCtx->palettes + size, (u32)_vr_holy1_pal_staticSegmentRomStart, size,
+            DmaMgr_SendRequest1((u8*)skyboxCtx->palettes + size, (uintptr_t)_vr_holy1_pal_staticSegmentRomStart, size,
                                 "../z_vr_box.c", 1216);
             break;
         case SKYBOX_HOUSE_LINK:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_LHVR_staticSegmentRomStart;
-            size = (u32)_vr_LHVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_LHVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_LHVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1228);
 
-            start = (u32)_vr_LHVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_LHVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_LHVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_LHVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -555,16 +555,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_MARKET_CHILD_DAY:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_MDVR_staticSegmentRomStart;
-            size = (u32)_vr_MDVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_MDVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_MDVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1259);
 
-            start = (u32)_vr_MDVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_MDVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_MDVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_MDVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -573,16 +573,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_MARKET_CHILD_NIGHT:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_MNVR_staticSegmentRomStart;
-            size = (u32)_vr_MNVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_MNVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_MNVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1273);
 
-            start = (u32)_vr_MNVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_MNVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_MNVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_MNVR_pal_staticSegmentRomEnd - start;
             osSyncPrintf("ＳＩＺＥ = %d\n", size);
 
             skyboxCtx->palettes = GameState_Alloc(&play->state, size, "../z_vr_box.c", 1277);
@@ -593,16 +593,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HAPPY_MASK_SHOP:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_FCVR_staticSegmentRomStart;
-            size = (u32)_vr_FCVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_FCVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_FCVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1288);
 
-            start = (u32)_vr_FCVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_FCVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_FCVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_FCVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -612,16 +612,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_KNOW_IT_ALL_BROTHERS:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_KHVR_staticSegmentRomStart;
-            size = (u32)_vr_KHVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KHVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KHVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1303);
 
-            start = (u32)_vr_KHVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_KHVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KHVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KHVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -630,16 +630,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_OF_TWINS:
             skyboxCtx->unk_140 = 2;
 
-            start = (u32)_vr_K3VR_staticSegmentRomStart;
-            size = (u32)_vr_K3VR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_K3VR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_K3VR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1333);
 
-            start = (u32)_vr_K3VR_pal_staticSegmentRomStart;
-            size = (u32)_vr_K3VR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_K3VR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_K3VR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -648,16 +648,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_STABLES:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_MLVR_staticSegmentRomStart;
-            size = (u32)_vr_MLVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_MLVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_MLVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1347);
 
-            start = (u32)_vr_MLVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_MLVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_MLVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_MLVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -666,16 +666,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_KAKARIKO:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_KKRVR_staticSegmentRomStart;
-            size = (u32)_vr_KKRVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KKRVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KKRVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1361);
 
-            start = (u32)_vr_KKRVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_KKRVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KKRVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KKRVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -684,16 +684,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_KOKIRI_SHOP:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_KSVR_staticSegmentRomStart;
-            size = (u32)_vr_KSVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KSVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KSVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1375);
 
-            start = (u32)_vr_KSVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_KSVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KSVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KSVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -703,16 +703,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_GORON_SHOP:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_GLVR_staticSegmentRomStart;
-            size = (u32)_vr_GLVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_GLVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_GLVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1407);
 
-            start = (u32)_vr_GLVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_GLVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_GLVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_GLVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -722,16 +722,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_ZORA_SHOP:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_ZRVR_staticSegmentRomStart;
-            size = (u32)_vr_ZRVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_ZRVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_ZRVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1422);
 
-            start = (u32)_vr_ZRVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_ZRVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_ZRVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_ZRVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -741,16 +741,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_POTION_SHOP_KAKARIKO:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_DGVR_staticSegmentRomStart;
-            size = (u32)_vr_DGVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_DGVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_DGVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1453);
 
-            start = (u32)_vr_DGVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_DGVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_DGVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_DGVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -760,16 +760,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_POTION_SHOP_MARKET:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_ALVR_staticSegmentRomStart;
-            size = (u32)_vr_ALVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_ALVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_ALVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1468);
 
-            start = (u32)_vr_ALVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_ALVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_ALVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_ALVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -779,16 +779,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_BOMBCHU_SHOP:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_NSVR_staticSegmentRomStart;
-            size = (u32)_vr_NSVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_NSVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_NSVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1483);
 
-            start = (u32)_vr_NSVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_NSVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_NSVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_NSVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -798,16 +798,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_RICHARD:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_IPVR_staticSegmentRomStart;
-            size = (u32)_vr_IPVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_IPVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_IPVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1514);
 
-            start = (u32)_vr_IPVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_IPVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_IPVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_IPVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -816,16 +816,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_IMPA:
             skyboxCtx->unk_140 = 1;
 
-            start = (u32)_vr_LBVR_staticSegmentRomStart;
-            size = (u32)_vr_LBVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_LBVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_LBVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1528);
 
-            start = (u32)_vr_LBVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_LBVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_LBVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_LBVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -834,16 +834,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_TENT:
             skyboxCtx->unk_140 = 2;
 
-            start = (u32)_vr_TTVR_staticSegmentRomStart;
-            size = (u32)_vr_TTVR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_TTVR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_TTVR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1542);
 
-            start = (u32)_vr_TTVR_pal_staticSegmentRomStart;
-            size = (u32)_vr_TTVR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_TTVR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_TTVR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -852,16 +852,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_MIDO:
             skyboxCtx->unk_140 = 2;
 
-            start = (u32)_vr_K4VR_staticSegmentRomStart;
-            size = (u32)_vr_K4VR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_K4VR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_K4VR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1562);
 
-            start = (u32)_vr_K4VR_pal_staticSegmentRomStart;
-            size = (u32)_vr_K4VR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_K4VR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_K4VR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -870,16 +870,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_SARIA:
             skyboxCtx->unk_140 = 2;
 
-            start = (u32)_vr_K5VR_staticSegmentRomStart;
-            size = (u32)_vr_K5VR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_K5VR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_K5VR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1576);
 
-            start = (u32)_vr_K5VR_pal_staticSegmentRomStart;
-            size = (u32)_vr_K5VR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_K5VR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_K5VR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);
 
@@ -888,16 +888,16 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) {
         case SKYBOX_HOUSE_ALLEY:
             skyboxCtx->unk_140 = 2;
 
-            start = (u32)_vr_KR3VR_staticSegmentRomStart;
-            size = (u32)_vr_KR3VR_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KR3VR_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KR3VR_staticSegmentRomEnd - start;
             skyboxCtx->staticSegments[0] = GameState_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);
 
             DmaMgr_SendRequest1(skyboxCtx->staticSegments[0], start, size, "../z_vr_box.c", 1590);
 
-            start = (u32)_vr_KR3VR_pal_staticSegmentRomStart;
-            size = (u32)_vr_KR3VR_pal_staticSegmentRomEnd - start;
+            start = (uintptr_t)_vr_KR3VR_pal_staticSegmentRomStart;
+            size = (uintptr_t)_vr_KR3VR_pal_staticSegmentRomEnd - start;
             skyboxCtx->palettes = GameState_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);