From e414e4c1130d7d262e3d374bb2cff8eeaaa0b410 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Mon, 7 Aug 2023 10:14:52 -0400
Subject: [PATCH] Match sub_8007A78 and nullsub_157

---
 asm/text.s         | 28 ----------------------------
 include/text2.h    |  1 +
 src/code_8021774.c |  1 -
 src/text2.c        | 13 ++++++++++++-
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/asm/text.s b/asm/text.s
index e1a72aeb8..01b5c04b0 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -5,34 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8007A78
-sub_8007A78:
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	ldr r1, [sp, 0x18]
-	ldr r0, _08007A9C
-	str r3, [sp]
-	str r1, [sp, 0x4]
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl sub_8007AA4
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08007A9C: .4byte gUnknown_2027370
-	thumb_func_end sub_8007A78
-
-	thumb_func_start nullsub_157
-nullsub_157:
-	bx lr
-	thumb_func_end nullsub_157
-
 	thumb_func_start sub_8007AA4
 sub_8007AA4:
 	push {r4-r7,lr}
diff --git a/include/text2.h b/include/text2.h
index 177f1ee80..fd9b30601 100644
--- a/include/text2.h
+++ b/include/text2.h
@@ -33,6 +33,7 @@ void sub_80073B8(s32);
 void sub_80073E0(s32);
 void sub_80078A4(u32, s32, s32, u32, u32);
 void sub_800792C(u32, s32, s32, u32, u32);
+void sub_8007A78(u32, u32, u32, u32, u32);
 
 // text.s
 extern struct unkChar *GetCharacter(u32);
diff --git a/src/code_8021774.c b/src/code_8021774.c
index b2af0e6a9..b90652ef9 100644
--- a/src/code_8021774.c
+++ b/src/code_8021774.c
@@ -50,7 +50,6 @@ extern u8 *gUnknown_80D49BC[];
 extern u8 gUnknown_80DC524[];
 extern void sub_8008C54(u32);
 extern void sub_8092578(u8 *buffer, u8 index, u8 r2);
-void sub_8007A78(u32, u32, u32, u32, u32);
 
 extern void sub_8021878(void);
 extern void sub_8021894(void);
diff --git a/src/text2.c b/src/text2.c
index 4411b149e..ce3b4b03d 100644
--- a/src/text2.c
+++ b/src/text2.c
@@ -9,6 +9,7 @@ extern const u32 gUnknown_80B8814[];
 extern const struct unkStruct_80B8824 gUnknown_80B8824;
 
 // text.s
+extern void sub_8007AA4(struct UnkTextStruct1 *, u32, u32, u32, u32, u32);
 extern void sub_8008C6C(struct UnkTextStruct1 *, u32);
 
 void nullsub_129(u32, s32, s32, u32, u32);
@@ -2160,4 +2161,14 @@ void sub_8007958(struct UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 co
 "_08007A70: .4byte gUnknown_80B85DC\n"
 "_08007A74: .4byte 0x11111111");
 }
-#endif // NONMATCHING
\ No newline at end of file
+#endif // NONMATCHING
+
+void sub_8007A78(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4)
+{
+    sub_8007AA4(gUnknown_2027370, a0, a1, a2, a3, a4);
+}
+
+// Unused
+void nullsub_157()
+{
+}
\ No newline at end of file