From ec786e0a46af8306714c3eb370ca0c51f03628da Mon Sep 17 00:00:00 2001
From: Drew T <50529377+Druthulu@users.noreply.github.com>
Date: Fri, 4 Sep 2026 19:00:03 -0600
Subject: [PATCH] =?UTF-8?q?feat(phase-31):=20S79=20#9=20(2)=20=E2=80=94=20?=
 =?UTF-8?q?main:=20func=5F80015608=20(86=20ins)=20banked:=20a=20Sonnet=20a?=
 =?UTF-8?q?gent=20closed=20the=20permuter's=20last=20instruction=20by=20ro?=
 =?UTF-8?q?uting=20the=20accumulator=20add=20through=20a=20fresh=20temp=20?=
 =?UTF-8?q?({=20s32=20xt=20=3D=20blockSize=20+=20x0;=20x0=20=3D=20xt;=20}?=
 =?UTF-8?q?=20=E2=80=94=20expand=5Fbinop's=20target=3D=3Dop1=20swap=20does?=
 =?UTF-8?q?=20not=20fire=20on=20a=20new=20pseudo);=20gate=5Fmain=20BYTE-ID?=
 =?UTF-8?q?ENTICAL=20143dbb89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/800.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/src/800.c b/src/800.c
index 16514661c..d71a69736 100644
--- a/src/800.c
+++ b/src/800.c
@@ -2723,7 +2723,75 @@ void func_80015498(void)
     }
 }
 
-INCLUDE_ASM("asm/nonmatchings/800", func_80015608);
+extern u16 D_800AF7BC;
+extern u16 D_800AF7BE;
+extern u8 *D_800A5E60;
+extern s16 *func_80015908(s32 a0, s32 a1);
+
+void func_80015608(s32 arg0, s32 arg1)
+{
+  int new_var2;
+  u8 *icon;
+  int new_var;
+  s32 x0;
+  s32 flags;
+register s32 blockSize __asm__("$22");
+register u32 code __asm__("$3");
+register s32 htmp __asm__("$3");
+  u8 *cur;
+  u32 rgbc;
+  s32 y0;
+  u32 y0hi;
+  u16 *tex;
+  u32 *otp;
+register u32 tagconst __asm__("$20");
+register u32 mask __asm__("$3");
+  otp = (u32 *) arg1;
+  icon = *((u8 **) (((u8 *) arg0) + 8));
+  htmp = *((u16 *) (((u8 *) arg0) + 2));
+  x0 = htmp - (D_800AF7BC >> 1);
+  flags = *(((u8 *) arg0) + 0xC);
+  htmp = *((u16 *) (((u8 *) arg0) + 4));
+  y0 = htmp - (D_800AF7BE >> 1);
+  new_var = 0x03000000;
+  blockSize = (flags & 0x80) ? (0x10) : (8);
+  code = blockSize & 0xFF;
+  if (code == 8)
+  {
+    code = 0x74000000;
+  }
+  else
+  {
+    code = 0x7C000000;
+  }
+  cur = D_800A5E60;
+  tagconst = new_var;
+  if ((*icon) != 0)
+  {
+    rgbc = code | 0x808080;
+    y0hi = y0 << 16;
+    do
+    {
+      *((u32 *) (cur + 4)) = rgbc;
+      *((u32 *) (cur + 8)) = ((u16) x0) | y0hi;
+      {
+        s32 xt = blockSize + x0;
+        x0 = xt;
+      }
+      tex = func_80015908(*icon, (u16) flags);
+      icon++;
+      mask = 0x00FFFFFF;
+      new_var2 = 0x40560000;
+      new_var = 0x10;
+      *((u32 *) (cur + 0xC)) = (*tex) | new_var2;
+      *((u32 *) cur) = ((*otp) & mask) | tagconst;
+      *otp = ((u32) cur) & mask;
+      cur += new_var;
+    }
+    while ((*icon) != 0);
+  }
+  D_800A5E60 = cur;
+}
 
 
 typedef struct