mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-05 09:34:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match sub_0802EA88 and sub_0802EB08

Browse Source
This commit is contained in:
Tal Hayon
2022-08-12 19:26:57 +03:00
parent 86ad4b1e00
commit f3dd57eba6
3 changed files with 28 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/gleerok.c
+28 -28
View File
@@ -1409,87 +1409,87 @@ void sub_0802EA68(Gleerok_HeapStruct* param_1, u32 param_2, u32 param_3, u32 par
param_1->filler2[param_2].unk0.HWORD = (param_1->filler2[param_2].unk0.HWORD + param_3) & 0x1fff;
}
NONMATCH("asm/non_matching/gleerok/sub_0802EA88.inc", bool32 sub_0802EA88(Gleerok_HeapStruct* this)) {
bool32 sub_0802EA88(Gleerok_HeapStruct* this) {
s32 bVar2;
u32 uVar3;
u32 bVar4;
u32 uVar5;
u32 i;
u32 uVar6;
uVar6 = FALSE;
for (uVar5 = 0; uVar5 < 5; uVar5++) {
if (this->filler[uVar5].unk0.HALF.HI != this->filler[uVar5 + 1].unk0.HALF.HI) {
for (i = 0; i < 5; i++) {
if (this->filler[i].unk0.HALF.HI != this->filler[i + 1].unk0.HALF.HI) {
uVar6 = TRUE;
if ((s32)((this->filler[uVar5 + 1].unk0.HALF.HI - this->filler[uVar5].unk0.HALF.HI) & 0x1fU) > 0x10) {
if ((s32)((this->filler[i + 1].unk0.HALF.HI - this->filler[i].unk0.HALF.HI) & 0x1fU) > 0x10) {
uVar3 = 0;
} else {
uVar3 = 1;
}
sub_0802EA48(this, uVar5 + 1, 0x20, uVar3);
sub_0802EA48(this, i + 1, 0x20, uVar3);
break;
}
}
for (uVar5 = 0; uVar5 <= 4; uVar5++) {
bVar4 = this->filler[uVar5 + 1].unk0.HALF.HI;
bVar2 = (bVar4 - this->filler[uVar5].unk0.HALF.HI) & 0x1f;
for (i = 0; i <= 4; i++) {
bVar4 = this->filler[i + 1].unk0.HALF.HI;
bVar2 = (bVar4 - this->filler[i].unk0.HALF.HI) & 0x1f;
uVar3 = bVar4;
if (bVar2 >= 0x11) {
if (bVar2 < 0x1f) {
bVar4 = (bVar4 + 1) & 0x1f;
uVar3++;
uVar3 &= 0x1f;
}
} else {
if (1 < bVar2) {
bVar4 = (bVar4 - 1) & 0x1f;
uVar3--;
uVar3 &= 0x1f;
}
}
this->filler[uVar5 + 1].unk0.HALF.HI = bVar4;
this->filler[i + 1].unk0.HALF.HI = uVar3;
}
return uVar6;
}
END_NONMATCH
NONMATCH("asm/non_matching/gleerok/sub_0802EB08.inc",
bool32 sub_0802EB08(Gleerok_HeapStruct* param_1, u32 param_2, s32 param_3)) {
bool32 sub_0802EB08(Gleerok_HeapStruct* param_1, u32 param_2, s32 param_3) {
s32 uVar2;
u32 bVar4;
u32 uVar5;
u32 uVar6;
u32 i;
u32 uVar7;
uVar7 = FALSE;
for (uVar6 = 0; uVar6 < 5; uVar6++) {
if (param_1->filler2[uVar6].unk0.HALF.HI != param_1->filler2[uVar6 + 1].unk0.HALF.HI) {
for (i = 0; i < 5; i++) {
if (param_1->filler2[i].unk0.HALF.HI != param_1->filler2[i + 1].unk0.HALF.HI) {
uVar7 = TRUE;
if (0x10 <
(s32)((param_1->filler2[uVar6 + 1].unk0.HALF.HI - param_1->filler2[uVar6].unk0.HALF.HI) & 0x1fU)) {
if (0x10 < (s32)((param_1->filler2[i + 1].unk0.HALF.HI - param_1->filler2[i].unk0.HALF.HI) & 0x1fU)) {
uVar5 = 3;
} else {
uVar5 = 2;
}
sub_0802EA68(param_1, uVar6 + 1, param_2, uVar5);
sub_0802EA68(param_1, i + 1, param_2, uVar5);
break;
}
}
for (uVar6 = 0; uVar6 <= 4; uVar6++) {
bVar4 = param_1->filler2[uVar6 + 1].unk0.HALF.HI;
uVar2 = (bVar4 - param_1->filler2[uVar6].unk0.HALF.HI) & 0x1f;
for (i = 0; i <= 4; i++) {
bVar4 = param_1->filler2[i + 1].unk0.HALF.HI;
uVar2 = (bVar4 - param_1->filler2[i].unk0.HALF.HI) & 0x1f;
uVar5 = bVar4;
if (uVar2 >= 0x11) {
if ((-param_3 & 0x1f) > uVar2) {
bVar4 = (bVar4 + 1) & 0x1f;
uVar5 = (uVar5 + 1) & 0x1f;
}
} else {
if (param_3 < (int)uVar2) {
bVar4 = (bVar4 - 1) & 0x1f;
uVar5 = (uVar5 - 1) & 0x1f;
}
}
param_1->filler2[uVar6 + 1].unk0.HALF.HI = bVar4;
param_1->filler2[i + 1].unk0.HALF.HI = uVar5;
}
return uVar7;
}
END_NONMATCH
void sub_0802EB9C(GleerokEntity* this) {
this->unk_74 = gUnk_080CD854[GetRandomByWeight(gUnk_080CD850)];