6 files changed, 35 insertions, 62 deletions
diff --git a/arm9/asm/error_handling.s b/arm9/asm/error_handling.s
index 04589e6c..d6330897 100644
--- a/arm9/asm/error_handling.s
+++ b/arm9/asm/error_handling.s
@@ -12,6 +12,6 @@ ErrorHandling: ; 0x02020C2C
 	bl OS_GetProcMode
 	cmp r0, #0x12
 	beq _02020C42
-	bl FUN_0208A9B8
+	bl PrintErrorMessageAndReset
 _02020C42:
 	pop {r3, pc}
diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s
index ee2881da..fe3efdd2 100644
--- a/arm9/asm/unk_02002C14.s
+++ b/arm9/asm/unk_02002C14.s
@@ -15,45 +15,18 @@ UNK_02106FCC: ; 0x02106FCC
 
 	.global UNK_020ECB54
 UNK_020ECB54: ; 0x020ECB54
-	.byte 0x00, 0x00
-
-	.global UNK_020ECB56
-UNK_020ECB56: ; 0x020ECB56
-	.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+	.short 0x0000, 0x0000
+	.short 0x0001, 0x0000
+	.short 0x0002, 0x0000
+	.short 0x0003, 0x0000
 
 	.global UNK_020ECB64
 UNK_020ECB64: ; 0x020ECB64
-	.byte 0x0B
-
-	.global UNK_020ECB65
-UNK_020ECB65: ; 0x020ECB65
-	.byte 0x10
-
-	.global UNK_020ECB66
-UNK_020ECB66: ; 0x020ECB66
-	.byte 0x00
-
-	.global UNK_020ECB67
-UNK_020ECB67: ; 0x020ECB67
-	.byte 0x00
-
-	.global UNK_020ECB68
-UNK_020ECB68: ; 0x020ECB68
-	.byte 0x00
-
-	.global UNK_020ECB69
-UNK_020ECB69: ; 0x020ECB69
-	.byte 0x01
-
-	.global UNK_020ECB6A
-UNK_020ECB6A: ; 0x020ECB6A
-	.byte 0x0F
-
-	.global UNK_020ECB6B
-UNK_020ECB6B: ; 0x020ECB6B
-	.byte 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F
-	.byte 0x02, 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00
+	.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
+	.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
+	.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
+	.byte 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 	.text
 
