Merge pull request #363 from remicalixte/unk_02031480

decompile unk_02031480.s

7 files changed, 251 insertions, 415 deletions

diff --git a/arm9/asm/unk_02031480.s b/arm9/asm/unk_02031480.s
deleted file mode 100644
index 58ff4996..00000000
--- a/arm9/asm/unk_02031480.s
+++ /dev/null
@@ -1,405 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .bss
-
-	.global UNK_021C59FC
-UNK_021C59FC: ; 0x021C59FC
-	.space 0x4
-
-	.text
-
-	thumb_func_start FUN_02031480
-FUN_02031480: ; 0x02031480
-	push {r4, lr}
-	ldr r1, _020314C8 ; =UNK_021C59FC
-	ldr r1, [r1, #0x0]
-	cmp r1, #0x0
-	bne _0203149C
-	ldr r1, _020314CC ; =0x00000253
-	bl AllocFromHeap
-	ldr r1, _020314C8 ; =UNK_021C59FC
-	ldr r2, _020314CC ; =0x00000253
-	str r0, [r1, #0x0]
-	mov r1, #0x0
-	bl MI_CpuFill8
-_0203149C:
-	ldr r1, _020314C8 ; =UNK_021C59FC
-	mov r3, #0x0
-	mov r0, #0xff
-_020314A2:
-	ldr r2, [r1, #0x0]
-	add r2, r2, r3
-	add r3, r3, #0x1
-	strb r0, [r2, #0x10]
-	cmp r3, #0x8
-	blt _020314A2
-	ldr r3, _020314C8 ; =UNK_021C59FC
-	mov r1, #0x25
-	ldr r2, [r3, #0x0]
-	lsl r1, r1, #0x4
-	strb r0, [r2, r1]
-	ldr r4, [r3, #0x0]
-	add r2, r1, #0x1
-	strb r0, [r4, r2]
-	ldr r2, [r3, #0x0]
-	mov r4, #0x0
-	add r0, r1, #0x2
-	strb r4, [r2, r0]
-	pop {r4, pc}
-	.balign 4
-_020314C8: .word UNK_021C59FC
-_020314CC: .word 0x00000253
-
-	thumb_func_start FUN_020314D0
-FUN_020314D0: ; 0x020314D0
-	push {r3, lr}
-	ldr r0, _020314E4 ; =UNK_021C59FC
-	ldr r0, [r0, #0x0]
-	bl FreeToHeap
-	ldr r0, _020314E4 ; =UNK_021C59FC
-	mov r1, #0x0
-	str r1, [r0, #0x0]
-	pop {r3, pc}
-	nop
-_020314E4: .word UNK_021C59FC
-
-	thumb_func_start FUN_020314E8
-FUN_020314E8: ; 0x020314E8
-	ldr r0, _020314F8 ; =UNK_021C59FC
-	ldr r0, [r0, #0x0]
-	cmp r0, #0x0
-	beq _020314F4
-	mov r0, #0x1
-	bx lr
-_020314F4:
-	mov r0, #0x0
-	bx lr
-	.balign 4
-_020314F8: .word UNK_021C59FC
-
-	thumb_func_start FUN_020314FC
-FUN_020314FC: ; 0x020314FC
-	push {r3-r6, lr}
-	sub sp, #0x4
-	ldrb r1, [r2, #0x0]
-	add r5, r0, #0x0
-	add r0, sp, #0x0
-	strb r1, [r0, #0x0]
-	bl FUN_02031190
-	cmp r0, #0x0
-	bne _02031556
-	add r0, sp, #0x0
-	strb r5, [r0, #0x1]
-	ldrb r1, [r0, #0x0]
-	strb r1, [r0, #0x2]
-	add r1, sp, #0x0
-	mov r0, #0x12
-	add r1, #0x1
-	bl FUN_02030C4C
-	ldr r6, _0203155C ; =UNK_021C59FC
-	add r4, sp, #0x0
-	ldr r0, [r6, #0x0]
-	ldrb r1, [r4, #0x0]
-	add r0, r0, r5
-	mov r5, #0x0
-	strb r1, [r0, #0x10]
-_02031530:
-	lsl r0, r5, #0x10
-	lsr r0, r0, #0x10
-	bl FUN_02030E7C
-	cmp r0, #0x0
-	beq _02031548
-	ldr r0, [r6, #0x0]
-	ldrb r1, [r4, #0x0]
-	add r0, r0, r5
-	ldrb r0, [r0, #0x10]
-	cmp r1, r0
-	bne _02031556
-_02031548:
-	add r5, r5, #0x1
-	cmp r5, #0x8
-	blt _02031530
-	mov r0, #0x11
-	add r1, sp, #0x0
-	bl FUN_02030C4C
-_02031556:
-	add sp, #0x4
-	pop {r3-r6, pc}
-	nop
-_0203155C: .word UNK_021C59FC
-
-	thumb_func_start FUN_02031560
-FUN_02031560: ; 0x02031560
-	ldr r0, _02031570 ; =UNK_021C59FC
-	ldrb r3, [r2, #0x1]
-	ldr r1, [r0, #0x0]
-	ldrb r0, [r2, #0x0]
-	add r0, r1, r0
-	strb r3, [r0, #0x10]
-	bx lr
-	nop
-_02031570: .word UNK_021C59FC
-
-	thumb_func_start FUN_02031574
-FUN_02031574: ; 0x02031574
-	ldr r0, _02031584 ; =UNK_021C59FC
-	ldrb r2, [r2, #0x0]
-	ldr r1, [r0, #0x0]
-	mov r0, #0x25
-	lsl r0, r0, #0x4
-	strb r2, [r1, r0]
-	bx lr
-	nop
-_02031584: .word UNK_021C59FC
-
-	thumb_func_start FUN_02031588
-FUN_02031588: ; 0x02031588
-	ldr r2, _0203159C ; =UNK_021C59FC
-	ldr r1, _020315A0 ; =0x00000251
-	ldr r3, [r2, #0x0]
-	strb r0, [r3, r1]
-	ldr r2, [r2, #0x0]
-	mov r3, #0x1
-	add r0, r1, #0x1
-	strb r3, [r2, r0]
-	bx lr
-	nop
-_0203159C: .word UNK_021C59FC
-_020315A0: .word 0x00000251
-
-	thumb_func_start FUN_020315A4
-FUN_020315A4: ; 0x020315A4
-	push {r3, lr}
-	ldr r0, _020315D0 ; =UNK_021C59FC
-	ldr r2, [r0, #0x0]
-	cmp r2, #0x0
-	beq _020315CE
-	ldr r1, _020315D4 ; =0x00000252
-	ldrb r0, [r2, r1]
-	cmp r0, #0x0
-	beq _020315CE
-	sub r1, r1, #0x1
-	mov r0, #0x10
-	add r1, r2, r1
-	bl FUN_020311D0
-	cmp r0, #0x0
-	beq _020315CE
-	ldr r0, _020315D0 ; =UNK_021C59FC
-	mov r2, #0x0
-	ldr r1, [r0, #0x0]
-	ldr r0, _020315D4 ; =0x00000252
-	strb r2, [r1, r0]
-_020315CE:
-	pop {r3, pc}
-	.balign 4
-_020315D0: .word UNK_021C59FC
-_020315D4: .word 0x00000252
-
-	thumb_func_start FUN_020315D8
-FUN_020315D8: ; 0x020315D8
-	ldr r1, _020315F8 ; =UNK_021C59FC
-	ldr r2, [r1, #0x0]
-	cmp r2, #0x0
-	bne _020315E4
-	mov r0, #0x1
-	bx lr
-_020315E4:
-	mov r1, #0x25
-	lsl r1, r1, #0x4
-	ldrb r1, [r2, r1]
-	cmp r1, r0
-	bne _020315F2
-	mov r0, #0x1
-	bx lr
-_020315F2:
-	mov r0, #0x0
-	bx lr
-	nop
-_020315F8: .word UNK_021C59FC
-
-	thumb_func_start FUN_020315FC
-FUN_020315FC: ; 0x020315FC
-	ldr r1, _02031608 ; =UNK_021C59FC
-	ldr r1, [r1, #0x0]
-	add r0, r1, r0
-	ldrb r0, [r0, #0x10]
-	bx lr
-	nop
-_02031608: .word UNK_021C59FC
-
-	thumb_func_start FUN_0203160C
-FUN_0203160C: ; 0x0203160C
-	push {r3-r4}
-	lsl r4, r0, #0x1
-	ldr r0, _02031624 ; =UNK_021C59FC
-	ldrb r3, [r2, #0x0]
-	ldr r1, [r0, #0x0]
-	strb r3, [r1, r4]
-	ldr r0, [r0, #0x0]
-	ldrb r1, [r2, #0x1]
-	add r0, r0, r4
-	strb r1, [r0, #0x1]
-	pop {r3-r4}
-	bx lr
-	.balign 4
-_02031624: .word UNK_021C59FC
-
-	thumb_func_start FUN_02031628
-FUN_02031628: ; 0x02031628
-	mov r0, #0x2
-	bx lr
-
-	thumb_func_start FUN_0203162C
-FUN_0203162C: ; 0x0203162C
-	push {r3, lr}
-	add r2, sp, #0x0
-	strb r0, [r2, #0x0]
-	strb r1, [r2, #0x1]
-	mov r0, #0x13
-	add r1, sp, #0x0
-	bl FUN_020311D0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02031640
-FUN_02031640: ; 0x02031640
-	ldr r2, _02031664 ; =UNK_021C59FC
-	ldr r3, [r2, #0x0]
-	cmp r3, #0x0
-	bne _0203164E
-	mov r0, #0x0
-	mvn r0, r0
-	bx lr
-_0203164E:
-	lsl r2, r0, #0x1
-	ldrb r0, [r3, r2]
-	cmp r1, r0
-	bne _0203165C
-	add r0, r3, r2
-	ldrb r0, [r0, #0x1]
-	bx lr
-_0203165C:
-	mov r0, #0x0
-	mvn r0, r0
-	bx lr
-	nop
-_02031664: .word UNK_021C59FC
-
-	thumb_func_start FUN_02031668
-FUN_02031668: ; 0x02031668
-	push {r3-r7, lr}
-	mov r4, #0x0
-	ldr r6, _02031688 ; =UNK_021C59FC
-	add r5, r4, #0x0
-	add r7, r4, #0x0
-_02031672:
-	ldr r0, [r6, #0x0]
-	add r1, r7, #0x0
-	add r0, r0, r5
-	mov r2, #0x2
-	bl MI_CpuFill8
-	add r4, r4, #0x1
-	add r5, r5, #0x2
-	cmp r4, #0x8
-	blt _02031672
-	pop {r3-r7, pc}
-	.balign 4
-_02031688: .word UNK_021C59FC
-
-	thumb_func_start FUN_0203168C
-FUN_0203168C: ; 0x0203168C
-	push {r3-r4}
-	mov r4, #0x0
-	mov r0, #0x92
-	ldr r1, _020316A8 ; =UNK_021C59FC
-	add r3, r4, #0x0
-	lsl r0, r0, #0x2
-_02031698:
-	ldr r2, [r1, #0x0]
-	add r2, r2, r4
-	add r4, r4, #0x1
-	strb r3, [r2, r0]
-	cmp r4, #0x8
-	blt _02031698
-	pop {r3-r4}
-	bx lr
-	.balign 4
-_020316A8: .word UNK_021C59FC
-
-	thumb_func_start FUN_020316AC
-FUN_020316AC: ; 0x020316AC
-	push {r4, lr}
-	ldr r2, _020316DC ; =UNK_021C59FC
-	ldr r3, [r2, #0x0]
-	cmp r3, #0x0
-	beq _020316D8
-	add r4, r0, #0x0
-	mov r2, #0x46
-	mul r4, r2
-	add r3, #0x18
-	add r0, r1, #0x0
-	add r1, r3, r4
-	bl MI_CpuCopy8
-	ldr r1, _020316DC ; =UNK_021C59FC
-	mov r0, #0x14
-	ldr r1, [r1, #0x0]
-	add r1, #0x18
-	add r1, r1, r4
-	bl FUN_020311D0
-	mov r0, #0x1
-	pop {r4, pc}
-_020316D8:
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-_020316DC: .word UNK_021C59FC
-
-	thumb_func_start FUN_020316E0
-FUN_020316E0: ; 0x020316E0
-	ldr r1, _02031700 ; =UNK_021C59FC
-	ldr r3, [r1, #0x0]
-	mov r1, #0x92
-	add r2, r3, r0
-	lsl r1, r1, #0x2
-	ldrb r1, [r2, r1]
-	cmp r1, #0x0
-	beq _020316FA
-	mov r1, #0x46
-	add r3, #0x18
-	mul r1, r0
-	add r0, r3, r1
-	bx lr
-_020316FA:
-	mov r0, #0x0
-	bx lr
-	nop
-_02031700: .word UNK_021C59FC
-
-	thumb_func_start FUN_02031704
-FUN_02031704: ; 0x02031704
-	push {r3-r5, lr}
-	ldr r3, _0203172C ; =UNK_021C59FC
-	add r1, r0, #0x0
-	ldr r0, [r3, #0x0]
-	mov r5, #0x1
-	add r4, r0, r1
-	mov r0, #0x92
-	lsl r0, r0, #0x2
-	strb r5, [r4, r0]
-	ldr r4, [r3, #0x0]
-	add r0, r2, #0x0
-	mov r2, #0x46
-	add r3, r1, #0x0
-	add r4, #0x18
-	mul r3, r2
-	add r1, r4, r3
-	bl MI_CpuCopy8
-	pop {r3-r5, pc}
-	nop
-_0203172C: .word UNK_021C59FC
-
-	thumb_func_start FUN_02031730
-FUN_02031730: ; 0x02031730
-	mov r0, #0x46
-	bx lr
diff --git a/arm9/src/unk_0202F150.c b/arm9/src/unk_0202F150.c
index d36c5794..c728ddf1 100644
--- a/arm9/src/unk_0202F150.c
+++ b/arm9/src/unk_0202F150.c
@@ -1,4 +1,5 @@
 #include "unk_0202F150.h"
+#include "unk_02031480.h"
 struct
 {
     u8 unk00;
@@ -9,7 +10,6 @@ vu8 UNK_02105D58 = 4;
 vu8 UNK_02105D59 = 4;
 
 extern int FUN_02033534();
-extern void FUN_02031480(u32 param0);
 extern void FUN_0202D7D8(u8 *param0, u32 param1, struct UnkStruct0202F150_sub1 *param2);
 extern u32 FUN_0200CA60(void (*param0)(), u32 param1, u32 param2);
 extern void FUN_0202D394(struct UnkStruct0202F150_sub1 *param0, u8 *param1, u32 param2);
@@ -19,7 +19,6 @@ extern void FUN_0202D330(void (*param0)(int));
 extern u32 FUN_0202E66C(u32 param0, u32 param1);
 extern void MOD04_021D83C0();
 extern u32 FUN_0202E784();
-extern void FUN_020314D0();
 extern void FUN_0202DBA4();
 extern void FUN_0200CAB4(u32 param0);
 extern void FUN_0202D824(u8 *param0);
@@ -30,7 +29,6 @@ extern void FUN_02031CDC();
 extern void FUN_0202EBD0(u16 param0);
 extern void FUN_0202ED70(u32 param0);
 extern void FUN_020335F4(u32 param0);
-extern void FUN_020315A4();
 extern void FUN_0202E538();
 extern u32 MOD04_021D78FC(void *param0, u32 param1);
 extern u32 FUN_0202CBD4();
diff --git a/arm9/src/unk_02031480.c b/arm9/src/unk_02031480.c
new file mode 100644
index 00000000..9639cd74
--- /dev/null
+++ b/arm9/src/unk_02031480.c
@@ -0,0 +1,213 @@
+#include "unk_02031480.h"
+
+struct UnkStruct_02031480
+{
+    u8 unk000[8][2];
+    u8 unk010[8];
+    u8 unk018[8][70];
+    u8 unk248[8];
+    u8 unk250;
+    u8 unk251;
+    u8 unk252;
+};
+
+static struct UnkStruct_02031480 *UNK_021C59FC;
+
+THUMB_FUNC void FUN_02031480(u32 heap_id)
+{
+    if (UNK_021C59FC == NULL)
+    {
+        UNK_021C59FC = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02031480));
+        MI_CpuFill8(UNK_021C59FC, 0, sizeof(struct UnkStruct_02031480));
+    }
+
+    for (int i = 0; i < 8; i++)
+    {
+        UNK_021C59FC->unk010[i] = 0xff;
+    }
+    UNK_021C59FC->unk250 = 0xff;
+    UNK_021C59FC->unk251 = 0xff;
+    UNK_021C59FC->unk252 = 0x00;
+}
+
+THUMB_FUNC void FUN_020314D0()
+{
+    FreeToHeap(UNK_021C59FC);
+    UNK_021C59FC = NULL;
+}
+
+THUMB_FUNC BOOL FUN_020314E8()
+{
+    if (UNK_021C59FC != NULL)
+    {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+THUMB_FUNC void FUN_020314FC(u8 param0, u32 unused, u8 *param2)
+{
+#pragma unused(unused)
+    u8 st0[3];
+
+    st0[0] = param2[0];
+
+    if (FUN_02031190() == 0)
+    {
+
+        st0[1] = param0;
+        st0[2] = st0[0];
+
+        FUN_02030C4C(0x12, &st0[1]);
+
+        UNK_021C59FC->unk010[param0] = st0[0];
+
+        for (int i = 0; i < 8; i++)
+        {
+            if (FUN_02030E7C((u16)i) != 0)
+            {
+                if (st0[0] != UNK_021C59FC->unk010[i])
+                {
+                    return;
+                }
+            }
+        }
+
+        FUN_02030C4C(0x11, &st0[0]);
+    }
+}
+
+THUMB_FUNC void FUN_02031560(u32 unused1, u32 unused2, u8 *param2)
+{
+#pragma unused(unused1)
+#pragma unused(unused2)
+    UNK_021C59FC->unk010[param2[0]] = param2[1];
+}
+
+THUMB_FUNC void FUN_02031574(u32 unused1, u32 unused2, u8 *param2)
+{
+#pragma unused(unused1)
+#pragma unused(unused2)
+    UNK_021C59FC->unk250 = *param2;
+}
+
+THUMB_FUNC void FUN_02031588(u8 param0)
+{
+    UNK_021C59FC->unk251 = param0;
+    UNK_021C59FC->unk252 = 1;
+}
+
+THUMB_FUNC void FUN_020315A4()
+{
+    if (UNK_021C59FC != NULL && UNK_021C59FC->unk252 != 0 &&
+        FUN_020311D0(0x10, &UNK_021C59FC->unk251))
+    {
+        UNK_021C59FC->unk252 = 0;
+    }
+}
+
+THUMB_FUNC BOOL FUN_020315D8(u8 param0)
+{
+    if (UNK_021C59FC == NULL)
+    {
+        return TRUE;
+    }
+
+    if (UNK_021C59FC->unk250 == param0)
+    {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+THUMB_FUNC u8 FUN_020315FC(u8 index)
+{
+    return UNK_021C59FC->unk010[index];
+}
+
+THUMB_FUNC void FUN_0203160C(u32 param0, u32 unused, u8 *param2)
+{
+#pragma unused(unused)
+    UNK_021C59FC->unk000[param0][0] = param2[0];
+    UNK_021C59FC->unk000[param0][1] = param2[1];
+}
+
+THUMB_FUNC u32 FUN_02031628()
+{
+    return 2;
+}
+
+THUMB_FUNC void FUN_0203162C(u8 param0, u8 param1)
+{
+    u8 st0[2] = { param0, param1 };
+
+    FUN_020311D0(0x13, st0);
+}
+
+THUMB_FUNC int FUN_02031640(u32 param0, u8 param1)
+{
+    if (UNK_021C59FC == NULL)
+    {
+        return -1;
+    }
+
+    if (UNK_021C59FC->unk000[param0][0] == param1)
+    {
+        return UNK_021C59FC->unk000[param0][1];
+    }
+
+    return -1;
+}
+
+THUMB_FUNC void FUN_02031668()
+{
+    for (int i = 0; i < 8; i++)
+    {
+        MI_CpuFill8(UNK_021C59FC->unk000[i], 0, 2);
+    }
+}
+
+THUMB_FUNC void FUN_0203168C()
+{
+    for (int i = 0; i < 8; i++)
+    {
+        UNK_021C59FC->unk248[i] = 0;
+    }
+}
+
+THUMB_FUNC BOOL FUN_020316AC(u32 param0, void *param1)
+{
+    if (UNK_021C59FC != NULL)
+    {
+        MI_CpuCopy8(param1, UNK_021C59FC->unk018[param0], 0x46);
+        FUN_020311D0(0x14, UNK_021C59FC->unk018[param0]);
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+THUMB_FUNC u8 *FUN_020316E0(int param0)
+{
+    if (UNK_021C59FC->unk248[param0] != 0)
+    {
+        return UNK_021C59FC->unk018[param0];
+    }
+
+    return NULL;
+}
+
+THUMB_FUNC void FUN_02031704(u32 param0, u32 unused, void *param2)
+{
+#pragma unused(unused)
+    UNK_021C59FC->unk248[param0] = 1;
+    MI_CpuCopy8(param2, UNK_021C59FC->unk018[param0], 0x46);
+}
+
+THUMB_FUNC u32 FUN_02031730()
+{
+    return 0x46;
+}
diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c
index 7bcdf950..9c4d7c8f 100644
--- a/arm9/src/unk_0205FA2C.c
+++ b/arm9/src/unk_0205FA2C.c
@@ -8,11 +8,9 @@ extern void FUN_0207C2A4(struct UnkPlayerStruct2_0205FA2C *ptr, struct PlayerDat
 extern u32 FUN_0203384C(u32 *param0);
 extern u32 *FUN_02038790(struct UnkStruct_0204639C *param0, u16 param1, u16 param2);
 extern u16 *GetVarPointer(struct UnkSavStruct80 *arg, u16);
-extern u32 FUN_02031190();
-extern u32 FUN_020316E0(u32 param0);
-extern u16 MOD06_02244660(struct UnkStruct_0204639C *param0, u32 param1);
-extern u16 MOD06_022446BC(struct UnkStruct_0204639C *param0, u32 param1);
-extern u16 MOD06_022446E0(struct UnkStruct_0204639C *param0, u32 param1);
+extern u16 MOD06_02244660(struct UnkStruct_0204639C *param0, u8 *param1);
+extern u16 MOD06_022446BC(struct UnkStruct_0204639C *param0, u8 *param1);
+extern u16 MOD06_022446E0(struct UnkStruct_0204639C *param0, u8 *param1);
 extern void FUN_0202A5CC(u32 param0, u32 param1);
 extern u32 FUN_0202A5D0(u32 param0);
 extern u32 FUN_0202A150(struct UnkStruct_02029FB0 *param0, u32 param1);
@@ -282,8 +280,8 @@ THUMB_FUNC int FUN_0205FD70(struct UnkStruct_0204639C *param0)
 {
     struct UnkStruct_0204639C *res = FUN_02046528(param0);
     u16 *res2 = (u16 *)FUN_0204652C(param0);
-    u32 res3 = FUN_020316E0(1 - FUN_02031190());
-    if (res3 == 0)
+    u8 *res3 = FUN_020316E0(1 - FUN_02031190());
+    if (res3 == NULL)
     {
         return 0;
     }
diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h
index 77fb4f7d..4542cdd1 100644
--- a/include/unk_0202F150.h
+++ b/include/unk_0202F150.h
@@ -7,6 +7,7 @@
 #include "heap.h"
 #include "main.h"
 #include "unk_0202D858.h"
+#include "unk_02031480.h"
 
 struct UnkStruct0202F150_sub1
 {
diff --git a/include/unk_02031480.h b/include/unk_02031480.h
new file mode 100644
index 00000000..975f0796
--- /dev/null
+++ b/include/unk_02031480.h
@@ -0,0 +1,30 @@
+#ifndef POKEDIAMOND_UNK_02031480_H
+#define POKEDIAMOND_UNK_02031480_H
+
+#include "global.h"
+#include "MI_memory.h"
+#include "heap.h"
+#include "unk_0202F150.h"
+
+THUMB_FUNC void FUN_02031480(u32 heap_id);
+THUMB_FUNC void FUN_020314D0();
+THUMB_FUNC BOOL FUN_020314E8();
+THUMB_FUNC void FUN_020314FC(u8 param0, u32 param1, u8 *param2);
+THUMB_FUNC void FUN_02031560(u32 param0, u32 param1, u8 *param2);
+THUMB_FUNC void FUN_02031574(u32 param0, u32 param1, u8 *param2);
+THUMB_FUNC void FUN_02031588(u8 param0);
+THUMB_FUNC void FUN_020315A4();
+THUMB_FUNC BOOL FUN_020315D8(u8 param0);
+THUMB_FUNC u8 FUN_020315FC(u8 index);
+THUMB_FUNC void FUN_0203160C(u32 param0, u32 param1, u8 *param2);
+THUMB_FUNC u32 FUN_02031628();
+THUMB_FUNC void FUN_0203162C(u8 param0, u8 param1);
+THUMB_FUNC int FUN_02031640(u32 param0, u8 param1);
+THUMB_FUNC void FUN_02031668();
+THUMB_FUNC void FUN_0203168C();
+THUMB_FUNC BOOL FUN_020316AC(u32 param0, void *param1);
+THUMB_FUNC u8 *FUN_020316E0(int param0);
+THUMB_FUNC void FUN_02031704(u32 param0, u32 param1, void *param2);
+THUMB_FUNC u32 FUN_02031730();
+
+#endif // POKEDIAMOND_UNK_02031480_H
diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h
index 99cf7606..e65507b7 100644
--- a/include/unk_0205FA2C.h
+++ b/include/unk_0205FA2C.h
@@ -13,6 +13,7 @@
 #include "unk_0202A8F4.h"
 #include "unk_0204639C.h"
 #include "unk_0206BB28.h"
+#include "unk_02031480.h"
 
 struct UnkPlayerStruct1_0205FA2C
 {