sub_8018404

2 files changed, 6 insertions, 17 deletions

diff --git a/asm/union_room.s b/asm/union_room.s
index fda2ebffe..b83d579c7 100755
--- a/asm/union_room.s
+++ b/asm/union_room.s
@@ -5,23 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8018404
-sub_8018404: @ 8018404
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	adds r1, 0x10
-	bl StringCopy7
-	ldrb r1, [r4]
-	lsls r1, 28
-	lsrs r1, 28
-	adds r0, r5, 0
-	bl ConvertInternationalString
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8018404
-
     @ file boundary?
 
 	thumb_func_start sub_8018424
diff --git a/src/union_room.c b/src/union_room.c
index 9483a2828..6928f13d6 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -5383,3 +5383,9 @@ void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2)
         StringAppend(gStringVar4, arg1->field_1A4);
     }
 }
+
+void sub_8018404(u8 *dest, struct UnkStruct_x20 *arg1)
+{
+    StringCopy7(dest, arg1->unk.playerName);
+    ConvertInternationalString(dest, arg1->unk.field_0.unk_00.unk_00_0);
+}