Merge remote-tracking branch 'refs/remotes/pret/master'

asm/mail.s

@@ -167,7 +167,7 @@ _081215BA:
 sub_81215EC: @ 81215EC
 	push {r4-r6,lr}
 	sub sp, 0xC
-	ldr r0, =gUnknown_030022C0
+	ldr r0, =gMain
 	movs r1, 0x87
 	lsls r1, 3
 	adds r0, r1
@@ -420,7 +420,7 @@ _081217EC:
 	movs r2, 0x20
 	bl LoadPalette
 	ldr r1, =gUnknown_0859F2B0
-	ldr r0, =gUnknown_03005D90
+	ldr r0, =gSaveBlock2Ptr
 	ldr r2, [r0]
 	ldrb r0, [r2, 0x8]
 	lsls r0, 2
@@ -574,7 +574,7 @@ _08121980:
 	b _081219E4
 	.pool
 _081219D4:
-	ldr r1, =gUnknown_030022C0
+	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
 	adds r1, r2
@@ -683,7 +683,7 @@ _08121A8A:
 	adds r1, r3
 	ldr r1, [r1]
 	adds r1, 0x12
-	bl CopyString
+	bl StringCopy
 	adds r2, r0, 0
 	ldr r1, [r4]
 	ldr r3, =0x0000021e
@@ -693,12 +693,12 @@ _08121A8A:
 	bne _08121AF0
 	ldr r1, =gUnknown_085EEA78
 	adds r0, r2, 0
-	bl CopyString
+	bl StringCopy
 	ldr r0, [r4]
 	movs r1, 0x80
 	lsls r1, 2
 	adds r0, r1
-	bl GetStringLength
+	bl StringLength
 	ldr r2, [r4]
 	movs r3, 0x8A
 	lsls r3, 2
@@ -827,13 +827,13 @@ _08121BB8:
 _08121BCC:
 	ldr r1, =gUnknown_085EEA78
 	add r0, sp, 0xC
-	bl CopyString
+	bl StringCopy
 	ldr r4, =gUnknown_0203A134
 	ldr r1, [r4]
 	movs r2, 0x80
 	lsls r2, 2
 	adds r1, r2
-	bl CopyString
+	bl StringCopy
 	ldr r0, [r4]
 	ldr r1, =0x00000219
 	adds r0, r1
@@ -939,7 +939,7 @@ _08121CB2:
 sub_8121CC0: @ 8121CC0
 	push {lr}
 	sub sp, 0x4
-	ldr r0, =gUnknown_030022C0
+	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0x3
 	ands r0, r1