Match two kid functions

asm/non_matching/kid/Kid_Head.inc

@@ -1,126 +0,0 @@
-    .syntax unified
-    .text
-
-	push {r4, r5, r6, r7, lr}
-	adds r5, r0, #0
-	ldrb r4, [r5, #0xa]
-	lsls r0, r4, #2
-	mov ip, r0
-	ldr r2, _08062868 @ =gUnk_0810C0A0
-	add r2, ip
-	adds r0, r5, #0
-	adds r0, #0x5a
-	ldrb r3, [r0]
-	movs r1, #0x1f
-	adds r0, r1, #0
-	ands r0, r3
-	ldrb r3, [r2]
-	adds r6, r0, r3
-	ldrb r0, [r5, #0x1e]
-	ands r1, r0
-	ldrb r2, [r2, #1]
-	adds r7, r1, r2
-	cmp r4, #8
-	bhi _08062946
-	ldr r0, _0806286C @ =_08062870
-	add r0, ip
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08062868: .4byte gUnk_0810C0A0
-_0806286C: .4byte _08062870 @ jump table
-_08062870:
-	.4byte _08062894 @ case 0
-	.4byte _08062894 @ case 1
-	.4byte _08062894 @ case 2
-	.4byte _08062894 @ case 3
-	.4byte _08062894 @ case 4
-	.4byte _08062894 @ case 5
-	.4byte _080628D8 @ case 6
-	.4byte _08062922 @ case 7
-	.4byte _08062922 @ case 8
-_08062894:
-	adds r0, r5, #0
-	adds r0, #0x5b
-	ldrb r1, [r0]
-	movs r0, #0x30
-	ands r0, r1
-	lsrs r4, r0, #4
-	cmp r4, #0
-	beq _080628A6
-	adds r4, #0x50
-_080628A6:
-	subs r4, #1
-	adds r0, r5, #0
-	movs r1, #0
-	adds r2, r6, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	adds r2, r7, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #2
-	adds r2, r4, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #0
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #2
-	b _08062916
-_080628D8:
-	adds r0, r5, #0
-	adds r0, #0x5b
-	ldrb r0, [r0]
-	movs r2, #0xf
-	ands r2, r0
-	cmp r2, #0
-	beq _080628E8
-	adds r2, #0x93
-_080628E8:
-	subs r2, #1
-	adds r0, r5, #0
-	movs r1, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	adds r2, r6, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #2
-	adds r2, r7, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #2
-	movs r2, #1
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #0
-_08062916:
-	bl SetSpriteSubEntryOffsetData2
-	adds r0, r5, #0
-	bl sub_0807000C
-	b _08062946
-_08062922:
-	adds r0, r5, #0
-	movs r1, #0
-	adds r2, r6, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	adds r2, r7, #0
-	bl SetExtraSpriteFrame
-	adds r0, r5, #0
-	movs r1, #1
-	movs r2, #0
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r5, #0
-	bl sub_0807000C
-_08062946:
-	pop {r4, r5, r6, r7, pc}
-
-    .syntax divided

asm/non_matching/kid/sub_08062948.inc

@@ -1,141 +0,0 @@
-    .syntax unified
-    .text
-
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	adds r6, r1, #0
-	ldrb r0, [r6, #0x18]
-	cmp r0, #0
-	bne _080629B4
-	adds r0, #1
-	strb r0, [r6, #0x18]
-	bl Random
-	movs r1, #0x3f
-	ands r0, r1
-	adds r0, #0x20
-	strh r0, [r6, #0x12]
-	bl Random
-	adds r1, r0, #0
-	movs r0, #0x18
-	ands r1, r0
-	ldrb r0, [r4, #0x15]
-	cmp r0, #8
-	beq _08062990
-	cmp r0, #8
-	bgt _0806297E
-	cmp r0, #0
-	beq _08062988
-	b _080629A6
-_0806297E:
-	cmp r0, #0x10
-	beq _08062998
-	cmp r0, #0x18
-	beq _080629A0
-	b _080629A6
-_08062988:
-	cmp r1, #0x10
-	bne _080629A6
-	movs r1, #8
-	b _080629A6
-_08062990:
-	cmp r1, #0x18
-	bne _080629A6
-	movs r1, #0x10
-	b _080629A6
-_08062998:
-	cmp r1, #0
-	bne _080629A6
-	movs r1, #0x18
-	b _080629A6
-_080629A0:
-	cmp r1, #8
-	bne _080629A6
-	movs r1, #0
-_080629A6:
-	strb r1, [r4, #0x15]
-	adds r0, r1, #0
-	bl sub_0806F5B0
-	strb r0, [r4, #0x14]
-	movs r0, #0x80
-	strh r0, [r4, #0x24]
-_080629B4:
-	ldrb r0, [r4, #0x14]
-	lsrs r0, r0, #1
-	adds r1, r0, #4
-	adds r5, r4, #0
-	adds r5, #0x58
-	ldrb r0, [r5]
-	cmp r1, r0
-	beq _080629D2
-	adds r0, r4, #0
-	bl InitializeAnimation
-	ldrb r1, [r5]
-	adds r0, r4, #0
-	adds r0, #0x80
-	strh r1, [r0]
-_080629D2:
-	adds r0, r4, #0
-	bl ProcessMovement0
-	movs r3, #0x2e
-	ldrsh r1, [r4, r3]
-	adds r2, r4, #0
-	adds r2, #0x6c
-	movs r5, #0
-	ldrsh r0, [r2, r5]
-	subs r1, r1, r0
-	cmp r1, #0x10
-	ble _080629F4
-	ldrh r0, [r2]
-	adds r0, #0x10
-	strh r0, [r4, #0x2e]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_080629F4:
-	movs r3, #0x10
-	rsbs r3, r3, #0
-	cmp r1, r3
-	bge _08062A06
-	ldrh r0, [r2]
-	subs r0, #0x10
-	strh r0, [r4, #0x2e]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_08062A06:
-	movs r0, #0x32
-	ldrsh r1, [r4, r0]
-	adds r2, r4, #0
-	adds r2, #0x6e
-	movs r5, #0
-	ldrsh r0, [r2, r5]
-	subs r1, r1, r0
-	cmp r1, #0x10
-	ble _08062A22
-	ldrh r0, [r2]
-	adds r0, #0x10
-	strh r0, [r4, #0x32]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_08062A22:
-	cmp r1, r3
-	bge _08062A30
-	ldrh r0, [r2]
-	subs r0, #0x10
-	strh r0, [r4, #0x32]
-	movs r0, #1
-	strh r0, [r6, #0x12]
-_08062A30:
-	ldrh r0, [r6, #0x12]
-	subs r0, #1
-	strh r0, [r6, #0x12]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	beq _08062A42
-	ldr r1, _08062A44 @ =gActiveScriptInfo
-	movs r0, #0
-	strb r0, [r1, #6]
-_08062A42:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08062A44: .4byte gActiveScriptInfo
-
-    .syntax divided

src/npc/kid.c

@@ -270,15 +270,18 @@ void sub_080627E8(Entity* this, ScriptExecutionContext* context) {
     sub_0807BA8C(0x64d, 1);
 }
 
-NONMATCH("asm/non_matching/kid/Kid_Head.inc", void Kid_Head(Entity* this)) {
+void Kid_Head(Entity* this) {
-    s32 iVar1;
+    u32 uVar1;
     u32 uVar2;
     u32 uVar3;
     u32 uVar4;
+    u32 uVar5;
+    u8* ptr;
 
-    iVar1 = (u32)this->type * 4;
+    uVar1 = this->type * 4;
-    uVar3 = ((u8)this->frame & 0x1f) + (u32)gUnk_0810C0A0[iVar1];
+    ptr = &gUnk_0810C0A0[uVar1];
-    uVar4 = (this->frameIndex & 0x1f) + (u32)gUnk_0810C0A0[iVar1 + 1];
+    uVar3 = ((u8)this->frame & 0x1f) + ptr[0];
+    uVar4 = (this->frameIndex & 0x1f) + ptr[1];
     switch (this->type) {
         case 0:
         case 1:
@@ -290,19 +293,20 @@ NONMATCH("asm/non_matching/kid/Kid_Head.inc", void Kid_Head(Entity* this)) {
             if (uVar2 != 0) {
                 uVar2 = uVar2 + 0x50;
             }
+            uVar2--;
             SetExtraSpriteFrame(this, 0, uVar3);
             SetExtraSpriteFrame(this, 1, uVar4);
-            SetExtraSpriteFrame(this, 2, uVar2 - 1);
+            SetExtraSpriteFrame(this, 2, uVar2);
             SetSpriteSubEntryOffsetData1(this, 1, 0);
             SetSpriteSubEntryOffsetData2(this, 1, 2);
             sub_0807000C(this);
             break;
         case 6:
-            uVar2 = this->frameSpriteSettings & 0xf;
+            uVar5 = this->frameSpriteSettings & 0xf;
             if ((this->frameSpriteSettings & 0xf) != 0) {
-                uVar2 = uVar2 + 0x93;
+                uVar5 = uVar5 + 0x93;
             }
-            SetExtraSpriteFrame(this, 0, uVar2 - 1);
+            SetExtraSpriteFrame(this, 0, uVar5 - 1);
             SetExtraSpriteFrame(this, 1, uVar3);
             SetExtraSpriteFrame(this, 2, uVar4);
             SetSpriteSubEntryOffsetData1(this, 2, 1);
@@ -320,10 +324,9 @@ NONMATCH("asm/non_matching/kid/Kid_Head.inc", void Kid_Head(Entity* this)) {
             break;
     }
 }
-END_NONMATCH
 
-NONMATCH("asm/non_matching/kid/sub_08062948.inc", void sub_08062948(Entity* this, ScriptExecutionContext* context)) {
+void sub_08062948(Entity* this, ScriptExecutionContext* context) {
-    u8 bVar1;
+    s32 bVar1;
     u16 uVar2;
     u32 uVar3;
     s32 iVar4;
@@ -332,64 +335,60 @@ NONMATCH("asm/non_matching/kid/sub_08062948.inc", void sub_08062948(Entity* this
         context->unk_18 += 1;
         context->unk_12 = (Random() & 0x3f) + 0x20;
         uVar3 = Random() & 0x18;
-        bVar1 = this->direction;
+        switch (this->direction) {
-        if (bVar1 != 8) {
+            case 0:
-            if (bVar1 >= 9) {
+                if (uVar3 == 0x10) {
-                if (bVar1 == 0x10) {
-                    if (uVar3 == 0) {
-                        uVar3 = 0x18;
-                    }
-                } else {
-                    if ((bVar1 == 0x18) && (uVar3 == 8)) {
-                        uVar3 = 0;
-                    }
-                }
-            } else {
-                if ((bVar1 == 0) && (uVar3 == 0x10)) {
                     uVar3 = 8;
                 }
-            }
+                break;
-        } else {
+            case 0x8:
-            if (uVar3 == 0x18) {
+                if (uVar3 == 0x18) {
-                uVar3 = 0x10;
+                    uVar3 = 0x10;
-            }
+                }
+                break;
+            case 0x10:
+                if (uVar3 == 0) {
+                    uVar3 = 0x18;
+                }
+                break;
+            case 0x18:
+                if ((uVar3 == 8)) {
+                    uVar3 = 0;
+                }
         }
+
         this->direction = (u8)uVar3;
-        uVar3 = sub_0806F5B0(uVar3);
+        this->animationState = sub_0806F5B0(uVar3);
-        this->animationState = (u8)uVar3;
         this->speed = 0x80;
     }
     uVar3 = (this->animationState >> 1) + 4;
     if (uVar3 != this->animIndex) {
         InitializeAnimation(this, uVar3);
-        this->field_0x80.HALF.LO = (u16)this->animIndex;
+        this->field_0x80.HWORD = (u16)this->animIndex;
     }
     ProcessMovement0(this);
-    iVar4 = this->x.HALF.HI - this->field_0x6c.HALF.LO;
+    iVar4 = this->x.HALF.HI - (s16)this->field_0x6c.HWORD;
     if (0x10 < iVar4) {
-        this->x.HALF.HI = this->field_0x6c.HALF.LO + 0x10;
+        this->x.HALF.HI = this->field_0x6c.HWORD + 0x10;
         context->unk_12 = 1;
     }
     if (iVar4 < -0x10) {
-        this->x.HALF.HI = this->field_0x6c.HALF.LO + -0x10;
+        this->x.HALF.HI = this->field_0x6c.HWORD - 0x10;
         context->unk_12 = 1;
     }
-    iVar4 = this->y.HALF.HI - this->field_0x6e.HALF.LO;
+    iVar4 = this->y.HALF.HI - (s16)this->field_0x6e.HWORD;
     if (0x10 < iVar4) {
-        this->y.HALF.HI = this->field_0x6e.HALF.LO + 0x10;
+        this->y.HALF.HI = this->field_0x6e.HWORD + 0x10;
         context->unk_12 = 1;
     }
     if (iVar4 < -0x10) {
-        this->y.HALF.HI = this->field_0x6e.HALF.LO + -0x10;
+        this->y.HALF.HI = this->field_0x6e.HWORD - 0x10;
         context->unk_12 = 1;
     }
-    uVar2 = context->unk_12 - 1;
+    if (--context->unk_12 != 0) {
-    context->unk_12 = uVar2;
-    if (uVar2 != 0) {
         gActiveScriptInfo.commandSize = 0;
     }
 }
-END_NONMATCH
 
 void sub_08062A48(Entity* this, ScriptExecutionContext* context) {
     this->field_0x6a.HALF.LO = sub_0801E99C(this);