Fixed asset loading on overlays and engine, including switching iwork to uintptr_t

8 files changed, 93 insertions, 90 deletions

diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c
index bbd66cb4..ee3d6a13 100644
--- a/src/engine/fox_360.c
+++ b/src/engine/fox_360.c
@@ -390,7 +390,7 @@ void func_360_8002F180(void) {
             actor->iwork[11] = 1;
             if (actor->aiType <= AI360_PEPPY) {
                 AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4);
-                actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CC01C);
+                actor->info.hitbox = LOAD_ASSET(D_edata_800CC01C);
                 actor->info.unk_1C = 0.0f;
                 actor->info.bonus = 0;
             } else {
diff --git a/src/engine/fox_97F80.c b/src/engine/fox_97F80.c
index f570c6fc..93156a42 100644
--- a/src/engine/fox_97F80.c
+++ b/src/engine/fox_97F80.c
@@ -551,8 +551,8 @@ bool func_80099254(Vec3f* objPos, Vec3f* colliderPos, Vec3f* objVel, CollisionHe
         objMinZ = swapBuff;
     }
 
-    colPoly = SEGMENTED_TO_VIRTUAL(colHeader->polys);
-    mesh = SEGMENTED_TO_VIRTUAL(colHeader->mesh);
+    colPoly = LOAD_ASSET(colHeader->polys);
+    mesh = LOAD_ASSET(colHeader->mesh);
     polyCount = colHeader->polyCount;
     speed = VEC3F_MAG(objVel);
 
diff --git a/src/engine/fox_A4290.c b/src/engine/fox_A4290.c
index 82088912..470c3f44 100644
--- a/src/engine/fox_A4290.c
+++ b/src/engine/fox_A4290.c
@@ -6,7 +6,7 @@ bool func_col2_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* col
 bool func_col2_800A3A74(Vec3f* point, Vec3f** tri, Vec3f* normOut);
 
 bool func_col2_800A3690(Vec3f* objPos, Vec3f* colliderPos, s32 colId, Vec3f* hitDataOut) {
-    return func_col2_800A36FC(objPos, colliderPos, SEGMENTED_TO_VIRTUAL(&D_800D2CA0[colId]), hitDataOut);
+    return func_col2_800A36FC(objPos, colliderPos, LOAD_ASSET(&D_800D2CA0[colId]), hitDataOut);
 }
 
 bool func_col2_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeader, Vec3f* hitDataOut) {
@@ -32,8 +32,8 @@ bool func_col2_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* col
     }
     above = false;
     count = colHeader->polyCount;
