sub_8136C6C

3 files changed, 20 insertions, 75 deletions

diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s
index 27ccf4da3..64157f558 100755
--- a/asm/use_pokeblock.s
+++ b/asm/use_pokeblock.s
@@ -6,81 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8136C6C
-sub_8136C6C: @ 8136C6C
-	push {lr}
-	ldr r0, _08136C8C @ =gWindowConfig_81E709C
-	bl BasicInitMenuWindow
-	movs r0, 0
-	movs r1, 0x10
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuDrawTextWindow
-	ldr r3, _08136C90 @ =gUnknown_02039304
-	ldr r0, [r3]
-	adds r0, 0x53
-	movs r1, 0
-	b _08136C9C
-	.align 2, 0
-_08136C8C: .4byte gWindowConfig_81E709C
-_08136C90: .4byte gUnknown_02039304
-_08136C94:
-	ldr r0, [r3]
-	adds r0, 0x53
-	ldrb r1, [r0]
-	adds r1, 0x1
-_08136C9C:
-	strb r1, [r0]
-	ldr r2, [r3]
-	adds r1, r2, 0
-	adds r1, 0x53
-	ldrb r0, [r1]
-	cmp r0, 0x4
-	bhi _08136CDC
-	adds r0, r2, 0
-	adds r0, 0x61
-	ldrb r1, [r1]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08136C94
-	ldr r0, _08136CD8 @ =gUnknown_02039304
-	ldr r2, [r0]
-	adds r1, r2, 0
-	adds r1, 0x53
-	ldrb r0, [r1]
-	cmp r0, 0x4
-	bhi _08136CDC
-	adds r0, r2, 0
-	adds r0, 0x10
-	ldrb r1, [r1]
-	adds r2, 0x61
-	adds r2, r1
-	ldrb r2, [r2]
-	bl sub_8136DC0
-	b _08136CEE
-	.align 2, 0
-_08136CD8: .4byte gUnknown_02039304
-_08136CDC:
-	ldr r0, _08136CFC @ =gUnknown_02039304
-	ldr r1, [r0]
-	adds r0, r1, 0
-	adds r0, 0x10
-	adds r1, 0x53
-	ldrb r1, [r1]
-	movs r2, 0
-	bl sub_8136DC0
-_08136CEE:
-	ldr r0, _08136CFC @ =gUnknown_02039304
-	ldr r0, [r0]
-	adds r0, 0x10
-	bl sub_8136DA0
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08136CFC: .4byte gUnknown_02039304
-	thumb_func_end sub_8136C6C
-
 	thumb_func_start sub_8136D00
 sub_8136D00: @ 8136D00
 	push {r4,r5,lr}
diff --git a/include/pokenav.h b/include/pokenav.h
index 87ba4d42c..87079600d 100755
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -21,6 +21,8 @@ struct UnkPokenavStruct_Sub1 {
     /*0x56*/ u8 unk56;
     /*0x57*/ u8 fil57[5];
     /*0x5c*/ u8 unk5c[1];
+    /*0x5d*/ u8 fil5d[4];
+    /*0x61*/ u8 unk61[5];
 };
 
 struct UnkPokenavStruct_Sub2 {
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index e6875645b..0c2ba8642 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -54,6 +54,8 @@ void sub_8136EF0(void);
 void sub_8137138(void);
 void sub_8136C6C(void);
 bool8 sub_8136D00(void);
+void sub_8136DC0(u8 *, u8, u8);
+void sub_8136DA0(u8 *);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -545,3 +547,19 @@ s8 sub_8136C40(void)
     }
     return retval;
 }
+
+void sub_8136C6C(void)
+{
+    BasicInitMenuWindow(&gWindowConfig_81E709C);
+    MenuDrawTextWindow(0, 16, 29, 19);
+    for (gUnknown_02039304->unk53 = 0; gUnknown_02039304->unk53 < 5 && gUnknown_02039304->unk61[gUnknown_02039304->unk53] == 0; gUnknown_02039304->unk53++);
+    if (gUnknown_02039304->unk53 < 5)
+    {
+        sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, gUnknown_02039304->unk61[gUnknown_02039304->unk53]);
+    }
+    else
+    {
+        sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, 0);
+    }
+    sub_8136DA0(gUnknown_02039304->stringBuffer);
+}