Game-Decompilation/sf64
1
0
Fork 0
mirror of https://github.com/sonicdcer/sf64.git synced 2024-11-23 04:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correction
Some checks failed
Build / Build repo (push) Has been cancelled
Details
Check Format / Check format (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-11-21 20:36:56 -03:00
parent a0dfeff6ba
commit 8f1c001410
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/overlays/ovl_i3/fox_zo.c
View File

@ -3999,13 +3999,13 @@ void Zoness_ZoSpikeBall_Draw(ZoSpikeBall* this) {
gSPDisplayList(gMasterDisp++, D_ZO_601BCC0); gSPDisplayList(gMasterDisp++, D_ZO_601BCC0);
} }
Vec3f D_i3_801BF744[3] = { Vec3f sTankerCointainerInitPos[3] = {
{ 0.0f, 50.0f, -200.0f }, { 0.0f, 50.0f, -200.0f }, // first position seems unused
{ 0.0f, 50.0f, 200.0f }, { 0.0f, 50.0f, 200.0f },
{ 0.0f, 50.0f, 600.0f }, { 0.0f, 50.0f, 600.0f },
}; };
Vec3f D_i3_801BF768[3] = { Vec3f sSupplyCraneCointainerInitPos[3] = {
{ 0.0f, 300.0f, 0.0f }, { 0.0f, 300.0f, 0.0f }, // first position seems unused
{ 0.0f, 300.0f, -200.0f }, { 0.0f, 300.0f, -200.0f },
{ 0.0f, 300.0f, 300.0f }, { 0.0f, 300.0f, 300.0f },
}; };
@ -4018,19 +4018,23 @@ void Zoness_ZoTanker_Init(ZoTanker* actor) {
s32 temp_v1; s32 temp_v1;
s32 containerIdx; s32 containerIdx;
s32 i; s32 i;
s32 var_s6; s32 j;
Vec3f sp84; Vec3f containerOffsetPos;
Vec3f sp78; Vec3f tankerVelSrc;
Vec3f sp6C; Vec3f tankerVelDest;
actor->obj.pos.y = 120.0f; actor->obj.pos.y = 120.0f;
actor->scale = -1.0f; actor->scale = -1.0f;
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, MTXF_NEW);
sp78.x = sp78.y = 0.0f;
sp78.z = actor->obj.rot.z; tankerVelSrc.x = tankerVelSrc.y = 0.0f;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); tankerVelSrc.z = actor->obj.rot.z;
actor->vel.x = sp6C.x;
actor->vel.z = sp6C.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &tankerVelSrc, &tankerVelDest);
actor->vel.x = tankerVelDest.x;
actor->vel.z = tankerVelDest.z;
actor->obj.rot.z = 0.0f; actor->obj.rot.z = 0.0f;
containerIdx = 1; containerIdx = 1;
@ -4040,12 +4044,12 @@ void Zoness_ZoTanker_Init(ZoTanker* actor) {
actor->obj.rot.x = (s32) fabsf(Math_ModF(actor->obj.rot.x, 100.0f)); actor->obj.rot.x = (s32) fabsf(Math_ModF(actor->obj.rot.x, 100.0f));
} }
for (i = 0, var_s6 = 0; (containerIdx < 3) && (i < ARRAY_COUNT(gActors)); i++) { for (i = 0, j = 0; (containerIdx < 3) && (i < ARRAY_COUNT(gActors)); i++) {
if (gActors[i].obj.status == OBJ_FREE) { if (gActors[i].obj.status == OBJ_FREE) {
if (actor->state == 0) { if (actor->state == 0) {
Matrix_MultVec3f(gCalcMatrix, &D_i3_801BF744[containerIdx], &sp84); Matrix_MultVec3f(gCalcMatrix, &sTankerCointainerInitPos[containerIdx], &containerOffsetPos);
} else { } else {
Matrix_MultVec3f(gCalcMatrix, &D_i3_801BF768[containerIdx], &sp84); Matrix_MultVec3f(gCalcMatrix, &sSupplyCraneCointainerInitPos[containerIdx], &containerOffsetPos);
} }
Actor_Initialize(&gActors[i]); Actor_Initialize(&gActors[i]);
@ -4056,14 +4060,18 @@ void Zoness_ZoTanker_Init(ZoTanker* actor) {
} else { } else {
gActors[i].obj.id = OBJ_ACTOR_ZO_SUPPLYCRANE; gActors[i].obj.id = OBJ_ACTOR_ZO_SUPPLYCRANE;
} }
gActors[i].obj.pos.x = actor->obj.pos.x + sp84.x;
gActors[i].obj.pos.y = actor->obj.pos.y + sp84.y; gActors[i].obj.pos.x = actor->obj.pos.x + containerOffsetPos.x;
gActors[i].obj.pos.z = actor->obj.pos.z + sp84.z; gActors[i].obj.pos.y = actor->obj.pos.y + containerOffsetPos.y;
((uintptr_t*) &actor->iwork[7])[containerIdx] = (s32) (actor->obj.rot.x * 3.0f) + containerIdx; gActors[i].obj.pos.z = actor->obj.pos.z + containerOffsetPos.z;
((s32*) &actor->iwork[7])[containerIdx] = (s32) (actor->obj.rot.x * 3.0f) + containerIdx;
gActors[i].obj.rot.y = actor->obj.rot.y; gActors[i].obj.rot.y = actor->obj.rot.y;
gActors[i].iwork[0] = D_i3_801BF78C[((s32*) &actor->iwork[7])[containerIdx]]; gActors[i].iwork[0] = D_i3_801BF78C[((s32*) &actor->iwork[7])[containerIdx]];
gActors[i].iwork[1] = actor->index; gActors[i].iwork[1] = actor->index;
gActors[i].iwork[2] = containerIdx; gActors[i].iwork[2] = containerIdx;
Object_SetInfo(&gActors[i].info, gActors[i].obj.id); Object_SetInfo(&gActors[i].info, gActors[i].obj.id);
if (actor->state != 0) { if (actor->state != 0) {
@ -4071,10 +4079,10 @@ void Zoness_ZoTanker_Init(ZoTanker* actor) {
if (D_i3_801BF804[actor->iwork[3]] >= 361.0f) { if (D_i3_801BF804[actor->iwork[3]] >= 361.0f) {
gActors[i].obj.rot.x = actor->obj.rot.y; gActors[i].obj.rot.x = actor->obj.rot.y;
} else { } else {
temp_v1 = (actor->iwork[3] * 2) + var_s6; temp_v1 = (actor->iwork[3] * 2) + j;
gActors[i].obj.rot.x = D_i3_801BF804[temp_v1]; gActors[i].obj.rot.x = D_i3_801BF804[temp_v1];
} }
var_s6++; j++;
} }
((uintptr_t*) &actor->iwork[0])[containerIdx] = i; ((uintptr_t*) &actor->iwork[0])[containerIdx] = i;
containerIdx++; containerIdx++;
@ -4099,7 +4107,7 @@ void Zoness_ZoTanker_Update(ZoTanker* this) {
actor = &gActors[this->iwork[i]]; actor = &gActors[this->iwork[i]];
if ((actor->obj.status != OBJ_FREE) && (actor->iwork[1] == this->index) && if ((actor->obj.status != OBJ_FREE) && (actor->iwork[1] == this->index) &&
(actor->obj.id == OBJ_ACTOR_ZO_CONTAINER)) { (actor->obj.id == OBJ_ACTOR_ZO_CONTAINER)) {
Matrix_MultVec3f(gCalcMatrix, &D_i3_801BF744[i], &sp58); Matrix_MultVec3f(gCalcMatrix, &sTankerCointainerInitPos[i], &sp58);
actor->obj.pos.x = this->obj.pos.x + sp58.x; actor->obj.pos.x = this->obj.pos.x + sp58.x;
actor->obj.pos.y = this->obj.pos.y + sp58.y; actor->obj.pos.y = this->obj.pos.y + sp58.y;
actor->obj.pos.z = this->obj.pos.z + sp58.z; actor->obj.pos.z = this->obj.pos.z + sp58.z;
@ -4112,7 +4120,7 @@ void Zoness_ZoTanker_Update(ZoTanker* this) {
actor = &gActors[this->iwork[i]]; actor = &gActors[this->iwork[i]];
if ((actor->obj.status != OBJ_FREE) && (actor->obj.id == OBJ_ACTOR_ZO_SUPPLYCRANE) && if ((actor->obj.status != OBJ_FREE) && (actor->obj.id == OBJ_ACTOR_ZO_SUPPLYCRANE) &&
(actor->iwork[1] == this->index)) { (actor->iwork[1] == this->index)) {
Matrix_MultVec3f(gCalcMatrix, &D_i3_801BF768[i], &sp58); Matrix_MultVec3f(gCalcMatrix, &sSupplyCraneCointainerInitPos[i], &sp58);
actor->obj.pos.x = this->obj.pos.x + sp58.x; actor->obj.pos.x = this->obj.pos.x + sp58.x;
actor->obj.pos.y = this->obj.pos.y + sp58.y; actor->obj.pos.y = this->obj.pos.y + sp58.y;
actor->obj.pos.z = this->obj.pos.z + sp58.z; actor->obj.pos.z = this->obj.pos.z + sp58.z;