From 9dda160a0b20afa7d9aa486ba27d2f2cb147c0b5 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Mon, 7 Aug 2023 08:30:57 -0400
Subject: [PATCH] Match sub_80078E8

---
 asm/text.s  | 35 -----------------------------------
 src/text2.c |  8 ++++++++
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/asm/text.s b/asm/text.s
index 7f1a04786..db0b30c6e 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -5,41 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80078E8
-sub_80078E8:
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r6, r1, 0
-	adds r4, r2, 0
-	mov r8, r3
-	ldr r0, [sp, 0x18]
-	str r0, [sp]
-	adds r0, r5, 0
-	bl nullsub_129
-	adds r4, 0x1
-	ldr r0, _08007928
-	ldr r0, [r0]
-	movs r1, 0xF
-	ands r0, r1
-	str r0, [sp]
-	adds r0, r5, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	mov r3, r8
-	bl nullsub_129
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08007928: .4byte gUnknown_202B030
-	thumb_func_end sub_80078E8
-
 	thumb_func_start sub_800792C
 sub_800792C:
 	push {r4-r6,lr}
diff --git a/src/text2.c b/src/text2.c
index 2aca33d21..733c33b4e 100644
--- a/src/text2.c
+++ b/src/text2.c
@@ -8,6 +8,7 @@ extern const u32 gUnknown_80B8814[];
 // text.s
 extern void sub_8008C6C(struct UnkTextStruct1 *, u32);
 
+void nullsub_129(u32 a0, s32 x, s32 y, u32 a3, u32 color);
 u32 xxx_draw_char(struct UnkTextStruct1 *, s32, s32, u32, u32, u32);
 
 void sub_800677C(struct UnkTextStruct1 *, s32, u16 *, u8);
@@ -1903,4 +1904,11 @@ void sub_80078A4(u32 a0, s32 x, s32 y, u32 a3, u32 color)
 {
     sub_800792C(a0, x, y, a3, color);
     sub_800792C(a0, x, y + 1, a3, gUnknown_202B030 & 0xF);
+}
+
+// Unused
+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);
 }
\ No newline at end of file