mirror of https://github.com/zeldaret/tmc.git
Match sub_0802EA88 and sub_0802EB08
This commit is contained in:
Tal Hayon
parent
86ad4b1e00
commit
f3dd57eba6
|
|
@ -1,75 +0,0 @@
|
|||
.syntax unified
|
||||
|
||||
.text
|
||||
push {r4, r5, r6, lr}
|
||||
adds r5, r0, #0
|
||||
movs r6, #0
|
||||
movs r3, #0
|
||||
_0802EA90:
|
||||
lsls r0, r3, #2
|
||||
adds r4, r5, r0
|
||||
adds r2, r3, #1
|
||||
lsls r0, r2, #2
|
||||
adds r1, r5, r0
|
||||
ldrb r0, [r4, #1]
|
||||
ldrb r3, [r1, #1]
|
||||
cmp r0, r3
|
||||
beq _0802EAC2
|
||||
movs r6, #1
|
||||
ldrb r0, [r1, #1]
|
||||
ldrb r1, [r4, #1]
|
||||
subs r0, r0, r1
|
||||
movs r1, #0x1f
|
||||
ands r0, r1
|
||||
movs r3, #1
|
||||
cmp r0, #0x10
|
||||
ble _0802EAB6
|
||||
movs r3, #0
|
||||
_0802EAB6:
|
||||
adds r0, r5, #0
|
||||
adds r1, r2, #0
|
||||
movs r2, #0x20
|
||||
bl sub_0802EA48
|
||||
b _0802EAC8
|
||||
_0802EAC2:
|
||||
adds r3, r2, #0
|
||||
cmp r3, #4
|
||||
bls _0802EA90
|
||||
_0802EAC8:
|
||||
movs r3, #0
|
||||
movs r4, #0x1f
|
||||
_0802EACC:
|
||||
adds r2, r3, #1
|
||||
lsls r0, r2, #2
|
||||
adds r0, r5, r0
|
||||
ldrb r1, [r0, #1]
|
||||
lsls r0, r3, #2
|
||||
adds r0, r5, r0
|
||||
ldrb r0, [r0, #1]
|
||||
subs r0, r1, r0
|
||||
ands r0, r4
|
||||
adds r3, r1, #0
|
||||
adds r1, r2, #0
|
||||
cmp r0, #0x10
|
||||
ble _0802EAEE
|
||||
cmp r0, #0x1e
|
||||
bgt _0802EAF6
|
||||
adds r3, #1
|
||||
b _0802EAF4
|
||||
_0802EAEE:
|
||||
cmp r0, #1
|
||||
ble _0802EAF6
|
||||
subs r3, #1
|
||||
_0802EAF4:
|
||||
ands r3, r4
|
||||
_0802EAF6:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r5, r0
|
||||
strb r3, [r0, #1]
|
||||
adds r3, r1, #0
|
||||
cmp r3, #4
|
||||
bls _0802EACC
|
||||
adds r0, r6, #0
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
.syntax unified
|
||||
|
||||
.text
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r5, r0, #0
|
||||
adds r6, r1, #0
|
||||
adds r7, r2, #0
|
||||
movs r0, #0
|
||||
mov r8, r0
|
||||
movs r3, #0
|
||||
_0802EB1A:
|
||||
lsls r0, r3, #2
|
||||
adds r4, r5, r0
|
||||
adds r2, r3, #1
|
||||
lsls r0, r2, #2
|
||||
adds r1, r5, r0
|
||||
ldrb r0, [r4, #0x19]
|
||||
ldrb r3, [r1, #0x19]
|
||||
cmp r0, r3
|
||||
beq _0802EB4E
|
||||
movs r0, #1
|
||||
mov r8, r0
|
||||
ldrb r0, [r1, #0x19]
|
||||
ldrb r1, [r4, #0x19]
|
||||
subs r0, r0, r1
|
||||
movs r1, #0x1f
|
||||
ands r0, r1
|
||||
movs r3, #2
|
||||
cmp r0, #0x10
|
||||
ble _0802EB42
|
||||
movs r3, #3
|
||||
_0802EB42:
|
||||
adds r0, r5, #0
|
||||
adds r1, r2, #0
|
||||
adds r2, r6, #0
|
||||
bl sub_0802EA68
|
||||
b _0802EB54
|
||||
_0802EB4E:
|
||||
adds r3, r2, #0
|
||||
cmp r3, #4
|
||||
bls _0802EB1A
|
||||
_0802EB54:
|
||||
movs r3, #0
|
||||
movs r4, #0x1f
|
||||
rsbs r6, r7, #0
|
||||
ands r6, r4
|
||||
_0802EB5C:
|
||||
adds r2, r3, #1
|
||||
lsls r0, r2, #2
|
||||
adds r0, r5, r0
|
||||
ldrb r1, [r0, #0x19]
|
||||
lsls r0, r3, #2
|
||||
adds r0, r5, r0
|
||||
ldrb r0, [r0, #0x19]
|
||||
subs r0, r1, r0
|
||||
ands r0, r4
|
||||
adds r3, r1, #0
|
||||
adds r1, r2, #0
|
||||
cmp r0, #0x10
|
||||
ble _0802EB7E
|
||||
cmp r6, r0
|
||||
ble _0802EB86
|
||||
adds r3, #1
|
||||
b _0802EB84
|
||||
_0802EB7E:
|
||||
cmp r7, r0
|
||||
bge _0802EB86
|
||||
subs r3, #1
|
||||
_0802EB84:
|
||||
ands r3, r4
|
||||
_0802EB86:
|
||||
lsls r0, r1, #2
|
||||
adds r0, r5, r0
|
||||
strb r3, [r0, #0x19]
|
||||
adds r3, r1, #0
|
||||
cmp r3, #4
|
||||
bls _0802EB5C
|
||||
mov r0, r8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
|
|
@ -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)];
|
||||
|
|
|
|||
Loading…
Reference in New Issue