From d35d816d6e1b44d0e224b1a78a675335e0cae661 Mon Sep 17 00:00:00 2001
From: KEKW555 <152369890+KEKW555@users.noreply.github.com>
Date: Mon, 11 Dec 2023 05:57:19 +0530
Subject: [PATCH] Match sub_08066490 (#648)

* Nuke sub_08066490.inc

* Match sub_08066490

* Remove extra bracket
---
 asm/non_matching/npc23/sub_08066490.inc | 66 -------------------------
 src/npc/npc23.c                         |  5 +-
 2 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 asm/non_matching/npc23/sub_08066490.inc

diff --git a/asm/non_matching/npc23/sub_08066490.inc b/asm/non_matching/npc23/sub_08066490.inc
deleted file mode 100644
index 87549b7f7b..0000000000
--- a/asm/non_matching/npc23/sub_08066490.inc
+++ /dev/null
@@ -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
diff --git a/src/npc/npc23.c b/src/npc/npc23.c
index 1092e0a4b4..e3dab55823 100644
--- a/src/npc/npc23.c
+++ b/src/npc/npc23.c
@@ -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 uVar2;
     u32 uVar3;
@@ -134,7 +134,7 @@ NONMATCH("asm/non_matching/npc23/sub_08066490.inc", void sub_08066490(NPC23Entit
         uVar3 = uVar2 + this->unk_82;
         uVar4 = uVar2 - this->unk_82;
         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 {
             if (entity->x.HALF.HI >= (int)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) {
     u32 dir = 0;