From d336ed15ec72fdacd7eaef23f9dfa26be1ec996c Mon Sep 17 00:00:00 2001
From: Drew T <50529377+Druthulu@users.noreply.github.com>
Date: Mon, 24 Aug 2026 07:18:47 -0600
Subject: [PATCH] =?UTF-8?q?feat(decomp):=20free=20A-prop=20sibling=20lane?=
 =?UTF-8?q?=20(maintenance=20pass)=20=E2=80=94=20zero=20model=20tokens?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/md_MAIN_003/md_MAIN_003.c             | 14 +++++++++++++-
 src/ov_SC06_024/ov_SC06_024_jr_801851E0.c | 10 +---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/md_MAIN_003/md_MAIN_003.c b/src/md_MAIN_003/md_MAIN_003.c
index 9e7d7daa9..49ec3dbec 100644
--- a/src/md_MAIN_003/md_MAIN_003.c
+++ b/src/md_MAIN_003/md_MAIN_003.c
@@ -333,7 +333,19 @@ s32 func_800D1E18(void) {
 }
 
 
-INCLUDE_ASM("asm/md_MAIN_003/nonmatchings/md_MAIN_003", func_800D1E58);
+
+
+extern D_800D942C_entry D_800D942C[];
+extern s32 D_800EC9E0;
+extern void func_800D1E9C(void *arg0);
+extern void func_8001BFB0(void);
+
+void func_800D1E58(void) {
+    D_800EC9E0 = 0;
+    func_800D1E9C(&D_800D942C[func_8001BFA0()]);
+    func_8001BFB0();
+}
+
 
 INCLUDE_ASM("asm/md_MAIN_003/nonmatchings/md_MAIN_003", func_800D1E9C);
 
diff --git a/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c b/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c
index bdbdefabf..c3ded08a3 100644
--- a/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c
+++ b/src/ov_SC06_024/ov_SC06_024_jr_801851E0.c
@@ -3156,15 +3156,7 @@ void func_8018588C(s32 p) {
 }
 
 
-extern short D_801D33F4;
-extern void func_8012A828(s32, void *);
-
-void func_8018596C(s32 a0) {
-    *(s16 *)(a0 + 0x1b) = 2;
-    func_8012A828(a0, &(*(u8 *)&D_801D33F4));
-    *(s32 *)(a0 + 0x1C) = 0x20;
-}
-
+INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_801851E0", func_8018596C);
 
 INCLUDE_ASM("asm/ov_SC06_024/nonmatchings/ov_SC06_024_jr_801851E0", func_801859AC);