Sync string_gf.c with pokeplatinum and pokeheartgold

arm9/arm9.lsf

@@ -79,7 +79,7 @@ Static arm9
     Object unk_02020C44.o
     Object unk_0202134C.o
     Object unk_02021590.o
-    Object unk_02021934.o
+    Object string_gf.o
     Object unk_02021FF8.o
     Object unk_02022244.o
     Object unk_02022294.o

arm9/asm/scrcmd_12.s

@@ -640,7 +640,7 @@ _020431D4:
 	bl SetMonData
 	add r0, r5, #0x0
 	add r4, r7, #0x0
-	bl String_Delete
+	bl String_Free
 _0204322C:
 	ldr r1, [sp, #0x8]
 	mov r0, #0x2
@@ -894,7 +894,7 @@ sub_020433DC: ; 0x020433DC
 	mov r3, #0x0
 	bl BufferString
 	add r0, r4, #0x0
-	bl String_Delete
+	bl String_Free
 	add sp, #0x8
 	pop {r3-r7, pc}
 

arm9/asm/scrcmd_9.s

@@ -527,7 +527,7 @@ sub_0204224C: ; 0x0204224C
 	bl String_New
 	add r1, r7, #0x0
 	add r4, r0, #0x0
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 	ldr r0, [sp, #0x24]
 	ldr r3, [sp, #0x8]
 	str r0, [sp, #0x0]
@@ -538,7 +538,7 @@ sub_0204224C: ; 0x0204224C
 	add r2, r4, #0x0
 	bl BufferString
 	add r0, r4, #0x0
-	bl String_Delete
+	bl String_Free
 	add sp, #0xc
 	pop {r4-r7, pc}
 	.balign 4

arm9/asm/unk_02012CC8.s

@@ -1503,7 +1503,7 @@ ListMenuCursorNew: ; 0x02013690
 	bl String_New
 	ldr r1, _020136BC ; =UNK_020ED548
 	str r0, [r4, #0x4]
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 _020136B2:
 	add r0, r4, #0x0
 	pop {r3-r5, pc}
@@ -1523,7 +1523,7 @@ _020136CA:
 	ldr r0, [r4, #0x4]
 	cmp r0, #0x0
 	beq _020136D8
-	bl String_Delete
+	bl String_Free
 _020136D8:
 	add r0, r4, #0x0
 	bl Heap_Free

arm9/asm/unk_020144FC.s

@@ -64,7 +64,7 @@ sub_02014564: ; 0x02014564
 	add r5, #0x70
 _0201456E:
 	ldr r0, [r5, #0x4]
-	bl String_Delete
+	bl String_Free
 	sub r5, r5, #0x4
 	sub r4, r4, #0x1
 	bpl _0201456E

arm9/asm/unk_02023AC4.s

@@ -47,14 +47,14 @@ _02023AE0: .word memset
 
 	thumb_func_start sub_02023AE4
 sub_02023AE4: ; 0x02023AE4
-	ldr r3, _02023AF0 ; =CopyU16ArrayToStringN
+	ldr r3, _02023AF0 ; =String_CopyNumChars
 	add r2, r0, #0x0
 	add r0, r1, #0x0
 	add r1, r2, #0x0
 	mov r2, #0xc
 	bx r3
 	.balign 4
-_02023AF0: .word CopyU16ArrayToStringN
+_02023AF0: .word String_CopyNumChars
 
 	thumb_func_start sub_02023AF4
 sub_02023AF4: ; 0x02023AF4
@@ -64,7 +64,7 @@ sub_02023AF4: ; 0x02023AF4
 	bl String_New
 	add r1, r5, #0x0
 	add r4, r0, #0x0
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 	add r0, r4, #0x0
 	pop {r3-r5, pc}
 	.balign 4

arm9/asm/unk_02026CD0.s

@@ -112,7 +112,7 @@ sub_02026D98: ; 0x02026D98
 	add r4, r2, #0x0
 	add r1, #0x20
 	mov r2, #0x8
-	bl CopyStringToU16Array
+	bl String_CopyToChars
 	add r5, #0x34
 	strb r4, [r5, #0x0]
 	pop {r3-r5, pc}
@@ -2242,13 +2242,13 @@ sub_02027C84: ; 0x02027C84
 	thumb_func_start sub_02027C88
 sub_02027C88: ; 0x02027C88
 	add r2, r0, #0x0
-	ldr r3, _02027C94 ; =CopyU16ArrayToString
+	ldr r3, _02027C94 ; =String_CopyFromChars
 	add r2, #0x20
 	add r0, r1, #0x0
 	add r1, r2, #0x0
 	bx r3
 	.balign 4
-_02027C94: .word CopyU16ArrayToString
+_02027C94: .word String_CopyFromChars
 
 	thumb_func_start sub_02027C98
 sub_02027C98: ; 0x02027C98

arm9/asm/unk_020281E0.s

@@ -291,7 +291,7 @@ _020283D0:
 	add r1, r2, r1
 	add r0, r6, #0x0
 	mov r2, #0x10
-	bl CopyStringToU16Array
+	bl String_CopyToChars
 	pop {r4-r6, pc}
 	.balign 4
 
@@ -330,7 +330,7 @@ _02028414:
 	add r1, r2, r1
 	add r0, r6, #0x0
 	mov r2, #0x10
-	bl CopyStringToU16Array
+	bl String_CopyToChars
 	pop {r4-r6, pc}
 	.balign 4
 

arm9/asm/unk_0202B870.s

@@ -277,7 +277,7 @@ _0202BA38:
 	add r0, r7, #0x0
 	add r1, #0x8
 	mov r2, #0x8
-	bl CopyStringToU16Array
+	bl String_CopyToChars
 	ldr r0, [r5, #0x0]
 	add r6, r6, #0x1
 	str r0, [r4, #0x4]
@@ -288,7 +288,7 @@ _0202BA38:
 	ldr r0, [sp, #0x0]
 	bl Heap_Free
 	add r0, r7, #0x0
-	bl String_Delete
+	bl String_Free
 	ldr r0, [sp, #0x4]
 	add sp, #0xc
 	pop {r4-r7, pc}
@@ -822,7 +822,7 @@ _0202BE14:
 	add r1, r5, #0x0
 	ldr r0, [r0, #0xc]
 	add r1, #0x8
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 	ldr r0, [r4, #0x0]
 	add r0, r0, #0x1
 	str r0, [r4, #0x0]
@@ -844,7 +844,7 @@ _0202BE74:
 	ldr r0, [r5, #0xc]
 	cmp r0, #0x0
 	beq _0202BE7E
-	bl String_Delete
+	bl String_Free
 _0202BE7E:
 	add r4, r4, #0x1
 	add r5, #0xc

arm9/asm/unk_02033874.s

@@ -285,7 +285,7 @@ _02033AA6:
 	add r1, r5, #0x0
 	bl sub_020283C0
 	ldr r0, [sp, #0xc]
-	bl String_Delete
+	bl String_Free
 	add r0, r6, #0x0
 	bl PlayerProfile_GetTrainerGender
 	add r3, r0, #0x0
@@ -333,13 +333,13 @@ _02033B22:
 	bl sub_0202DFFC
 	add r1, r0, #0x0
 	ldr r0, [sp, #0x10]
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 	ldr r2, [sp, #0x10]
 	add r0, r4, #0x0
 	add r1, r5, #0x0
 	bl sub_02028404
 	ldr r0, [sp, #0x10]
-	bl String_Delete
+	bl String_Free
 	add r0, r6, #0x0
 	bl PlayerProfile_GetAvatar
 	add r3, r0, #0x0

arm9/asm/unk_02035068.s

@@ -686,9 +686,9 @@ _02035526:
 	add r1, r7, #0x0
 	bl ListMenuItems_AddItem
 	ldr r0, [sp, #0x20]
-	bl String_Delete
+	bl String_Free
 	add r0, r7, #0x0
-	bl String_Delete
+	bl String_Free
 	add r0, r6, #0x0
 	bl MessageFormat_Delete
 	b _020355A2
@@ -994,7 +994,7 @@ _020357D6:
 	str r1, [sp, #0x8]
 	bl AddTextPrinterParameterized
 	add r0, r7, #0x0
-	bl String_Delete
+	bl String_Free
 	mov r0, #0xb
 	bl MessageFormat_New
 	add r7, r0, #0x0
@@ -1049,9 +1049,9 @@ _0203584C:
 	str r1, [sp, #0x8]
 	bl AddTextPrinterParameterized
 	ldr r0, [sp, #0x18]
-	bl String_Delete
+	bl String_Free
 	ldr r0, [sp, #0x14]
-	bl String_Delete
+	bl String_Free
 	add r0, r7, #0x0
 	bl MessageFormat_Delete
 	ldr r0, [sp, #0x1c]

arm9/asm/unk_020377F0.s

@@ -1860,7 +1860,7 @@ _020384F2:
 	cmp r0, #0x5
 	bne _02038514
 	ldr r0, [r1, #0x18]
-	bl String_c_str
+	bl String_GetChars
 	add r7, r0, #0x0
 	ldr r0, [r6, #0xc]
 	bl sub_0202881C
@@ -1889,7 +1889,7 @@ _0203852E:
 	ldr r0, [r4, #0xc]
 	bl sub_02077AC4
 	ldr r0, [r4, #0x10]
-	bl String_Delete
+	bl String_Free
 	add r0, r4, #0x0
 	bl Heap_Free
 	mov r0, #0x1
@@ -2022,20 +2022,20 @@ _02038620:
 	beq _0203866E
 	ldr r0, [r4, #0x10]
 	add r1, r5, #0x0
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 	b _0203866E
 _02038656:
 	ldr r0, [r4, #0x10]
 	add r1, r5, #0x0
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 	b _0203866E
 _02038660:
 	cmp r5, #0x0
 	beq _0203866E
 	ldr r0, [r4, #0xc]
 	add r1, r5, #0x0
 	ldr r0, [r0, #0x18]
-	bl CopyU16ArrayToString
+	bl String_CopyFromChars
 _0203866E:
 	ldr r0, [sp, #0x4]
 	ldr r1, _0203867C ; =sub_0203847C

arm9/asm/unk_02038C78.s

@@ -1058,9 +1058,9 @@ _02038DD2:
 	ldr r0, [r4, #0x40]
 	bl MessageFormat_Delete
 	ldr r0, [r4, #0x44]
-	bl String_Delete
+	bl String_Free
 	ldr r0, [r4, #0x48]
-	bl String_Delete
+	bl String_Free
 	mov r0, #0x0
 	str r0, [r4, #0x0]
 	add r0, r4, #0x0

arm9/asm/unk_020476CC.s

@@ -211,14 +211,14 @@ sub_02047814: ; 0x02047814
 	add r2, r7, #0x0
 	bl ReadMsgDataIntoString
 	add r0, r7, #0x0
-	bl String_c_str
+	bl String_GetChars
 	add r1, r0, #0x0
 	add r0, r4, #0x0
 	add r0, #0xf8
 	ldr r0, [r0, #0x0]
 	bl CopyPlayerName
 	add r0, r7, #0x0
-	bl String_Delete
+	bl String_Free
 	ldr r0, [sp, #0x18]
 	bl DestroyMsgData
 	ldr r0, [sp, #0x10]

arm9/asm/unk_020484A8.s

@@ -442,7 +442,7 @@ sub_02048848: ; 0x02048848
 	push {r4, lr}
 	add r4, r0, #0x0
 	ldr r0, [r4, #0x2c]
-	bl String_Delete
+	bl String_Free
 	ldr r0, [r4, #0x30]
 	bl sub_0200DBFC
 	add r4, #0x1c
@@ -510,7 +510,7 @@ sub_020488D4: ; 0x020488D4
 	ldr r0, [r4, #0x2c]
 	cmp r0, #0x0
 	beq _020488E4
-	bl String_Delete
+	bl String_Free
 _020488E4:
 	add r0, r4, #0x0
 	add r0, #0x1c

arm9/asm/unk_02048904.s

@@ -2026,7 +2026,7 @@ _020498DC:
 	cmp r0, #0x1
 	bne _0204992C
 	ldr r0, [r4, #0x34]
-	bl String_Delete
+	bl String_Free
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	mov r3, #0xb

arm9/asm/unk_0204CB20.s

@@ -6065,7 +6065,7 @@ _0204F990:
 	add r1, r4, #0x0
 	bl sub_020311D0
 	add r0, r5, #0x0
-	bl String_Delete
+	bl String_Free
 	add r0, r4, #0x0
 	bl Heap_Free
 	pop {r3-r5, pc}
@@ -6102,7 +6102,7 @@ sub_0204F9BC: ; 0x0204F9BC
 	mov r1, #0xf
 	bl PlayerProfile_GetPlayerName_NewString
 	str r0, [sp, #0x0]
-	bl StringGetLength
+	bl String_GetLength
 	cmp r0, #0x0
 	beq _0204F9FE
 	ldr r0, _0204FA54 ; =UNK_021C5A68
@@ -6141,7 +6141,7 @@ _0204FA26:
 	mov r2, #0x1
 	bl sub_02030BC4
 	ldr r0, [sp, #0x0]
-	bl String_Delete
+	bl String_Free
 	ldr r0, _0204FA54 ; =UNK_021C5A68
 	mov r2, #0x1
 	ldr r1, [r0, #0x0]

arm9/asm/unk_02050E48.s

@@ -1438,9 +1438,9 @@ _020519BA:
 	ldr r0, [r4, #0x28]
 	bl MessageFormat_Delete
 	ldr r0, [r4, #0xc]
-	bl String_Delete
+	bl String_Free
 	ldr r0, [r4, #0x10]
-	bl String_Delete
+	bl String_Free
 	ldr r0, [r4, #0x78]
 	bl DestroyListMenuCursorObj
 	add r0, r4, #0x0
@@ -2196,9 +2196,9 @@ _02051F7C:
 	ldr r0, [r4, #0x18]
 	bl MessageFormat_Delete
 	ldr r0, [r4, #0x0]
-	bl String_Delete
+	bl String_Free
 	ldr r0, [r4, #0x4]
-	bl String_Delete
+	bl String_Free
 	add r0, r4, #0x0
 	add r0, #0x8
 	mov r1, #0x0

arm9/asm/unk_02052EE8.s

@@ -917,12 +917,12 @@ sub_020535E0: ; 0x020535E0
 	ldr r0, [r4, #0x4]
 	cmp r0, #0x0
 	beq _020535F4
-	bl String_Delete
+	bl String_Free
 _020535F4:
 	ldr r0, [r4, #0x8]
 	cmp r0, #0x0
 	beq _020535FE
-	bl String_Delete
+	bl String_Free
 _020535FE:
 	pop {r4, pc}