From b36783ba8e4f633cfa9de217af80a28b3ca47bcc Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Sat, 6 Apr 2024 15:34:46 -0600 Subject: [PATCH] Fixed asset loading on overlays and engine, including switching iwork to uintptr_t --- include/sf64object.h | 2 +- src/audio/audio_general.c | 2 + src/engine/fox_360.c | 2 +- src/engine/fox_97F80.c | 4 +- src/engine/fox_A4290.c | 6 +-- src/engine/fox_enmy.c | 16 +++---- src/engine/fox_enmy2.c | 70 +++++++++++++-------------- src/engine/fox_play.c | 78 +++++++++++++++---------------- src/engine/fox_std_lib.c | 3 ++ src/engine/fox_tank.c | 4 +- src/overlays/ovl_i1/fox_co.c | 52 ++++++++++----------- src/overlays/ovl_i1/fox_tr360.c | 2 +- src/overlays/ovl_i2/fox_sx.c | 64 ++++++++++++------------- src/overlays/ovl_i3/fox_a6.c | 6 +-- src/overlays/ovl_i3/fox_aq.c | 22 ++++----- src/overlays/ovl_i3/fox_so.c | 4 +- src/overlays/ovl_i3/fox_zo.c | 4 +- src/overlays/ovl_i4/fox_bo.c | 8 ++-- src/overlays/ovl_i4/fox_fo.c | 4 +- src/overlays/ovl_i4/fox_sz.c | 6 +-- src/overlays/ovl_i5/fox_ma.c | 64 ++++++++++++------------- src/overlays/ovl_i5/fox_ti.c | 18 +++---- src/overlays/ovl_i6/fox_andross.c | 38 +++++++-------- src/overlays/ovl_i6/fox_sy.c | 18 +++---- src/overlays/ovl_i6/fox_ve2.c | 2 +- src/overlays/ovl_menu/fox_map.c | 2 - 26 files changed, 252 insertions(+), 249 deletions(-) diff --git a/include/sf64object.h b/include/sf64object.h index 4723a2ae..7ccda766 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -256,7 +256,7 @@ typedef struct { /* 0x04A */ s16 unk_04A; /* 0x04C */ s16 timer_04C; /* 0x04E */ s16 unk_04E; - /* 0x050 */ s32 iwork[25]; + /* 0x050 */ uintptr_t iwork[25]; /* 0x0B4 */ s16 unk_0B4; /* 0x0B6 */ s16 unk_0B6; /* 0x0B8 */ s16 state; diff --git a/src/audio/audio_general.c b/src/audio/audio_general.c index e4fc768b..79f7d412 100644 --- a/src/audio/audio_general.c +++ b/src/audio/audio_general.c @@ -1993,6 +1993,8 @@ void Audio_ClearVoice(void) { } s32 Audio_GetCurrentVoice(void) { + // LAudioTODO: Stub for now + return 0; if (!IS_SEQUENCE_CHANNEL_VALID(gSeqPlayers[SEQ_PLAYER_VOICE].channels[15])) { return 0; } 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) { diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index f4630394..69748d57 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -77,7 +77,7 @@ void Corneria_801877A0(Boss* boss, f32 arg1, f32 arg2, f32 arg3) { 100.0f); } -void Corneria_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { +void Corneria_80187838(Boss* arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { s32 i; for (i = 0; i < ARRAY_COUNT(gItems); i++) { @@ -571,7 +571,7 @@ void Corneria_80189058(Boss* boss) { D_i1_8019B6D8[66] = 0.0f; D_i1_8019B6D8[67] = 10000.0f; boss->timer_050 = 30; - Animation_GetFrameData(&D_CO_602C0D0, 0, boss->vwork); + Animation_GetFrameData(D_CO_602C0D0, 0, boss->vwork); gBossFrameCount = 0; } gBossFrameCount++; @@ -713,7 +713,7 @@ void Corneria_80189058(Boss* boss) { break; } } - Animation_GetFrameData(&D_CO_602C0D0, boss->unk_04C, sp84); + Animation_GetFrameData(D_CO_602C0D0, boss->unk_04C, sp84); if (boss->timer_052 == 0) { boss->timer_052 = 150; boss->swork[30] = 1; @@ -725,10 +725,10 @@ void Corneria_80189058(Boss* boss) { D_i1_8019B6D8[19] = D_i1_8019B6D8[67] = gPlayer[0].unk_138; boss->unk_04C += 2; - if (boss->unk_04C >= Animation_GetFrameCount(&D_CO_602BC18)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_CO_602BC18)) { boss->unk_04C = 0; } - Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84); + Animation_GetFrameData(D_CO_602BC18, boss->unk_04C, sp84); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp1EC, &sp21C); if (boss->timer_052 == 0) { boss->timer_052 = 150; @@ -745,7 +745,7 @@ void Corneria_80189058(Boss* boss) { if (boss->unk_04C < 0) { boss->unk_04C = 100; } - Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84); + Animation_GetFrameData(D_CO_602BC18, boss->unk_04C, sp84); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp6C, &sp21C); if (boss->timer_052 == 0) { boss->timer_052 = 30; @@ -766,7 +766,7 @@ void Corneria_80189058(Boss* boss) { if (boss->unk_04C >= 101) { boss->unk_04C = 0; } - Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84); + Animation_GetFrameData(D_CO_602BC18, boss->unk_04C, sp84); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C); if (boss->timer_052 == 0) { boss->timer_052 = 30; @@ -787,7 +787,7 @@ void Corneria_80189058(Boss* boss) { if (boss->unk_04C >= 101) { boss->unk_04C = 0; } - Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84); + Animation_GetFrameData(D_CO_602BC18, boss->unk_04C, sp84); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C); Corneria_80188A18(boss); break; @@ -847,7 +847,7 @@ void Corneria_80189058(Boss* boss) { if (!(gGameFrameCount & 0xF)) { boss->unk_04C = RAND_INT(100.0f); } - Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84); + Animation_GetFrameData(D_CO_602BC18, boss->unk_04C, sp84); boss->fwork[14] = 0.03f; break; case 7: @@ -916,10 +916,10 @@ void Corneria_80189058(Boss* boss) { if (boss->timer_050 == 0) { Object_Kill(&boss->obj, boss->sfxSource); } - Animation_GetFrameData(&D_CO_602BC18, 0, sp84); + Animation_GetFrameData(D_CO_602BC18, 0, sp84); break; default: - Animation_GetFrameData(&D_CO_602C0D0, boss->unk_04C, sp84); + Animation_GetFrameData(D_CO_602C0D0, boss->unk_04C, sp84); break; } Math_SmoothStepToF(&boss->vel.x, sp21C.x, 0.3f, 5.0f, 0.0f); @@ -1159,7 +1159,7 @@ void Corneria_8018AED0(Actor* actor) { f32 temp_cos; Corneria_8018ACE0(actor); - Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(&D_CO_602991C, actor->unk_0B6, sp40), + Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(D_CO_602991C, actor->unk_0B6, sp40), 1.0f, 1.0f, 1.0f); temp_sin = SIN_DEG(actor->obj.rot.y); actor->vel.x = actor->fwork[0] * temp_sin; @@ -1188,7 +1188,7 @@ void Corneria_8018AED0(Actor* actor) { if (actor->unk_0B6 == 50) { gObjects80[actor->iwork[0] - 1].state = 1; } - if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602991C)) { + if (actor->unk_0B6 >= Animation_GetFrameCount(D_CO_602991C)) { actor->state++; } break; @@ -1260,10 +1260,10 @@ void Corneria_8018B15C(Actor* actor) { Texture_Scroll(D_CO_60329C0, 16, 16, 1); actor->unk_0B6++; - if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602AA04)) { + if (actor->unk_0B6 >= Animation_GetFrameCount(D_CO_602AA04)) { actor->state = 3; } - if (actor->unk_0B6 == (Animation_GetFrameCount(&D_CO_602AA04) - actor->iwork[2])) { + if (actor->unk_0B6 == (Animation_GetFrameCount(D_CO_602AA04) - actor->iwork[2])) { actor->iwork[1] = 1; obj80->state = 1; sp54.x = 0.0f; @@ -1286,7 +1286,7 @@ void Corneria_8018B15C(Actor* actor) { obj80->vel.y = 0.0f; } - Math_SmoothStepToVec3fArray(sp60, actor->vwork, 0, Animation_GetFrameData(&D_CO_602AA04, actor->unk_0B6, sp60), + Math_SmoothStepToVec3fArray(sp60, actor->vwork, 0, Animation_GetFrameData(D_CO_602AA04, actor->unk_0B6, sp60), 1.0f, 1.0f, 1.0f); } @@ -1315,7 +1315,7 @@ void Corneria_8018B418(Actor* actor) { actor->fwork[1] += 5.0f; Texture_Scroll(D_CO_60329C0, 16, 16, 1); actor->unk_0B6++; - if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602A520)) { + if (actor->unk_0B6 >= Animation_GetFrameCount(D_CO_602A520)) { actor->unk_0B6 = 0; } break; @@ -1330,7 +1330,7 @@ void Corneria_8018B418(Actor* actor) { temp_v0_2->vel.y = 0.0f; } - Math_SmoothStepToVec3fArray(sp54, actor->vwork, 0, Animation_GetFrameData(&D_CO_602A520, actor->unk_0B6, sp54), + Math_SmoothStepToVec3fArray(sp54, actor->vwork, 0, Animation_GetFrameData(D_CO_602A520, actor->unk_0B6, sp54), 1.0f, 1.0f, 1.0f); } @@ -2011,8 +2011,8 @@ void Corneria_8018C19C(Boss* boss) { } break; } - temp_a0 = SEGMENTED_TO_VIRTUAL(D_CO_603E748); - temp_a1 = SEGMENTED_TO_VIRTUAL(D_CO_603E7C4); + temp_a0 = (float*) LOAD_ASSET(D_CO_603E748); + temp_a1 = (float*) LOAD_ASSET(D_CO_603E7C4); temp_a0[9] = -100000.0f; temp_a0[3] = 172.0f; temp_a1[9] = -100000.0f; @@ -2338,7 +2338,7 @@ bool Corneria_8018EC54(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* void Corneria_8018ECAC(Boss* boss) { - Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); + Animation_GetFrameData(D_CO_602D400, 0, boss->vwork); Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018EC54, NULL, &boss->index, &gIdentityMatrix); } @@ -2356,7 +2356,7 @@ void Corneria_8018ED78(Boss* boss) { Matrix_Translate(gGfxMatrix, -D_i1_80199A78.x, -D_i1_80199A78.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); + Animation_GetFrameData(D_CO_602D400, 0, boss->vwork); Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018ED1C, NULL, &boss->index, &gIdentityMatrix); } @@ -2374,7 +2374,7 @@ void Corneria_8018EE84(Boss* boss) { Matrix_Translate(gGfxMatrix, -D_i1_80199A90.x, -D_i1_80199A90.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); + Animation_GetFrameData(D_CO_602D400, 0, boss->vwork); Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018EE2C, NULL, &boss->index, &gIdentityMatrix); } @@ -2392,7 +2392,7 @@ void Corneria_8018EF90(Boss* boss) { Matrix_Translate(gGfxMatrix, -D_i1_80199AA8.x, -D_i1_80199AA8.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); + Animation_GetFrameData(D_CO_602D400, 0, boss->vwork); Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018EF38, NULL, &boss->index, &gIdentityMatrix); } @@ -2409,7 +2409,7 @@ void Corneria_8018F044(Object_80* obj80) { obj80->vel.y += 2.0f; if (obj80->unk_44 >= 3) { obj80->state = 1; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_CO_603E924); + obj80->info.hitbox = (float*) LOAD_ASSET(&D_CO_603E924); AUDIO_PLAY_SFX(0x1900000D, obj80->sfxSource, 0); return; } @@ -2448,7 +2448,7 @@ bool Corneria_8018F1C8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* void Corneria_8018F31C(Object_80* obj80) { Vec3f sp28[10]; - Animation_GetFrameData(&D_CO_602AA7C, 0, sp28); + Animation_GetFrameData(D_CO_602AA7C, 0, sp28); Animation_DrawSkeleton(3, D_CO_602AB48, sp28, Corneria_8018F1C8, NULL, obj80, gCalcMatrix); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } diff --git a/src/overlays/ovl_i1/fox_tr360.c b/src/overlays/ovl_i1/fox_tr360.c index 3c1d7b0d..a0736540 100644 --- a/src/overlays/ovl_i1/fox_tr360.c +++ b/src/overlays/ovl_i1/fox_tr360.c @@ -11,7 +11,7 @@ void Training_80198C50(void) { Object_58* obj58; s32 i; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_TR_6008EF8); + D_ctx_80178310 = LOAD_ASSET(D_TR_6008EF8); Rand_SetSeed(1, 29000, 9876); obj58 = gObjects58; diff --git a/src/overlays/ovl_i2/fox_sx.c b/src/overlays/ovl_i2/fox_sx.c index 9f2f680c..7e998ae1 100644 --- a/src/overlays/ovl_i2/fox_sx.c +++ b/src/overlays/ovl_i2/fox_sx.c @@ -196,7 +196,7 @@ void SectorX_8018FA04(f32 x, f32 y, f32 z) { actor->obj.pos.y = y; actor->obj.pos.z = z; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_60328CC); + actor->info.hitbox = (f32*)LOAD_ASSET(D_SX_60328CC); xRot = Math_Atan2F(gPlayer[0].pos.x - x, gPlayer[0].unk_138 - z); pad = sqrtf(SQ(gPlayer[0].pos.x - x) + SQ(gPlayer[0].unk_138 - z)); yRot = -Math_Atan2F(gPlayer[0].pos.y - y, pad); @@ -255,7 +255,7 @@ void SectorX_8018FE38(Boss* boss) { Vec3f sp20; if (boss->state == 0) { - Animation_GetFrameData(&D_SX_60206DC, boss->unk_04C, boss->vwork); + Animation_GetFrameData(D_SX_60206DC, boss->unk_04C, boss->vwork); Math_Vec3fFromAngles(&sp20, boss->obj.rot.x, boss->obj.rot.y, 20.0f); boss->vel.x = sp20.x; boss->vel.y = sp20.y; @@ -426,7 +426,7 @@ void SectorX_80190078(Boss* boss) { boss->swork[7] = 1; Audio_KillSfxBySourceAndId(D_i2_80195D88, 0x31032061); Audio_KillSfxBySourceAndId(D_i2_80195D98, 0x31032061); - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_603265C); + boss->info.hitbox = (f32*) LOAD_ASSET(D_SX_603265C); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); boss->timer_052 = 40; @@ -500,7 +500,7 @@ void SectorX_80190078(Boss* boss) { boss->swork[7] = 1; boss->obj.pos.x = gPlayer[0].unk_0AC; boss->swork[0] = 0; - Animation_GetFrameData(&D_SX_60206DC, boss->unk_04C, boss->vwork); + Animation_GetFrameData(D_SX_60206DC, boss->unk_04C, boss->vwork); boss->fwork[1] = -2000.0f; boss->fwork[14] = 300.0f; boss->fwork[17] = -300.0f; @@ -510,7 +510,7 @@ void SectorX_80190078(Boss* boss) { boss->timer_050 = 450; boss->swork[3] = 400; boss->health = 300; - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032550); + boss->info.hitbox = (f32*) LOAD_ASSET(D_SX_6032550); gBossActive = 1; AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]); boss->swork[6] = 1; @@ -552,13 +552,13 @@ void SectorX_80190078(Boss* boss) { case 100: boss->fwork[1] = -2000.0f; - frameData = Animation_GetFrameData(&D_SX_60206DC, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_60206DC, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60206DC)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_60206DC)) { boss->unk_04C = 0; boss->state = 1; boss->fwork[0] = 0.0f; @@ -577,13 +577,13 @@ void SectorX_80190078(Boss* boss) { boss->fwork[44] = 5.0f; boss->fwork[43] = 5.0f; - frameData = Animation_GetFrameData(&D_SX_6016E28, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_6016E28, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_6016E28)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_6016E28)) { boss->unk_04C = 0; boss->state = 2; boss->fwork[0] = 0.0f; @@ -613,13 +613,13 @@ void SectorX_80190078(Boss* boss) { boss->fwork[42] = 0.0f; } - frameData = Animation_GetFrameData(&D_SX_60123BC, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_60123BC, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60123BC)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_60123BC)) { boss->unk_04C = 0; boss->state = 3; boss->fwork[42] = boss->fwork[43] = boss->fwork[44] = boss->fwork[0] = 0.0f; @@ -649,13 +649,13 @@ void SectorX_80190078(Boss* boss) { boss->fwork[42] = 0.0f; } - frameData = Animation_GetFrameData(&D_SX_6013798, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_6013798, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_6013798)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_6013798)) { boss->unk_04C = 0; boss->fwork[0] = 0.0f; if (boss->swork[3] <= 250) { @@ -683,7 +683,7 @@ void SectorX_80190078(Boss* boss) { Math_SmoothStepToF(&boss->fwork[43], 10.0f, 1.0f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[42], 50.0f, 1.0f, 3.0f, 0); - frameData = Animation_GetFrameData(&D_SX_6016E28, 0, sp80); + frameData = Animation_GetFrameData(D_SX_6016E28, 0, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); @@ -810,13 +810,13 @@ void SectorX_80190078(Boss* boss) { boss->fwork[2] = -400.0f; boss->fwork[42] = 30.0f; - frameData = Animation_GetFrameData(&D_SX_601C690, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_601C690, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_601C690)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_601C690)) { boss->state = 75; boss->fwork[0] = 0.0f; boss->unk_04C = 0; @@ -828,7 +828,7 @@ void SectorX_80190078(Boss* boss) { boss->fwork[41] = 20.0f; boss->fwork[2] = -400.0f; - frameData = Animation_GetFrameData(&D_SX_600A2D4, 0, sp80); + frameData = Animation_GetFrameData(D_SX_600A2D4, 0, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 2.5f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 0.1f, 1.0f, 0.005f, 0); @@ -856,13 +856,13 @@ void SectorX_80190078(Boss* boss) { boss->fwork[43] = 5.0f; boss->fwork[42] = 30.0f; - frameData = Animation_GetFrameData(&D_SX_600F890, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_600F890, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.02f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_600F890)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_600F890)) { boss->unk_04C = 0; boss->fwork[0] = 0.0f; boss->state = 9; @@ -876,15 +876,15 @@ void SectorX_80190078(Boss* boss) { boss->fwork[2] = gPlayer[0].pos.y; boss->fwork[3] = gPlayer[0].pos.x; - frameData = Animation_GetFrameData(&D_SX_60123BC, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_60123BC, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 50.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.01f, 0); if (boss->timer_050 == 0) { boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60123BC)) { - boss->unk_04C = Animation_GetFrameCount(&D_SX_60123BC) - 1; + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_60123BC)) { + boss->unk_04C = Animation_GetFrameCount(D_SX_60123BC) - 1; if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0) { boss->unk_04C = 0; boss->state = 10; @@ -908,13 +908,13 @@ void SectorX_80190078(Boss* boss) { boss->fwork[2] = gPlayer[0].pos.y; boss->fwork[3] = gPlayer[0].pos.x; - frameData = Animation_GetFrameData(&D_SX_601AA28, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_601AA28, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 50.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.01f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_601AA28)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_601AA28)) { boss->unk_04C = 0; boss->state = 10; boss->fwork[0] = 0.0f; @@ -937,7 +937,7 @@ void SectorX_80190078(Boss* boss) { boss->fwork[1] = -1000.0f; Math_SmoothStepToF(&boss->fwork[42], 50.0f, 1.0f, 3.0f, 0); - frameData = Animation_GetFrameData(&D_SX_60158C4, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_60158C4, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); @@ -947,7 +947,7 @@ void SectorX_80190078(Boss* boss) { AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); } - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60158C4)) { + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_60158C4)) { boss->unk_04C = 0; boss->fwork[0] = 0.0f; @@ -1000,7 +1000,7 @@ void SectorX_80190078(Boss* boss) { Math_SmoothStepToF(&boss->fwork[44], 20.0f, 1.0f, 0.5f, 0); Math_SmoothStepToF(&boss->fwork[43], 20.0f, 1.0f, 0.5f, 0); - frameData = Animation_GetFrameData(&D_SX_6009FF8, 0, sp80); + frameData = Animation_GetFrameData(D_SX_6009FF8, 0, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 5.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 0.1f, 1.0f, 0.001f, 0); @@ -1028,14 +1028,14 @@ void SectorX_80190078(Boss* boss) { boss->fwork[41] = 340.0f; boss->fwork[2] = -400.0f; - frameData = Animation_GetFrameData(&D_SX_601C690, boss->unk_04C, sp80); + frameData = Animation_GetFrameData(D_SX_601C690, boss->unk_04C, sp80); Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0); boss->unk_04C++; - if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_601C690)) { - boss->unk_04C = Animation_GetFrameCount(&D_SX_601C690); + if (boss->unk_04C >= Animation_GetFrameCount(D_SX_601C690)) { + boss->unk_04C = Animation_GetFrameCount(D_SX_601C690); } if (!(boss->timer_050 & 3)) { @@ -1104,7 +1104,7 @@ void SectorX_80190078(Boss* boss) { } if (boss->state != 35) { - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032550); + boss->info.hitbox = (f32*) LOAD_ASSET(D_SX_6032550); boss->info.hitbox[43] = -211.0f + boss->fwork[16]; boss->info.hitbox[45] = -35.0f + boss->fwork[15]; boss->info.hitbox[47] = 442.0f + boss->fwork[14]; @@ -1134,7 +1134,7 @@ void SectorX_80190078(Boss* boss) { boss->info.hitbox[66] = 70.0f; } } else { - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032768); + boss->info.hitbox = (f32*) LOAD_ASSET(D_SX_6032768); } if (boss->swork[0] == 1) { diff --git a/src/overlays/ovl_i3/fox_a6.c b/src/overlays/ovl_i3/fox_a6.c index d1976d8b..c886237e 100644 --- a/src/overlays/ovl_i3/fox_a6.c +++ b/src/overlays/ovl_i3/fox_a6.c @@ -892,7 +892,7 @@ void Area6_80187944(Boss* bossA6) { bossA6->fwork[A6_FWK_1] = 90.0f; bossA6->fwork[A6_FWK_2] = 2.0f; AUDIO_PLAY_SFX(0x31404066, bossA6->sfxSource, 4); - bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578); + bossA6->info.hitbox = LOAD_ASSET(D_A6_6028578); D_i3_801C2250[A6_BSS_7] = 0; } } @@ -931,7 +931,7 @@ void Area6_80187944(Boss* bossA6) { D_i3_801C2250[A6_BSS_28] = 0; bossA6->state = 4; bossA6->fwork[A6_FWK_2] = 1.0f; - bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028454); + bossA6->info.hitbox = LOAD_ASSET(D_A6_6028454); D_i3_801C2250[A6_BSS_6] = 1; Audio_KillSfxBySource(bossA6->sfxSource); AUDIO_PLAY_SFX(0x31404067, bossA6->sfxSource, 4); @@ -982,7 +982,7 @@ void Area6_80187944(Boss* bossA6) { bossA6->fwork[A6_FWK_8] = bossA6->fwork[A6_FWK_9] = 0; bossA6->fwork[A6_FWK_2] = 2.0f; AUDIO_PLAY_SFX(0x31404066, bossA6->sfxSource, 4); - bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578); + bossA6->info.hitbox = LOAD_ASSET(D_A6_6028578); D_i3_801C2250[A6_BSS_7] = bossA6->swork[A6_SWK_37] = 0; bossA6->state = 3; if (D_i3_801C2250[A6_BSS_6] == 0) { diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c index a590f5ce..693cb1bf 100644 --- a/src/overlays/ovl_i3/fox_aq.c +++ b/src/overlays/ovl_i3/fox_aq.c @@ -306,8 +306,8 @@ void Aquas_801A8E30(void) { f32 spA8[17]; f32 sp64[17]; s32 j; - Vtx* sp5C = SEGMENTED_TO_VIRTUAL(D_AQ_6031D90); - Vtx* sp58 = SEGMENTED_TO_VIRTUAL(D_AQ_6011A78); + Vtx* sp5C = LOAD_ASSET(D_AQ_6031D90); + Vtx* sp58 = LOAD_ASSET(D_AQ_6011A78); for (i = 0; i < 17; i++) { if ((i == 0) || (i == 16)) { @@ -1841,11 +1841,11 @@ void Aquas_801AEB44(Actor* actor) { actor->iwork[1]++; actor->iwork[1] %= 8; } - temp_v1_2 = SEGMENTED_TO_VIRTUAL(D_AQ_6019078); + temp_v1_2 = LOAD_ASSET(D_AQ_6019078); if (actor->iwork[1] < 4) { - var_t5 = SEGMENTED_TO_VIRTUAL(D_AQ_6018C78); + var_t5 = LOAD_ASSET(D_AQ_6018C78); } else { - var_t5 = SEGMENTED_TO_VIRTUAL(D_AQ_6018878); + var_t5 = LOAD_ASSET(D_AQ_6018878); } var_t1 = actor->iwork[1] % 4; if (var_t1 >= 3) { @@ -4608,7 +4608,7 @@ void Aquas_801B91A4(Actor* actor) { actor->unk_0B6 = 19; actor->fwork[1] = actor->obj.pos.z; if (actor->obj.rot.z >= 4.0f) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_60314AC); + actor->info.hitbox = LOAD_ASSET(D_AQ_60314AC); actor->health = 200; actor->info.bonus = 1; actor->state = 2; @@ -4878,7 +4878,7 @@ void Aquas_801BA57C(Actor* actor) { actor->info.bonus = 0; actor->scale = 0.5f; actor->gravity = 0.1f; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_603151C); + actor->info.hitbox = LOAD_ASSET(D_AQ_603151C); actor->fwork[2] = RAND_FLOAT_CENTERED((actor->index & 3) + 1.0f); } actor->fwork[1] = RAND_FLOAT(50.0f); @@ -5605,10 +5605,10 @@ void Aquas_801BC9A0(Actor* actor) { var_s0->vel.z = sp98.z; var_s0->gravity = 0.4f; var_s0->state = 5; - var_s0->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_6030D3C); + var_s0->info.hitbox = LOAD_ASSET(D_AQ_6030D3C); } else { var_s0->state = 2; - var_s0->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_6030D58); + var_s0->info.hitbox = LOAD_ASSET(D_AQ_6030D58); } break; } @@ -6036,7 +6036,7 @@ void Aquas_801BE3F8(Actor* actor) { break; case 1: if (fabsf(gPlayer[0].pos.z - actor->obj.pos.z) <= 3000.0f) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_60314E4); + actor->info.hitbox = LOAD_ASSET(D_AQ_60314E4); actor->info.damage = 0; actor->info.bonus = 1; actor->timer_0BC = 40.0f + RAND_FLOAT(30.0f); @@ -6098,7 +6098,7 @@ void Aquas_801BE3F8(Actor* actor) { } } if (actor->state == 1) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_60314E4); + actor->info.hitbox = LOAD_ASSET(D_AQ_60314E4); actor->info.damage = 0; actor->info.bonus = 1; actor->state = 2; diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index f1f1ba0b..559a115a 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -1227,7 +1227,7 @@ void Solar_801A1F80(Boss* bossSO) { D_ctx_801779A8[gMainController] = 10.0f; gCameraShake = 120; bossSO->fwork[SO_FWK_3] = 2400.0f; - bossSO->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SO_60231A4); + bossSO->info.hitbox = LOAD_ASSET(D_SO_60231A4); bossSO->unk_04C = 0; bossSO->swork[SO_SWK_1] = 0; bossSO->info.hitbox[8] = bossSO->info.hitbox[12] = bossSO->info.hitbox[14] = bossSO->info.hitbox[18] = @@ -1802,7 +1802,7 @@ void Solar_801A3C4C(Boss* bossSO) { bossSO->state = 0; bossSO->swork[SO_SWK_1] = 1; bossSO->fwork[SO_FWK_0] = 0.01f; - bossSO->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); + bossSO->info.hitbox = LOAD_ASSET(D_edata_800CBF34); bossSO->timer_058 = 20000; D_ctx_8017796C = -1; D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index 9a19383f..6a877f3c 100644 --- a/src/overlays/ovl_i3/fox_zo.c +++ b/src/overlays/ovl_i3/fox_zo.c @@ -793,7 +793,7 @@ typedef struct { } JntHitbox; void Zoness_80190D0C(Actor* actor) { - Hitbox* var_s2 = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(D_ZO_602BC58))->boxes); + Hitbox* var_s2 = (((JntHitbox*) LOAD_ASSET(D_ZO_602BC58))->boxes); s32 i; s32 k; PosRot* temp_s0; @@ -4408,7 +4408,7 @@ void Zoness_Actor247_Init(Actor* actor) { actor->unk_046 = i + 1; Object_SetInfo(&gActors[i].info, gActors[i].obj.id); - gActors[i].info.hitbox = SEGMENTED_TO_VIRTUAL(D_ZO_602C028); + gActors[i].info.hitbox = LOAD_ASSET(D_ZO_602C028); break; } } diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c index c4211d01..488d36e1 100644 --- a/src/overlays/ovl_i4/fox_bo.c +++ b/src/overlays/ovl_i4/fox_bo.c @@ -724,7 +724,7 @@ bool Bolse_8018D584(Actor* actor) { } func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 10.0f, 5); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_BO_6011BA4); + actor->info.hitbox = LOAD_ASSET(D_BO_6011BA4); Audio_KillSfxBySourceAndId(actor->sfxSource, 0x11000028U); AUDIO_PLAY_SFX(0x2903B009U, actor->sfxSource, 0U); } else { @@ -777,8 +777,8 @@ s32 Bolse_8018D9CC(void) { f32 spA8[17]; f32 sp64[17]; s32 j; - Vtx* sp5C = SEGMENTED_TO_VIRTUAL(D_BO_6011E28); - Vtx* sp58 = SEGMENTED_TO_VIRTUAL(D_BO_600C0B8); + Vtx* sp5C = LOAD_ASSET(D_BO_6011E28); + Vtx* sp58 = LOAD_ASSET(D_BO_600C0B8); for (i = 0; i < 17; i++) { if ((i == 0) || (i == 16)) { @@ -2108,7 +2108,7 @@ void Bolse_80191ED8(void) { Boss* boss; Object_58* obj58; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = gObjects58, i = 0; i < 1000; i++) { if (D_ctx_80178310[i].id < 0) { diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c index 69ed460f..369dd562 100644 --- a/src/overlays/ovl_i4/fox_fo.c +++ b/src/overlays/ovl_i4/fox_fo.c @@ -492,7 +492,7 @@ void Fortuna_80188AD0(Actor* actor) { if ((actor->unk_0D0 != 0) && (actor->state == 0)) { actor->unk_0D0 = 0; actor->state = 1; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_FO_600FF64); + actor->info.hitbox = LOAD_ASSET(D_FO_600FF64); actor->info.unk_1C = 0.0f; actor->timer_0CA[0] = 0; actor->info.bonus = 0; @@ -1440,7 +1440,7 @@ void Fortuna_8018BA2C(void) { Object_58* obj58; Boss* boss = &gBosses[0]; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = &gObjects58[0], i = 0; i < 1000; i++) { if (D_ctx_80178310[i].id < 0) { diff --git a/src/overlays/ovl_i4/fox_sz.c b/src/overlays/ovl_i4/fox_sz.c index c588e9b3..699ba564 100644 --- a/src/overlays/ovl_i4/fox_sz.c +++ b/src/overlays/ovl_i4/fox_sz.c @@ -195,7 +195,7 @@ void SectorZ_80199FCC(Actor* actor, s32 arg1) { actor->health = 250; actor->info.drawType = 2; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SZ_6009230); + actor->info.hitbox = LOAD_ASSET(D_SZ_6009230); actor->fwork[1] = 25.0f; actor->fwork[29] = 2.0f; @@ -768,7 +768,7 @@ void SectorZ_8019B888(void) { actor->health = 255; actor->iwork[11] = 1; AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CC01C); + actor->info.hitbox = LOAD_ASSET(D_edata_800CC01C); actor->info.unk_16 = 0; actor->info.unk_1C = 0.0f; } @@ -1794,7 +1794,7 @@ void SectorZ_8019EA68(void) { Object_58* obj58; Boss* boss = &gBosses[0]; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]); Rand_SetSeed(1, 29000, 9876); diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 825d5091..714c13da 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -273,8 +273,8 @@ void Macbeth_80199A40(u8* arg0, u8* arg1, f32 arg2) { Vec3f sp74; Matrix_Push(&gCalcMatrix); - arg0 = SEGMENTED_TO_VIRTUAL(arg0); - arg1 = SEGMENTED_TO_VIRTUAL(arg1); + arg0 = LOAD_ASSET(arg0); + arg1 = LOAD_ASSET(arg1); Matrix_RotateZ(gCalcMatrix, M_DTOR * arg2, 0); sp74.z = 0.0f; for (i = 0, var_fs4 = 0.0f; i < 32; i++, var_fs4++) { @@ -299,7 +299,7 @@ void Macbeth_80199C20(u8* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { u8 a; u8 b; - temp_v1 = SEGMENTED_TO_VIRTUAL(arg0); + temp_v1 = LOAD_ASSET(arg0); for (i = arg3; i < arg3 + arg4; i++) { b = temp_v1[i]; @@ -320,7 +320,7 @@ void Macbeth_80199D88(u16* arg0, s32 arg1, s32 arg2) { s32 i; s32 j; - temp_t1 = SEGMENTED_TO_VIRTUAL(arg0); + temp_t1 = LOAD_ASSET(arg0); for (i = 0; i < arg1; i++) { a = temp_t1[(arg2 - 1) * arg1 + i]; @@ -1000,7 +1000,7 @@ void Macbeth_8019D048(Actor* actor) { actor->obj.pos.y + actor->fwork[8] + 290.0f, actor->obj.pos.z + 175.0f, actor->iwork[4] * 35.0f, actor->vel.z, actor->iwork[4] * -35.0f, 0.0f, 14, 5); actor->iwork[3]++; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035DD0); + actor->info.hitbox = LOAD_ASSET(D_MA_6035DD0); } break; case 2: @@ -1187,27 +1187,27 @@ void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 actor->iwork[22] |= (var_v0); switch (actor->iwork[22]) { case 1: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035E68); + actor->info.hitbox = LOAD_ASSET(D_MA_6035E68); break; case 2: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035ECC); + actor->info.hitbox = LOAD_ASSET(D_MA_6035ECC); break; case 3: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035F30); + actor->info.hitbox = LOAD_ASSET(D_MA_6035F30); break; case 4: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035F94); + actor->info.hitbox = LOAD_ASSET(D_MA_6035F94); break; case 5: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035FF8); + actor->info.hitbox = LOAD_ASSET(D_MA_6035FF8); break; case 6: - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603605C); + actor->info.hitbox = LOAD_ASSET(D_MA_603605C); break; case 7: actor->state = 1; actor->timer_0BC = 60; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); + actor->info.hitbox = LOAD_ASSET(D_MA_60359AC); break; } (*arg1)++; @@ -1323,7 +1323,7 @@ void Macbeth_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 case 3: Macbeth_8019A8C8(actor, 1); *arg6 = 2; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); + actor->info.hitbox = LOAD_ASSET(D_MA_60359AC); (*arg1)++; actor->state = 1; break; @@ -1401,7 +1401,7 @@ void Macbeth_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 case 1: Macbeth_8019AF34(actor); *arg6 = 2; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); + actor->info.hitbox = LOAD_ASSET(D_MA_60359AC); (*arg1)++; return; case 2: @@ -1657,7 +1657,7 @@ void Macbeth_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3 0.0f, 0.0f, 0.0f, 20.0f, 20); } *arg7 = 2; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); + actor->info.hitbox = LOAD_ASSET(D_MA_60359AC); (*arg1)++; actor->state = 1; break; @@ -2771,7 +2771,7 @@ void Macbeth_801A3E98(Actor* actor) { Math_SmoothStepToF(&actor->fwork[1], -181.0f, 0.6f, 20.0f, 0.0f); if (actor->fwork[1] <= -180.0f) { AUDIO_PLAY_SFX(0x19033008, actor->sfxSource, 0); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603648C); + actor->info.hitbox = LOAD_ASSET(D_MA_603648C); actor->iwork[0] = 2; actor->state = 2; } @@ -2983,7 +2983,7 @@ void Macbeth_801A4B24(Actor* actor) { break; case 1: if ((gPlayer[0].unk_138 - actor->obj.pos.z) < 2000.0f) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036520); + actor->info.hitbox = LOAD_ASSET(D_MA_6036520); actor->state = 2; } break; @@ -3013,7 +3013,7 @@ void Macbeth_801A4B24(Actor* actor) { actor->unk_0D0 = 0; D_MA_801BE2F0[5] = 1; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]); for (i = D_ctx_80177DC8 - 5, objInit = &D_ctx_80178310[i]; i < D_ctx_80177DC8 + 50; i++, objInit++) { Object_Load(objInit, 40000.0f, -2000.0f, 40000.0f, -2000.0f); @@ -3754,7 +3754,7 @@ void Macbeth_801A7D98(Actor* actor) { D_i5_801BE320[29] = 250; D_i5_801BE320[9] = 200; D_i5_801BE320[10] = 250; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); + actor->info.hitbox = LOAD_ASSET(D_edata_800CBF34); D_i5_801BE320[14] = 0; D_i5_801BE320[15] = 0; gBossFrameCount = 0; @@ -3817,7 +3817,7 @@ void Macbeth_801A7E7C(Actor* actor) { D_i5_801BE320[7] = 1; if ((actor->fwork[5] + 500.0f) <= actor->obj.pos.y) { Radio_PlayMessage(gMsg_ID_17430, RCID_BOSS_MACBETH); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); + actor->info.hitbox = LOAD_ASSET(D_MA_603677C); actor->state = 3; } } @@ -3964,13 +3964,13 @@ void Macbeth_801A7E7C(Actor* actor) { if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_601D188) - 1)) { D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1); if ((D_i5_801BE320[3] == 26) && (D_i5_801BE320[10] > 0)) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036818); + actor->info.hitbox = LOAD_ASSET(D_MA_6036818); AUDIO_PLAY_SFX(0x2902405E, actor->sfxSource, 4); } } else { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); + actor->info.hitbox = LOAD_ASSET(D_edata_800CBF34); if ((gPlayer[0].pos.y + 1200.0f) < actor->obj.pos.y) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); + actor->info.hitbox = LOAD_ASSET(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4169,7 +4169,7 @@ void Macbeth_801A7E7C(Actor* actor) { D_i5_801BE368[0] * 0.8f, -10.0f, 8.0f); D_i5_801BE320[11]++; if (D_i5_801BE320[11] >= var_s0) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); + actor->info.hitbox = LOAD_ASSET(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4291,7 +4291,7 @@ void Macbeth_801A7E7C(Actor* actor) { D_i5_801BE320[8] = 1; if (actor->timer_0BC == 0) { actor->vel.y = 0.0f; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); + actor->info.hitbox = LOAD_ASSET(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4431,7 +4431,7 @@ void Macbeth_801A7E7C(Actor* actor) { } if (actor->timer_0BC == 0) { Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19006035); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); + actor->info.hitbox = LOAD_ASSET(D_MA_603677C); D_i5_801BE320[3] = 0; D_i5_801BE320[2] = 1; D_i5_801BE320[31] = 30; @@ -4849,7 +4849,7 @@ void Macbeth_801AC438(Actor* actor) { if (actor->iwork[1] != 0) { Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH); AUDIO_PLAY_SFX(0x19034066, actor->sfxSource, 4); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035A94); + actor->info.hitbox = LOAD_ASSET(D_MA_6035A94); actor->state += 1; } Macbeth_8019A830(actor); @@ -4913,13 +4913,13 @@ void Macbeth_801AC754(Player* player) { switch (player->unk_1D0) { case 0: - var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035678); + var_s0 = D_ctx_80178310 = LOAD_ASSET(D_MA_6035678); for (i = 0; var_s0->id != OBJ_INVALID; i++, var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } - var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + var_s0 = D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]); for (i = 0; i < 40; i++, var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); @@ -5056,7 +5056,7 @@ void Macbeth_801ACF6C(void) { void Macbeth_801ACFBC(void) { ObjectInit* var_s0; - for (var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_60357CC); var_s0->id != OBJ_INVALID; var_s0++) { + for (var_s0 = D_ctx_80178310 = LOAD_ASSET(D_MA_60357CC); var_s0->id != OBJ_INVALID; var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } } @@ -5064,7 +5064,7 @@ void Macbeth_801ACFBC(void) { void Macbeth_801AD080(void) { ObjectInit* var_s0; - for (var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035920); var_s0->id != OBJ_INVALID; var_s0++) { + for (var_s0 = D_ctx_80178310 = LOAD_ASSET(D_MA_6035920); var_s0->id != OBJ_INVALID; var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } } @@ -6384,7 +6384,7 @@ void Macbeth_801AF8F4(Player* player) { break; case 1960: Macbeth_801AF27C(&gActors[3], 3); - gActors[3].info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); + gActors[3].info.hitbox = LOAD_ASSET(D_edata_800CBF34); break; case 2017: D_ctx_80177830 = 0; diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c index 350a3ce5..7117b57f 100644 --- a/src/overlays/ovl_i5/fox_ti.c +++ b/src/overlays/ovl_i5/fox_ti.c @@ -337,7 +337,7 @@ void Titania_80189B80(Actor* actor) { Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp2C, &actor->obj.pos.y, &sp2C); actor->health = 10; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_60068F0); + actor->info.hitbox = LOAD_ASSET(D_TI_60068F0); Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); @@ -368,7 +368,7 @@ void Titania_80189CC8(Actor* actor) { actor->info.unk_1C = 0.0f; func_enmy_80066254(actor); actor->info.bonus = 0; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006924); + actor->info.hitbox = LOAD_ASSET(D_TI_6006924); func_effect_8007D0E0(actor->fwork[0], actor->fwork[1], actor->fwork[2], 2.0f); } } @@ -463,7 +463,7 @@ void Titania_8018A2E8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 actor->obj.pos.z = zPos; actor->scale = RAND_FLOAT(0.2f) + 0.3f; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_i5_801B7568); + actor->info.hitbox = LOAD_ASSET(D_i5_801B7568); } void Titania_8018A3F4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { @@ -760,7 +760,7 @@ void Titania_8018B1B4(s32 limbIndex, Vec3f* rot, void* data) { s32 i; PosRot* var_a2; - var_a2 = SEGMENTED_TO_VIRTUAL(D_i5_801BDA30); + var_a2 = LOAD_ASSET(D_i5_801BDA30); for (i = 0; i < 10; i++, var_a2++) { if (limbIndex == D_i5_801B75D0[i]) { @@ -887,7 +887,7 @@ void Titania_8018B720(Actor* actor) { Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); - var_s1 = SEGMENTED_TO_VIRTUAL(D_i5_801BDA30); + var_s1 = LOAD_ASSET(D_i5_801BDA30); for (i = 0; i < 10; i++, var_s1++) { actorPtr = func_game_800A3608(OBJ_ACTOR_189); @@ -2138,13 +2138,13 @@ void Titania_8018F4D8(Object_80* obj80) { if (obj80->unk_44 != 0) { if (obj80->obj.rot.z == 0.0f) { obj80->obj.pos.x = obj80->vel.z; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006BF0); + obj80->info.hitbox = LOAD_ASSET(D_TI_6006BF0); } else if (obj80->obj.rot.z > 0.0f) { obj80->obj.pos.x = obj80->vel.z - 75.0f; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006C28); + obj80->info.hitbox = LOAD_ASSET(D_TI_6006C28); } else { obj80->obj.pos.x = obj80->vel.z + 75.0f; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006C0C); + obj80->info.hitbox = LOAD_ASSET(D_TI_6006C0C); } } } @@ -2233,7 +2233,7 @@ void Titania_Boss306_Init(Boss* boss) { *sp1C = 0.0f; } - D_i5_801BBEF8 = SEGMENTED_TO_VIRTUAL(D_TI_8000FC0); + D_i5_801BBEF8 = LOAD_ASSET(D_TI_8000FC0); } bool Titania_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c index 3291131b..9d9de115 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -51,7 +51,7 @@ void Andross_80187530(Actor* actor) { } index = actor->unk_0B6 / 18.0f; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_i6_801A6760[index]); + actor->info.hitbox = LOAD_ASSET(D_i6_801A6760[index]); actor->obj.rot.z = D_Andross_801A7F68; } @@ -76,8 +76,8 @@ void Andross_801876FC(void) { s32 i; s32 j; - var_s0 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C039290); - var_s3 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C03A290); + var_s0 = LOAD_ASSET(&D_ANDROSS_C039290); + var_s3 = LOAD_ASSET(&D_ANDROSS_C03A290); for (i = 0; i < 32 * 32; i += 32) { temp_ft3 = 4.0f * __sinf((s32) (((i / 32) + (gGameFrameCount / 2)) % 32U) * (2 * M_PI / 32)); @@ -94,7 +94,7 @@ void Andross_801878A8() { Object_58* obj58; s32 i; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C0356CC); + D_ctx_80178310 = LOAD_ASSET(&D_ANDROSS_C0356CC); for (obj58 = gObjects58, i = 0; i < 1000; i++) { if (D_ctx_80178310[i].id < 0) { @@ -112,7 +112,7 @@ void Andross_801878A8() { obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); if (obj58->obj.id == OBJ_80_131) { - obj58->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038CCC); + obj58->info.hitbox = LOAD_ASSET(&D_ANDROSS_C038CCC); } obj58++; } @@ -163,14 +163,14 @@ void Andross_80187C5C(void) { switch (RAND_INT(2.9f)) { case 0: - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036310); + D_ctx_80178310 = LOAD_ASSET(&D_ANDROSS_C036310); break; case 1: - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036B6C); + D_ctx_80178310 = LOAD_ASSET(&D_ANDROSS_C036B6C); break; default: case 2: - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C03733C); + D_ctx_80178310 = LOAD_ASSET(&D_ANDROSS_C03733C); break; } @@ -193,7 +193,7 @@ void Andross_80187C5C(void) { } Object_SetInfo(&obj58->info, obj58->obj.id); if (obj58->obj.id == OBJ_80_131) { - obj58->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038CCC); + obj58->info.hitbox = LOAD_ASSET(&D_ANDROSS_C038CCC); } obj58++; } @@ -542,7 +542,7 @@ void Andross_80189098(Boss* boss) { actor->obj.pos.y = 0.0f; actor->obj.pos.z = boss->obj.pos.z; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBEA8); + actor->info.hitbox = LOAD_ASSET(&D_edata_800CBEA8); actor++; @@ -556,7 +556,7 @@ void Andross_80189098(Boss* boss) { actor->obj.pos.y = 0.0f; actor->obj.pos.z = boss->obj.pos.z; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBEA8); + actor->info.hitbox = LOAD_ASSET(&D_edata_800CBEA8); gActors[0].state = 2; } @@ -761,7 +761,7 @@ void Andross_80189B70(Boss* boss) { Andross_80188A4C(boss); Andross_80188CB8(boss); - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038F24); + boss->info.hitbox = LOAD_ASSET(&D_ANDROSS_C038F24); Math_SmoothStepToF(&D_bg_800C9C30, 255.0f, 1.0f, 4.0f, 0); Math_SmoothStepToF(&boss->unk_3F8, 10.0f, 0.2f, 0.2f, 0); if (!(gGameFrameCount & 0x10)) { @@ -833,7 +833,7 @@ void Andross_80189B70(Boss* boss) { } break; case 11: - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBF34); + boss->info.hitbox = LOAD_ASSET(&D_edata_800CBF34); if (boss->timer_050 < 120) { D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; D_ctx_80178358 = 80; @@ -882,7 +882,7 @@ void Andross_80189B70(Boss* boss) { boss->fwork[5] = gPlayer[0].unk_138; break; case 12: - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBF34); + boss->info.hitbox = LOAD_ASSET(&D_edata_800CBF34); boss->fwork[1] = 0; boss->fwork[24] = 0.2f; boss->fwork[22] = 0.0f; @@ -903,7 +903,7 @@ void Andross_80189B70(Boss* boss) { } break; case 13: - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBF34); + boss->info.hitbox = LOAD_ASSET(&D_edata_800CBF34); boss->fwork[24] = 0.0f; boss->fwork[22] = 255.0f; if (250.0f < boss->fwork[22]) { @@ -1254,8 +1254,8 @@ void Andross_8018BDD8(void) { Vtx* sp74; Vtx* sp70; - sp74 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C038FE8); - sp70 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C017598); + sp74 = LOAD_ASSET(D_ANDROSS_C038FE8); + sp70 = LOAD_ASSET(D_ANDROSS_C017598); for (i = 0; i < 17; i++) { if (i == 0 || i == 16) { @@ -3281,7 +3281,7 @@ void Andross_80193380(Object_80* obj80) { case 0: if (fabsf(obj80->obj.pos.z - gPlayer[0].unk_138) < 1800.0f) { obj80->state = 1; - obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C038AC4); + obj80->info.hitbox = LOAD_ASSET(D_ANDROSS_C038AC4); } break; case 1: @@ -3355,7 +3355,7 @@ void Andross_80193710(void) { Boss* boss; s32 i; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = gObjects58, i = 0; i < 1000; i++) { if (D_ctx_80178310[i].id < 0) { diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c index 3f188069..6a5289ec 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -59,7 +59,7 @@ void SectorY_Boss314_Init(Boss* boss) { D_ctx_80177A10[8] = 0; if (boss->index == 0) { - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_60342A0); + boss->info.hitbox = LOAD_ASSET(D_SY_60342A0); boss->health = 150; boss->swork[28] = 5; @@ -75,7 +75,7 @@ void SectorY_Boss314_Init(Boss* boss) { SectorY_8019AEC0(boss); } else { boss->fwork[34] = 2.8f; - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034304); + boss->info.hitbox = LOAD_ASSET(D_SY_6034304); boss->health = 100; boss->swork[28] = 0; boss->swork[25] = 1; @@ -414,7 +414,7 @@ void SectorY_80198F5C(Boss* boss) { boss->unk_04C = 0; boss->swork[36] = 0; boss->swork[21] = 9; - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); + boss->info.hitbox = LOAD_ASSET(D_edata_800CBF34); if (boss->index == 0) { boss->timer_058 = 20000; @@ -622,7 +622,7 @@ void SectorY_80199438(Boss* boss) { } } func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 30.0f, 4.0f); - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034304); + boss->info.hitbox = LOAD_ASSET(D_SY_6034304); AUDIO_PLAY_SFX(0x2903A06F, boss->sfxSource, 4); } } @@ -3496,20 +3496,20 @@ void SectorY_Actor204_Update(Actor* actor) { } else { Math_SmoothStepToF(&actor->fwork[27], 0.0f, 1.0f, 0.05f, 0.0f); } - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_603405C); + actor->info.hitbox = LOAD_ASSET(D_SY_603405C); if (actor->unk_046 == 1) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_603421C); + actor->info.hitbox = LOAD_ASSET(D_SY_603421C); } i = actor->iwork[17]; if (i != 0) { if (i == 1) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034124); + actor->info.hitbox = LOAD_ASSET(D_SY_6034124); } else if (i == 2) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_60341A8); + actor->info.hitbox = LOAD_ASSET(D_SY_60341A8); } } if (actor->unk_046 == 2) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_60340C0); + actor->info.hitbox = LOAD_ASSET(D_SY_60340C0); } if ((actor->unk_0D0 != 0) && (actor->unk_046 != 3)) { diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c index e5ce7c06..aae65d68 100644 --- a/src/overlays/ovl_i6/fox_ve2.c +++ b/src/overlays/ovl_i6/fox_ve2.c @@ -172,7 +172,7 @@ void Venom2_80196968(void) { Object_58* obj58; s32 i; - D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = LOAD_ASSET(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = gObjects58, i = 0; i < 1000; i++) { if (D_ctx_80178310[i].id < 0) { diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index a02579e7..e76b42e7 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -2022,14 +2022,12 @@ void Map_801A0788(void) { } void Map_801A07E8(u8* arg0, u8* arg1, f32* arg2) { - return; s32* var_v0 = D_menu_801B0004; s32 temp; s32 i; s32 j; s32 k; - arg0 = LOAD_ASSET(arg0); arg1 = LOAD_ASSET(arg1); for (i = 1; i < 48; i++, var_v0++) {