script_buffers.c; unk_020286F8.c

1 files changed, 62 insertions, 62 deletions

diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index bc34aa28..09b24dc9 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -7704,7 +7704,7 @@ _0223D212:
 	cmp r1, #0
 	beq _0223D26E
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	add r5, r0, #0
 	mov r0, #0x64
 	mov r1, #4
@@ -7717,7 +7717,7 @@ _0223D212:
 	ldr r2, _0223D294 ; =0x000004CC
 	mov r1, #2
 	ldrb r2, [r3, r2]
-	bl FUN_0200B19C
+	bl BufferUndergroundItemNameWithArticle
 	add r0, r5, #0
 	mov r1, #2
 	bl FUN_0200B7A8
@@ -7752,7 +7752,7 @@ _0223D280:
 	cmp r5, #0
 	beq _0223D28A
 	add r0, r5, #0
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 _0223D28A:
 	add r0, r7, #0
 	pop {r3, r4, r5, r6, r7, pc}
@@ -8319,7 +8319,7 @@ MOD18_0223D6D8: ; 0x0223D6D8
 	cmp r6, #0
 	beq _0223D73E
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	add r4, r0, #0
 	mov r0, #0x64
 	mov r1, #4
@@ -8328,11 +8328,11 @@ MOD18_0223D6D8: ; 0x0223D6D8
 	add r0, r4, #0
 	mov r1, #0
 	add r2, r5, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	add r0, r4, #0
 	mov r1, #1
 	add r2, r6, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	bl MOD18_0223D638
 	bl MOD18_0224DBB4
 	ldr r1, [sp]
@@ -8345,7 +8345,7 @@ MOD18_0223D6D8: ; 0x0223D6D8
 	add r0, r7, #0
 	bl String_dtor
 	add r0, r4, #0
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	add sp, #8
 	mov r0, #1
 	pop {r3, r4, r5, r6, r7, pc}
@@ -8366,7 +8366,7 @@ MOD18_0223D744: ; 0x0223D744
 	cmp r5, #0
 	beq _0223D79C
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	add r4, r0, #0
 	mov r0, #0x64
 	mov r1, #4
@@ -8375,7 +8375,7 @@ MOD18_0223D744: ; 0x0223D744
 	add r0, r4, #0
 	add r1, r7, #0
 	add r2, r5, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	bl MOD18_0223D638
 	bl MOD18_0224DBB4
 	ldr r1, [sp]
@@ -8388,7 +8388,7 @@ MOD18_0223D744: ; 0x0223D744
 	add r0, r6, #0
 	bl String_dtor
 	add r0, r4, #0
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	add sp, #8
 	mov r0, #1
 	pop {r3, r4, r5, r6, r7, pc}
@@ -10136,7 +10136,7 @@ MOD18_0223E4D4: ; 0x0223E4D4
 	add r1, #0xdc
 	str r0, [r1]
 	mov r0, #0xb
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	add r6, r0, #0
 	mov r0, #0x64
 	mov r1, #0xb
@@ -10147,7 +10147,7 @@ MOD18_0223E4D4: ; 0x0223E4D4
 	add r2, r0, #0
 	add r0, r6, #0
 	mov r1, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	bl MOD18_0223D638
 	bl MOD18_0224DBB4
 	mov r1, #0x73
