diff --git a/asm/include/main_0205B584.inc b/asm/include/main_0205B5A8.inc
similarity index 99%
rename from asm/include/main_0205B584.inc
rename to asm/include/main_0205B5A8.inc
index 676f96f4..6f428bc4 100644
--- a/asm/include/main_0205B584.inc
+++ b/asm/include/main_0205B5A8.inc
@@ -360,7 +360,6 @@
 .public sub_02048624
 .public sub_02048644
 .public sub_0204872C
-.public sub_02048C3C
 .public sub_0204A1A4
 .public sub_0204D018
 .public sub_0204E210
diff --git a/asm/main_0205B584.s b/asm/main_0205B5A8.s
similarity index 99%
rename from asm/main_0205B584.s
rename to asm/main_0205B5A8.s
index 274fdbdd..3eb3a3b1 100644
--- a/asm/main_0205B584.s
+++ b/asm/main_0205B5A8.s
@@ -1,22 +1,8 @@
 	.include "asm/macros.inc"
-	.include "main_0205B584.inc"
+	.include "main_0205B5A8.inc"
 
 	.text
 
-	arm_func_start sub_0205B584
-sub_0205B584: ; 0x0205B584
-	stmdb sp!, {r4, lr}
-	ldr r1, _0205B5A4 ; =_022B57BC
-	mov r4, r0
-	ldr r0, [r1]
-	str r0, [r4]
-	bl sub_02048C3C
-	str r0, [r4, #4]
-	ldmia sp!, {r4, pc}
-	.align 2, 0
-_0205B5A4: .word _022B57BC
-	arm_func_end sub_0205B584
-
 	arm_func_start sub_0205B5A8
 sub_0205B5A8: ; 0x0205B5A8
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
diff --git a/include/main_0205B554.h b/include/main_0205B554.h
index 17188ae4..be96a4b3 100644
--- a/include/main_0205B554.h
+++ b/include/main_0205B554.h
@@ -10,5 +10,6 @@ struct unkStruct_0205B560 {
 
 void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2);
 bool8 sub_0205B560(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2);
+void sub_0205B584(struct unkStruct_0205B560 *ptr);
 
 #endif //PMDSKY_MAIN_0205B554_H
diff --git a/main.lsf b/main.lsf
index 46ef8bfa..89d421e6 100644
--- a/main.lsf
+++ b/main.lsf
@@ -146,7 +146,7 @@ Static main
 	Object src/main_0205B440.o
 	Object asm/main_0205B478.o
 	Object src/main_0205B554.o
-	Object asm/main_0205B584.o
+	Object asm/main_0205B5A8.o
 	Object src/dungeon_init_2.o
 	Object asm/main_0206A750.o
 	Object src/main_0206C98C.o
diff --git a/src/main_0205B554.c b/src/main_0205B554.c
index cbadb13e..766f86eb 100644
--- a/src/main_0205B554.c
+++ b/src/main_0205B554.c
@@ -1,5 +1,8 @@
 #include "main_0205B554.h"
 
+extern u32 sub_02048C3C(void);
+extern u32 _022B57BC;
+
 void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2)
 {
     sub_0205B560(v1, v2);
@@ -14,3 +17,9 @@ bool8 sub_0205B560(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2)
 
     return FALSE;
 }
+
+void sub_0205B584(struct unkStruct_0205B560 *ptr)
+{
+    ptr->unk0 = _022B57BC;
+    ptr->unk1 = sub_02048C3C();
+}