From 297b00a5a84f90b35cfff2b42781c973a3d53385 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Mon, 7 Aug 2023 08:36:03 -0400
Subject: [PATCH] Match sub_800792C and nullsub_129

---
 asm/text.s      | 28 ----------------------------
 include/text2.h |  3 +--
 src/text2.c     | 12 +++++++++++-
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/asm/text.s b/asm/text.s
index db0b30c6..61b92c9d 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -5,34 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_800792C
-sub_800792C:
-	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, _08007950
-	str r3, [sp]
-	str r1, [sp, 0x4]
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl sub_8007958
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08007950: .4byte gUnknown_2027370
-	thumb_func_end sub_800792C
-
-	thumb_func_start nullsub_129
-nullsub_129:
-	bx lr
-	thumb_func_end nullsub_129
-
 	thumb_func_start sub_8007958
 sub_8007958:
 	push {r4-r7,lr}
diff --git a/include/text2.h b/include/text2.h
index edcc2bc1..bedb687e 100644
--- a/include/text2.h
+++ b/include/text2.h
@@ -27,12 +27,11 @@ void sub_8006554(struct UnkTextStruct1 *, u32 *, u32 *, u16 *, u32, const struct
 void sub_80073B8(s32);
 void sub_80073E0(s32);
 void sub_80078A4(u32, s32, s32, u32, u32);
+void sub_800792C(u32, s32, s32, u32, u32);
 
 // text.s
 extern struct unkChar *GetCharacter(u32);
 extern void InitGraphics(void);
 extern void xxx_call_draw_string(s32 x, u32 y, const u8 *str, u32 , u32);
 
-extern void sub_800792C(u32, s32, s32, u32, u32);
-
 #endif // GUARD_TEXT2_H
\ No newline at end of file
diff --git a/src/text2.c b/src/text2.c
index 733c33b4..342da0bb 100644
--- a/src/text2.c
+++ b/src/text2.c
@@ -6,9 +6,10 @@
 extern const u32 gUnknown_80B8814[];
 
 // text.s
+extern void sub_8007958(struct UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, u32 a4, u32 color);
 extern void sub_8008C6C(struct UnkTextStruct1 *, u32);
 
-void nullsub_129(u32 a0, s32 x, s32 y, u32 a3, u32 color);
+void nullsub_129(u32, s32, s32, u32, u32);
 u32 xxx_draw_char(struct UnkTextStruct1 *, s32, s32, u32, u32, u32);
 
 void sub_800677C(struct UnkTextStruct1 *, s32, u16 *, u8);
@@ -1911,4 +1912,13 @@ void sub_80078E8(u32 a0, s32 x, s32 y, u32 a3, u32 color)
 {
     nullsub_129(a0, x, y, a3, color);
     nullsub_129(a0, x, y + 1, a3, gUnknown_202B030 & 0xF);
+}
+
+void sub_800792C(u32 a0, s32 x, s32 y, u32 a3, u32 color)
+{ 
+    sub_8007958(gUnknown_2027370, a0, x, y, a3, color);
+}
+
+void nullsub_129(u32 a0, s32 x, s32 y, u32 a3, u32 color)
+{
 }
\ No newline at end of file