@@ -10164,7 +10164,7 @@ MOD18_0223E4D4: ; 0x0223E4D4
 	add r0, r7, #0
 	bl String_dtor
 	add r0, r6, #0
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 _0223E54E:
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
@@ -32895,7 +32895,7 @@ MOD18_022494C8: ; 0x022494C8
 	bl String_ctor
 	str r0, [r4, #0x6c]
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [r4, #0x70]
 	ldr r0, _02249538 ; =MOD18_02249684
 	ldr r2, _0224953C ; =0x00002710
@@ -34234,7 +34234,7 @@ _0224A002:
 	add r2, r0, #0
 	ldr r0, [r5, #0x70]
 	mov r1, #2
-	bl FUN_0200B164
+	bl BufferUndergroundItemName
 	add r0, r4, #0
 	add r1, r5, #0
 	blx r7
@@ -34246,7 +34246,7 @@ _0224A002:
 	ldr r0, [r5, #0x70]
 	mov r1, #6
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	bl MOD18_0223D638
 	bl MOD18_0224DBB4
 	ldr r2, [r5, #0x6c]
@@ -35184,7 +35184,7 @@ MOD18_0224A7C8: ; 0x0224A7C8
 	bl String_ctor
 	str r0, [r4, #0x6c]
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [r4, #0x70]
 	bl FUN_0204F7E4
 	bl MOD18_0223D648
@@ -35283,7 +35283,7 @@ _0224A8C0:
 	ldr r0, [r5, #0x6c]
 	bl String_dtor
 	ldr r0, [r5, #0x70]
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	bl MOD18_0223D648
 	bl MOD18_0224DD94
 	bl MOD18_0223D638
@@ -35947,7 +35947,7 @@ _0224AE48:
 	ldr r0, [r5, #0x70]
 	cmp r0, #0
 	beq _0224AE52
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 _0224AE52:
 	ldr r0, [r5, #4]
 	cmp r0, #0
@@ -36091,7 +36091,7 @@ MOD18_0224AF28: ; 0x0224AF28
 	bl String_ctor
 	str r0, [r4, #0x6c]
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [r4, #0x70]
 	add r0, r4, #0
 	bl MOD18_0224AA4C
@@ -37370,7 +37370,7 @@ MOD18_0224B980: ; 0x0224B980
 	ldr r0, [r4, #0x6c]
 	bl String_dtor
 	ldr r0, [r4, #0x70]
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	mov r0, #0x7f
 	lsl r0, r0, #2
 	ldr r1, [r4, r0]
@@ -37836,7 +37836,7 @@ MOD18_0224BD54: ; 0x0224BD54
 	bl String_ctor
 	str r0, [r4, #0x6c]
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [r4, #0x70]
 	mov r0, #4
 	bl FUN_0205EB38
@@ -38668,7 +38668,7 @@ _0224C434:
 	ldrb r2, [r3, r2]
 	ldr r0, [r4, #0x70]
 	mov r1, #2
-	bl FUN_0200B164
+	bl BufferUndergroundItemName
 	mov r0, #1
 	str r0, [sp]
 	str r0, [sp, #4]
@@ -38678,7 +38678,7 @@ _0224C434:
 	ldr r0, [r4, #0x70]
 	mov r1, #6
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	bl MOD18_0223D658
 	bl MOD18_0224DBB4
 	ldr r2, [r4, #0x68]
@@ -38977,7 +38977,7 @@ _0224C6C4:
 	ldr r0, [r4, #0x70]
 	mov r1, #2
 	add r2, r5, #0
-	bl FUN_0200B164
+	bl BufferUndergroundItemName
 	mov r0, #1
 	str r0, [sp]
 	str r0, [sp, #4]
@@ -38985,7 +38985,7 @@ _0224C6C4:
 	mov r1, #6
 	add r2, r7, #0
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	bl MOD18_0223D658
 	bl MOD18_0224DBB4
 	ldr r2, [r4, #0x68]
@@ -39374,7 +39374,7 @@ MOD18_0224CA34: ; 0x0224CA34
 	ldr r0, [r4, #0x6c]
 	bl String_dtor
 	ldr r0, [r4, #0x70]
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	add r0, r4, #0
 	bl FreeToHeap
 	pop {r4, pc}
@@ -40368,7 +40368,7 @@ MOD18_0224D1F8: ; 0x0224D1F8
 	bl String_ctor
 	str r0, [r6, #0x6c]
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [r6, #0x70]
 	ldr r0, _0224D2DC ; =0x00000246
 	mov r1, #0
@@ -40506,7 +40506,7 @@ MOD18_0224D364: ; 0x0224D364
 	str r1, [sp, #0xc]
 	add r5, r2, #0
 	str r3, [sp, #0x10]
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [sp, #0x1c]
 	mov r0, #0x1e
 	mov r1, #4
@@ -40596,7 +40596,7 @@ MOD18_0224D364: ; 0x0224D364
 	ldr r0, [sp, #0x1c]
 	mov r1, #6
 	mov r3, #5
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r0, [sp, #0xc]
 	mov r1, #5
 	add r2, r4, #0
@@ -40618,7 +40618,7 @@ MOD18_0224D364: ; 0x0224D364
 	ldr r0, [sp, #0x1c]
 	mov r1, #0
 	add r2, r5, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	ldr r0, [sp, #0xc]
 	mov r1, #4
 	add r2, r4, #0
@@ -40690,7 +40690,7 @@ _0224D500:
 	mov r1, #6
 	ldr r0, [sp, #0x1c]
 	add r3, r1, #0
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r0, [sp, #0xc]
 	mov r1, #0xd
 	add r2, r4, #0
@@ -40721,7 +40721,7 @@ _0224D500:
 	ldr r0, [sp, #0x18]
 	bl String_dtor
 	ldr r0, [sp, #0x1c]
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	add sp, #0x20
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
@@ -41074,7 +41074,7 @@ MOD18_0224D814: ; 0x0224D814
 	mov r0, #4
 	add r5, r2, #0
 	str r3, [sp, #0x14]
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	add r7, r0, #0
 	mov r0, #0x28
 	mov r1, #4
@@ -41087,7 +41087,7 @@ MOD18_0224D814: ; 0x0224D814
 	add r0, r7, #0
 	mov r1, #1
 	add r2, r5, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	ldr r0, [sp, #0x10]
 	mov r1, #0xc
 	add r2, r4, #0
@@ -41129,7 +41129,7 @@ MOD18_0224D814: ; 0x0224D814
 	str r0, [sp, #4]
 	add r0, r7, #0
 	add r3, r1, #0
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r0, [sp, #0x10]
 	mov r1, #0xe
 	add r2, r4, #0
@@ -41175,7 +41175,7 @@ _0224D8FA:
 	ldr r2, [sp, #0x24]
 	add r0, r7, #0
 	mov r1, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	ldr r0, [sp, #0x10]
 	mov r1, #0x10
 	add r2, r4, #0
@@ -41208,7 +41208,7 @@ _0224D8FA:
 	str r0, [sp, #4]
 	add r0, r7, #0
 	add r3, r1, #0
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r0, [sp, #0x10]
 	mov r1, #0x11
 	add r2, r4, #0
@@ -41277,7 +41277,7 @@ _0224D9DE:
 	add r0, r6, #0
 	bl String_dtor
 	add r0, r7, #0
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	add sp, #0x28
 	pop {r3, r4, r5, r6, r7, pc}
 	thumb_func_end MOD18_0224D814
@@ -41421,7 +41421,7 @@ _0224DB08:
 	bl String_ctor
 	str r0, [r4, #4]
 	add r0, r5, #0
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	str r0, [r4, #0x28]
 	ldr r0, [sp]
 	ldr r2, [sp]
@@ -41460,7 +41460,7 @@ MOD18_0224DB5C: ; 0x0224DB5C
 	ldr r0, [r4, #4]
 	bl String_dtor
 	ldr r0, [r4, #0x28]
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	ldr r0, [r4, #0x24]
 	bl DestroyMsgData
 	add r0, r4, #0
@@ -41776,7 +41776,7 @@ MOD18_0224DDA0: ; 0x0224DDA0
 	ldr r0, [r4, #0x28]
 	add r2, r1, #0
 	mov r1, #1
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41791,7 +41791,7 @@ MOD18_0224DDB8: ; 0x0224DDB8
 	ldr r0, [r4, #0x28]
 	add r2, r1, #0
 	mov r1, #0
-	bl FUN_0200ABC0
+	bl BufferPlayersName
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41806,7 +41806,7 @@ MOD18_0224DDD0: ; 0x0224DDD0
 	ldr r0, [r4, #0x28]
 	add r2, r1, #0
 	mov r1, #2
-	bl FUN_0200B19C
+	bl BufferUndergroundItemNameWithArticle
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41821,7 +41821,7 @@ MOD18_0224DDE8: ; 0x0224DDE8
 	ldr r0, [r4, #0x28]
 	add r2, r1, #0
 	mov r1, #3
-	bl FUN_0200B1D4
+	bl BufferUndergroundTrapName
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41836,7 +41836,7 @@ MOD18_0224DE00: ; 0x0224DE00
 	ldr r0, [r4, #0x28]
 	add r2, r1, #0
 	mov r1, #5
-	bl FUN_0200B2E0
+	bl BufferInterviewQuestion
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41851,7 +41851,7 @@ MOD18_0224DE18: ; 0x0224DE18
 	ldr r0, [r4, #0x28]
 	add r2, r1, #0
 	mov r1, #5
-	bl FUN_0200B318
+	bl BufferInterviewAnswer
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41864,7 +41864,7 @@ MOD18_0224DE30: ; 0x0224DE30
 	push {r4, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0x28]
-	bl FUN_0200B318
+	bl BufferInterviewAnswer
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41879,7 +41879,7 @@ MOD18_0224DE44: ; 0x0224DE44
 	ldr r0, [r4, #0x28]
 	add r2, r1, #0
 	mov r1, #2
-	bl FUN_0200B350
+	bl BufferDecorationName
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41897,7 +41897,7 @@ MOD18_0224DE5C: ; 0x0224DE5C
 	mov r3, #1
 	str r3, [sp, #4]
 	ldr r0, [r4, #0x28]
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41919,7 +41919,7 @@ MOD18_0224DE7C: ; 0x0224DE7C
 	ldr r0, [r4, #0x28]
 	mov r1, #6
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41940,7 +41940,7 @@ MOD18_0224DEA4: ; 0x0224DEA4
 	str r0, [sp, #4]
 	ldr r0, [r4, #0x28]
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41963,7 +41963,7 @@ MOD18_0224DEC8: ; 0x0224DEC8
 	mov r1, #6
 	ldr r0, [r4, #0x28]
 	add r3, r1, #0
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41978,7 +41978,7 @@ MOD18_0224DEF0: ; 0x0224DEF0
 	push {r4, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0x28]
-	bl FUN_0200B164
+	bl BufferUndergroundItemName
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -41991,7 +41991,7 @@ MOD18_0224DF04: ; 0x0224DF04
 	push {r4, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0x28]
-	bl FUN_0200B1D4
+	bl BufferUndergroundTrapName
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -42004,7 +42004,7 @@ MOD18_0224DF18: ; 0x0224DF18
 	push {r4, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0x28]
-	bl FUN_0200B350
+	bl BufferDecorationName
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -42017,7 +42017,7 @@ MOD18_0224DF2C: ; 0x0224DF2C
 	push {r4, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0x28]
-	bl FUN_0200B19C
+	bl BufferUndergroundItemNameWithArticle
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -42030,7 +42030,7 @@ MOD18_0224DF40: ; 0x0224DF40
 	push {r4, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0x28]
-	bl FUN_0200B20C
+	bl BufferUndergroundTrapNameWithArticle
 	ldr r1, [r4, #0x40]
 	mov r0, #2
 	orr r0, r1
@@ -42828,7 +42828,7 @@ _0224E454:
 	str r1, [sp, #8]
 	bl AddTextPrinterParameterized
 	mov r0, #4
-	bl FUN_0200AA80
+	bl ScrStrBufs_new
 	mov r1, #1
 	str r1, [sp]
 	add r2, r5, #0
@@ -42838,7 +42838,7 @@ _0224E454:
 	mov r1, #0
 	mov r3, #2
 	add r6, r0, #0
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	mov r1, #1
 	str r1, [sp]
 	add r2, r5, #0
@@ -42847,7 +42847,7 @@ _0224E454:
 	ldrb r2, [r2]
 	add r0, r6, #0
 	mov r3, #2
-	bl FUN_0200AD38
+	bl BufferIntegerAsString
 	ldr r2, [sp, #0x2c]
 	add r0, r6, #0
 	add r1, r4, #0
@@ -42864,7 +42864,7 @@ _0224E454:
 	str r1, [sp, #8]
 	bl AddTextPrinterParameterized
 	add r0, r6, #0
-	bl FUN_0200AB18
+	bl ScrStrBufs_delete
 	ldr r0, [sp, #0x28]
 	bl String_dtor
 	ldr r0, [sp, #0x2c]