-    polys = SEGMENTED_TO_VIRTUAL(colHeader->polys);
-    mesh = SEGMENTED_TO_VIRTUAL(colHeader->mesh);
+    polys = LOAD_ASSET(colHeader->polys);
+    mesh = LOAD_ASSET(colHeader->mesh);
     for (i = 0; i < count; i++, polys++) {
         for (j = 0; j < 3; j++) {
             tri[j] = &mesh[polys->vtx[j]];
diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c
index 365ccac9..2672a45c 100644
--- a/src/engine/fox_enmy.c
+++ b/src/engine/fox_enmy.c
@@ -133,7 +133,7 @@ bool func_enmy_80061148(Vec3f* arg0, f32 arg1) {
 
 void Object_SetInfo(ObjectInfo* info, u32 objId) {
     *info = D_edata_800CC124[objId];
-    info->hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CC124[objId].hitbox);
+    info->hitbox = LOAD_ASSET(D_edata_800CC124[objId].hitbox);
     if (gLevelMode == LEVELMODE_UNK_2) {
         info->unk_10 += 200.0f;
     }
@@ -488,7 +488,7 @@ void func_enmy_80062568(void) {
     s32 var_s0;
     s32 temp = gCurrentLevel; // seems fake
     if (1) {}
-    D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[temp]);
+    D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[temp]);
     var_s0 = D_ctx_80177CA0 - 40;
     var_s1 = &D_ctx_80178310[var_s0];
 
@@ -507,15 +507,15 @@ void func_enmy_80062664(void) {
     s32 j;
 
     if ((gCurrentLevel == LEVEL_METEO) && (D_ctx_8017827C == 1)) {
-        D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_ME_602B148);
+        D_ctx_80178310 = LOAD_ASSET(D_ME_602B148);
     } else if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_ctx_8017827C == 1)) {
-        D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_SX_602F18C);
+        D_ctx_80178310 = LOAD_ASSET(D_SX_602F18C);
     } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_ctx_8017827C == 1)) {
-        D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C0356A4);
+        D_ctx_80178310 = LOAD_ASSET(D_ANDROSS_C0356A4);
     } else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_ctx_8017827C == 1)) {
-        D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_VE1_6010088);
+        D_ctx_80178310 = LOAD_ASSET(D_VE1_6010088);
     } else {
-        D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]);
+        D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]);
     }
     if (D_ctx_8017812C == 0) {
         for (j = 0; j < D_ctx_801782B8; j++) {
@@ -965,7 +965,7 @@ void func_enmy_80063E5C(Object_80* obj80, f32* hitboxData) {
             item->obj.pos.z = obj80->obj.pos.z;
             item->obj.rot.y = obj80->obj.rot.y;
             Object_SetInfo(&item->info, item->obj.id);
-            item->info.hitbox = SEGMENTED_TO_VIRTUAL(hitboxData);
+            item->info.hitbox = LOAD_ASSET(hitboxData);
             break;
         }
     }
diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c
index e8f103f3..15c6aba4 100644
--- a/src/engine/fox_enmy2.c
+++ b/src/engine/fox_enmy2.c
@@ -996,52 +996,52 @@ void ActorEvent_ProcessScript(Actor* this) {
 
     switch (gCurrentLevel) {
         case LEVEL_VENOM_ANDROSS:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C037E3C);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_ANDROSS_C037E3C);
             break;
         case LEVEL_CORNERIA:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_CO_603D9E8);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_CO_603D9E8);
             break;
         case LEVEL_METEO:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_ME_602F3AC);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_ME_602F3AC);
             break;
         case LEVEL_AQUAS:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_AQ_60308B8);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_AQ_60308B8);
             break;
         case LEVEL_TITANIA:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_TI_600631C);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_TI_600631C);
             break;
         case LEVEL_SECTOR_X:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_SX_60320D0);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_SX_60320D0);
             break;
         case LEVEL_UNK_4:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_A6_60289FC);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_A6_60289FC);
             break;
         case LEVEL_AREA_6:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_A6_6027F50);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_A6_6027F50);
             break;
         case LEVEL_SECTOR_Y:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_SY_6032E18);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_SY_6032E18);
             break;
         case LEVEL_SOLAR:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_SO_6020DD0);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_SO_6020DD0);
             break;
         case LEVEL_ZONESS:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_ZO_602AAC0);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_ZO_602AAC0);
             break;
         case LEVEL_VENOM_1:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_VE1_601B1E4);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_VE1_601B1E4);
             break;
         case LEVEL_MACBETH:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_MA_60381D8);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_MA_60381D8);
             break;
         case LEVEL_TRAINING:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_TR_6009B34);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_TR_6009B34);
             break;
         default:
-            levelScripts = SEGMENTED_TO_VIRTUAL(D_CO_603D9E8);
+            levelScripts = (uint16_t**) LOAD_ASSET(D_CO_603D9E8);
             break;
     }
