From e9c981e1b7b2a77f00beb12f3bf093ef650f23b5 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sat, 3 Jun 2023 13:29:20 -0700
Subject: [PATCH] simple decomp of nullsub funcs

---
 asm/code_800D090.s   | 98 --------------------------------------------
 ld_script.txt        |  1 +
 src/code_800D090_1.c | 63 ++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 98 deletions(-)
 create mode 100644 src/code_800D090_1.c

diff --git a/asm/code_800D090.s b/asm/code_800D090.s
index ff13af4b7..a6f1c4b42 100644
--- a/asm/code_800D090.s
+++ b/asm/code_800D090.s
@@ -1085,102 +1085,4 @@ _0800DA70: .4byte 0x04000004
 _0800DA74: .4byte 0x05000004
 	thumb_func_end sub_800D9B8
 
-	thumb_func_start nullsub_189
-nullsub_189:
-	bx lr
-	thumb_func_end nullsub_189
-
-	thumb_func_start nullsub_190
-nullsub_190:
-	bx lr
-	thumb_func_end nullsub_190
-
-	thumb_func_start nullsub_191
-nullsub_191:
-	bx lr
-	thumb_func_end nullsub_191
-
-	thumb_func_start nullsub_192
-nullsub_192:
-	bx lr
-	thumb_func_end nullsub_192
-
-	thumb_func_start nullsub_193
-nullsub_193:
-	bx lr
-	thumb_func_end nullsub_193
-
-	thumb_func_start nullsub_194
-nullsub_194:
-	bx lr
-	thumb_func_end nullsub_194
-
-	thumb_func_start nullsub_195
-nullsub_195:
-	bx lr
-	thumb_func_end nullsub_195
-
-	thumb_func_start sub_800DA94
-sub_800DA94:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DA94
-
-	thumb_func_start sub_800DA98
-sub_800DA98:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DA98
-
-	thumb_func_start sub_800DA9C
-sub_800DA9C:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DA9C
-
-	thumb_func_start nullsub_196
-nullsub_196:
-	bx lr
-	thumb_func_end nullsub_196
-
-	thumb_func_start nullsub_197
-nullsub_197:
-	bx lr
-	thumb_func_end nullsub_197
-
-	thumb_func_start nullsub_198
-nullsub_198:
-	bx lr
-	thumb_func_end nullsub_198
-
-	thumb_func_start sub_800DAAC
-sub_800DAAC:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DAAC
-
-	thumb_func_start sub_800DAB0
-sub_800DAB0:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DAB0
-
-	thumb_func_start sub_800DAB4
-sub_800DAB4:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DAB4
-
-	thumb_func_start sub_800DAB8
-sub_800DAB8:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DAB8
-
-	thumb_func_start sub_800DABC
-sub_800DABC:
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_800DABC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index 296eafdcf..f80eb8226 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -85,6 +85,7 @@ SECTIONS {
         src/flash.o(.text);
         src/code_800D090.o(.text);
         asm/code_800D090.o(.text);
+        src/code_800D090_1.o(.text);
         src/code_800DAC0.o(.text);
         asm/code_800DAC0.o(.text);
         src/code_80118A4.o(.text);
diff --git a/src/code_800D090_1.c b/src/code_800D090_1.c
new file mode 100644
index 000000000..0bc59cad6
--- /dev/null
+++ b/src/code_800D090_1.c
@@ -0,0 +1,63 @@
+#include "global.h"
+
+void nullsub_189(void)
+{}
+
+void nullsub_190(void)
+{}
+
+void nullsub_191(void)
+{}
+
+void nullsub_192(void)
+{}
+
+void nullsub_193(void)
+{}
+
+void nullsub_194(void)
+{}
+
+void nullsub_195(void)
+{}
+
+u32 sub_800DA94(void) {
+    return 0;
+}
+
+u32 sub_800DA98(void) {
+    return 0;
+}
+
+u32 sub_800DA9C(void) {
+    return 0;
+}
+
+void nullsub_196(void)
+{}
+
+void nullsub_197(void)
+{}
+
+void nullsub_198(void)
+{}
+
+u32 sub_800DAAC(void) {
+    return 0;
+}
+
+u32 sub_800DAB0(void) {
+    return 0;
+}
+
+u32 sub_800DAB4(void) {
+    return 0;
+}
+
+u32 sub_800DAB8(void) {
+    return 0;
+}
+
+u32 sub_800DABC(void) {
+    return 0;
+}