diff --git a/asm/non_matching/kid/sub_08062634.inc b/asm/non_matching/kid/sub_08062634.inc deleted file mode 100644 index 2c665de5..00000000 --- a/asm/non_matching/kid/sub_08062634.inc +++ /dev/null @@ -1,22 +0,0 @@ - .syntax unified - .text - - push {r4, r5, lr} - adds r5, r0, #0 - ldrb r4, [r5, #0xb] - bl Random - movs r1, #1 - ands r1, r0 - ldr r0, _08062658 @ =gUnk_0810BDE8 - lsls r1, r1, #1 - lsls r4, r4, #2 - adds r1, r1, r4 - adds r1, r1, r0 - ldrh r0, [r1] - adds r1, r5, #0 - bl MessageNoOverlap - pop {r4, r5, pc} - .align 2, 0 -_08062658: .4byte gUnk_0810BDE8 - - .syntax divided diff --git a/src/npc/kid.c b/src/npc/kid.c index 18f9bb7d..9b116b0a 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -20,7 +20,7 @@ typedef struct { u8 unk_7; } KidHeap; -extern u16 gUnk_0810BDE8[]; +extern u16 gUnk_0810BDE8[][2]; extern Dialog gUnk_0810BE10[]; @@ -193,12 +193,11 @@ NONMATCH("asm/non_matching/kid/sub_0806252C.inc", void sub_0806252C(Entity* this } END_NONMATCH -NONMATCH("asm/non_matching/kid/sub_08062634.inc", void sub_08062634(Entity* this)) { +void sub_08062634(Entity* this) { u32 a = this->type2; u32 b = (Random() & 1); - MessageNoOverlap(*((u16*)gUnk_0810BDE8 + b + a * 2), this); + MessageNoOverlap(gUnk_0810BDE8[a][b], this); } -END_NONMATCH NONMATCH("asm/non_matching/kid/sub_0806265C.inc", void sub_0806265C(Entity* this, ScriptExecutionContext* context)) { if (gSave.global_progress == 0) {