diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-22 11:23:07 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-22 11:23:07 -0400 |
| commit | c95859dace4cddd46bb36f3e3589f7d14b67c49f (patch) | |
| tree | fdbeb576cccabbbc673f7402bc14784c67d31e55 /arm9/modules | |
| parent | f78d404d3212f2148af5ca9974e4db6daec66e89 (diff) | |
script_buffers.c; unk_020286F8.c
Diffstat (limited to 'arm9/modules')
38 files changed, 684 insertions, 684 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index 75c42499..e3bb69a4 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -187,7 +187,7 @@ _021E14DC: ldr r0, [r4, r0] mov r1, #0 add r2, r5, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0 mov r1, #8 bl MOD05_021E1514 diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 3beaf558..3dc5d0bb 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -1816,7 +1816,7 @@ MOD05_021E28A0: ; 0x021E28A0 bl NewMsgDataFromNarc str r0, [sp, #0xc] mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0 mov r0, #0x10 mov r1, #4 @@ -1836,7 +1836,7 @@ MOD05_021E28A0: ; 0x021E28A0 add r0, r6, #0 mov r1, #0 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [sp, #0x10] add r0, r6, #0 add r1, r4, #0 @@ -1861,7 +1861,7 @@ MOD05_021E28A0: ; 0x021E28A0 add r0, r4, #0 bl String_dtor add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [sp, #0xc] bl DestroyMsgData add r0, r5, #0 @@ -1944,7 +1944,7 @@ MOD05_021E29C8: ; 0x021E29C8 bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new add r5, r0, #0 mov r0, #0x10 mov r1, #4 @@ -1964,7 +1964,7 @@ MOD05_021E29C8: ; 0x021E29C8 add r0, r5, #0 mov r1, #0 mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [sp, #0x10] add r0, r5, #0 add r1, r4, #0 @@ -1988,7 +1988,7 @@ MOD05_021E29C8: ; 0x021E29C8 add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] @@ -2062,7 +2062,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new add r5, r0, #0 mov r0, #0x10 mov r1, #4 @@ -2084,7 +2084,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 add r0, r5, #0 mov r1, #0 mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [sp, #0x10] add r0, r5, #0 add r1, r4, #0 @@ -2108,7 +2108,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index f48dc799..a993374a 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -6353,11 +6353,11 @@ MOD05_021E835C: ; 0x021E835C ldr r2, [r4, #4] mov r1, #0 add r5, r0, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r2, [r4, #8] add r0, r5, #0 mov r1, #1 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r4, #8] bl PlayerProfile_CountBadges add r2, r0, #0 @@ -6367,7 +6367,7 @@ MOD05_021E835C: ; 0x021E835C str r3, [sp, #4] add r0, r5, #0 mov r1, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [r4] cmp r2, #0x64 blt _021E839A @@ -6389,7 +6389,7 @@ _021E83A8: str r0, [sp, #4] add r0, r5, #0 mov r1, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0xc] bl GetIGTHours add r2, r0, #0 @@ -6413,7 +6413,7 @@ _021E83D6: str r0, [sp, #4] add r0, r5, #0 mov r1, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0xc] bl GetIGTMinutes mov r3, #2 @@ -6423,7 +6423,7 @@ _021E83D6: str r0, [sp, #4] add r0, r5, #0 mov r1, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, r4, r5, pc} @@ -6630,7 +6630,7 @@ MOD05_021E8588: ; 0x021E8588 ldr r0, [r6, #8] str r0, [r4, #0xc] add r0, r5, #0 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x14] ldr r2, _021E85E0 ; =0x000001E3 mov r0, #1 @@ -6664,7 +6664,7 @@ MOD05_021E85E4: ; 0x021E85E4 ldr r0, [r4, #0x18] bl DestroyMsgData ldr r0, [r4, #0x14] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -14590,7 +14590,7 @@ MOD05_021EC668: ; 0x021EC668 add r0, r7, #0 mov r1, #0 add r2, r5, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r5, #0 mov r1, #5 mov r2, #0 @@ -14753,11 +14753,11 @@ MOD05_021EC7D4: ; 0x021EC7D4 add r2, r4, #0 mov r3, #3 str r1, [sp, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 mov r1, #0 add r2, r6, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname lsl r0, r4, #0x18 lsr r0, r0, #0x18 add sp, #8 @@ -14779,7 +14779,7 @@ MOD05_021EC810: ; 0x021EC810 add r0, r5, #0 mov r1, #0 add r2, r6, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r1, r4, #1 mov r0, #0x64 mul r0, r1 @@ -14792,7 +14792,7 @@ MOD05_021EC810: ; 0x021EC810 add r2, r4, #0 mov r3, #5 str r1, [sp, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0 add sp, #8 pop {r4, r5, r6, pc} @@ -16416,11 +16416,11 @@ MOD05_021ED4E0: ; 0x021ED4E0 ldr r2, [sp] add r0, r4, #0 mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r2, [sp] add r0, r4, #0 mov r1, #2 - bl FUN_0200AD18 + bl BufferBoxMonOTName _021ED50E: ldr r0, [sp, #4] mov r1, #5 @@ -16431,7 +16431,7 @@ _021ED50E: ldr r2, [sp, #4] add r0, r4, #0 mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname _021ED526: add sp, #8 pop {r4, pc} @@ -16457,7 +16457,7 @@ MOD05_021ED52C: ; 0x021ED52C ldr r0, [sp, #0x2c] add r1, r4, #0 add r2, r5, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, [sp, #0xc] bl FUN_02023C84 add r1, r0, #0 @@ -16472,7 +16472,7 @@ MOD05_021ED52C: ; 0x021ED52C ldr r0, [sp, #0x2c] add r1, r7, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 mov r1, #0x6f mov r2, #0 @@ -16503,7 +16503,7 @@ _021ED5B4: ldr r0, [sp, #0x2c] ldr r1, [sp, #8] add r2, r4, #0 - bl FUN_0200B3C0 + bl BufferGenderSymbol add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -16518,7 +16518,7 @@ MOD05_021ED5C4: ; 0x021ED5C4 add r2, r0, #0 add r0, r5, #0 mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 mov r1, #5 mov r2, #0 @@ -21629,7 +21629,7 @@ _021EFCC4: add r2, r0, #0 ldr r0, [r6, #0x38] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r6, #0 mov r1, #0x21 bl MOD05_021F01EC @@ -21819,7 +21819,7 @@ _021EFE4C: add r2, r0, #0 ldr r0, [r4, #0x38] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r4, #0 mov r1, #0x23 bl MOD05_021F01EC @@ -22021,7 +22021,7 @@ _021EFFE6: add r2, r0, #0 ldr r0, [r5, #0x38] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #0x23 bl MOD05_021F01EC @@ -22049,7 +22049,7 @@ _021F000E: ldr r0, [r5, #0x38] mov r1, #0 add r2, r6, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r6, #0 bl FreeToHeap add r0, r5, #0 @@ -22149,7 +22149,7 @@ _021F0104: add r2, r0, #0 ldr r0, [r5, #0x38] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #0x23 bl MOD05_021F01EC @@ -22316,7 +22316,7 @@ MOD05_021F0254: ; 0x021F0254 add r4, r0, #0 bl MI_CpuFill8 mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x38] ldr r2, _021F028C ; =0x00000251 mov r0, #0 @@ -22343,7 +22343,7 @@ MOD05_021F0290: ; 0x021F0290 ldr r0, [r4, #0x3c] bl DestroyMsgData ldr r0, [r4, #0x38] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0xc] bl String_dtor ldr r0, [r4, #8] @@ -29680,7 +29680,7 @@ MOD05_021F3AE0: ; 0x021F3AE0 ldr r0, [r5] add r1, r6, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0 mov r1, #0xa bl _u32_div_f @@ -29691,7 +29691,7 @@ MOD05_021F3AE0: ; 0x021F3AE0 str r3, [sp, #4] ldr r0, [r5] add r1, r7, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -34800,7 +34800,7 @@ MOD05_021F60C4: ; 0x021F60C4 mov r0, #8 mov r1, #0x40 mov r2, #4 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [r4, #0x34] pop {r4, pc} @@ -34809,7 +34809,7 @@ MOD05_021F60FC: ; 0x021F60FC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x34] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x2c] bl String_dtor ldr r0, [r4, #0x30] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index a40c9c9b..5d47188a 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8410,7 +8410,7 @@ MOD06_0223D618: ; 0x0223D618 add r1, #0x88 str r0, [r1] mov r0, #0xb - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, #0x8c str r0, [r4] pop {r4, pc} @@ -8657,7 +8657,7 @@ _0223D804: add r0, r4, #0 add r0, #0x8c ldr r0, [r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x23 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -9412,7 +9412,7 @@ MOD06_0223DE34: ; 0x0223DE34 ldr r2, [sp, #0x10] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -9516,7 +9516,7 @@ _0223DF30: ldr r0, [r0] mov r1, #0 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -9858,7 +9858,7 @@ _0223E214: mov r1, #0 add r2, r4, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -10107,7 +10107,7 @@ _0223E450: ldrsh r2, [r4, r2] ldr r0, [r0] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0 str r0, [sp] mov r0, #1 @@ -10123,7 +10123,7 @@ _0223E450: mul r2, r3 mov r1, #2 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0 add r0, #0x88 ldr r0, [r0] @@ -10198,7 +10198,7 @@ _0223E50A: ldrsh r2, [r5, r2] ldr r0, [r0] mov r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -10238,7 +10238,7 @@ _0223E50A: mul r2, r3 mov r1, #0 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -10341,7 +10341,7 @@ _0223E63A: ldrh r2, [r5, r2] ldr r0, [r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName b _0223E67C _0223E66C: add r0, r5, #0 @@ -10350,7 +10350,7 @@ _0223E66C: ldrh r2, [r5, r2] ldr r0, [r0] mov r1, #0 - bl FUN_0200AEA8 + bl BufferItemNamePlural _0223E67C: ldr r0, _0223E794 ; =0x00000242 mov r1, #5 @@ -10362,7 +10362,7 @@ _0223E67C: add r0, #0x8c ldr r0, [r0] mov r1, #1 - bl FUN_0200AEE0 + bl BufferPocketName b _0223E704 _0223E698: cmp r0, #1 @@ -10394,7 +10394,7 @@ _0223E6B8: add r0, #0x8c ldr r0, [r0] mov r1, #0 - bl FUN_0200B534 + bl BufferSealName b _0223E6F6 _0223E6DC: add r0, r1, #1 @@ -10407,7 +10407,7 @@ _0223E6DC: add r0, #0x8c ldr r0, [r0] mov r1, #0 - bl FUN_0200B568 + bl BufferSealNamePlural _0223E6F6: add r0, r5, #0 add r0, #0x88 @@ -10759,7 +10759,7 @@ MOD06_0223E9BC: ; 0x0223E9BC ldr r0, [r4] add r1, r5, #0 add r2, r3, #0 - bl FUN_0200AE38 + bl BufferItemName pop {r3, r4, r5, pc} _0223E9DA: cmp r0, #1 @@ -10768,7 +10768,7 @@ _0223E9DA: ldr r0, [r4] add r1, r5, #0 add r2, r3, #0 - bl FUN_0200B350 + bl BufferDecorationName pop {r3, r4, r5, pc} _0223E9EC: lsl r0, r3, #0x18 @@ -10778,7 +10778,7 @@ _0223E9EC: add r2, r0, #0 ldr r0, [r4] add r1, r5, #0 - bl FUN_0200B534 + bl BufferSealName pop {r3, r4, r5, pc} nop _0223EA04: .word 0x00000241 @@ -11464,17 +11464,17 @@ _0223EF28: add r0, #0x40 bl FUN_0201901C mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _0223EFF4 ; =0x02252420 ldr r1, [r1] str r0, [r1, #0x50] mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _0223EFF4 ; =0x02252420 ldr r1, [r1] str r0, [r1, #0x54] mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _0223EFF4 ; =0x02252420 ldr r2, [r1] str r0, [r2, #0x58] @@ -11532,7 +11532,7 @@ _0223F004: ldr r0, [r0, #0x50] cmp r0, #0 beq _0223F034 - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _0223F08C ; =0x02252420 mov r1, #0 ldr r0, [r0] @@ -11543,7 +11543,7 @@ _0223F034: ldr r0, [r0, #0x54] cmp r0, #0 beq _0223F04A - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _0223F08C ; =0x02252420 mov r1, #0 ldr r0, [r0] @@ -11554,7 +11554,7 @@ _0223F04A: ldr r0, [r0, #0x58] cmp r0, #0 beq _0223F060 - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _0223F08C ; =0x02252420 mov r1, #0 ldr r0, [r0] @@ -11701,13 +11701,13 @@ _0223F11A: ldr r0, [r0, #0x50] mov r1, #0 add r2, r2, #1 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0223F26C ; =0x02252420 mov r1, #1 ldr r2, [r0] ldr r0, [r2, #0x50] ldr r2, [r2, #0x7c] - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, _0223F26C ; =0x02252420 mov r1, #0x31 ldr r2, [r0] @@ -11746,7 +11746,7 @@ _0223F11A: ldr r0, [r0] mov r3, #5 ldr r0, [r0, #0x50] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0223F26C ; =0x02252420 mov r1, #0x33 ldr r2, [r0] @@ -11783,7 +11783,7 @@ _0223F21C: ldr r0, [r0] add r2, r2, #1 ldr r0, [r0, #0x50] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0223F26C ; =0x02252420 mov r1, #0x32 ldr r2, [r0] @@ -11919,7 +11919,7 @@ MOD06_0223F344: ; 0x0223F344 ldr r2, [r0] ldr r0, [r2, #0x54] ldr r2, [r2, #0x78] - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, _0223F3B4 ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x78] @@ -11935,7 +11935,7 @@ MOD06_0223F344: ; 0x0223F344 lsr r2, r2, #0x10 ldr r0, [r0, #0x54] mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0223F3B4 ; =0x02252420 mov r1, #0x30 ldr r2, [r0] @@ -11992,7 +11992,7 @@ _0223F3E0: ldr r0, [r0, #0x50] add r2, r5, #1 add r3, r6, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [r4] mov r1, #0x32 ldr r0, [r2, #0x74] @@ -12193,7 +12193,7 @@ MOD06_0223F584: ; 0x0223F584 ldr r2, [r2] mov r1, #1 ldr r2, [r2, #0x7c] - bl FUN_0200ABC0 + bl BufferPlayersName bl MOD06_02240750 cmp r0, #2 bgt _0223F5B8 @@ -12469,7 +12469,7 @@ _0223F7E0: mov r1, #0 ldr r0, [r0] ldr r0, [r0, #0x50] - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, _0223F898 ; =0x02252420 mov r1, #0x34 ldr r2, [r0] @@ -12506,7 +12506,7 @@ _0223F7E0: mov r3, #5 ldr r0, [r0] ldr r0, [r0, #0x50] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0223F898 ; =0x02252420 mov r1, #0x33 ldr r2, [r0] @@ -12722,7 +12722,7 @@ _0223FA02: ldr r0, [r0] mov r3, #2 ldr r0, [r0, #0x54] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0223FA5C ; =0x02252420 mov r1, #0xf ldr r0, [r0] @@ -12778,7 +12778,7 @@ _0223FA6E: beq _0223FA8C ldr r0, [r4, #0x58] mov r1, #1 - bl FUN_0200ABC0 + bl BufferPlayersName _0223FA8C: add r4, #0x91 ldrb r0, [r4] @@ -13900,7 +13900,7 @@ MOD06_022403E0: ; 0x022403E0 add r2, r0, #0 ldr r0, [r4, #0x58] mov r1, #1 - bl FUN_0200ABC0 + bl BufferPlayersName mov r0, #0x2b mov r1, #1 bl MOD06_0223EDC4 @@ -13930,7 +13930,7 @@ MOD06_02240418: ; 0x02240418 ldr r2, [r2] mov r1, #1 ldr r2, [r2, #0x7c] - bl FUN_0200ABC0 + bl BufferPlayersName mov r0, #4 mov r1, #1 bl MOD06_0223EDC4 @@ -14206,7 +14206,7 @@ MOD06_02240668: ; 0x02240668 ldr r2, [r2] mov r1, #1 ldr r2, [r2, #0x7c] - bl FUN_0200ABC0 + bl BufferPlayersName mov r0, #5 mov r1, #1 bl MOD06_0223EDC4 @@ -14550,7 +14550,7 @@ MOD06_022408F8: ; 0x022408F8 ldr r0, [r4, #0x64] ldr r2, [r4, #0x1c] add r3, r1, #0 - bl FUN_0200ABB4 + bl BufferString add sp, #8 pop {r4, pc} .align 2, 0 @@ -15086,7 +15086,7 @@ _02240D74: add r0, r5, #0 mov r1, #0 mov r3, #1 - bl FUN_0200AD38 + bl BufferIntegerAsString b _02240E8C _02240D86: mov r0, #0 @@ -15096,7 +15096,7 @@ _02240D86: add r0, r5, #0 mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString b _02240E8C _02240D9A: cmp r2, #0 @@ -15111,7 +15111,7 @@ _02240DA2: add r0, r5, #0 mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString b _02240E8C _02240DB6: cmp r2, #0 @@ -15147,7 +15147,7 @@ _02240DE4: add r0, r5, #0 mov r1, #0 mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r6, #0 mov r1, #0xc bl _s32_div_f @@ -15161,7 +15161,7 @@ _02240DE4: add r0, r5, #0 mov r1, #1 mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString cmp r6, #0 bne _02240E2E mov r4, #0x52 @@ -15202,7 +15202,7 @@ _02240E5E: add r0, r5, #0 mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString cmp r6, #0 bne _02240E80 mov r4, #0x52 @@ -15338,7 +15338,7 @@ _02240F70: add r2, r0, #0 ldr r0, [r4, #0x64] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0 mov r1, #0x6b bl MOD06_02240864 @@ -15363,7 +15363,7 @@ _02240FAA: add r2, r0, #0 ldr r0, [r4, #0x64] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0 mov r1, #0x79 bl MOD06_02240864 @@ -15551,7 +15551,7 @@ _0224113A: mov r1, #0 bl MOD06_022408D4 ldr r0, [r4, #0x64] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x68] bl DestroyMsgData ldr r0, [r4, #0x14] @@ -15594,7 +15594,7 @@ MOD06_02241188: ; 0x02241188 add r5, #0xac str r0, [r5] mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x64] mov r0, #0 mov r1, #0x1a @@ -18946,7 +18946,7 @@ MOD06_02242C78: ; 0x02242C78 bl NewMsgDataFromNarc str r0, [r5, #0x54] mov r0, #4 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r5, #0x58] add r0, r5, #0 str r4, [r5] @@ -19455,7 +19455,7 @@ _02243060: cmp r4, #0xc blt _02243060 ldr r0, [r6, #0x58] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r6, #0x54] bl DestroyMsgData pop {r4, r5, r6, pc} @@ -21804,14 +21804,14 @@ MOD06_02244210: ; 0x02244210 mov r0, #0x13 mov r1, #0xe mov r2, #4 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom mov r1, #0 str r1, [sp] mov r3, #1 add r2, r7, #0 str r0, [sp, #0x14] str r3, [sp, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString mov r4, #0 _02244264: add r0, r4, #0 @@ -21835,7 +21835,7 @@ _02244264: ldr r0, [sp, #0x14] ldr r3, [sp, #8] add r1, r1, #1 - bl FUN_0200ABB4 + bl BufferString ldrb r0, [r5] add r0, r0, #1 strb r0, [r5] @@ -40861,7 +40861,7 @@ MOD06_0224D46C: ; 0x0224D46C bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0xb - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x14] mov r2, #3 str r2, [sp] @@ -40906,7 +40906,7 @@ MOD06_0224D46C: ; 0x0224D46C add r2, r0, #0 ldr r0, [r4, #0x14] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r4, #0x14] add r1, r6, #0 add r2, r5, #0 @@ -41037,7 +41037,7 @@ _0224D60C: ldr r2, [sp, #0x28] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x14] ldr r2, [sp, #0x2c] add r1, r6, #0 @@ -41099,7 +41099,7 @@ MOD06_0224D6A4: ; 0x0224D6A4 ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0x14] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -41915,7 +41915,7 @@ MOD06_0224DD50: ; 0x0224DD50 add r0, r7, #0 add r4, r1, #0 add r5, r3, #0 - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0 mov r0, #0xc8 add r1, r7, #0 @@ -41934,7 +41934,7 @@ MOD06_0224DD50: ; 0x0224DD50 add r0, r6, #0 mov r1, #0 add r2, #0x95 - bl FUN_0200AEA8 + bl BufferItemNamePlural mov r0, #0 str r0, [sp] mov r1, #1 @@ -41943,11 +41943,11 @@ MOD06_0224DD50: ; 0x0224DD50 ldr r2, [r2, #8] add r0, r6, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [r5, r4] add r0, r6, #0 mov r1, #2 - bl FUN_0200B660 + bl BufferFashionName ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] add r0, r6, #0 @@ -41957,7 +41957,7 @@ MOD06_0224DD50: ; 0x0224DD50 add r2, r7, #0 bl MOD06_0224DCD8 add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [sp, #0xc] bl String_dtor ldr r0, [sp, #0x10] @@ -41975,7 +41975,7 @@ MOD06_0224DDD8: ; 0x0224DDD8 add r0, r7, #0 add r4, r1, #0 add r5, r3, #0 - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0 mov r0, #0xc8 add r1, r7, #0 @@ -41994,7 +41994,7 @@ MOD06_0224DDD8: ; 0x0224DDD8 add r0, r6, #0 mov r1, #0 add r2, #0x95 - bl FUN_0200AEA8 + bl BufferItemNamePlural mov r0, #0 str r0, [sp] mov r1, #1 @@ -42003,11 +42003,11 @@ MOD06_0224DDD8: ; 0x0224DDD8 ldr r2, [r2, #8] add r0, r6, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [r5, r4] add r0, r6, #0 mov r1, #2 - bl FUN_0200B660 + bl BufferFashionName ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] add r0, r6, #0 @@ -42017,7 +42017,7 @@ MOD06_0224DDD8: ; 0x0224DDD8 add r2, r7, #0 bl MOD06_0224DCD8 add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [sp, #0xc] bl String_dtor ldr r0, [sp, #0x10] @@ -42057,7 +42057,7 @@ MOD06_0224DE60: ; 0x0224DE60 mov r3, #1 bl FUN_02019064 ldr r0, [sp, #0x14] - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r6, #8] mov r4, #0 add r5, r6, #0 @@ -42104,7 +42104,7 @@ _0224DEE6: ldr r0, [r6, #0xc] bl String_dtor ldr r0, [r6, #8] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r6, #4] bl FUN_02019570 ldr r0, [r6, #4] @@ -42130,14 +42130,14 @@ MOD06_0224DF1C: ; 0x0224DF1C mov r1, #0 add r2, r6, #0 add r7, r3, #0 - bl FUN_0200AE38 + bl BufferItemName mov r1, #1 str r1, [sp] str r1, [sp, #4] ldr r0, [r5, #8] add r2, r4, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #1 str r0, [sp] str r0, [sp, #4] @@ -42145,7 +42145,7 @@ MOD06_0224DF1C: ; 0x0224DF1C mov r1, #2 add r2, r7, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #4] mov r1, #0xf bl FUN_02019620 @@ -42232,7 +42232,7 @@ _0224DFC0: mov r3, #0x11 bl FUN_02019064 ldr r0, [sp, #0x14] - bl FUN_0200AA80 + bl ScrStrBufs_new mov r1, #0x49 lsl r1, r1, #2 str r0, [r5, r1] @@ -42259,7 +42259,7 @@ _0224E034: ldr r0, [r5, r0] ldr r2, [r2] mov r1, #0 - bl FUN_0200B660 + bl BufferFashionName mov r0, #0x49 mov r1, #0x4a lsl r0, r0, #2 @@ -42309,7 +42309,7 @@ _0224E084: mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x4a lsl r0, r0, #2 ldr r0, [r5, r0] diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 5efdd51b..2659dd5c 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -4507,7 +4507,7 @@ _022142BE: add r2, r0, #0 ldr r0, [sp, #0x14] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, [sp, #0x14] ldr r2, [sp, #0x20] add r1, r6, #0 @@ -4621,7 +4621,7 @@ MOD07_0221437C: ; 0x0221437C ldrb r2, [r3, r2] ldr r0, [sp, #0x10] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x10] ldr r1, [sp, #0x28] add r2, r7, #0 @@ -4678,7 +4678,7 @@ MOD07_022143FC: ; 0x022143FC ldr r0, [sp, #0x18] ldrh r2, [r3, r2] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x18] ldr r2, [sp, #0x20] add r1, r4, #0 @@ -4742,7 +4742,7 @@ MOD07_022143FC: ; 0x022143FC ldrh r2, [r3, r2] ldr r0, [sp, #0x18] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x18] add r1, r4, #0 add r2, r5, #0 @@ -4976,7 +4976,7 @@ MOD07_0221469C: ; 0x0221469C str r0, [sp, #0xc] ldr r0, [r6] ldr r0, [r0, #0x24] - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, [r6] str r0, [sp, #8] ldr r1, [r1, #0x24] @@ -5010,7 +5010,7 @@ _022146F6: ldr r0, [sp, #0xc] bl FUN_0200B990 ldr r0, [sp, #8] - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x14 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 4ff7de8f..59100716 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2373,7 +2373,7 @@ MOD09_02213138: ; 0x02213138 str r0, [r4, r1] ldr r0, [r4] ldr r0, [r0, #0xc] - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _02213188 ; =0x00001FAC str r0, [r4, r1] ldr r1, [r4] @@ -2402,7 +2402,7 @@ MOD09_02213190: ; 0x02213190 bl FUN_0200B990 ldr r0, _022131C0 ; =0x00001FAC ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _022131C4 ; =0x00001FB0 ldr r0, [r4, r0] bl String_dtor @@ -3500,7 +3500,7 @@ _02213A30: ldr r0, _02213B74 ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _02213B74 ; =0x00001FAC add r2, r6, #0 ldr r0, [r5, r1] @@ -3535,7 +3535,7 @@ _02213A82: ldr r0, _02213B74 ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _02213B74 ; =0x00001FAC add r2, r6, #0 ldr r0, [r5, r1] @@ -3584,7 +3584,7 @@ _02213AD4: ldr r0, _02213B74 ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _02213B74 ; =0x00001FAC add r2, r6, #0 ldr r0, [r5, r1] @@ -3616,7 +3616,7 @@ _02213B24: ldr r0, _02213B74 ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _02213B74 ; =0x00001FAC add r2, r7, #0 ldr r0, [r5, r1] @@ -4088,7 +4088,7 @@ MOD09_02213E84: ; 0x02213E84 ldr r0, _02214020 ; =0x00001FAC mov r1, #0 ldr r0, [r6, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, _02214020 ; =0x00001FAC ldr r1, [sp, #0x1c] ldr r0, [r6, r0] @@ -4481,7 +4481,7 @@ MOD09_022141D8: ; 0x022141D8 ldrh r2, [r2, #0x1c] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200ADCC + bl BufferAbilityName ldr r0, _02214254 ; =0x00001FAC ldr r2, [sp, #0x10] ldr r0, [r5, r0] @@ -4551,7 +4551,7 @@ _02214284: ldrh r2, [r5, #0x1a] ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName ldr r0, _022142F0 ; =0x00001FAC ldr r2, [sp, #0x10] ldr r0, [r4, r0] @@ -4612,7 +4612,7 @@ MOD09_022142FC: ; 0x022142FC ldr r2, [sp, #0x10] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AD5C + bl BufferMoveName ldr r0, _0221439C ; =0x00001FAC ldr r2, [sp, #0x18] ldr r0, [r5, r0] @@ -4849,7 +4849,7 @@ MOD09_022144C0: ; 0x022144C0 lsl r2, r2, #0x19 ldr r0, [r5, r0] lsr r2, r2, #0x19 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0221468C ; =0x00001FAC ldr r1, [sp, #0x1c] ldr r0, [r5, r0] @@ -4921,7 +4921,7 @@ MOD09_022144C0: ; 0x022144C0 sub r2, r2, r3 mov r1, #0 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString b _022145F4 _022145E0: mov r0, #1 @@ -4932,7 +4932,7 @@ _022145E0: ldr r0, [r5, r0] add r2, r1, #0 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString _022145F4: ldr r0, _0221468C ; =0x00001FAC ldr r1, [sp, #0x10] @@ -5053,7 +5053,7 @@ MOD09_02214694: ; 0x02214694 ldrh r2, [r2, #0xa] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214788 ; =0x00001FAC ldr r2, [sp, #0x10] ldr r0, [r5, r0] @@ -5162,7 +5162,7 @@ MOD09_02214790: ; 0x02214790 ldrh r2, [r2, #0xc] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214884 ; =0x00001FAC ldr r2, [sp, #0x10] ldr r0, [r5, r0] @@ -5272,7 +5272,7 @@ MOD09_0221488C: ; 0x0221488C ldrh r2, [r2, #0xe] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214984 ; =0x00001FAC ldr r2, [sp, #0x10] ldr r0, [r5, r0] @@ -5384,7 +5384,7 @@ MOD09_0221498C: ; 0x0221498C ldrh r2, [r2, #0x10] ldr r0, [r4, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214A84 ; =0x00001FAC ldr r2, [sp, #0x10] ldr r0, [r4, r0] @@ -5496,7 +5496,7 @@ MOD09_02214A8C: ; 0x02214A8C ldrh r2, [r2, #0x12] ldr r0, [r4, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214B84 ; =0x00001FAC ldr r2, [sp, #0x10] ldr r0, [r4, r0] @@ -5643,7 +5643,7 @@ MOD09_02214B8C: ; 0x02214B8C ldrh r2, [r7, #0x10] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214D20 ; =0x00001FAC ldr r1, [sp, #0x1c] ldr r0, [r5, r0] @@ -5689,7 +5689,7 @@ MOD09_02214B8C: ; 0x02214B8C ldrh r2, [r7, #0x12] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214D20 ; =0x00001FAC ldr r1, [sp, #0x24] ldr r0, [r5, r0] @@ -5880,7 +5880,7 @@ _02214E42: ldr r2, [sp, #0x10] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214ECC ; =0x00001FAC ldr r2, [sp, #0x14] ldr r0, [r5, r0] @@ -6016,7 +6016,7 @@ _02214F72: ldr r2, [sp, #0x10] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02214FFC ; =0x00001FAC ldr r2, [sp, #0x14] ldr r0, [r5, r0] @@ -6311,7 +6311,7 @@ MOD09_022151A8: ; 0x022151A8 ldr r2, [sp, #0x10] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _022152D8 ; =0x00001FAC ldr r1, [sp, #0x24] ldr r0, [r5, r0] @@ -6355,7 +6355,7 @@ MOD09_022151A8: ; 0x022151A8 ldr r2, [sp, #0x14] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _022152D8 ; =0x00001FAC ldr r1, [sp, #0x2c] ldr r0, [r5, r0] @@ -6560,7 +6560,7 @@ MOD09_022153B0: ; 0x022153B0 ldrb r2, [r2, #3] ldr r0, [r5, r0] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _022154F8 ; =0x00001FAC ldr r2, [sp, #0x20] ldr r0, [r5, r0] @@ -6596,7 +6596,7 @@ MOD09_022153B0: ; 0x022153B0 ldrb r2, [r2, #2] ldr r0, [r5, r0] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _022154F8 ; =0x00001FAC ldr r2, [sp, #0x24] ldr r0, [r5, r0] @@ -6688,7 +6688,7 @@ MOD09_022154FC: ; 0x022154FC ldrb r2, [r2, #2] ldr r0, [r5, r0] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _022155C8 ; =0x00001FAC ldr r1, [sp, #0x14] ldr r0, [r5, r0] @@ -6972,7 +6972,7 @@ MOD09_02215784: ; 0x02215784 ldr r0, _022158DC ; =0x00001FAC mov r1, #0 ldr r0, [r4, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, _022158DC ; =0x00001FAC ldr r1, [sp, #0x10] ldr r0, [r4, r0] @@ -8433,7 +8433,7 @@ _02216444: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8458,7 +8458,7 @@ _0221648E: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0 str r0, [sp] mov r1, #1 @@ -8474,7 +8474,7 @@ _0221648E: ldr r0, [r5, r0] sub r2, r2, r3 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8517,7 +8517,7 @@ _02216512: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8540,7 +8540,7 @@ _0221654A: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8563,7 +8563,7 @@ _02216580: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8586,7 +8586,7 @@ _022165B6: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8609,7 +8609,7 @@ _022165EC: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8632,7 +8632,7 @@ _02216622: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8655,7 +8655,7 @@ _02216658: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8676,7 +8676,7 @@ _0221668E: ldr r0, _022166CC ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r1, _022166CC ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -8718,12 +8718,12 @@ MOD09_022166D0: ; 0x022166D0 ldr r0, _0221672C ; =0x00001FAC mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, _0221672C ; =0x00001FAC ldr r2, _02216730 ; =0x00000175 ldr r0, [r5, r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName ldr r1, _0221672C ; =0x00001FAC add r2, r4, #0 ldr r0, [r5, r1] @@ -13351,11 +13351,11 @@ _02218C68: add r2, r0, #0 ldr r0, [r5, #0x14] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, [r5, #0x14] ldr r2, _02218E3C ; =0x00000175 mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r4, #0 @@ -13416,7 +13416,7 @@ _02218D22: ldr r0, [r5, #0x14] ldr r2, [r4, #4] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r6, #0 @@ -14099,7 +14099,7 @@ MOD09_022192A4: ; 0x022192A4 str r0, [r4, #0xc] ldr r0, [r4] ldr r0, [r0, #0xc] - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x14] ldr r1, [r4] mov r0, #2 @@ -14119,7 +14119,7 @@ MOD09_022192E4: ; 0x022192E4 ldr r0, [r4, #0xc] bl FUN_0200B990 ldr r0, [r4, #0x14] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x18] bl String_dtor pop {r4, pc} @@ -14615,7 +14615,7 @@ MOD09_02219694: ; 0x02219694 add r2, r2, r7 ldrh r2, [r2, #0x3c] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] ldr r2, [sp, #0x14] @@ -14695,7 +14695,7 @@ MOD09_02219738: ; 0x02219738 add r2, r2, r6 ldrh r2, [r2, #0x3e] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] ldr r2, [sp, #0x14] @@ -14878,7 +14878,7 @@ MOD09_02219884: ; 0x02219884 ldrb r2, [r2, r3] mov r3, #2 add r2, r2, #1 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] ldr r2, [sp, #0x14] @@ -14916,7 +14916,7 @@ MOD09_02219884: ; 0x02219884 ldrb r2, [r2] mov r3, #2 add r2, r2, #1 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r7, #0 @@ -15082,7 +15082,7 @@ MOD09_02219A8C: ; 0x02219A8C add r2, r2, r3 ldrh r2, [r2, #0x3c] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r7, #0 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] diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 63b143f4..215acf37 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -187,7 +187,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 bl FUN_02011744 str r0, [r4, #0x60] mov r0, #0x15 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x54] mov r0, #0x1e lsl r0, r0, #4 @@ -498,7 +498,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 ldr r0, [r4, #0x58] bl String_dtor ldr r0, [r4, #0x54] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x44] bl DestroyMsgData ldr r0, [r4, #0x48] @@ -3286,7 +3286,7 @@ MOD12_0222EF04: ; 0x0222EF04 bl NewMsgDataFromNarc str r0, [r5, #0x44] mov r0, #0x16 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r5, #0x48] mov r0, #5 lsl r0, r0, #6 @@ -3667,7 +3667,7 @@ _0222F3AE: ldr r0, [r4, #0x50] bl FUN_02002FEC ldr r0, [r4, #0x48] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x4c] bl String_dtor ldr r0, [r4, #0x44] @@ -5156,7 +5156,7 @@ MOD12_0222FE4C: ; 0x0222FE4C add r1, #0x98 str r0, [r1] mov r0, #0x17 - bl FUN_0200AA80 + bl ScrStrBufs_new add r1, r5, #0 add r1, #0x9c str r0, [r1] @@ -5511,7 +5511,7 @@ _02230296: add r0, r4, #0 add r0, #0x9c ldr r0, [r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0 add r0, #0x98 ldr r0, [r0] @@ -14734,7 +14734,7 @@ _02234AC4: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234AE2: @@ -14746,7 +14746,7 @@ _02234AE2: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234AFC: @@ -14758,14 +14758,14 @@ _02234AFC: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234B16: ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200AD5C + bl BufferMoveName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234B24: @@ -14775,7 +14775,7 @@ _02234B24: str r3, [sp, #4] ldrb r2, [r5, #4] ldr r0, [r4, #0x54] - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234B38: @@ -14787,7 +14787,7 @@ _02234B38: add r2, #0xd0 ldrh r2, [r2] mov r1, #0 - bl FUN_0200B244 + bl BufferContestJudgeName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234B50: @@ -14799,7 +14799,7 @@ _02234B50: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldrb r0, [r5, #1] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -14808,7 +14808,7 @@ _02234B50: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234B80: @@ -14820,11 +14820,11 @@ _02234B80: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234BA4: @@ -14836,7 +14836,7 @@ _02234BA4: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0 mov r1, #1 str r0, [sp] @@ -14844,7 +14844,7 @@ _02234BA4: ldrb r2, [r5, #4] ldr r0, [r4, #0x54] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234BD0: @@ -14856,7 +14856,7 @@ _02234BD0: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldrb r2, [r5, #5] ldr r3, [r4, #0xc] ldr r0, [r4, #0x54] @@ -14865,7 +14865,7 @@ _02234BD0: add r2, #0xd0 ldrh r2, [r2] mov r1, #1 - bl FUN_0200B244 + bl BufferContestJudgeName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234BFE: @@ -14877,7 +14877,7 @@ _02234BFE: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldrb r0, [r5] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -14886,7 +14886,7 @@ _02234BFE: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234C2E: @@ -14898,11 +14898,11 @@ _02234C2E: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234C52: @@ -14914,7 +14914,7 @@ _02234C52: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0 mov r1, #1 str r0, [sp] @@ -14922,7 +14922,7 @@ _02234C52: ldrb r2, [r5, #4] ldr r0, [r4, #0x54] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234C7E: @@ -14934,7 +14934,7 @@ _02234C7E: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldrb r0, [r5] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -14943,14 +14943,14 @@ _02234C7E: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234CAE: ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200AD5C + bl BufferMoveName ldrb r0, [r5] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -14959,14 +14959,14 @@ _02234CAE: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234CD2: ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200AD5C + bl BufferMoveName ldrb r0, [r5, #1] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -14975,14 +14975,14 @@ _02234CD2: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234CF6: ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200AD5C + bl BufferMoveName mov r0, #0 mov r1, #1 str r0, [sp] @@ -14990,14 +14990,14 @@ _02234CF6: ldrb r2, [r5, #4] ldr r0, [r4, #0x54] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234D16: ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200AD5C + bl BufferMoveName ldrb r0, [r5] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -15006,7 +15006,7 @@ _02234D16: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234D3A: @@ -15016,7 +15016,7 @@ _02234D3A: str r3, [sp, #4] ldrb r2, [r5, #4] ldr r0, [r4, #0x54] - bl FUN_0200AD38 + bl BufferIntegerAsString ldrb r0, [r5] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -15025,7 +15025,7 @@ _02234D3A: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234D64: @@ -15035,7 +15035,7 @@ _02234D64: str r3, [sp, #4] ldrb r2, [r5, #4] ldr r0, [r4, #0x54] - bl FUN_0200AD38 + bl BufferIntegerAsString ldrb r0, [r5, #1] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -15044,7 +15044,7 @@ _02234D64: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234D8E: @@ -15054,11 +15054,11 @@ _02234D8E: str r3, [sp, #4] ldrb r2, [r5, #4] ldr r0, [r4, #0x54] - bl FUN_0200AD38 + bl BufferIntegerAsString ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234DAC: @@ -15068,7 +15068,7 @@ _02234DAC: str r3, [sp, #4] ldrb r2, [r5, #4] ldr r0, [r4, #0x54] - bl FUN_0200AD38 + bl BufferIntegerAsString ldrb r0, [r5] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -15077,7 +15077,7 @@ _02234DAC: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234DD6: @@ -15089,7 +15089,7 @@ _02234DD6: add r2, #0xd0 ldrh r2, [r2] mov r1, #0 - bl FUN_0200B244 + bl BufferContestJudgeName ldrb r0, [r5] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -15098,7 +15098,7 @@ _02234DD6: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234E04: @@ -15110,7 +15110,7 @@ _02234E04: add r2, #0xd0 ldrh r2, [r2] mov r1, #0 - bl FUN_0200B244 + bl BufferContestJudgeName ldrb r0, [r5, #1] ldr r1, [r4, #0xc] lsl r0, r0, #2 @@ -15119,7 +15119,7 @@ _02234E04: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234E32: @@ -15131,11 +15131,11 @@ _02234E32: add r2, #0xd0 ldrh r2, [r2] mov r1, #0 - bl FUN_0200B244 + bl BufferContestJudgeName ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234E54: @@ -15147,7 +15147,7 @@ _02234E54: add r2, #0xd0 ldrh r2, [r2] mov r1, #0 - bl FUN_0200B244 + bl BufferContestJudgeName mov r0, #0 mov r1, #1 str r0, [sp] @@ -15155,7 +15155,7 @@ _02234E54: ldrb r2, [r5, #4] ldr r0, [r4, #0x54] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234E7E: @@ -15167,7 +15167,7 @@ _02234E7E: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldrb r2, [r5, #5] ldr r3, [r4, #0xc] ldr r0, [r4, #0x54] @@ -15176,11 +15176,11 @@ _02234E7E: add r2, #0xd0 ldrh r2, [r2] mov r1, #1 - bl FUN_0200B244 + bl BufferContestJudgeName ldrh r2, [r5, #2] ldr r0, [r4, #0x54] mov r1, #2 - bl FUN_0200AD5C + bl BufferMoveName add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234EB6: @@ -15192,7 +15192,7 @@ _02234EB6: add r2, #0xd0 ldrh r2, [r2] mov r1, #0 - bl FUN_0200B244 + bl BufferContestJudgeName mov r5, #0 _02234ECC: add r0, r6, r5 @@ -15206,7 +15206,7 @@ _02234ECC: add r2, r0, #0 ldr r0, [r4, #0x54] add r1, r5, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r5, r5, #1 cmp r5, #4 blt _02234ECC @@ -25464,7 +25464,7 @@ _02239A82: ldr r0, [r5, #0x48] ldr r2, [r2] mov r1, #0 - bl FUN_0200ABB4 + bl BufferString ldrb r0, [r6] ldr r1, [r5, #0xc] lsl r0, r0, #2 @@ -25473,7 +25473,7 @@ _02239A82: add r2, r0, #0 ldr r0, [r5, #0x48] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r4, r5, r6, pc} _02239AC8: @@ -34579,7 +34579,7 @@ _0223E09E: add r2, r0, #0 ldr r0, [r4] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r4, r5, r6, pc} _0223E0BA: @@ -34596,7 +34596,7 @@ _0223E0BA: add r2, r0, #0 ldr r0, [r4] mov r1, #0 - bl FUN_0200B278 + bl BufferContestMessage add sp, #8 pop {r4, r5, r6, pc} _0223E0DE: @@ -34607,7 +34607,7 @@ _0223E0DE: add r4, #0x9c ldrb r2, [r5, #4] ldr r0, [r4] - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r4, r5, r6, pc} _0223E0F4: @@ -34629,7 +34629,7 @@ _0223E0F4: ldr r0, [r0] ldr r2, [r2] mov r1, #0 - bl FUN_0200ABB4 + bl BufferString ldrb r0, [r5] ldr r1, [r4, #0x14] lsl r0, r0, #2 @@ -34639,7 +34639,7 @@ _0223E0F4: add r2, r0, #0 ldr r0, [r4] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r4, r5, r6, pc} _0223E138: @@ -34653,7 +34653,7 @@ _0223E138: add r0, #0x9c ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #0 mov r1, #1 str r0, [sp] @@ -34662,7 +34662,7 @@ _0223E138: ldrb r2, [r5, #4] ldr r0, [r4] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r4, r5, r6, pc} _0223E16A: @@ -34680,7 +34680,7 @@ _0223E16A: add r0, #0x9c ldr r0, [r0] mov r1, #0 - bl FUN_0200B278 + bl BufferContestMessage mov r0, #0 str r0, [sp] mov r1, #1 @@ -34690,7 +34690,7 @@ _0223E16A: ldrb r2, [r5, #4] ldr r0, [r0] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldrb r6, [r5] ldr r3, [r4] mov r0, #1 @@ -34708,7 +34708,7 @@ _0223E16A: ldrb r3, [r6, r3] ldr r0, [r0] ldr r2, [r2] - bl FUN_0200ABB4 + bl BufferString ldrb r0, [r5] ldr r1, [r4, #0x14] lsl r0, r0, #2 @@ -34718,7 +34718,7 @@ _0223E16A: add r2, r0, #0 ldr r0, [r4] mov r1, #3 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r4, r5, r6, pc} _0223E1E4: @@ -41227,7 +41227,7 @@ MOD12_02241210: ; 0x02241210 add r1, #0xc4 str r0, [r1] mov r0, #0x18 - bl FUN_0200AA80 + bl ScrStrBufs_new add r1, r5, #0 add r1, #0xc8 str r0, [r1] @@ -41546,7 +41546,7 @@ _022415D4: add r0, r4, #0 add r0, #0xc8 ldr r0, [r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] @@ -43433,7 +43433,7 @@ _0224252E: add r2, r0, #0 ldr r0, [r4] mov r1, #0 - bl FUN_0200B278 + bl BufferContestMessage add sp, #8 pop {r4, r5, r6, pc} _02242552: @@ -43455,7 +43455,7 @@ _02242552: ldr r0, [r0] ldr r2, [r2] mov r1, #0 - bl FUN_0200ABB4 + bl BufferString ldrb r0, [r5] ldr r1, [r4, #0x10] lsl r0, r0, #2 @@ -43465,7 +43465,7 @@ _02242552: add r2, r0, #0 ldr r0, [r4] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r4, r5, r6, pc} _02242596: @@ -43477,7 +43477,7 @@ _02242596: add r0, #0xc8 ldrb r2, [r5, #4] ldr r0, [r0] - bl FUN_0200AD38 + bl BufferIntegerAsString ldrb r6, [r5] ldr r3, [r4] mov r1, #1 @@ -43495,7 +43495,7 @@ _02242596: ldrb r3, [r6, r3] ldr r0, [r0] ldr r2, [r2] - bl FUN_0200ABB4 + bl BufferString ldrb r0, [r5] ldr r1, [r4, #0x10] lsl r0, r0, #2 @@ -43505,7 +43505,7 @@ _02242596: add r2, r0, #0 ldr r0, [r4] mov r1, #2 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add sp, #8 pop {r4, r5, r6, pc} _022425EC: diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index b7b80736..7b1720cb 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -3,8 +3,8 @@ .section .text .balign 4, 0 - thumb_func_start MOD14_021D74E0 -MOD14_021D74E0: ; 0x021D74E0 + thumb_func_start StoragePC_Overlay_Init +StoragePC_Overlay_Init: ; 0x021D74E0 push {r3, r4, r5, lr} mov r2, #1 add r5, r0, #0 @@ -53,8 +53,8 @@ _021D7544: .align 2, 0 _021D7548: .word MOD14_021D7680 - thumb_func_start MOD14_021D754C -MOD14_021D754C: ; 0x021D754C + thumb_func_start StoragePC_Overlay_Run +StoragePC_Overlay_Run: ; 0x021D754C push {r4, lr} bl OverlayManager_GetData mov r1, #0x6b @@ -107,8 +107,8 @@ _021D75AA: nop _021D75B4: .word gMain - thumb_func_start MOD14_021D75B8 -MOD14_021D75B8: ; 0x021D75B8 + thumb_func_start StoragePC_Overlay_Teardown +StoragePC_Overlay_Teardown: ; 0x021D75B8 push {r4, lr} bl OverlayManager_GetData mov r1, #0x49 @@ -2355,7 +2355,7 @@ _021D8828: lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 mov r1, #0 bl MOD14_021DBA44 @@ -2645,7 +2645,7 @@ _021D8A92: lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName add r0, r4, #0 mov r1, #0x19 bl MOD14_021DBA44 @@ -2659,7 +2659,7 @@ _021D8AB0: lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName add r0, r4, #0 mov r1, #0x19 bl MOD14_021DBA44 @@ -4962,7 +4962,7 @@ _021D9D86: lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 bl MOD14_021D9F80 add r0, r4, #0 @@ -5942,7 +5942,7 @@ _021DA566: lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName add r0, r4, #0 mov r1, #0x10 bl MOD14_021DBA44 @@ -6048,7 +6048,7 @@ _021DA648: ldr r0, [r4, r0] ldr r2, [r2, #4] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName add r0, r4, #0 mov r1, #0 bl MOD14_021E5D98 @@ -6270,7 +6270,7 @@ _021DA81E: ldr r0, [r4, r0] ldr r2, [r2] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName add r0, r4, #0 mov r1, #0x1a bl MOD14_021DBA44 @@ -7572,7 +7572,7 @@ MOD14_021DB220: ; 0x021DB220 lsl r1, r1, #2 str r0, [r5, r1] mov r0, #9 - bl FUN_0200AA80 + bl ScrStrBufs_new mov r1, #0x67 lsl r1, r1, #2 str r0, [r5, r1] @@ -7702,7 +7702,7 @@ _021DB3BE: mov r0, #0x67 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x63 lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index e633fc94..712980c4 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -5212,7 +5212,7 @@ _021D9CDC: mov r0, #2 mov r1, #0x3c mov r2, #0 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom add r5, r0, #0 mov r0, #0x4b lsl r0, r0, #2 @@ -5222,7 +5222,7 @@ _021D9CDC: add r6, r0, #0 add r0, r5, #0 add r2, r1, #0 - bl FUN_0200AEE0 + bl BufferPocketName ldr r0, [r4, #4] bl MOD15_021D86E8 add r1, r0, #0 @@ -5248,7 +5248,7 @@ _021D9CDC: add r0, r6, #0 bl String_dtor add r0, r5, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete b _021D9DB0 _021D9D40: ldr r0, [r4, #0x48] diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index cd2070e9..be4096d7 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4956,7 +4956,7 @@ MOD17_021D9B74: ; 0x021D9B74 add r4, r0, #0 bl MOD17_021D9918 mov r0, #0xd - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _021D9B98 ; =0x000006D4 str r0, [r4, r1] add sp, #8 @@ -4984,7 +4984,7 @@ MOD17_021D9BA4: ; 0x021D9BA4 ldr r3, _021D9BC0 ; =0x000006D4 ldr r0, [r0, r3] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, pc} nop @@ -5006,7 +5006,7 @@ MOD17_021D9BCC: ; 0x021D9BCC bl MOD17_021D9B30 ldr r0, _021D9BE4 ; =0x000006D4 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _021D9BE4 ; =0x000006D4 mov r1, #0 str r1, [r4, r0] @@ -14347,7 +14347,7 @@ MOD17_021DDFDC: ; 0x021DDFDC bl ErrorHandling _021DDFF8: mov r0, #0xd - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0 mov r0, #0x63 lsl r0, r0, #2 @@ -14445,7 +14445,7 @@ _021DDFF8: ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop @@ -14467,7 +14467,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 bl FUN_02027C58 add r6, r0, #0 mov r0, #0xd - bl FUN_0200AA80 + bl ScrStrBufs_new add r7, r0, #0 mov r0, #0xc8 mov r1, #0xd @@ -14478,13 +14478,13 @@ MOD17_021DE0F4: ; 0x021DE0F4 add r2, r0, #0 add r0, r7, #0 mov r1, #0 - bl FUN_0200B2AC + bl BufferContestMessage2 add r0, r6, #0 bl FUN_02083268 add r2, r0, #0 add r0, r7, #0 mov r1, #1 - bl FUN_0200B278 + bl BufferContestMessage ldr r0, [r5, #4] bl FUN_02027B44 add r6, r0, #0 @@ -14499,7 +14499,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 mov r1, #3 add r2, r4, #0 add r3, r6, #0 - bl FUN_0200ABB4 + bl BufferString mov r0, #0xd bl AllocMonZeroed add r6, r0, #0 @@ -14511,7 +14511,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 add r2, r0, #0 add r0, r7, #0 mov r1, #4 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r6, #0 bl FreeToHeap ldr r2, _021DE24C ; =0x00000151 @@ -14593,7 +14593,7 @@ _021DE1A0: ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r7, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x14 pop {r4, r5, r6, r7, pc} nop 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] diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 736ecfdf..c28270a3 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -104,7 +104,7 @@ MOD51_022548F0: ; 0x022548F0 sub r1, #0xa mov r0, #4 strh r2, [r4, r1] - bl FUN_0200AA80 + bl ScrStrBufs_new mov r2, #9 str r0, [r4, #0x18] mov r0, #0 @@ -347,7 +347,7 @@ _02254AEC: ldr r0, [r6, #0x1c] bl DestroyMsgData ldr r0, [r6, #0x18] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x72 lsl r0, r0, #2 add r0, r6, r0 @@ -1554,7 +1554,7 @@ _02255478: ldr r2, [sp, #0x28] add r0, r7, #0 mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName b _022554CA _0225548C: cmp r4, #2 @@ -1579,7 +1579,7 @@ _0225548C: add r0, r7, #0 add r2, r4, #0 add r3, r1, #0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0 bl String_dtor _022554CA: diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 7f63bc2e..d128782b 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -50,7 +50,7 @@ _021D74F6: bl FUN_02016B94 str r0, [r4] mov r0, #0x27 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0xc] ldr r2, _021D7644 ; =0x00000176 mov r0, #0 @@ -363,7 +363,7 @@ _021D77D8: ldr r0, [r6, #0x10] bl DestroyMsgData ldr r0, [r6, #0xc] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r7] add r0, r0, #1 str r0, [r7] @@ -2428,7 +2428,7 @@ _021D88EA: add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r6, #2 bl MOD53_021D9440 @@ -2479,7 +2479,7 @@ MOD53_021D896C: ; 0x021D896C add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #3 mov r2, #1 @@ -2779,7 +2779,7 @@ _021D8BB0: add r2, r0, #0 ldr r0, [r4, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName mov r0, #0x32 lsl r0, r0, #4 str r6, [r4, r0] @@ -2800,7 +2800,7 @@ _021D8BE0: add r2, r0, #0 ldr r0, [r4, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName bl FUN_02031190 cmp r6, r0 beq _021D8C4A diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 1ff5c011..2c2aad31 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -57,7 +57,7 @@ _021D74F6: ldr r0, _021D763C ; =0x00004A38 str r1, [r4, r0] mov r0, #0x33 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x24] ldr r2, _021D7640 ; =0x000001E2 mov r0, #0 @@ -317,7 +317,7 @@ _021D776C: ldr r0, [r6, #0x28] bl DestroyMsgData ldr r0, [r6, #0x24] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0 bl MOD54_021D7A34 ldr r0, [sp] @@ -2210,7 +2210,7 @@ _021D869C: add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName _021D86BE: mov r0, #0x32 mov r1, #0 @@ -2246,7 +2246,7 @@ _021D86F6: add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #0x10 mov r2, #0 @@ -2579,7 +2579,7 @@ _021D896C: add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName bl FUN_02031190 cmp r6, r0 beq _021D89BE @@ -2639,7 +2639,7 @@ _021D89EA: add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #1 bl MOD54_021D8F40 @@ -2668,7 +2668,7 @@ _021D8A2E: add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName bl FUN_02031190 cmp r6, r0 beq _021D8A7E @@ -2815,7 +2815,7 @@ _021D8B2A: ldr r0, [r0, #0x24] mov r1, #0 mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x14] ldr r1, [sp, #0x14] ldr r0, [r0, #0x24] diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 860ecc6b..78542890 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -562,7 +562,7 @@ MOD55_021D7994: ; 0x021D7994 push {r3, r4, r5, r6, r7, lr} add r6, r0, #0 mov r0, #0x34 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r6, #0xc] ldr r2, _021D7A34 ; =0x00000251 mov r0, #0 @@ -642,7 +642,7 @@ MOD55_021D7A38: ; 0x021D7A38 ldr r0, [r6, #0x10] bl DestroyMsgData ldr r0, [r6, #0xc] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r4, #0 add r5, r6, #0 _021D7A4C: @@ -1313,7 +1313,7 @@ _021D7F86: add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] @@ -1986,7 +1986,7 @@ MOD55_021D84C8: ; 0x021D84C8 ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r1, [sp] add r0, r5, #0 add r2, r7, #0 @@ -3330,7 +3330,7 @@ _021D8F1A: ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #0xc bl MOD55_021DA0A4 @@ -3526,7 +3526,7 @@ MOD55_021D90D8: ; 0x021D90D8 ldr r0, [r5, #0xc] mov r1, #0 add r2, r6, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #0x1f bl MOD55_021DA15C @@ -3611,7 +3611,7 @@ _021D91D6: add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] @@ -3859,7 +3859,7 @@ MOD55_021D93F8: ; 0x021D93F8 str r1, [sp, #4] ldr r0, [r5, #0xc] mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, _021D9470 ; =0x00002710 add r0, r4, #0 add r1, r6, #0 @@ -3875,7 +3875,7 @@ MOD55_021D93F8: ; 0x021D93F8 str r0, [sp, #4] ldr r0, [r5, #0xc] mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, _021D9470 ; =0x00002710 add r0, r4, #0 add r1, r6, #0 @@ -3889,7 +3889,7 @@ MOD55_021D93F8: ; 0x021D93F8 ldr r0, [r5, #0xc] mov r1, #3 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r4, r5, r6, pc} nop @@ -4177,7 +4177,7 @@ _021D969A: ldr r0, [r4, #0xc] ldr r2, [sp, #0x20] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r2, r4, #0 add r2, #0xb8 ldr r0, [r4, #0x10] @@ -4247,7 +4247,7 @@ _021D974E: ldr r0, [r4, #0xc] ldr r2, [sp, #0x20] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r2, r4, #0 add r2, #0xb8 ldr r0, [r4, #0x10] @@ -4417,7 +4417,7 @@ _021D987C: ldr r0, [r4, #0xc] mov r1, #0 add r2, r5, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 bl FreeToHeap add r2, r4, #0 @@ -4490,7 +4490,7 @@ _021D987C: ldr r0, [r4, #0xc] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString add r2, r4, #0 add r2, #0xb8 ldr r0, [r4, #0x10] @@ -4539,7 +4539,7 @@ _021D987C: ldr r0, [r4, #0xc] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString add r2, r4, #0 add r2, #0xb8 ldr r0, [r4, #0x10] @@ -4619,7 +4619,7 @@ _021D9A64: mov r1, #0 add r2, r5, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString cmp r5, #1 ldr r0, [r4, #0x10] bne _021D9ADC @@ -4701,7 +4701,7 @@ _021D9AE8: mov r1, #2 ldr r0, [r4, #0xc] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] mov r2, #4 @@ -4713,7 +4713,7 @@ _021D9AE8: ldr r0, [r4, #0xc] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] mov r2, #5 @@ -4721,7 +4721,7 @@ _021D9AE8: add r2, r0, #0 ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_0200B764 + bl BufferMonthNameAbbr ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] mov r2, #6 @@ -4733,7 +4733,7 @@ _021D9AE8: mov r1, #2 ldr r0, [r4, #0xc] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r2, r4, #0 add r2, #0xb8 ldr r0, [r4, #0x10] @@ -5221,7 +5221,7 @@ MOD55_021D9F8C: ; 0x021D9F8C ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #0x1c bl MOD55_021DA0A4 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 08b66924..48a760dd 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -274,7 +274,7 @@ MOD56_02211FD4: ; 0x02211FD4 add r1, #0xc0 str r0, [r1] mov r0, #0x36 - bl FUN_0200AA80 + bl ScrStrBufs_new add r1, r4, #0 add r1, #0xc8 str r0, [r1] @@ -528,7 +528,7 @@ _022121EC: bl DestroyMsgData add r6, #0xc8 ldr r0, [r6] - bl FUN_0200AB18 + bl ScrStrBufs_delete pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end MOD56_022121C4 @@ -2190,7 +2190,7 @@ _02212FAC: ldr r0, [r0] mov r1, #0 mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r4, #0 add r1, r6, #0 bl MOD56_02215FF4 @@ -7111,7 +7111,7 @@ _02215532: ldr r0, [r0] mov r1, #0 add r2, r6, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r6, #0 bl FreeToHeap add r0, r5, #0 @@ -7189,7 +7189,7 @@ _02215532: ldr r0, [r0] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 mov r2, #0x56 add r0, #0xcc @@ -7235,7 +7235,7 @@ _02215532: ldr r0, [r0] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 mov r2, #0x56 add r0, #0xcc @@ -7313,7 +7313,7 @@ _02215532: mov r1, #0 add r2, r6, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString cmp r6, #1 bne _02215810 add r0, r5, #0 @@ -7404,7 +7404,7 @@ _02215822: mov r1, #2 ldr r0, [r0] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5] add r1, r4, #0 mov r2, #4 @@ -7418,7 +7418,7 @@ _02215822: ldr r0, [r0] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5] add r1, r4, #0 mov r2, #5 @@ -7428,7 +7428,7 @@ _02215822: add r0, #0xc8 ldr r0, [r0] mov r1, #1 - bl FUN_0200B764 + bl BufferMonthNameAbbr add r0, r5, #0 mov r2, #0x56 add r0, #0xcc @@ -8443,7 +8443,7 @@ MOD56_022160E4: ; 0x022160E4 ldr r0, [r5] mov r1, #0 add r2, r4, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r4, #0 bl FreeToHeap _0221611C: diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 798a2bdb..6f58ea67 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -2802,7 +2802,7 @@ _021D8AE0: mov r0, #6 mov r1, #0x20 mov r2, #0x19 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom mov r2, #0 str r5, [sp] add r4, r0, #0 @@ -2835,7 +2835,7 @@ _021D8AE0: add r0, r4, #0 mov r1, #5 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x14] ldr r2, [sp, #0x10] mov r1, #0xe @@ -2904,7 +2904,7 @@ _021D8BA4: add r0, r4, #0 mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r6, #0x18] bl GetIGTMinutes mov r3, #2 @@ -2913,7 +2913,7 @@ _021D8BA4: mov r1, #1 add r0, r4, #0 str r1, [sp, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x14] ldr r2, [sp, #0x10] mov r1, #0x10 @@ -2927,7 +2927,7 @@ _021D8C02: add r0, r4, #0 mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r3, #2 add r2, r6, #0 str r3, [sp] @@ -2936,7 +2936,7 @@ _021D8C02: add r2, #0x2e ldrb r2, [r2] add r0, r4, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x14] ldr r2, [sp, #0x10] mov r1, #0xf @@ -2971,13 +2971,13 @@ _021D8C32: ldrb r2, [r2] add r0, r4, #0 add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r2, r6, #0 add r2, #0x30 ldrb r2, [r2] add r0, r4, #0 mov r1, #3 - bl FUN_0200B764 + bl BufferMonthNameAbbr mov r3, #2 str r3, [sp] mov r0, #1 @@ -2986,7 +2986,7 @@ _021D8C32: ldrb r2, [r6] add r0, r4, #0 mov r1, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x14] ldr r2, [sp, #0x10] mov r1, #0x11 @@ -3014,7 +3014,7 @@ _021D8C32: ldr r0, [sp, #0x10] bl String_dtor add r0, r4, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r5, #0 bl String_dtor ldr r0, [sp, #0x14] @@ -3116,7 +3116,7 @@ _021D8D72: mov r0, #5 mov r1, #0x20 mov r2, #0x19 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom ldr r1, [sp, #0x10] add r4, r0, #0 add r1, #0x33 @@ -3131,13 +3131,13 @@ _021D8D72: add r3, r1, #0 add r2, #0x32 ldrb r2, [r2] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [sp, #0x10] add r0, r4, #0 add r2, #0x33 ldrb r2, [r2] mov r1, #3 - bl FUN_0200B764 + bl BufferMonthNameAbbr mov r3, #2 ldr r2, [sp, #0x10] str r3, [sp] @@ -3147,7 +3147,7 @@ _021D8D72: ldrb r2, [r2] add r0, r4, #0 mov r1, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #1 str r0, [sp] str r0, [sp, #4] @@ -3156,7 +3156,7 @@ _021D8D72: ldrh r2, [r2, #0x2c] mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r3, #2 ldr r2, [sp, #0x10] str r3, [sp] @@ -3165,7 +3165,7 @@ _021D8D72: add r2, #0x35 ldrb r2, [r2] add r0, r4, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [sp, #0x14] add r0, r7, #0 mov r1, #0x11 @@ -3187,7 +3187,7 @@ _021D8E3C: ldr r2, [sp, #0x14] add r0, r4, #0 add r3, r1, #0 - bl FUN_0200ABB4 + bl BufferString mov r3, #0 str r3, [sp] mov r0, #2 @@ -3195,7 +3195,7 @@ _021D8E3C: ldr r2, [sp, #0x14] add r0, r4, #0 mov r1, #1 - bl FUN_0200ABB4 + bl BufferString add r0, r7, #0 mov r1, #0x14 add r2, r5, #0 @@ -3331,7 +3331,7 @@ _021D8E74: ldr r0, [sp, #0x14] bl String_dtor add r0, r4, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r5, #0 bl String_dtor add r0, r7, #0 @@ -3473,7 +3473,7 @@ _021D906E: mov r0, #2 mov r1, #0x20 mov r2, #0x19 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom add r6, r0, #0 ldr r0, [r5, #0x18] bl GetIGTHours @@ -3484,7 +3484,7 @@ _021D906E: add r0, r6, #0 mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x18] bl GetIGTMinutes mov r3, #2 @@ -3493,7 +3493,7 @@ _021D906E: mov r1, #1 add r0, r6, #0 str r1, [sp, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [sp, #0x10] ldr r2, [sp, #0x14] mov r1, #0x10 @@ -3525,7 +3525,7 @@ _021D906E: ldr r0, [sp, #0x14] bl String_dtor add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 0d391752..ddcbedd9 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -56,7 +56,7 @@ _021D9A36: bl FUN_02016B94 str r0, [r4] mov r0, #0x27 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x10] ldr r2, _021D9B78 ; =0x00000176 mov r0, #0 @@ -260,7 +260,7 @@ _021D9C40: ldr r0, [r6, #0x14] bl DestroyMsgData ldr r0, [r6, #0x10] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0 bl MOD58_021D9EA0 ldr r0, [sp] diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index 746049b9..9182c632 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -610,7 +610,7 @@ MOD59_021D79F8: ; 0x021D79F8 bl FUN_020142EC str r0, [r4, #0x60] ldr r0, [r4] - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x64] mov r0, #0 str r0, [r4, #0x50] @@ -626,7 +626,7 @@ MOD59_021D7A34: ; 0x021D7A34 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x64] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x60] bl FUN_020143D0 ldr r0, [r4, #0x4c] @@ -982,7 +982,7 @@ _021D7C5E: ldr r2, [r2, #0x18] ldr r3, [r3] add r1, r4, #0 - bl FUN_0200ABB4 + bl BufferString mov r1, #1 str r1, [sp] mov r0, #2 @@ -991,7 +991,7 @@ _021D7C5E: ldr r0, [r5, #0x64] ldr r2, [r2, #0x18] add r3, r4, #0 - bl FUN_0200ABB4 + bl BufferString ldr r0, [r5, #0x64] ldr r1, [r5, #0x5c] add r2, r6, #0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 7eac95d5..af08a5f3 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -1051,7 +1051,7 @@ MOD65_021D7CC8: ; 0x021D7CC8 ldr r2, [r5] mov r0, #2 mov r1, #0x40 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [r5, #0x30] ldr r1, [r5] mov r0, #0x40 @@ -1142,7 +1142,7 @@ _021D7D94: ldr r0, [r6, #0x34] bl String_dtor ldr r0, [r6, #0x30] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r6, #0x28] bl FUN_02014564 ldr r0, [r6, #0x2c] @@ -1566,7 +1566,7 @@ _021D80EE: ldr r0, [r5, #0x30] add r1, r7, #0 add r3, r7, #0 - bl FUN_0200ABB4 + bl BufferString mov r0, #2 str r0, [sp] mov r0, #1 @@ -1575,7 +1575,7 @@ _021D80EE: ldr r0, [r5, #0x30] mov r1, #1 mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x30] ldr r1, [r5, #0x34] ldr r2, [r5, #0x3c] @@ -2179,7 +2179,7 @@ _021D85D4: str r0, [sp, #4] ldr r0, [r4, #0x30] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x40] @@ -2354,7 +2354,7 @@ MOD65_021D8718: ; 0x021D8718 str r3, [sp, #4] ldr r0, [r4, #0x30] mov r1, #0 - bl FUN_0200ABB4 + bl BufferString ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x44] @@ -2391,7 +2391,7 @@ MOD65_021D8764: ; 0x021D8764 str r3, [sp, #4] ldr r0, [r4, #0x30] mov r1, #0 - bl FUN_0200ABB4 + bl BufferString ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x48] @@ -3316,7 +3316,7 @@ MOD65_021D8EC4: ; 0x021D8EC4 ldr r2, [r6] mov r0, #1 mov r1, #0x40 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [r6, #0x1c] ldr r1, [r6] mov r0, #0x40 @@ -3354,7 +3354,7 @@ _021D8F10: ldr r0, [r6, #0x20] bl String_dtor ldr r0, [r6, #0x1c] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r6, #0x18] bl DestroyMsgData pop {r4, r5, r6, pc} @@ -3852,7 +3852,7 @@ MOD65_021D92C4: ; 0x021D92C4 ldr r0, [r4, #0x1c] ldr r2, [r4, #0x3c] mov r1, #0 - bl FUN_0200ABB4 + bl BufferString add r2, r4, #0 add r2, #0x39 ldrb r2, [r2] diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 6b7ae246..997d785e 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -441,7 +441,7 @@ MOD67_021D7880: ; 0x021D7880 bl NewMsgDataFromNarc str r0, [r4, #0x50] mov r0, #0x2a - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x54] mov r0, #0x80 mov r1, #0x2a @@ -459,7 +459,7 @@ MOD67_021D78AC: ; 0x021D78AC ldr r0, [r4, #0x50] bl DestroyMsgData ldr r0, [r4, #0x54] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x58] bl String_dtor pop {r4, pc} @@ -1188,7 +1188,7 @@ _021D7E32: ldr r0, [r5, #0x54] mov r1, #0 lsr r2, r2, #0x1c - bl FUN_0200B764 + bl BufferMonthNameAbbr mov r0, #0 str r0, [sp] mov r1, #1 @@ -1198,7 +1198,7 @@ _021D7E32: lsl r2, r2, #0xd lsr r2, r2, #0x1b mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r4, #0 @@ -1252,7 +1252,7 @@ _021D7E32: add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r4, #0 @@ -1711,7 +1711,7 @@ _021D822A: ldr r0, [r4, #0x54] ldr r2, [r4, #0x4c] mov r1, #1 - bl FUN_0200ABE4 + bl BufferRivalsName ldr r0, [r4, #0x54] ldr r1, [r4, #0x58] add r2, r6, #0 @@ -1778,7 +1778,7 @@ _021D82F2: add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r4, #0x54] ldr r1, [r4, #0x58] add r2, r5, #0 @@ -2257,7 +2257,7 @@ MOD67_021D8688: ; 0x021D8688 ldrh r2, [r4, #2] ldr r0, [r5, #0x54] mov r1, #0 - bl FUN_0200B430 + bl BufferGymName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2298,7 +2298,7 @@ MOD67_021D86DC: ; 0x021D86DC ldrh r2, [r4, #2] ldr r0, [r5, #0x54] mov r1, #0 - bl FUN_0200B430 + bl BufferGymName ldrh r2, [r4, #4] ldr r0, [r5, #0x54] mov r1, #1 @@ -2427,7 +2427,7 @@ MOD67_021D87E4: ; 0x021D87E4 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2482,7 +2482,7 @@ _021D886E: ldr r0, [r5, #0x54] mov r1, #0 add r2, r4, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2532,7 +2532,7 @@ _021D88D2: ldr r0, [r5, #0x54] ldr r2, [sp, #0x10] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r6, #0 @@ -2635,7 +2635,7 @@ MOD67_021D898C: ; 0x021D898C ldrh r2, [r4, #6] ldr r0, [r5, #0x54] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2678,7 +2678,7 @@ MOD67_021D89E0: ; 0x021D89E0 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2721,7 +2721,7 @@ MOD67_021D8A3C: ; 0x021D8A3C add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2764,7 +2764,7 @@ MOD67_021D8A98: ; 0x021D8A98 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2807,7 +2807,7 @@ MOD67_021D8AF4: ; 0x021D8AF4 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2850,7 +2850,7 @@ MOD67_021D8B50: ; 0x021D8B50 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2893,7 +2893,7 @@ MOD67_021D8BAC: ; 0x021D8BAC add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2936,7 +2936,7 @@ MOD67_021D8C08: ; 0x021D8C08 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -2979,7 +2979,7 @@ MOD67_021D8C64: ; 0x021D8C64 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -3022,7 +3022,7 @@ MOD67_021D8CC0: ; 0x021D8CC0 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -3065,7 +3065,7 @@ MOD67_021D8D1C: ; 0x021D8D1C add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -3108,7 +3108,7 @@ MOD67_021D8D78: ; 0x021D8D78 add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 @@ -3313,7 +3313,7 @@ MOD67_021D8F00: ; 0x021D8F00 add r2, r0, #0 ldr r0, [r5, #0x54] ldr r1, [sp, #0xc] - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName add r0, r6, #0 bl FreeToHeap add sp, #0x10 @@ -3380,7 +3380,7 @@ _021D8F9A: mov r1, #1 lsl r2, r2, #0x1a lsr r2, r2, #0x1c - bl FUN_0200B468 + bl BufferTimeOfDayName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r6, #0 @@ -3465,7 +3465,7 @@ _021D9046: mov r1, #1 lsl r2, r2, #0x1a lsr r2, r2, #0x1c - bl FUN_0200B468 + bl BufferTimeOfDayName ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r6, #0 @@ -3512,7 +3512,7 @@ MOD67_021D9098: ; 0x021D9098 ldr r1, [sp, #8] add r2, r4, #0 add r3, r7, #0 - bl FUN_0200ABB4 + bl BufferString add r0, r4, #0 bl String_dtor add sp, #0xc @@ -4192,7 +4192,7 @@ MOD67_021D95EC: ; 0x021D95EC ldr r0, [r5, #0x54] lsl r2, r2, #0x1c lsr r2, r2, #0x1c - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 469d30af..c201069e 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -446,7 +446,7 @@ MOD68_021D7870: ; 0x021D7870 add r1, #0xcc str r0, [r1] mov r0, #0x24 - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, #0xc8 str r0, [r4] pop {r4, pc} @@ -467,7 +467,7 @@ MOD68_021D78A8: ; 0x021D78A8 bl FUN_0200B990 add r4, #0xc8 ldr r0, [r4] - bl FUN_0200AB18 + bl ScrStrBufs_delete pop {r4, pc} thumb_func_end MOD68_021D78A8 @@ -693,7 +693,7 @@ MOD68_021D7A18: ; 0x021D7A18 ldr r0, [r0] mov r1, #0 add r2, r2, #1 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 add r0, #0xc8 ldr r0, [r0] @@ -945,7 +945,7 @@ MOD68_021D7C28: ; 0x021D7C28 add r0, #0xc8 ldr r0, [r0] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r7, #0 mov r1, #0xa bl _u32_div_f @@ -958,7 +958,7 @@ MOD68_021D7C28: ; 0x021D7C28 add r0, #0xc8 ldr r0, [r0] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r5, #0xc8 ldr r0, [r5] ldr r2, [sp, #0x10] diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 686df4a1..0e218fd3 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -43,7 +43,7 @@ HOF_OverlayInit: ; 0x0222D5C0 ldr r1, _0222D718 ; =0x00001B58 str r0, [r4, r1] mov r0, #0x3f - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _0222D71C ; =0x00001B50 str r0, [r4, r1] mov r0, #0 @@ -200,7 +200,7 @@ _0222D762: bl MOD69_0222DD18 ldr r0, _0222D7E4 ; =0x00001B50 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _0222D7E8 ; =0x00001B54 ldr r0, [r4, r0] bl String_dtor @@ -2358,7 +2358,7 @@ HOF_MonGetUIStrings: ; 0x0222E8FC add r2, r0, #0 ldr r0, [r4, #0x14] mov r1, #0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName ldr r0, [r4, #0x24] bl CalcMonLevel add r2, r0, #0 @@ -2368,7 +2368,7 @@ HOF_MonGetUIStrings: ; 0x0222E8FC str r1, [sp, #4] ldr r0, [r4, #0x14] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x24] bl GetMonGender cmp r0, #0 @@ -2422,7 +2422,7 @@ _0222E982: add r2, r0, #0 ldr r0, [r5, #0x14] mov r1, #0 - bl GetLandmarkName + bl BufferLandmarkName _0222E996: ldr r0, [r5, #0x20] ldr r2, [r5, #0x18] @@ -2503,7 +2503,7 @@ _0222EA2E: add r2, r0, #0 ldr r0, [r4, #0x14] mov r1, #0 - bl FUN_0200AD18 + bl BufferBoxMonOTName ldr r0, [r4, #0x20] ldr r2, [r4, #0x18] mov r1, #4 @@ -2669,7 +2669,7 @@ MOD69_0222EB4C: ; 0x0222EB4C ldr r0, [r4, r0] ldr r2, [r2] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r4, #0xc] ldr r0, [r0] bl PlayerProfile_GetTrainerID_VisibleHalf @@ -2681,7 +2681,7 @@ MOD69_0222EB4C: ; 0x0222EB4C str r1, [sp, #4] ldr r0, [r4, r0] mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0xc] ldr r0, [r0, #8] bl GetIGTHours @@ -2694,7 +2694,7 @@ MOD69_0222EB4C: ; 0x0222EB4C mov r1, #2 ldr r0, [r4, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0xc] ldr r0, [r0, #8] bl GetIGTMinutes @@ -2706,7 +2706,7 @@ MOD69_0222EB4C: ; 0x0222EB4C ldr r0, _0222EC5C ; =0x00001B50 mov r1, #3 ldr r0, [r4, r0] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, _0222EC50 ; =0x00001B5C mov r1, #0xd ldr r0, [r4, r2] diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 9eeae0a5..61998dcd 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -450,7 +450,7 @@ MOD70_021D77CC: ; 0x021D77CC lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x3d - bl FUN_0200AA80 + bl ScrStrBufs_new mov r1, #0x63 lsl r1, r1, #2 str r0, [r4, r1] @@ -509,7 +509,7 @@ MOD70_021D78A0: ; 0x021D78A0 mov r0, #0x63 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x62 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1053,7 +1053,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 ldr r2, [r4] mov r3, #4 add r6, #0x14 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0 str r0, [sp] mov r1, #1 @@ -1066,13 +1066,13 @@ MOD70_021D7CE8: ; 0x021D7CE8 add r2, r3, r2 ldr r0, [r5, r0] mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x63 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, [r4, #8] mov r1, #2 - bl FUN_0200B764 + bl BufferMonthNameAbbr mov r0, #0 str r0, [sp] mov r0, #1 @@ -1083,7 +1083,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 ldr r2, [r4, #0xc] mov r1, #3 mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r2, #6 lsl r2, r2, #6 ldr r0, [r5, r2] @@ -1247,7 +1247,7 @@ _021D7E68: ldr r0, [r5, r0] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r2, #0x63 lsl r2, r2, #2 add r1, r2, #0 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index d526414e..b61bff20 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -45,17 +45,17 @@ MOD71_0222D5C0: ; 0x0222D5C0 mov r0, #0xc mov r1, #0x16 mov r2, #0x1a - bl FUN_0200AA90 + bl ScrStrBufs_new_custom mov r1, #0x5e lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x1a - bl FUN_0200AA80 + bl ScrStrBufs_new mov r1, #0x5f lsl r1, r1, #2 str r0, [r4, r1] mov r0, #0x1a - bl FUN_0200AA80 + bl ScrStrBufs_new mov r2, #6 lsl r2, r2, #6 str r0, [r4, r2] @@ -655,7 +655,7 @@ _0222DB70: add r2, r0, #0 add r0, r7, #0 add r1, r4, r6 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r5, #0 add r4, r4, #1 bl GetPartyCount @@ -1758,15 +1758,15 @@ MOD71_0222E438: ; 0x0222E438 mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x5e lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x63 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -4285,7 +4285,7 @@ _0222F910: ldr r0, _0222F94C ; =0x00003674 mov r1, #0 ldr r0, [r4, r0] - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r4, #0 mov r1, #0x23 bl MOD71_0222F84C @@ -4334,7 +4334,7 @@ _0222F976: ldr r0, _0222FA18 ; =0x00003674 mov r1, #0 ldr r0, [r5, r0] - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r5, #0 mov r1, #0x23 bl MOD71_0222F84C @@ -4361,7 +4361,7 @@ _0222F9A0: mov r1, #0 ldr r0, [r5, r0] add r2, r6, #0 - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r6, #0 bl FreeToHeap add r0, r5, #0 @@ -4509,7 +4509,7 @@ _0222FB08: ldr r0, _0222FB40 ; =0x00003674 mov r1, #0 ldr r0, [r4, r0] - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r4, #0 mov r1, #0x23 bl MOD71_0222F84C @@ -4660,7 +4660,7 @@ _0222FC2C: bl DestroyMsgData ldr r0, _0222FCEC ; =0x00003674 ldr r0, [r6, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0x13 bl FUN_02031588 mov r3, #0x5e @@ -4695,7 +4695,7 @@ _0222FC70: ldr r0, _0222FCEC ; =0x00003674 mov r1, #0 ldr r0, [r6, r0] - bl FUN_0200ABC0 + bl BufferPlayersName add r0, r6, #0 mov r1, #0x21 bl MOD71_0222F84C @@ -4779,7 +4779,7 @@ MOD71_0222FD08: ; 0x0222FD08 pop {r3, r4, pc} _0222FD48: mov r0, #0x1a - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _0222FD88 ; =0x00003674 ldr r2, _0222FD8C ; =0x00000251 str r0, [r4, r1] @@ -4882,7 +4882,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r1, #0 str r1, [sp] mov r0, #0x20 @@ -5701,7 +5701,7 @@ MOD71_022304AC: ; 0x022304AC lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r1, r4, #0 ldr r0, _02230538 ; =0x0000221C add r1, #0x8c @@ -5715,7 +5715,7 @@ MOD71_022304AC: ; 0x022304AC lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r3, #0x5f lsl r3, r3, #2 ldr r0, [r4, r3] @@ -6128,7 +6128,7 @@ MOD71_02230810: ; 0x02230810 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r1, #0 str r1, [sp] mov r0, #0x20 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index efabd4ae..20e8b507 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -2831,7 +2831,7 @@ MOD73_021D8BDC: ; 0x021D8BDC ldr r2, [r5] mov r0, #4 mov r1, #0x40 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom ldr r1, _021D8CE8 ; =0x00001578 str r0, [r5, r1] ldr r1, [r5] @@ -3016,7 +3016,7 @@ _021D8D92: bl String_dtor ldr r0, _021D8DEC ; =0x00001578 ldr r0, [r6, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, _021D8DF0 ; =0x00001574 ldr r0, [r6, r0] bl DestroyMsgData @@ -4904,7 +4904,7 @@ _021D9B02: mov r2, #0x4d lsl r2, r2, #2 ldr r2, [r3, r2] - bl FUN_0200ABC0 + bl BufferPlayersName ldr r2, [r5, #0x18] ldr r0, [r2, #4] ldr r1, [r2, #8] @@ -6246,7 +6246,7 @@ MOD73_021DA550: ; 0x021DA550 ldrb r2, [r2] ldr r0, [r0, #4] mov r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r3, #2 str r3, [sp] mov r1, #1 @@ -6256,7 +6256,7 @@ MOD73_021DA550: ; 0x021DA550 add r2, #0x67 ldrb r2, [r2] ldr r0, [r0, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString mov r1, #2 str r1, [sp] mov r0, #1 @@ -6267,7 +6267,7 @@ MOD73_021DA550: ; 0x021DA550 ldrb r2, [r2] ldr r0, [r0, #4] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [r4, #0x1c] ldr r0, [r2, #4] ldr r1, [r2, #8] @@ -6306,7 +6306,7 @@ MOD73_021DA550: ; 0x021DA550 ldr r0, [r0, #4] ldr r2, [r2, #0x58] mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x24] ldr r0, [r0, #0x58] cmp r0, #1 @@ -6356,7 +6356,7 @@ _021DA61A: ldr r0, [r0, #4] ldr r2, [r2, #0x5c] mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x24] ldr r0, [r0, #0x5c] cmp r0, #1 @@ -6404,7 +6404,7 @@ MOD73_021DA6BC: ; 0x021DA6BC ldrb r2, [r2] ldr r0, [r0, #4] mov r1, #3 - bl FUN_0200B628 + bl BufferPoffinName mov r3, #2 str r3, [sp] mov r1, #1 @@ -6414,7 +6414,7 @@ MOD73_021DA6BC: ; 0x021DA6BC add r2, #0x65 ldrb r2, [r2] ldr r0, [r0, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString mov r1, #2 str r1, [sp] mov r0, #1 @@ -6423,7 +6423,7 @@ MOD73_021DA6BC: ; 0x021DA6BC ldr r2, [r4, #0x20] ldr r0, [r0, #4] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r2, [r4, #0x1c] ldr r0, [r2, #4] ldr r1, [r2, #8] @@ -6523,7 +6523,7 @@ _021DA79E: ldr r0, [r0, #4] ldr r2, [r2, r3] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r2, [r4, #0x1c] ldr r0, [r2, #4] ldr r1, [r2, #8] diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 4f8087ae..4daaf396 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -850,7 +850,7 @@ MOD74_021D7B20: ; 0x021D7B20 ldr r2, [r5] mov r0, #2 mov r1, #0x4c - bl FUN_0200AA90 + bl ScrStrBufs_new_custom str r0, [r5, #0x2c] ldr r1, [r5] mov r0, #0x4c @@ -936,7 +936,7 @@ _021D7BEC: ldr r0, [r6, #0x30] bl String_dtor ldr r0, [r6, #0x2c] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r6, #0x28] bl DestroyMsgData pop {r4, r5, r6, pc} @@ -992,7 +992,7 @@ MOD74_021D7C10: ; 0x021D7C10 mov r1, #0 add r2, r7, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x2c] ldr r1, [r5, #0x30] ldr r2, [r5, #0x5c] @@ -1037,7 +1037,7 @@ MOD74_021D7C10: ; 0x021D7C10 ldr r2, [sp, #0x10] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r5, #0x2c] ldr r1, [r5, #0x30] ldr r2, [r5, #0x5c] @@ -1203,7 +1203,7 @@ _021D7E04: str r0, [sp, #4] ldr r0, [r4, #0x2c] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x60] @@ -1452,7 +1452,7 @@ MOD74_021D8008: ; 0x021D8008 ldrb r2, [r2] ldr r0, [r4, #0x2c] mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #2 str r0, [sp] mov r1, #1 @@ -1461,7 +1461,7 @@ MOD74_021D8008: ; 0x021D8008 ldrb r2, [r2, #1] ldr r0, [r4, #0x2c] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x38] @@ -1562,7 +1562,7 @@ _021D8108: ldr r0, [r4, #0x2c] bne _021D813C mov r1, #0 - bl FUN_0200B4A0 + bl BufferCountryName ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x44] @@ -1582,12 +1582,12 @@ _021D8108: b _021D8172 _021D813C: mov r1, #0 - bl FUN_0200B4A0 + bl BufferCountryName ldrb r2, [r5, #5] ldrb r3, [r5, #6] ldr r0, [r4, #0x2c] mov r1, #1 - bl FUN_0200B4D8 + bl BufferCityName ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x40] diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index c2cbd1be..f6d498ce 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -450,7 +450,7 @@ MOD75_021E6F00: ; 0x021E6F00 mov r0, #0x46 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r4, #0xd4 ldr r0, [r4] bl NARC_dtor @@ -951,7 +951,7 @@ MOD75_021E737C: ; 0x021E737C lsl r1, r1, #4 str r0, [r4, r1] mov r0, #6 - bl FUN_0200AA80 + bl ScrStrBufs_new mov r2, #0x46 lsl r2, r2, #2 str r0, [r4, r2] @@ -4659,7 +4659,7 @@ _021E8FFA: ldr r0, [r4, r0] mov r1, #0 add r2, r5, #0 - bl FUN_0200AD5C + bl BufferMoveName add r0, r5, #0 bl MoveIsHM cmp r0, #1 @@ -4866,13 +4866,13 @@ MOD75_021E91B8: ; 0x021E91B8 ldr r0, [r4, r0] ldr r2, [r2] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName mov r0, #0x46 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #1 add r2, r5, #0 - bl FUN_0200AE38 + bl BufferItemName cmp r5, #0x44 bne _021E9200 mov r0, #0x45 @@ -5435,7 +5435,7 @@ _021E9636: ldrh r2, [r2] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName b _021E967A _021E9664: add r2, r5, #0 @@ -5447,7 +5447,7 @@ _021E9664: ldrh r2, [r2] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AEA8 + bl BufferItemNamePlural _021E967A: mov r0, #0 str r0, [sp] @@ -5459,7 +5459,7 @@ _021E967A: ldrsh r2, [r5, r2] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -5727,7 +5727,7 @@ _021E9872: ldrh r2, [r2] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -5880,7 +5880,7 @@ _021E99C6: ldrh r2, [r2] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName add r0, r5, #0 mov r1, #2 bl MOD75_021EC090 @@ -5976,7 +5976,7 @@ _021E9A6E: ldr r0, [r5, r0] mul r2, r3 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -6120,7 +6120,7 @@ _021E9BAC: ldr r0, [r4, r0] mul r2, r3 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -6215,7 +6215,7 @@ _021E9C80: ldr r0, [r4, r0] mul r2, r3 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -6364,7 +6364,7 @@ _021E9DE6: ldrh r2, [r2] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AEA8 + bl BufferItemNamePlural b _021E9E2A _021E9E14: add r2, r5, #0 @@ -6376,7 +6376,7 @@ _021E9E14: ldrh r2, [r2] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AE38 + bl BufferItemName _021E9E2A: mov r0, #0 str r0, [sp] @@ -6391,7 +6391,7 @@ _021E9E2A: ldr r0, [r5, r0] mul r2, r3 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -8015,7 +8015,7 @@ MOD75_021EAAA8: ; 0x021EAAA8 lsl r0, r0, #2 ldr r0, [r5, r0] add r1, r4, #0 - bl FUN_0200AE38 + bl BufferItemName pop {r3, r4, r5, pc} thumb_func_end MOD75_021EAAA8 @@ -8033,7 +8033,7 @@ MOD75_021EAAC8: ; 0x021EAAC8 lsl r0, r0, #2 ldr r0, [r5, r0] add r1, r4, #0 - bl FUN_0200AEA8 + bl BufferItemNamePlural pop {r3, r4, r5, pc} thumb_func_end MOD75_021EAAC8 @@ -8210,7 +8210,7 @@ MOD75_021EAB44: ; 0x021EAB44 mov r1, #0 add r2, r7, #0 mov r3, #2 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -8265,7 +8265,7 @@ _021EACC6: ldr r0, [r5, r0] add r2, r7, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -8319,7 +8319,7 @@ _021EAD3C: ldr r0, [r5, r0] add r2, r7, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -8446,7 +8446,7 @@ _021EAE2E: ldr r0, [r5, r0] ldr r2, [sp, #0x10] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r2, #1 lsl r0, r0, #2 @@ -9298,7 +9298,7 @@ MOD75_021EB504: ; 0x021EB504 ldr r0, [r5, r0] mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -9412,7 +9412,7 @@ _021EB616: ldrsh r2, [r5, r2] ldr r0, [r5, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -9560,7 +9560,7 @@ _021EB722: ldrsh r2, [r5, r2] ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -9602,7 +9602,7 @@ _021EB722: mul r2, r3 mov r1, #0 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -9707,7 +9707,7 @@ _021EB866: ldr r0, [r5, r0] mov r1, #0 mov r3, #6 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -9799,7 +9799,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 ldr r0, [r5, r0] mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 02dc181f..12b6e9fc 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -519,7 +519,7 @@ MOD76_021D7900: ; 0x021D7900 add r1, #0xf8 str r0, [r1] mov r0, #0x43 - bl FUN_0200AA80 + bl ScrStrBufs_new add r1, r4, #0 add r1, #0xfc str r0, [r1] @@ -545,7 +545,7 @@ MOD76_021D7938: ; 0x021D7938 add r0, r4, #0 add r0, #0xfc ldr r0, [r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #1 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -1090,7 +1090,7 @@ MOD76_021D7D60: ; 0x021D7D60 add r0, #0xfc ldr r0, [r0] add r3, r7, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 mov r1, #1 add r0, #0xfc @@ -1836,7 +1836,7 @@ _021D8382: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname b _021D84D8 _021D839A: bl MOD76_021D8514 @@ -1845,7 +1845,7 @@ _021D839A: add r0, #0xfc ldr r0, [r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName b _021D84D8 _021D83AE: ldr r0, [r4] @@ -1856,7 +1856,7 @@ _021D83AE: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname b _021D84D8 _021D83C6: ldr r0, [r4] @@ -1867,7 +1867,7 @@ _021D83C6: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 bl MOD76_021D8514 add r2, r0, #0 @@ -1875,7 +1875,7 @@ _021D83C6: add r0, #0xfc ldr r0, [r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName b _021D84D8 _021D83F2: ldr r0, [r4] @@ -1886,7 +1886,7 @@ _021D83F2: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 bl MOD76_021D8514 add r2, r0, #0 @@ -1894,7 +1894,7 @@ _021D83F2: add r0, #0xfc ldr r0, [r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName b _021D84D8 _021D841E: ldr r0, [r4] @@ -1905,7 +1905,7 @@ _021D841E: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 bl MOD76_021D8524 add r2, r0, #0 @@ -1913,7 +1913,7 @@ _021D841E: add r0, #0xfc ldr r0, [r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName b _021D84D8 _021D844A: ldr r0, [r4] @@ -1924,7 +1924,7 @@ _021D844A: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 bl MOD76_021D8514 add r2, r0, #0 @@ -1932,7 +1932,7 @@ _021D844A: add r0, #0xfc ldr r0, [r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName b _021D84D8 _021D8476: bl MOD76_021D8514 @@ -1941,7 +1941,7 @@ _021D8476: add r0, #0xfc ldr r0, [r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName b _021D84D8 _021D848A: ldr r0, [r4] @@ -1952,7 +1952,7 @@ _021D848A: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname add r0, r4, #0 bl MOD76_021D8514 add r2, r0, #0 @@ -1960,7 +1960,7 @@ _021D848A: add r0, #0xfc ldr r0, [r0] mov r1, #1 - bl FUN_0200AD5C + bl BufferMoveName b _021D84D8 _021D84B6: ldr r2, [r4] @@ -1968,7 +1968,7 @@ _021D84B6: ldr r0, [r0] ldr r2, [r2, #4] mov r1, #2 - bl FUN_0200ABC0 + bl BufferPlayersName b _021D84D8 _021D84C6: bl MOD76_021D8524 @@ -1977,7 +1977,7 @@ _021D84C6: add r0, #0xfc ldr r0, [r0] mov r1, #0 - bl FUN_0200AD5C + bl BufferMoveName _021D84D8: ldr r1, [r4] add r0, r4, #0 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index cdfde984..1c074133 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -84,7 +84,7 @@ _021D7540: ldr r2, [r5] mov r0, #8 mov r1, #0x40 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom ldr r1, _021D75F8 ; =0x0000C070 str r0, [r5, r1] ldr r0, [r5] @@ -820,7 +820,7 @@ MOD77_021D7BAC: ; 0x021D7BAC bl FUN_0201EB70 ldr r0, _021D7C18 ; =0x0000C070 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete bl FUN_0201B398 ldr r0, _021D7C1C ; =0x0000C010 ldr r0, [r4, r0] @@ -1990,7 +1990,7 @@ MOD77_021D8510: ; 0x021D8510 ldr r0, [r5, r0] ldr r2, [r5, r2] mov r1, #0 - bl FUN_0200B4A0 + bl BufferCountryName ldr r3, _021D85D8 ; =0x0000C314 ldr r0, _021D85D4 ; =0x0000C070 ldr r2, [r5, r3] @@ -1998,7 +1998,7 @@ MOD77_021D8510: ; 0x021D8510 ldr r0, [r5, r0] ldr r3, [r5, r3] mov r1, #1 - bl FUN_0200B4D8 + bl BufferCityName ldr r0, _021D85DC ; =0x0000C060 mov r1, #0xd ldr r0, [r5, r0] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index b1e3f871..ca96ae65 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1417,7 +1417,7 @@ _0222DFE4: mov r0, #0xb mov r1, #0x40 mov r2, #0x3e - bl FUN_0200AA90 + bl ScrStrBufs_new_custom mov r1, #0xb3 lsl r1, r1, #4 str r0, [r4, r1] @@ -1675,7 +1675,7 @@ MOD80_0222E25C: ; 0x0222E25C mov r0, #0xb3 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0 bl MOD80_0222E398 bl FUN_0202E4F0 @@ -4789,7 +4789,7 @@ MOD80_0222FB3C: ; 0x0222FB3C lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200AC60 + bl BufferBoxMonSpeciesName ldr r0, _0222FBB4 ; =0x00000B34 add r1, r6, #0 ldr r0, [r5, r0] @@ -4889,7 +4889,7 @@ MOD80_0222FBC0: ; 0x0222FBC0 add r0, r7, #0 add r2, r4, #0 add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r7, #0 add r1, r5, #0 mov r2, #0x66 @@ -5633,7 +5633,7 @@ MOD80_0223022C: ; 0x0223022C lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #8 - bl FUN_0200B4A0 + bl BufferCountryName _02230268: ldr r2, _022302B8 ; =0x0000011F ldrb r3, [r4, r2] @@ -5645,7 +5645,7 @@ _02230268: ldrb r2, [r4, r2] ldr r0, [r5, r0] mov r1, #9 - bl FUN_0200B4D8 + bl BufferCityName _02230280: mov r1, #0xb3 lsl r1, r1, #4 @@ -9485,7 +9485,7 @@ _022321B8: lsl r0, r0, #4 ldr r0, [r5, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, _02232378 ; =0x00000F0F mov r3, #0 str r0, [sp] @@ -9622,7 +9622,7 @@ _022322BC: ldr r0, [r5, r0] mov r1, #0 add r2, r4, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, _02232378 ; =0x00000F0F mov r3, #0 str r0, [sp] @@ -13395,7 +13395,7 @@ MOD80_022340DC: ; 0x022340DC ldr r2, [sp, #0x10] add r0, r5, #0 add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 add r1, r4, #0 mov r2, #0x66 @@ -15256,7 +15256,7 @@ _02234F38: lsl r0, r0, #4 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #2 str r0, [r4, #0x28] mov r0, #0x22 @@ -15302,7 +15302,7 @@ _02234FA4: lsl r0, r0, #4 ldr r0, [r4, r0] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname mov r0, #3 str r0, [r4, #0x28] mov r0, #0x22 @@ -19256,7 +19256,7 @@ _02236E16: ldr r0, [r5, r0] mov r1, #0 mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02236E44 ; =0x00000E98 mov r1, #1 add r0, r5, r0 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index d972789e..3db42aa1 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -55,7 +55,7 @@ _02237E84: bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x39 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0xc] ldr r2, [r4] ldr r0, [r2, #0x10] @@ -70,17 +70,17 @@ _02237ECC: ldr r0, [r4, #0xc] ldr r2, [r2] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r2, [r4] ldr r0, [r4, #0xc] ldr r2, [r2, #4] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r2, [r4] ldr r0, [r4, #0xc] ldr r2, [r2, #8] mov r1, #2 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r4] ldr r0, [r0, #4] bl MOD81_02237FE8 @@ -92,13 +92,13 @@ _02237EFE: ldr r0, [r4, #0xc] ldr r2, [r2] mov r1, #0 - bl FUN_0200ACF8 + bl BufferBoxMonNickname b _02237F22 _02237F0A: ldr r0, [r4, #0xc] ldr r2, [r2, #4] mov r1, #1 - bl FUN_0200ACF8 + bl BufferBoxMonNickname ldr r0, [r4] ldr r0, [r0, #4] bl MOD81_02237FE8 @@ -224,7 +224,7 @@ MOD81_02238004: ; 0x02238004 bl FUN_0200CAB4 bl FUN_02033ED0 ldr r0, [r4, #0xc] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0x14] diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 07328905..4e09a3ed 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -667,7 +667,7 @@ _0222DA48: mov r0, #0xb mov r1, #0x20 mov r2, #0x44 - bl FUN_0200AA90 + bl ScrStrBufs_new_custom ldr r1, _0222DB64 ; =0x00000B78 ldr r2, _0222DB68 ; =0x0000024E str r0, [r4, r1] @@ -875,7 +875,7 @@ MOD82_0222DC50: ; 0x0222DC50 bl DestroyMsgData ldr r0, _0222DCC0 ; =0x00000B78 ldr r0, [r4, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r4, #0 bl MOD82_0222DD20 bl FUN_0202E4F0 @@ -2679,7 +2679,7 @@ MOD82_0222EAA4: ; 0x0222EAA4 ldr r0, [r4, r0] mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r3, #2 str r3, [sp] mov r1, #1 @@ -2687,7 +2687,7 @@ MOD82_0222EAA4: ; 0x0222EAA4 ldr r0, _0222EB00 ; =0x00000B78 ldr r2, [r4, #0x3c] ldr r0, [r4, r0] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0222EB04 ; =0x00000F0F mov r2, #1 str r0, [sp] @@ -3397,7 +3397,7 @@ MOD82_0222F048: ; 0x0222F048 ldr r0, [r4, r0] mov r1, #0 mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r3, #2 str r3, [sp] mov r1, #1 @@ -3405,7 +3405,7 @@ MOD82_0222F048: ; 0x0222F048 ldr r0, _0222F09C ; =0x00000B78 ldr r2, [r4, #0x3c] ldr r0, [r4, r0] - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _0222F0A0 ; =0x00000F0F mov r2, #1 str r0, [sp] @@ -4427,7 +4427,7 @@ _0222F7D2: mov r1, #0 ldr r0, [r5, r0] mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x36 lsl r0, r0, #6 add r0, r5, r0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 2ec14d72..d16c0493 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -952,7 +952,7 @@ _0222DD12: mov r1, #1 str r1, [sp, #4] mov r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #8 pop {r3, pc} .align 2, 0 @@ -973,7 +973,7 @@ MOD83_0222DD24: ; 0x0222DD24 bl NewMsgDataFromNarc str r0, [sp, #0x24] mov r0, #0x51 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [sp, #0x28] ldr r0, [sp, #0x10] ldr r0, [r0, #0xc] @@ -1041,7 +1041,7 @@ _0222DDB8: ldr r0, [sp, #0x28] ldr r2, [r2, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName mov r0, #0x10 str r0, [sp] str r0, [sp, #4] @@ -1066,7 +1066,7 @@ _0222DDB8: str r3, [sp] mov r1, #1 str r1, [sp, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x11 str r0, [sp] mov r0, #0x20 @@ -1084,7 +1084,7 @@ _0222DDB8: str r3, [sp, #4] ldr r0, [sp, #0x28] ldr r2, [r2, #0x50] - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x13 str r0, [sp] mov r0, #0x30 @@ -1138,7 +1138,7 @@ _0222DE76: add r0, #0xcc str r2, [r0] ldr r0, [sp, #0x28] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [sp, #0x24] bl DestroyMsgData mov r0, #1 @@ -2871,7 +2871,7 @@ MOD83_0222EC78: ; 0x0222EC78 sub sp, #0x20 add r5, r0, #0 ldr r0, [r5] - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, r0, #0 mov r0, #1 str r0, [sp] @@ -2902,7 +2902,7 @@ MOD83_0222EC78: ; 0x0222EC78 ldr r2, [r5, #0x10] add r0, r4, #0 mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x10] bl PlayerProfile_GetTrainerID_VisibleHalf add r2, r0, #0 @@ -2912,7 +2912,7 @@ MOD83_0222EC78: ; 0x0222EC78 add r0, r4, #0 mov r3, #5 str r1, [sp, #4] - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x42 str r0, [sp] add r1, r5, #0 @@ -2957,7 +2957,7 @@ MOD83_0222EC78: ; 0x0222EC78 add r0, r4, #0 mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #2 str r0, [sp] mov r1, #1 @@ -2965,7 +2965,7 @@ MOD83_0222EC78: ; 0x0222EC78 ldr r2, [sp, #0x18] add r0, r4, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString add r0, r5, #0 mov r1, #1 add r0, #0xfc @@ -2979,7 +2979,7 @@ MOD83_0222EC78: ; 0x0222EC78 add r3, r2, #0 bl MOD83_02238A38 add r0, r4, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x20 pop {r3, r4, r5, pc} nop @@ -3347,7 +3347,7 @@ MOD83_0222F074: ; 0x0222F074 bl NewMsgDataFromNarc add r6, r0, #0 ldr r0, [r5] - bl FUN_0200AA80 + bl ScrStrBufs_new mov r1, #0xc6 mov r2, #7 lsl r1, r1, #6 @@ -3443,7 +3443,7 @@ MOD83_0222F074: ; 0x0222F074 lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [sp] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0 bl DestroyMsgData ldr r0, _0222F1A8 ; =0x00003174 @@ -5986,7 +5986,7 @@ MOD83_0223050C: ; 0x0223050C bl NewMsgDataFromNarc str r0, [r4, #0x10] mov r0, #0x56 - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0xc] mov r0, #1 mov r1, #6 @@ -6030,7 +6030,7 @@ _0223057A: ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0xc] - bl FUN_0200AB18 + bl ScrStrBufs_delete mov r0, #0xff str r0, [r4, #0x68] add sp, #0x10 @@ -6311,7 +6311,7 @@ _022307C8: mov r1, #0 bl FUN_02018744 mov r0, #0x56 - bl FUN_0200AA80 + bl ScrStrBufs_new mov r1, #2 str r1, [sp] mov r1, #1 @@ -6321,7 +6321,7 @@ _022307C8: ldr r2, [r5, r2] mov r3, #5 add r6, r0, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #0x1f ldr r1, _02230844 ; =0x00002624 str r0, [sp] @@ -6349,7 +6349,7 @@ _022307C8: add r3, r2, #0 bl MOD83_02238A38 add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x5c pop {r3, r4, r5, r6, pc} nop @@ -6426,7 +6426,7 @@ MOD83_0223089C: ; 0x0223089C bl NewMsgDataFromNarc add r7, r0, #0 mov r0, #0x56 - bl FUN_0200AA80 + bl ScrStrBufs_new add r1, r7, #0 add r2, r5, #0 mov r3, #0x56 @@ -6442,7 +6442,7 @@ MOD83_0223089C: ; 0x0223089C ldr r0, [sp, #4] str r0, [r4, #0x74] ldr r0, [sp, #8] - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r7, #0 bl DestroyMsgData b _02230918 @@ -8231,7 +8231,7 @@ MOD83_022317A8: ; 0x022317A8 bl NewMsgDataFromNarc add r4, r0, #0 mov r0, #0x57 - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0 mov r0, #1 mov r1, #6 @@ -8263,7 +8263,7 @@ MOD83_022317A8: ; 0x022317A8 add r0, r4, #0 bl DestroyMsgData add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -8670,12 +8670,12 @@ MOD83_02231B1C: ; 0x02231B1C ldr r0, [r4, r0] mov r1, #0 mov r3, #4 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r0, _02231B80 ; =0x000029A0 ldr r2, [sp, #0xc] ldr r0, [r4, r0] mov r1, #1 - bl FUN_0200B764 + bl BufferMonthNameAbbr mov r1, #2 str r1, [sp] mov r0, #1 @@ -8684,7 +8684,7 @@ MOD83_02231B1C: ; 0x02231B1C ldr r2, [sp, #0x10] ldr r0, [r4, r0] add r3, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #1 add sp, #0x18 pop {r4, pc} @@ -8785,7 +8785,7 @@ _02231C2C: ldr r0, _02231C54 ; =0x000029A0 ldr r0, [r3, r0] mov r3, #3 - bl FUN_0200AD38 + bl BufferIntegerAsString add sp, #0x10 mov r0, #1 pop {r4, r5, r6, pc} @@ -8975,7 +8975,7 @@ MOD83_02231D9C: ; 0x02231D9C ldr r0, [r0, r1] mov r1, #0 add r2, r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString mov r0, #1 add sp, #8 pop {r3, pc} @@ -9028,7 +9028,7 @@ MOD83_02231DF0: ; 0x02231DF0 ldr r1, _02231F70 ; =0x000029A4 str r0, [r5, r1] ldr r0, [r5] - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _02231F74 ; =0x000029A0 str r0, [r5, r1] ldr r1, _02231F78 ; =0x00002B64 @@ -9186,7 +9186,7 @@ _02231F2E: bl DestroyMsgData ldr r0, _02231F74 ; =0x000029A0 ldr r0, [r5, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [sp, #0x14] cmp r0, #0 bne _02231F64 @@ -9261,7 +9261,7 @@ _02231FD2: ldr r1, _02232090 ; =0x000029A4 str r0, [r5, r1] mov r0, #0x57 - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _02232094 ; =0x000029A0 str r0, [r5, r1] _02231FFE: @@ -9302,7 +9302,7 @@ _02231FFE: bl DestroyMsgData ldr r0, _02232094 ; =0x000029A0 ldr r0, [r5, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete _02232054: ldr r0, _022320A0 ; =0x00002B70 add r0, r5, r0 @@ -11077,7 +11077,7 @@ _02232E7E: bl MOD83_02232DB4 str r0, [sp, #0x34] mov r0, #0x57 - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, r0, #0 ldr r2, _02232FD8 ; =0x00000172 mov r0, #1 @@ -11104,7 +11104,7 @@ _02232EE6: add r0, r4, #0 mov r1, #0 add r2, r7, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r1, [sp, #0x1c] add r0, r4, #0 mov r2, #0x35 @@ -11156,7 +11156,7 @@ _02232F4A: mov r1, #0 lsr r2, r2, #0x10 mov r3, #5 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r1, [sp, #0x1c] add r0, r4, #0 mov r2, #0x36 @@ -11196,7 +11196,7 @@ _02232FB8: ldr r0, [sp, #0x1c] bl DestroyMsgData add r0, r4, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r6, #0 add sp, #0x48 pop {r3, r4, r5, r6, r7, pc} @@ -11225,7 +11225,7 @@ MOD83_02232FE4: ; 0x02232FE4 ldr r1, _02233078 ; =0x000029A4 str r0, [r5, r1] mov r0, #0x57 - bl FUN_0200AA80 + bl ScrStrBufs_new ldr r1, _0223307C ; =0x000029A0 str r0, [r5, r1] add r0, r4, #0 @@ -11239,7 +11239,7 @@ MOD83_02232FE4: ; 0x02232FE4 ldr r0, [r5, r0] ldr r2, [r5, r2] mov r1, #0 - bl FUN_0200AD38 + bl BufferIntegerAsString ldr r1, _0223307C ; =0x000029A0 mov r2, #0x38 ldr r0, [r5, r1] @@ -11268,7 +11268,7 @@ MOD83_02232FE4: ; 0x02232FE4 bl DestroyMsgData ldr r0, _0223307C ; =0x000029A0 ldr r0, [r5, r0] - bl FUN_0200AB18 + bl ScrStrBufs_delete add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -15528,7 +15528,7 @@ _02234F8C: cmp r7, #0 bne _02234FB2 mov r0, #0x4e - bl FUN_0200AA80 + bl ScrStrBufs_new add r7, r0, #0 _02234FB2: ldr r1, [sp, #0x14] @@ -15560,7 +15560,7 @@ _02234FB2: cmp r0, #0 bne _02234FF8 add r0, r7, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete _02234FF8: ldr r0, [sp, #0x14] bl DestroyMsgData @@ -18158,7 +18158,7 @@ MOD83_02236484: ; 0x02236484 mov r2, #8 bl FUN_02015D88 mov r0, #0x4e - bl FUN_0200AA80 + bl ScrStrBufs_new add r4, r0, #0 mov r0, #8 mov r1, #0x4e @@ -18173,7 +18173,7 @@ MOD83_02236484: ; 0x02236484 add r0, r4, #0 add r2, r6, #0 mov r3, #0 - bl FUN_0200ABB4 + bl BufferString add r0, r5, #0 bl MOD83_0223600C ldr r0, [r5] @@ -18194,7 +18194,7 @@ MOD83_02236484: ; 0x02236484 add r0, r6, #0 bl String_dtor add r0, r4, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete add r0, r5, #0 bl MOD83_02236450 add sp, #0x18 @@ -23101,7 +23101,7 @@ _02238976: cmp r6, #0 bne _0223899C ldr r0, [r4, #4] - bl FUN_0200AA80 + bl ScrStrBufs_new add r6, r0, #0 _0223899C: ldr r1, [sp, #0x10] @@ -23165,7 +23165,7 @@ _02238A12: cmp r0, #0 bne _02238A24 add r0, r6, #0 - bl FUN_0200AB18 + bl ScrStrBufs_delete _02238A24: ldr r0, [sp, #0x10] bl DestroyMsgData diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index d9175392..2fe33d18 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -783,7 +783,7 @@ MOD85_021D7B28: ; 0x021D7B28 ldr r1, _021D7BA4 ; =0x00000408 str r0, [r5, r1] mov r0, #0x4f - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #4] ldr r0, _021D7BB0 ; =0x0000043C add r1, r4, #0 @@ -822,7 +822,7 @@ MOD85_021D7BB8: ; 0x021D7BB8 ldr r0, [r5, r0] bl DestroyMsgData ldr r0, [r4, #4] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x18] bl String_dtor pop {r4, r5, r6, pc} diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index aae7de3c..e3a93e0f 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -484,7 +484,7 @@ MOD86_021D78D4: ; 0x021D78D4 bl NewMsgDataFromNarc str r0, [r4, #0x34] ldr r0, [r4] - bl FUN_0200AA80 + bl ScrStrBufs_new str r0, [r4, #0x38] mov r1, #0 add r0, sp, #8 @@ -540,7 +540,7 @@ MOD86_021D7964: ; 0x021D7964 add r0, #0x14 bl FUN_02019178 ldr r0, [r4, #0x38] - bl FUN_0200AB18 + bl ScrStrBufs_delete ldr r0, [r4, #0x34] bl DestroyMsgData pop {r4, pc} @@ -812,7 +812,7 @@ MOD86_021D7B80: ; 0x021D7B80 ldr r0, [r5, #0x38] ldr r2, [r5, #0xc] mov r1, #0 - bl FUN_0200ABC0 + bl BufferPlayersName ldr r0, [r5, #0x38] add r1, r4, #0 add r2, r6, #0 |