izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
KiritoDv
2024-04-06 15:34:46 -06:00
parent 5427fdb031
commit b36783ba8e
26 changed files with 252 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sf64object.h
+1 -1
View File
@@ -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;
src/audio/audio_general.c
+2
View File
@@ -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;
}
src/engine/fox_360.c
+1 -1
View File
@@ -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 {
src/engine/fox_97F80.c
+2 -2
View File
@@ -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);
src/engine/fox_A4290.c
+3 -3
View File
@@ -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]];
src/engine/fox_enmy.c
+8 -8
View File
@@ -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;
}
}
src/engine/fox_enmy2.c
+35 -35
View File
@@ -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;
src/engine/fox_play.c
+39 -39
View File
@@ -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);
}
src/engine/fox_std_lib.c
+3
View File
@@ -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) {
src/engine/fox_tank.c
+2 -2
View File
@@ -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) {
src/overlays/ovl_i1/fox_co.c
+26 -26
View File
@@ -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);
}
src/overlays/ovl_i1/fox_tr360.c
+1 -1
View File
@@ -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;
src/overlays/ovl_i2/fox_sx.c
+32 -32
View File
@@ -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) {
src/overlays/ovl_i3/fox_a6.c
+3 -3
View File
@@ -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) {
src/overlays/ovl_i3/fox_aq.c
+11 -11
View File
@@ -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;
src/overlays/ovl_i3/fox_so.c
+2 -2
View File
@@ -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;
src/overlays/ovl_i3/fox_zo.c
+2 -2
View File
@@ -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;
}
}
src/overlays/ovl_i4/fox_bo.c
+4 -4
View File
@@ -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) {
src/overlays/ovl_i4/fox_fo.c
+2 -2
View File
@@ -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) {
src/overlays/ovl_i4/fox_sz.c
+3 -3
View File
@@ -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);

Some files were not shown because too many files have changed in this diff Show More