-    actorScript = SEGMENTED_TO_VIRTUAL(levelScripts[this->aiType]);
+    actorScript = LOAD_ASSET(levelScripts[this->aiType]);
 
     switch (EV_OPC_MASK(actorScript[this->aiIndex])) {
         case EV_OPC(EVOP_STOP_SCRIPT):
@@ -1121,11 +1121,11 @@ void ActorEvent_ProcessScript(Actor* this) {
             }
 
             if (this->unk_0B4 == EINFO_104) {
-                this->unk_0B6 = Animation_GetFrameCount(&D_VE2_6014658) - 1;
+                this->unk_0B6 = Animation_GetFrameCount(D_VE2_6014658) - 1;
             }
 
             if (this->unk_0B4 < EINFO_200) {
-                this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800D003C[this->unk_0B4].hitbox);
+                this->info.hitbox = LOAD_ASSET(D_800D003C[this->unk_0B4].hitbox);
                 this->scale = D_800D003C[this->unk_0B4].scale;
                 this->info.unk_16 = D_800D003C[this->unk_0B4].info_unk_16;
                 this->info.unk_14 = D_800D003C[this->unk_0B4].info_unk_14;
@@ -1220,7 +1220,7 @@ void ActorEvent_ProcessScript(Actor* this) {
             }
 
             if (actorScript[this->aiIndex + 1] == EVACT_15) {
-                this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBEC4);
+                this->info.hitbox = LOAD_ASSET(D_edata_800CBEC4);
                 this->state = EVSTATE_11;
                 this->aiIndex += 2;
                 break;
@@ -2845,7 +2845,7 @@ void ActorEvent_800720E8(Actor* this) {
 
                 if (this->health <= 0) {
                     this->unk_046 = 1;
-                    this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032408);
+                    this->info.hitbox = (f32*) LOAD_ASSET(D_SX_6032408);
                     AUDIO_PLAY_SFX(0x1900000D, this->sfxSource, 0);
                 } else {
                     AUDIO_PLAY_SFX(0x2903300E, this->sfxSource, 0);
@@ -3228,7 +3228,7 @@ void ActorEvent_Update(Actor* this) {
                 }
 
                 if (var_s0 == 3) {
-                    this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_ME_602F638);
+                    this->info.hitbox = (f32*) LOAD_ASSET(D_ME_602F638);
                     ActorEvent_ProcessScript(this);
                 }
                 break;
@@ -3462,21 +3462,21 @@ void ActorEvent_Update(Actor* this) {
             case EINFO_6:
                 this->unk_0B6++;
                 if (gCurrentLevel == LEVEL_SOLAR) {
-                    if (this->unk_0B6 >= Animation_GetFrameCount(&D_SO_600636C)) {
+                    if (this->unk_0B6 >= Animation_GetFrameCount(D_SO_600636C)) {
                         this->unk_0B6 = 0;
                     }
                     if (((s32) gGameFrameCount % 3) == 0) {
                         Solar_8019E9F4(this->obj.pos.x, this->obj.pos.y - 20, this->obj.pos.z - 180.0f, 0.0f,
                                        RAND_FLOAT(20.0f) * -1.0f, 0.0f, 4.0f, 2);
                     }
-                } else if (this->unk_0B6 >= Animation_GetFrameCount(&D_ENMY_PLANET_40057AC)) {
+                } else if (this->unk_0B6 >= Animation_GetFrameCount(D_ENMY_PLANET_40057AC)) {
                     this->unk_0B6 = 0;
                 }
                 break;
 
             case EINFO_9:
                 this->unk_0B6++;
-                if (this->unk_0B6 >= Animation_GetFrameCount(&D_ENMY_PLANET_40001A4)) {
+                if (this->unk_0B6 >= Animation_GetFrameCount(D_ENMY_PLANET_40001A4)) {
                     this->unk_0B6 = 0;
                 }
                 if (this->iwork[6] == 0) {
@@ -3501,7 +3501,7 @@ void ActorEvent_Update(Actor* this) {
             case EINFO_79:
                 if (this->timer_0C4 == 0) {
                     this->unk_0B6 += 1;
-                    if (Animation_GetFrameCount(&D_ZO_600E5EC) < this->unk_0B6) {
+                    if (Animation_GetFrameCount(D_ZO_600E5EC) < this->unk_0B6) {
                         this->unk_0B6 = 0;
                     }
                 }
@@ -3618,7 +3618,7 @@ void ActorEvent_Update(Actor* this) {
                 Math_SmoothStepToF(&this->fwork[15], 1.0f, 0.1f, 0.1f, 0.001f);
 
                 if (this->fwork[15] > 0.5f) {
-                    this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_VE1_601B4C4);
+                    this->info.hitbox = (f32*) LOAD_ASSET(D_VE1_601B4C4);
                 }
 
                 if (this->unk_046 == 0) {
@@ -3754,7 +3754,7 @@ bool ActorEvent_OverrideLimbDraw2(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
 void ActorEvent_80074E3C(Actor* this) {
     Vec3f sp30[10];
 
-    Animation_GetFrameData(&D_SX_6013820, 0, sp30);
+    Animation_GetFrameData(D_SX_6013820, 0, sp30);
     sp30[6].y += this->fwork[15];
     sp30[5].z += this->fwork[16] + ((this->timer_0BE >> 2) & 1);
     sp30[4].z -= this->fwork[16] + ((this->timer_0BE >> 2) & 1);
@@ -3882,11 +3882,11 @@ void ActorEvent_Draw(Actor* this) {
                 case EINFO_6:
                     if (gCurrentLevel == LEVEL_SOLAR) {
                         gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                        Animation_GetFrameData(&D_SO_600636C, this->unk_0B6, sp114);
+                        Animation_GetFrameData(D_SO_600636C, this->unk_0B6, sp114);
                         Animation_DrawSkeleton(1, D_SO_6006558, sp114, NULL, NULL, this, &gIdentityMatrix);
                         gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     } else {
-                        Animation_GetFrameData(&D_ENMY_PLANET_40057AC, this->unk_0B6, sp114);
+                        Animation_GetFrameData(D_ENMY_PLANET_40057AC, this->unk_0B6, sp114);
                         Animation_DrawSkeleton(1, D_ENMY_PLANET_40058B8, sp114, NULL, NULL, this, &gIdentityMatrix);
                     }
                     break;
@@ -3898,7 +3898,7 @@ void ActorEvent_Draw(Actor* this) {
 
                 case EINFO_9:
                     Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1);
-                    Animation_GetFrameData(&D_ENMY_PLANET_40001A4, this->unk_0B6, sp114);
+                    Animation_GetFrameData(D_ENMY_PLANET_40001A4, this->unk_0B6, sp114);
                     Animation_DrawSkeleton(1, D_ENMY_PLANET_4000270, sp114, NULL, NULL, this, &gIdentityMatrix);
                     break;
 
@@ -3966,7 +3966,7 @@ void ActorEvent_Draw(Actor* this) {
                     break;
 
                 case EINFO_33:
-                    Animation_GetFrameData(&D_ENMY_SPACE_400A30C, this->unk_0B6, sp114);
+                    Animation_GetFrameData(D_ENMY_SPACE_400A30C, this->unk_0B6, sp114);
                     Matrix_RotateY(gGfxMatrix, M_PI, 1);
                     Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
                     Animation_DrawSkeleton(1, D_ENMY_SPACE_400A398, sp114, ActorEvent_OverrideLimbDraw1, NULL, this,
@@ -3975,7 +3975,7 @@ void ActorEvent_Draw(Actor* this) {
                     break;
 
                 case EINFO_36:
-                    Animation_GetFrameData(&D_TI1_700CAF4, this->unk_0B6, sp114);
+                    Animation_GetFrameData(D_TI1_700CAF4, this->unk_0B6, sp114);
                     sp114[2].z += this->fwork[15];
                     Animation_DrawSkeleton(1, D_TI1_700CB60, sp114, NULL, NULL, this, &gIdentityMatrix);
                     break;
@@ -3991,7 +3991,7 @@ void ActorEvent_Draw(Actor* this) {
                     break;
 
                 case EINFO_52:
-                    Animation_GetFrameData(&D_ZO_601F874, this->unk_0B6, sp114);
+                    Animation_GetFrameData(D_ZO_601F874, this->unk_0B6, sp114);
                     sp114[2].z -= this->fwork[15];
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
                     Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1);
@@ -4055,7 +4055,7 @@ void ActorEvent_Draw(Actor* this) {
 
                 case EINFO_83:
                     Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1);
-                    Animation_GetFrameData(&D_AQ_602201C, this->unk_0B6, sp114);
+                    Animation_GetFrameData(D_AQ_602201C, this->unk_0B6, sp114);
                     Animation_DrawSkeleton(1, D_AQ_60220E8, sp114, NULL, NULL, this, &gIdentityMatrix);
                     break;
 
@@ -4093,7 +4093,7 @@ void ActorEvent_Draw(Actor* this) {
                     break;
 
                 case EINFO_106:
-                    Animation_GetFrameData(&D_ENMY_SPACE_4000080, this->unk_0B6, sp114);
+                    Animation_GetFrameData(D_ENMY_SPACE_4000080, this->unk_0B6, sp114);
                     Animation_DrawSkeleton(1, D_ENMY_SPACE_400014C, sp114, NULL, NULL, this, &gIdentityMatrix);
                     break;
 
diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
index eb9ba85b..5791d087 100644
--- a/src/engine/fox_play.c
+++ b/src/engine/fox_play.c
@@ -86,11 +86,11 @@ void func_play_800A3FEC(void) {
     switch (gCurrentLevel) {
         case LEVEL_SOLAR:
             if (gGameFrameCount & 1) {
-                spB4 = SEGMENTED_TO_VIRTUAL(D_SO_6001C50);
+                spB4 = LOAD_ASSET(D_SO_6001C50);
             } else {
-                spB4 = SEGMENTED_TO_VIRTUAL(D_SO_6004500);
+                spB4 = LOAD_ASSET(D_SO_6004500);
             }
-            spB0 = SEGMENTED_TO_VIRTUAL(D_SO_6022760);
+            spB0 = LOAD_ASSET(D_SO_6022760);
             spA8 = 15;
             sp90 = 70.0f;
             sp8C = 0.1f;
@@ -99,11 +99,11 @@ void func_play_800A3FEC(void) {
             break;
         case LEVEL_ZONESS:
             if (gGameFrameCount & 1) {
-                spB4 = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
+                spB4 = LOAD_ASSET(D_ZO_6009ED0);
             } else {
-                spB4 = SEGMENTED_TO_VIRTUAL(D_ZO_600C780);
+                spB4 = LOAD_ASSET(D_ZO_600C780);
             }
-            spB0 = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50);
+            spB0 = LOAD_ASSET(D_ZO_602AC50);
             spA8 = 7;
             sp90 = 40.0f;
             sp8C = 0.2f;
@@ -282,16 +282,16 @@ void func_play_800A4F7C(void) {
 
     switch (gVersusStage) {
         case VS_STAGE_CORNERIA:
-            D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302DE3C);
+            D_ctx_80178310 = LOAD_ASSET(D_versus_302DE3C);
             break;
         case VS_STAGE_KATINA:
-            D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E0E4);
+            D_ctx_80178310 = LOAD_ASSET(D_versus_302E0E4);
             break;
         case VS_STAGE_SECTOR_Z:
             if (D_ctx_801778AC == 2) {
-                D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E378);
+                D_ctx_80178310 = LOAD_ASSET(D_versus_302E378);
             } else {
-                D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E170);
+                D_ctx_80178310 = LOAD_ASSET(D_versus_302E170);
             }
             break;
     }
@@ -337,7 +337,7 @@ void func_play_800A5338(void) {
     s32 i;
     s32 j;
 
-    D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_CO_603B074);
+    D_ctx_80178310 = LOAD_ASSET(D_CO_603B074);
 
     for (j = 0, obj58 = gObjects58; j < 200; j++) {
         if (D_ctx_80178310[j].id <= OBJ_INVALID) {
@@ -389,7 +389,7 @@ void func_play_800A55B0(void) {
     s32 i;
     s32 j;
 
-    D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_SY_6030B14);
+    D_ctx_80178310 = LOAD_ASSET(D_SY_6030B14);
 
     for (j = 0, obj58 = gObjects58; j < 200; j++) {
         if (D_ctx_80178310[j].id <= OBJ_INVALID) {
@@ -481,17 +481,17 @@ void func_play_800A594C(void) {
     if (gVersusMode) {
         switch (gVersusStage) {
             case 0:
-                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DD70);
+                sEnvSettings = LOAD_ASSET(&D_versus_302DD70);
                 break;
             case 1:
-                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DDB4);
+                sEnvSettings = LOAD_ASSET(&D_versus_302DDB4);
                 break;
             case 2:
-                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DDF8);
+                sEnvSettings = LOAD_ASSET(&D_versus_302DDF8);
                 break;
         }
     } else {
-        sEnvSettings = SEGMENTED_TO_VIRTUAL(D_800D2F98[gCurrentLevel]);
+        sEnvSettings = LOAD_ASSET(D_800D2F98[gCurrentLevel]);
     }
     if (D_ctx_8017782C == 0) {
         if (gCurrentLevel == LEVEL_SOLAR) {
@@ -500,7 +500,7 @@ void func_play_800A594C(void) {
             Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x3140807E);
         }
     } else if (gCurrentLevel == LEVEL_AQUAS) {
-        sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_AQ_602E584);
+        sEnvSettings = LOAD_ASSET(&D_AQ_602E584);
     }
     gBgmSeqId = sEnvSettings->seqId;
     gLevelType = sEnvSettings->type;
@@ -999,12 +999,12 @@ bool func_play_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) {
 
     switch (gCurrentLevel) {
         case LEVEL_SOLAR:
-            spA4 = SEGMENTED_TO_VIRTUAL(D_SO_6001C50);
-            spA0 = SEGMENTED_TO_VIRTUAL(D_SO_6022760);
+            spA4 = LOAD_ASSET(D_SO_6001C50);
+            spA0 = LOAD_ASSET(D_SO_6022760);
             break;
         case LEVEL_ZONESS:
-            spA4 = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
-            spA0 = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50);
+            spA4 = LOAD_ASSET(D_ZO_6009ED0);
+            spA0 = LOAD_ASSET(D_ZO_602AC50);
             break;
         default:
             return false;
@@ -1926,7 +1926,7 @@ void func_play_800A8BA4(Player* player) {
                                                      actor->vwork[29].y, actor->vwork[29].z + actor->unk_0F4.z);
                         if (temp_v0 != 0) {
                             if ((temp_v0 < 0) && (actor->unk_0B4 == 38)) {
-                                actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032328);
+                                actor->info.hitbox = LOAD_ASSET(D_SX_6032328);
                                 if (D_ctx_80177E80 >= 0) {
                                     actor->unk_046 = 2;
                                     D_ctx_80177E80++;
@@ -2456,10 +2456,10 @@ void func_play_800AB334(void) {
 
             switch (gCurrentLevel) {
                 case LEVEL_SOLAR:
-                    mesh = SEGMENTED_TO_VIRTUAL(D_SO_6001C50);
+                    mesh = LOAD_ASSET(D_SO_6001C50);
                     break;
                 case LEVEL_ZONESS:
-                    mesh = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
+                    mesh = LOAD_ASSET(D_ZO_6009ED0);
                     break;
             }
             for (i = 0; i < 17 * 17; i++, mesh++) {
@@ -2476,10 +2476,10 @@ void func_play_800AB334(void) {
 
             switch (gCurrentLevel) {
                 case LEVEL_SOLAR:
-                    mesh = SEGMENTED_TO_VIRTUAL(D_SO_6004500);
+                    mesh = LOAD_ASSET(D_SO_6004500);
                     break;
                 case LEVEL_ZONESS:
-                    mesh = SEGMENTED_TO_VIRTUAL(D_ZO_600C780);
+                    mesh = LOAD_ASSET(D_ZO_600C780);
                     break;
             }
             for (i = 0; i < 17 * 17; i++, mesh++) {
@@ -3984,16 +3984,16 @@ void func_play_800B0194(Player* player) {
             }
             switch (gPlayerNum) {
                 case 0:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E56C);
+                    sp48 = LOAD_ASSET(D_versus_302E56C);
                     break;
                 case 1:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E830);
+                    sp48 = LOAD_ASSET(D_versus_302E830);
                     break;
                 case 2:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E74C);
+                    sp48 = LOAD_ASSET(D_versus_302E74C);
                     break;
                 case 3:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E65C);
+                    sp48 = LOAD_ASSET(D_versus_302E65C);
                     break;
             }
             Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 24, 0.2f, 10.0f, 0.01f);
@@ -4007,16 +4007,16 @@ void func_play_800B0194(Player* player) {
     if (player->unk_1D4 == 0) {
         switch (gPlayerNum) {
             case 0:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E95C);
+                sp48 = LOAD_ASSET(D_versus_302E95C);
                 break;
             case 1:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EC20);
+                sp48 = LOAD_ASSET(D_versus_302EC20);
                 break;
             case 2:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EB3C);
+                sp48 = LOAD_ASSET(D_versus_302EB3C);
                 break;
             case 3:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EA4C);
+                sp48 = LOAD_ASSET(D_versus_302EA4C);
                 break;
         }
         Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 24, 0.2f, 10.0f, 0.01f);
@@ -4228,16 +4228,16 @@ void func_play_800B0F50(Player* playerx) {
                 player->unk_068 = 0;
                 switch (gPlayerNum) {
                     case 0:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E56C);
+                        sp38 = LOAD_ASSET(D_versus_302E56C);
                         break;
                     case 1:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E830);
+                        sp38 = LOAD_ASSET(D_versus_302E830);
                         break;
                     case 2:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E74C);
+                        sp38 = LOAD_ASSET(D_versus_302E74C);
                         break;
                     case 3:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E65C);
+                        sp38 = LOAD_ASSET(D_versus_302E65C);
                         break;
                 }
                 for (j = 0; j < 30; j++, sp38++) {
@@ -4319,7 +4319,7 @@ void func_play_800B0F50(Player* playerx) {
             D_ctx_80177D20 = player->unk_144 = 3932.0f;
 
             D_ctx_80177DC8 = 40;
-            D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]);
+            D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]);
             for (sp34 = D_ctx_80178310, i = 0; i < D_ctx_80177DC8; i++, sp34++) {
                 Object_Load(sp34, 4000.0f, -4000.0f, 4000.0f, -4000.0f);
             }
diff --git a/src/engine/fox_std_lib.c b/src/engine/fox_std_lib.c
index f3f4fcc8..fd2704fc 100644
--- a/src/engine/fox_std_lib.c
+++ b/src/engine/fox_std_lib.c
@@ -26,6 +26,7 @@ s32 Graphics_Printf(const char* fmt, ...) {
 }
 
 void Texture_Scroll(u16* texture, s32 width, s32 height, u8 mode) {
+    return;
     u16* temp_t0 = LOAD_ASSET(texture);
     u16 temp_a3;
     s32 var_a0;
@@ -75,12 +76,14 @@ void Texture_Scroll(u16* texture, s32 width, s32 height, u8 mode) {
 }
 
 void Texture_Mottle(u16* dst, u16* src, u8 mode) {
+    return;
     s32 var_v1;
     s32 var_s3;
     u8* var_s0_2;
     u8* var_s4_2;
     s32 temp_ft3;
 
+    // LTodo: [HD-Textures] This is broken
     dst = LOAD_ASSET(dst);
     src = LOAD_ASSET(src);
     switch (mode) {
diff --git a/src/engine/fox_tank.c b/src/engine/fox_tank.c
index 4eb0b069..7a00eb2c 100644
--- a/src/engine/fox_tank.c
+++ b/src/engine/fox_tank.c
@@ -35,8 +35,8 @@ void func_tank_80043280(u16* text0, u16* text1, f32 zRot) {
     Vec3f sp74;
 
     Matrix_Push(&gCalcMatrix);
-    text0 = SEGMENTED_TO_VIRTUAL(text0);
-    text1 = SEGMENTED_TO_VIRTUAL(text1);
+    text0 = LOAD_ASSET(text0);
+    text1 = LOAD_ASSET(text1);
     Matrix_RotateZ(gCalcMatrix, M_DTOR * zRot, 0);
     sp74.z = 0.0f;
     for (i = 0, dy = 0.0f; i < 32; i++, dy += 1.0f) {