@@ -94,7 +67,7 @@ FUN_02002C50: ; 0x02002C50
 	str r1, [sp, #0x0]
 	lsl r4, r0, #0x2
 	ldr r1, _02002C78 ; =UNK_020ECB54
-	ldr r3, _02002C7C ; =UNK_020ECB56
+	ldr r3, _02002C7C ; =UNK_020ECB54 + 2
 	ldrh r1, [r1, r4]
 	ldrh r3, [r3, r4]
 	mov r0, #0xe
@@ -109,7 +82,7 @@ FUN_02002C50: ; 0x02002C50
 	pop {r3-r4, pc}
 	nop
 _02002C78: .word UNK_020ECB54
-_02002C7C: .word UNK_020ECB56
+_02002C7C: .word UNK_020ECB54 + 2
 _02002C80: .word UNK_02106FC8
 
 	thumb_func_start FUN_02002C84
@@ -381,50 +354,50 @@ _02002E6E:
 	b _02002EAC
 _02002E76:
 	lsl r1, r0, #0x3
-	ldr r0, _02002EB4 ; =UNK_020ECB65
+	ldr r0, _02002EB4 ; =UNK_020ECB64 + 1
 	ldrb r2, [r0, r1]
 	b _02002EAC
 _02002E7E:
 	lsl r1, r0, #0x3
-	ldr r0, _02002EB8 ; =UNK_020ECB66
+	ldr r0, _02002EB8 ; =UNK_020ECB64 + 2
 	ldrb r2, [r0, r1]
 	b _02002EAC
 _02002E86:
 	lsl r1, r0, #0x3
-	ldr r0, _02002EBC ; =UNK_020ECB67
+	ldr r0, _02002EBC ; =UNK_020ECB64 + 3
 	ldrb r2, [r0, r1]
 	b _02002EAC
 _02002E8E:
 	lsl r1, r0, #0x3
-	ldr r0, _02002EC0 ; =UNK_020ECB68
+	ldr r0, _02002EC0 ; =UNK_020ECB64 + 4
 	ldrb r2, [r0, r1]
 	b _02002EAC
 _02002E96:
 	lsl r1, r0, #0x3
-	ldr r0, _02002EC4 ; =UNK_020ECB69
+	ldr r0, _02002EC4 ; =UNK_020ECB64 + 5
 	ldrb r2, [r0, r1]
 	b _02002EAC
 _02002E9E:
 	lsl r1, r0, #0x3
-	ldr r0, _02002EC8 ; =UNK_020ECB6A
+	ldr r0, _02002EC8 ; =UNK_020ECB64 + 6
 	ldrb r2, [r0, r1]
 	b _02002EAC
 _02002EA6:
 	lsl r1, r0, #0x3
-	ldr r0, _02002ECC ; =UNK_020ECB6B
+	ldr r0, _02002ECC ; =UNK_020ECB64 + 7
 	ldrb r2, [r0, r1]
 _02002EAC:
 	add r0, r2, #0x0
 	bx lr
 	.balign 4
 _02002EB0: .word UNK_020ECB64
-_02002EB4: .word UNK_020ECB65
-_02002EB8: .word UNK_020ECB66
-_02002EBC: .word UNK_020ECB67
-_02002EC0: .word UNK_020ECB68
-_02002EC4: .word UNK_020ECB69
-_02002EC8: .word UNK_020ECB6A
-_02002ECC: .word UNK_020ECB6B
+_02002EB4: .word UNK_020ECB64 + 1
+_02002EB8: .word UNK_020ECB64 + 2
+_02002EBC: .word UNK_020ECB64 + 3
+_02002EC0: .word UNK_020ECB64 + 4
+_02002EC4: .word UNK_020ECB64 + 5
+_02002EC8: .word UNK_020ECB64 + 6
+_02002ECC: .word UNK_020ECB64 + 7
 
 	thumb_func_start FUN_02002ED0
 FUN_02002ED0: ; 0x02002ED0
diff --git a/arm9/asm/unk_020166C8.s b/arm9/asm/unk_020166C8.s
index 87453775..3c251114 100644
--- a/arm9/asm/unk_020166C8.s
+++ b/arm9/asm/unk_020166C8.s
@@ -393,7 +393,7 @@ FUN_02016988: ; 0x02016988
 	bl FUN_02031810
 	cmp r0, #0x0
 	beq _02016996
-	bl FUN_0208A9B8
+	bl PrintErrorMessageAndReset
 _02016996:
 	pop {r3, pc}
 
diff --git a/arm9/asm/unk_0201BCBC.s b/arm9/asm/unk_0201BCBC.s
index c8cd3e56..f81339be 100644
--- a/arm9/asm/unk_0201BCBC.s
+++ b/arm9/asm/unk_0201BCBC.s
@@ -5,7 +5,7 @@
 
 	.global UNK_02105BB4
 UNK_02105BB4: ; 0x02105BB4
-	.byte 0x00, 0x00, 0x00, 0x00
+	.word 0
 
 	.section .bss
 
diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s
index 2c02879a..56522d7a 100644
--- a/arm9/asm/unk_0208A998.s
+++ b/arm9/asm/unk_0208A998.s
@@ -30,8 +30,8 @@ UNK_020FF4D8: ; 0x020FF4D8
 
 	.section .bss
 
-	.global UNK_021C8C58
-UNK_021C8C58: ; 0x021C8C58
+	.global sErrorMessagePrinterLock
+sErrorMessagePrinterLock: ; 0x021C8C58
 	.space 0x4
 
 	.text
@@ -52,11 +52,11 @@ _0208A9AC: .word 0x027E0000
 _0208A9B0: .word 0x00003FF8
 _0208A9B4: .word MI_WaitDma
 
-	thumb_func_start FUN_0208A9B8
-FUN_0208A9B8: ; 0x0208A9B8
+	thumb_func_start PrintErrorMessageAndReset
+PrintErrorMessageAndReset: ; 0x0208A9B8
 	push {r4-r7, lr}
 	sub sp, #0x24
-	ldr r0, _0208ABC8 ; =UNK_021C8C58
+	ldr r0, _0208ABC8 ; =sErrorMessagePrinterLock
 	ldr r1, [r0, #0x0]
 	cmp r1, #0x1
 	bne _0208A9C6
@@ -273,7 +273,7 @@ _0208ABC4:
 	add sp, #0x24
 	pop {r4-r7, pc}
 	.balign 4
-_0208ABC8: .word UNK_021C8C58
+_0208ABC8: .word sErrorMessagePrinterLock
 _0208ABCC: .word UNK_020FF4A4
 _0208ABD0: .word FUN_0208A998
 _0208ABD4: .word 0xFFFFE0FF
diff --git a/arm9/global.inc b/arm9/global.inc
index ad2fb8a9..c44fa06a 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -5479,7 +5479,7 @@
 .extern FUN_0208A330
 .extern FUN_0208A334
 .extern FUN_0208A338
-.extern FUN_0208A9B8
+.extern PrintErrorMessageAndReset
 .extern FUN_0208AC14
 .extern FUN_0208AC58
 .extern FUN_0208ACEC