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

Match sub_08066490 (#648) 

* Nuke sub_08066490.inc

* Match sub_08066490

* Remove extra bracket
This commit is contained in:
KEKW555 2023-12-11 05:57:19 +05:30 committed by GitHub
parent b163ecafc9
commit d35d816d6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
asm/non_matching/npc23/sub_08066490.inc
View File

@ -1,66 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
mov ip, r0
adds r5, r1, #0
ldrb r1, [r0, #0xb]
movs r0, #0x10
ands r0, r1
cmp r0, #0
beq _0806650A
mov r1, ip
ldrh r0, [r1, #0x2e]
adds r1, #0x86
strh r0, [r1]
mov r0, ip
adds r0, #0x7e
ldrh r2, [r0]
adds r0, #4
ldrh r0, [r0]
adds r3, r2, r0
subs r4, r2, r0
movs r6, #0x2e
ldrsh r0, [r5, r6]
cmp r0, r3
bge _080664C6
cmp r0, r4
ble _080664C6
adds r2, r0, #0
b _080664D2
_080664C6:
movs r2, #0x2e
ldrsh r0, [r5, r2]
adds r2, r4, #0
cmp r0, r3
blt _080664D2
adds r2, r3, #0
_080664D2:
ldrh r0, [r1]
cmp r0, r2
bne _080664F0
mov r1, ip
adds r1, #0x84
ldrh r0, [r1]
cmp r0, #1
bne _0806650A
movs r0, #0
strh r0, [r1]
mov r0, ip
movs r1, #2
bl InitializeAnimation
b _0806650A
_080664F0:
mov r6, ip
strh r2, [r6, #0x2e]
mov r1, ip
adds r1, #0x84
ldrh r0, [r1]
cmp r0, #0
bne _0806650A
movs r0, #1
strh r0, [r1]
mov r0, ip
movs r1, #6
bl InitializeAnimation
_0806650A:
pop {r4, r5, r6, pc}
.syntax divided

5
src/npc/npc23.c
View File

@ -122,7 +122,7 @@ void sub_08066474(NPC23Entity* this) {
} }
} }
NONMATCH("asm/non_matching/npc23/sub_08066490.inc", void sub_08066490(NPC23Entity* this, Entity* entity)) { void sub_08066490(NPC23Entity* this, Entity* entity) {
u32 uVar1; u32 uVar1;
u32 uVar2; u32 uVar2;
u32 uVar3; u32 uVar3;
@ -134,7 +134,7 @@ NONMATCH("asm/non_matching/npc23/sub_08066490.inc", void sub_08066490(NPC23Entit
uVar3 = uVar2 + this->unk_82; uVar3 = uVar2 + this->unk_82;
uVar4 = uVar2 - this->unk_82; uVar4 = uVar2 - this->unk_82;
if (((entity->x.HALF.HI < (int)uVar3) && (entity->x.HALF.HI > (int)uVar4))) { if (((entity->x.HALF.HI < (int)uVar3) && (entity->x.HALF.HI > (int)uVar4))) {
uVar2 = entity->x.HALF.HI; uVar2 += (entity->x.HALF.HI - uVar2);
} else { } else {
if (entity->x.HALF.HI >= (int)uVar3) { if (entity->x.HALF.HI >= (int)uVar3) {
uVar2 = uVar3; uVar2 = uVar3;
@ -157,7 +157,6 @@ NONMATCH("asm/non_matching/npc23/sub_08066490.inc", void sub_08066490(NPC23Entit
} }
} }
} }
END_NONMATCH
bool32 sub_0806650C(NPC23Entity* this) { bool32 sub_0806650C(NPC23Entity* this) {
u32 dir = 0; u32 dir = 0;