Merge branch 'master' of https://github.com/pret/pokediamond

3 files changed, 6 insertions, 191 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_02024E64.s b/arm9/asm/unk_02024E64.s
deleted file mode 100644
index 0234a504..00000000
--- a/arm9/asm/unk_02024E64.s
+++ /dev/null
@@ -1,118 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02024E64
-FUN_02024E64: ; 0x02024E64
-	ldr r0, _02024E68 ; =0x0000074C
-	bx lr
-	.balign 4
-_02024E68: .word 0x0000074C
-
-	thumb_func_start FUN_02024E6C
-FUN_02024E6C: ; 0x02024E6C
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r2, _02024EA4 ; =0x0000074C
-	mov r0, #0x0
-	add r1, r4, #0x0
-	bl MIi_CpuClearFast
-	add r0, r4, #0x0
-	bl FUN_020250A4
-	mov r0, #0x7
-	lsl r0, r0, #0x8
-	add r0, r4, r0
-	bl FUN_02025484
-	ldr r1, _02024EA8 ; =0x00000724
-	ldr r0, _02024EAC ; =0x0000FFFF
-	add r1, r4, r1
-	mov r2, #0x8
-	bl MIi_CpuClear16
-	ldr r1, _02024EB0 ; =0x00000734
-	ldr r0, _02024EAC ; =0x0000FFFF
-	add r1, r4, r1
-	mov r2, #0xb
-	bl MIi_CpuClear16
-	pop {r4, pc}
-	.balign 4
-_02024EA4: .word 0x0000074C
-_02024EA8: .word 0x00000724
-_02024EAC: .word 0x0000FFFF
-_02024EB0: .word 0x00000734
-
-	thumb_func_start FUN_02024EB4
-FUN_02024EB4: ; 0x02024EB4
-	ldr r3, _02024EBC ; =SavArray_get
-	mov r1, #0xa
-	bx r3
-	nop
-_02024EBC: .word SavArray_get
-
-	thumb_func_start FUN_02024EC0
-FUN_02024EC0: ; 0x02024EC0
-	ldr r3, _02024EC8 ; =FUN_02022634
-	mov r1, #0xa
-	bx r3
-	nop
-_02024EC8: .word FUN_02022634
-
-	thumb_func_start FUN_02024ECC
-FUN_02024ECC: ; 0x02024ECC
-	ldr r3, _02024ED4 ; =SavArray_get
-	mov r1, #0xa
-	bx r3
-	nop
-_02024ED4: .word SavArray_get
-
-	thumb_func_start FUN_02024ED8
-FUN_02024ED8: ; 0x02024ED8
-	push {r3, lr}
-	mov r1, #0xa
-	bl SavArray_get
-	mov r1, #0x7
-	lsl r1, r1, #0x8
-	add r0, r0, r1
-	pop {r3, pc}
-
-	thumb_func_start FUN_02024EE8
-FUN_02024EE8: ; 0x02024EE8
-	ldr r1, _02024EF0 ; =0x00000724
-	add r0, r0, r1
-	bx lr
-	nop
-_02024EF0: .word 0x00000724
-
-	thumb_func_start FUN_02024EF4
-FUN_02024EF4: ; 0x02024EF4
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	ldr r1, _02024F04 ; =0x00000724
-	ldr r3, _02024F08 ; =CopyStringToU16Array
-	add r1, r2, r1
-	mov r2, #0x8
-	bx r3
-	nop
-_02024F04: .word 0x00000724
-_02024F08: .word CopyStringToU16Array
-
-	thumb_func_start FUN_02024F0C
-FUN_02024F0C: ; 0x02024F0C
-	ldr r1, _02024F14 ; =0x00000734
-	add r0, r0, r1
-	bx lr
-	nop
-_02024F14: .word 0x00000734
-
-	thumb_func_start FUN_02024F18
-FUN_02024F18: ; 0x02024F18
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	ldr r1, _02024F28 ; =0x00000734
-	ldr r3, _02024F2C ; =CopyStringToU16Array
-	add r1, r2, r1
-	mov r2, #0xb
-	bx r3
-	nop
-_02024F28: .word 0x00000734
-_02024F2C: .word CopyStringToU16Array
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