Merge pull request #335 from remicalixte/unk_020166C8

Decompile unk_020166C8.s to heap.c

8 files changed, 419 insertions, 676 deletions

diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index fbe54fd5..ba128605 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -48,7 +48,7 @@ Static arm9
 	Object unk_02015D14.o
 	Object unk_02015E30.o
 	Object game_init.o
-	Object unk_020166C8.o
+	Object heap.o
 	Object unk_02016B94.o
 	Object unk_0201B1A8.o
 	Object unk_0201B4E8.o
diff --git a/arm9/asm/unk_020166C8.s b/arm9/asm/unk_020166C8.s
deleted file mode 100644
index 3c251114..00000000
--- a/arm9/asm/unk_020166C8.s
+++ /dev/null
@@ -1,665 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .bss
-
-	.global UNK_021C4D28
-UNK_021C4D28: ; 0x021C4D28
-	.space 0x1c
-
-	.text
-
-	thumb_func_start FUN_020166C8
-FUN_020166C8: ; 0x020166C8
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	str r0, [sp, #0x4]
-	add r0, #0x18
-	add r6, r2, #0x0
-	str r0, [sp, #0x4]
-	cmp r6, r0
-	bhs _020166E0
-	add r6, r0, #0x0
-_020166E0:
-	cmp r3, #0x0
-	beq _020166FE
-	mov r0, #0x3
-	tst r0, r3
-	beq _020166F4
-	mov r0, #0x3
-_020166EC:
-	add r3, r3, #0x1
-	add r1, r3, #0x0
-	tst r1, r0
-	bne _020166EC
-_020166F4:
-	mov r0, #0x0
-	add r1, r3, #0x0
-	mov r2, #0x4
-	bl OS_AllocFromArenaLo
-_020166FE:
-	ldr r1, [sp, #0x4]
-	lsl r7, r6, #0x1
-	lsl r2, r1, #0x1
-	add r1, r1, r2
-	add r1, r1, #0x1
-	lsl r1, r1, #0x2
-	add r1, r7, r1
-	mov r0, #0x0
-	add r1, r6, r1
-	mov r2, #0x4
-	bl OS_AllocFromArenaLo
-	ldr r1, _020167F0 ; =UNK_021C4D28
-	str r0, [r1, #0x0]
-	ldr r1, [sp, #0x4]
-	add r1, r1, #0x1
-	lsl r1, r1, #0x2
-	add r1, r0, r1
-	ldr r0, _020167F0 ; =UNK_021C4D28
-	str r1, [r0, #0x4]
-	ldr r0, [sp, #0x4]
-	lsl r0, r0, #0x2
-	add r2, r1, r0
-	ldr r1, _020167F0 ; =UNK_021C4D28
-	str r2, [r1, #0x8]
-	add r1, r2, r0
-	ldr r0, _020167F0 ; =UNK_021C4D28
-	str r1, [r0, #0xc]
-	add r1, r1, r7
-	str r1, [r0, #0x10]
-	strh r6, [r0, #0x14]
-	strh r4, [r0, #0x16]
-	ldr r0, [sp, #0x4]
-	mov r7, #0x0
-	lsl r0, r0, #0x10
-	lsr r1, r0, #0x10
-	ldr r0, _020167F0 ; =UNK_021C4D28
-	cmp r4, #0x0
-	strh r1, [r0, #0x1a]
-	strh r1, [r0, #0x18]
-	bls _020167A0
-	str r7, [sp, #0x0]
-_02016752:
-	ldr r0, [r5, #0x4]
-	cmp r0, #0x0
-	beq _0201675C
-	cmp r0, #0x2
-	beq _02016768
-_0201675C:
-	ldr r1, [r5, #0x0]
-	mov r0, #0x0
-	mov r2, #0x4
-	bl OS_AllocFromArenaLo
-	b _02016772
-_02016768:
-	ldr r1, [r5, #0x0]
-	mov r0, #0x2
-	mov r2, #0x4
-	bl OS_AllocFromArenaHi
-_02016772:
-	cmp r0, #0x0
-	beq _0201678E
-	ldr r1, [r5, #0x0]
-	mov r2, #0x0
-	bl tempName_NNS_FndCreateExpHeapEx
-	ldr r1, _020167F0 ; =UNK_021C4D28
-	ldr r2, [r1, #0x0]
-	ldr r1, [sp, #0x0]
-	str r0, [r2, r1]
-	ldr r0, _020167F0 ; =UNK_021C4D28
-	ldr r0, [r0, #0x10]
-	strb r7, [r0, r7]
-	b _02016792
-_0201678E:
-	bl ErrorHandling
-_02016792:
-	ldr r0, [sp, #0x0]
-	add r7, r7, #0x1
-	add r0, r0, #0x4
-	add r5, #0x8
-	str r0, [sp, #0x0]
-	cmp r7, r4
-	blo _02016752
-_020167A0:
-	ldr r0, [sp, #0x4]
-	add r1, r0, #0x1
-	cmp r4, r1
-	bhs _020167C0
-	ldr r3, _020167F0 ; =UNK_021C4D28
-	lsl r2, r4, #0x2
-	mov r0, #0x0
-_020167AE:
-	ldr r5, [r3, #0x0]
-	str r0, [r5, r2]
-	ldrh r7, [r3, #0x1a]
-	ldr r5, [r3, #0x10]
-	add r2, r2, #0x4
-	strb r7, [r5, r4]
-	add r4, r4, #0x1
-	cmp r4, r1
-	blo _020167AE
-_020167C0:
-	cmp r4, r6
-	bhs _020167D2
-	ldr r0, _020167F0 ; =UNK_021C4D28
-_020167C6:
-	ldrh r2, [r0, #0x1a]
-	ldr r1, [r0, #0x10]
-	strb r2, [r1, r4]
-	add r4, r4, #0x1
-	cmp r4, r6
-	blo _020167C6
-_020167D2:
-	mov r4, #0x0
-	cmp r6, #0x0
-	bls _020167EA
-	ldr r0, _020167F0 ; =UNK_021C4D28
-	add r3, r4, #0x0
-	add r2, r4, #0x0
-_020167DE:
-	ldr r1, [r0, #0xc]
-	add r4, r4, #0x1
-	strh r2, [r1, r3]
-	add r3, r3, #0x2
-	cmp r4, r6
-	blo _020167DE
-_020167EA:
-	add sp, #0x8
-	pop {r3-r7, pc}
-	nop
-_020167F0: .word UNK_021C4D28
-
-	thumb_func_start FUN_020167F4
-FUN_020167F4: ; 0x020167F4
-	ldr r1, _02016818 ; =UNK_021C4D28
-	ldrh r0, [r1, #0x16]
-	ldrh r3, [r1, #0x18]
-	cmp r0, r3
-	bge _02016812
-	ldr r2, [r1, #0x0]
-	lsl r1, r0, #0x2
-	add r2, r2, r1
-_02016804:
-	ldr r1, [r2, #0x0]
-	cmp r1, #0x0
-	beq _02016816
-	add r0, r0, #0x1
-	add r2, r2, #0x4
-	cmp r0, r3
-	blt _02016804
-_02016812:
-	mov r0, #0x0
-	mvn r0, r0
-_02016816:
-	bx lr
-	.balign 4
-_02016818: .word UNK_021C4D28
-
-	thumb_func_start FUN_0201681C
-FUN_0201681C: ; 0x0201681C
-	push {r3, lr}
-	mov r3, #0x4
-	bl FUN_02016834
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02016828
-FUN_02016828: ; 0x02016828
-	push {r3, lr}
-	mov r3, #0x3
-	mvn r3, r3
-	bl FUN_02016834
-	pop {r3, pc}
-
-	thumb_func_start FUN_02016834
-FUN_02016834: ; 0x02016834
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r4, r0, #0x0
-	add r5, r1, #0x0
-	str r2, [sp, #0x0]
-	add r7, r3, #0x0
-	bl OS_GetProcMode
-	cmp r0, #0x12
-	bne _0201684C
-	bl ErrorHandling
-_0201684C:
-	ldr r1, _020168CC ; =UNK_021C4D28
-	ldr r0, [r1, #0x10]
-	ldrh r3, [r1, #0x1a]
-	ldrb r2, [r0, r5]
-	cmp r3, r2
-	bne _020168C2
-	ldrb r0, [r0, r4]
-	ldr r1, [r1, #0x0]
-	lsl r0, r0, #0x2
-	ldr r6, [r1, r0]
-	cmp r6, #0x0
-	beq _020168BC
-	ldr r1, [sp, #0x0]
-	add r0, r6, #0x0
-	add r2, r7, #0x0
-	bl tempName_NNS_FndAllocFromExpHeapEx
-	str r0, [sp, #0x4]
-	cmp r0, #0x0
-	beq _020168B6
-	bl FUN_020167F4
-	add r7, r0, #0x0
-	bmi _020168B0
-	ldr r0, [sp, #0x4]
-	ldr r1, [sp, #0x0]
-	mov r2, #0x0
-	lsl r4, r7, #0x2
-	bl tempName_NNS_FndCreateExpHeapEx
-	ldr r1, _020168CC ; =UNK_021C4D28
-	ldr r2, [r1, #0x0]
-	str r0, [r2, r4]
-	ldr r0, [r1, #0x0]
-	ldr r0, [r0, r4]
-	cmp r0, #0x0
-	beq _020168AA
-	ldr r0, [r1, #0x4]
-	str r6, [r0, r4]
-	ldr r0, [sp, #0x4]
-	ldr r2, [r1, #0x8]
-	add sp, #0x8
-	str r0, [r2, r4]
-	ldr r0, [r1, #0x10]
-	strb r7, [r0, r5]
-	mov r0, #0x1
-	pop {r3-r7, pc}
-_020168AA:
-	bl ErrorHandling
-	b _020168C6
-_020168B0:
-	bl ErrorHandling
-	b _020168C6
-_020168B6:
-	bl ErrorHandling
-	b _020168C6
-_020168BC:
-	bl ErrorHandling
-	b _020168C6
-_020168C2:
-	bl ErrorHandling
-_020168C6:
-	mov r0, #0x0
-	add sp, #0x8
-	pop {r3-r7, pc}
-	.balign 4
-_020168CC: .word UNK_021C4D28
-
-	thumb_func_start FUN_020168D0
-FUN_020168D0: ; 0x020168D0
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl OS_GetProcMode
-	cmp r0, #0x12
-	bne _020168E0
-	bl ErrorHandling
-_020168E0:
-	ldr r0, _02016940 ; =UNK_021C4D28
-	ldr r1, [r0, #0x0]
-	ldr r0, [r0, #0x10]
-	ldrb r0, [r0, r4]
-	lsl r0, r0, #0x2
-	ldr r0, [r1, r0]
-	cmp r0, #0x0
-	beq _0201693E
-	bl thunk_FUN_020adc8c
-	ldr r1, _02016940 ; =UNK_021C4D28
-	ldr r0, [r1, #0x10]
-	ldrb r0, [r0, r4]
-	lsl r2, r0, #0x2
-	ldr r0, [r1, #0x4]
-	ldr r1, [r1, #0x8]
-	ldr r0, [r0, r2]
-	ldr r1, [r1, r2]
-	cmp r0, #0x0
-	beq _02016912
-	cmp r1, #0x0
-	beq _02016912
-	bl FUN_020ADDF0
-	b _02016916
-_02016912:
-	bl ErrorHandling
-_02016916:
-	ldr r1, _02016940 ; =UNK_021C4D28
-	mov r0, #0x0
-	ldr r2, [r1, #0x10]
-	ldr r3, [r1, #0x0]
-	ldrb r2, [r2, r4]
-	lsl r2, r2, #0x2
-	str r0, [r3, r2]
-	ldr r2, [r1, #0x10]
-	ldr r3, [r1, #0x4]
-	ldrb r2, [r2, r4]
-	lsl r2, r2, #0x2
-	str r0, [r3, r2]
-	ldr r2, [r1, #0x10]
-	ldr r3, [r1, #0x8]
-	ldrb r2, [r2, r4]
-	lsl r2, r2, #0x2
-	str r0, [r3, r2]
-	ldrh r2, [r1, #0x1a]
-	ldr r0, [r1, #0x10]
-	strb r2, [r0, r4]
-_0201693E:
-	pop {r4, pc}
-	.balign 4
-_02016940: .word UNK_021C4D28
-
-	thumb_func_start FUN_02016944
-FUN_02016944: ; 0x02016944
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	add r7, r2, #0x0
-	add r6, r3, #0x0
-	cmp r5, #0x0
-	bne _02016956
-	bl ErrorHandling
-_02016956:
-	bl OS_DisableInterrupts
-	add r4, #0x10
-	str r0, [sp, #0x0]
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	add r2, r7, #0x0
-	bl tempName_NNS_FndAllocFromExpHeapEx
-	add r4, r0, #0x0
-	ldr r0, [sp, #0x0]
-	bl OS_RestoreInterrupts
-	cmp r4, #0x0
-	beq _02016984
-	ldr r1, [r4, #0xc]
-	mov r0, #0xff
-	bic r1, r0
-	lsl r0, r6, #0x18
-	lsr r0, r0, #0x18
-	orr r0, r1
-	str r0, [r4, #0xc]
-	add r4, #0x10
-_02016984:
-	add r0, r4, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02016988
-FUN_02016988: ; 0x02016988
-	push {r3, lr}
-	bl FUN_02031810
-	cmp r0, #0x0
-	beq _02016996
-	bl PrintErrorMessageAndReset
-_02016996:
-	pop {r3, pc}
-
-	thumb_func_start AllocFromHeap
-AllocFromHeap: ; 0x02016998
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldr r0, _020169D4 ; =UNK_021C4D28
-	mov r4, #0x0
-	ldrh r2, [r0, #0x14]
-	cmp r5, r2
-	bhs _020169BA
-	ldr r2, [r0, #0x0]
-	ldr r0, [r0, #0x10]
-	add r3, r5, #0x0
-	ldrb r0, [r0, r5]
-	lsl r0, r0, #0x2
-	ldr r0, [r2, r0]
-	mov r2, #0x4
-	bl FUN_02016944
-	add r4, r0, #0x0
-_020169BA:
-	cmp r4, #0x0
-	beq _020169CC
-	ldr r0, _020169D4 ; =UNK_021C4D28
-	lsl r1, r5, #0x1
-	ldr r2, [r0, #0xc]
-	ldrh r0, [r2, r1]
-	add r0, r0, #0x1
-	strh r0, [r2, r1]
-	b _020169D0
-_020169CC:
-	bl FUN_02016988
-_020169D0:
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-_020169D4: .word UNK_021C4D28
-
-	thumb_func_start AllocFromHeapAtEnd
-AllocFromHeapAtEnd: ; 0x020169D8
-	push {r3-r5, lr}
-	ldr r2, _02016A14 ; =UNK_021C4D28
-	add r5, r0, #0x0
-	ldrh r0, [r2, #0x14]
-	mov r4, #0x0
-	cmp r5, r0
-	bhs _020169FA
-	ldr r0, [r2, #0x0]
-	ldr r2, [r2, #0x10]
-	add r3, r5, #0x0
-	ldrb r2, [r2, r5]
-	lsl r2, r2, #0x2
-	ldr r0, [r0, r2]
-	sub r2, r4, #0x4
-	bl FUN_02016944
-	add r4, r0, #0x0
-_020169FA:
-	cmp r4, #0x0
-	beq _02016A0C
-	ldr r0, _02016A14 ; =UNK_021C4D28
-	lsl r1, r5, #0x1
-	ldr r2, [r0, #0xc]
-	ldrh r0, [r2, r1]
-	add r0, r0, #0x1
-	strh r0, [r2, r1]
-	b _02016A10
-_02016A0C:
-	bl FUN_02016988
-_02016A10:
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-_02016A14: .word UNK_021C4D28
-
-	thumb_func_start FreeToHeap
-FreeToHeap: ; 0x02016A18
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	sub r0, r6, #0x4
-	ldr r0, [r0, #0x0]
-	lsl r0, r0, #0x18
-	lsr r4, r0, #0x18
-	ldr r0, _02016A88 ; =UNK_021C4D28
-	ldrh r1, [r0, #0x14]
-	cmp r4, r1
-	bhs _02016A80
-	ldr r1, [r0, #0x0]
-	ldr r0, [r0, #0x10]
-	ldrb r0, [r0, r4]
-	lsl r0, r0, #0x2
-	ldr r7, [r1, r0]
-	cmp r7, #0x0
-	bne _02016A3E
-	bl ErrorHandling
-_02016A3E:
-	ldr r0, _02016A88 ; =UNK_021C4D28
-	lsl r5, r4, #0x1
-	ldr r0, [r0, #0xc]
-	ldrh r0, [r0, r5]
-	cmp r0, #0x0
-	bne _02016A50
-	add r0, r4, #0x0
-	bl FUN_02016B90
-_02016A50:
-	ldr r0, _02016A88 ; =UNK_021C4D28
-	ldr r0, [r0, #0xc]
-	ldrh r0, [r0, r5]
-	cmp r0, #0x0
-	bne _02016A5E
-	bl ErrorHandling
-_02016A5E:
-	ldr r0, _02016A88 ; =UNK_021C4D28
-	ldr r1, [r0, #0xc]
-	ldrh r0, [r1, r5]
-	sub r0, r0, #0x1
-	strh r0, [r1, r5]
-	bl OS_DisableInterrupts
-	sub r6, #0x10
-	add r4, r0, #0x0
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	bl FUN_020ADDF0
-	add r0, r4, #0x0
-	bl OS_RestoreInterrupts
-	pop {r3-r7, pc}
-_02016A80:
-	bl ErrorHandling
-	pop {r3-r7, pc}
-	nop
-_02016A88: .word UNK_021C4D28
-
-	thumb_func_start FUN_02016A8C
-FUN_02016A8C: ; 0x02016A8C
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	bl OS_GetProcMode
-	cmp r0, #0x12
-	bne _02016A9E
-	bl ErrorHandling
-_02016A9E:
-	ldr r0, _02016AF4 ; =UNK_021C4D28
-	ldrh r1, [r0, #0x14]
-	cmp r5, r1
-	bhs _02016AEE
-	ldr r1, [r0, #0x0]
-	ldr r0, [r0, #0x10]
-	ldrb r0, [r0, r5]
-	lsl r0, r0, #0x2
-	ldr r6, [r1, r0]
-	cmp r6, #0x0
-	bne _02016AB8
-	bl ErrorHandling
-_02016AB8:
-	sub r0, r4, #0x4
-	ldr r0, [r0, #0x0]
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, r5
-	beq _02016AC8
-	bl ErrorHandling
-_02016AC8:
-	sub r4, #0x10
-	add r0, r6, #0x0
-	add r1, r4, #0x0
-	bl FUN_020ADDF0
-	ldr r0, _02016AF4 ; =UNK_021C4D28
-	lsl r4, r5, #0x1
-	ldr r0, [r0, #0xc]
-	ldrh r0, [r0, r4]
-	cmp r0, #0x0
-	bne _02016AE2
-	bl ErrorHandling
-_02016AE2:
-	ldr r0, _02016AF4 ; =UNK_021C4D28
-	ldr r1, [r0, #0xc]
-	ldrh r0, [r1, r4]
-	sub r0, r0, #0x1
-	strh r0, [r1, r4]
-	pop {r4-r6, pc}
-_02016AEE:
-	bl ErrorHandling
-	pop {r4-r6, pc}
-	.balign 4
-_02016AF4: .word UNK_021C4D28
-
-	thumb_func_start FUN_02016AF8
-FUN_02016AF8: ; 0x02016AF8
-	push {r3, lr}
-	ldr r1, _02016B1C ; =UNK_021C4D28
-	ldrh r2, [r1, #0x14]
-	cmp r0, r2
-	bhs _02016B12
-	ldr r2, [r1, #0x0]
-	ldr r1, [r1, #0x10]
-	ldrb r0, [r1, r0]
-	lsl r0, r0, #0x2
-	ldr r0, [r2, r0]
-	bl FUN_020ADDC8
-	pop {r3, pc}
-_02016B12:
-	bl ErrorHandling
-	mov r0, #0x0
-	pop {r3, pc}
-	nop
-_02016B1C: .word UNK_021C4D28
-
-	thumb_func_start FUN_02016B20
-FUN_02016B20: ; 0x02016B20
-	push {r4, lr}
-	ldr r4, _02016B40 ; =UNK_021C4D28
-	ldrh r3, [r4, #0x14]
-	cmp r1, r3
-	bhs _02016B3A
-	ldr r3, [r4, #0x0]
-	ldr r4, [r4, #0x10]
-	ldrb r1, [r4, r1]
-	lsl r1, r1, #0x2
-	ldr r1, [r3, r1]
-	bl FUN_020AE82C
-	pop {r4, pc}
-_02016B3A:
-	bl ErrorHandling
-	pop {r4, pc}
-	.balign 4
-_02016B40: .word UNK_021C4D28
-
-	thumb_func_start FUN_02016B44
-FUN_02016B44: ; 0x02016B44
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	bl OS_GetProcMode
-	cmp r0, #0x12
-	bne _02016B56
-	bl ErrorHandling
-_02016B56:
-	add r0, r5, #0x0
-	sub r0, #0x10
-	bl FUN_020ADDC0
-	add r4, #0x10
-	cmp r0, r4
-	blo _02016B84
-	sub r2, r5, #0x4
-	ldr r0, _02016B8C ; =UNK_021C4D28
-	ldr r2, [r2, #0x0]
-	ldr r1, [r0, #0x0]
-	lsl r2, r2, #0x18
-	ldr r0, [r0, #0x10]
-	lsr r2, r2, #0x18
-	ldrb r0, [r0, r2]
-	sub r5, #0x10
-	add r2, r4, #0x0
-	lsl r0, r0, #0x2
-	ldr r0, [r1, r0]
-	add r1, r5, #0x0
-	bl FUN_020ADE2C
-	pop {r3-r5, pc}
-_02016B84:
-	bl ErrorHandling
-	pop {r3-r5, pc}
-	nop
-_02016B8C: .word UNK_021C4D28
-
-	thumb_func_start FUN_02016B90
-FUN_02016B90: ; 0x02016B90
-	mov r0, #0x1
-	bx lr
diff --git a/arm9/modules/05/src/mod05_021E72FC.c b/arm9/modules/05/src/mod05_021E72FC.c
index 8a31d032..c24a7bd3 100644
--- a/arm9/modules/05/src/mod05_021E72FC.c
+++ b/arm9/modules/05/src/mod05_021E72FC.c
@@ -2,6 +2,7 @@
 #include "mod05_021E72FC.h"
 #include "heap.h"
 
+
 extern void FUN_020054C8(u32 param0);
 extern void FUN_020463CC(u32 param0, void *func, UnkStruct021E7358 *param2);
 extern u32 FUN_020553A0(u32 param0);
@@ -19,7 +20,6 @@ extern void FUN_02055304(u32 param0, u32 param1);
 extern BOOL FUN_02056B74(u32 param0, u32 param1, u32 param2);
 extern void FUN_02058418(u32 param0, u32 param1);
 extern void FUN_020054F0(u32 param0, u32 param1);
-extern void FUN_02016A8C(u32 param0, void *param1);
 
 THUMB_FUNC BOOL MOD05_021E72FC(u32 param0, u32 param1)
 {
diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c
index 8b00f613..a5b53e6c 100644
--- a/arm9/modules/52/src/module_52.c
+++ b/arm9/modules/52/src/module_52.c
@@ -1,11 +1,11 @@
 #include "module_52.h"
+#include "heap.h"
+
 
 extern struct Unk21DBE18 UNK_020FD144;
 extern struct Unk21DBE18 UNK_020F2B7C;
 extern struct Unk21DBE18 UNK_020F2B8C;
 
-extern void FUN_0201681C(u32 param0, u32 heap_id, u32 param2);
-extern int FUN_020168D0(u32 heap_id);
 extern void FUN_02015E3C(struct IGT *igt);
 extern void FUN_0206007C(struct SaveBlock2 *sav2);
 extern int FUN_02053678(u32 random, u32 gender, u32 param2);
diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c
index 9fccfd95..4d7a4a98 100644
--- a/arm9/modules/59/src/mod59_021D74E0_src.c
+++ b/arm9/modules/59/src/mod59_021D74E0_src.c
@@ -2,8 +2,9 @@
 #include "player_data.h"
 #include "overlay_manager.h"
 #include "mod59_021D74E0.h"
+#include "heap.h"
+
 
-extern void FUN_0201681C(u32 param0, u32 heap_id, u32 param2);
 extern u32 FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options);
 
 THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0)
diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c
index 327c66c6..a7508fab 100644
--- a/arm9/src/game_init.c
+++ b/arm9/src/game_init.c
@@ -4,16 +4,15 @@
 #include "main.h"
 #include "FS_rom.h"
 #include "PAD_pad.h"
-#include "heap.h"
 #include "MWC_string.h"
 #include "tp.h"
 #include "unk_0201B4E8.h"
 #include "game_init.h"
 #include "registers.h"
+#include "heap.h"
 
 #pragma thumb on
 
-extern void FUN_020166C8(const u32 (*)[2], int, int, int);
 extern void FUN_02022450(void);
 
 typedef volatile struct
@@ -142,7 +141,7 @@ void FUN_02015FC8(void)
     {
         csum++;
     }
-    FUN_020166C8(UNK_020EDB10, 4, 92, (int)csum);
+    FUN_020166C8((u32 *)UNK_020EDB10, 4, 92, (int)csum);
 }
 
 void InitSystemForTheGame(void)
diff --git a/arm9/src/heap.c b/arm9/src/heap.c
new file mode 100644
index 00000000..c27a40c0
--- /dev/null
+++ b/arm9/src/heap.c
@@ -0,0 +1,380 @@
+#include "heap.h"
+
+extern void *tempName_NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2);
+extern void *tempName_NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2);
+extern void thunk_FUN_020adc8c();
+extern void FUN_020ADDF0(void *ptr1, void *ptr2);
+extern u32 FUN_02031810(void);
+extern void PrintErrorMessageAndReset(void);
+extern u32 FUN_020ADDC8(void *param0);
+extern void FUN_020AE82C(u32 param0, void *param1, u32 param2);
+extern u32 FUN_020ADDC0(void *param0);
+extern void FUN_020ADE2C(void *ptr1, void *ptr2, u32 param2);
+
+
+struct UnkStruct_020166C8 UNK_021C4D28;
+
+
+THUMB_FUNC void FUN_020166C8(u32 *param0, u32 param1, u32 param2, u32 pre_size)
+{
+    u32 unk_size = param1 + 24;
+
+    if (param2 < unk_size)
+    {
+        param2 = unk_size;
+    }
+    if (pre_size != 0)
+    {
+        while (pre_size % 4 != 0)
+        {
+            pre_size++;
+        }
+
+        OS_AllocFromArenaLo(OS_ARENA_MAIN, pre_size, 4);
+    }
+
+    u32 r7 = param2 * 2;
+
+    void *ptr = OS_AllocFromArenaLo(OS_ARENA_MAIN, (unk_size * 3 + 1) * sizeof(u32) + r7 + param2, 4);
+    UNK_021C4D28.unk00 = ptr;
+    ptr += (unk_size + 1) * 4;
+    UNK_021C4D28.unk04 = ptr;
+    ptr += unk_size * 4;
+    UNK_021C4D28.unk08 = ptr;
+    ptr += unk_size * 4;
+    UNK_021C4D28.unk0c = ptr;
+    ptr += r7;
+    UNK_021C4D28.unk10 = ptr;
+    UNK_021C4D28.unk14 = (u16)param2;
+    UNK_021C4D28.unk16 = (u16)param1;
+
+    r7 = 0;
+    UNK_021C4D28.unk1a = (u16)unk_size;
+    UNK_021C4D28.unk18 = (u16)unk_size;
+
+    while (r7 < param1)
+    {
+        void *ptr;
+        if (param0[1] == 0 || param0[1] != 2)
+        {
+            ptr = OS_AllocFromArenaLo(OS_ARENA_MAIN, param0[0], 4);
+        }
+        else
+        {
+            ptr = OS_AllocFromArenaHi(OS_ARENA_MAINEX, param0[0], 4);
+        }
+
+        if (ptr != 0)
+        {
+
+            UNK_021C4D28.unk00[r7] = tempName_NNS_FndCreateExpHeapEx(ptr, param0[0], 0);
+            UNK_021C4D28.unk10[r7] = (u8)r7;
+        }
+        else
+        {
+            ErrorHandling();
+        }
+
+        param0 += 2;
+        r7++;
+    }
+
+    while (param1 < unk_size + 1)
+    {
+        UNK_021C4D28.unk00[param1] = 0;
+        UNK_021C4D28.unk10[param1] = (u8)UNK_021C4D28.unk1a;
+
+        param1++;
+    }
+
+    while (param1 < param2)
+    {
+        UNK_021C4D28.unk10[param1] = (u8)UNK_021C4D28.unk1a;
+
+        param1++;
+    }
+
+    for (param1 = 0; param1 < param2; param1++)
+    {
+        UNK_021C4D28.unk0c[param1] = 0;
+    }
+}
+
+THUMB_FUNC s32 FUN_020167F4()
+{
+    s32 i = UNK_021C4D28.unk16;
+    s32 j = UNK_021C4D28.unk18;
+
+    if (i < j)
+    {
+        void **ptr = UNK_021C4D28.unk00 + i;
+        do
+        {
+            if (*ptr == 0)
+            {
+                return i;
+            }
+            i++;
+            ptr++;
+        } while (i < j);
+    }
+
+    return -1;
+}
+
+THUMB_FUNC u32 FUN_0201681C(u32 param0, u32 param1, u32 param2)
+{
+    return FUN_02016834(param0, param1, param2, 4);
+}
+
+THUMB_FUNC u32 FUN_02016828(u32 param0, u32 param1, u32 param2)
+{
+    return FUN_02016834(param0, param1, param2, -4);
+}
+
+THUMB_FUNC u32 FUN_02016834(u32 param0, u32 param1, u32 param2, s32 param3)
+{
+    GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
+
+    u8 *ptr = UNK_021C4D28.unk10;
+    if (UNK_021C4D28.unk1a == ptr[param1])
+    {
+        void *ptr2 = UNK_021C4D28.unk00[ptr[param0]];
+        if (ptr2 != 0)
+        {
+            void *ptr3 = tempName_NNS_FndAllocFromExpHeapEx(ptr2, param2, param3);
+            if (ptr3 != 0)
+            {
+                param3 = FUN_020167F4();
+                if (param3 >= 0)
+                {
+                    UNK_021C4D28.unk00[param3] = tempName_NNS_FndCreateExpHeapEx(ptr3, param2, 0);
+
+
+                    if (UNK_021C4D28.unk00[param3] != 0)
+                    {
+                        UNK_021C4D28.unk04[param3] = ptr2;
+                        UNK_021C4D28.unk08[param3] = ptr3;
+                        UNK_021C4D28.unk10[param1] = (u8)param3;
+
+                        return 1;
+                    }
+                    else
+                    {
+                        ErrorHandling();
+                    }
+                }
+                else
+                {
+                    ErrorHandling();
+                }
+            }
+            else
+            {
+                ErrorHandling();
+            }
+        }
+        else
+        {
+            ErrorHandling();
+        }
+    }
+    else
+    {
+        ErrorHandling();
+    }
+    return 0;
+}
+
+THUMB_FUNC void FUN_020168D0(u32 heap_id)
+{
+    GF_ASSERT (OS_GetProcMode() != OS_PROCMODE_IRQ);
+
+    if (UNK_021C4D28.unk00[UNK_021C4D28.unk10[heap_id]] != 0)
+    {
+        thunk_FUN_020adc8c();
+
+        u8 index = UNK_021C4D28.unk10[heap_id];
+        void *ptr1 = UNK_021C4D28.unk04[index];
+        void *ptr2 = UNK_021C4D28.unk08[index];
+        if (ptr1 != 0 && ptr2 != 0)
+        {
+            FUN_020ADDF0(ptr1, ptr2);
+        }
+        else
+        {
+            ErrorHandling();
+        }
+
+        UNK_021C4D28.unk00[UNK_021C4D28.unk10[heap_id]] = 0;
+        UNK_021C4D28.unk04[UNK_021C4D28.unk10[heap_id]] = 0;
+        UNK_021C4D28.unk08[UNK_021C4D28.unk10[heap_id]] = 0;
+
+        UNK_021C4D28.unk10[heap_id] = (u8)UNK_021C4D28.unk1a;
+    }
+}
+
+THUMB_FUNC u32 *FUN_02016944(void *param0, u32 param1, s32 param2, u32 param3)
+{
+    GF_ASSERT(param0);
+
+    OSIntrMode intr_mode = OS_DisableInterrupts();
+    param1 += 16;
+    u32 *ptr = (u32 *)tempName_NNS_FndAllocFromExpHeapEx(param0, param1, param2);
+
+    OS_RestoreInterrupts(intr_mode);
+    if (ptr != 0)
+    {
+        ptr[3] = (ptr[3] & ~0xff) | (param3 & 0xff);
+
+        ptr += 4;
+    }
+
+    return ptr;
+}
+
+THUMB_FUNC void FUN_02016988()
+{
+    if (FUN_02031810() != 0)
+    {
+        PrintErrorMessageAndReset();
+    }
+}
+
+void *AllocFromHeap(u32 heap_id, u32 size)
+{
+    void *ptr = 0;
+    if (heap_id < UNK_021C4D28.unk14)
+    {
+        u8 index = UNK_021C4D28.unk10[heap_id];
+        ptr = FUN_02016944(UNK_021C4D28.unk00[index], size, 4, heap_id);
+    }
+    if (ptr != 0)
+    {
+        UNK_021C4D28.unk0c[heap_id]++;
+    }
+    else
+    {
+        FUN_02016988();
+    }
+
+    return ptr;
+}
+
+void *AllocFromHeapAtEnd(u32 heap_id, u32 size)
+{
+    void *ptr = 0;
+    if (heap_id < UNK_021C4D28.unk14)
+    {
+        u8 index = UNK_021C4D28.unk10[heap_id];
+        ptr = FUN_02016944(UNK_021C4D28.unk00[index], size, -4, heap_id);
+    }
+
+    if (ptr != 0)
+    {
+        UNK_021C4D28.unk0c[heap_id]++;
+    }
+    else
+    {
+        FUN_02016988();
+    }
+
+    return ptr;
+}
+
+void FreeToHeap(void *ptr)
+{
+    u8 heap_id = (u8)((u32 *)ptr)[-1];
+
+    if ((u16)heap_id < UNK_021C4D28.unk14)
+    {
+        u8 index = UNK_021C4D28.unk10[heap_id];
+        void *ptr2 = UNK_021C4D28.unk00[index];
+        GF_ASSERT(ptr2);
+
+        if (UNK_021C4D28.unk0c[heap_id] == 0)
+        {
+            FUN_02016B90(heap_id);
+        }
+        GF_ASSERT(UNK_021C4D28.unk0c[heap_id]);
+
+        UNK_021C4D28.unk0c[heap_id]--;
+        OSIntrMode intr_mode = OS_DisableInterrupts();
+        FUN_020ADDF0(ptr2, ptr - 16);
+        OS_RestoreInterrupts(intr_mode);
+        return;
+    }
+
+    ErrorHandling();
+}
+
+void FUN_02016A8C(u32 param0, void *param1)
+{
+    GF_ASSERT (OS_GetProcMode() != OS_PROCMODE_IRQ);
+
+    if (param0 < UNK_021C4D28.unk14)
+    {
+        u8 index = UNK_021C4D28.unk10[param0];
+        void *ptr = UNK_021C4D28.unk00[index];
+        GF_ASSERT (ptr );
+
+        u8 heap_id = (u8)((u32 *)param1)[-1];
+        GF_ASSERT (heap_id == param0);
+
+        FUN_020ADDF0(ptr, param1 - 16);
+        GF_ASSERT (UNK_021C4D28.unk0c[param0]);
+
+        UNK_021C4D28.unk0c[param0]--;
+        return;
+    }
+
+    ErrorHandling();
+}
+
+THUMB_FUNC u32 FUN_02016AF8(u32 param0)
+{
+    if (param0 < UNK_021C4D28.unk14)
+    {
+        u8 index = UNK_021C4D28.unk10[param0];
+        return FUN_020ADDC8(UNK_021C4D28.unk00[index]);
+    }
+
+    ErrorHandling();
+    return 0;
+}
+
+THUMB_FUNC void FUN_02016B20(u32 param0, u32 param1, u32 param2)
+{
+    if (param1 < UNK_021C4D28.unk14)
+    {
+
+        u8 index = UNK_021C4D28.unk10[param1];
+        FUN_020AE82C(param0, UNK_021C4D28.unk00[index], param2);
+        return;
+    }
+
+    ErrorHandling();
+}
+
+THUMB_FUNC void FUN_02016B44(void *ptr, u32 param1)
+{
+    GF_ASSERT (OS_GetProcMode() != OS_PROCMODE_IRQ);
+
+    param1 += 16;
+    if (FUN_020ADDC0(ptr - 16) >= param1)
+    {
+        u8 heap_id = (u8)((u32 *)ptr)[-1];
+
+        u8 index = UNK_021C4D28.unk10[heap_id];
+
+        FUN_020ADE2C(UNK_021C4D28.unk00[index], ptr - 16, param1);
+        return;
+    }
+    ErrorHandling();
+}
+
+THUMB_FUNC u32 FUN_02016B90(u32 param0)
+{
+#pragma unused(param0)
+    return 1;
+}
diff --git a/include/heap.h b/include/heap.h
index 6f04c5bc..69aedd9e 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,9 +1,37 @@
 #ifndef POKEDIAMOND_HEAP_H
 #define POKEDIAMOND_HEAP_H
 
-void * AllocFromHeap(u32 heap_id, u32 size);
-void * AllocFromHeapAtEnd(u32 heap_id, u32 size);
-void FreeToHeap(void * ptr);
+#include "global.h"
+
+struct UnkStruct_020166C8
+{
+    void **unk00;
+    void **unk04;
+    void **unk08;
+    u16 *unk0c;
+    u8 *unk10;
+    u16 unk14;
+    u16 unk16;
+    u16 unk18;
+    u16 unk1a;
+};
+
+
+THUMB_FUNC void FUN_020166C8(u32 *param0, u32 param1, u32 param2, u32 pre_size);
+THUMB_FUNC s32 FUN_020167F4();
+THUMB_FUNC u32 FUN_0201681C(u32 param0, u32 heap_id, u32 param2);
+THUMB_FUNC u32 FUN_02016828(u32 param0, u32 param1, u32 param2);
+THUMB_FUNC u32 FUN_02016834(u32 param0, u32 param1, u32 param2, s32 param3);
+THUMB_FUNC void FUN_020168D0(u32 heap_id);
+THUMB_FUNC u32 *FUN_02016944(void *param0, u32 param1, s32 param2, u32 param3);
+THUMB_FUNC void FUN_02016988();
+void *AllocFromHeap(u32 heap_id, u32 size);
+void *AllocFromHeapAtEnd(u32 heap_id, u32 size);
+void FreeToHeap(void *ptr);
 void FUN_02016A8C(u32 heap_id, void * ptr);
+THUMB_FUNC u32 FUN_02016AF8(u32 param0);
+THUMB_FUNC void FUN_02016B20(u32 param0, u32 param1, u32 param2);
+THUMB_FUNC void FUN_02016B44(void *ptr, u32 param1);
+THUMB_FUNC u32 FUN_02016B90(u32 param0);
 
 #endif //POKEDIAMOND_HEAP_H