From 9538855d9a532c9839b962c755640829d9432cea Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 28 Mar 2019 08:42:35 -0400
Subject: [PATCH] Through sub_80173D4

---
 asm/union_room.s | 28 ----------------------------
 src/union_room.c | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/asm/union_room.s b/asm/union_room.s
index e227323e1..79bd7d96f 100755
--- a/asm/union_room.s
+++ b/asm/union_room.s
@@ -5,34 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80173B0
-sub_80173B0: @ 80173B0
-	push {lr}
-	sub sp, 0xC
-	movs r0, 0x20
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl FillBgTilemapBufferRect
-	movs r0, 0
-	bl CopyBgTilemapBufferToVram
-	add sp, 0xC
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80173B0
-
-	thumb_func_start sub_80173D4
-sub_80173D4: @ 80173D4
-	push {lr}
-	bl EnableBothScriptContexts
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80173D4
-
 	thumb_func_start sub_80173E0
 sub_80173E0: @ 80173E0
 	push {r4,r5,lr}
diff --git a/src/union_room.c b/src/union_room.c
index 90631dab4..f153801a2 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -3934,3 +3934,31 @@ s32 sub_80172A0(u8 *arg0, u8 *arg1, u8 *arg2, u8 *arg3, const struct WindowTempl
                 "\tbx r1");
 }
 #endif
+
+void sub_80173B0(void)
+{
+    FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0);
+    CopyBgTilemapBufferToVram(0);
+}
+
+void sub_80173D4(void)
+{
+    EnableBothScriptContexts();
+}
+
+/*
+void sub_80173E0(u8 windowId, u8 arg1, const u8 *str, u8 arg3, u8 arg4, u8 arg5)
+{
+    struct TextPrinterTemplate sp0 = {
+        .currentChar = str,
+        .windowId = windowId,
+        .fontId = arg1,
+        .x = arg3,
+        .y = arg4,
+        .currentX = arg3,
+        .currentY = arg4
+    };
+
+    // to be continued
+}
+*/