From cdf50f96d74f576fe16602ec1b0da9c4e18d9ae1 Mon Sep 17 00:00:00 2001
From: Drew T <50529377+Druthulu@users.noreply.github.com>
Date: Fri, 4 Sep 2026 19:43:50 -0600
Subject: [PATCH] =?UTF-8?q?feat(phase-31):=20S79=20#9=20(6)=20=E2=80=94=20?=
 =?UTF-8?q?ov=5FSC06=5F010:=20func=5F801809E4=20(33=20ins)=20banked=20by?=
 =?UTF-8?q?=20the=20Sonnet=20escalation=20(the=20Haiku=20plateau's=20missi?=
 =?UTF-8?q?ng=202=20ins=20was=20an=20early=20return=20that=20should=20fall?=
 =?UTF-8?q?=20through=20into=20the=20shared=20mask/store=20tail;=20the=20-?=
 =?UTF-8?q?0x10=20no-save=20frame=20is=20two=20s16=20locals,=20=C2=A7186b)?=
 =?UTF-8?q?;=20real-TU=20MATCH,=20worktree=20gate=20+=20in-tree=20byte-ide?=
 =?UTF-8?q?ntical?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c | 24 ++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c b/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c
index 0ab1f1d67..a3e62a983 100644
--- a/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c
+++ b/src/ov_SC06_010/ov_SC06_010_jr_8017A4AC.c
@@ -6522,7 +6522,29 @@ void func_8018098C(s32 a0) {
 }
 
 
-INCLUDE_ASM("asm/ov_SC06_010/nonmatchings/ov_SC06_010_jr_8017A4AC", func_801809E4);
+extern u16 D_80126B66;
+
+void func_801809E4(s32 a0) {
+    s16 v0;
+    s16 v1;
+
+    if (*(s32 *)(a0 + 0x1C) != 0) {
+        *(s32 *)(a0 + 0x1C) -= 1;
+        return;
+    }
+    *(u16 *)(a0 + 6) = 0;
+    *(s16 *)(a0 + 0xA) = -0x500;
+    v0 = D_80126B66;
+    v1 = *(s16 *)(a0 + 0x8C);
+    if (v0 >= v1) {
+        *(s16 *)(a0 + 0xE) = v1 - 0x200;
+    } else {
+        *(s16 *)(a0 + 0xE) = v0 - 0x200;
+    }
+    *(u32 *)(*(s32 *)(a0 + 0x20) + 4) &= 0x7FFFFFFF;
+    *(u16 *)(a0 + 2) = 1;
+}
+
 
 
 extern s32 func_80180A88(void);