mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

additional matching functions in z_room, z_camera, and En_Zl3 (#541)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* small improvement

* also minor

* merge

* matches

* the room?

* woo matches

* spelling fix
This commit is contained in:
petrie911 2020-12-18 21:09:38 -06:00 • committed by GitHub
parent 83e53bbaf2
commit 2373c779d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 143 additions and 1643 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
View file

@ -542,6 +542,7 @@ void func_80ADA35C(EnPoSisters* this, GlobalContext* globalCtx) {
if (this->unk_196 != 0) {
this->unk_196--;
}
this->actor.posRot.pos.y += (2.0f + 0.5f * Math_Rand_ZeroOne()) * Math_Sins(this->unk_196 * 0x800);
if (this->unk_22E.a == 255 && this->actionFunc != func_80ADA8C0 && this->actionFunc != func_80ADA7F0) {
if (this->actionFunc == func_80ADAC70) {

6
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View file

@ -35,7 +35,7 @@ void EnSyatekiMan_StartGame(EnSyatekiMan* this, GlobalContext* globalCtx);
void EnSyatekiMan_WaitForGame(EnSyatekiMan* this, GlobalContext* globalCtx);
void EnSyatekiMan_EndGame(EnSyatekiMan* this, GlobalContext* globalCtx);
void EnSyatekiMan_GivePrize(EnSyatekiMan* this, GlobalContext* globalCtx);
void EnSyaketiMan_FinishPrize(EnSyatekiMan* this, GlobalContext* globalCtx);
void EnSyatekiMan_FinishPrize(EnSyatekiMan* this, GlobalContext* globalCtx);
void EnSyatekiMan_RestartGame(EnSyatekiMan* this, GlobalContext* globalCtx);
void EnSyatekiMan_BlinkWait(EnSyatekiMan* this);
@ -313,13 +313,13 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, GlobalContext* globalCtx) {
void EnSyatekiMan_GivePrize(EnSyatekiMan* this, GlobalContext* globalCtx) {
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
if (Actor_HasParent(&this->actor, globalCtx)) {
this->actionFunc = EnSyaketiMan_FinishPrize;
this->actionFunc = EnSyatekiMan_FinishPrize;
} else {
func_8002F434(&this->actor, globalCtx, this->getItemId, 2000.0f, 1000.0f);
}
}
void EnSyaketiMan_FinishPrize(EnSyatekiMan* this, GlobalContext* globalCtx) {
void EnSyatekiMan_FinishPrize(EnSyatekiMan* this, GlobalContext* globalCtx) {
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) {
// Successful completion

92
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -234,20 +234,19 @@ void func_80B53974(EnZl3* this, u8 arg1) {
this->unk_3C8 = arg1;
}
#ifdef NON_MATCHING
void func_80B53980(EnZl3* this, s16 y, s32 idx) {
SkelAnime* skelAnime = &this->skelAnime;
void func_80B53980(EnZl3* thisx, s16 y, s32 idx) {
EnZl3* this = THIS; // this function might take thisx
s32 action = this->action;
EnZl3* this2 = this;
s16 y2 = y;
s32 yTemp;
f32 animCurrentFrame;
f32 unk_3DC;
if (this->unk_2FC != 0) {
s32 temp25C = this2->unk_25C[idx];
s32 temp28C = (s16)(y + this2->unk_28C[idx]);
s32 temp2BC = y - this2->unk_2BC[idx];
SkelAnime* skelAnime = &this->skelAnime;
s32 temp25C = this->unk_25C[idx];
s32 temp28C = (s16)(y + this->unk_28C[idx]);
s32 temp2BC = y - this->unk_2BC[idx];
if ((s32)fabsf(temp2BC) > 0x8000) {
if (y2 > 0) {
@ -274,7 +273,6 @@ void func_80B53980(EnZl3* this, s16 y, s32 idx) {
temp28C = y;
temp25C = 0;
}
if (idx == 0 && action == 3) {
yTemp = y + -11000;
if (skelAnime->mode == 2) {
@ -302,30 +300,22 @@ void func_80B53980(EnZl3* this, s16 y, s32 idx) {
}
this->unk_2BC[idx] = y;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53980.s")
#endif
// Assorted regalloc issues
#ifdef NON_MATCHING
void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
void func_80B53B64(EnZl3* thisx, s16 z, s32 idx) {
EnZl3* this = THIS;
SkelAnime* skelAnime = &this->skelAnime;
s32 action = this->action;
s32 phi_a1;
s32 idx25C;
s16 temp_t1;
s32 temp_a0;
s32 temp_a3_2;
s32 temp_a3_3;
s32 temp_a3_4;
s32 temp_a3_5;
s32 temp_a3_6;
s32 temp_a3_7;
s32 temp_a3_8;
s32 temp_a3;
s32 temp_v1_3;
s32 phi_v1;
s32 phi_v0;
s32 phi_v1_2;
s32 test;
if (idx == 2) {
phi_a1 = 15000;
@ -351,11 +341,10 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
}
if (this->unk_2FC != 0) {
temp_t1 = this->unk_25C[idx];
temp_a3_3 = this->unk_28C[idx] + z;
phi_v0 = temp_t1 = this->unk_25C[idx];
temp_a3 = this->unk_28C[idx] + z;
phi_v1 = z - this->unk_2BC[idx];
temp_a0 = (s16)(temp_a3_3);
phi_v0 = temp_t1;
temp_a0 = (s16)(temp_a3);
if ((s32)fabsf(phi_v1) > 0x8000) {
if (z > 0) {
@ -391,9 +380,10 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
if (phi_v0 != 0) {
phi_v0 -= phi_v0 / 10;
}
test = (s16)(temp_a0 - phi_a1);
if ((s16)(temp_a0 - phi_a1) != 0) {
phi_v0 -= (s16)(temp_a0 - phi_a1) / 50;
if (test != 0) {
phi_v0 -= test / 50;
}
temp_a0 += phi_v0;
@ -408,9 +398,9 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
if (skelAnime->mode == 2) {
f32 animCurrentFrame = skelAnime->animCurrentFrame;
temp_a3_2 = (s32)(((this->unk_3E0 - animCurrentFrame) / this->unk_3E0) * -2000.0f) + phi_a1;
if (temp_a3_2 >= phi_a1) {
phi_a1 = temp_a3_2;
temp_a3 = (s32)(((this->unk_3E0 - animCurrentFrame) / this->unk_3E0) * -2000.0f) + phi_a1;
if (temp_a3 >= phi_a1) {
phi_a1 = temp_a3;
if (phi_v0 < 0) {
phi_v0 /= -2;
}
@ -418,9 +408,9 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
}
} else if (action == 5) {
if (skelAnime->mode == 2) {
temp_a3_3 = (s32)((skelAnime->animCurrentFrame / this->unk_3E4) * -2000.0f) + phi_a1;
if (temp_a3_3 >= phi_a1) {
phi_a1 = temp_a3_3;
temp_a3 = (s32)((skelAnime->animCurrentFrame / this->unk_3E4) * -2000.0f) + phi_a1;
if (temp_a3 >= phi_a1) {
phi_a1 = temp_a3;
if (phi_v0 < 0) {
phi_v0 /= -2;
}
@ -438,15 +428,15 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
f32 unk_3F4 = this->unk_3F4;
if (skelAnime->animCurrentFrame <= 42.0f) {
phi_v1_2 = phi_a1 - 2000;
temp_a3 = phi_a1 - 2000;
} else {
phi_v1_2 =
temp_a3 =
(s32)((((skelAnime->animCurrentFrame - 42.0f) * 6200.0f) / (unk_3F4 - 42.0f)) + -2000.0f) +
phi_a1;
}
if (phi_v1_2 >= phi_a1) {
phi_a1 = phi_v1_2;
if (temp_a3 >= phi_a1) {
phi_a1 = temp_a3;
if (phi_v0 < 0) {
phi_v0 /= -2;
}
@ -461,9 +451,9 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
}
} else if (action == 22) {
if (skelAnime->mode == 2) {
temp_a3_4 = (s32)(((skelAnime->animCurrentFrame / this->unk_3EC) * -5200.0f) + 4200.0f) + phi_a1;
if (temp_a3_4 >= phi_a1) {
phi_a1 = temp_a3_4;
temp_a3 = (s32)(((skelAnime->animCurrentFrame / this->unk_3EC) * -5200.0f) + 4200.0f) + phi_a1;
if (temp_a3 >= phi_a1) {
phi_a1 = temp_a3;
if (phi_v0 < 0) {
phi_v0 /= -2;
}
@ -478,9 +468,9 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
}
} else if (action == 23) {
if (skelAnime->mode == 2) {
temp_a3_5 = (s32)(((skelAnime->animCurrentFrame / this->unk_3F0) * -7600.0f) + -2000.0f) + phi_a1;
if (temp_a3_5 >= phi_a1) {
phi_a1 = temp_a3_5;
temp_a3 = (s32)(((skelAnime->animCurrentFrame / this->unk_3F0) * -7600.0f) + -2000.0f) + phi_a1;
if (temp_a3 >= phi_a1) {
phi_a1 = temp_a3;
if (phi_v0 < 0) {
phi_v0 /= -2;
}
@ -495,9 +485,9 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
}
} else if (action == 24) {
if (skelAnime->mode == 2) {
temp_a3_6 = (s32)(((skelAnime->animCurrentFrame / this->unk_3E8) * 21000.0f) + -9600.0f) + phi_a1;
if (temp_a3_6 >= phi_a1) {
phi_a1 = temp_a3_6;
temp_a3 = (s32)(((skelAnime->animCurrentFrame / this->unk_3E8) * 21000.0f) + -9600.0f) + phi_a1;
if (temp_a3 >= phi_a1) {
phi_a1 = temp_a3;
if (phi_v0 < 0) {
phi_v0 /= -2;
}
@ -514,9 +504,9 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
} else if (idx == 11 || idx == 17) {
if (action == 4) {
if (skelAnime->mode == 2) {
temp_a3_7 = (s32)((skelAnime->animCurrentFrame / this->unk_3E0) * -7000.0f) + phi_a1;
if (phi_a1 >= temp_a3_7) {
phi_a1 = temp_a3_7;
temp_a3 = (s32)((skelAnime->animCurrentFrame / this->unk_3E0) * -7000.0f) + phi_a1;
if (phi_a1 >= temp_a3) {
phi_a1 = temp_a3;
if (phi_v0 > 0) {
phi_v0 /= -2;
}
@ -533,9 +523,9 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
if (skelAnime->mode == 2) {
f32 animCurrentFrame = skelAnime->animCurrentFrame;
temp_a3_8 = (s32)(((this->unk_3E4 - animCurrentFrame) / this->unk_3E4) * -7000.0f) + phi_a1;
if (phi_a1 >= temp_a3_8) {
phi_a1 = temp_a3_8;
temp_a3 = (s32)(((this->unk_3E4 - animCurrentFrame) / this->unk_3E4) * -7000.0f) + phi_a1;
if (phi_a1 >= temp_a3) {
phi_a1 = temp_a3;
if (phi_v0 > 0) {
phi_v0 /= -2;
}