falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #280 from nonmatch/patch-14 

Match sub_080AA320
This commit is contained in:
notyourav 2022-01-11 19:46:57 -08:00 committed by GitHub
parent 410ea3871a 91e58924d6
commit 00d104e28c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
asm/non_matching/mandiblesProjectile/sub_080AA320.inc
View File

@ -1,41 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, [r5, #0x50]
movs r2, #0
movs r1, #2
strb r1, [r5, #0xc]
adds r3, r5, #0
adds r3, #0x82
movs r0, #1
strb r0, [r3]
strb r2, [r5, #0xf]
strb r1, [r4, #0xc]
movs r0, #0x30
strb r0, [r4, #0xf]
adds r1, r4, #0
adds r1, #0x80
movs r0, #0x50
strh r0, [r1]
strh r2, [r4, #0x24]
adds r0, r4, #0
movs r1, #0
bl sub_08049F84
strb r0, [r4, #0x15]
ldrb r0, [r4, #0x15]
adds r0, #4
movs r1, #0x1c
ands r0, r1
lsrs r1, r0, #2
strb r1, [r5, #0x14]
movs r1, #0x18
ands r0, r1
lsrs r0, r0, #2
strb r0, [r4, #0x14]
adds r0, r4, #0
movs r1, #1
bl sub_080AA3E0
adds r0, r5, #0
bl sub_080AA1D8
pop {r4, r5, pc}
.syntax divided

7
src/projectile/mandiblesProjectile.c
View File

@ -275,7 +275,7 @@ bool32 sub_080AA2E0(Entity* this) {
return TRUE; return TRUE;
} }
NONMATCH("asm/non_matching/mandiblesProjectile/sub_080AA320.inc", void sub_080AA320(Entity* this)) { void sub_080AA320(Entity* this) {
u32 uVar2; u32 uVar2;
Entity* parent; Entity* parent;
@ -289,13 +289,12 @@ NONMATCH("asm/non_matching/mandiblesProjectile/sub_080AA320.inc", void sub_080AA
parent->speed = 0; parent->speed = 0;
parent->direction = sub_08049F84(parent, 0); parent->direction = sub_08049F84(parent, 0);
// TODO regalloc // TODO regalloc
uVar2 = parent->direction + 4; uVar2 = Direction8Round(parent->direction + 4);
this->animationState = Direction8Round(uVar2) >> 2; this->animationState = uVar2 >> 2;
parent->animationState = DirectionRound(uVar2) >> 2; parent->animationState = DirectionRound(uVar2) >> 2;
sub_080AA3E0(parent, 1); sub_080AA3E0(parent, 1);
sub_080AA1D8(this); sub_080AA1D8(this);
} }
END_NONMATCH
NONMATCH("asm/non_matching/mandiblesProjectile/sub_080AA374.inc", bool32 sub_080AA374(Entity* this)) { NONMATCH("asm/non_matching/mandiblesProjectile/sub_080AA374.inc", bool32 sub_080AA374(Entity* this)) {
u32 uVar1; u32 uVar1;