Merge branch 'master' into decomp-unk_02024E64

4 files changed, 49 insertions, 73 deletions

diff --git a/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s b/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
index 2d51a2ae..a083bf2e 100644
--- a/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
+++ b/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
@@ -1,11 +1,11 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
 
-	.extern UNK_021C570C
-	.extern UNK_021C5734
+.section .text
+
+glabel GenerateFontHalfRowLookupTable
+
+.extern UNK_021C570C
+.extern UNK_021C5734
 
-	thumb_func_start GenerateFontHalfRowLookupTable
-GenerateFontHalfRowLookupTable: ; 0x0201C05C
 	push {r3-r7, lr}
 	sub sp, #0x30
 	ldr r3, _0201C0F8 ; =UNK_021C570C
diff --git a/arm9/asm/unk_0204AEA8.s b/arm9/asm/unk_0204AEA8.s
deleted file mode 100644
index 018a64e2..00000000
--- a/arm9/asm/unk_0204AEA8.s
+++ /dev/null
@@ -1,67 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_0204AEA8
-FUN_0204AEA8: ; 0x0204AEA8
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl FUN_02046528
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0204652C
-	add r4, r0, #0x0
-	ldr r1, [r4, #0x0]
-	cmp r1, #0x0
-	beq _0204AEC6
-	cmp r1, #0x1
-	beq _0204AEE6
-	b _0204AEF4
-_0204AEC6:
-	ldr r0, [r4, #0x8]
-	add r1, r5, #0x0
-	add r2, r4, #0x4
-	bl MOD05_021E3444
-	ldr r1, [r4, #0xc]
-	mov r0, #0x5
-	lsl r1, r1, #0x10
-	lsr r1, r1, #0x10
-	mov r2, #0x1
-	bl FUN_0200433C
-	ldr r0, [r4, #0x0]
-	add r0, r0, #0x1
-	str r0, [r4, #0x0]
-	b _0204AEF4
-_0204AEE6:
-	ldr r1, [r4, #0x4]
-	cmp r1, #0x1
-	bne _0204AEF4
-	bl FreeToHeap
-	mov r0, #0x1
-	pop {r3-r5, pc}
-_0204AEF4:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_0204AEF8
-FUN_0204AEF8: ; 0x0204AEF8
-	push {r4-r6, lr}
-	add r6, r0, #0x0
-	add r5, r1, #0x0
-	mov r0, #0xb
-	mov r1, #0x10
-	add r4, r2, #0x0
-	bl AllocFromHeapAtEnd
-	add r2, r0, #0x0
-	mov r0, #0x0
-	str r0, [r2, #0x0]
-	str r0, [r2, #0x4]
-	str r5, [r2, #0x8]
-	ldr r1, _0204AF20 ; =FUN_0204AEA8
-	add r0, r6, #0x0
-	str r4, [r2, #0xc]
-	bl FUN_0204640C
-	pop {r4-r6, pc}
-	nop
-_0204AF20: .word FUN_0204AEA8
diff --git a/arm9/src/unk_0204AEA8.c b/arm9/src/unk_0204AEA8.c
new file mode 100644
index 00000000..9c572a8e
--- /dev/null
+++ b/arm9/src/unk_0204AEA8.c
@@ -0,0 +1,43 @@
+#include "global.h"
+#include "heap.h"
+#include "unk_0204639C.h"
+#include "unk_0204AEA8.h"
+
+extern void MOD05_021E3444(u32, struct UnkStruct_0204639C *, u32);
+extern void FUN_0200433C(u32, u16, u32);
+
+THUMB_FUNC BOOL FUN_0204AEA8(struct UnkStruct_0204639C *a0)
+{
+    struct UnkStruct_0204639C *v0 = FUN_02046528(a0);
+    u32 *v1 = FUN_0204652C(a0);
+
+    switch (v1[0])
+    {
+        case 0:
+            MOD05_021E3444(v1[2], v0, (u32)v1 + 4);
+            FUN_0200433C(5, (u16)v1[3], 1);
+            v1[0]++;
+            break;
+        case 1:
+            if (v1[1] == 1)
+            {
+                FreeToHeap(v1);
+                return TRUE;
+            }
+            break;
+    }
+    
+    return FALSE;
+}
+
+THUMB_FUNC void FUN_0204AEF8(struct UnkStruct_0204639C *a0, u32 a1, u32 a2)
+{
+    u32 *v0 = AllocFromHeapAtEnd(11, 4 * sizeof(u32));
+    
+    v0[0] = 0;
+    v0[1] = 0;
+    v0[2] = a1;
+    v0[3] = a2;
+    
+    FUN_0204640C(a0, FUN_0204AEA8, v0);
+}
diff --git a/arm9/temp.c b/arm9/temp.c
deleted file mode 100644
index e69de29b..00000000
--- a/arm9/temp.c
+++ /dev/null