script_buffers.c; unk_020286F8.c

2 files changed, 33 insertions, 33 deletions

diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index e7b9b013..891ecf6a 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -902,7 +902,7 @@ _0222DC42:
 	bl NewMsgDataFromNarc
 	str r0, [r4, #0x10]
 	mov r0, #5
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [r4, #0x14]
 	mov r0, #5
 	lsl r0, r0, #6
@@ -1307,7 +1307,7 @@ _0222E10A:
 	ldr r0, [r4, #0x10]
 	bl DestroyMsgData
 	ldr r0, [r4, #0x14]
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	mov r0, #0x71
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index dc3dccda..9c5b85ce 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -6055,25 +6055,25 @@ MOD11_022320C8: ; 0x022320C8
 	add r2, r0, #0
 	ldr r0, [r5, #0x14]
 	add r1, r4, #0
-	bl FUN_0200ACF8
+	bl BufferBoxMonNickname
 	pop {r3, r4, r5, pc}
 	.align 2, 0
 
 	thumb_func_start MOD11_022320EC
 MOD11_022320EC: ; 0x022320EC
-	ldr r3, _022320F4 ; =FUN_0200AD5C
+	ldr r3, _022320F4 ; =BufferMoveName
 	ldr r0, [r0, #0x14]
 	bx r3
 	nop
-_022320F4: .word FUN_0200AD5C
+_022320F4: .word BufferMoveName
 
 	thumb_func_start MOD11_022320F8
 MOD11_022320F8: ; 0x022320F8
-	ldr r3, _02232100 ; =FUN_0200AE38
+	ldr r3, _02232100 ; =BufferItemName
 	ldr r0, [r0, #0x14]
 	bx r3
 	nop
-_02232100: .word FUN_0200AE38
+_02232100: .word BufferItemName
 
 	thumb_func_start MOD11_02232104
 MOD11_02232104: ; 0x02232104
@@ -6085,7 +6085,7 @@ MOD11_02232104: ; 0x02232104
 	str r3, [sp, #4]
 	ldr r0, [r0, #0x14]
 	mov r3, #5
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	add sp, #8
 	pop {r3, pc}
 
@@ -6099,7 +6099,7 @@ MOD11_0223211C: ; 0x0223211C
 	str r4, [sp]
 	str r4, [sp, #4]
 	ldr r0, [r0, #0x14]
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	add sp, #8
 	pop {r4, pc}
 _02232134:
@@ -6108,42 +6108,42 @@ _02232134:
 	str r3, [sp, #4]
 	ldr r0, [r0, #0x14]
 	mov r3, #5
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	add sp, #8
 	pop {r4, pc}
 	.align 2, 0
 
 	thumb_func_start MOD11_02232148
 MOD11_02232148: ; 0x02232148
-	ldr r3, _02232150 ; =FUN_0200AF18
+	ldr r3, _02232150 ; =BufferTypeName
 	ldr r0, [r0, #0x14]
 	bx r3
 	nop
-_02232150: .word FUN_0200AF18
+_02232150: .word BufferTypeName
 
 	thumb_func_start MOD11_02232154
 MOD11_02232154: ; 0x02232154
-	ldr r3, _0223215C ; =FUN_0200ADCC
+	ldr r3, _0223215C ; =BufferAbilityName
 	ldr r0, [r0, #0x14]
 	bx r3
 	nop
-_0223215C: .word FUN_0200ADCC
+_0223215C: .word BufferAbilityName
 
 	thumb_func_start MOD11_02232160
 MOD11_02232160: ; 0x02232160
-	ldr r3, _02232168 ; =FUN_0200AF50
+	ldr r3, _02232168 ; =BufferStatName
 	ldr r0, [r0, #0x14]
 	bx r3
 	nop
-_02232168: .word FUN_0200AF50
+_02232168: .word BufferStatName
 
 	thumb_func_start MOD11_0223216C
 MOD11_0223216C: ; 0x0223216C
-	ldr r3, _02232174 ; =FUN_0200AF88
+	ldr r3, _02232174 ; =BufferStatusName
 	ldr r0, [r0, #0x14]
 	bx r3
 	nop
-_02232174: .word FUN_0200AF88
+_02232174: .word BufferStatusName
 
 	thumb_func_start MOD11_02232178
 MOD11_02232178: ; 0x02232178
@@ -6160,7 +6160,7 @@ MOD11_02232178: ; 0x02232178
 	add r2, r0, #0
 	ldr r0, [r5, #0x14]
 	add r1, r4, #0
-	bl FUN_0200AC60
+	bl BufferBoxMonSpeciesName
 	pop {r3, r4, r5, pc}
 	.align 2, 0
 
@@ -6171,11 +6171,11 @@ MOD11_0223219C: ; 0x0223219C
 
 	thumb_func_start MOD11_022321A0
 MOD11_022321A0: ; 0x022321A0
-	ldr r3, _022321A8 ; =FUN_0200AFBC
+	ldr r3, _022321A8 ; =BufferFlavorDislikeText
 	ldr r0, [r0, #0x14]
 	bx r3
 	nop
-_022321A8: .word FUN_0200AFBC
+_022321A8: .word BufferFlavorDislikeText
 
 	thumb_func_start MOD11_022321AC
 MOD11_022321AC: ; 0x022321AC
@@ -6187,7 +6187,7 @@ MOD11_022321AC: ; 0x022321AC
 	add r2, r0, #0
 	ldr r0, [r5, #0x14]
 	add r1, r4, #0
-	bl FUN_0200B0D4
+	bl BufferTrainerClassName2
 	pop {r3, r4, r5, pc}
 
 	thumb_func_start MOD11_022321C4
@@ -6210,7 +6210,7 @@ MOD11_022321DC: ; 0x022321DC
 	add r3, r2, #0
 	ldr r0, [r4, #0x14]
 	ldr r2, [r4, #0x64]
-	bl FUN_0200B410
+	bl BufferBoxName
 	pop {r4, pc}
 
 	thumb_func_start MOD11_022321EC
@@ -28079,7 +28079,7 @@ _0223CF5C:
 	add r2, r0, #0
 	ldr r0, [sp, #0x24]
 	mov r1, #0
-	bl FUN_0200ACF8
+	bl BufferBoxMonNickname
 	ldr r0, [sp, #0x18]
 	mov r1, #0xa0
 	mov r2, #0
@@ -28091,7 +28091,7 @@ _0223CF5C:
 	ldr r0, [sp, #0x24]
 	mov r3, #3
 	str r1, [sp, #4]
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r0, [sp, #0x24]
 	ldr r1, [sp, #0x20]
 	add r2, r6, #0
@@ -82469,7 +82469,7 @@ MOD11_022574F0: ; 0x022574F0
 	add r2, r0, #0
 	add r0, r4, #0
 	mov r1, #0
-	bl FUN_0200ACF8
+	bl BufferBoxMonNickname
 	ldr r1, [sp, #0x18]
 	ldr r2, [sp, #0x1c]
 	add r0, r4, #0
@@ -83168,7 +83168,7 @@ _02257B1E:
 	add r0, r7, #0
 	mov r1, #0
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r2, [sp, #0x18]
 	add r0, r7, #0
 	add r1, r6, #0
@@ -86990,7 +86990,7 @@ MOD11_022599CC: ; 0x022599CC
 	ldrh r2, [r5, #0x18]
 	add r0, r4, #0
 	mov r1, #0
-	bl FUN_0200AD5C
+	bl BufferMoveName
 	ldr r2, [sp, #0x1c]
 	add r0, r4, #0
 	add r1, r6, #0
@@ -87086,7 +87086,7 @@ MOD11_02259AB0: ; 0x02259AB0
 	ldrh r2, [r5, #0x18]
 	add r0, r4, #0
 	mov r1, #0
-	bl FUN_0200AD5C
+	bl BufferMoveName
 	ldr r2, [sp, #0x1c]
 	add r0, r4, #0
 	add r1, r6, #0
@@ -87183,7 +87183,7 @@ MOD11_02259B94: ; 0x02259B94
 	ldrh r2, [r5, #0x18]
 	add r0, r4, #0
 	mov r1, #0
-	bl FUN_0200AD5C
+	bl BufferMoveName
 	ldr r2, [sp, #0x1c]
 	add r0, r4, #0
 	add r1, r6, #0
@@ -87344,7 +87344,7 @@ _02259D2A:
 	add r2, r0, #0
 	ldr r0, [sp, #0x1c]
 	mov r1, #0
-	bl FUN_0200ACF8
+	bl BufferBoxMonNickname
 	ldr r0, [sp, #0x1c]
 	ldr r1, [sp, #0x28]
 	ldr r2, [sp, #0x24]
@@ -88781,7 +88781,7 @@ _0225A876:
 	ldr r0, [sp, #0x24]
 	mov r1, #0
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	mov r0, #1
 	str r0, [sp]
 	mov r0, #0
@@ -88790,7 +88790,7 @@ _0225A876:
 	ldr r0, [sp, #0x24]
 	mov r1, #1
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r0, [sp, #0x24]
 	ldr r1, [sp, #0x30]
 	ldr r2, [sp, #0x2c]