mirror of
https://github.com/zeldaret/tmc
synced 2026-05-29 08:43:06 -04:00
Merge pull request #556 from hatal175/sub_0802CF8C
This commit is contained in:
notyourav
@@ -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
|
||||
@@ -1,65 +0,0 @@
|
||||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r5, r1, #0
|
||||
adds r4, r2, #0
|
||||
bl CreateLargeWaterTrace
|
||||
adds r6, r0, #0
|
||||
cmp r6, #0
|
||||
beq _080A2B74
|
||||
bl Random
|
||||
adds r7, r0, #0
|
||||
subs r1, r4, r5
|
||||
adds r1, #1
|
||||
bl __modsi3
|
||||
adds r4, r0, #0
|
||||
adds r4, r4, r5
|
||||
asrs r7, r7, #0x10
|
||||
movs r0, #0xff
|
||||
ands r7, r0
|
||||
ldr r0, _080A2B7C @ =gSineTable
|
||||
mov r8, r0
|
||||
lsls r0, r7, #1
|
||||
add r0, r8
|
||||
movs r1, #0
|
||||
ldrsh r0, [r0, r1]
|
||||
lsls r4, r4, #0x18
|
||||
asrs r4, r4, #0x10
|
||||
adds r1, r4, #0
|
||||
bl FixedMul
|
||||
lsls r0, r0, #0x10
|
||||
asrs r0, r0, #0x10
|
||||
movs r5, #0x80
|
||||
lsls r5, r5, #1
|
||||
adds r1, r5, #0
|
||||
bl FixedDiv
|
||||
lsls r0, r0, #0x10
|
||||
asrs r0, r0, #8
|
||||
ldr r1, [r6, #0x2c]
|
||||
adds r1, r1, r0
|
||||
str r1, [r6, #0x2c]
|
||||
adds r0, r7, #0
|
||||
adds r0, #0x40
|
||||
lsls r0, r0, #1
|
||||
add r0, r8
|
||||
movs r1, #0
|
||||
ldrsh r0, [r0, r1]
|
||||
adds r1, r4, #0
|
||||
bl FixedMul
|
||||
lsls r0, r0, #0x10
|
||||
asrs r0, r0, #0x10
|
||||
adds r1, r5, #0
|
||||
bl FixedDiv
|
||||
lsls r0, r0, #0x10
|
||||
asrs r0, r0, #8
|
||||
ldr r1, [r6, #0x30]
|
||||
subs r1, r1, r0
|
||||
str r1, [r6, #0x30]
|
||||
_080A2B74:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_080A2B7C: .4byte gSineTable
|
||||
.syntax divided
|
||||
@@ -1,43 +0,0 @@
|
||||
.syntax unified
|
||||
push {r4, lr}
|
||||
adds r3, r0, #0
|
||||
ldrb r1, [r3, #0x15]
|
||||
adds r2, r1, #2
|
||||
movs r0, #0x1c
|
||||
ands r2, r0
|
||||
ldrb r4, [r3, #0x14]
|
||||
lsls r0, r4, #2
|
||||
subs r0, r2, r0
|
||||
adds r0, #6
|
||||
cmp r0, #0xc
|
||||
bls _0802CFA8
|
||||
lsrs r0, r2, #2
|
||||
b _0802CFB8
|
||||
_0802CFA8:
|
||||
adds r0, r1, #1
|
||||
movs r1, #7
|
||||
ands r0, r1
|
||||
cmp r0, #2
|
||||
ble _0802CFD0
|
||||
lsrs r0, r2, #2
|
||||
cmp r0, r4
|
||||
beq _0802CFD0
|
||||
_0802CFB8:
|
||||
strb r0, [r3, #0x14]
|
||||
lsrs r0, r2, #3
|
||||
lsls r0, r0, #2
|
||||
ldr r1, _0802CFD4 @ =gUnk_080CD730
|
||||
adds r2, r0, r1
|
||||
ldrh r1, [r2]
|
||||
adds r0, r3, #0
|
||||
adds r0, #0x74
|
||||
strh r1, [r0]
|
||||
ldrh r1, [r2, #2]
|
||||
adds r0, #2
|
||||
strh r1, [r0]
|
||||
_0802CFD0:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0802CFD4: .4byte gUnk_080CD730
|
||||
|
||||
.syntax divided
|
||||
+28
-28
@@ -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)];
|
||||
|
||||
+12
-9
@@ -165,23 +165,26 @@ void sub_0802CF64(Entity* this) {
|
||||
sub_0802CF8C(this);
|
||||
}
|
||||
|
||||
NONMATCH("asm/non_matching/wallMaster2/sub_0802CF8C.inc", void sub_0802CF8C(Entity* this)) {
|
||||
void sub_0802CF8C(Entity* this) {
|
||||
int iVar1;
|
||||
u32 uVar2;
|
||||
u32 dir;
|
||||
const u16* ptr;
|
||||
u16* ptr2;
|
||||
|
||||
uVar2 = (this->direction + 2) & 0x1c;
|
||||
if ((uVar2 - this->animationState * 4 + 6 > 0xc) ||
|
||||
((((this->direction + 1) & 7) > 2 && (uVar2 >> 2 != this->animationState)))) {
|
||||
this->animationState = (uVar2 >> 2);
|
||||
iVar1 = (uVar2 >> 3) * 2;
|
||||
dir = Direction8RoundUp(this->direction);
|
||||
if (dir - Direction8FromAnimationState(this->animationState) + 6 > 12) {
|
||||
this->animationState = Direction8ToAnimationState(dir);
|
||||
iVar1 = (dir >> 3) * 2;
|
||||
ptr = &gUnk_080CD730[iVar1];
|
||||
this->field_0x74.HWORD = ptr[0];
|
||||
this->field_0x76.HWORD = ptr[1];
|
||||
} else if (((this->direction + 1) & 7) > 2 && (Direction8ToAnimationState(dir) != this->animationState)) {
|
||||
this->animationState = Direction8ToAnimationState(dir);
|
||||
iVar1 = (dir >> 3) * 2;
|
||||
ptr = &gUnk_080CD730[iVar1];
|
||||
this->field_0x74.HWORD = ptr[0];
|
||||
this->field_0x76.HWORD = ptr[1];
|
||||
}
|
||||
}
|
||||
END_NONMATCH
|
||||
|
||||
void sub_0802CFD8(Entity* this) {
|
||||
u32 unk = gUnk_080CD740[(this->field_0x7a.HALF.LO++ >> 3) & 7];
|
||||
|
||||
+7
-15
@@ -214,28 +214,20 @@ Entity* CreateLargeWaterTrace(Entity* parent) {
|
||||
return ent;
|
||||
}
|
||||
|
||||
NONMATCH("asm/non_matching/objectUtils/sub_080A2AF4.inc", void sub_080A2AF4(Entity* parent, s32 param_2, s32 param_3)) {
|
||||
void sub_080A2AF4(Entity* parent, s32 param_2, s32 param_3) {
|
||||
Entity* entity;
|
||||
s32 rand;
|
||||
s32 radius;
|
||||
u32 angle;
|
||||
s32 tmp;
|
||||
s32 angle;
|
||||
|
||||
entity = CreateLargeWaterTrace(parent);
|
||||
if (entity != NULL) {
|
||||
rand = Random();
|
||||
radius = (rand % (param_3 - param_2 + 1)) + param_2;
|
||||
angle = rand >> 0x10 & 0xff;
|
||||
radius *= 0x100;
|
||||
tmp = FixedMul(gSineTable[angle], radius);
|
||||
tmp = FixedDiv(tmp, 0x100);
|
||||
entity->x.WORD += ((tmp << 0x10) >> 8);
|
||||
tmp = FixedMul(gSineTable[angle + 0x40], radius);
|
||||
tmp = FixedDiv(tmp, 0x100);
|
||||
entity->y.WORD -= ((tmp << 0x10) >> 8);
|
||||
angle = Random();
|
||||
radius = (angle % (param_3 - param_2 + 1)) + param_2;
|
||||
angle = angle >> 0x10 & 0xff;
|
||||
entity->x.WORD += FixedDiv(FixedMul(gSineTable[angle], radius << 8), 0x100) << 8;
|
||||
entity->y.WORD -= FixedDiv(FixedMul(gSineTable[angle + 0x40], radius << 8), 0x100) << 8;
|
||||
}
|
||||
}
|
||||
END_NONMATCH
|
||||
|
||||
void CreateSparkle(Entity* entity) {
|
||||
Entity* sparkle;
|
||||
|
||||
Reference in New Issue
Block a user