summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/code_800AAA0.s10
-rw-r--r--asm/event_flag.s5
-rwxr-xr-xld_script.txt1
-rw-r--r--src/file_system.c8
4 files changed, 9 insertions, 15 deletions
diff --git a/asm/code_800AAA0.s b/asm/code_800AAA0.s
index 44a0085..bce8e88 100644
--- a/asm/code_800AAA0.s
+++ b/asm/code_800AAA0.s
@@ -5,16 +5,6 @@
.text
- thumb_func_start nullsub_16
-nullsub_16:
- bx lr
- thumb_func_end nullsub_16
-
- thumb_func_start nullsub_175
-nullsub_175:
- bx lr
- thumb_func_end nullsub_175
-
thumb_func_start sub_800AAA8
sub_800AAA8:
push {lr}
diff --git a/asm/event_flag.s b/asm/event_flag.s
index aea4c65..f29c30c 100644
--- a/asm/event_flag.s
+++ b/asm/event_flag.s
@@ -2583,9 +2583,4 @@ sub_800276C:
bx lr
thumb_func_end sub_800276C
- thumb_func_start nullsub_140
-nullsub_140:
- bx lr
- thumb_func_end nullsub_140
-
.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index ef1810e..f22c068 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -42,6 +42,7 @@ SECTIONS {
asm/crt0.o(.text);
asm/code.o(.text);
asm/event_flag.o(.text);
+ src/event_flag.o(.text);
asm/code_8002774.o(.text);
src/memory.o(.text);
asm/memory.o(.text);
diff --git a/src/file_system.c b/src/file_system.c
index 61d9ec4..1555a65 100644
--- a/src/file_system.c
+++ b/src/file_system.c
@@ -173,3 +173,11 @@ void *UnusedGetSir0Ptr(struct SiroArchive *siro)
void NDS_DecompressRLE(void *unused)
{
}
+
+void nullsub_16(void)
+{
+}
+
+void nullsub_175(void)
+{
+}