6 files changed, 30 insertions, 30 deletions
diff --git a/arm9/modules/05/asm/mod05_021E2B80.s b/arm9/modules/05/asm/mod05_021E2B80.s
index 86414448..8aa39261 100644
--- a/arm9/modules/05/asm/mod05_021E2B80.s
+++ b/arm9/modules/05/asm/mod05_021E2B80.s
@@ -324,23 +324,23 @@ MOD05_021E2DF0: ; 0x021E2DF0
 	add r6, r2, #0
 	add r0, sp, #0
 	add r7, r3, #0
-	bl FUN_02013724
+	bl MailMsg_init
 	add r0, sp, #0
 	add r1, r4, #0
 	add r2, r6, #0
-	bl FUN_02013980
+	bl MailMsg_SetMsgBankAndNum
 	add r0, sp, #0
 	mov r1, #0
 	add r2, r7, #0
-	bl FUN_02013998
+	bl MailMsg_SetFieldI
 	add r2, sp, #0x10
 	ldrh r2, [r2, #0x10]
 	add r0, sp, #0
 	mov r1, #1
-	bl FUN_02013998
+	bl MailMsg_SetFieldI
 	add r0, sp, #0
 	mov r1, #0x20
-	bl FUN_020137D4
+	bl MailMsg_GetExpandedString
 	add r4, r0, #0
 	ldr r0, [r5]
 	add r1, r4, #0
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index fb098d96..c342adc4 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -4840,7 +4840,7 @@ MOD11_02231684: ; 0x02231684
 	mul r1, r0
 	add r0, r5, r1
 	mov r1, #5
-	bl FUN_020137D4
+	bl MailMsg_GetExpandedString
 	b _022316CC
 _022316BC:
 	ldr r0, [sp, #0xc]
@@ -4849,7 +4849,7 @@ _022316BC:
 	mul r1, r0
 	add r0, r5, r1
 	mov r1, #5
-	bl FUN_020137D4
+	bl MailMsg_GetExpandedString
 _022316CC:
 	add r4, r0, #0
 	add r0, r6, #0
diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s
index 712980c4..d8172549 100644
--- a/arm9/modules/15/asm/module_15.s
+++ b/arm9/modules/15/asm/module_15.s
@@ -252,14 +252,14 @@ MOD15_021D76C4: ; 0x021D76C4
 	add r4, r1, #0
 	add r5, r0, #0
 	add r0, r4, #0
-	bl FUN_02013920
+	bl MailMsg_GetMsgBank
 	strh r0, [r5]
 	mov r0, #0
 	ldrsh r0, [r5, r0]
-	bl FUN_02013974
+	bl MailMsg_NumMsgsInBank
 	strb r0, [r5, #3]
 	add r0, r4, #0
-	bl FUN_02013924
+	bl MailMsg_GetMsgNo
 	strb r0, [r5, #2]
 	pop {r3, r4, r5, pc}
 	.align 2, 0
@@ -290,7 +290,7 @@ MOD15_021D76E8: ; 0x021D76E8
 _021D7712:
 	mov r0, #0
 	ldrsh r0, [r5, r0]
-	bl FUN_02013974
+	bl MailMsg_NumMsgsInBank
 	strb r0, [r5, #3]
 _021D771C:
 	mov r1, #0
@@ -298,7 +298,7 @@ _021D771C:
 	ldrsh r1, [r5, r1]
 	ldrsb r2, [r5, r2]
 	add r0, r4, #0
-	bl FUN_02013980
+	bl MailMsg_SetMsgBankAndNum
 	pop {r3, r4, r5, pc}
 
 	thumb_func_start MOD15_021D772C
@@ -325,7 +325,7 @@ MOD15_021D772C: ; 0x021D772C
 _021D7752:
 	mov r0, #0
 	ldrsh r0, [r5, r0]
-	bl FUN_02013974
+	bl MailMsg_NumMsgsInBank
 	strb r0, [r5, #3]
 	mov r0, #3
 	ldrsb r0, [r5, r0]
@@ -337,7 +337,7 @@ _021D7764:
 	ldrsh r1, [r5, r1]
 	ldrsb r2, [r5, r2]
 	add r0, r4, #0
-	bl FUN_02013980
+	bl MailMsg_SetMsgBankAndNum
 	pop {r3, r4, r5, pc}
 
 	thumb_func_start MOD15_021D7774
@@ -1917,7 +1917,7 @@ _021D8362:
 	ldrh r1, [r1]
 	add r0, r4, #0
 	add r0, #8
-	bl FUN_02013998
+	bl MailMsg_SetFieldI
 _021D8370:
 	add r0, r4, #0
 	bl MOD15_021D85EC
@@ -2102,7 +2102,7 @@ _021D84B6:
 	bne _021D84CA
 	add r0, r4, #0
 	add r0, #8
-	bl FUN_020139B0
+	bl MailMsg_SetTrailingFieldsEmpty
 _021D84CA:
 	add r1, r4, #0
 	add r2, r4, #0
@@ -2282,7 +2282,7 @@ _021D8620:
 	pop {r3, pc}
 _021D8624:
 	add r0, #8
-	bl FUN_02013870
+	bl MailMsg_AllFieldsAreInit
 	pop {r3, pc}
 _021D862C:
 	mov r0, #0
@@ -2417,11 +2417,11 @@ MOD15_021D86F4: ; 0x021D86F4
 
 	thumb_func_start MOD15_021D86FC
 MOD15_021D86FC: ; 0x021D86FC
-	ldr r3, _021D8704 ; =FUN_02013920
+	ldr r3, _021D8704 ; =MailMsg_GetMsgBank
 	add r0, #8
 	bx r3
 	nop
-_021D8704: .word FUN_02013920
+_021D8704: .word MailMsg_GetMsgBank
 
 	thumb_func_start MOD15_021D8708
 MOD15_021D8708: ; 0x021D8708
@@ -2430,7 +2430,7 @@ MOD15_021D8708: ; 0x021D8708
 	cmp r2, #2
 	bne _021D8718
 	add r0, #8
-	bl FUN_02013918
+	bl MailMsg_GetFieldI
 	pop {r3, pc}
 _021D8718:
 	lsl r1, r1, #1
@@ -2440,11 +2440,11 @@ _021D8718:
 
 	thumb_func_start MOD15_021D8720
 MOD15_021D8720: ; 0x021D8720
-	ldr r3, _021D8728 ; =FUN_02013840
+	ldr r3, _021D8728 ; =MailMsg_GetRawString
 	add r0, #8
 	bx r3
 	nop
-_021D8728: .word FUN_02013840
+_021D8728: .word MailMsg_GetRawString
 
 	thumb_func_start MOD15_021D872C
 MOD15_021D872C: ; 0x021D872C
diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s
index 72a21ef0..0eea16a7 100644
--- a/arm9/modules/51/asm/module_51.s
+++ b/arm9/modules/51/asm/module_51.s
@@ -1675,7 +1675,7 @@ _02255530:
 	str r0, [r1, #0x10]
 	add r0, r6, #0
 	mov r1, #0x59
-	bl FUN_020137D4
+	bl MailMsg_GetExpandedString
 	ldr r2, [r5]
 	mov r1, #0x1c
 	mul r1, r2
@@ -1717,7 +1717,7 @@ MOD51_022555C0: ; 0x022555C0
 	add r0, r1, #0
 	str r1, [sp]
 	add r7, r2, #0
-	bl FUN_0201385C
+	bl MailMsg_IsInit
 	cmp r0, #0
 	bne _022555D6
 	mov r0, #0
@@ -1739,7 +1739,7 @@ _022555E8:
 	bne _022555FC
 	ldr r0, [sp]
 	add r1, #0x14
-	bl FUN_02013928
+	bl MailMsg_compare
 	cmp r0, #0
 	bne _02255610
 _022555FC:
@@ -1774,7 +1774,7 @@ _02255626:
 	beq _0225563A
 	ldr r0, [sp]
 	add r1, #0x14
-	bl FUN_02013928
+	bl MailMsg_compare
 _0225563A:
 	mov r0, #1
 	pop {r3, r4, r5, r6, r7, pc}
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s
index e82b9e44..5cb5badb 100644
--- a/arm9/modules/61/asm/module_61.s
+++ b/arm9/modules/61/asm/module_61.s
@@ -96,7 +96,7 @@ _021D758C:
 	ldr r0, [r6, #0x1c]
 	add r0, #0x1a
 	add r0, r0, r5
-	bl FUN_0201385C
+	bl MailMsg_IsInit
 	cmp r0, #0
 	beq _021D759E
 	mov r0, #0
@@ -1537,14 +1537,14 @@ _021D8122:
 	ldr r0, [r4, #0x1c]
 	add r0, #0x1a
 	add r0, r0, r5
-	bl FUN_0201385C
+	bl MailMsg_IsInit
 	cmp r0, #0
 	beq _021D8164
 	ldr r0, [r4, #0x1c]
 	ldr r1, [r4]
 	add r0, #0x1a
 	add r0, r0, r5
-	bl FUN_020137D4
+	bl MailMsg_GetExpandedString
 	str r0, [sp, #0x10]
 	mov r0, #0
 	str r0, [sp]
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index 4daaf396..637691d0 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -1632,7 +1632,7 @@ MOD74_021D818C: ; 0x021D818C
 	add r0, r0, r1
 	ldr r1, [r4]
 	add r0, #8
-	bl FUN_020137D4
+	bl MailMsg_GetExpandedString
 	add r5, r0, #0
 	add r0, r4, #0
 	add r0, #0x8c