From e078b812cc48a82e75951f4564946154689c2c4b Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 13 Dec 2023 11:21:31 -0600 Subject: [PATCH 1/8] Decompile text printer code --- asm/text.s | 784 --------------------------------------- include/font_types_def.h | 22 +- include/text.h | 19 +- include/unk_0200E320.h | 1 + main.lsf | 2 +- src/text.c | 410 ++++++++++++++++++++ 6 files changed, 434 insertions(+), 804 deletions(-) delete mode 100644 asm/text.s create mode 100644 src/text.c diff --git a/asm/text.s b/asm/text.s deleted file mode 100644 index 6edbc28dd..000000000 --- a/asm/text.s +++ /dev/null @@ -1,784 +0,0 @@ - .include "asm/macros.inc" - .include "text.inc" - .include "global.inc" - - .data - - .public _0210F6D8 -_0210F6D8: - .byte 0x00, 0x00, 0x00, 0x00 - - .bss - -_021D1F6C: - .space 0x8 - -_021D1F74: - .space 0x20 - -_021D1F94: - .space 0x200 - - .text - - thumb_func_start sub_0201FFE0 -sub_0201FFE0: ; 0x0201FFE0 - ldr r1, _0201FFE8 ; =_0210F6D8 - str r0, [r1] - bx lr - nop -_0201FFE8: .word _0210F6D8 - thumb_func_end sub_0201FFE0 - - thumb_func_start sub_0201FFEC -sub_0201FFEC: ; 0x0201FFEC - push {r4, r5, r6, lr} - ldr r4, _0202001C ; =_021D1F74 - mov r5, #0 -_0201FFF2: - ldr r3, [r4] - cmp r3, #0 - bne _0202000C - ldr r6, _0202001C ; =_021D1F74 - lsl r4, r5, #2 - bl sub_0200E358 - str r0, [r6, r4] - ldr r0, [r6, r4] - cmp r0, #0 - bne _02020014 - mov r5, #8 - b _02020014 -_0202000C: - add r5, r5, #1 - add r4, r4, #4 - cmp r5, #8 - blt _0201FFF2 -_02020014: - lsl r0, r5, #0x18 - lsr r0, r0, #0x18 - pop {r4, r5, r6, pc} - nop -_0202001C: .word _021D1F74 - thumb_func_end sub_0201FFEC - - thumb_func_start sub_02020020 -sub_02020020: ; 0x02020020 - push {r4, r5, r6, lr} - add r5, r0, #0 - cmp r5, #8 - blo _0202002C - bl GF_AssertFail -_0202002C: - ldr r6, _02020064 ; =_021D1F74 - lsl r4, r5, #2 - ldr r0, [r6, r4] - cmp r0, #0 - bne _0202003A - bl GF_AssertFail -_0202003A: - cmp r5, #8 - bhs _02020060 - ldr r0, [r6, r4] - cmp r0, #0 - beq _02020060 - bl sub_0201F988 - add r5, r0, #0 - beq _02020056 - bl sub_02020548 - add r0, r5, #0 - bl FreeToHeap -_02020056: - ldr r0, [r6, r4] - bl DestroySysTask - mov r0, #0 - str r0, [r6, r4] -_02020060: - pop {r4, r5, r6, pc} - nop -_02020064: .word _021D1F74 - thumb_func_end sub_02020020 - - thumb_func_start sub_02020068 -sub_02020068: ; 0x02020068 - lsl r1, r0, #2 - ldr r0, _0202007C ; =_021D1F74 - ldr r0, [r0, r1] - cmp r0, #0 - beq _02020076 - mov r0, #1 - bx lr -_02020076: - mov r0, #0 - bx lr - nop -_0202007C: .word _021D1F74 - thumb_func_end sub_02020068 - - thumb_func_start ResetAllTextPrinters -ResetAllTextPrinters: ; 0x02020080 - mov r1, #0 - ldr r2, _02020090 ; =_021D1F74 - add r0, r1, #0 -_02020086: - add r1, r1, #1 - stmia r2!, {r0} - cmp r1, #8 - blt _02020086 - bx lr - .balign 4, 0 -_02020090: .word _021D1F74 - thumb_func_end ResetAllTextPrinters - - thumb_func_start TextPrinterCheckActive -TextPrinterCheckActive: ; 0x02020094 - push {r3, lr} - bl sub_02020068 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - pop {r3, pc} - thumb_func_end TextPrinterCheckActive - - thumb_func_start sub_020200A0 -sub_020200A0: ; 0x020200A0 - ldr r3, _020200A4 ; =sub_02020020 - bx r3 - .balign 4, 0 -_020200A4: .word sub_02020020 - thumb_func_end sub_020200A0 - - thumb_func_start AddTextPrinterParameterized -AddTextPrinterParameterized: ; 0x020200A8 - push {lr} - sub sp, #0x1c - str r2, [sp] - str r0, [sp, #4] - add r2, sp, #0 - strb r1, [r2, #9] - ldr r0, [sp, #0x20] - strb r3, [r2, #0xa] - strb r0, [r2, #0xb] - strh r3, [r2, #0xc] - strh r0, [r2, #0xe] - ldr r0, _020200F8 ; =_0210F6D8 - lsl r1, r1, #3 - ldr r0, [r0] - add r1, r0, r1 - ldrb r0, [r1, #2] - strh r0, [r2, #0x10] - ldrb r0, [r1, #3] - strh r0, [r2, #0x12] - ldrb r0, [r1, #4] - strb r0, [r2, #0x14] - ldrb r0, [r1, #5] - strb r0, [r2, #0x15] - ldrb r0, [r1, #6] - strb r0, [r2, #0x16] - ldrb r0, [r1, #7] - ldr r1, [sp, #0x24] - strb r0, [r2, #0x17] - mov r0, #0 - strh r0, [r2, #0x18] - strb r0, [r2, #0x1a] - mov r0, #0xff - strb r0, [r2, #0x1b] - ldr r2, [sp, #0x28] - add r0, sp, #0 - bl AddTextPrinter - add sp, #0x1c - pop {pc} - nop -_020200F8: .word _0210F6D8 - thumb_func_end AddTextPrinterParameterized - - thumb_func_start AddTextPrinterParameterized2 -AddTextPrinterParameterized2: ; 0x020200FC - push {lr} - sub sp, #0x1c - str r2, [sp] - str r0, [sp, #4] - add r2, sp, #0 - strb r1, [r2, #9] - ldr r0, [sp, #0x20] - strb r3, [r2, #0xa] - strb r0, [r2, #0xb] - strh r3, [r2, #0xc] - strh r0, [r2, #0xe] - ldr r0, _0202014C ; =_0210F6D8 - lsl r1, r1, #3 - ldr r0, [r0] - add r1, r0, r1 - ldrb r0, [r1, #2] - strh r0, [r2, #0x10] - ldrb r0, [r1, #3] - strh r0, [r2, #0x12] - ldrb r0, [r1, #4] - ldr r1, [sp, #0x28] - strb r0, [r2, #0x14] - lsr r0, r1, #0x10 - strb r0, [r2, #0x15] - lsr r0, r1, #8 - strb r0, [r2, #0x17] - strb r1, [r2, #0x16] - mov r0, #0 - strh r0, [r2, #0x18] - strb r0, [r2, #0x1a] - mov r0, #0xff - strb r0, [r2, #0x1b] - ldr r1, [sp, #0x24] - ldr r2, [sp, #0x2c] - add r0, sp, #0 - bl AddTextPrinter - add sp, #0x1c - pop {pc} - nop -_0202014C: .word _0210F6D8 - thumb_func_end AddTextPrinterParameterized2 - - thumb_func_start AddTextPrinterParameterized3 -AddTextPrinterParameterized3: ; 0x02020150 - push {lr} - sub sp, #0x1c - str r2, [sp] - str r0, [sp, #4] - add r2, sp, #0 - strb r1, [r2, #9] - ldr r0, [sp, #0x20] - strb r3, [r2, #0xa] - strb r0, [r2, #0xb] - strh r3, [r2, #0xc] - strh r0, [r2, #0xe] - ldr r0, [sp, #0x2c] - strh r0, [r2, #0x10] - ldr r0, [sp, #0x30] - strh r0, [r2, #0x12] - ldr r0, _020201A0 ; =_0210F6D8 - ldr r3, [r0] - lsl r0, r1, #3 - add r0, r3, r0 - ldrb r0, [r0, #4] - ldr r1, [sp, #0x28] - strb r0, [r2, #0x14] - lsr r0, r1, #0x10 - strb r0, [r2, #0x15] - lsr r0, r1, #8 - strb r0, [r2, #0x17] - strb r1, [r2, #0x16] - mov r0, #0 - strh r0, [r2, #0x18] - strb r0, [r2, #0x1a] - mov r0, #0xff - strb r0, [r2, #0x1b] - ldr r1, [sp, #0x24] - ldr r2, [sp, #0x34] - add r0, sp, #0 - bl AddTextPrinter - add sp, #0x1c - pop {pc} - nop -_020201A0: .word _0210F6D8 - thumb_func_end AddTextPrinterParameterized3 - - thumb_func_start AddTextPrinter -AddTextPrinter: ; 0x020201A4 - push {r3, r4, r5, r6, r7, lr} - add r7, r0, #0 - ldr r0, _020202E0 ; =_0210F6D8 - add r6, r1, #0 - ldr r0, [r0] - add r5, r2, #0 - cmp r0, #0 - bne _020201B8 - mov r0, #0xff - pop {r3, r4, r5, r6, r7, pc} -_020201B8: - mov r0, #0 - mov r1, #0x34 - bl AllocFromHeap - add r4, r0, #0 - mov r1, #1 - add r0, #0x27 - strb r1, [r0] - add r0, r4, #0 - mov r3, #0 - add r0, #0x28 - strb r3, [r0] - add r0, r4, #0 - add r0, #0x29 - ldrb r2, [r0] - mov r0, #0x7f - bic r2, r0 - lsl r0, r6, #0x18 - lsr r1, r0, #0x18 - mov r0, #0x7f - and r0, r1 - add r1, r2, #0 - orr r1, r0 - add r0, r4, #0 - add r0, #0x29 - strb r1, [r0] - add r0, r4, #0 - add r0, #0x2a - strb r3, [r0] - add r0, r4, #0 - add r0, #0x2b - strb r3, [r0] - add r0, r4, #0 - add r0, #0x2d - strb r3, [r0] - add r1, r3, #0 -_02020200: - add r0, r4, r3 - add r0, #0x20 - add r3, r3, #1 - strb r1, [r0] - cmp r3, #7 - blt _02020200 - add r3, r7, #0 - ldmia r3!, {r0, r1} - add r2, r4, #0 - stmia r2!, {r0, r1} - ldmia r3!, {r0, r1} - stmia r2!, {r0, r1} - ldmia r3!, {r0, r1} - stmia r2!, {r0, r1} - ldr r0, [r3] - str r0, [r2] - ldr r0, [r4] - bl String_cstr - str r0, [r4] - ldr r0, _020202E4 ; =_021D1F6C - str r5, [r4, #0x1c] - mov r1, #0 - strb r1, [r0] - add r0, r4, #0 - bl sub_020204B8 - cmp r6, #0xff - beq _02020286 - cmp r6, #0 - beq _02020286 - add r0, r4, #0 - add r0, #0x29 - ldrb r2, [r0] - mov r1, #0x7f - add r0, r2, #0 - bic r0, r1 - lsl r1, r2, #0x19 - lsr r1, r1, #0x19 - add r1, #0xff - lsl r1, r1, #0x18 - lsr r2, r1, #0x18 - mov r1, #0x7f - and r1, r2 - orr r1, r0 - add r0, r4, #0 - add r0, #0x29 - strb r1, [r0] - add r0, r4, #0 - add r0, #0x29 - ldrb r1, [r0] - mov r0, #0x80 - mov r2, #1 - orr r1, r0 - add r0, r4, #0 - add r0, #0x29 - strb r1, [r0] - ldr r0, _020202E8 ; =sub_020202EC - add r1, r4, #0 - bl sub_0201FFEC - add r1, r4, #0 - add r1, #0x2c - strb r0, [r1] - add r4, #0x2c - ldrb r0, [r4] - pop {r3, r4, r5, r6, r7, pc} -_02020286: - add r0, r4, #0 - add r0, #0x29 - ldrb r1, [r0] - mov r0, #0x7f - mov r5, #0 - bic r1, r0 - add r0, r4, #0 - add r0, #0x29 - strb r1, [r0] - add r0, r4, #0 - add r0, #0x29 - ldrb r1, [r0] - mov r0, #0x80 - bic r1, r0 - add r0, r4, #0 - add r0, #0x29 - strb r1, [r0] - ldrb r0, [r7, #0x15] - ldrb r1, [r7, #0x16] - ldrb r2, [r7, #0x17] - bl sub_0202036C - mov r7, #1 - lsl r7, r7, #0xa -_020202B6: - add r0, r4, #0 - bl sub_02020358 - cmp r0, #1 - beq _020202C6 - add r5, r5, #1 - cmp r5, r7 - blo _020202B6 -_020202C6: - cmp r6, #0xff - beq _020202D0 - ldr r0, [r4, #4] - bl CopyWindowToVram -_020202D0: - add r0, r4, #0 - bl sub_02020548 - add r0, r4, #0 - bl FreeToHeap - mov r0, #8 - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_020202E0: .word _0210F6D8 -_020202E4: .word _021D1F6C -_020202E8: .word sub_020202EC - thumb_func_end AddTextPrinter - - thumb_func_start sub_020202EC -sub_020202EC: ; 0x020202EC - push {r4, lr} - ldr r0, _02020354 ; =_021D1F6C - add r4, r1, #0 - ldrb r0, [r0] - cmp r0, #0 - bne _02020352 - add r0, r4, #0 - add r0, #0x2d - ldrb r0, [r0] - cmp r0, #0 - bne _02020346 - mov r0, #0 - strh r0, [r4, #0x2e] - ldrb r0, [r4, #0x15] - ldrb r1, [r4, #0x16] - ldrb r2, [r4, #0x17] - bl sub_0202036C - add r0, r4, #0 - bl sub_02020358 - cmp r0, #0 - beq _02020324 - cmp r0, #1 - beq _0202033C - cmp r0, #3 - beq _0202032A - pop {r4, pc} -_02020324: - ldr r0, [r4, #4] - bl CopyWindowToVram -_0202032A: - ldr r2, [r4, #0x1c] - cmp r2, #0 - beq _02020352 - ldrh r1, [r4, #0x2e] - add r0, r4, #0 - blx r2 - add r4, #0x2d - strb r0, [r4] - pop {r4, pc} -_0202033C: - add r4, #0x2c - ldrb r0, [r4] - bl sub_02020020 - pop {r4, pc} -_02020346: - ldrh r1, [r4, #0x2e] - ldr r2, [r4, #0x1c] - add r0, r4, #0 - blx r2 - add r4, #0x2d - strb r0, [r4] -_02020352: - pop {r4, pc} - .balign 4, 0 -_02020354: .word _021D1F6C - thumb_func_end sub_020202EC - - thumb_func_start sub_02020358 -sub_02020358: ; 0x02020358 - push {r4, lr} - add r4, r0, #0 -_0202035C: - ldrb r0, [r4, #9] - add r1, r4, #0 - bl FontID_RenderText - cmp r0, #2 - beq _0202035C - pop {r4, pc} - .balign 4, 0 - thumb_func_end sub_02020358 - - thumb_func_start sub_0202036C -sub_0202036C: ; 0x0202036C - push {r3, r4, r5, r6, r7, lr} - sub sp, #0x30 - ldr r3, _02020408 ; =_021D1F6C - mov r5, #0 - str r5, [sp, #0x20] - str r0, [sp, #0x24] - str r2, [sp, #0x28] - str r1, [sp, #0x2c] - strh r1, [r3, #6] - strh r0, [r3, #2] - add r0, sp, #0x20 - strh r2, [r3, #4] - str r5, [sp, #0x14] - str r0, [sp, #8] - mov ip, r0 - mov lr, r0 - str r0, [sp, #0x18] -_0202038E: - mov r0, #0 - str r0, [sp, #0x10] - ldr r0, [sp, #0x18] - str r0, [sp, #4] - ldr r0, [sp, #8] - ldr r0, [r0] - str r0, [sp, #0x1c] -_0202039C: - mov r0, #0 - str r0, [sp, #0xc] - mov r0, lr - str r0, [sp] - ldr r0, [sp, #4] - ldr r0, [r0] - lsl r7, r0, #4 -_020203AA: - ldr r0, [sp] - mov r3, #0 - ldr r0, [r0] - mov r4, ip - lsl r6, r0, #8 -_020203B4: - ldr r0, [r4] - add r1, r7, #0 - lsl r0, r0, #0xc - orr r0, r6 - orr r1, r0 - ldr r0, [sp, #0x1c] - add r3, r3, #1 - add r2, r0, #0 - orr r2, r1 - lsl r1, r5, #1 - ldr r0, _0202040C ; =_021D1F94 - add r5, r5, #1 - add r4, r4, #4 - strh r2, [r0, r1] - cmp r3, #4 - blt _020203B4 - ldr r0, [sp] - add r0, r0, #4 - str r0, [sp] - ldr r0, [sp, #0xc] - add r0, r0, #1 - str r0, [sp, #0xc] - cmp r0, #4 - blt _020203AA - ldr r0, [sp, #4] - add r0, r0, #4 - str r0, [sp, #4] - ldr r0, [sp, #0x10] - add r0, r0, #1 - str r0, [sp, #0x10] - cmp r0, #4 - blt _0202039C - ldr r0, [sp, #8] - add r0, r0, #4 - str r0, [sp, #8] - ldr r0, [sp, #0x14] - add r0, r0, #1 - str r0, [sp, #0x14] - cmp r0, #4 - blt _0202038E - add sp, #0x30 - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_02020408: .word _021D1F6C -_0202040C: .word _021D1F94 - thumb_func_end sub_0202036C - - thumb_func_start DecompressGlyphTile -DecompressGlyphTile: ; 0x02020410 - ldrh r2, [r0] - lsr r2, r2, #8 - lsl r3, r2, #1 - ldr r2, _020204B4 ; =_021D1F94 - ldrh r3, [r2, r3] - strh r3, [r1] - ldrh r3, [r0] - lsl r3, r3, #0x18 - lsr r3, r3, #0x17 - ldrh r3, [r2, r3] - strh r3, [r1, #2] - ldrh r3, [r0, #2] - lsr r3, r3, #8 - lsl r3, r3, #1 - ldrh r3, [r2, r3] - strh r3, [r1, #4] - ldrh r3, [r0, #2] - lsl r3, r3, #0x18 - lsr r3, r3, #0x17 - ldrh r3, [r2, r3] - strh r3, [r1, #6] - ldrh r3, [r0, #4] - lsr r3, r3, #8 - lsl r3, r3, #1 - ldrh r3, [r2, r3] - strh r3, [r1, #8] - ldrh r3, [r0, #4] - lsl r3, r3, #0x18 - lsr r3, r3, #0x17 - ldrh r3, [r2, r3] - strh r3, [r1, #0xa] - ldrh r3, [r0, #6] - lsr r3, r3, #8 - lsl r3, r3, #1 - ldrh r3, [r2, r3] - strh r3, [r1, #0xc] - ldrh r3, [r0, #6] - lsl r3, r3, #0x18 - lsr r3, r3, #0x17 - ldrh r3, [r2, r3] - strh r3, [r1, #0xe] - ldrh r3, [r0, #8] - lsr r3, r3, #8 - lsl r3, r3, #1 - ldrh r3, [r2, r3] - strh r3, [r1, #0x10] - ldrh r3, [r0, #8] - lsl r3, r3, #0x18 - lsr r3, r3, #0x17 - ldrh r3, [r2, r3] - strh r3, [r1, #0x12] - ldrh r3, [r0, #0xa] - lsr r3, r3, #8 - lsl r3, r3, #1 - ldrh r3, [r2, r3] - strh r3, [r1, #0x14] - ldrh r3, [r0, #0xa] - lsl r3, r3, #0x18 - lsr r3, r3, #0x17 - ldrh r3, [r2, r3] - strh r3, [r1, #0x16] - ldrh r3, [r0, #0xc] - lsr r3, r3, #8 - lsl r3, r3, #1 - ldrh r3, [r2, r3] - strh r3, [r1, #0x18] - ldrh r3, [r0, #0xc] - lsl r3, r3, #0x18 - lsr r3, r3, #0x17 - ldrh r3, [r2, r3] - strh r3, [r1, #0x1a] - ldrh r3, [r0, #0xe] - lsr r3, r3, #8 - lsl r3, r3, #1 - ldrh r3, [r2, r3] - strh r3, [r1, #0x1c] - ldrh r0, [r0, #0xe] - lsl r0, r0, #0x18 - lsr r0, r0, #0x17 - ldrh r0, [r2, r0] - strh r0, [r1, #0x1e] - bx lr - .balign 4, 0 -_020204B4: .word _021D1F94 - thumb_func_end DecompressGlyphTile - - thumb_func_start sub_020204B8 -sub_020204B8: ; 0x020204B8 - mov r1, #0 - str r1, [r0, #0x30] - bx lr - .balign 4, 0 - thumb_func_end sub_020204B8 - - thumb_func_start sub_020204C0 -sub_020204C0: ; 0x020204C0 - push {r3, r4, r5, lr} - sub sp, #8 - mov r1, #6 - mov r0, #0 - lsl r1, r1, #8 - bl AllocFromHeap - mov r2, #0 - add r5, r0, #0 - str r2, [sp] - mov r0, #0x10 - mov r1, #6 - add r3, sp, #4 - bl GfGfxLoader_GetCharData - add r4, r0, #0 - ldr r0, [sp, #4] - mov r2, #6 - ldr r0, [r0, #0x14] - add r1, r5, #0 - lsl r2, r2, #8 - bl MIi_CpuCopy32 - add r0, r4, #0 - bl FreeToHeap - add r0, r5, #0 - add sp, #8 - pop {r3, r4, r5, pc} - .balign 4, 0 - thumb_func_end sub_020204C0 - - thumb_func_start sub_020204FC -sub_020204FC: ; 0x020204FC - push {r3, r4, r5, r6, r7, lr} - sub sp, #0x18 - add r4, r0, #0 - ldr r0, [r4, #0x30] - add r7, r3, #0 - ldr r5, [r4, #4] - cmp r0, #0 - bne _02020512 - bl sub_020204C0 - str r0, [r4, #0x30] -_02020512: - mov r0, #6 - lsl r0, r0, #6 - add r6, r7, #0 - mul r6, r0 - add r0, r5, #0 - ldr r4, [r4, #0x30] - bl GetWindowWidth - sub r0, r0, #3 - lsl r0, r0, #0x13 - mov r1, #0x18 - lsr r2, r0, #0x10 - str r1, [sp] - mov r0, #0x20 - str r0, [sp, #4] - str r2, [sp, #8] - mov r2, #0 - str r2, [sp, #0xc] - str r1, [sp, #0x10] - str r0, [sp, #0x14] - add r0, r5, #0 - add r1, r4, r6 - add r3, r2, #0 - bl BlitBitmapRectToWindow - add sp, #0x18 - pop {r3, r4, r5, r6, r7, pc} - thumb_func_end sub_020204FC - - thumb_func_start sub_02020548 -sub_02020548: ; 0x02020548 - push {r4, lr} - add r4, r0, #0 - ldr r0, [r4, #0x30] - cmp r0, #0 - beq _0202055A - bl FreeToHeap - mov r0, #0 - str r0, [r4, #0x30] -_0202055A: - pop {r4, pc} - thumb_func_end sub_02020548 diff --git a/include/font_types_def.h b/include/font_types_def.h index 6dc7a8493..16bf9c791 100644 --- a/include/font_types_def.h +++ b/include/font_types_def.h @@ -29,7 +29,7 @@ union StrbufForPrint { const u16 *raw; }; -struct TextPrinterTemplate { +typedef struct TextPrinterTemplate { union StrbufForPrint currentChar; Window *window; u8 padding[1]; @@ -42,13 +42,13 @@ struct TextPrinterTemplate { u16 unk18; u8 unk1A; u8 unk1B; -}; +} TextPrinterTemplate; -typedef BOOL (*PrinterCallback_t)(struct TextPrinterTemplate *template, u16 glyphId); +typedef BOOL (*PrinterCallback_t)(TextPrinterTemplate *template, u16 glyphId); -struct TextPrinter { - struct TextPrinterTemplate template; - PrinterCallback_t calback; +typedef struct TextPrinter { + TextPrinterTemplate template; + PrinterCallback_t callback; u8 subStructFields[7]; // x20 u8 active; @@ -57,10 +57,10 @@ struct TextPrinter { u8 textSpeedTop:1; u8 delayCounter; u8 scrollDistance; - u8 minLetterSpacing; - u8 Unk2D; - u16 Unk2E; - u16 *Unk30; -}; + u8 id; + u8 unk2D; + u16 unk2E; + u16 *unk30; +} TextPrinter; #endif //POKEHEARTGOLD_FONT_TYPES_DEF_H diff --git a/include/text.h b/include/text.h index 9bf1ac87b..7e818286f 100644 --- a/include/text.h +++ b/include/text.h @@ -5,21 +5,24 @@ #include "bg_window.h" #include "options.h" #include "text_0205B4EC.h" +#include "unk_0200E320.h" #define MAKE_TEXT_COLOR(fg, sh, bg) ((((fg) & 0xFF) << 16) | (((sh) & 0xFF) << 8) | (((bg) & 0xFF) << 0)) #define TEXT_SPEED_INSTANT 0 // Transfers to VRAM #define TEXT_SPEED_NOTRANSFER 0xFF // Defers VRAM transfer +#define MAX_TEXT_PRINTERS 8 + void sub_0201FFE0(const struct FontInfo *fontData); -void DecompressGlyphTile(const u8 *src, u8 *dest); -// FIXME: Are the x/y params 32bit on all three of these functions? -u16 AddTextPrinterParameterized(Window* window, u8 font_id, String* text, u32 x, u32 y, u32 speed, void* callback); -u8 AddTextPrinterParameterized2(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback); -u8 AddTextPrinterParameterized3(Window *window, int fontId, String *string, u8 x, u8 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback); -BOOL TextPrinterCheckActive(u8 printerId); +void sub_020200A0(u8 printerId); void ResetAllTextPrinters(void); -BOOL sub_02020094(u8 a0); -void sub_020200A0(u8 printer_id); +u8 TextPrinterCheckActive(u8 printerId); // FIXME: bool8 +u8 AddTextPrinterParameterized(Window* window, FontID fontId, String* text, u32 x, u32 y, u32 textSpeed, PrinterCallback_t callback); +u8 AddTextPrinterParameterized2(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback); +u8 AddTextPrinterParameterized3(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback); +void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor); +void DecompressGlyphTile(const u8 *src, u8 *dest); +void sub_020204FC(TextPrinter *printer, u32 x, u32 y, u16 fieldNum); #endif //POKEHEARTGOLD_TEXT_H diff --git a/include/unk_0200E320.h b/include/unk_0200E320.h index 3e27aadd5..d5dd38c4c 100644 --- a/include/unk_0200E320.h +++ b/include/unk_0200E320.h @@ -7,6 +7,7 @@ typedef void (*UnkSysTaskFunc)(int a0, void *data, int a2); SysTask *CreateSysTask(SysTaskFunc func, void *data, int priority); SysTask *sub_0200E33C(UnkSysTaskFunc, void *data, int a2); +SysTask *sub_0200E358(SysTaskFunc func, void *data, int priority); void DestroySysTask(SysTask *task); #endif //POKEHEARTGOLD_UNK_0200E320_H diff --git a/main.lsf b/main.lsf index fbd608e26..e4af33f49 100644 --- a/main.lsf +++ b/main.lsf @@ -68,7 +68,7 @@ Static main Object asm/unk_0201F79C.o Object src/string_control_code.o Object src/math_util.o - Object asm/text.o + Object src/text.o Object src/vram_transfer_manager.o Object asm/unk_02020654.o Object src/ascii_util.o diff --git a/src/text.c b/src/text.c new file mode 100644 index 000000000..f62ae245f --- /dev/null +++ b/src/text.c @@ -0,0 +1,410 @@ +#include "global.h" +#include "font.h" +#include "gf_gfx_loader.h" +#include "text.h" +#include "unk_0201F79C.h" + +struct Unk21D1F6C { + u8 unk0; + u16 fgColor; + u16 shadowColor; + u16 bgColor; +}; + +const struct FontInfo *_0210F6D8; + +struct Unk21D1F6C _021D1F6C; +SysTask *sTextPrinterTasks[MAX_TEXT_PRINTERS]; +u16 _021D1F94[4 * 4 * 4 * 4]; + +static u8 CreateTextPrinterSysTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority); +static BOOL sub_02020068(u8 printerId); +static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallback_t callback); +static void sub_020202EC(SysTask *task, TextPrinter *printer); +static u32 sub_02020358(TextPrinter *printer); +static void sub_020204B8(TextPrinter *printer); +static u16 *sub_020204C0(void); +static void sub_02020548(TextPrinter *printer); + +void sub_0201FFE0(const struct FontInfo *fontData) { + _0210F6D8 = fontData; +} + +static u8 CreateTextPrinterSysTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority) { + int i; + for (i = 0; i < MAX_TEXT_PRINTERS; i++) { + if (sTextPrinterTasks[i] != NULL) { + continue; + } + + sTextPrinterTasks[i] = sub_0200E358(taskFunc, printer, priority); + if (sTextPrinterTasks[i] == NULL) { + i = MAX_TEXT_PRINTERS; + } + break; + } + return i; +} + +static void DestroyTextPrinterSysTask(u8 printerId) { + GF_ASSERT(printerId < MAX_TEXT_PRINTERS); + GF_ASSERT(sTextPrinterTasks[printerId] != NULL); + if (printerId >= MAX_TEXT_PRINTERS || sTextPrinterTasks[printerId] == NULL) { + return; + } + + TextPrinter *printer = sub_0201F988(sTextPrinterTasks[printerId]); + if (printer != NULL) { + sub_02020548(printer); + FreeToHeap(printer); + } + + DestroySysTask(sTextPrinterTasks[printerId]); + sTextPrinterTasks[printerId] = NULL; +} + +static BOOL sub_02020068(u8 printerId) { + return sTextPrinterTasks[printerId] != NULL; +} + +void ResetAllTextPrinters(void) { + for (int i = 0; i < MAX_TEXT_PRINTERS; i++) { + sTextPrinterTasks[i] = NULL; + } +} + +u8 TextPrinterCheckActive(u8 printerId) { + return sub_02020068(printerId); +} + +void sub_020200A0(u8 printerId) { + DestroyTextPrinterSysTask(printerId); +} + +u8 AddTextPrinterParameterized(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, PrinterCallback_t callback) { + TextPrinterTemplate template; + + template.currentChar.wrapped = string; + template.window = window; + template.fontId = fontId; + template.x = x; + template.y = y; + template.currentX = x; + template.currentY = y; + template.letterSpacing = _0210F6D8[fontId].letterSpacing; + template.lineSpacing = _0210F6D8[fontId].lineSpacing; + template.unk14 = _0210F6D8[fontId].unk; + template.fgColor = _0210F6D8[fontId].fgColor; + template.bgColor = _0210F6D8[fontId].bgColor; + template.shadowColor = _0210F6D8[fontId].shadowColor; + template.unk18 = 0; + template.unk1A = 0; + template.unk1B = 0xFF; + + return AddTextPrinter(&template, textSpeed, callback); +} + +u8 AddTextPrinterParameterized2(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback) { + TextPrinterTemplate template; + + template.currentChar.wrapped = string; + template.window = window; + template.fontId = fontId; + template.x = x; + template.y = y; + template.currentX = x; + template.currentY = y; + template.letterSpacing = _0210F6D8[fontId].letterSpacing; + template.lineSpacing = _0210F6D8[fontId].lineSpacing; + template.unk14 = _0210F6D8[fontId].unk; + template.fgColor = (color >> 16) & 0xFF; + template.shadowColor = (color >> 8) & 0xFF; + template.bgColor = (color >> 0) & 0xFF; + template.unk18 = 0; + template.unk1A = 0; + template.unk1B = 0xFF; + + return AddTextPrinter(&template, textSpeed, callback); +} + +u8 AddTextPrinterParameterized3(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback) { + TextPrinterTemplate template; + + template.currentChar.wrapped = string; + template.window = window; + template.fontId = fontId; + template.x = x; + template.y = y; + template.currentX = x; + template.currentY = y; + template.letterSpacing = letterSpacing; + template.lineSpacing = lineSpacing; + template.unk14 = _0210F6D8[fontId].unk; + template.fgColor = (color >> 16) & 0xFF; + template.shadowColor = (color >> 8) & 0xFF; + template.bgColor = (color >> 0) & 0xFF; + template.unk18 = 0; + template.unk1A = 0; + template.unk1B = 0xFF; + + return AddTextPrinter(&template, textSpeed, callback); +} + +static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallback_t callback) { + if (_0210F6D8 == NULL) { + return 0xFF; + } + + TextPrinter *printer = AllocFromHeap(HEAP_ID_DEFAULT, sizeof(TextPrinter)); + printer->active = 1; + printer->state = 0; + printer->textSpeedBottom = speed; + printer->delayCounter = 0; + printer->scrollDistance = 0; + printer->unk2D = 0; + for (int i = 0; i < 7; i++) { + printer->subStructFields[i] = 0; + } + printer->template = *template; + printer->template.currentChar.raw = String_cstr(printer->template.currentChar.wrapped); + printer->callback = callback; + _021D1F6C.unk0 = 0; + + sub_020204B8(printer); + + if (speed != TEXT_SPEED_NOTRANSFER && speed != TEXT_SPEED_INSTANT) { + printer->textSpeedBottom--; + printer->textSpeedTop = 1; + printer->id = CreateTextPrinterSysTask((SysTaskFunc)sub_020202EC, printer, 1); + return printer->id; + } + + u32 i = 0; + + printer->textSpeedBottom = 0; + printer->textSpeedTop = 0; + + sub_0202036C(template->fgColor, template->bgColor, template->shadowColor); + + for (; i < 0x400; i++) { + if (sub_02020358(printer) == 1) { + break; + } + } + + if (speed != TEXT_SPEED_NOTRANSFER) { + CopyWindowToVram(printer->template.window); + } + + sub_02020548(printer); + FreeToHeap(printer); + + return MAX_TEXT_PRINTERS; +} + +static void sub_020202EC(SysTask *task, TextPrinter *printer) { + if (_021D1F6C.unk0 != 0) { + return; + } + + if (printer->unk2D == 0) { + printer->unk2E = 0; + + sub_0202036C(printer->template.fgColor, printer->template.bgColor, printer->template.shadowColor); + + switch (sub_02020358(printer)) { + case 0: + CopyWindowToVram(printer->template.window); + // fallthrough + case 3: + if (printer->callback != NULL) { + printer->unk2D = printer->callback(&printer->template, printer->unk2E); + } + return; + case 1: + DestroyTextPrinterSysTask(printer->id); + return; + } + } else { + printer->unk2D = printer->callback(&printer->template, printer->unk2E); + } +} + +static u32 sub_02020358(TextPrinter *printer) { + u32 ret; + do { + ret = FontID_RenderText(printer->template.fontId, printer); + } while (ret == 2); + return ret; +} + +// https://decomp.me/scratch/YCL75 +#ifdef NONMATCHING +void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor) { + u32 colors[4]; + colors[0] = 0; + colors[1] = fgColor; + colors[2] = shadowColor; + colors[3] = bgColor; + + _021D1F6C.bgColor = bgColor; + _021D1F6C.fgColor = fgColor; + _021D1F6C.shadowColor = shadowColor; + + u32 index = 0; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + for (int k = 0; k < 4; k++) { + for (int l = 0; l < 4; l++) { + _021D1F94[index++] = (colors[l] << 12) | (colors[k] << 8) | (colors[j] << 4) | colors[i]; + } + } + } + } +} +#else +asm void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor) { + push {r3, r4, r5, r6, r7, lr} + sub sp, #0x30 + ldr r3, [pc, #0x94] // _02020408 ; =_021D1F6C + mov r5, #0 + str r5, [sp, #0x20] + str r0, [sp, #0x24] + str r2, [sp, #0x28] + str r1, [sp, #0x2c] + strh r1, [r3, #6] + strh r0, [r3, #2] + add r0, sp, #0x20 + strh r2, [r3, #4] + str r5, [sp, #0x14] + str r0, [sp, #8] + mov ip, r0 + mov lr, r0 + str r0, [sp, #0x18] +_0202038E: + mov r0, #0 + str r0, [sp, #0x10] + ldr r0, [sp, #0x18] + str r0, [sp, #4] + ldr r0, [sp, #8] + ldr r0, [r0, #0] + str r0, [sp, #0x1c] +_0202039C: + mov r0, #0 + str r0, [sp, #0xc] + mov r0, lr + str r0, [sp] + ldr r0, [sp, #4] + ldr r0, [r0, #0] + lsl r7, r0, #4 +_020203AA: + ldr r0, [sp] + mov r3, #0 + ldr r0, [r0, #0] + mov r4, ip + lsl r6, r0, #8 +_020203B4: + ldr r0, [r4, #0] + add r1, r7, #0 + lsl r0, r0, #0xc + orr r0, r6 + orr r1, r0 + ldr r0, [sp, #0x1c] + add r3, r3, #1 + add r2, r0, #0 + orr r2, r1 + lsl r1, r5, #1 + ldr r0, [pc, #0x40] // _0202040C ; =_021D1F94 + add r5, r5, #1 + add r4, r4, #4 + strh r2, [r0, r1] + cmp r3, #4 + blt _020203B4 + ldr r0, [sp] + add r0, r0, #4 + str r0, [sp] + ldr r0, [sp, #0xc] + add r0, r0, #1 + str r0, [sp, #0xc] + cmp r0, #4 + blt _020203AA + ldr r0, [sp, #4] + add r0, r0, #4 + str r0, [sp, #4] + ldr r0, [sp, #0x10] + add r0, r0, #1 + str r0, [sp, #0x10] + cmp r0, #4 + blt _0202039C + ldr r0, [sp, #8] + add r0, r0, #4 + str r0, [sp, #8] + ldr r0, [sp, #0x14] + add r0, r0, #1 + str r0, [sp, #0x14] + cmp r0, #4 + blt _0202038E + add sp, #0x30 + pop {r3, r4, r5, r6, r7, pc} +_02020408: DCD _021D1F6C +_0202040C: DCD _021D1F94 +} +#endif + +void DecompressGlyphTile(const u8* src, u8* dest) { + const u16 *src16 = (u16*)src; + u16 *dest16 = (u16*)dest; + dest16[0] = _021D1F94[src16[0] / 256]; + dest16[1] = _021D1F94[src16[0] & 0xFF]; + dest16[2] = _021D1F94[src16[1] / 256]; + dest16[3] = _021D1F94[src16[1] & 0xFF]; + dest16[4] = _021D1F94[src16[2] / 256]; + dest16[5] = _021D1F94[src16[2] & 0xFF]; + dest16[6] = _021D1F94[src16[3] / 256]; + dest16[7] = _021D1F94[src16[3] & 0xFF]; + dest16[8] = _021D1F94[src16[4] / 256]; + dest16[9] = _021D1F94[src16[4] & 0xFF]; + dest16[10] = _021D1F94[src16[5] / 256]; + dest16[11] = _021D1F94[src16[5] & 0xFF]; + dest16[12] = _021D1F94[src16[6] / 256]; + dest16[13] = _021D1F94[src16[6] & 0xFF]; + dest16[14] = _021D1F94[src16[7] / 256]; + dest16[15] = _021D1F94[src16[7] & 0xFF]; +} + +static void sub_020204B8(TextPrinter *printer) { + printer->unk30 = NULL; +} + +static u16 *sub_020204C0(void) { + u16 *ret = AllocFromHeap(HEAP_ID_DEFAULT, 0x300 * sizeof(u16)); + + NNSG2dCharacterData *g2dCharData; + void *charData = GfGfxLoader_GetCharData(NARC_graphic_font, 6, FALSE, &g2dCharData, HEAP_ID_DEFAULT); + MI_CpuCopy32(g2dCharData->pRawData, ret, 0x300 * sizeof(u16)); + FreeToHeap(charData); + + return ret; +} + +void sub_020204FC(TextPrinter *printer, u32 x, u32 y, u16 fieldNum) { + (void)x; + (void)y; + + Window *window = printer->template.window; + + if (printer->unk30 == NULL) { + printer->unk30 = sub_020204C0(); + } + + void *startAddr = (void*)printer->unk30 + (fieldNum * 0x180); + u16 destX = (GetWindowWidth(window) - 3) * 8; + BlitBitmapRectToWindow(window, startAddr, 0, 0, 24, 32, destX, 0, 24, 32); +} + +static void sub_02020548(TextPrinter *printer) { + if (printer->unk30 != NULL) { + FreeToHeap(printer->unk30); + printer->unk30 = NULL; + } +} From 2ba5fab2b26819a579a24adeedab595475f2faaf Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 13 Dec 2023 11:28:12 -0600 Subject: [PATCH 2/8] text: AddTextPrinterParameterized{2 -> WithColor} --- asm/include/overlay_01_021EF7A0.inc | 2 +- asm/include/overlay_01_021F3F50.inc | 2 +- asm/include/overlay_02.inc | 2 +- asm/include/overlay_03.inc | 2 +- asm/include/overlay_05.inc | 2 +- asm/include/overlay_08.inc | 2 +- asm/include/overlay_101.inc | 2 +- asm/include/overlay_102.inc | 2 +- asm/include/overlay_103.inc | 2 +- asm/include/overlay_108.inc | 2 +- asm/include/overlay_109.inc | 2 +- asm/include/overlay_110.inc | 2 +- asm/include/overlay_111.inc | 2 +- asm/include/overlay_112.inc | 2 +- asm/include/overlay_113.inc | 2 +- asm/include/overlay_115.inc | 2 +- asm/include/overlay_117.inc | 2 +- asm/include/overlay_121.inc | 2 +- asm/include/overlay_12_battle_command.inc | 2 +- asm/include/overlay_14.inc | 2 +- asm/include/overlay_15.inc | 2 +- asm/include/overlay_17.inc | 2 +- asm/include/overlay_18.inc | 2 +- asm/include/overlay_19.inc | 2 +- asm/include/overlay_27.inc | 2 +- asm/include/overlay_28.inc | 2 +- asm/include/overlay_29.inc | 2 +- asm/include/overlay_31.inc | 2 +- asm/include/overlay_32.inc | 2 +- asm/include/overlay_33.inc | 2 +- asm/include/overlay_34.inc | 2 +- asm/include/overlay_37.inc | 2 +- asm/include/overlay_39_thumb.inc | 2 +- asm/include/overlay_40.inc | 2 +- asm/include/overlay_41.inc | 2 +- asm/include/overlay_43.inc | 2 +- asm/include/overlay_44.inc | 2 +- asm/include/overlay_46.inc | 2 +- asm/include/overlay_47.inc | 2 +- asm/include/overlay_48.inc | 2 +- asm/include/overlay_49.inc | 2 +- asm/include/overlay_53.inc | 2 +- asm/include/overlay_54.inc | 2 +- asm/include/overlay_56.inc | 2 +- asm/include/overlay_57.inc | 2 +- asm/include/overlay_59.inc | 2 +- asm/include/overlay_62.inc | 2 +- asm/include/overlay_63.inc | 2 +- asm/include/overlay_64.inc | 2 +- asm/include/overlay_65.inc | 2 +- asm/include/overlay_67.inc | 2 +- asm/include/overlay_68.inc | 2 +- asm/include/overlay_70.inc | 2 +- asm/include/overlay_72.inc | 2 +- asm/include/overlay_73.inc | 2 +- asm/include/overlay_74_thumb.inc | 2 +- asm/include/overlay_75.inc | 2 +- asm/include/overlay_81.inc | 2 +- asm/include/overlay_82.inc | 2 +- asm/include/overlay_83.inc | 2 +- asm/include/overlay_85.inc | 2 +- asm/include/overlay_86.inc | 2 +- asm/include/overlay_87.inc | 2 +- asm/include/overlay_88.inc | 2 +- asm/include/overlay_89.inc | 2 +- asm/include/overlay_90.inc | 2 +- asm/include/overlay_91.inc | 2 +- asm/include/overlay_93_thumb_1.inc | 2 +- asm/include/overlay_95.inc | 2 +- asm/include/overlay_96.inc | 2 +- asm/include/overlay_97.inc | 2 +- asm/include/overlay_98.inc | 2 +- asm/include/overlay_trainer_card_main.inc | 2 +- .../overlay_trainer_card_signature.inc | 2 +- asm/include/text.inc | 2 +- asm/include/unk_02014DA0.inc | 2 +- asm/include/unk_020183F0.inc | 2 +- asm/include/unk_020755E8.inc | 2 +- asm/include/unk_0207CB7C.inc | 2 +- asm/include/unk_02082908.inc | 2 +- asm/include/unk_020863F4.inc | 2 +- asm/include/unk_0208C3E4.inc | 2 +- asm/include/unk_020932E0.inc | 2 +- asm/overlay_01_021EF7A0.s | 2 +- asm/overlay_01_021F3F50.s | 2 +- asm/overlay_02.s | 2 +- asm/overlay_03.s | 10 +- asm/overlay_05.s | 8 +- asm/overlay_08.s | 126 ++++++------- asm/overlay_101.s | 48 ++--- asm/overlay_102.s | 26 +-- asm/overlay_103.s | 4 +- asm/overlay_108.s | 30 +-- asm/overlay_109.s | 8 +- asm/overlay_111.s | 4 +- asm/overlay_112.s | 36 ++-- asm/overlay_113.s | 6 +- asm/overlay_115.s | 4 +- asm/overlay_117.s | 2 +- asm/overlay_121.s | 20 +- asm/overlay_12_battle_command.s | 2 +- asm/overlay_14.s | 4 +- asm/overlay_15.s | 52 ++--- asm/overlay_18.s | 2 +- asm/overlay_19.s | 4 +- asm/overlay_27.s | 16 +- asm/overlay_28.s | 2 +- asm/overlay_29.s | 2 +- asm/overlay_31.s | 26 +-- asm/overlay_32.s | 10 +- asm/overlay_33.s | 2 +- asm/overlay_34.s | 8 +- asm/overlay_37.s | 6 +- asm/overlay_39_thumb.s | 2 +- asm/overlay_40.s | 178 +++++++++--------- asm/overlay_41.s | 14 +- asm/overlay_43.s | 26 +-- asm/overlay_44.s | 104 +++++----- asm/overlay_46.s | 2 +- asm/overlay_47.s | 22 +-- asm/overlay_48.s | 8 +- asm/overlay_49.s | 14 +- asm/overlay_53.s | 10 +- asm/overlay_54.s | 16 +- asm/overlay_56.s | 10 +- asm/overlay_57.s | 8 +- asm/overlay_59.s | 28 +-- asm/overlay_62.s | 2 +- asm/overlay_63.s | 16 +- asm/overlay_64.s | 20 +- asm/overlay_65.s | 4 +- asm/overlay_67.s | 2 +- asm/overlay_68.s | 14 +- asm/overlay_70.s | 18 +- asm/overlay_72.s | 8 +- asm/overlay_73.s | 18 +- asm/overlay_74_thumb.s | 50 ++--- asm/overlay_75.s | 2 +- asm/overlay_81.s | 18 +- asm/overlay_82.s | 8 +- asm/overlay_83.s | 18 +- asm/overlay_85.s | 12 +- asm/overlay_86.s | 2 +- asm/overlay_87.s | 4 +- asm/overlay_88.s | 2 +- asm/overlay_89.s | 2 +- asm/overlay_90.s | 8 +- asm/overlay_91.s | 8 +- asm/overlay_93_thumb_1.s | 4 +- asm/overlay_95.s | 2 +- asm/overlay_96.s | 62 +++--- asm/overlay_97.s | 22 +-- asm/overlay_98.s | 12 +- asm/overlay_trainer_card_main.s | 40 ++-- asm/overlay_trainer_card_signature.s | 4 +- asm/unk_02014DA0.s | 2 +- asm/unk_020183F0.s | 4 +- asm/unk_020755E8.s | 2 +- asm/unk_0207CB7C.s | 26 +-- asm/unk_02082908.s | 6 +- asm/unk_020863F4.s | 2 +- asm/unk_0208C3E4.s | 58 +++--- asm/unk_020932E0.s | 6 +- include/text.h | 2 +- src/alph_puzzle.c | 8 +- src/berry_pots_app.c | 2 +- src/blackout.c | 2 +- src/certificates_app.c | 12 +- src/choose_starter_app.c | 2 +- src/credits/credits.c | 4 +- src/scrcmd_c.c | 4 +- src/text.c | 2 +- src/voltorb_flip/voltorb_flip.c | 2 +- 173 files changed, 805 insertions(+), 805 deletions(-) diff --git a/asm/include/overlay_01_021EF7A0.inc b/asm/include/overlay_01_021EF7A0.inc index 654a996ef..e8c985c35 100644 --- a/asm/include/overlay_01_021EF7A0.inc +++ b/asm/include/overlay_01_021EF7A0.inc @@ -16,7 +16,7 @@ .public ClearWindowTilemapAndCopyToVram .public FillWindowPixelBuffer .public BlitBitmapRectToWindow -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_AssertFail .public String_New .public String_Delete diff --git a/asm/include/overlay_01_021F3F50.inc b/asm/include/overlay_01_021F3F50.inc index ce4f6ed92..016379e1f 100644 --- a/asm/include/overlay_01_021F3F50.inc +++ b/asm/include/overlay_01_021F3F50.inc @@ -24,7 +24,7 @@ .public CopyWindowToVram .public FillWindowPixelBuffer .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_AssertFail .public String_Delete .public SaveGameNormal diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index c539c5264..b1120e485 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -105,7 +105,7 @@ .public GF_SinDegFX32 .public LCRandom .public MTRandom -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineATogglePlanes .public Camera_New .public Camera_Delete diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 59e385587..0246ad964 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -69,7 +69,7 @@ .public ScheduleBgTilemapBufferTransfer .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineATogglePlanes .public GfGfx_EngineASetPlanes .public GfGfx_EngineBTogglePlanes diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index c1854fe51..09e17b738 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -112,7 +112,7 @@ .public sub_0201F988 .public LCRandom .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc index 3fcbde69c..ef99f7320 100644 --- a/asm/include/overlay_08.inc +++ b/asm/include/overlay_08.inc @@ -93,7 +93,7 @@ .public sub_0201F988 .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02020A0C .public sub_02020A18 .public sub_02020A24 diff --git a/asm/include/overlay_101.inc b/asm/include/overlay_101.inc index 189b768c8..d1bda65f7 100644 --- a/asm/include/overlay_101.inc +++ b/asm/include/overlay_101.inc @@ -136,7 +136,7 @@ .public LCRandom .public MTRandom .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_020210BC .public sub_02021148 .public sub_02021238 diff --git a/asm/include/overlay_102.inc b/asm/include/overlay_102.inc index 8036cf8c5..91e803978 100644 --- a/asm/include/overlay_102.inc +++ b/asm/include/overlay_102.inc @@ -110,7 +110,7 @@ .public ScheduleBgTilemapBufferTransfer .public sub_0201F988 .public MsgArray_SkipControlCode -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_020215A0 .public sub_0202168C .public sub_020216C8 diff --git a/asm/include/overlay_103.inc b/asm/include/overlay_103.inc index c6c82facd..13492bc43 100644 --- a/asm/include/overlay_103.inc +++ b/asm/include/overlay_103.inc @@ -114,7 +114,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_020210BC .public sub_02021148 .public sub_02021238 diff --git a/asm/include/overlay_108.inc b/asm/include/overlay_108.inc index 508fd049f..15b496747 100644 --- a/asm/include/overlay_108.inc +++ b/asm/include/overlay_108.inc @@ -142,7 +142,7 @@ .public Draw3dModel .public Bind3dModelSet .public AllocAndLoad3dTexResources -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_109.inc b/asm/include/overlay_109.inc index 005d03da3..8c62b0580 100644 --- a/asm/include/overlay_109.inc +++ b/asm/include/overlay_109.inc @@ -87,7 +87,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public sub_020210BC diff --git a/asm/include/overlay_110.inc b/asm/include/overlay_110.inc index b6cfad5cd..0d6ff7ca0 100644 --- a/asm/include/overlay_110.inc +++ b/asm/include/overlay_110.inc @@ -82,7 +82,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public sub_020210BC diff --git a/asm/include/overlay_111.inc b/asm/include/overlay_111.inc index 03b2e4d46..3c7531a7d 100644 --- a/asm/include/overlay_111.inc +++ b/asm/include/overlay_111.inc @@ -88,7 +88,7 @@ .public ResetAllTextPrinters .public TextPrinterCheckActive .public sub_020200A0 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_SetBanks .public GfGfx_DisableEngineAPlanes .public GfGfx_EngineATogglePlanes diff --git a/asm/include/overlay_112.inc b/asm/include/overlay_112.inc index ab7bc70f1..5affae473 100644 --- a/asm/include/overlay_112.inc +++ b/asm/include/overlay_112.inc @@ -158,7 +158,7 @@ .public GF_CalcCRC16 .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_113.inc b/asm/include/overlay_113.inc index 648b7564e..ffd868d14 100644 --- a/asm/include/overlay_113.inc +++ b/asm/include/overlay_113.inc @@ -76,7 +76,7 @@ .public FillWindowPixelBuffer .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_115.inc b/asm/include/overlay_115.inc index 6d575e98a..21d43a29d 100644 --- a/asm/include/overlay_115.inc +++ b/asm/include/overlay_115.inc @@ -23,7 +23,7 @@ .public RemoveWindow .public FillWindowPixelBuffer .public ScheduleSetBgPosText -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineATogglePlanes .public sub_0202457C .public Sprite_Delete diff --git a/asm/include/overlay_117.inc b/asm/include/overlay_117.inc index 050b34e10..b2b6be0de 100644 --- a/asm/include/overlay_117.inc +++ b/asm/include/overlay_117.inc @@ -28,7 +28,7 @@ .public RemoveWindow .public FillWindowPixelBuffer .public ScheduleSetBgPosText -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineATogglePlanes .public sub_0202457C .public Sprite_Delete diff --git a/asm/include/overlay_121.inc b/asm/include/overlay_121.inc index 6183d7670..b23a88a9e 100644 --- a/asm/include/overlay_121.inc +++ b/asm/include/overlay_121.inc @@ -63,7 +63,7 @@ .public FillWindowPixelBuffer .public DoScheduledBgGpuUpdates .public ResetAllTextPrinters -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215A0 .public sub_0202168C diff --git a/asm/include/overlay_12_battle_command.inc b/asm/include/overlay_12_battle_command.inc index c11482f16..3367eb18d 100644 --- a/asm/include/overlay_12_battle_command.inc +++ b/asm/include/overlay_12_battle_command.inc @@ -58,7 +58,7 @@ .public FillWindowPixelBuffer .public FillWindowPixelRect .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02021AC8 .public sub_02021B5C .public sub_02021BD0 diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index d9797ccd3..86e5d8866 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -180,7 +180,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public ScheduleSetBgPosText -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02020A0C .public sub_020210BC .public sub_02021148 diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 4488c079a..263865a20 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -119,7 +119,7 @@ .public sub_0201F63C .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_17.inc b/asm/include/overlay_17.inc index a5c7b1624..54fd53c6f 100644 --- a/asm/include/overlay_17.inc +++ b/asm/include/overlay_17.inc @@ -97,7 +97,7 @@ .public FillWindowPixelBuffer .public DoScheduledBgGpuUpdates .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public sub_020210BC diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index be8d830a5..24f01cbde 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -189,7 +189,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public ScheduleSetBgPosText -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02020A0C .public sub_020210BC .public sub_02021148 diff --git a/asm/include/overlay_19.inc b/asm/include/overlay_19.inc index 6760c9455..7c95e7861 100644 --- a/asm/include/overlay_19.inc +++ b/asm/include/overlay_19.inc @@ -39,7 +39,7 @@ .public FillWindowPixelBuffer .public ScheduleBgTilemapBufferTransfer .public sub_0201F988 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineBTogglePlanes .public sub_0202457C .public Sprite_Delete diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index a18184780..c31fd1211 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -64,7 +64,7 @@ .public GetWindowY .public ScheduleBgTilemapBufferTransfer .public sub_0201F988 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineBTogglePlanes .public SpriteList_Delete .public sub_0202457C diff --git a/asm/include/overlay_28.inc b/asm/include/overlay_28.inc index ebfcfeacd..98e1ba991 100644 --- a/asm/include/overlay_28.inc +++ b/asm/include/overlay_28.inc @@ -48,7 +48,7 @@ .public GF_SinDeg .public GF_CosDeg .public GF_DegreeToSinCosIdx -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public SpriteList_Delete .public sub_0202457C .public CreateSprite diff --git a/asm/include/overlay_29.inc b/asm/include/overlay_29.inc index 99a5b6a3b..f368511de 100644 --- a/asm/include/overlay_29.inc +++ b/asm/include/overlay_29.inc @@ -48,7 +48,7 @@ .public GetWindowWidth .public ScheduleBgTilemapBufferTransfer .public sub_0201F988 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public SpriteList_Delete .public sub_0202457C .public CreateSprite diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 911df92f8..c6f9595dc 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -54,7 +54,7 @@ .public ScheduleBgTilemapBufferTransfer .public sub_0201F988 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineBTogglePlanes .public sub_02025224 .public GF_AssertFail diff --git a/asm/include/overlay_32.inc b/asm/include/overlay_32.inc index 6361a0872..98d51b931 100644 --- a/asm/include/overlay_32.inc +++ b/asm/include/overlay_32.inc @@ -54,7 +54,7 @@ .public GetWindowWidth .public ScheduleBgTilemapBufferTransfer .public sub_0201F988 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public SpriteList_Delete .public sub_0202457C .public CreateSprite diff --git a/asm/include/overlay_33.inc b/asm/include/overlay_33.inc index 32b6a8fb0..6e5d763d5 100644 --- a/asm/include/overlay_33.inc +++ b/asm/include/overlay_33.inc @@ -31,7 +31,7 @@ .public GetWindowWidth .public ScheduleBgTilemapBufferTransfer .public sub_0201F988 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02025204 .public sub_02025224 .public String_Delete diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index f58e58b4f..c7ab53273 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -46,7 +46,7 @@ .public ScheduleWindowCopyToVram .public FillWindowPixelBuffer .public sub_0201F988 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_EngineBTogglePlanes .public SpriteList_Delete .public sub_0202457C diff --git a/asm/include/overlay_37.inc b/asm/include/overlay_37.inc index 066d2dc88..102795451 100644 --- a/asm/include/overlay_37.inc +++ b/asm/include/overlay_37.inc @@ -71,7 +71,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020210BC .public sub_02021148 diff --git a/asm/include/overlay_39_thumb.inc b/asm/include/overlay_39_thumb.inc index 5d76b864e..10c8e7d2b 100644 --- a/asm/include/overlay_39_thumb.inc +++ b/asm/include/overlay_39_thumb.inc @@ -64,7 +64,7 @@ .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_40.inc b/asm/include/overlay_40.inc index de890bf77..767077d6b 100644 --- a/asm/include/overlay_40.inc +++ b/asm/include/overlay_40.inc @@ -141,7 +141,7 @@ .public DoScheduledBgGpuUpdates .public GF_SinDeg .public GF_CosDeg -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_41.inc b/asm/include/overlay_41.inc index b92ad67e9..657f6524d 100644 --- a/asm/include/overlay_41.inc +++ b/asm/include/overlay_41.inc @@ -138,7 +138,7 @@ .public sub_0201F988 .public MTRandom .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_020210BC .public sub_02021148 .public sub_02021238 diff --git a/asm/include/overlay_43.inc b/asm/include/overlay_43.inc index 4508b76c5..a3aa26b5c 100644 --- a/asm/include/overlay_43.inc +++ b/asm/include/overlay_43.inc @@ -114,7 +114,7 @@ .public ScheduleSetBgPosText .public TextPrinterCheckActive .public sub_020200A0 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_44.inc b/asm/include/overlay_44.inc index b451ebe52..64198f5c6 100644 --- a/asm/include/overlay_44.inc +++ b/asm/include/overlay_44.inc @@ -145,7 +145,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_CreateNewVramTransferTask diff --git a/asm/include/overlay_46.inc b/asm/include/overlay_46.inc index 47c01965f..9b85f0c59 100644 --- a/asm/include/overlay_46.inc +++ b/asm/include/overlay_46.inc @@ -59,7 +59,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_SetBanks .public GfGfx_EngineATogglePlanes .public GfGfx_SwapDisplay diff --git a/asm/include/overlay_47.inc b/asm/include/overlay_47.inc index f5086b698..0b9745f30 100644 --- a/asm/include/overlay_47.inc +++ b/asm/include/overlay_47.inc @@ -76,7 +76,7 @@ .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive .public sub_020200A0 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_48.inc b/asm/include/overlay_48.inc index cac733378..3b77f5932 100644 --- a/asm/include/overlay_48.inc +++ b/asm/include/overlay_48.inc @@ -94,7 +94,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_CreateNewVramTransferTask diff --git a/asm/include/overlay_49.inc b/asm/include/overlay_49.inc index 607ac0fd6..80b6b5a09 100644 --- a/asm/include/overlay_49.inc +++ b/asm/include/overlay_49.inc @@ -152,7 +152,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_53.inc b/asm/include/overlay_53.inc index b48974560..46e19fc41 100644 --- a/asm/include/overlay_53.inc +++ b/asm/include/overlay_53.inc @@ -97,7 +97,7 @@ .public ResetAllTextPrinters .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GfGfx_SetBanks diff --git a/asm/include/overlay_54.inc b/asm/include/overlay_54.inc index 91c2ffe17..f1afd6d20 100644 --- a/asm/include/overlay_54.inc +++ b/asm/include/overlay_54.inc @@ -66,7 +66,7 @@ .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive .public sub_020200A0 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GfGfx_SetBanks diff --git a/asm/include/overlay_56.inc b/asm/include/overlay_56.inc index e00f9cc0c..528471bf8 100644 --- a/asm/include/overlay_56.inc +++ b/asm/include/overlay_56.inc @@ -87,7 +87,7 @@ .public ScheduleBgTilemapBufferTransfer .public DoesPixelAtScreenXYMatchPtrVal .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GfGfx_SetBanks diff --git a/asm/include/overlay_57.inc b/asm/include/overlay_57.inc index 28f388c8c..b3893270e 100644 --- a/asm/include/overlay_57.inc +++ b/asm/include/overlay_57.inc @@ -142,7 +142,7 @@ .public DoScheduledBgGpuUpdates .public DoesPixelAtScreenXYMatchPtrVal .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_59.inc b/asm/include/overlay_59.inc index 0e210647a..9492a0d2b 100644 --- a/asm/include/overlay_59.inc +++ b/asm/include/overlay_59.inc @@ -117,7 +117,7 @@ .public GF_DegreeToSinCosIdx .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_62.inc b/asm/include/overlay_62.inc index e632ce21a..cdeccb4d7 100644 --- a/asm/include/overlay_62.inc +++ b/asm/include/overlay_62.inc @@ -71,7 +71,7 @@ .public sub_0201F988 .public GF_SinDegNoWrap .public LCRandom -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GfGfx_SetBanks diff --git a/asm/include/overlay_63.inc b/asm/include/overlay_63.inc index 4e76fb220..c8c0e626d 100644 --- a/asm/include/overlay_63.inc +++ b/asm/include/overlay_63.inc @@ -98,7 +98,7 @@ .public GF_CosDegNoWrap .public SetLCRNGSeed .public LCRandom -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_SetBanks .public GfGfx_EngineATogglePlanes .public GfGfx_EngineASetPlanes diff --git a/asm/include/overlay_64.inc b/asm/include/overlay_64.inc index ec54e9df7..2c7d0dea3 100644 --- a/asm/include/overlay_64.inc +++ b/asm/include/overlay_64.inc @@ -80,7 +80,7 @@ .public CopyWindowPixelsToVram_TextMode .public FillWindowPixelBuffer .public DoScheduledBgGpuUpdates -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_020210BC .public sub_02021148 .public sub_02021238 diff --git a/asm/include/overlay_65.inc b/asm/include/overlay_65.inc index b1fd2fc64..07a9a7e07 100644 --- a/asm/include/overlay_65.inc +++ b/asm/include/overlay_65.inc @@ -111,7 +111,7 @@ .public DoScheduledBgGpuUpdates .public GF_SinDeg .public LCRandom -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215A0 .public sub_0202168C diff --git a/asm/include/overlay_67.inc b/asm/include/overlay_67.inc index a5266f4aa..5910c1635 100644 --- a/asm/include/overlay_67.inc +++ b/asm/include/overlay_67.inc @@ -77,7 +77,7 @@ .public GetWindowWidth .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02020A0C .public GfGfx_SetBanks .public GfGfx_DisableEngineAPlanes diff --git a/asm/include/overlay_68.inc b/asm/include/overlay_68.inc index 890e9bd38..d0769cf5e 100644 --- a/asm/include/overlay_68.inc +++ b/asm/include/overlay_68.inc @@ -109,7 +109,7 @@ .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_70.inc b/asm/include/overlay_70.inc index 362e6eead..e2eec9917 100644 --- a/asm/include/overlay_70.inc +++ b/asm/include/overlay_70.inc @@ -138,7 +138,7 @@ .public LCRandom .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215A0 .public sub_0202168C diff --git a/asm/include/overlay_72.inc b/asm/include/overlay_72.inc index 2110cf03d..970b765f0 100644 --- a/asm/include/overlay_72.inc +++ b/asm/include/overlay_72.inc @@ -86,7 +86,7 @@ .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215A0 .public sub_0202168C diff --git a/asm/include/overlay_73.inc b/asm/include/overlay_73.inc index e2223a9b4..56ffd4208 100644 --- a/asm/include/overlay_73.inc +++ b/asm/include/overlay_73.inc @@ -98,7 +98,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020210BC .public sub_02021148 diff --git a/asm/include/overlay_74_thumb.inc b/asm/include/overlay_74_thumb.inc index dcd1748ca..7a0c43b04 100644 --- a/asm/include/overlay_74_thumb.inc +++ b/asm/include/overlay_74_thumb.inc @@ -137,7 +137,7 @@ .public LCRandom .public ResetAllTextPrinters .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215A0 .public sub_020215C0 diff --git a/asm/include/overlay_75.inc b/asm/include/overlay_75.inc index 3c87015fc..befdcd667 100644 --- a/asm/include/overlay_75.inc +++ b/asm/include/overlay_75.inc @@ -86,7 +86,7 @@ .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_81.inc b/asm/include/overlay_81.inc index 212595ede..86879eef0 100644 --- a/asm/include/overlay_81.inc +++ b/asm/include/overlay_81.inc @@ -124,7 +124,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215C0 .public sub_0202168C diff --git a/asm/include/overlay_82.inc b/asm/include/overlay_82.inc index fc15cd657..8a42c8bcd 100644 --- a/asm/include/overlay_82.inc +++ b/asm/include/overlay_82.inc @@ -91,7 +91,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215C0 .public sub_0202168C diff --git a/asm/include/overlay_83.inc b/asm/include/overlay_83.inc index 2c433afe5..d863af0e3 100644 --- a/asm/include/overlay_83.inc +++ b/asm/include/overlay_83.inc @@ -125,7 +125,7 @@ .public GetWindowWidth .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_85.inc b/asm/include/overlay_85.inc index 8bbe11b33..a2006aaf3 100644 --- a/asm/include/overlay_85.inc +++ b/asm/include/overlay_85.inc @@ -130,7 +130,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_86.inc b/asm/include/overlay_86.inc index 0764210ce..4cd030778 100644 --- a/asm/include/overlay_86.inc +++ b/asm/include/overlay_86.inc @@ -88,7 +88,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public ScheduleSetBgPosText -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02020A0C .public GfGfx_SetBanks .public GfGfx_DisableEngineAPlanes diff --git a/asm/include/overlay_87.inc b/asm/include/overlay_87.inc index 8881590f5..456baea37 100644 --- a/asm/include/overlay_87.inc +++ b/asm/include/overlay_87.inc @@ -91,7 +91,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public LCRandom -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_88.inc b/asm/include/overlay_88.inc index 36a27c373..f0f08caa7 100644 --- a/asm/include/overlay_88.inc +++ b/asm/include/overlay_88.inc @@ -54,7 +54,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_CreateNewVramTransferTask diff --git a/asm/include/overlay_89.inc b/asm/include/overlay_89.inc index 13bc87a88..c4f7a740a 100644 --- a/asm/include/overlay_89.inc +++ b/asm/include/overlay_89.inc @@ -129,7 +129,7 @@ .public GF_SinDegFX32 .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public AddTextPrinterParameterized3 .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager diff --git a/asm/include/overlay_90.inc b/asm/include/overlay_90.inc index 18d2afd68..d67f452b7 100644 --- a/asm/include/overlay_90.inc +++ b/asm/include/overlay_90.inc @@ -100,7 +100,7 @@ .public MTRandom .public TextPrinterCheckActive .public sub_020200A0 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_CreateNewVramTransferTask diff --git a/asm/include/overlay_91.inc b/asm/include/overlay_91.inc index cdf9b042c..58575d6f5 100644 --- a/asm/include/overlay_91.inc +++ b/asm/include/overlay_91.inc @@ -106,7 +106,7 @@ .public GF_DegreeToSinCosIdxNoWrap .public GF_DegreeToSinCosIdx .public MTRandom -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_93_thumb_1.inc b/asm/include/overlay_93_thumb_1.inc index 4410fb89d..0ff261f5a 100644 --- a/asm/include/overlay_93_thumb_1.inc +++ b/asm/include/overlay_93_thumb_1.inc @@ -116,7 +116,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public AllocAndLoad3dTexResources -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_95.inc b/asm/include/overlay_95.inc index 7d7e98f41..9b2417fed 100644 --- a/asm/include/overlay_95.inc +++ b/asm/include/overlay_95.inc @@ -124,7 +124,7 @@ .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_96.inc b/asm/include/overlay_96.inc index 25ebec2d4..7beb8a85e 100644 --- a/asm/include/overlay_96.inc +++ b/asm/include/overlay_96.inc @@ -206,7 +206,7 @@ .public ResetAllTextPrinters .public TextPrinterCheckActive .public sub_020200A0 -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public AddTextPrinterParameterized3 .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager diff --git a/asm/include/overlay_97.inc b/asm/include/overlay_97.inc index 6693f06e2..5d8469e85 100644 --- a/asm/include/overlay_97.inc +++ b/asm/include/overlay_97.inc @@ -53,7 +53,7 @@ .public CopyWindowToVram .public FillWindowPixelBuffer .public ResetAllTextPrinters -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_020215A0 .public sub_0202168C .public sub_020216C8 diff --git a/asm/include/overlay_98.inc b/asm/include/overlay_98.inc index ccb9d1fd3..9154e414e 100644 --- a/asm/include/overlay_98.inc +++ b/asm/include/overlay_98.inc @@ -56,7 +56,7 @@ .public FillWindowPixelBuffer .public GetWindowWidth .public SetWindowY -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GfGfx_SetBanks .public GfGfx_DisableEngineAPlanes .public GfGfx_EngineATogglePlanes diff --git a/asm/include/overlay_trainer_card_main.inc b/asm/include/overlay_trainer_card_main.inc index 6eb953060..5e4d8db87 100644 --- a/asm/include/overlay_trainer_card_main.inc +++ b/asm/include/overlay_trainer_card_main.inc @@ -92,7 +92,7 @@ .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer .public TextPrinterCheckActive -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020210BC .public sub_02021148 diff --git a/asm/include/overlay_trainer_card_signature.inc b/asm/include/overlay_trainer_card_signature.inc index 7d24674dd..040861527 100644 --- a/asm/include/overlay_trainer_card_signature.inc +++ b/asm/include/overlay_trainer_card_signature.inc @@ -73,7 +73,7 @@ .public GF_SinDeg .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020210BC .public sub_02021148 diff --git a/asm/include/text.inc b/asm/include/text.inc index 4f4b24399..fa48ed4ea 100644 --- a/asm/include/text.inc +++ b/asm/include/text.inc @@ -15,7 +15,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public AddTextPrinterParameterized3 .public AddTextPrinter .public sub_0202036C diff --git a/asm/include/unk_02014DA0.inc b/asm/include/unk_02014DA0.inc index 169ea5a8c..b7e0a0018 100644 --- a/asm/include/unk_02014DA0.inc +++ b/asm/include/unk_02014DA0.inc @@ -48,7 +48,7 @@ .public AllocFromHeap .public FreeToHeap .public CopyWindowPixelsToVram_TextMode -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public Camera_New .public Camera_Delete .public Camera_SetStaticPtr diff --git a/asm/include/unk_020183F0.inc b/asm/include/unk_020183F0.inc index 23fc5714b..9c5052645 100644 --- a/asm/include/unk_020183F0.inc +++ b/asm/include/unk_020183F0.inc @@ -29,7 +29,7 @@ .public ClearWindowTilemapAndScheduleTransfer .public FillWindowPixelBuffer .public ScheduleBgTilemapBufferTransfer -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02025224 .public GF_AssertFail .public NNS_G2dGetUnpackedBGCharacterData diff --git a/asm/include/unk_020755E8.inc b/asm/include/unk_020755E8.inc index 90af710fd..7340af9c6 100644 --- a/asm/include/unk_020755E8.inc +++ b/asm/include/unk_020755E8.inc @@ -109,7 +109,7 @@ .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public GfGfx_SetBanks .public GfGfx_DisableEngineAPlanes diff --git a/asm/include/unk_0207CB7C.inc b/asm/include/unk_0207CB7C.inc index db385db99..d7308643c 100644 --- a/asm/include/unk_0207CB7C.inc +++ b/asm/include/unk_0207CB7C.inc @@ -43,7 +43,7 @@ .public FillWindowPixelRect .public GetWindowWidth .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public Set2dSpriteVisibleFlag .public Set2dSpriteAnimSeqNo .public Get2dSpriteCurrentAnimSeqNo diff --git a/asm/include/unk_02082908.inc b/asm/include/unk_02082908.inc index 139a3b2e7..215c9fb9f 100644 --- a/asm/include/unk_02082908.inc +++ b/asm/include/unk_02082908.inc @@ -89,7 +89,7 @@ .public LCRandom .public TextPrinterCheckActive .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public sub_020215A0 .public sub_0202168C diff --git a/asm/include/unk_020863F4.inc b/asm/include/unk_020863F4.inc index f7444676f..f70a94f46 100644 --- a/asm/include/unk_020863F4.inc +++ b/asm/include/unk_020863F4.inc @@ -49,7 +49,7 @@ .public CopyWindowToVram .public FillWindowPixelBuffer .public AddTextPrinterParameterized -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public sub_02021AC8 .public sub_02021B5C .public GF_AssertFail diff --git a/asm/include/unk_0208C3E4.inc b/asm/include/unk_0208C3E4.inc index 0e07aeabf..3c5f267a8 100644 --- a/asm/include/unk_0208C3E4.inc +++ b/asm/include/unk_0208C3E4.inc @@ -25,7 +25,7 @@ .public FillWindowPixelBuffer .public GetWindowWidth .public ScheduleBgTilemapBufferTransfer -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public String_Delete .public String_Compare .public AllocMonZeroed diff --git a/asm/include/unk_020932E0.inc b/asm/include/unk_020932E0.inc index 90ca26d85..707f7af63 100644 --- a/asm/include/unk_020932E0.inc +++ b/asm/include/unk_020932E0.inc @@ -53,7 +53,7 @@ .public GetWindowWidth .public DoScheduledBgGpuUpdates .public ScheduleBgTilemapBufferTransfer -.public AddTextPrinterParameterized2 +.public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks .public GfGfx_EngineATogglePlanes .public GfGfx_SwapDisplay diff --git a/asm/overlay_01_021EF7A0.s b/asm/overlay_01_021EF7A0.s index 3d25858b7..56cc45220 100644 --- a/asm/overlay_01_021EF7A0.s +++ b/asm/overlay_01_021EF7A0.s @@ -305,7 +305,7 @@ ov01_021EF9A8: ; 0x021EF9A8 add r3, #0x30 ldrb r3, [r3] add r0, #0x20 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, pc} nop diff --git a/asm/overlay_01_021F3F50.s b/asm/overlay_01_021F3F50.s index 6879931de..10f60233d 100644 --- a/asm/overlay_01_021F3F50.s +++ b/asm/overlay_01_021F3F50.s @@ -463,7 +463,7 @@ _021F429C: mov r0, #0 str r0, [sp, #0xc] ldr r0, [r5, #0x10] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete _021F42E2: diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 61bbe525c..920f62b89 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -1755,7 +1755,7 @@ ov02_0224686C: ; 0x0224686C add r0, #8 mov r1, #3 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, #8 add r0, r5, #0 bl ScheduleWindowCopyToVram diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 9bdadd240..76dba420b 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -6821,7 +6821,7 @@ _022574AA: add r0, #0x18 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r4, #0 @@ -10246,7 +10246,7 @@ ov03_02258F48: ; 0x02258F48 ldr r2, [r5, #0x3c] add r0, #0x10 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r4, [sp] mov r0, #0xff str r0, [sp, #4] @@ -10258,7 +10258,7 @@ ov03_02258F48: ; 0x02258F48 ldr r2, [r5, #0x38] add r0, #0x10 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 @@ -10287,7 +10287,7 @@ ov03_02258F8C: ; 0x02258F8C ldr r2, [r5, #0x34] add r0, #0x10 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #0x24] add r1, r6, #0 bl ov03_02259070 @@ -10363,7 +10363,7 @@ _02259036: ldr r2, [r5, #0x34] add r0, #0x10 sub r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/overlay_05.s b/asm/overlay_05.s index 3ccc485e2..921f9fb3c 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -3404,7 +3404,7 @@ ov05_0221D530: ; 0x0221D530 add r2, r7, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _0221D5D0 ; =0x00000B44 ldr r0, [r4, r0] str r0, [sp, #0x10] @@ -5550,7 +5550,7 @@ _0221E656: add r3, r1, #0 add r0, r7, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x18 mul r0, r4 add r2, r5, r0 @@ -5578,7 +5578,7 @@ _0221E656: add r0, r7, r0 mov r3, #0x40 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x24 pop {r4, r5, r6, r7, pc} _0221E6DC: @@ -5599,7 +5599,7 @@ _0221E6DC: mov r3, #0x40 add r0, r7, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0221E704: add sp, #0x24 pop {r4, r5, r6, r7, pc} diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 5d31b5383..e194eaf8f 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -4116,7 +4116,7 @@ ov08_0221DDCC: ; 0x0221DDCC str r0, [sp, #0xc] ldrb r3, [r3, #0x10] add r0, r5, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0221DE6A _0221DE4E: ldrb r7, [r3, #0x14] @@ -4131,7 +4131,7 @@ _0221DE4E: str r0, [sp, #0xc] ldrb r3, [r3, #0x10] add r0, r5, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0221DE6A: ldr r0, [sp, #0x18] bl String_Delete @@ -4177,7 +4177,7 @@ _0221DE6A: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0221DEE6 _0221DED2: mov r0, #0xff @@ -4188,7 +4188,7 @@ _0221DED2: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0221DEE6: add r0, r6, #0 bl String_Delete @@ -4224,7 +4224,7 @@ _0221DEEE: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0221DF4A _0221DF36: mov r0, #0xff @@ -4235,7 +4235,7 @@ _0221DF36: add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0221DF4A: add r0, r6, #0 bl String_Delete @@ -4510,7 +4510,7 @@ ov08_0221E120: ; 0x0221E120 add r2, r6, #0 add r0, r0, r4 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 @@ -4584,7 +4584,7 @@ _0221E202: add r2, r6, #0 add r0, r0, r5 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, _0221E240 ; =0x00002070 @@ -4661,7 +4661,7 @@ _0221E2AA: str r0, [sp, #0xc] ldrh r1, [r1, #0x10] add r0, r4, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] bl String_Delete add r0, r7, #0 @@ -4702,7 +4702,7 @@ ov08_0221E2E8: ; 0x0221E2E8 ldr r3, [sp, #0x10] add r0, r0, r5 add r2, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete ldr r0, _0221E33C ; =0x00002070 @@ -4749,7 +4749,7 @@ ov08_0221E340: ; 0x0221E340 add r2, r5, #0 add r0, r4, r0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete ldr r0, _0221E398 ; =0x00002050 @@ -4797,7 +4797,7 @@ ov08_0221E3A4: ; 0x0221E3A4 mov r1, #4 add r2, r7, #0 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r5, r4 @@ -4842,7 +4842,7 @@ ov08_0221E408: ; 0x0221E408 add r3, r1, #0 add r0, r2, r0 add r2, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete ldr r0, _0221E5D0 ; =0x00001FA8 @@ -4886,7 +4886,7 @@ ov08_0221E408: ; 0x0221E408 ldr r0, [r5, r0] add r3, r1, #0 add r0, r0, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] bl String_Delete ldr r0, [sp, #0x1c] @@ -4909,7 +4909,7 @@ ov08_0221E408: ; 0x0221E408 add r3, r1, #0 add r0, r2, r0 ldr r2, [sp, #0x20] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] bl String_Delete ldr r0, _0221E5D0 ; =0x00001FA8 @@ -4981,7 +4981,7 @@ _0221E53C: str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete ldr r0, [sp, #0x10] @@ -5046,7 +5046,7 @@ ov08_0221E5DC: ; 0x0221E5DC ldr r0, [r5, r0] add r3, r1, #0 add r0, #0xe0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, _0221E6CC ; =0x00001FA8 @@ -5103,7 +5103,7 @@ ov08_0221E5DC: ; 0x0221E5DC str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 @@ -5156,7 +5156,7 @@ ov08_0221E6D8: ; 0x0221E6D8 ldr r0, [r5, r0] add r3, r1, #0 add r0, #0xf0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, _0221E7C8 ; =0x00001FA8 @@ -5213,7 +5213,7 @@ ov08_0221E6D8: ; 0x0221E6D8 str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 @@ -5267,7 +5267,7 @@ ov08_0221E7D4: ; 0x0221E7D4 add r3, r1, #0 add r0, r0, r2 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, _0221E8C8 ; =0x00001FA8 @@ -5324,7 +5324,7 @@ ov08_0221E7D4: ; 0x0221E7D4 str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 @@ -5380,7 +5380,7 @@ ov08_0221E8D4: ; 0x0221E8D4 add r3, r1, #0 add r0, r2, r0 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, _0221E9C8 ; =0x00001FA8 @@ -5437,7 +5437,7 @@ ov08_0221E8D4: ; 0x0221E8D4 str r1, [sp, #0xc] ldr r0, [r4, r0] add r0, r0, r5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 @@ -5493,7 +5493,7 @@ ov08_0221E9D4: ; 0x0221E9D4 add r3, r1, #0 add r0, r2, r0 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, _0221EAC8 ; =0x00001FA8 @@ -5550,7 +5550,7 @@ ov08_0221E9D4: ; 0x0221E9D4 str r1, [sp, #0xc] ldr r0, [r4, r0] add r0, r0, r5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 @@ -5608,7 +5608,7 @@ ov08_0221EAD4: ; 0x0221EAD4 ldr r0, [r5, r0] add r3, r1, #0 add r0, #0xd0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, _0221EC60 ; =0x00001FA8 @@ -5644,7 +5644,7 @@ ov08_0221EAD4: ; 0x0221EAD4 str r1, [sp, #0xc] ldr r0, [r5, r0] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete ldr r0, _0221EC60 ; =0x00001FA8 @@ -5688,7 +5688,7 @@ ov08_0221EAD4: ; 0x0221EAD4 ldr r0, [r5, r0] sub r3, r6, r3 add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] bl String_Delete ldr r0, [sp, #0x1c] @@ -5730,7 +5730,7 @@ ov08_0221EAD4: ; 0x0221EAD4 ldr r0, [r5, r0] add r3, r6, r3 add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] bl String_Delete ldr r0, [sp, #0x24] @@ -5792,7 +5792,7 @@ ov08_0221EC6C: ; 0x0221EC6C ldr r0, [r5, r0] add r3, r1, #0 add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r7, #0 @@ -5832,7 +5832,7 @@ ov08_0221ECE8: ; 0x0221ECE8 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, r4 @@ -5882,7 +5882,7 @@ ov08_0221ED30: ; 0x0221ED30 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete b _0221EE00 @@ -5932,7 +5932,7 @@ _0221ED8A: str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete add r0, r7, #0 @@ -5970,7 +5970,7 @@ ov08_0221EE18: ; 0x0221EE18 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, r4 @@ -6020,7 +6020,7 @@ ov08_0221EE60: ; 0x0221EE60 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete b _0221EF30 @@ -6070,7 +6070,7 @@ _0221EEBA: str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete add r0, r7, #0 @@ -6115,7 +6115,7 @@ ov08_0221EF48: ; 0x0221EF48 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r7, #0 @@ -6165,7 +6165,7 @@ ov08_0221EFA8: ; 0x0221EFA8 str r0, [sp, #8] add r0, r5, r4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r5, r4 @@ -6222,7 +6222,7 @@ _0221F04C: add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, r4 @@ -6270,7 +6270,7 @@ ov08_0221F07C: ; 0x0221F07C str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] bl String_Delete ldr r0, _0221F1A8 ; =0x00001FA8 @@ -6312,7 +6312,7 @@ ov08_0221F07C: ; 0x0221F07C add r0, r4, r6 sub r3, r7, r3 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] bl String_Delete ldr r0, [sp, #0x24] @@ -6352,7 +6352,7 @@ ov08_0221F07C: ; 0x0221F07C add r0, r4, r6 add r3, r7, r3 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x28] bl String_Delete ldr r0, [sp, #0x2c] @@ -6411,7 +6411,7 @@ _0221F1DA: mov r1, #4 add r2, r6, #0 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, r4 @@ -6459,7 +6459,7 @@ _0221F23C: add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r5, #0 @@ -6502,7 +6502,7 @@ ov08_0221F284: ; 0x0221F284 add r0, r4, r6 mov r3, #0x28 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete ldr r0, _0221F3C4 ; =0x00001FA8 @@ -6526,7 +6526,7 @@ ov08_0221F284: ; 0x0221F284 add r0, r4, r6 mov r3, #0x50 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] bl String_Delete ldr r0, _0221F3C4 ; =0x00001FA8 @@ -6562,7 +6562,7 @@ ov08_0221F284: ; 0x0221F284 add r2, r7, #0 str r1, [sp, #0xc] str r3, [sp, #0x1c] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] bl String_Delete ldr r0, _0221F3C4 ; =0x00001FA8 @@ -6602,7 +6602,7 @@ ov08_0221F284: ; 0x0221F284 add r2, r7, #0 sub r3, r3, r5 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x24] bl String_Delete add r0, r7, #0 @@ -6695,7 +6695,7 @@ ov08_0221F3D0: ; 0x0221F3D0 add r0, r4, r6 sub r3, r3, r5 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete ldr r0, [sp, #0x14] @@ -7040,7 +7040,7 @@ _0221F714: ldr r0, [sp, #0x18] mov r1, #4 add r3, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete cmp r5, #0 @@ -7062,7 +7062,7 @@ _0221F714: add r2, r5, #0 add r3, r4, r3 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0221F794 _0221F778: mov r0, #8 @@ -7077,7 +7077,7 @@ _0221F778: add r2, r5, #0 add r3, r4, r3 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0221F794: add r0, r5, #0 bl String_Delete @@ -8170,7 +8170,7 @@ ov08_02220084: ; 0x02220084 ldr r0, [r5, r0] add r3, r1, #0 add r0, #0x40 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete ldr r0, _022201B0 ; =0x00002070 @@ -14609,7 +14609,7 @@ ov08_022234A4: ; 0x022234A4 mov r0, #0 str r0, [sp, #0xc] add r0, r5, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r5, r4 @@ -14709,7 +14709,7 @@ _02223508: mov r1, #4 add r0, #0x40 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete ldr r0, [r5, #0x2c] @@ -14786,7 +14786,7 @@ ov08_022235D4: ; 0x022235D4 str r0, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r4, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete _02223666: @@ -14857,7 +14857,7 @@ ov08_02223678: ; 0x02223678 str r3, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r4, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete _022236FA: @@ -15007,7 +15007,7 @@ ov08_022237C4: ; 0x022237C4 add r0, r4, r0 add r3, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete ldr r0, [r5, #0x10] @@ -15045,7 +15045,7 @@ ov08_022237C4: ; 0x022237C4 ldr r2, [r5, #0x18] add r0, r4, r0 add r3, r6, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete ldr r0, [r5, #0x10] @@ -15088,7 +15088,7 @@ ov08_022237C4: ; 0x022237C4 ldr r2, [r5, #0x18] add r0, r4, r0 sub r3, r6, r3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete mov r0, #0x19 @@ -15252,7 +15252,7 @@ ov08_022239CC: ; 0x022239CC str r1, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r4, #0 @@ -15300,7 +15300,7 @@ ov08_02223A3C: ; 0x02223A3C add r0, r4, #0 mov r3, #4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r4, #0 diff --git a/asm/overlay_101.s b/asm/overlay_101.s index 612e54e56..124f7a135 100644 --- a/asm/overlay_101.s +++ b/asm/overlay_101.s @@ -2542,7 +2542,7 @@ ov101_021E8AE4: ; 0x021E8AE4 ldr r2, [r2] add r0, r5, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #0x3c] str r0, [sp, #0x18] mov r0, #0x81 @@ -6591,7 +6591,7 @@ _021EAA40: add r2, #0x9c ldr r2, [r2] mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldrb r0, [r5, #0xd] cmp r0, #0 bne _021EAA9C @@ -6643,7 +6643,7 @@ _021EAABE: add r2, #0xa4 ldr r2, [r2] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] cmp r0, #0 beq _021EAB48 @@ -6795,7 +6795,7 @@ _021EAB5A: add r2, #0x90 ldr r2, [r2] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, [sp, #0x2c] add r0, r5, #0 ldrh r1, [r1] @@ -6920,7 +6920,7 @@ _021EACC2: ldr r2, [r2] mov r1, #0 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021EAD1E: add r6, r6, #1 add r4, #0x28 @@ -7055,7 +7055,7 @@ _021EADDE: ldr r2, [r2] add r0, r5, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, r5, #0 mov r2, #0x81 lsl r2, r2, #2 @@ -7120,7 +7120,7 @@ ov101_021EAE54: ; 0x021EAE54 ldr r2, [r2] add r0, r7, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r7, #0x10] mov r1, #1 ldr r0, [r0, #0x74] @@ -7944,7 +7944,7 @@ ov101_021EB4C4: ; 0x021EB4C4 add r5, #0xa8 ldr r2, [r5] mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, pc} _021EB4FC: @@ -7989,7 +7989,7 @@ _021EB4FC: add r5, #0x90 ldr r2, [r5] mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 @@ -14482,7 +14482,7 @@ _021EE82A: ldr r2, [r2] add r0, r5, r0 mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] mov r1, #1 add r0, #0xe8 @@ -17652,7 +17652,7 @@ ov101_021F0080: ; 0x021F0080 ldr r2, [r4, #0x20] add r0, #0x48 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021F00B8 ; =0x000005F3 bl PlaySE add sp, #0x10 @@ -17696,7 +17696,7 @@ _021F00DC: ldr r2, [r4, #0x20] add r0, #0x48 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021F0174 ; =0x000005DC bl PlaySE b _021F0162 @@ -18184,7 +18184,7 @@ ov101_021F0464: ; 0x021F0464 add r0, #0x58 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021F0552 _021F0508: mov r1, #0 @@ -18994,7 +18994,7 @@ ov101_021F0ACC: ; 0x021F0ACC add r0, r5, #0 ldr r2, [r4, r6] add r0, #0x78 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021F0B6C _021F0B48: add r0, #0x78 @@ -21052,7 +21052,7 @@ _021F1A88: lsl r0, r0, #4 ldr r0, [r5, r0] mov r3, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0xff lsl r0, r0, #2 ldrb r1, [r4, #8] @@ -21070,7 +21070,7 @@ _021F1A88: lsl r0, r0, #4 ldr r0, [r5, r0] mov r3, #0x5e - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021F1B32 _021F1ADE: mov r0, #0xff @@ -21092,7 +21092,7 @@ _021F1ADE: lsl r0, r0, #4 ldr r0, [r5, r0] mov r3, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0xff lsl r0, r0, #2 ldrb r1, [r4, #8] @@ -21110,7 +21110,7 @@ _021F1ADE: lsl r0, r0, #4 ldr r0, [r5, r0] mov r3, #0x5e - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021F1B32: ldr r0, [sp, #0x30] cmp r0, #0 @@ -21983,7 +21983,7 @@ PhoneCallMessagePrint: ; 0x021F21A0 str r1, [sp, #0xc] ldr r0, [r4, #0xc] ldr r2, [r4, #0x54] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, #0x35 strb r0, [r4] add sp, #0x10 @@ -22324,7 +22324,7 @@ _021F2450: ldr r0, [r5, #0xc] ldr r2, [r2, #0x68] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} _021F2472: @@ -22338,7 +22338,7 @@ _021F2472: ldr r0, [r5, #0xc] ldr r2, [r2, #0x74] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -29756,7 +29756,7 @@ ov101_021F5C44: ; 0x021F5C44 str r1, [sp, #0xc] ldr r0, [r4, #0x10] ldr r2, [r4, #0x4c] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0 str r1, [sp] mov r0, #0xff @@ -29767,7 +29767,7 @@ ov101_021F5C44: ; 0x021F5C44 str r1, [sp, #0xc] ldr r0, [r4, #0x14] ldr r2, [r4, #0x50] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r4, #0x10] bl ScheduleWindowCopyToVram ldr r0, [r4, #0x14] @@ -29806,7 +29806,7 @@ _021F5CBE: ldr r0, [r5, #0xc] add r2, r4, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end PrintRadioLine diff --git a/asm/overlay_102.s b/asm/overlay_102.s index fe48e22d9..1c5b905e6 100644 --- a/asm/overlay_102.s +++ b/asm/overlay_102.s @@ -3819,7 +3819,7 @@ _021E92CA: lsl r0, r0, #2 add r0, r7, r0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] add r6, r6, #1 add r5, #0x10 @@ -6932,7 +6932,7 @@ _021EAB84: ldr r0, [sp, #0x14] mov r1, #1 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, [sp, #0x20] mov r0, #1 mov r2, #0 @@ -7257,7 +7257,7 @@ ov102_021EAD98: ; 0x021EAD98 ldrsh r3, [r3, r6] ldr r2, [r5, #0x7c] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021EADE2: add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -7367,7 +7367,7 @@ _021EAE68: str r3, [sp, #0xc] ldr r0, [r4, #0x5c] add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, #0 @@ -7388,7 +7388,7 @@ _021EAECA: str r3, [sp, #0xc] ldr r0, [r4, #0x5c] ldr r2, [r4, #0x7c] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021EAF34 _021EAEEE: ldr r0, [r4, #0x78] @@ -7405,7 +7405,7 @@ _021EAEEE: str r3, [sp, #0xc] ldr r0, [r4, #0x5c] ldr r2, [r4, #0x7c] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021EAF34 _021EAF12: ldr r0, [r4, #0x78] @@ -7422,7 +7422,7 @@ _021EAF12: str r3, [sp, #0xc] ldr r0, [r4, #0x5c] ldr r2, [r4, #0x7c] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021EAF34: ldr r0, [r4, #0x5c] bl CopyWindowToVram @@ -7994,7 +7994,7 @@ _021EB366: add r0, r4, #0 mov r1, #4 asr r3, r7, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r6, r6, #1 add r4, #0x10 add r5, r5, #4 @@ -8087,7 +8087,7 @@ _021EB3F6: add r0, #0x44 mov r1, #4 asr r3, r4, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 mov r1, #0 bl ScheduleBgTilemapBufferTransfer @@ -8611,7 +8611,7 @@ _021EB7EC: str r0, [sp, #0xc] add r0, sp, #0x28 add r2, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, sp, #0x28 bl PutWindowTilemap add r0, sp, #0x28 @@ -8708,7 +8708,7 @@ _021EB8FC: add r0, sp, #0x20 mov r1, #0 add r3, r3, #3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, r5, #1 cmp r5, r7 blo _021EB8D8 @@ -9837,7 +9837,7 @@ ov102_021EC13C: ; 0x021EC13C ldr r2, [r5, #0x3c] add r0, #0x10 mul r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021EC178: @@ -9859,7 +9859,7 @@ _021EC178: add r0, r5, #0 ldr r2, [r5, #0x3c] add r0, #0x20 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0 mov r0, #1 add r1, r7, #0 diff --git a/asm/overlay_103.s b/asm/overlay_103.s index 8bc39b97f..6f928b249 100644 --- a/asm/overlay_103.s +++ b/asm/overlay_103.s @@ -3510,7 +3510,7 @@ _021EE412: add r0, r6, #0 add r2, r7, #0 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov103_021EE3E4 @@ -3991,7 +3991,7 @@ ov103_021EE7DC: ; 0x021EE7DC add r2, #0x68 ldr r2, [r4, r2] mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r1, r6, #0 ldr r2, [r5, #0xc] add r1, #0x6c diff --git a/asm/overlay_108.s b/asm/overlay_108.s index 95072192d..a15a34785 100644 --- a/asm/overlay_108.s +++ b/asm/overlay_108.s @@ -3591,7 +3591,7 @@ ov108_021E756C: ; 0x021E756C ldr r0, _021E7648 ; =0x000004A4 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0xe7 lsl r1, r1, #2 ldr r0, [r5, r1] @@ -3841,7 +3841,7 @@ _021E77AC: ldr r2, [sp, #0x24] ldr r2, [r2, r3] ldr r3, [sp, #0x20] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -3903,7 +3903,7 @@ ov108_021E77D4: ; 0x021E77D4 str r1, [sp, #0xc] sub r2, #0xd8 ldr r2, [r5, r2] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0xd lsl r0, r0, #6 ldr r0, [r5, r0] @@ -4475,7 +4475,7 @@ _021E7C76: ldr r2, [r5, r2] add r0, r0, r7 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] add r0, r0, r7 bl CopyWindowToVram @@ -4590,7 +4590,7 @@ _021E7D3E: ldr r2, [r5, r2] add r0, r5, r6 add r3, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl ScheduleWindowCopyToVram ldr r0, _021E7EA4 ; =0x000184E3 @@ -4699,7 +4699,7 @@ _021E7E14: ldr r2, [r5, r2] add r0, r6, r4 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, r4 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x18] @@ -4765,7 +4765,7 @@ ov108_021E7EB0: ; 0x021E7EB0 sub r2, #0xe8 ldr r2, [r5, r2] add r0, r5, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r3, _021E7F78 ; =0x000184E0 ldrb r1, [r5, r3] cmp r1, #6 @@ -4805,7 +4805,7 @@ ov108_021E7EB0: ; 0x021E7EB0 ldr r2, [r5, r2] add r0, r5, r4 add r3, #0x90 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E7F66: add r0, r5, r4 bl ScheduleWindowCopyToVram @@ -8853,7 +8853,7 @@ ov108_021E9F20: ; 0x021E9F20 lsl r2, r2, #4 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021E9F8C ; =0x00000474 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -9089,7 +9089,7 @@ _021EA0B0: add r0, r7, r0 mov r1, #4 asr r3, r6, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] add r0, r7, r0 bl ScheduleWindowCopyToVram @@ -9147,7 +9147,7 @@ _021EA170: ldr r2, [r5, r2] add r0, r5, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021EA258 ; =0x00000484 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -9254,7 +9254,7 @@ ov108_021EA260: ; 0x021EA260 add r0, r4, r0 mov r1, #4 asr r3, r5, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021EA2DC ; =0x00000494 add r0, r4, r0 bl ScheduleWindowCopyToVram @@ -9410,7 +9410,7 @@ _021EA3DE: ldr r2, [r5, r2] add r0, r5, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021EA40C ; =0x00000454 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -9458,7 +9458,7 @@ ov108_021EA418: ; 0x021EA418 ldr r2, [r5, r2] add r0, r5, r0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021EA474 ; =0x00000464 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -9527,7 +9527,7 @@ _021EA4BA: ldr r2, [r4, r2] add r0, r4, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021EA500 ; =0x000004A4 add r0, r4, r0 bl ScheduleWindowCopyToVram diff --git a/asm/overlay_109.s b/asm/overlay_109.s index 07333c062..a45f3fb93 100644 --- a/asm/overlay_109.s +++ b/asm/overlay_109.s @@ -3411,7 +3411,7 @@ _021E7342: add r0, r5, #0 ldr r2, [r5, #0x2c] add r0, #0x70 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x70 bl ScheduleWindowCopyToVram @@ -3473,7 +3473,7 @@ _021E73B2: ldr r2, [r4, #0x30] add r0, #0x50 mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x50 bl ScheduleWindowCopyToVram @@ -3520,7 +3520,7 @@ _021E7412: ldr r2, [r2, #0x34] add r0, #0x60 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021E7462 _021E7440: mov r1, #0 @@ -3535,7 +3535,7 @@ _021E7440: ldr r2, [r2, #0x34] add r0, #0x60 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r1, r5, #0 add r1, #0x21 strb r0, [r1] diff --git a/asm/overlay_111.s b/asm/overlay_111.s index 215a0d735..17c3e6295 100644 --- a/asm/overlay_111.s +++ b/asm/overlay_111.s @@ -2342,7 +2342,7 @@ _021E6ADE: ldr r2, [r6] add r0, r4, #0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, r0, #0 ldr r2, _021E6B28 ; =0x000003D2 add r0, r4, #0 @@ -2384,7 +2384,7 @@ ov111_021E6B30: ; 0x021E6B30 str r1, [sp, #0xc] ldrb r3, [r3, #0x18] add r0, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x10 diff --git a/asm/overlay_112.s b/asm/overlay_112.s index a14d774c1..a1ebdef86 100644 --- a/asm/overlay_112.s +++ b/asm/overlay_112.s @@ -6705,7 +6705,7 @@ ov112_021E90FC: ; 0x021E90FC add r0, r5, #0 mov r1, #5 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #5 bl FontID_Release add r0, r4, #0 @@ -6757,7 +6757,7 @@ _021E9170: add r0, r5, #0 add r2, r6, #0 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r7, r7, #1 @@ -6794,7 +6794,7 @@ _021E91B4: add r0, r0, r1 mov r1, #5 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, r5, #1 @@ -6821,7 +6821,7 @@ _021E91B4: add r0, #0xd0 mov r1, #5 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #0xc @@ -6848,7 +6848,7 @@ _021E91B4: add r0, #0xe0 mov r3, #2 str r0, [sp, #0x10] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #5 @@ -8535,7 +8535,7 @@ ov112_021E9FA4: ; 0x021E9FA4 add r1, r7, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -8563,7 +8563,7 @@ ov112_021E9FD8: ; 0x021E9FD8 add r1, r7, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -8592,7 +8592,7 @@ ov112_021EA010: ; 0x021EA010 add r1, r7, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -21641,7 +21641,7 @@ ov112_021F06CC: ; 0x021F06CC add r0, r5, #0 ldr r2, [r5, #0x70] add r0, #0x38 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x38 bl CopyWindowToVram @@ -21680,7 +21680,7 @@ ov112_021F06CC: ; 0x021F06CC add r0, #8 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #8 bl CopyWindowToVram @@ -21724,7 +21724,7 @@ ov112_021F06CC: ; 0x021F06CC add r0, r5, #0 add r0, #0x18 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x18 bl CopyWindowToVram @@ -21752,7 +21752,7 @@ ov112_021F06CC: ; 0x021F06CC add r0, #0x48 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x48 bl CopyWindowToVram @@ -21782,7 +21782,7 @@ _021F0820: add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x48 bl CopyWindowToVram @@ -21817,7 +21817,7 @@ _021F0876: add r0, #0x28 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x28 bl CopyWindowToVram @@ -21848,7 +21848,7 @@ _021F0876: add r0, #0x58 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, #0x58 add r0, r5, #0 bl CopyWindowToVram @@ -23260,7 +23260,7 @@ _021F1370: ldr r1, [sp, #0x28] ldr r3, [sp, #0x10] add r0, r4, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r6 @@ -23337,7 +23337,7 @@ ov112_021F13CC: ; 0x021F13CC ldr r0, [sp, #0x10] add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r4, #0 @@ -23354,7 +23354,7 @@ _021F145A: ldr r0, [sp, #0x10] add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021F1472: add r0, r6, #0 bl String_Delete diff --git a/asm/overlay_113.s b/asm/overlay_113.s index 47ac0127e..d0602fd0a 100644 --- a/asm/overlay_113.s +++ b/asm/overlay_113.s @@ -701,7 +701,7 @@ _021E5DF6: add r0, r4, #0 ldr r2, [r4, #0x50] add r0, #0x98 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x78 bl ScheduleWindowCopyToVram @@ -754,7 +754,7 @@ ov113_021E5E64: ; 0x021E5E64 ldr r2, [r4, #0x54] add r0, #0x68 mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, #0x68 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -1262,7 +1262,7 @@ ov113_021E6274: ; 0x021E6274 str r1, [sp, #0xc] add r1, r2, #0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, pc} .balign 4, 0 diff --git a/asm/overlay_115.s b/asm/overlay_115.s index 5116654da..cf36527e7 100644 --- a/asm/overlay_115.s +++ b/asm/overlay_115.s @@ -361,7 +361,7 @@ _0225F2DE: add r0, r4, r0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete add r0, r4, #0 @@ -1659,7 +1659,7 @@ _0225FC0E: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete mov r0, #3 diff --git a/asm/overlay_117.s b/asm/overlay_117.s index 83aa80db5..97ecd9837 100644 --- a/asm/overlay_117.s +++ b/asm/overlay_117.s @@ -814,7 +814,7 @@ _0225F560: add r2, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0 diff --git a/asm/overlay_121.s b/asm/overlay_121.s index 2e5862fca..05c620649 100644 --- a/asm/overlay_121.s +++ b/asm/overlay_121.s @@ -2311,7 +2311,7 @@ _021E6B0E: str r0, [sp, #0xc] ldr r2, [r4, #0x6c] add r0, r4, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #1 str r0, [sp] mov r0, #2 @@ -2338,7 +2338,7 @@ _021E6B0E: str r0, [sp, #0xc] ldr r0, [sp, #0x28] ldr r2, [r4, #0x6c] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #1 str r0, [sp] str r0, [sp, #4] @@ -2375,7 +2375,7 @@ _021E6B0E: ldr r2, [r4, #0x6c] mov r1, #0 sub r3, r3, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] ldr r1, [sp, #0x1c] add r2, r4, r0 @@ -2466,7 +2466,7 @@ ov121_021E6C5C: ; 0x021E6C5C add r0, #0x44 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x44 @@ -2501,7 +2501,7 @@ ov121_021E6CA4: ; 0x021E6CA4 add r0, #0x34 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x34 @@ -2570,7 +2570,7 @@ ov121_021E6CEC: ; 0x021E6CEC add r0, #0x54 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x54 @@ -2612,7 +2612,7 @@ ov121_021E6D80: ; 0x021E6D80 add r0, #0x54 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x54 @@ -2666,7 +2666,7 @@ _021E6DF6: add r0, #0x24 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x10 str r0, [sp] mov r0, #0xff @@ -2679,7 +2679,7 @@ _021E6DF6: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, #0 @@ -2722,7 +2722,7 @@ ov121_021E6E68: ; 0x021E6E68 add r0, #0x54 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x54 diff --git a/asm/overlay_12_battle_command.s b/asm/overlay_12_battle_command.s index 9c678544a..1a27d9e6e 100644 --- a/asm/overlay_12_battle_command.s +++ b/asm/overlay_12_battle_command.s @@ -4007,7 +4007,7 @@ _022483C6: add r0, sp, #0x68 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, sp, #0x68 mov r1, #1 mov r2, #5 diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 78ac5cb70..28593a730 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -31100,7 +31100,7 @@ _021F4F66: add r0, r7, #0 add r1, r4, #0 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end ov14_021F4F24 @@ -34530,7 +34530,7 @@ _021F6996: add r0, #0x30 ldr r2, [r2, #0x28] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl DestroyMsgData add sp, #0x10 diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 5ed1d6ec9..0f90bb1b7 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -10345,7 +10345,7 @@ _021FE5F4: add r0, r5, #4 mov r3, #0x14 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x10 @@ -10381,7 +10381,7 @@ ov15_021FE620: ; 0x021FE620 add r0, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0x2f @@ -10401,7 +10401,7 @@ ov15_021FE620: ; 0x021FE620 add r2, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0x2f @@ -10420,7 +10420,7 @@ ov15_021FE620: ; 0x021FE620 add r0, r4, #0 mov r3, #0x48 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0x2f @@ -10439,7 +10439,7 @@ ov15_021FE620: ; 0x021FE620 add r0, r4, #0 mov r3, #0xa8 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0x2f @@ -10459,7 +10459,7 @@ ov15_021FE620: ; 0x021FE620 add r2, r6, #0 mov r3, #0xa8 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, [sp, #0x10] @@ -10503,7 +10503,7 @@ ov15_021FE620: ; 0x021FE620 ldr r2, [r5, r2] add r0, r4, #0 mov r3, #0x30 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] mov r1, #2 bl GetMoveAttr @@ -10555,7 +10555,7 @@ _021FE79C: ldr r2, [r5, r2] add r0, r4, #0 mov r3, #0xe8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] mov r1, #4 bl GetMoveAttr @@ -10607,7 +10607,7 @@ _021FE80C: ldr r2, [r5, r2] add r0, r4, #0 mov r3, #0xe8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -11202,7 +11202,7 @@ ov15_021FECD8: ; 0x021FECD8 add r0, r5, #0 mov r3, #0x14 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r5, #0 @@ -11296,7 +11296,7 @@ ov15_021FED60: ; 0x021FED60 add r0, #0x24 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, #0x24 add r0, r5, #0 bl ScheduleWindowCopyToVram @@ -11387,7 +11387,7 @@ _021FEE2C: ldr r2, [sp, #0x14] add r0, r5, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -11687,7 +11687,7 @@ ov15_021FF068: ; 0x021FF068 ldr r2, [r5, r2] add r0, r5, r6 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -11734,7 +11734,7 @@ ov15_021FF0FC: ; 0x021FF0FC add r0, r5, r6 mov r3, #4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete b _021FF160 @@ -11792,7 +11792,7 @@ _021FF160: add r2, r4, #0 sub r3, r3, r7 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x10] @@ -11926,7 +11926,7 @@ ov15_021FF29C: ; 0x021FF29C add r0, #0x74 add r3, #8 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021FF308 _021FF2EE: mov r1, #0 @@ -11940,7 +11940,7 @@ _021FF2EE: add r0, #0x74 mov r3, #5 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021FF308: add r5, #0x74 add r0, r5, #0 @@ -12147,7 +12147,7 @@ _021FF470: mov r1, #0 ldr r2, [r7, r2] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021FF494: ldr r0, [sp, #0x28] add r6, r6, #1 @@ -12285,7 +12285,7 @@ _021FF586: str r0, [sp, #8] add r0, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x28] ldr r2, [r4] lsl r7, r0, #2 @@ -12324,7 +12324,7 @@ _021FF5D8: str r0, [sp, #8] add r0, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x28] lsl r7, r0, #2 mov r0, #0x8e @@ -12366,7 +12366,7 @@ _021FF632: str r0, [sp, #8] add r0, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r3, [sp, #0x28] mov r1, #0xbd lsl r1, r1, #2 @@ -12417,7 +12417,7 @@ ov15_021FF66C: ; 0x021FF66C add r2, r4, #0 mov r3, #0x30 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x10 @@ -12489,7 +12489,7 @@ _021FF6E0: add r0, #0x64 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, #0x64 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -12533,7 +12533,7 @@ ov15_021FF758: ; 0x021FF758 sub r3, r4, r3 add r0, r6, #0 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021FF79E: add r0, r6, #0 bl ScheduleWindowCopyToVram @@ -12577,7 +12577,7 @@ ov15_021FF7C4: ; 0x021FF7C4 lsl r2, r2, #2 ldr r2, [r4, r2] mov r3, #5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x7d lsl r0, r0, #2 add r0, r4, r0 @@ -12606,7 +12606,7 @@ ov15_021FF7FC: ; 0x021FF7FC lsl r2, r2, #2 ldr r2, [r4, r2] mov r3, #5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x7d lsl r0, r0, #2 add r0, r4, r0 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 0a87fb6fd..f597a2f13 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -39567,7 +39567,7 @@ _021F962A: add r0, r6, #0 add r2, r7, #0 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov18_021F95FC diff --git a/asm/overlay_19.s b/asm/overlay_19.s index 19b574827..aaf86af86 100644 --- a/asm/overlay_19.s +++ b/asm/overlay_19.s @@ -889,7 +889,7 @@ ov19_02259F64: ; 0x02259F64 ldr r2, [r4, #0x30] add r0, #0x3c mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x3c bl ScheduleWindowCopyToVram @@ -929,7 +929,7 @@ _02259FD4: add r0, r4, #0 ldr r2, [r4, #0x2c] add r0, #0x4c - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x4c bl ScheduleWindowCopyToVram diff --git a/asm/overlay_27.s b/asm/overlay_27.s index fbe13aced..f931a41d8 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -129,7 +129,7 @@ ov27_02259F80: ; 0x02259F80 add r2, #0xe4 ldr r2, [r4, r2] mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0 mov r2, #0x3e str r1, [sp] @@ -143,7 +143,7 @@ ov27_02259F80: ; 0x02259F80 add r2, #0xe4 ldr r2, [r4, r2] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ov27_0225BCE8 add r0, r4, #0 @@ -826,7 +826,7 @@ ov27_0225A61C: ; 0x0225A61C add r2, #0xe0 ldr r2, [r4, r2] mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0xf lsl r0, r0, #6 ldr r0, [r5, r0] @@ -3445,7 +3445,7 @@ ov27_0225BB38: ; 0x0225BB38 add r2, r6, #0 mov r3, #3 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -3672,7 +3672,7 @@ _0225BCF6: add r0, r4, #0 mov r1, #0 asr r3, r7, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0225BD2C: add r6, r6, #1 add r5, #8 @@ -3972,7 +3972,7 @@ _0225BF48: str r0, [sp, #8] add r0, sp, #0x14 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, sp, #0x14 @@ -4931,7 +4931,7 @@ _0225C6B0: ldr r2, [r7] add r0, r4, #0 mov r3, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram add r5, r5, #1 @@ -5205,7 +5205,7 @@ ov27_0225C8D0: ; 0x0225C8D0 add r0, r5, #0 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 diff --git a/asm/overlay_28.s b/asm/overlay_28.s index 488642506..cb4e87af4 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -379,7 +379,7 @@ _0225D7FC: add r0, r4, #0 mov r1, #4 mov r3, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl CopyWindowPixelsToVram_TextMode ldr r0, [sp, #0x10] diff --git a/asm/overlay_29.s b/asm/overlay_29.s index 81644929c..41f0ccccd 100644 --- a/asm/overlay_29.s +++ b/asm/overlay_29.s @@ -314,7 +314,7 @@ _0225D73A: mov r0, #0 str r0, [sp, #0xc] add r0, r5, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r5, r4 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index cc9bcdbe9..a4429ce1b 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -203,7 +203,7 @@ ov31_0225D684: ; 0x0225D684 add r0, #0x64 add r3, #8 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0225D6F8 _0225D6DE: mov r1, #0 @@ -217,7 +217,7 @@ _0225D6DE: add r0, #0x64 mov r3, #5 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0225D6F8: add r5, #0x64 add r0, r5, #0 @@ -1100,7 +1100,7 @@ ov31_0225DE00: ; 0x0225DE00 add r0, r1, #0 add r1, r3, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, pc} nop @@ -1146,7 +1146,7 @@ _0225DE3A: add r2, r4, #0 mov r3, #0x24 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x10 @@ -1196,7 +1196,7 @@ _0225DEBC: add r0, #0x74 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #0x10 @@ -1268,7 +1268,7 @@ _0225DF2A: add r2, r4, #0 sub r3, r3, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r4, #0 @@ -1358,7 +1358,7 @@ _0225DFEC: add r0, #0x54 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -1615,7 +1615,7 @@ ov31_0225E20C: ; 0x0225E20C add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #5 @@ -1667,7 +1667,7 @@ ov31_0225E20C: ; 0x0225E20C add r2, r4, #0 sub r3, r3, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r7, #0 @@ -1765,7 +1765,7 @@ ov31_0225E2D4: ; 0x0225E2D4 add r2, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #4 str r0, [sp] mov r2, #0xff @@ -1778,7 +1778,7 @@ ov31_0225E2D4: ; 0x0225E2D4 add r2, r7, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r7, #0 @@ -1848,7 +1848,7 @@ ov31_0225E2D4: ; 0x0225E2D4 add r2, r6, #0 sub r3, r3, r4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r7, #0 @@ -1885,7 +1885,7 @@ ov31_0225E474: ; 0x0225E474 add r2, r4, #0 mov r3, #4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x45 lsl r0, r0, #2 add r0, r5, r0 diff --git a/asm/overlay_32.s b/asm/overlay_32.s index c5a58211a..ca0f4487b 100644 --- a/asm/overlay_32.s +++ b/asm/overlay_32.s @@ -359,7 +359,7 @@ _0225D796: str r1, [sp, #0xc] add r0, #0x24 mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, #0 @@ -435,7 +435,7 @@ ov32_0225D84C: ; 0x0225D84C add r0, #0x34 add r3, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #4 @@ -474,7 +474,7 @@ ov32_0225D84C: ; 0x0225D84C add r0, #0x34 add r3, r4, r7 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete mov r0, #0x51 @@ -517,7 +517,7 @@ ov32_0225D84C: ; 0x0225D84C add r0, r5, #0 add r0, #0x34 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -620,7 +620,7 @@ _0225D9D4: add r0, r5, r0 mov r1, #4 sub r3, r3, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] add r0, r5, r0 bl CopyWindowPixelsToVram_TextMode diff --git a/asm/overlay_33.s b/asm/overlay_33.s index 95ffcbbac..bc919fd27 100644 --- a/asm/overlay_33.s +++ b/asm/overlay_33.s @@ -558,7 +558,7 @@ _0225D912: mov r0, #0 str r0, [sp, #0xc] add r0, r4, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r6 bl CopyWindowPixelsToVram_TextMode add r0, r4, r6 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index fb75cb7d7..87c135f21 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -24,7 +24,7 @@ ov34_0225D520: ; 0x0225D520 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x10 @@ -928,7 +928,7 @@ ov34_0225DC18: ; 0x0225DC18 str r3, [sp, #0xc] ldr r2, [r6] add r0, r7, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r3, #0 str r3, [sp] mov r0, #0xff @@ -940,7 +940,7 @@ ov34_0225DC18: ; 0x0225DC18 ldr r0, [sp, #0x1c] ldr r2, [r6, #4] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, r4 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] @@ -958,7 +958,7 @@ ov34_0225DC18: ; 0x0225DC18 str r0, [sp, #8] add r0, r5, r4 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0225DCF0: add r0, r5, r4 bl ScheduleWindowCopyToVram diff --git a/asm/overlay_37.s b/asm/overlay_37.s index 1b60605b5..61b030c78 100644 --- a/asm/overlay_37.s +++ b/asm/overlay_37.s @@ -1401,7 +1401,7 @@ ov37_021E6418: ; 0x021E6418 add r0, r7, r0 mov r1, #1 add r3, r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp, #0x14] mov r0, #0x9e @@ -3493,7 +3493,7 @@ _021E74F0: ldr r2, [r4, #0x14] add r0, r5, #0 mov r3, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021E7540 _021E7524: mov r0, #0 @@ -3508,7 +3508,7 @@ _021E7524: ldr r2, [r4, #0x14] add r0, r5, #0 mov r3, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E7540: add r0, r5, #0 bl CopyWindowToVram diff --git a/asm/overlay_39_thumb.s b/asm/overlay_39_thumb.s index 87f546d23..389483c9f 100644 --- a/asm/overlay_39_thumb.s +++ b/asm/overlay_39_thumb.s @@ -3374,7 +3374,7 @@ ov39_0222899C: ; 0x0222899C add r0, r5, #0 mov r1, #1 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov39_0222899C diff --git a/asm/overlay_40.s b/asm/overlay_40.s index 09e9eb81c..02ec70a31 100644 --- a/asm/overlay_40.s +++ b/asm/overlay_40.s @@ -3735,7 +3735,7 @@ _0222D504: add r0, sp, #0x1c add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] ldr r1, [sp, #0x10] ldr r0, [r0, #0x14] @@ -3914,7 +3914,7 @@ ov40_0222D66C: ; 0x0222D66C str r1, [sp, #0xc] add r0, sp, #0x10 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #8] ldr r1, [r5, #0xc] add r2, sp, #0x10 @@ -4886,7 +4886,7 @@ ov40_0222DD9C: ; 0x0222DD9C add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -5026,7 +5026,7 @@ ov40_0222DED0: ; 0x0222DED0 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -5065,7 +5065,7 @@ ov40_0222DF60: ; 0x0222DF60 add r0, r5, r6 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -5175,7 +5175,7 @@ ov40_0222DFE8: ; 0x0222DFE8 add r0, r5, r4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -5277,7 +5277,7 @@ _0222E0D6: str r0, [sp, #0xc] add r0, r4, #0 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram mov r0, #4 @@ -5353,7 +5353,7 @@ _0222E0D6: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x2c] @@ -5408,7 +5408,7 @@ _0222E0D6: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x38] @@ -5441,7 +5441,7 @@ _0222E0D6: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -5473,7 +5473,7 @@ _0222E0D6: add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -5506,7 +5506,7 @@ _0222E33C: add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x44] @@ -5549,7 +5549,7 @@ _0222E33C: ldr r0, [sp, #0x18] mov r3, #4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] bl ScheduleWindowCopyToVram add r0, r5, #0 @@ -5587,7 +5587,7 @@ _0222E434: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -5619,7 +5619,7 @@ _0222E46A: ldr r0, [sp, #0x14] add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl ScheduleWindowCopyToVram add r0, r5, #0 @@ -6138,7 +6138,7 @@ _0222E890: add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x14] @@ -6245,7 +6245,7 @@ _0222E95C: str r0, [sp, #0xc] ldr r0, [sp, #0x18] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] bl String_Delete ldr r0, [r4] @@ -6384,7 +6384,7 @@ _0222EA72: str r0, [sp, #0xc] ldr r0, [sp, #0x20] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x24] bl String_Delete ldr r0, [r4, #0x10] @@ -6451,7 +6451,7 @@ _0222EAC0: mov r6, ip mov r1, #0 sub r3, r3, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -6463,7 +6463,7 @@ _0222EAC0: ldr r0, [sp, #0x20] mov r1, #0 mov r3, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -6475,7 +6475,7 @@ _0222EAC0: ldr r0, [sp, #0x20] add r2, r7, #0 mov r3, #0x16 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete ldr r0, [sp, #0x2c] @@ -6820,7 +6820,7 @@ _0222EDA8: str r0, [sp, #0xc] ldr r0, [sp, #0x50] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r4, #0x28] ldr r0, [r0, #8] cmp r0, #2 @@ -6858,7 +6858,7 @@ _0222EDA8: mov r0, #0 str r0, [sp, #0xc] ldr r0, [sp, #0x50] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0222EE7A: ldr r0, [sp, #0x4c] bl String_Delete @@ -6997,7 +6997,7 @@ _0222EF7C: str r0, [sp, #0xc] ldr r0, [sp, #0x14] ldr r2, [r5] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r7, #8] mov r1, #0 lsl r0, r0, #3 @@ -7013,7 +7013,7 @@ _0222EF7C: str r0, [sp, #0xc] ldr r0, [sp, #0x14] ldr r2, [r5, #4] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r6, #0x10] add r4, r4, #1 add r5, #8 @@ -7095,7 +7095,7 @@ _0222F030: mov r0, #0 str r0, [sp, #0xc] add r0, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #0x28] mov r1, #0 ldr r0, [r0, #8] @@ -7112,7 +7112,7 @@ _0222F030: str r0, [sp, #0xc] ldr r2, [r4, #4] add r0, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0222F07C: ldr r0, [r5, #0x10] add r6, r6, #1 @@ -7412,7 +7412,7 @@ _0222F258: str r0, [sp, #0xc] ldr r0, [sp, #0x58] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r4, #0x28] ldr r0, [r0, #8] cmp r0, #2 @@ -7450,7 +7450,7 @@ _0222F258: mov r0, #0 str r0, [sp, #0xc] ldr r0, [sp, #0x58] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0222F32A: ldr r0, [sp, #0x44] add r0, r0, #1 @@ -7602,7 +7602,7 @@ _0222F42C: mov r0, #0 str r0, [sp, #0xc] ldr r0, [sp, #0x18] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete ldr r0, [sp, #0x10] @@ -7740,7 +7740,7 @@ _0222F500: mov r1, #0 add r2, r7, #0 sub r3, r3, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r4, [sp] mov r0, #0xff str r0, [sp, #4] @@ -7752,7 +7752,7 @@ _0222F500: ldr r0, [sp, #0x28] mov r1, #0 mov r3, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r4, [sp] mov r0, #0xff str r0, [sp, #4] @@ -7764,7 +7764,7 @@ _0222F500: ldr r0, [sp, #0x28] add r2, r5, #0 mov r3, #0x16 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r7, #0 @@ -9181,7 +9181,7 @@ _0222FFAE: str r0, [sp, #0xc] add r0, r5, #0 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram mov r0, #4 @@ -9257,7 +9257,7 @@ _02230062: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x44] @@ -9293,7 +9293,7 @@ _02230062: add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -9358,7 +9358,7 @@ _02230062: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x50] @@ -9525,7 +9525,7 @@ _022302BA: str r0, [sp, #8] ldr r0, [sp, #0x14] str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl ScheduleWindowCopyToVram ldr r0, [sp, #0x38] @@ -11084,7 +11084,7 @@ ov40_02230E34: ; 0x02230E34 str r0, [sp, #8] add r0, r5, r4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, r4 @@ -14159,7 +14159,7 @@ ov40_022326DC: ; 0x022326DC str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r4, r6 @@ -14201,7 +14201,7 @@ ov40_022326DC: ; 0x022326DC str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r6 @@ -15249,7 +15249,7 @@ ov40_02232FEC: ; 0x02232FEC str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r6 @@ -20050,7 +20050,7 @@ ov40_02235868: ; 0x02235868 str r0, [sp, #8] add r0, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, #0 @@ -20488,7 +20488,7 @@ _02235C18: str r0, [sp, #0xc] ldr r0, [sp, #0x20] add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] add r5, r5, #1 add r6, #0x10 @@ -20624,7 +20624,7 @@ _02235D48: str r0, [sp, #0xc] ldr r0, [sp, #0x20] add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] add r5, r5, #1 add r6, #0x10 @@ -21049,7 +21049,7 @@ _02236014: str r0, [sp, #0xc] add r0, r4, #0 mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _022360DA _022360BE: ldr r0, [sp, #0x18] @@ -21064,7 +21064,7 @@ _022360BE: str r0, [sp, #0xc] add r0, r4, #0 mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _022360DA: add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -22932,7 +22932,7 @@ _02236F50: ldr r3, [sp, #0x1c] add r0, r4, #0 mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x18] @@ -23024,7 +23024,7 @@ ov40_02237030: ; 0x02237030 add r0, r5, r6 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -23103,7 +23103,7 @@ ov40_0223707C: ; 0x0223707C add r0, r4, r0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x75 lsl r0, r0, #2 add r0, r4, r0 @@ -23155,7 +23155,7 @@ ov40_02237144: ; 0x02237144 add r0, r5, r6 add r2, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -23271,7 +23271,7 @@ _02237238: add r0, r4, r7 add r2, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r7 bl ScheduleWindowCopyToVram add r0, r5, #0 @@ -24363,7 +24363,7 @@ _02237AE6: str r0, [sp, #0xc] add r0, r4, #0 mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram ldrb r1, [r5, #2] @@ -24419,7 +24419,7 @@ ov40_02237B7C: ; 0x02237B7C str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r6 @@ -24479,7 +24479,7 @@ ov40_02237BD4: ; 0x02237BD4 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r6 bl ScheduleWindowCopyToVram add r0, r5, #0 @@ -24605,7 +24605,7 @@ _02237D16: str r0, [sp, #0xc] add r0, r4, #0 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete _02237D3C: @@ -27286,7 +27286,7 @@ _02239358: str r0, [sp, #0xc] add r0, r4, #0 add r2, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r7, #0 @@ -27428,7 +27428,7 @@ _022394B4: ldr r2, [sp, #0x20] add r0, r4, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x20] @@ -27556,7 +27556,7 @@ _022395CE: add r0, #0x24 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x24 bl ScheduleWindowCopyToVram @@ -27590,7 +27590,7 @@ _0223961A: add r0, #0x34 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x34 bl ScheduleWindowCopyToVram @@ -27731,7 +27731,7 @@ _0223973A: add r0, #0x34 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, #0x34 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -29464,7 +29464,7 @@ _0223A602: add r3, r1, #0 add r0, r5, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _0223A638 ; =0x000008A4 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -31040,7 +31040,7 @@ _0223B31A: add r0, sp, #0x18 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] ldr r1, [sp, #0x10] ldr r0, [r0, #8] @@ -31963,7 +31963,7 @@ ov40_0223BA70: ; 0x0223BA70 add r0, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl ScheduleWindowCopyToVram add r0, r7, #0 @@ -32009,7 +32009,7 @@ ov40_0223BA70: ; 0x0223BA70 str r0, [sp, #8] add r0, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl ScheduleWindowCopyToVram add r0, r5, #0 @@ -33487,7 +33487,7 @@ _0223C7CE: add r3, r1, #0 add r0, r5, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _0223C804 ; =0x000008A4 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -34082,7 +34082,7 @@ ov40_0223CCBC: ; 0x0223CCBC str r0, [sp, #8] add r0, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, #0 @@ -34174,7 +34174,7 @@ ov40_0223CD58: ; 0x0223CD58 str r0, [sp, #8] add r0, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -34216,7 +34216,7 @@ ov40_0223CD58: ; 0x0223CD58 str r0, [sp, #8] add r0, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, #0 @@ -36151,7 +36151,7 @@ _0223DC94: add r0, r4, #0 add r2, r6, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 @@ -36228,7 +36228,7 @@ _0223DD38: add r0, r6, r7 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, r7 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -36285,7 +36285,7 @@ _0223DDB0: add r0, r4, r7 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r7 bl ScheduleWindowCopyToVram add r0, r5, #0 @@ -36381,7 +36381,7 @@ _0223DE84: add r3, r1, #0 add r0, r7, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _0223DEB0 ; =0x00000664 add r0, r7, r0 bl ScheduleWindowCopyToVram @@ -36427,7 +36427,7 @@ _0223DED2: add r0, r5, r6 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -36545,7 +36545,7 @@ _0223DFC6: add r0, r5, #0 add r2, r4, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -36678,7 +36678,7 @@ ov40_0223E0A4: ; 0x0223E0A4 add r0, r4, r6 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r6 bl ScheduleWindowCopyToVram add r0, r7, #0 @@ -36723,7 +36723,7 @@ ov40_0223E0A4: ; 0x0223E0A4 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r6 bl ScheduleWindowCopyToVram add r0, r5, #0 @@ -37499,7 +37499,7 @@ _0223E74A: str r0, [sp, #0xc] add r0, r4, #0 mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0223E810 _0223E7F4: ldr r0, [sp, #0x18] @@ -37514,7 +37514,7 @@ _0223E7F4: str r0, [sp, #0xc] add r0, r4, #0 mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0223E810: add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -42088,7 +42088,7 @@ _02240DCE: add r0, sp, #0x18 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] ldr r1, [sp, #0x10] ldr r0, [r0, #8] @@ -42205,7 +42205,7 @@ _02240EE4: add r3, r1, #0 add r0, r5, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _02240F1C ; =0x000008A4 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -42337,7 +42337,7 @@ _02241014: add r3, r1, #0 add r0, r5, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _0224104C ; =0x000008A4 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -43575,7 +43575,7 @@ ov40_02241A54: ; 0x02241A54 str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r6 @@ -43670,7 +43670,7 @@ ov40_02241AFC: ; 0x02241AFC str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r4, r6 @@ -43712,7 +43712,7 @@ ov40_02241AFC: ; 0x02241AFC str r0, [sp, #8] add r0, r4, r6 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r6 @@ -46099,7 +46099,7 @@ ov40_02242E4C: ; 0x02242E4C add r3, r1, #0 add r0, r5, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _02242FA4 ; =0x000008A4 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -48748,7 +48748,7 @@ _02244372: add r3, r1, #0 add r0, r5, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _022443AC ; =0x000008A4 add r0, r5, r0 bl ScheduleWindowCopyToVram @@ -48808,7 +48808,7 @@ ov40_022443B4: ; 0x022443B4 str r0, [sp, #8] add r0, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -48850,7 +48850,7 @@ ov40_022443B4: ; 0x022443B4 str r0, [sp, #8] add r0, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, #0 diff --git a/asm/overlay_41.s b/asm/overlay_41.s index c10aaa276..c07776434 100644 --- a/asm/overlay_41.s +++ b/asm/overlay_41.s @@ -3905,7 +3905,7 @@ ov41_02247BB8: ; 0x02247BB8 ldr r0, [r5, r0] mov r1, #1 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r6, #0 @@ -3960,7 +3960,7 @@ ov41_02247C7C: ; 0x02247C7C ldr r0, [r5, r0] mov r1, #1 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r6, #0 @@ -10184,7 +10184,7 @@ _0224A940: str r1, [sp, #0xc] add r0, r4, #0 mov r1, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r7, #0 @@ -10827,7 +10827,7 @@ _0224AE3C: mov r0, #0 str r0, [sp, #0xc] add r0, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r6, r0, #0 add r0, r4, #0 bl String_Delete @@ -10878,7 +10878,7 @@ _0224AEA4: str r0, [sp, #0xc] ldr r2, [r4] add r0, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, r0, #0 add r0, r5, #0 bl DestroyMsgData @@ -12976,7 +12976,7 @@ _0224BE9C: ldr r0, [r5, r0] add r2, r7, #0 sub r3, r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete ldr r0, [r5] @@ -13018,7 +13018,7 @@ _0224BE9C: mov r3, #0x80 add r2, r4, #0 sub r3, r3, r5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r7, #0 diff --git a/asm/overlay_43.s b/asm/overlay_43.s index 6c2a63e74..61a081ee3 100644 --- a/asm/overlay_43.s +++ b/asm/overlay_43.s @@ -1434,7 +1434,7 @@ _0222AA22: ldr r2, [r5, #0x74] add r0, r4, #0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, #0x84 str r0, [r5] add r0, r4, #0 @@ -2364,7 +2364,7 @@ _0222B160: mov r1, #4 add r2, r4, #0 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r7, r7, #1 add r5, #0x28 cmp r7, #4 @@ -2806,7 +2806,7 @@ ov43_0222B4BC: ; 0x0222B4BC add r0, r5, #0 ldr r2, [r5, #0x3c] add r0, #0x20 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r0, [r5, #0x34] add r0, r5, #0 add r0, #0x20 @@ -3425,7 +3425,7 @@ _0222B95A: add r2, r4, #0 add r0, #0xb8 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #0 @@ -4939,7 +4939,7 @@ ov43_0222C550: ; 0x0222C550 add r0, r5, #0 ldr r2, [r2] add r0, #0xc8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r1, r5, #0 add r1, #0xdc str r0, [r1] @@ -5660,7 +5660,7 @@ _0222CAD0: add r0, r5, #0 add r2, r6, #0 lsl r3, r3, #3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add sp, #0x28 @@ -6199,7 +6199,7 @@ ov43_0222CE48: ; 0x0222CE48 str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, [sp, #0x24] ldr r2, [sp, #0x1c] add r0, r4, #0 @@ -6223,7 +6223,7 @@ ov43_0222CE48: ; 0x0222CE48 add r0, #0x10 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0222CFB4 _0222CF86: mov r1, #0x36 @@ -6245,7 +6245,7 @@ _0222CF86: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0222CFB4: ldr r0, [r4, #0x54] mov r1, #0x33 @@ -6262,7 +6262,7 @@ _0222CFB4: add r0, #0x20 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, [sp, #0x20] @@ -9331,7 +9331,7 @@ ov43_0222E78C: ; 0x0222E78C ldr r0, [r0, #0x20] ldr r2, [sp, #0x2c] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x2c] bl String_Delete mov r2, #0xb @@ -9909,7 +9909,7 @@ _0222ECA6: lsl r0, r0, #4 add r0, r1, r0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -9944,7 +9944,7 @@ ov43_0222ECD4: ; 0x0222ECD4 str r0, [sp, #0xc] ldr r2, [r4, #0x7c] add r0, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/asm/overlay_44.s b/asm/overlay_44.s index d147f0718..58aec7879 100644 --- a/asm/overlay_44.s +++ b/asm/overlay_44.s @@ -2419,7 +2419,7 @@ _0222B0DA: lsr r2, r2, #1 ldr r2, [r4, r2] mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x2f lsl r0, r0, #4 add r0, r4, r0 @@ -4433,7 +4433,7 @@ _0222C170: add r0, r5, r0 mov r3, #0x20 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete ldr r1, [r5, #4] @@ -4508,7 +4508,7 @@ _0222C214: lsr r2, r2, #1 ldr r2, [r5, r2] mov r3, #0x66 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #1 str r2, [sp] mov r0, #0x57 @@ -12664,7 +12664,7 @@ _02230322: add r0, r5, r0 mov r1, #1 mov r3, #0x20 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r1, r4, #0 bl ov44_02231958 @@ -12695,7 +12695,7 @@ _02230322: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #0x68 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x35 bl PlayerProfile_New add r6, r0, #0 @@ -12732,7 +12732,7 @@ _02230322: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x96 mov r0, #0x5a add r2, r1, #0 @@ -12769,7 +12769,7 @@ _02230322: add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x5a lsl r2, r2, #2 ldr r0, [r5, r2] @@ -12790,7 +12790,7 @@ _02230322: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5] add r1, r4, #0 mov r2, #1 @@ -12832,7 +12832,7 @@ _02230322: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #0x78 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5] add r1, r4, #0 mov r2, #2 @@ -12881,7 +12881,7 @@ _02230322: add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x5a mov r1, #0x2f lsl r0, r0, #2 @@ -12902,7 +12902,7 @@ _02230322: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5] add r1, r4, #0 mov r2, #3 @@ -12951,7 +12951,7 @@ _02230322: add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ov44_02229EF8 cmp r0, #1 @@ -12976,7 +12976,7 @@ _02230322: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5] add r1, r4, #0 mov r2, #9 @@ -13033,7 +13033,7 @@ _022306A8: add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _022306B4: mov r2, #0x5a lsl r2, r2, #2 @@ -13055,7 +13055,7 @@ _022306B4: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5] add r1, r4, #0 mov r2, #6 @@ -13128,7 +13128,7 @@ _022306B4: add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _02230788: mov r3, #2 str r3, [sp] @@ -13200,7 +13200,7 @@ ov44_022307E0: ; 0x022307E0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x5e lsl r1, r1, #2 ldr r1, [r5, r1] @@ -13221,7 +13221,7 @@ ov44_022307E0: ; 0x022307E0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x78 str r0, [sp] mov r0, #0x18 @@ -13251,7 +13251,7 @@ ov44_022307E0: ; 0x022307E0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x78 str r0, [sp] mov r0, #0x30 @@ -13297,7 +13297,7 @@ ov44_022308B0: ; 0x022308B0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x5a lsl r2, r2, #2 ldr r0, [r5, r2] @@ -13318,7 +13318,7 @@ ov44_022308B0: ; 0x022308B0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x5a lsl r2, r2, #2 ldr r0, [r5, r2] @@ -13346,7 +13346,7 @@ ov44_022308B0: ; 0x022308B0 add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x5e lsl r1, r1, #2 ldr r1, [r5, r1] @@ -13367,7 +13367,7 @@ ov44_022308B0: ; 0x022308B0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x68 str r0, [sp] mov r0, #0x30 @@ -13406,7 +13406,7 @@ ov44_022308B0: ; 0x022308B0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x68 str r0, [sp] mov r0, #0x40 @@ -13445,7 +13445,7 @@ ov44_022308B0: ; 0x022308B0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x5a lsl r2, r2, #2 ldr r0, [r5, r2] @@ -13473,7 +13473,7 @@ ov44_022308B0: ; 0x022308B0 add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x5e lsl r1, r1, #2 ldr r1, [r5, r1] @@ -13494,7 +13494,7 @@ ov44_022308B0: ; 0x022308B0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x68 str r0, [sp] mov r0, #0x70 @@ -13533,7 +13533,7 @@ ov44_022308B0: ; 0x022308B0 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x68 str r0, [sp] mov r0, #0x80 @@ -13588,7 +13588,7 @@ ov44_02230B2C: ; 0x02230B2C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x5a lsl r2, r2, #2 ldr r0, [r5, r2] @@ -13618,7 +13618,7 @@ ov44_02230B2C: ; 0x02230B2C add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x5e lsl r1, r1, #2 ldr r1, [r5, r1] @@ -13639,7 +13639,7 @@ ov44_02230B2C: ; 0x02230B2C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x68 str r0, [sp] mov r0, #0x30 @@ -13678,7 +13678,7 @@ ov44_02230B2C: ; 0x02230B2C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x68 str r0, [sp] mov r0, #0x50 @@ -13739,7 +13739,7 @@ ov44_02230C68: ; 0x02230C68 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 mov r1, #0x7c add r2, r4, #0 @@ -13766,7 +13766,7 @@ ov44_02230C68: ; 0x02230C68 add r2, r6, #0 add r0, r5, r0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r1, #0x5e @@ -13789,7 +13789,7 @@ ov44_02230C68: ; 0x02230C68 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x6c str r0, [sp] mov r0, #0x30 @@ -13819,7 +13819,7 @@ ov44_02230C68: ; 0x02230C68 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x6c str r0, [sp] mov r0, #0x50 @@ -13865,7 +13865,7 @@ ov44_02230D8C: ; 0x02230D8C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x5e lsl r1, r1, #2 ldr r1, [r5, r1] @@ -13886,7 +13886,7 @@ ov44_02230D8C: ; 0x02230D8C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x70 str r0, [sp] mov r0, #0x18 @@ -13916,7 +13916,7 @@ ov44_02230D8C: ; 0x02230D8C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x70 str r0, [sp] mov r0, #0x30 @@ -13967,7 +13967,7 @@ ov44_02230E5C: ; 0x02230E5C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _02230FE0 ; =0x00000B1C mov r1, #0 ldr r0, [r5, r0] @@ -14001,7 +14001,7 @@ ov44_02230E5C: ; 0x02230E5C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 add r1, r4, #0 mov r2, #0xa @@ -14046,7 +14046,7 @@ ov44_02230E5C: ; 0x02230E5C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 add r1, r4, #0 mov r2, #0xb @@ -14091,7 +14091,7 @@ ov44_02230E5C: ; 0x02230E5C ldr r2, [r5, r2] add r0, r5, r0 mov r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 add r1, r4, #0 mov r2, #0xc @@ -14282,7 +14282,7 @@ ov44_022310C8: ; 0x022310C8 add r2, #0x79 ldr r2, [r5, r2] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -14555,7 +14555,7 @@ _022312EC: ldr r2, [r5, r2] add r0, r6, #0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl ScheduleWindowCopyToVram add sp, #0x18 @@ -14887,7 +14887,7 @@ _0223153E: str r1, [sp, #0xc] add r0, sp, #0x68 mov r1, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete ldr r1, [sp, #0x2c] @@ -19258,7 +19258,7 @@ _022336DC: add r0, r4, r2 ldr r2, [r4, #0xc] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x67 lsl r0, r0, #2 add r0, r4, r0 @@ -19282,7 +19282,7 @@ _022336DC: add r0, r4, r2 ldr r2, [r4, #0xc] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x6b lsl r0, r0, #2 add r0, r4, r0 @@ -19468,7 +19468,7 @@ _02233890: lsl r0, r0, #2 ldr r2, [r5, #0xc] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor strb r0, [r5, #0x14] mov r0, #0x63 lsl r0, r0, #2 @@ -19618,7 +19618,7 @@ ov44_0223398C: ; 0x0223398C add r2, r7, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x73 lsl r0, r0, #2 add r0, r5, r0 @@ -19768,7 +19768,7 @@ ov44_02233AB8: ; 0x02233AB8 ldr r2, [sp, #0x24] add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, [sp, #0x20] str r7, [sp] add r0, r5, #0 @@ -19794,7 +19794,7 @@ ov44_02233AB8: ; 0x02233AB8 ldr r2, [sp, #0x24] mov r3, #0x48 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x6f lsl r0, r0, #2 add r0, r5, r0 diff --git a/asm/overlay_46.s b/asm/overlay_46.s index 1917787b9..904ade685 100644 --- a/asm/overlay_46.s +++ b/asm/overlay_46.s @@ -1615,7 +1615,7 @@ ov46_022594E0: ; 0x022594E0 ldr r2, [r4, #0x18] add r0, #8 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, pc} nop diff --git a/asm/overlay_47.s b/asm/overlay_47.s index 0b79ad4da..4239c998f 100644 --- a/asm/overlay_47.s +++ b/asm/overlay_47.s @@ -1208,7 +1208,7 @@ ov47_0225916C: ; 0x0225916C str r0, [sp, #8] add r0, r5, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x2c add r1, r4, #0 @@ -1225,7 +1225,7 @@ ov47_0225916C: ; 0x0225916C add r0, r5, #0 mov r1, #1 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x2c add r1, r4, #0 @@ -1242,7 +1242,7 @@ ov47_0225916C: ; 0x0225916C add r0, r5, #0 mov r1, #1 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -1383,7 +1383,7 @@ _022592D4: add r0, r5, #0 ldr r2, [r5, #0x18] add r0, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r0, [r5] add r5, #8 mov r1, #1 @@ -1432,7 +1432,7 @@ _02259338: add r0, r5, #0 ldr r2, [r5, #0x18] add r0, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 mov r1, #1 add r0, #8 @@ -2278,7 +2278,7 @@ ov47_0225999C: ; 0x0225999C mov r1, #1 add r2, r6, #0 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -2316,7 +2316,7 @@ ov47_022599F0: ; 0x022599F0 add r0, #0x10 mov r1, #1 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] ldr r1, [sp, #0x10] mov r2, #1 @@ -2332,7 +2332,7 @@ ov47_022599F0: ; 0x022599F0 add r0, #0x10 mov r1, #1 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] ldr r1, [sp, #0x10] mov r2, #2 @@ -2348,7 +2348,7 @@ ov47_022599F0: ; 0x022599F0 add r0, #0x10 mov r1, #1 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] ldr r1, [r7] ldr r0, [r0, #4] @@ -2397,7 +2397,7 @@ _02259A98: add r0, #0x50 mov r1, #1 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] ldr r1, [sp, #0x10] ldr r2, [r7, #4] @@ -2424,7 +2424,7 @@ _02259A98: mov r1, #1 add r2, r5, #0 add r3, #0x60 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _02259B1C: add r0, r6, #0 add r0, #0x50 diff --git a/asm/overlay_48.s b/asm/overlay_48.s index 75af27147..0d111a948 100644 --- a/asm/overlay_48.s +++ b/asm/overlay_48.s @@ -2805,7 +2805,7 @@ ov48_02259D00: ; 0x02259D00 str r1, [sp, #0xc] add r0, #0x1c mov r1, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #2 bl FontID_Release add r5, #0x1c @@ -4237,7 +4237,7 @@ _0225A7A4: str r0, [sp, #8] str r3, [sp, #0xc] add r0, r5, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, [r6, #4] add r0, r7, #0 bl ov48_0225B0E0 @@ -4252,7 +4252,7 @@ _0225A7A4: str r3, [sp, #0xc] add r0, r5, r4 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, [r6, #4] ldr r2, [r6, #8] add r0, r7, #0 @@ -4268,7 +4268,7 @@ _0225A7A4: add r0, r5, r4 mov r1, #1 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/asm/overlay_49.s b/asm/overlay_49.s index 751fd9008..59d08fa58 100644 --- a/asm/overlay_49.s +++ b/asm/overlay_49.s @@ -4862,7 +4862,7 @@ _0225AB64: str r3, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #1 str r0, [r5, #0x10] add r0, r5, #0 @@ -4908,7 +4908,7 @@ _0225ABC4: str r3, [sp, #0xc] ldr r2, [r5, #0x18] add r0, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #1 add r0, r5, #0 add r2, r1, #0 @@ -5671,7 +5671,7 @@ ov49_0225B148: ; 0x0225B148 add r2, r6, #0 add r3, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -5811,7 +5811,7 @@ ov49_0225B24C: ; 0x0225B24C str r3, [sp, #8] add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 mov r1, #1 mov r2, #0x55 @@ -8143,7 +8143,7 @@ ov49_0225C3DC: ; 0x0225C3DC lsl r0, r4, #4 ldrb r3, [r3, #0x10] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 @@ -8183,7 +8183,7 @@ _0225C43C: add r0, r2, r0 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -8915,7 +8915,7 @@ ov49_0225C970: ; 0x0225C970 str r1, [sp, #0xc] add r0, #0xc add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldrb r0, [r5, #2] cmp r0, #0 str r4, [sp] diff --git a/asm/overlay_53.s b/asm/overlay_53.s index b0d5bf59e..55f8fff07 100644 --- a/asm/overlay_53.s +++ b/asm/overlay_53.s @@ -1282,7 +1282,7 @@ _021E632E: ldr r2, [r4, r2] add r0, #0x1c add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021E63E2 _021E6384: ldr r1, _021E649C ; =ov53_021E84F8 @@ -1329,7 +1329,7 @@ _021E63A6: ldr r2, [r4, r2] add r0, #0x1c add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E63E2: mov r0, #0x11 lsl r0, r0, #4 @@ -1533,7 +1533,7 @@ _021E650C: lsr r3, r5, #0x1f add r3, r5, r3 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl CopyWindowToVram add r0, r6, #0 @@ -4514,7 +4514,7 @@ ov53_021E7D70: ; 0x021E7D70 mov r1, #4 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl CopyWindowToVram add r0, r4, #0 @@ -5244,7 +5244,7 @@ ov53_021E8330: ; 0x021E8330 mov r1, #4 add r2, r5, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl CopyWindowToVram add r0, r7, #0 diff --git a/asm/overlay_54.s b/asm/overlay_54.s index f80ba7698..c40fd02b2 100644 --- a/asm/overlay_54.s +++ b/asm/overlay_54.s @@ -1089,7 +1089,7 @@ _021E61D2: mov r1, #1 add r2, r4, #0 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021E620C: @@ -1103,7 +1103,7 @@ _021E620C: mov r1, #1 add r2, r4, #0 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0xca lsl r1, r1, #2 strb r0, [r5, r1] @@ -1138,7 +1138,7 @@ ov54_021E6238: ; 0x021E6238 add r2, r5, #0 mov r3, #2 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_SetEmpty add r0, r6, #0 @@ -1169,7 +1169,7 @@ _021E6282: add r0, r7, #0 add r2, r5, #0 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -1193,7 +1193,7 @@ _021E6282: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_SetEmpty ldr r0, [r6, #0x28] @@ -1212,7 +1212,7 @@ _021E6282: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r4, #0 _021E6316: add r0, r6, #0 @@ -1419,7 +1419,7 @@ _021E6466: lsl r2, r2, #2 ldr r2, [r5, r2] add r0, #0x44 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] add r0, #0x44 bl CopyWindowToVram @@ -1537,7 +1537,7 @@ _021E6568: ldr r0, [sp, #0x1c] ldr r2, [r2] mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 diff --git a/asm/overlay_56.s b/asm/overlay_56.s index 0c79e9d12..60e7f5cdf 100644 --- a/asm/overlay_56.s +++ b/asm/overlay_56.s @@ -554,7 +554,7 @@ _021E5FF2: mov r1, #1 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete b _021E6088 @@ -748,7 +748,7 @@ _021E6162: add r0, r5, #0 str r3, [sp, #0xc] add r0, #0x9c - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor strb r0, [r5, #0xf] add r0, r4, #0 bl String_Delete @@ -1861,7 +1861,7 @@ _021E6AB2: add r0, r6, #0 mov r1, #1 mov r3, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r6, #0 @@ -1922,7 +1922,7 @@ _021E6B26: add r0, r0, r1 mov r1, #1 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, [sp, #0x14] ldr r0, [sp, #0x18] add r0, r0, r1 @@ -1946,7 +1946,7 @@ _021E6B88: add r0, r4, #0 ldr r2, [r2, #0x14] add r0, #0x8c - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, #0x8c add r0, r4, #0 bl CopyWindowToVram diff --git a/asm/overlay_57.s b/asm/overlay_57.s index 1641b5ec1..18ab468bf 100644 --- a/asm/overlay_57.s +++ b/asm/overlay_57.s @@ -1789,7 +1789,7 @@ ov57_0223866C: ; 0x0223866C mov r1, #4 add r2, r4, #0 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r6, #0 @@ -1974,7 +1974,7 @@ ov57_022387E0: ; 0x022387E0 add r0, sp, #0x1c mov r1, #2 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, sp, #0x1c mov r1, #2 mov r2, #0x34 @@ -4303,7 +4303,7 @@ _02239A22: add r0, r5, #0 add r2, r4, #0 mov r3, #7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -4369,7 +4369,7 @@ _02239AB8: add r0, r5, r4 mov r3, #7 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r4 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x10] diff --git a/asm/overlay_59.s b/asm/overlay_59.s index 6e0f404ac..b1949f652 100644 --- a/asm/overlay_59.s +++ b/asm/overlay_59.s @@ -1307,7 +1307,7 @@ ov59_022386D0: ; 0x022386D0 ldr r2, [r4, #0x64] add r0, r4, r0 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r5, #0 _0223871E: lsl r1, r5, #0x18 @@ -1434,7 +1434,7 @@ ov59_022387D0: ; 0x022387D0 ldr r2, [r4, #0x6c] mov r1, #4 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x52 lsl r0, r0, #2 add r0, r4, r0 @@ -1489,7 +1489,7 @@ ov59_02238834: ; 0x02238834 add r0, r7, r0 mov r1, #4 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] add r0, r7, r0 bl ScheduleWindowCopyToVram @@ -1652,7 +1652,7 @@ _0223896C: add r4, r3, r4 add r0, r6, r7 asr r3, r4, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, r7 bl ScheduleWindowCopyToVram _022389E0: @@ -1729,7 +1729,7 @@ _02238A32: ldrb r3, [r6] ldr r2, [r5, #0x64] add r0, r4, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] add r0, r4, r0 bl ScheduleWindowCopyToVram @@ -1810,7 +1810,7 @@ ov59_02238AB0: ; 0x02238AB0 add r2, r5, r2 add r2, #0xd0 ldr r2, [r2] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x5e lsl r0, r0, #2 add r0, r5, r0 @@ -1835,7 +1835,7 @@ ov59_02238AB0: ; 0x02238AB0 add r0, r5, r2 ldr r2, [r5, #0x68] mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x72 lsl r0, r0, #2 add r0, r5, r0 @@ -6299,7 +6299,7 @@ ov59_0223AD84: ; 0x0223AD84 add r0, r5, r2 ldr r2, [r5, #0x68] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x79 lsl r0, r0, #2 add r0, r5, r0 @@ -6331,7 +6331,7 @@ _0223ADC8: ldr r2, [r5, #0x68] add r0, r7, r0 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] add r0, r7, r0 bl ScheduleWindowCopyToVram @@ -6492,7 +6492,7 @@ _0223AF08: ldr r2, [r4, #0x68] add r0, r4, r0 mov r3, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x26 ldr r1, [sp, #0x10] lsl r0, r0, #4 @@ -8178,7 +8178,7 @@ _0223BC48: ldr r2, [r4, #0x68] add r0, r4, r0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r1, r4, #0 add r1, #0x4d strb r0, [r1] @@ -8221,7 +8221,7 @@ ov59_0223BC88: ; 0x0223BC88 add r0, r5, r2 ldr r2, [r4, #0xc] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldrb r0, [r4, #7] cmp r0, #2 beq _0223BCE4 @@ -8239,7 +8239,7 @@ ov59_0223BC88: ; 0x0223BC88 add r2, r5, r2 ldr r2, [r2, #0x70] mov r3, #0x40 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0223BCE4: mov r1, #0 str r1, [sp] @@ -8264,7 +8264,7 @@ _0223BCE4: str r1, [sp, #0xc] add r0, r5, r2 ldr r2, [r5, #0x68] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x7d lsl r0, r0, #2 add r0, r5, r0 diff --git a/asm/overlay_62.s b/asm/overlay_62.s index 4f9a23b7a..6190ad2d0 100644 --- a/asm/overlay_62.s +++ b/asm/overlay_62.s @@ -1061,7 +1061,7 @@ _021E6102: ldrb r1, [r4, #8] add r0, r5, #0 mov r3, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r5, #0 diff --git a/asm/overlay_63.s b/asm/overlay_63.s index 091bb9394..aab63b361 100644 --- a/asm/overlay_63.s +++ b/asm/overlay_63.s @@ -2019,7 +2019,7 @@ _0221CE06: ldr r2, [r2] add r0, #0x14 sub r3, r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r7, #0x14 add r0, r7, #0 bl CopyWindowPixelsToVram_TextMode @@ -2104,7 +2104,7 @@ ov63_0221CE94: ; 0x0221CE94 ldr r2, [r2] add r0, r5, r6 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 bl CopyWindowPixelsToVram_TextMode add r0, r5, r6 @@ -2190,7 +2190,7 @@ _0221CF84: ldr r2, [r2] add r0, #0x10 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r2, r4, #0 add r0, #0x84 @@ -2233,7 +2233,7 @@ _0221CF84: ldr r2, [r2] add r0, #0x10 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 add r0, #0x10 bl CopyWindowPixelsToVram_TextMode @@ -2278,7 +2278,7 @@ _0221CF84: ldr r2, [r2] add r0, #0x20 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r2, [r4] ldr r1, [sp, #0x14] ldr r2, [r2] @@ -2456,7 +2456,7 @@ _0221D1DA: ldr r2, [r4] add r0, #0x20 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r6 add r0, #0x20 bl CopyWindowPixelsToVram_TextMode @@ -5504,7 +5504,7 @@ _0221EAB6: ldr r2, [r2] add r0, #0x14 sub r3, r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x14 bl CopyWindowToVram @@ -5599,7 +5599,7 @@ _0221EAB6: ldr r2, [r2] add r0, #0x24 sub r3, r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, #0x24 add r0, r5, #0 bl CopyWindowToVram diff --git a/asm/overlay_64.s b/asm/overlay_64.s index a68104b32..786d50cc9 100644 --- a/asm/overlay_64.s +++ b/asm/overlay_64.s @@ -1060,7 +1060,7 @@ _021E6186: add r0, r6, r0 mov r1, #4 sub r3, r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x42 lsl r0, r0, #2 add r0, r6, r0 @@ -1751,7 +1751,7 @@ _021E6656: ldr r2, [r5, r2] add r0, r4, r6 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r6 bl CopyWindowPixelsToVram_TextMode add r0, r4, r6 @@ -2011,7 +2011,7 @@ _021E6920: add r0, r3, r0 ldr r2, [r5, r2] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x47 lsl r2, r2, #2 add r1, r2, #0 @@ -2036,7 +2036,7 @@ _021E6920: ldr r2, [r5, r2] add r0, r6, r7 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x66 lsl r2, r2, #2 ldrh r0, [r5, r2] @@ -2072,7 +2072,7 @@ _021E6920: ldr r2, [r5, r2] add r0, r6, r7 add r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021E6A18 _021E69DA: cmp r0, #1 @@ -2102,7 +2102,7 @@ _021E69DA: ldr r2, [r5, r2] add r0, r6, r7 add r3, #8 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E6A18: mov r2, #0x46 lsl r2, r2, #2 @@ -2143,7 +2143,7 @@ _021E6A18: ldr r2, [r5, r2] add r0, r6, r7 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x46 lsl r2, r2, #2 ldr r0, [r5, r2] @@ -2166,7 +2166,7 @@ _021E6A18: ldr r2, [r5, r2] add r0, r6, r7 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x4a lsl r1, r1, #2 mov r0, #0 @@ -2190,7 +2190,7 @@ _021E6ACC: str r1, [sp, #0xc] ldr r2, [r5, r2] add r0, r6, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp, #0x14] add r0, r5, #0 @@ -2238,7 +2238,7 @@ _021E6AEA: ldr r2, [r5, r2] mov r1, #0 sub r3, r3, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E6B3E: ldr r0, [sp, #0x38] add r7, r7, #1 diff --git a/asm/overlay_65.s b/asm/overlay_65.s index 942f738f6..ede38fcfb 100644 --- a/asm/overlay_65.s +++ b/asm/overlay_65.s @@ -7443,7 +7443,7 @@ _0221FB70: add r0, r5, #0 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -7491,7 +7491,7 @@ _0221FBC6: add r0, r5, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, r0, #0 add r0, r5, #0 bl ScheduleWindowCopyToVram diff --git a/asm/overlay_67.s b/asm/overlay_67.s index 5e53beecd..e0b274f6b 100644 --- a/asm/overlay_67.s +++ b/asm/overlay_67.s @@ -1037,7 +1037,7 @@ _021E6146: add r0, r6, #0 add r2, r7, #0 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov67_021E6118 diff --git a/asm/overlay_68.s b/asm/overlay_68.s index c69a489e2..5c2db6c88 100644 --- a/asm/overlay_68.s +++ b/asm/overlay_68.s @@ -1224,7 +1224,7 @@ _021E62AA: add r0, r1, r0 ldr r2, [r5, r2] add r1, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -1495,7 +1495,7 @@ _021E64C4: ldr r2, [r5, r2] mov r1, #0 mov r3, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r1, r4, #0 ldr r0, [sp, #0x18] add r1, #0x3a @@ -1550,7 +1550,7 @@ _021E64C4: ldr r2, [r5, r2] mov r1, #0 mov r3, #0x2d - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E659C: ldr r0, [sp, #0x10] add r4, r4, #1 @@ -1597,7 +1597,7 @@ _021E65AE: ldr r2, [r5, r2] add r0, #0xe8 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0xf8 ldr r0, [r0] @@ -1757,7 +1757,7 @@ _021E6720: add r0, #0xa8 ldr r2, [r2, r6] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x10 str r0, [sp] @@ -1772,7 +1772,7 @@ _021E6720: ldr r2, [r5, r2] add r0, #0xa8 mov r3, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x11 lsl r0, r0, #4 ldr r0, [r5, r0] @@ -1825,7 +1825,7 @@ _021E6720: ldr r2, [r5, r2] add r0, #0xa8 mov r3, #0x2d - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/asm/overlay_70.s b/asm/overlay_70.s index c98af89e1..4b457ff41 100644 --- a/asm/overlay_70.s +++ b/asm/overlay_70.s @@ -3616,7 +3616,7 @@ ov70_022394B8: ; 0x022394B8 ldr r2, [r7, r2] add r0, r7, r0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp, #0x14] ldr r0, _022395B8 ; =0x00000F58 @@ -4542,7 +4542,7 @@ ov70_02239C34: ; 0x02239C34 add r1, r6, #0 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x10 @@ -15158,7 +15158,7 @@ ov70_0223F20C: ; 0x0223F20C add r0, r6, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete _0223F240: @@ -15314,7 +15314,7 @@ _0223F334: add r0, r6, #0 add r2, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete _0223F368: @@ -23121,7 +23121,7 @@ ov70_02242FC4: ; 0x02242FC4 str r0, [sp, #8] add r0, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl CopyWindowPixelsToVram_TextMode add r0, r5, #0 @@ -25053,7 +25053,7 @@ ov70_02243EB8: ; 0x02243EB8 add r0, r5, #0 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl CopyWindowPixelsToVram_TextMode add r0, r6, #0 @@ -27312,7 +27312,7 @@ ov70_02245050: ; 0x02245050 add r0, r5, #0 mov r1, #1 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov70_02245050 @@ -27339,7 +27339,7 @@ ov70_02245084: ; 0x02245084 add r0, r5, #0 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -27368,7 +27368,7 @@ ov70_022450B8: ; 0x022450B8 add r0, r5, #0 mov r1, #4 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov70_022450B8 diff --git a/asm/overlay_72.s b/asm/overlay_72.s index ca1a393d2..9070aeb03 100644 --- a/asm/overlay_72.s +++ b/asm/overlay_72.s @@ -5502,7 +5502,7 @@ ov72_0223A3E0: ; 0x0223A3E0 add r0, r5, #0 mov r1, #1 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov72_0223A3E0 @@ -6736,7 +6736,7 @@ ov72_0223AD20: ; 0x0223AD20 mov r1, #4 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl CopyWindowToVram add r0, r4, #0 @@ -7393,7 +7393,7 @@ ov72_0223B1C8: ; 0x0223B1C8 mov r1, #4 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r3, #0 str r3, [sp] ldr r0, _0223B2BC ; =0x000F0100 @@ -7404,7 +7404,7 @@ ov72_0223B1C8: ; 0x0223B1C8 mov r1, #4 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #8 bl CopyWindowToVram diff --git a/asm/overlay_73.s b/asm/overlay_73.s index 84e261da6..1e545b319 100644 --- a/asm/overlay_73.s +++ b/asm/overlay_73.s @@ -1305,7 +1305,7 @@ ov73_021E63BC: ; 0x021E63BC add r0, r5, #0 add r2, r7, #0 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -3151,7 +3151,7 @@ ov73_021E7230: ; 0x021E7230 mov r1, #4 add r2, r5, #0 asr r3, r6, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete _021E7286: @@ -3187,7 +3187,7 @@ _021E7286: mov r1, #4 add r2, r5, #0 asr r3, r6, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete ldr r0, [r4] @@ -3333,7 +3333,7 @@ _021E738E: ldr r2, [r4, #0x2c] add r0, r6, #0 mov r3, #5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -3345,7 +3345,7 @@ _021E738E: add r0, r6, #0 mov r1, #0 mov r3, #0x46 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021E7442 _021E7410: mov r0, #0xff @@ -3358,7 +3358,7 @@ _021E7410: ldr r2, [r4, #0x2c] add r0, r6, #0 mov r3, #5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -3370,7 +3370,7 @@ _021E7410: add r0, r6, #0 mov r1, #0 mov r3, #0x46 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E7442: ldr r0, [sp, #0x18] bl String_Delete @@ -9144,7 +9144,7 @@ ov73_021EA088: ; 0x021EA088 add r0, r5, #0 mov r1, #1 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov73_021EA088 @@ -9171,7 +9171,7 @@ ov73_021EA0BC: ; 0x021EA0BC add r0, r5, #0 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/asm/overlay_74_thumb.s b/asm/overlay_74_thumb.s index a7cff2f58..78ee14e17 100644 --- a/asm/overlay_74_thumb.s +++ b/asm/overlay_74_thumb.s @@ -1806,7 +1806,7 @@ ov74_02227E10: ; 0x02227E10 add r0, r6, #0 add r2, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add sp, #0x10 @@ -1913,7 +1913,7 @@ _02227EF8: add r2, r7, #0 ldr r0, [r0, #0x10] mov r3, #0x20 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete _02227F28: @@ -7351,7 +7351,7 @@ _0222AA60: str r0, [sp, #8] str r3, [sp, #0xc] add r0, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r0, [r4, #0x6c] ldr r0, [r4, #0x14] cmp r0, #0 @@ -7406,7 +7406,7 @@ ov74_0222AAAC: ; 0x0222AAAC add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 mov r1, #0 mov r2, #0x1f @@ -12213,7 +12213,7 @@ ov74_0222D1D4: ; 0x0222D1D4 add r0, r5, #0 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl CopyWindowToVram add r0, r7, #0 @@ -12536,7 +12536,7 @@ ov74_0222D494: ; 0x0222D494 mov r1, #1 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #1 @@ -12597,7 +12597,7 @@ _0222D522: mov r1, #1 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #1 @@ -12691,7 +12691,7 @@ ov74_0222D5C4: ; 0x0222D5C4 mov r1, #1 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0 @@ -12736,7 +12736,7 @@ ov74_0222D614: ; 0x0222D614 mov r1, #1 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x10 @@ -13138,7 +13138,7 @@ _0222D956: str r0, [sp, #0xc] ldr r1, [r4, #0x14] add r0, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete _0222D976: @@ -13279,7 +13279,7 @@ _0222DA58: str r3, [sp, #0xc] ldr r1, [r4, #0x14] add r0, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete ldr r0, _0222DAE8 ; =0x00002A04 @@ -15147,7 +15147,7 @@ _0222E98C: ldr r0, [sp, #0x10] ldr r2, [sp, #0x20] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0222E9F0 _0222E9D6: mov r0, #0xff @@ -15161,7 +15161,7 @@ _0222E9D6: ldr r0, [sp, #0x10] ldr r2, [sp, #0x20] add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0222E9F0: ldr r0, [sp, #0x20] bl String_Delete @@ -15195,7 +15195,7 @@ _0222E9F0: ldr r0, [sp, #0x10] add r2, r7, #0 mov r3, #0x50 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r5, #0x18 @@ -15282,7 +15282,7 @@ ov74_0222EA88: ; 0x0222EA88 add r0, r4, #0 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl CopyWindowToVram add r0, r6, #0 @@ -15689,7 +15689,7 @@ ov74_0222EE0C: ; 0x0222EE0C mov r1, #1 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #1 @@ -15735,7 +15735,7 @@ _0222EE76: mov r1, #1 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #1 @@ -15824,7 +15824,7 @@ ov74_0222EF18: ; 0x0222EF18 mov r1, #1 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0 @@ -16081,7 +16081,7 @@ _0222F0F4: ldr r1, [r4, #0x14] ldr r3, [r4, #0x28] add r0, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x30] bl String_Delete _0222F158: @@ -16219,7 +16219,7 @@ _0222F234: str r3, [sp, #0xc] ldr r1, [r4, #0x14] add r0, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] bl String_Delete ldr r0, _0222F2C4 ; =0x00002A04 @@ -21595,7 +21595,7 @@ _02231AA6: str r0, [sp, #0xc] ldr r0, [r5] ldr r1, [r5, #0x28] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r0, [r5, #0x48] ldr r0, [r5, #0x40] cmp r0, #0 @@ -21632,7 +21632,7 @@ _02231B0E: str r0, [sp, #0xc] ldr r0, [r5] ldr r1, [r5, #0x28] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r0, [r5, #0x48] mov r0, #0 str r0, [r5, #0x38] @@ -21654,7 +21654,7 @@ _02231B4A: ldr r0, [r5] ldr r1, [r5, #0x28] ldr r2, [r5, #0x3c] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r0, [r5, #0x48] mov r0, #0 str r0, [r5, #0x3c] @@ -29183,7 +29183,7 @@ _022354CC: ldr r0, [r5, #0x10] ldr r1, [r5, #0x40] ldr r3, [r5, #0x20] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r7, r0, #0 b _02235542 _02235500: @@ -29212,7 +29212,7 @@ _02235500: str r0, [sp, #0xc] ldr r0, [r5, #0x10] ldr r1, [r5, #0x40] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r7, r0, #0 mov r0, #0 str r0, [r5, #0xc] diff --git a/asm/overlay_75.s b/asm/overlay_75.s index 4018bd28a..aea423736 100644 --- a/asm/overlay_75.s +++ b/asm/overlay_75.s @@ -5820,7 +5820,7 @@ ov75_02249684: ; 0x02249684 add r0, r5, #0 mov r1, #1 add r2, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov75_02249684 diff --git a/asm/overlay_81.s b/asm/overlay_81.s index e47d1abb8..f5f0a1b8f 100644 --- a/asm/overlay_81.s +++ b/asm/overlay_81.s @@ -5264,7 +5264,7 @@ ov81_0224080C: ; 0x0224080C ldrb r1, [r1] ldr r2, [r5, #0x24] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov81_0224080C @@ -5366,7 +5366,7 @@ _0224090C: ldr r3, [sp, #0x10] add r0, r5, #0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r5, #0 @@ -5420,7 +5420,7 @@ _02240980: ldr r3, [sp, #0x10] add r0, r5, #0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r5, #0 @@ -5488,7 +5488,7 @@ ov81_022409B0: ; 0x022409B0 ldr r3, [sp, #0x10] add r0, r4, #0 add r1, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] bl String_Delete ldr r0, [sp, #0x18] @@ -5528,7 +5528,7 @@ ov81_022409B0: ; 0x022409B0 str r0, [sp, #0xc] ldr r3, [sp, #0x14] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete b _02240AC8 @@ -5552,7 +5552,7 @@ _02240A96: ldr r3, [sp, #0x14] add r0, r4, #0 add r2, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete _02240AC8: @@ -5610,7 +5610,7 @@ ov81_02240AD8: ; 0x02240AD8 ldr r1, [sp, #0x1c] add r0, r5, #0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl GetWindowWidth sub r0, r0, #1 @@ -5660,7 +5660,7 @@ _02240B6C: add r0, r5, #0 add r2, r4, #0 lsl r3, r3, #3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _02240BA0: add r0, r4, #0 bl String_Delete @@ -10523,7 +10523,7 @@ _02243096: add r0, r6, #0 add r2, r7, #0 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov81_02243068 diff --git a/asm/overlay_82.s b/asm/overlay_82.s index 0be10b46f..ff482d078 100644 --- a/asm/overlay_82.s +++ b/asm/overlay_82.s @@ -2226,7 +2226,7 @@ ov82_0223EF1C: ; 0x0223EF1C ldrb r1, [r1] ldr r2, [r5, #0x28] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov82_0223EF1C @@ -2320,7 +2320,7 @@ ov82_0223EFCC: ; 0x0223EFCC add r0, r5, #0 add r2, r6, #0 add r3, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, #0 @@ -2399,7 +2399,7 @@ _0223F090: str r0, [sp, #0xc] ldr r0, [sp, #0x10] add r3, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0223F0D4: add r4, r4, #1 add r6, #0x40 @@ -2556,7 +2556,7 @@ ov82_0223F1AC: ; 0x0223F1AC add r0, r5, #0 add r2, r6, #0 add r3, r7, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete ldr r0, [sp, #0x10] diff --git a/asm/overlay_83.s b/asm/overlay_83.s index d8dd7cdcc..0542ac728 100644 --- a/asm/overlay_83.s +++ b/asm/overlay_83.s @@ -3633,7 +3633,7 @@ ov83_0223FC48: ; 0x0223FC48 ldrb r1, [r1] ldr r2, [r5, #0x28] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, r0, #0 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -3681,7 +3681,7 @@ ov83_0223FCB4: ; 0x0223FCB4 ldrb r1, [r1] ldr r2, [r5, #0x28] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, r0, #0 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -4889,7 +4889,7 @@ _02240682: add r0, r4, r0 mov r1, #0 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, _02240744 ; =0x000004DC add r0, r5, #0 ldr r2, [r5, r1] @@ -5617,7 +5617,7 @@ _02240CCA: ldr r3, [sp, #0x10] add r0, r5, #0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 @@ -9127,7 +9127,7 @@ _022428E2: lsl r0, r0, #4 ldr r2, [r2, r4] add r0, r6, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, _022429DC ; =0x000004DC ldrb r2, [r6, #0x13] ldr r1, [r6, r1] @@ -12851,7 +12851,7 @@ ov83_022447E0: ; 0x022447E0 ldrb r1, [r1] ldr r2, [r5, #0x28] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, r0, #0 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -12899,7 +12899,7 @@ ov83_0224484C: ; 0x0224484C ldrb r1, [r1] ldr r2, [r5, #0x28] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, r0, #0 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -13246,7 +13246,7 @@ _02244B18: ldr r3, [sp, #0x10] add r0, r7, #0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add sp, #0x14 @@ -19103,7 +19103,7 @@ _022479C6: add r0, r6, #0 add r2, r7, #0 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov83_02247998 diff --git a/asm/overlay_85.s b/asm/overlay_85.s index 9e7c87f8c..b6d42e8e4 100644 --- a/asm/overlay_85.s +++ b/asm/overlay_85.s @@ -3448,7 +3448,7 @@ ov85_021E7380: ; 0x021E7380 add r0, r5, r4 add r2, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -7630,7 +7630,7 @@ ov85_021E9244: ; 0x021E9244 add r0, r5, #0 add r2, r7, #0 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -9310,7 +9310,7 @@ _021E9EF2: ldr r2, [r4, #0x3c] add r0, r6, #0 mov r3, #5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -9322,7 +9322,7 @@ _021E9EF2: add r0, r6, #0 mov r1, #0 mov r3, #0x46 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _021E9FA6 _021E9F74: mov r0, #0xff @@ -9335,7 +9335,7 @@ _021E9F74: ldr r2, [r4, #0x3c] add r0, r6, #0 mov r3, #5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -9347,7 +9347,7 @@ _021E9F74: add r0, r6, #0 mov r1, #0 mov r3, #0x46 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E9FA6: ldr r0, [sp, #0x18] bl String_Delete diff --git a/asm/overlay_86.s b/asm/overlay_86.s index fa1c97d30..cd57b6cbc 100644 --- a/asm/overlay_86.s +++ b/asm/overlay_86.s @@ -893,7 +893,7 @@ _021E6006: add r0, r6, #0 add r2, r7, #0 add r3, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov86_021E5FD8 diff --git a/asm/overlay_87.s b/asm/overlay_87.s index c4afc49ed..a92ddbaab 100644 --- a/asm/overlay_87.s +++ b/asm/overlay_87.s @@ -2795,7 +2795,7 @@ ov87_021E6F38: ; 0x021E6F38 ldrb r1, [r1] ldr r2, [r5, #0x40] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov87_021E6F38 @@ -2850,7 +2850,7 @@ ov87_021E6F98: ; 0x021E6F98 ldrb r1, [r1] ldr r2, [r5, #0x40] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov87_021E6F98 diff --git a/asm/overlay_88.s b/asm/overlay_88.s index 63b28a2f8..90749c648 100644 --- a/asm/overlay_88.s +++ b/asm/overlay_88.s @@ -2034,7 +2034,7 @@ _02259766: ldr r0, [sp, #0x14] mov r1, #0 add r2, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x30] add r7, r7, #1 add r6, #0x10 diff --git a/asm/overlay_89.s b/asm/overlay_89.s index 36e0d0a82..60c719e5b 100644 --- a/asm/overlay_89.s +++ b/asm/overlay_89.s @@ -8193,7 +8193,7 @@ _0225C7D8: add r2, r7, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r5 bl CopyWindowToVram ldr r0, [sp, #0x1c] diff --git a/asm/overlay_90.s b/asm/overlay_90.s index 9eb04a05e..de0ce8d09 100644 --- a/asm/overlay_90.s +++ b/asm/overlay_90.s @@ -1552,7 +1552,7 @@ _022592F0: str r1, [sp, #0xc] ldr r2, [r5, #8] add r0, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1583,7 +1583,7 @@ ov90_02259314: ; 0x02259314 add r0, r6, #0 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -1616,7 +1616,7 @@ ov90_02259350: ; 0x02259350 str r1, [sp, #0xc] ldr r2, [r5, #8] add r0, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov90_02259350 @@ -3716,7 +3716,7 @@ ov90_0225A350: ; 0x0225A350 ldr r2, [r5, #0x14] add r0, r5, #0 sub r3, r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #2 bl FontID_Release mov r0, #1 diff --git a/asm/overlay_91.s b/asm/overlay_91.s index e03e64d4c..89a8c7b0a 100644 --- a/asm/overlay_91.s +++ b/asm/overlay_91.s @@ -2685,7 +2685,7 @@ _0225D908: add r3, r1, #0 add r0, #0xc str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete mov r0, #0 @@ -2837,7 +2837,7 @@ _0225DA60: add r0, sp, #0x30 mov r1, #0 lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x28] add r0, #0x10 str r0, [sp, #0x28] @@ -10830,7 +10830,7 @@ ov91_02261808: ; 0x02261808 add r0, r5, #0 ldr r2, [r5, #0x5c] add r0, #0x38 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r3, r5, #0 add r3, #0x9c add r2, r5, #0 @@ -10920,7 +10920,7 @@ ov91_022618B0: ; 0x022618B0 add r0, r5, #0 ldr r2, [r5, #0x5c] add r0, #0x38 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r3, r5, #0 add r3, #0x9c add r2, r5, #0 diff --git a/asm/overlay_93_thumb_1.s b/asm/overlay_93_thumb_1.s index f4efa036c..ee94060d1 100644 --- a/asm/overlay_93_thumb_1.s +++ b/asm/overlay_93_thumb_1.s @@ -1778,7 +1778,7 @@ ov93_0225D468: ; 0x0225D468 add r2, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x70 @@ -1893,7 +1893,7 @@ _0225D560: ldr r0, [sp, #0x18] add r0, r0, r1 mov r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl FreeToHeap _0225D58E: diff --git a/asm/overlay_95.s b/asm/overlay_95.s index 6fbc01670..ede808579 100644 --- a/asm/overlay_95.s +++ b/asm/overlay_95.s @@ -3291,7 +3291,7 @@ ov95_021E7328: ; 0x021E7328 mov r1, #4 add r2, r5, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl CopyWindowToVram add r0, r7, #0 diff --git a/asm/overlay_96.s b/asm/overlay_96.s index ed655bbdf..edaffb106 100644 --- a/asm/overlay_96.s +++ b/asm/overlay_96.s @@ -18949,7 +18949,7 @@ ov96_021EE700: ; 0x021EE700 add r0, r5, #0 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -19377,7 +19377,7 @@ _021EEA36: ldr r2, [r4] add r0, r5, #0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r4, r0, #0 ldr r2, _021EEA7C ; =0x000003D2 add r0, r5, #0 @@ -27964,7 +27964,7 @@ ov96_021F2EFC: ; 0x021F2EFC add r0, r5, #4 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -30512,7 +30512,7 @@ _021F425A: add r0, #0xc add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #0x13 @@ -30557,7 +30557,7 @@ _021F42D2: add r0, r0, r1 mov r1, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete lsl r0, r6, #2 @@ -30932,7 +30932,7 @@ ov96_021F459C: ; 0x021F459C add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add sp, #0x10 @@ -36145,7 +36145,7 @@ _021F6F8E: add r0, r7, #4 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r7, #4 @@ -36176,7 +36176,7 @@ _021F6FE4: add r0, r0, r1 mov r1, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r4, #1 @@ -36293,7 +36293,7 @@ ov96_021F70AC: ; 0x021F70AC add r0, #0x44 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -37360,7 +37360,7 @@ ov96_021F78C4: ; 0x021F78C4 add r0, r4, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r6, #0 @@ -45251,7 +45251,7 @@ ov96_021FB808: ; 0x021FB808 add r0, #8 add r2, r6, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r4, #0 @@ -54009,7 +54009,7 @@ _021FFDB0: add r0, r5, #4 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r4, #0 @@ -55777,7 +55777,7 @@ ov96_02200BD8: ; 0x02200BD8 add r0, #0xc add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r4, #0xc @@ -55812,7 +55812,7 @@ ov96_02200C40: ; 0x02200C40 add r0, #0x1c add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x1c @@ -60625,7 +60625,7 @@ ov96_0220337C: ; 0x0220337C add r0, r5, #4 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -61240,7 +61240,7 @@ _02203846: add r0, r5, #0 add r2, r6, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl String_Delete add r0, r5, #0 @@ -62233,7 +62233,7 @@ ov96_02203FFC: ; 0x02203FFC add r0, #0xc add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0xc @@ -69121,7 +69121,7 @@ ov96_02207774: ; 0x02207774 add r0, r5, #4 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -71334,7 +71334,7 @@ ov96_022088AC: ; 0x022088AC add r0, #0xc add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r4, #0xc @@ -74177,7 +74177,7 @@ ov96_02209F40: ; 0x02209F40 add r0, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r5, #0 @@ -75031,7 +75031,7 @@ ov96_0220A5DC: ; 0x0220A5DC add r0, r4, r0 add r2, r5, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete mov r0, #0x8e @@ -83830,7 +83830,7 @@ ov96_0220E9A0: ; 0x0220E9A0 add r0, #0x24 add r2, r5, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r4, #0x24 @@ -87577,7 +87577,7 @@ _022106E4: ldr r2, [sp, #0x20] add r0, r6, r7 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, r7 bl CopyWindowToVram ldr r0, [sp, #0x20] @@ -93589,7 +93589,7 @@ ov96_022136A4: ; 0x022136A4 add r0, #8 add r2, r7, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -94886,7 +94886,7 @@ _0221408A: str r0, [sp, #8] add r0, r4, r7 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _022140D4 _022140A2: ldr r0, [sp, #0x10] @@ -94914,7 +94914,7 @@ _022140B6: ldr r2, _022140F0 ; =0x000007C4 mov r1, #4 ldr r2, [r5, r2] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _022140D4: add r0, r4, r7 bl CopyWindowToVram @@ -95890,7 +95890,7 @@ ov96_022147FC: ; 0x022147FC add r0, #0x14 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x14 @@ -95927,7 +95927,7 @@ ov96_02214854: ; 0x02214854 add r0, #0x24 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r5, #0x24 @@ -105788,7 +105788,7 @@ ov96_022193F8: ; 0x022193F8 add r0, #0x20 add r2, r5, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r4, #0x20 @@ -106733,7 +106733,7 @@ ov96_02219B30: ; 0x02219B30 str r1, [sp, #0xc] add r0, #0x30 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #4] mov r3, #0x13 str r0, [sp] @@ -106820,7 +106820,7 @@ ov96_02219BDC: ; 0x02219BDC str r1, [sp, #0xc] ldrsh r3, [r3, r6] add r0, r5, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete add r0, r5, #0 diff --git a/asm/overlay_97.s b/asm/overlay_97.s index e4296f57c..dc08c7fd1 100644 --- a/asm/overlay_97.s +++ b/asm/overlay_97.s @@ -1626,7 +1626,7 @@ ov97_0221F294: ; 0x0221F294 add r0, #8 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #8 bl CopyWindowToVram @@ -1656,7 +1656,7 @@ ov97_0221F294: ; 0x0221F294 add r0, #0x18 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete _0221F32A: @@ -1682,7 +1682,7 @@ _0221F32A: add r0, #0x48 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete ldr r0, [r4, #0x6c] @@ -1701,7 +1701,7 @@ _0221F32A: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete ldr r0, [r4, #0x6c] @@ -1720,7 +1720,7 @@ _0221F32A: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete ldr r0, [r4, #0x6c] @@ -1739,7 +1739,7 @@ _0221F32A: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete ldr r0, [r4, #0x6c] @@ -1758,7 +1758,7 @@ _0221F32A: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r4, #0x48 @@ -1794,7 +1794,7 @@ ov97_0221F428: ; 0x0221F428 add r0, r5, #0 ldr r2, [r5, #0x74] add r0, #0x28 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x28 bl CopyWindowToVram @@ -1820,7 +1820,7 @@ ov97_0221F428: ; 0x0221F428 add r0, #0x38 mov r3, #4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x38 bl CopyWindowToVram @@ -1850,7 +1850,7 @@ _0221F4A8: add r2, r6, #0 mov r3, #4 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 add r0, #0x38 bl CopyWindowToVram @@ -1901,7 +1901,7 @@ _0221F4FE: add r0, #0x58 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r5, #0x58 add r0, r5, #0 bl CopyWindowToVram diff --git a/asm/overlay_98.s b/asm/overlay_98.s index b6c8e337e..3fdf103e8 100644 --- a/asm/overlay_98.s +++ b/asm/overlay_98.s @@ -911,7 +911,7 @@ _0221EC8A: ldr r0, [r5, #4] add r0, r0, r6 add r3, r4, r3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #4] add r0, r0, r6 bl ScheduleWindowCopyToVram @@ -961,7 +961,7 @@ ov98_0221ECD0: ; 0x0221ECD0 ldr r2, [r5, #0x14] add r0, r0, r4 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #4] add r0, r0, r4 bl ScheduleWindowCopyToVram @@ -1014,7 +1014,7 @@ ov98_0221ED48: ; 0x0221ED48 ldr r0, [r4, #4] ldr r2, [r4, #0x14] add r0, r0, r5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r4, #4] add r0, r0, r5 bl ScheduleWindowCopyToVram @@ -1079,7 +1079,7 @@ ov98_0221EDC4: ; 0x0221EDC4 ldr r2, [r5, #0x14] add r0, r0, r4 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #4] add r0, r0, r4 bl ScheduleWindowCopyToVram @@ -1124,7 +1124,7 @@ _0221EE3E: ldr r0, [r5, #4] ldr r2, [r5, #0x14] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #4] add r0, r0, r4 bl ScheduleWindowCopyToVram @@ -1172,7 +1172,7 @@ ov98_0221EE9C: ; 0x0221EE9C ldr r0, [r4, #4] add r3, r7, #0 add r0, r0, r5 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r4, #4] add r0, r0, r5 bl ScheduleWindowCopyToVram diff --git a/asm/overlay_trainer_card_main.s b/asm/overlay_trainer_card_main.s index c420920e7..3e4cd64b9 100644 --- a/asm/overlay_trainer_card_main.s +++ b/asm/overlay_trainer_card_main.s @@ -2512,7 +2512,7 @@ _021E6F44: ldr r2, [r3, r2] add r0, r6, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E6F68: add r0, r4, #1 lsl r0, r0, #0x18 @@ -2595,7 +2595,7 @@ _021E6F68: add r0, r6, #0 add r0, #0x20 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldrb r0, [r5, #4] lsl r0, r0, #0x1c lsr r0, r0, #0x1f @@ -2633,7 +2633,7 @@ _021E6F68: add r0, r6, #0 add r0, #0x30 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _021E7076: ldr r0, [sp, #0x14] mov r2, #0 @@ -2722,7 +2722,7 @@ _021E710A: add r0, r6, #0 add r0, #0x50 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #2 add r2, r5, #0 str r1, [sp] @@ -2772,7 +2772,7 @@ _021E710A: ldr r2, [sp, #0x18] add r0, r6, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] bl String_Delete add r0, r4, #0 @@ -2850,7 +2850,7 @@ _021E721C: add r0, r5, r7 add r1, r6, #0 add r3, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -2967,7 +2967,7 @@ _021E7324: add r0, r5, #0 add r0, #0x70 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] mov r1, #0x14 add r2, r7, #0 @@ -2993,7 +2993,7 @@ _021E7324: add r0, #0x70 add r2, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp] mov r0, #1 @@ -3028,7 +3028,7 @@ _021E7324: add r0, r5, #0 add r0, #0x80 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] mov r1, #0x17 add r2, r4, #0 @@ -3044,7 +3044,7 @@ _021E7324: add r0, #0x90 mov r3, #0x70 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0 ldr r0, [sp, #0x18] str r4, [sp] @@ -3076,7 +3076,7 @@ _021E7324: add r0, #0x90 mov r3, #0xb0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] str r4, [sp] ldr r0, [r0, #0x3c] @@ -3127,7 +3127,7 @@ _021E7324: add r0, r5, #0 add r2, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r7, #0 bl String_Delete add r0, r6, #0 @@ -3194,7 +3194,7 @@ ov51_021E74F4: ; 0x021E74F4 add r0, r7, #0 sub r3, r5, r3 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -3225,7 +3225,7 @@ ov51_021E7540: ; 0x021E7540 add r0, r7, #0 sub r3, r5, r3 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -3316,7 +3316,7 @@ _021E758E: add r0, r7, #0 add r2, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r4, #0 @@ -3346,7 +3346,7 @@ ov51_021E7664: ; 0x021E7664 str r3, [sp, #8] mov r3, #0xcd str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r4, pc} _021E7684: @@ -3394,7 +3394,7 @@ ov51_021E76A4: ; 0x021E76A4 ldr r2, [r5, r2] add r0, #0xd4 lsr r3, r4, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 @@ -3446,7 +3446,7 @@ _021E7712: add r0, r4, #0 ldr r2, [r5, r2] lsr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021E7798 ; =0x0000311C mov r1, #1 add r0, r5, r0 @@ -3470,7 +3470,7 @@ _021E7756: ldr r2, [r5, r2] add r0, r4, #0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _021E7798 ; =0x0000311C mov r1, #1 add r0, r5, r0 @@ -3519,7 +3519,7 @@ _021E77B6: ldr r2, [r4, r2] add r0, #0xb4 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r1, _021E7800 ; =0x0000343C strb r0, [r5, r1] ldr r0, [r5] diff --git a/asm/overlay_trainer_card_signature.s b/asm/overlay_trainer_card_signature.s index 6c93d7401..c1de30673 100644 --- a/asm/overlay_trainer_card_signature.s +++ b/asm/overlay_trainer_card_signature.s @@ -1062,7 +1062,7 @@ ov52_021E8994: ; 0x021E8994 lsr r3, r4, #0x1f add r3, r4, r3 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #0xc] add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -1223,7 +1223,7 @@ _021E8A8A: add r0, r5, r0 mov r1, #1 asr r3, r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp, #0x14] mov r0, #0x9d diff --git a/asm/unk_02014DA0.s b/asm/unk_02014DA0.s index 490ee5a34..d897e6a23 100644 --- a/asm/unk_02014DA0.s +++ b/asm/unk_02014DA0.s @@ -1634,7 +1634,7 @@ ListMenuUpdateCursorObj: ; 0x020157F0 ldr r2, [r6, #4] add r0, r5, #0 add r3, r4, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl CopyWindowPixelsToVram_TextMode add sp, #0x10 diff --git a/asm/unk_020183F0.s b/asm/unk_020183F0.s index f55e70361..a70f1564d 100644 --- a/asm/unk_020183F0.s +++ b/asm/unk_020183F0.s @@ -1197,7 +1197,7 @@ _02018CC8: ldr r0, [r5, #0x1c] ldr r2, [r2, r6] add r0, r0, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #0x1c] add r0, r0, r4 bl ScheduleWindowCopyToVram @@ -1274,7 +1274,7 @@ _02018D50: ldr r3, [sp, #0x10] add r0, r0, r6 mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r5, #0x1c] add r0, r0, r6 bl ScheduleWindowCopyToVram diff --git a/asm/unk_020755E8.s b/asm/unk_020755E8.s index 4df4e507c..b17dcdd24 100644 --- a/asm/unk_020755E8.s +++ b/asm/unk_020755E8.s @@ -347,7 +347,7 @@ sub_02075804: ; 0x02075804 mov r1, #4 add r2, r4, #0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl CopyWindowToVram add r0, r4, #0 diff --git a/asm/unk_0207CB7C.s b/asm/unk_0207CB7C.s index 68792fa9e..0fb6c345c 100644 --- a/asm/unk_0207CB7C.s +++ b/asm/unk_0207CB7C.s @@ -964,7 +964,7 @@ sub_0207D2E4: ; 0x0207D2E4 ldr r2, [r3, r2] add r0, r4, r6 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _0207D3D0 ; =0x00000838 add r1, r5, r7 ldrb r0, [r1, r0] @@ -992,7 +992,7 @@ _0207D328: ldr r2, [r5, r2] add r0, r5, r0 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r2, _0207D3D8 ; =0x00000836 add r0, r5, r2 ldrh r0, [r0, r7] @@ -1021,7 +1021,7 @@ _0207D328: ldr r2, [r5, r2] add r0, r4, r6 mov r3, #0x40 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0207D3BE _0207D390: cmp r0, #1 @@ -1044,7 +1044,7 @@ _0207D390: ldr r2, [r5, r2] add r0, r4, r6 mov r3, #0x40 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0207D3BE: add r0, r4, r6 bl ScheduleWindowCopyToVram @@ -1826,7 +1826,7 @@ sub_0207D998: ; 0x0207D998 ldr r2, _0207DA58 ; =0x000007CC str r1, [sp, #0xc] ldr r2, [r5, r2] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x79 lsl r0, r0, #2 add r0, r5, r0 @@ -1861,7 +1861,7 @@ _0207DA04: ldr r2, _0207DA58 ; =0x000007CC str r1, [sp, #0xc] ldr r2, [r5, r2] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x7d lsl r0, r0, #2 add r0, r5, r0 @@ -2153,7 +2153,7 @@ _0207DC62: add r0, r4, r6 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r4, r6 @@ -2219,7 +2219,7 @@ _0207DCE6: add r0, r4, r7 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] bl String_Delete add r0, r4, r7 @@ -2270,7 +2270,7 @@ _0207DD4C: add r0, r4, r6 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r6 @@ -2333,7 +2333,7 @@ _0207DDCE: add r0, r4, r7 add r3, r1, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r4, r7 @@ -2684,7 +2684,7 @@ sub_0207E068: ; 0x0207E068 ldr r2, [r5, r2] add r0, r5, r0 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete ldr r0, _0207E168 ; =0x00000654 @@ -2729,7 +2729,7 @@ sub_0207E068: ; 0x0207E068 ldr r2, [r5, r2] add r0, r5, r0 mov r3, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 bl String_Delete mov r0, #0x95 @@ -2990,7 +2990,7 @@ _0207E30C: ldr r2, [r3, r2] ldr r3, [sp, #0x14] add r0, r4, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, r7 bl ScheduleWindowCopyToVram add sp, #0x20 diff --git a/asm/unk_02082908.s b/asm/unk_02082908.s index 7df614c3d..a8520fe8e 100644 --- a/asm/unk_02082908.s +++ b/asm/unk_02082908.s @@ -2771,7 +2771,7 @@ _02083F70: add r2, r7, #0 add r3, r4, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl CopyWindowToVram add sp, #0x10 @@ -3598,7 +3598,7 @@ _020845CE: ldr r2, [sp, #0x28] mov r1, #0 add r3, r5, r3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0208461A: add r4, r4, #1 _0208461C: @@ -3634,7 +3634,7 @@ sub_02084640: ; 0x02084640 add r3, r5, #0 add r4, r0, #0 str r5, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [r4, #0xc] add sp, #0x10 pop {r4, r5, r6, pc} diff --git a/asm/unk_020863F4.s b/asm/unk_020863F4.s index 76183f9c4..42ec8e908 100644 --- a/asm/unk_020863F4.s +++ b/asm/unk_020863F4.s @@ -1686,7 +1686,7 @@ sub_02087090: ; 0x02087090 str r1, [sp, #0xc] add r0, sp, #0x1c mov r1, #2 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, sp, #0x1c mov r1, #1 mov r2, #0x6c diff --git a/asm/unk_0208C3E4.s b/asm/unk_0208C3E4.s index 50769533c..eb7ef360b 100644 --- a/asm/unk_0208C3E4.s +++ b/asm/unk_0208C3E4.s @@ -258,7 +258,7 @@ sub_0208C57C: ; 0x0208C57C ldr r2, [r5, r2] add r0, r5, r4 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r0, #0x2e ldrb r1, [r5, r0] @@ -371,7 +371,7 @@ sub_0208C614: ; 0x0208C614 ldr r2, [r5, r2] add r0, r5, r6 mov r3, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0208C69C: add r0, r5, r6 bl ScheduleWindowCopyToVram @@ -539,7 +539,7 @@ _0208C7DA: str r1, [sp, #0xc] ldr r2, [r4, r2] add r0, r6, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -698,7 +698,7 @@ sub_0208C8C8: ; 0x0208C8C8 str r1, [sp, #0xc] ldr r2, [r4, r2] add r0, r5, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp] add r3, sp, #0x28 @@ -727,7 +727,7 @@ sub_0208C8C8: ; 0x0208C8C8 ldr r2, [r4, r2] add r0, r5, r7 sub r3, r3, r6 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp] add r3, sp, #0x28 @@ -748,7 +748,7 @@ sub_0208C8C8: ; 0x0208C8C8 ldr r2, [r4, r2] ldr r3, [sp, #0x18] add r0, r5, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -930,7 +930,7 @@ _0208CA1E: str r1, [sp, #0xc] ldr r2, [r4, r2] mov r3, #3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x7a lsl r2, r2, #4 ldr r0, [r4, r2] @@ -950,7 +950,7 @@ _0208CA1E: add r0, r4, r1 ldr r2, [r4, r2] mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0 str r0, [sp] ldr r3, _0208CBC8 ; =0x000E0F00 @@ -1298,7 +1298,7 @@ _0208CE2A: add r2, #0xc ldr r2, [r4, r2] add r0, #0x10 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r1, #0x9d lsl r1, r1, #2 ldrb r0, [r4, r1] @@ -1325,7 +1325,7 @@ _0208CE2A: add r2, #0x14 ldr r2, [r4, r2] add r0, #0x20 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor b _0208CEC4 _0208CE96: sub r1, #0x3c @@ -1348,7 +1348,7 @@ _0208CE96: add r2, #0x14 ldr r2, [r4, r2] add r0, #0x20 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0208CEC4: mov r0, #2 mov r2, #0x91 @@ -1483,7 +1483,7 @@ sub_0208CFB4: ; 0x0208CFB4 str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0208CFE8: ldr r2, [r4, #0x20] cmp r2, #0 @@ -1500,7 +1500,7 @@ _0208CFE8: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0208D00A: ldr r2, [r4, #0x28] cmp r2, #0 @@ -1517,7 +1517,7 @@ _0208D00A: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0208D02C: ldr r2, [r4, #0x38] cmp r2, #0 @@ -1534,7 +1534,7 @@ _0208D02C: str r0, [sp, #8] add r0, r5, #0 str r1, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _0208D04E: mov r0, #5 str r0, [sp] @@ -1664,7 +1664,7 @@ _0208D110: add r2, r4, #0 add r0, #0x70 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x89 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -1956,7 +1956,7 @@ sub_0208D178: ; 0x0208D178 ldr r2, [r4, r2] add r0, #0x70 mov r3, #3 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x89 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2150,7 +2150,7 @@ _0208D53A: ldr r2, [r4, r2] add r0, #0x30 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x7a lsl r2, r2, #4 ldr r0, [r4, r2] @@ -2172,7 +2172,7 @@ _0208D53A: ldr r2, [r4, r2] add r0, #0x40 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x7a lsl r2, r2, #4 ldr r0, [r4, r2] @@ -2194,7 +2194,7 @@ _0208D53A: ldr r2, [r4, r2] add r0, #0x50 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x7a lsl r2, r2, #4 ldr r0, [r4, r2] @@ -2216,7 +2216,7 @@ _0208D53A: ldr r2, [r4, r2] add r0, #0x60 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r2, #0x7a lsl r2, r2, #4 ldr r0, [r4, r2] @@ -2238,7 +2238,7 @@ _0208D53A: ldr r2, [r4, r2] add r0, #0x70 mov r3, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x89 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2382,7 +2382,7 @@ _0208D73E: ldr r2, [r4, r2] add r0, #0x10 add r3, r1, #0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x89 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2540,7 +2540,7 @@ _0208D8CA: ldr r2, [r5, r2] add r0, r6, r7 mov r3, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] cmp r0, #0 beq _0208D952 @@ -2562,7 +2562,7 @@ _0208D8CA: str r1, [sp, #0xc] ldr r2, [r5, r2] add r0, r6, r7 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r4, #0 add r1, r4, #0 add r0, #0x8d @@ -2613,7 +2613,7 @@ _0208D952: ldr r2, [r5, r2] add r0, r6, r7 sub r3, r3, r4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add sp, #0x24 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -2996,7 +2996,7 @@ sub_0208DC68: ; 0x0208DC68 add r0, r1, r0 ldr r2, [r4, r2] mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x89 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3083,7 +3083,7 @@ sub_0208DD20: ; 0x0208DD20 add r0, r0, r1 ldr r2, [r4, r2] mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor mov r0, #0x89 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -3184,7 +3184,7 @@ _0208DDE4: ldr r2, [r4, r2] add r0, r6, #0 mov r1, #1 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r6, #0 bl ScheduleWindowCopyToVram add sp, #0x10 diff --git a/asm/unk_020932E0.s b/asm/unk_020932E0.s index bea470204..c3ad8fb16 100644 --- a/asm/unk_020932E0.s +++ b/asm/unk_020932E0.s @@ -3247,7 +3247,7 @@ _02094CC8: ldr r0, _02094D14 ; =0x00004650 str r1, [sp, #0xc] add r0, r5, r0 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor ldr r0, _02094D14 ; =0x00004650 add r0, r5, r0 bl CopyWindowToVram @@ -3303,7 +3303,7 @@ sub_02094D1C: ; 0x02094D1C str r1, [sp, #0xc] add r0, r5, r0 mov r1, #4 - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor _02094D78: ldr r0, _02094D94 ; =0x00004670 add r0, r5, r0 @@ -3682,7 +3682,7 @@ sub_0209501C: ; 0x0209501C add r2, r5, #0 add r0, r4, r0 str r3, [sp, #0xc] - bl AddTextPrinterParameterized2 + bl AddTextPrinterParameterizedWithColor add r0, r5, #0 bl String_Delete add r0, r7, #0 diff --git a/include/text.h b/include/text.h index 7e818286f..8ee690a57 100644 --- a/include/text.h +++ b/include/text.h @@ -19,7 +19,7 @@ void sub_020200A0(u8 printerId); void ResetAllTextPrinters(void); u8 TextPrinterCheckActive(u8 printerId); // FIXME: bool8 u8 AddTextPrinterParameterized(Window* window, FontID fontId, String* text, u32 x, u32 y, u32 textSpeed, PrinterCallback_t callback); -u8 AddTextPrinterParameterized2(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback); +u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback); u8 AddTextPrinterParameterized3(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback); void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor); void DecompressGlyphTile(const u8 *src, u8 *dest); diff --git a/src/alph_puzzle.c b/src/alph_puzzle.c index 4af567f61..28ad1e991 100644 --- a/src/alph_puzzle.c +++ b/src/alph_puzzle.c @@ -823,7 +823,7 @@ void ov110_021E6904(AlphPuzzleData *data, int a1) { } u32 width = FontID_String_GetWidth(4, data->quitText, 0); - AddTextPrinterParameterized2(data->window, 4, data->quitText, (48 - width) / 2, 4, 0xFF, ov110_021E6DA4[a1], NULL); + AddTextPrinterParameterizedWithColor(data->window, 4, data->quitText, (48 - width) / 2, 4, 0xFF, ov110_021E6DA4[a1], NULL); ScheduleWindowCopyToVram(data->window); } @@ -833,16 +833,16 @@ static void ov110_021E6988(AlphPuzzleData *data, int a1, int a2, u8 textFrameDel } FillWindowPixelBuffer(&data->window[1], 15); if (textFrameDelay == 0) { - AddTextPrinterParameterized2(&data->window[1], 1, data->confirmQuitText[a1], 0, 0, 0xFF, 0x1020F, 0); + AddTextPrinterParameterizedWithColor(&data->window[1], 1, data->confirmQuitText[a1], 0, 0, 0xFF, 0x1020F, 0); } else { - data->textPrinterId = AddTextPrinterParameterized2(&data->window[1], 1, data->confirmQuitText[a1], 0, 0, textFrameDelay, 0x1020F, 0); + data->textPrinterId = AddTextPrinterParameterizedWithColor(&data->window[1], 1, data->confirmQuitText[a1], 0, 0, textFrameDelay, 0x1020F, 0); } ScheduleWindowCopyToVram(&data->window[1]); } static void ov110_021E6A04(AlphPuzzleData *data) { FillWindowPixelBuffer(&data->window[2], 0); - AddTextPrinterParameterized2(&data->window[2], 4, data->hintText[data->puzzleIndex], 0, 0, 0xFF, 0x20100, 0); + AddTextPrinterParameterizedWithColor(&data->window[2], 4, data->hintText[data->puzzleIndex], 0, 0, 0xFF, 0x20100, 0); ScheduleWindowCopyToVram(&data->window[2]); } diff --git a/src/berry_pots_app.c b/src/berry_pots_app.c index 8b8695f13..26e35c98f 100644 --- a/src/berry_pots_app.c +++ b/src/berry_pots_app.c @@ -881,7 +881,7 @@ static void ov17_02202850(BerryPotsAppData *data, u32 seqNo) { FillWindowPixelBuffer(&data->windows[0], 0); u32 stringWidth = FontID_String_GetWidth(4, data->cancelString, 0); - AddTextPrinterParameterized2(&data->windows[0], 4, data->cancelString, (48 - stringWidth) / 2, 0, 0xFF, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&data->windows[0], 4, data->cancelString, (48 - stringWidth) / 2, 0, 0xFF, MAKE_TEXT_COLOR(1, 2, 0), NULL); ScheduleWindowCopyToVram(&data->windows[0]); } diff --git a/src/blackout.c b/src/blackout.c index 18e2f5825..7d39d9ae9 100644 --- a/src/blackout.c +++ b/src/blackout.c @@ -168,7 +168,7 @@ static void Blackout_PrintMessage(BlackoutScreenEnvironment *environment, s32 ms x /= 2; x -= 4; - AddTextPrinterParameterized2(&environment->window, 0, finStr, x, y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&environment->window, 0, finStr, x, y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); String_Delete(tmpStr); String_Delete(finStr); diff --git a/src/certificates_app.c b/src/certificates_app.c index 239f52647..efa243b77 100644 --- a/src/certificates_app.c +++ b/src/certificates_app.c @@ -533,8 +533,8 @@ static void ov78_021E6068(CertificatesApp_Data *data) { BufferPlayersName(data->msgFmt, 0, data->profile); StringExpandPlaceholders(data->msgFmt, string, tempString); - AddTextPrinterParameterized2(&data->window1, 0, string, x1, y1, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); - AddTextPrinterParameterized2(&data->window2, 0, string, x1, y1, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&data->window1, 0, string, x1, y1, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&data->window2, 0, string, x1, y1, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); String_Delete(tempString); u32 msgNum; @@ -546,13 +546,13 @@ static void ov78_021E6068(CertificatesApp_Data *data) { msgNum = msg_0004_00005; } ReadMsgDataIntoString(data->msgData, msgNum, string); - AddTextPrinterParameterized2(&data->window1, 0, string, x2, y2, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); - AddTextPrinterParameterized2(&data->window2, 0, string, x2, y2, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&data->window1, 0, string, x2, y2, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&data->window2, 0, string, x2, y2, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); if (data->certificateId != CERTIFICATE_SHINY_LEAVES) { ReadMsgDataIntoString(data->msgData, msg_0004_00003, string); - AddTextPrinterParameterized2(&data->window1, 0, string, 138, 144, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); - AddTextPrinterParameterized2(&data->window2, 0, string, 138, 144, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&data->window1, 0, string, 138, 144, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); + AddTextPrinterParameterizedWithColor(&data->window2, 0, string, 138, 144, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); } String_Delete(string); diff --git a/src/choose_starter_app.c b/src/choose_starter_app.c index 180b6827d..a70201491 100644 --- a/src/choose_starter_app.c +++ b/src/choose_starter_app.c @@ -1055,7 +1055,7 @@ static u8 printMsgOnWinEx(Window *window, HeapID heapId, BOOL makeFrame, s32 msg GF_ASSERT(msgData != NULL); *out = NewString_ReadMsgData(msgData, msgno); FillWindowPixelBuffer(window, color); - ret = AddTextPrinterParameterized2(window, 1, *out, 0, 0, speed, color, NULL); + ret = AddTextPrinterParameterizedWithColor(window, 1, *out, 0, 0, speed, color, NULL); if (makeFrame) { DrawFrameAndWindow2(window, FALSE, 0x200, 0); } else { diff --git a/src/credits/credits.c b/src/credits/credits.c index 767b2a1bc..a61c5c2d8 100644 --- a/src/credits/credits.c +++ b/src/credits/credits.c @@ -248,7 +248,7 @@ BOOL CreditsApp_OvyInit(OVY_MANAGER *man, int *state) { // Print game title ReadMsgDataIntoString(work->pageWork.msgData, GAME_TITLE_MSG_NO, work->pageWork.string); FillWindowPixelBuffer(&work->pageWork.window, 0); - AddTextPrinterParameterized2(&work->pageWork.window, 0, work->pageWork.string, 0, 70, TEXT_SPEED_NOTRANSFER, 0x00010200, NULL); + AddTextPrinterParameterizedWithColor(&work->pageWork.window, 0, work->pageWork.string, 0, 70, TEXT_SPEED_NOTRANSFER, 0x00010200, NULL); CopyWindowToVram(&work->pageWork.window); // Initialize to first line of the credits @@ -930,7 +930,7 @@ static void LoadPage(PageWork *ptr) { u8 xPos = sCreditMsgLines[ptr->pageState.line].x; u8 yPos = sCreditMsgLines[ptr->pageState.line].y; ReadMsgDataIntoString(ptr->msgData, msgno, ptr->string); - AddTextPrinterParameterized2(&ptr->window, 0, ptr->string, xPos, yPos, TEXT_SPEED_NOTRANSFER, 0x00010200, NULL); + AddTextPrinterParameterizedWithColor(&ptr->window, 0, ptr->string, xPos, yPos, TEXT_SPEED_NOTRANSFER, 0x00010200, NULL); if (++ptr->pageState.line >= NELEMS(sCreditMsgLines)) { break; } diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 6c61928c3..6bdf34786 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -787,7 +787,7 @@ BOOL ScrCmd_DirectionSignpost(ScriptContext* ctx) { ReadMsgDataIntoString(ctx->msgdata, msg_no, *tmp_str); StringExpandPlaceholders(*msg_fmt, *unk1, *tmp_str); Window* window = ov01_021F3D80(fieldSystem->unk68); - AddTextPrinterParameterized2(window, 1, *unk1, 0, 0, 0, MAKE_TEXT_COLOR(2, 10, 15), NULL); + AddTextPrinterParameterizedWithColor(window, 1, *unk1, 0, 0, 0, MAKE_TEXT_COLOR(2, 10, 15), NULL); return TRUE; } @@ -846,7 +846,7 @@ BOOL ScrCmd_TrainerTips(ScriptContext* ctx) { Window* window = ov01_021F3D80(fieldSystem->unk68); u8 text_speed = Options_GetTextFrameDelay(Save_PlayerData_GetOptionsAddr(fieldSystem->saveData)); - *printer_id_ptr = AddTextPrinterParameterized2(window, 1, *unk, 0, 0, text_speed, MAKE_TEXT_COLOR(2, 10, 15), NULL); + *printer_id_ptr = AddTextPrinterParameterizedWithColor(window, 1, *unk, 0, 0, text_speed, MAKE_TEXT_COLOR(2, 10, 15), NULL); ctx->data[0] = result_var_id; SetupNativeScript(ctx, sub_02041520); diff --git a/src/text.c b/src/text.c index f62ae245f..7db2b1d38 100644 --- a/src/text.c +++ b/src/text.c @@ -104,7 +104,7 @@ u8 AddTextPrinterParameterized(Window *window, FontID fontId, String *string, u3 return AddTextPrinter(&template, textSpeed, callback); } -u8 AddTextPrinterParameterized2(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback) { +u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback) { TextPrinterTemplate template; template.currentChar.wrapped = string; diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index db2fdb026..200fa0031 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -1533,7 +1533,7 @@ static void PrintMessageOnWindow(VoltorbFlipAppWork *work, FontID fontId, u8 msg FillWindowPixelBuffer(window, 0); String *str = ReadMsgData_ExpandPlaceholders(work->msgFmt, work->msgData, msgNo, work->heapId); - AddTextPrinterParameterized2(window, fontId, str, x, y, 0xff, textSpeed, 0); + AddTextPrinterParameterizedWithColor(window, fontId, str, x, y, 0xff, textSpeed, 0); ScheduleWindowCopyToVram(window); String_Delete(str); From 0df75daf4b80ff860bc30942667ddef70d214c21 Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 13 Dec 2023 11:31:00 -0600 Subject: [PATCH 3/8] text: AddTextPrinterParameterized{3 -> WithColorAndSpacing} --- asm/include/overlay_12_02264824.inc | 2 +- asm/include/overlay_12_02266024.inc | 2 +- asm/include/overlay_60.inc | 2 +- asm/include/overlay_80_0223A00C.inc | 2 +- asm/include/overlay_89.inc | 2 +- asm/include/overlay_92.inc | 2 +- asm/include/overlay_93_thumb_2.inc | 2 +- asm/include/overlay_96.inc | 2 +- asm/include/text.inc | 2 +- asm/overlay_12_02266024.s | 4 ++-- asm/overlay_12_hp_bar.s | 6 +++--- asm/overlay_60.s | 4 ++-- asm/overlay_80_0223A00C.s | 2 +- asm/overlay_89.s | 2 +- asm/overlay_92.s | 4 ++-- asm/overlay_93_thumb_2.s | 2 +- asm/overlay_96.s | 4 ++-- include/text.h | 2 +- src/list_menu.c | 4 ++-- src/text.c | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/asm/include/overlay_12_02264824.inc b/asm/include/overlay_12_02264824.inc index 8ed7d680d..de2b11b7e 100644 --- a/asm/include/overlay_12_02264824.inc +++ b/asm/include/overlay_12_02264824.inc @@ -32,7 +32,7 @@ .public AddTextWindowTopLeftCorner .public RemoveWindow .public GF_SinDegNoWrap -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public Set2dSpriteAnimActiveFlag .public Sprite_SetAnimCtrlCurrentFrame .public sub_02024B1C diff --git a/asm/include/overlay_12_02266024.inc b/asm/include/overlay_12_02266024.inc index 30f024aee..91b0973ee 100644 --- a/asm/include/overlay_12_02266024.inc +++ b/asm/include/overlay_12_02266024.inc @@ -85,7 +85,7 @@ .public RemoveWindow .public ScheduleBgTilemapBufferTransfer .public LCRandom -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public sub_02021AC8 .public sub_02021B5C .public Set2dSpriteAnimSeqNo diff --git a/asm/include/overlay_60.inc b/asm/include/overlay_60.inc index cc983f058..5cdd67d40 100644 --- a/asm/include/overlay_60.inc +++ b/asm/include/overlay_60.inc @@ -100,7 +100,7 @@ .public Draw3dModel .public GetLCRNGSeed .public SetLCRNGSeed -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public sub_02020D2C .public sub_020215A0 .public sub_0202168C diff --git a/asm/include/overlay_80_0223A00C.inc b/asm/include/overlay_80_0223A00C.inc index 8b0f11cca..811fd15ce 100644 --- a/asm/include/overlay_80_0223A00C.inc +++ b/asm/include/overlay_80_0223A00C.inc @@ -52,7 +52,7 @@ .public ScheduleBgTilemapBufferTransfer .public ScheduleSetBgPosText .public sub_0201F988 -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public sub_02021AC8 .public sub_02021B5C .public sub_020247F4 diff --git a/asm/include/overlay_89.inc b/asm/include/overlay_89.inc index c4f7a740a..54a563da0 100644 --- a/asm/include/overlay_89.inc +++ b/asm/include/overlay_89.inc @@ -130,7 +130,7 @@ .public TextPrinterCheckActive .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_92.inc b/asm/include/overlay_92.inc index b3194fe70..9186125a7 100644 --- a/asm/include/overlay_92.inc +++ b/asm/include/overlay_92.inc @@ -117,7 +117,7 @@ .public SetLCRNGSeed .public LCRandom .public AddTextPrinterParameterized -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_93_thumb_2.inc b/asm/include/overlay_93_thumb_2.inc index 99967fa3a..b3abcf103 100644 --- a/asm/include/overlay_93_thumb_2.inc +++ b/asm/include/overlay_93_thumb_2.inc @@ -53,7 +53,7 @@ .public GF_SinDegFX32 .public GF_CosDegFX32 .public LCRandom -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public sub_02021AC8 .public sub_02021B5C .public GF_AssertFail diff --git a/asm/include/overlay_96.inc b/asm/include/overlay_96.inc index 7beb8a85e..a55c0e96f 100644 --- a/asm/include/overlay_96.inc +++ b/asm/include/overlay_96.inc @@ -207,7 +207,7 @@ .public TextPrinterCheckActive .public sub_020200A0 .public AddTextPrinterParameterizedWithColor -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager .public GF_RunVramTransferTasks diff --git a/asm/include/text.inc b/asm/include/text.inc index fa48ed4ea..a713d86a1 100644 --- a/asm/include/text.inc +++ b/asm/include/text.inc @@ -16,7 +16,7 @@ .public sub_020200A0 .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor -.public AddTextPrinterParameterized3 +.public AddTextPrinterParameterizedWithColorAndSpacing .public AddTextPrinter .public sub_0202036C .public DecompressGlyphTile diff --git a/asm/overlay_12_02266024.s b/asm/overlay_12_02266024.s index 9e1e067e3..d4f938440 100644 --- a/asm/overlay_12_02266024.s +++ b/asm/overlay_12_02266024.s @@ -4497,7 +4497,7 @@ _02268594: ldr r2, [sp, #0x18] add r0, sp, #0x3c str r3, [sp, #0x14] - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing b _022685DE _022685D2: add r3, r4, #0 @@ -5139,7 +5139,7 @@ _02268A90: add r0, r4, #0 add r2, r6, #0 str r3, [sp, #0x14] - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov12_02268A64 diff --git a/asm/overlay_12_hp_bar.s b/asm/overlay_12_hp_bar.s index 8e45e93f1..99879f76c 100644 --- a/asm/overlay_12_hp_bar.s +++ b/asm/overlay_12_hp_bar.s @@ -1293,7 +1293,7 @@ ov12_0226516C: ; 0x0226516C str r1, [sp, #0x14] add r0, sp, #0x24 add r3, r1, #0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing ldr r0, [r5, #4] ldr r6, [sp, #0x30] ldr r0, [r0] @@ -1808,7 +1808,7 @@ _0226561E: str r1, [sp, #0x14] add r0, sp, #0x18 add r3, r1, #0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing ldr r0, [r4, #4] ldr r5, [sp, #0x24] ldr r0, [r0] @@ -1935,7 +1935,7 @@ _02265716: str r1, [sp, #0x14] add r0, sp, #0x24 add r3, r1, #0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing ldr r0, [r4, #4] ldr r5, [sp, #0x30] ldr r0, [r0] diff --git a/asm/overlay_60.s b/asm/overlay_60.s index 3d38f13c0..64ea24b9a 100644 --- a/asm/overlay_60.s +++ b/asm/overlay_60.s @@ -1754,7 +1754,7 @@ _021E667C: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0x14] - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing b _021E679A _021E677C: mov r1, #0 @@ -1770,7 +1770,7 @@ _021E677C: add r2, r5, #0 add r3, r1, #0 str r1, [sp, #0x14] - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing _021E679A: add r0, r5, #0 bl String_Delete diff --git a/asm/overlay_80_0223A00C.s b/asm/overlay_80_0223A00C.s index 8ee916bd1..325955043 100644 --- a/asm/overlay_80_0223A00C.s +++ b/asm/overlay_80_0223A00C.s @@ -813,7 +813,7 @@ _0223A668: ldr r2, [sp, #0x18] add r0, sp, #0x3c str r3, [sp, #0x14] - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing b _0223A6B2 _0223A6A6: add r3, r4, #0 diff --git a/asm/overlay_89.s b/asm/overlay_89.s index 60c719e5b..2694f43d5 100644 --- a/asm/overlay_89.s +++ b/asm/overlay_89.s @@ -3205,7 +3205,7 @@ _0225A278: ldr r2, [sp, #0x18] add r0, sp, #0x38 str r3, [sp, #0x14] - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing add r0, sp, #0x38 mov r1, #1 mov r2, #0x7d diff --git a/asm/overlay_92.s b/asm/overlay_92.s index 02a0bdbb7..71d5e6bdf 100644 --- a/asm/overlay_92.s +++ b/asm/overlay_92.s @@ -3637,7 +3637,7 @@ _0225E246: str r0, [sp, #0x14] add r0, r4, #0 add r2, r7, #0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing b _0225E32E _0225E312: mov r0, #0 @@ -3652,7 +3652,7 @@ _0225E312: str r0, [sp, #0x14] add r0, r4, #0 add r2, r7, #0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing _0225E32E: add r0, r7, #0 bl String_Delete diff --git a/asm/overlay_93_thumb_2.s b/asm/overlay_93_thumb_2.s index 452af4183..492330258 100644 --- a/asm/overlay_93_thumb_2.s +++ b/asm/overlay_93_thumb_2.s @@ -4543,7 +4543,7 @@ _02261EE6: ldr r2, [sp, #0x88] add r0, sp, #0x30 str r3, [sp, #0x14] - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing add r0, sp, #0x30 mov r1, #1 mov r2, #0x75 diff --git a/asm/overlay_96.s b/asm/overlay_96.s index edaffb106..83d5af7f4 100644 --- a/asm/overlay_96.s +++ b/asm/overlay_96.s @@ -40026,7 +40026,7 @@ ov96_021F8DF4: ; 0x021F8DF4 str r1, [sp, #0x14] add r0, r4, #0 add r2, r7, #0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing mov r1, #1 ldr r0, [r4, #0x14] add r2, r1, #0 @@ -40428,7 +40428,7 @@ ov96_021F9134: ; 0x021F9134 str r1, [sp, #0x14] add r0, r4, #0 add r2, r7, #0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterizedWithColorAndSpacing ldr r0, [r4, #0x14] mov r1, #1 mov r2, #2 diff --git a/include/text.h b/include/text.h index 8ee690a57..a87fb9781 100644 --- a/include/text.h +++ b/include/text.h @@ -20,7 +20,7 @@ void ResetAllTextPrinters(void); u8 TextPrinterCheckActive(u8 printerId); // FIXME: bool8 u8 AddTextPrinterParameterized(Window* window, FontID fontId, String* text, u32 x, u32 y, u32 textSpeed, PrinterCallback_t callback); u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback); -u8 AddTextPrinterParameterized3(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback); +u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback); void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor); void DecompressGlyphTile(const u8 *src, u8 *dest); void sub_020204FC(TextPrinter *printer, u32 x, u32 y, u16 fieldNum); diff --git a/src/list_menu.c b/src/list_menu.c index 829c12b8d..478011c28 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -178,9 +178,9 @@ s32 ListMenuGetTemplateField(struct ListMenu *list, enum ListMenuAttr attr) { static void ListMenuPrint(struct ListMenu *list, String *str, u8 x, u8 y) { if (str != NULL) { if (list->overrideEnabled) { - AddTextPrinterParameterized3(list->template.window, list->fontId, str, x, y, 0xFF, MAKE_TEXT_COLOR(list->cursorPal, list->cursorShadowPal, list->fillValue), list->lettersSpacing, 0, NULL); + AddTextPrinterParameterizedWithColorAndSpacing(list->template.window, list->fontId, str, x, y, 0xFF, MAKE_TEXT_COLOR(list->cursorPal, list->cursorShadowPal, list->fillValue), list->lettersSpacing, 0, NULL); } else { - AddTextPrinterParameterized3(list->template.window, list->template.fontId, str, x, y, 0xFF, MAKE_TEXT_COLOR(list->template.cursorPal, list->template.cursorShadowPal, list->template.fillValue), list->template.lettersSpacing, 0, NULL); + AddTextPrinterParameterizedWithColorAndSpacing(list->template.window, list->template.fontId, str, x, y, 0xFF, MAKE_TEXT_COLOR(list->template.cursorPal, list->template.cursorShadowPal, list->template.fillValue), list->template.lettersSpacing, 0, NULL); } } } diff --git a/src/text.c b/src/text.c index 7db2b1d38..89de6ee37 100644 --- a/src/text.c +++ b/src/text.c @@ -127,7 +127,7 @@ u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *s return AddTextPrinter(&template, textSpeed, callback); } -u8 AddTextPrinterParameterized3(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback) { +u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback) { TextPrinterTemplate template; template.currentChar.wrapped = string; From 9731f12019f36277c440b619d8b95e5cd05f9dde Mon Sep 17 00:00:00 2001 From: tgsm Date: Sat, 16 Dec 2023 06:04:47 -0600 Subject: [PATCH 4/8] text: Sync with pokediamond --- asm/include/overlay_03.inc | 2 +- asm/include/overlay_111.inc | 2 +- asm/include/overlay_37.inc | 2 +- asm/include/overlay_43.inc | 2 +- asm/include/overlay_44.inc | 2 +- asm/include/overlay_46.inc | 2 +- asm/include/overlay_47.inc | 2 +- asm/include/overlay_48.inc | 2 +- asm/include/overlay_49.inc | 2 +- asm/include/overlay_54.inc | 2 +- asm/include/overlay_73.inc | 2 +- asm/include/overlay_85.inc | 2 +- asm/include/overlay_90.inc | 2 +- asm/include/overlay_96.inc | 2 +- asm/include/render_text.inc | 2 +- asm/include/text.inc | 6 +- asm/overlay_03.s | 8 +- asm/overlay_111.s | 2 +- asm/overlay_37.s | 2 +- asm/overlay_43.s | 4 +- asm/overlay_44.s | 10 +- asm/overlay_46.s | 6 +- asm/overlay_47.s | 8 +- asm/overlay_48.s | 2 +- asm/overlay_49.s | 10 +- asm/overlay_54.s | 4 +- asm/overlay_73.s | 4 +- asm/overlay_85.s | 6 +- asm/overlay_90.s | 4 +- asm/overlay_96.s | 2 +- asm/render_text.s | 2 +- include/text.h | 6 +- src/font.c | 3 +- src/scrcmd_c.c | 2 +- src/text.c | 200 ++++++++++-------------------------- 35 files changed, 112 insertions(+), 209 deletions(-) diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 0246ad964..0c9f0a0d0 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -67,7 +67,7 @@ .public FillWindowPixelRect .public GetWindowWidth .public ScheduleBgTilemapBufferTransfer -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GfGfx_EngineATogglePlanes diff --git a/asm/include/overlay_111.inc b/asm/include/overlay_111.inc index 3c7531a7d..5a39715c9 100644 --- a/asm/include/overlay_111.inc +++ b/asm/include/overlay_111.inc @@ -87,7 +87,7 @@ .public ScheduleSetBgPosText .public ResetAllTextPrinters .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterizedWithColor .public GfGfx_SetBanks .public GfGfx_DisableEngineAPlanes diff --git a/asm/include/overlay_37.inc b/asm/include/overlay_37.inc index 102795451..586810e59 100644 --- a/asm/include/overlay_37.inc +++ b/asm/include/overlay_37.inc @@ -69,7 +69,7 @@ .public DoScheduledBgGpuUpdates .public GF_SinDeg .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_43.inc b/asm/include/overlay_43.inc index a3aa26b5c..31a6c83e3 100644 --- a/asm/include/overlay_43.inc +++ b/asm/include/overlay_43.inc @@ -113,7 +113,7 @@ .public ScheduleBgTilemapBufferTransfer .public ScheduleSetBgPosText .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager diff --git a/asm/include/overlay_44.inc b/asm/include/overlay_44.inc index 64198f5c6..dae898c1a 100644 --- a/asm/include/overlay_44.inc +++ b/asm/include/overlay_44.inc @@ -143,7 +143,7 @@ .public GF_SinDegNoWrap .public MTRandom .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager diff --git a/asm/include/overlay_46.inc b/asm/include/overlay_46.inc index 9b85f0c59..8af5f0723 100644 --- a/asm/include/overlay_46.inc +++ b/asm/include/overlay_46.inc @@ -57,7 +57,7 @@ .public FillWindowPixelBuffer .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GfGfx_SetBanks diff --git a/asm/include/overlay_47.inc b/asm/include/overlay_47.inc index 0b9745f30..e23c70e24 100644 --- a/asm/include/overlay_47.inc +++ b/asm/include/overlay_47.inc @@ -75,7 +75,7 @@ .public SetWindowPaletteNum .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager diff --git a/asm/include/overlay_48.inc b/asm/include/overlay_48.inc index 3b77f5932..3fe2dddfc 100644 --- a/asm/include/overlay_48.inc +++ b/asm/include/overlay_48.inc @@ -92,7 +92,7 @@ .public ScheduleBgTilemapBufferTransfer .public GF_DegreeToSinCosIdxNoWrap .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager diff --git a/asm/include/overlay_49.inc b/asm/include/overlay_49.inc index 80b6b5a09..92f90d8cc 100644 --- a/asm/include/overlay_49.inc +++ b/asm/include/overlay_49.inc @@ -150,7 +150,7 @@ .public GF_DegreeToSinCosIdx .public MTRandom .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager diff --git a/asm/include/overlay_54.inc b/asm/include/overlay_54.inc index f1afd6d20..2f1cedae4 100644 --- a/asm/include/overlay_54.inc +++ b/asm/include/overlay_54.inc @@ -65,7 +65,7 @@ .public FillWindowPixelRect .public DoScheduledBgGpuUpdates .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager diff --git a/asm/include/overlay_73.inc b/asm/include/overlay_73.inc index 56ffd4208..07fda6fad 100644 --- a/asm/include/overlay_73.inc +++ b/asm/include/overlay_73.inc @@ -96,7 +96,7 @@ .public DoesPixelAtScreenXYMatchPtrVal .public GF_SinDeg .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GF_RunVramTransferTasks diff --git a/asm/include/overlay_85.inc b/asm/include/overlay_85.inc index a2006aaf3..4e5d36317 100644 --- a/asm/include/overlay_85.inc +++ b/asm/include/overlay_85.inc @@ -128,7 +128,7 @@ .public GF_SinDeg .public LCRandom .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager diff --git a/asm/include/overlay_90.inc b/asm/include/overlay_90.inc index d67f452b7..23f260f98 100644 --- a/asm/include/overlay_90.inc +++ b/asm/include/overlay_90.inc @@ -99,7 +99,7 @@ .public ScheduleSetBgPosText .public MTRandom .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterizedWithColor .public GF_CreateVramTransferManager .public GF_DestroyVramTransferManager diff --git a/asm/include/overlay_96.inc b/asm/include/overlay_96.inc index a55c0e96f..9e18fb2e6 100644 --- a/asm/include/overlay_96.inc +++ b/asm/include/overlay_96.inc @@ -205,7 +205,7 @@ .public MTRandom .public ResetAllTextPrinters .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterizedWithColor .public AddTextPrinterParameterizedWithColorAndSpacing .public GF_CreateVramTransferManager diff --git a/asm/include/render_text.inc b/asm/include/render_text.inc index a006c318d..b20d4c30b 100644 --- a/asm/include/render_text.inc +++ b/asm/include/render_text.inc @@ -34,7 +34,7 @@ .public MsgArray_SkipControlCode .public MsgArray_GetControlCode .public MsgArray_ControlCodeGetField -.public sub_0202036C +.public GenerateFontHalfRowLookupTable .public sub_020204FC .public sub_020252F4 .public sub_02025320 diff --git a/asm/include/text.inc b/asm/include/text.inc index a713d86a1..60516f4c4 100644 --- a/asm/include/text.inc +++ b/asm/include/text.inc @@ -10,15 +10,15 @@ .public BlitBitmapRectToWindow .public GetWindowWidth .public sub_0201F988 -.public sub_0201FFE0 +.public SetFontsPointer .public ResetAllTextPrinters .public TextPrinterCheckActive -.public sub_020200A0 +.public RemoveTextPrinter .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public AddTextPrinterParameterizedWithColorAndSpacing .public AddTextPrinter -.public sub_0202036C +.public GenerateFontHalfRowLookupTable .public DecompressGlyphTile .public sub_020204FC .public GF_AssertFail diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 76dba420b..8d0389400 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -20,7 +20,7 @@ ov03_02253E20: ; 0x02253E20 ldr r0, [r0] add r0, #0x94 ldrb r0, [r0] - bl sub_020200A0 + bl RemoveTextPrinter _02253E42: cmp r4, #0 beq _02253E64 @@ -1108,7 +1108,7 @@ _02254714: ldr r0, [r0] add r0, #0x94 ldrb r0, [r0] - bl sub_020200A0 + bl RemoveTextPrinter _02254730: ldr r0, _022547D0 ; =ov03_022598A0 mov r1, #2 @@ -1271,7 +1271,7 @@ _0225486A: ldr r0, [r0] add r0, #0x94 ldrb r0, [r0] - bl sub_020200A0 + bl RemoveTextPrinter _022548A6: add r0, r6, #0 add r1, r4, #0 @@ -3314,7 +3314,7 @@ _02255932: ldr r0, [r0] add r0, #0x94 ldrb r0, [r0] - bl sub_020200A0 + bl RemoveTextPrinter _02255960: bl sub_02037454 add r1, r4, #0 diff --git a/asm/overlay_111.s b/asm/overlay_111.s index 17c3e6295..cbd08d8eb 100644 --- a/asm/overlay_111.s +++ b/asm/overlay_111.s @@ -2209,7 +2209,7 @@ ov111_021E69F4: ; 0x021E69F4 beq _021E6A0A lsl r0, r1, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021E6A0A: ldr r0, [r4, #0x1c] cmp r0, #0 diff --git a/asm/overlay_37.s b/asm/overlay_37.s index 61b030c78..f04f2d8de 100644 --- a/asm/overlay_37.s +++ b/asm/overlay_37.s @@ -2640,7 +2640,7 @@ ov37_021E6EB4: ; 0x021E6EB4 ldr r0, [r5, #0x30] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021E6ED2: add r0, r5, #0 mov r1, #2 diff --git a/asm/overlay_43.s b/asm/overlay_43.s index 61a081ee3..6f45beaee 100644 --- a/asm/overlay_43.s +++ b/asm/overlay_43.s @@ -1408,7 +1408,7 @@ ov43_0222A9F4: ; 0x0222A9F4 ldr r0, [r0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _0222AA22: add r0, r4, #0 mov r1, #0 @@ -1463,7 +1463,7 @@ ov43_0222AA70: ; 0x0222AA70 ldr r0, [r0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _0222AA98: add r4, #0x64 add r0, r4, #0 diff --git a/asm/overlay_44.s b/asm/overlay_44.s index 58aec7879..08de4e954 100644 --- a/asm/overlay_44.s +++ b/asm/overlay_44.s @@ -10899,7 +10899,7 @@ _0222F580: ldr r0, [r5, r0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter mov r0, #6 mov r1, #8 lsl r0, r0, #6 @@ -11048,7 +11048,7 @@ _0222F6C0: ldr r0, [r5, r0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter mov r0, #6 mov r1, #8 lsl r0, r0, #6 @@ -11172,7 +11172,7 @@ ov44_0222F7BC: ; 0x0222F7BC ldr r0, [r4, r0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter mov r0, #6 mov r1, #8 lsl r0, r0, #6 @@ -19434,7 +19434,7 @@ ov44_0223386C: ; 0x0223386C cmp r0, #0 beq _02233890 ldrb r0, [r5, #0x14] - bl sub_020200A0 + bl RemoveTextPrinter mov r0, #0xff strb r0, [r5, #0x14] _02233890: @@ -19545,7 +19545,7 @@ ov44_02233954: ; 0x02233954 cmp r0, #0 beq _0223396C ldrb r0, [r4, #0x14] - bl sub_020200A0 + bl RemoveTextPrinter _0223396C: mov r0, #0xff strb r0, [r4, #0x14] diff --git a/asm/overlay_46.s b/asm/overlay_46.s index 904ade685..05a9ab4cc 100644 --- a/asm/overlay_46.s +++ b/asm/overlay_46.s @@ -1411,7 +1411,7 @@ ov46_02259374: ; 0x02259374 ldr r0, [r5, #0x2c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _02259394: add r0, r5, #0 add r0, #8 @@ -1473,7 +1473,7 @@ ov46_022593F8: ; 0x022593F8 ldr r0, [r4, #0x2c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _02259414: ldr r0, [r4, #0x20] cmp r0, #0 @@ -1559,7 +1559,7 @@ ov46_02259494: ; 0x02259494 ldr r0, [r4, #0x2c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _022594B0: ldr r0, [r4, #0x24] cmp r0, #0 diff --git a/asm/overlay_47.s b/asm/overlay_47.s index 4239c998f..434725f79 100644 --- a/asm/overlay_47.s +++ b/asm/overlay_47.s @@ -1333,7 +1333,7 @@ ov47_02259278: ; 0x02259278 ldr r0, [r5] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _02259296: add r0, r5, #0 bl ov47_022593A0 @@ -1363,7 +1363,7 @@ ov47_022592B4: ; 0x022592B4 ldr r0, [r5] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _022592D4: add r0, r5, #0 add r0, #8 @@ -1412,7 +1412,7 @@ ov47_02259318: ; 0x02259318 ldr r0, [r5] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _02259338: add r0, r5, #0 add r0, #8 @@ -1508,7 +1508,7 @@ ov47_022593CC: ; 0x022593CC ldr r0, [r4] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _022593E8: add r0, r4, #0 bl ov47_022593A0 diff --git a/asm/overlay_48.s b/asm/overlay_48.s index 0d111a948..e7260d024 100644 --- a/asm/overlay_48.s +++ b/asm/overlay_48.s @@ -3045,7 +3045,7 @@ ov48_02259F14: ; 0x02259F14 ldr r0, [r4, #4] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _02259F30: ldr r0, [r4, #0xc] bl String_Delete diff --git a/asm/overlay_49.s b/asm/overlay_49.s index 59d08fa58..29b3b3018 100644 --- a/asm/overlay_49.s +++ b/asm/overlay_49.s @@ -4818,7 +4818,7 @@ ov49_0225AB14: ; 0x0225AB14 ldr r0, [r4, #0x10] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _0225AB30: add r0, r4, #0 bl ov49_0225AC38 @@ -4844,7 +4844,7 @@ ov49_0225AB44: ; 0x0225AB44 ldr r0, [r5, #0x10] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _0225AB64: add r0, r5, #0 mov r1, #0xf @@ -4890,7 +4890,7 @@ ov49_0225ABA4: ; 0x0225ABA4 ldr r0, [r5, #0x10] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _0225ABC4: add r0, r5, #0 mov r1, #0xf @@ -5009,7 +5009,7 @@ ov49_0225AC74: ; 0x0225AC74 ldr r0, [r4, #0x10] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _0225AC90: add r0, r4, #0 bl ov49_0225AC38 @@ -5057,7 +5057,7 @@ ov49_0225ACC4: ; 0x0225ACC4 ldr r0, [r5, #0x10] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _0225ACE4: add r0, r5, #0 mov r1, #0xf diff --git a/asm/overlay_54.s b/asm/overlay_54.s index c40fd02b2..fdcf3c565 100644 --- a/asm/overlay_54.s +++ b/asm/overlay_54.s @@ -380,7 +380,7 @@ _021E5C14: mov r0, #0xca lsl r0, r0, #2 ldrb r0, [r4, r0] - bl sub_020200A0 + bl RemoveTextPrinter _021E5C2C: mov r0, #0xb5 lsl r0, r0, #2 @@ -1064,7 +1064,7 @@ ov54_021E61A8: ; 0x021E61A8 mov r0, #0xca lsl r0, r0, #2 ldrb r0, [r5, r0] - bl sub_020200A0 + bl RemoveTextPrinter _021E61D2: ldr r1, _021E6230 ; =0x0000022A ldr r0, [r5, #0x28] diff --git a/asm/overlay_73.s b/asm/overlay_73.s index 1e545b319..3f8e5de8d 100644 --- a/asm/overlay_73.s +++ b/asm/overlay_73.s @@ -2763,7 +2763,7 @@ _021E6F34: ldr r0, [r5, #0x4c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021E6F66: add r0, r5, #0 mov r1, #0xf @@ -2929,7 +2929,7 @@ _021E7098: ldr r0, [r5, #0x4c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021E70AC: add r0, r5, #0 mov r1, #1 diff --git a/asm/overlay_85.s b/asm/overlay_85.s index b6d42e8e4..9724b6436 100644 --- a/asm/overlay_85.s +++ b/asm/overlay_85.s @@ -8796,7 +8796,7 @@ ov85_021E9B40: ; 0x021E9B40 ldr r0, [r5, #0x5c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021E9B5E: add r0, r5, #0 mov r1, #0xf @@ -9002,7 +9002,7 @@ _021E9CDA: ldr r0, [r5, #0x5c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021E9CEE: add r0, r5, #0 mov r1, #0xc @@ -9064,7 +9064,7 @@ _021E9D60: ldr r0, [r5, #0x5c] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021E9D74: mov r0, #0x33 lsl r0, r0, #4 diff --git a/asm/overlay_90.s b/asm/overlay_90.s index de0ce8d09..a44b5e401 100644 --- a/asm/overlay_90.s +++ b/asm/overlay_90.s @@ -1771,7 +1771,7 @@ _0225948A: ldrh r0, [r1, r0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _022594B4: add r0, r5, #0 add r1, r6, #0 @@ -1823,7 +1823,7 @@ ov90_022594FC: ; 0x022594FC ldrh r0, [r6, r7] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _02259524: lsl r4, r4, #4 add r0, r5, r4 diff --git a/asm/overlay_96.s b/asm/overlay_96.s index 83d5af7f4..fad264cf1 100644 --- a/asm/overlay_96.s +++ b/asm/overlay_96.s @@ -19235,7 +19235,7 @@ ov96_021EE944: ; 0x021EE944 beq _021EE95A lsl r0, r1, #0x18 lsr r0, r0, #0x18 - bl sub_020200A0 + bl RemoveTextPrinter _021EE95A: ldr r0, [r4, #0x18] cmp r0, #0 diff --git a/asm/render_text.s b/asm/render_text.s index a6fa6ccef..d7d96d95b 100644 --- a/asm/render_text.s +++ b/asm/render_text.s @@ -403,7 +403,7 @@ _0200245A: ldrb r0, [r4, #0x15] ldrb r1, [r4, #0x16] ldrb r2, [r4, #0x17] - bl sub_0202036C + bl GenerateFontHalfRowLookupTable b _02002622 _02002470: ldr r0, [r4] diff --git a/include/text.h b/include/text.h index a87fb9781..9a4657db3 100644 --- a/include/text.h +++ b/include/text.h @@ -14,14 +14,14 @@ #define MAX_TEXT_PRINTERS 8 -void sub_0201FFE0(const struct FontInfo *fontData); -void sub_020200A0(u8 printerId); +void SetFontsPointer(const struct FontInfo *fonts); +void RemoveTextPrinter(u8 printerId); void ResetAllTextPrinters(void); u8 TextPrinterCheckActive(u8 printerId); // FIXME: bool8 u8 AddTextPrinterParameterized(Window* window, FontID fontId, String* text, u32 x, u32 y, u32 textSpeed, PrinterCallback_t callback); u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, PrinterCallback_t callback); u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback); -void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor); +void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor); void DecompressGlyphTile(const u8 *src, u8 *dest); void sub_020204FC(TextPrinter *printer, u32 x, u32 y, u16 fieldNum); diff --git a/src/font.c b/src/font.c index 9942f851a..55048e0c9 100644 --- a/src/font.c +++ b/src/font.c @@ -44,7 +44,7 @@ void FontWork_Init(void) { sFontWork->fontDataMan[i] = NULL; sFontWork->fontDataRefCount[i] = 0; } - sub_0201FFE0(sFontInfos); + SetFontsPointer(sFontInfos); } void FontID_Alloc(FontID fontId, HeapID heapId) { @@ -195,4 +195,3 @@ u32 FontID_GetGlyphWidth(FontID fontId, u16 glyph) { GF_ASSERT(sFontWork->fontDataMan[fontId] != NULL); return GetGlyphWidth(sFontWork->fontDataMan[fontId], glyph); } - diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 6bdf34786..0000ce684 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -878,7 +878,7 @@ static BOOL sub_02041520(ScriptContext* ctx) { } if (direction != 0xFFFF) { - sub_020200A0(*printer_id_ptr); + RemoveTextPrinter(*printer_id_ptr); PlayerAvatar_SetFacingDirection(ctx->fieldSystem->playerAvatar, direction); *ret_ptr = 0; ctx->fieldSystem->unkD2_6 = 0; diff --git a/src/text.c b/src/text.c index 89de6ee37..05a142bb7 100644 --- a/src/text.c +++ b/src/text.c @@ -4,30 +4,24 @@ #include "text.h" #include "unk_0201F79C.h" -struct Unk21D1F6C { - u8 unk0; - u16 fgColor; - u16 shadowColor; - u16 bgColor; -}; +const struct FontInfo *gFonts; -const struct FontInfo *_0210F6D8; - -struct Unk21D1F6C _021D1F6C; +u8 _021D1F6C; +u16 sFgColor, sShadowColor, sBgColor; SysTask *sTextPrinterTasks[MAX_TEXT_PRINTERS]; -u16 _021D1F94[4 * 4 * 4 * 4]; +u16 sFontHalfRowLookupTable[4 * 4 * 4 * 4]; static u8 CreateTextPrinterSysTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority); -static BOOL sub_02020068(u8 printerId); +static BOOL TextPrinterSysTaskIsActive(u8 printerId); static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallback_t callback); -static void sub_020202EC(SysTask *task, TextPrinter *printer); +static void RunTextPrinter(SysTask *task, TextPrinter *printer); static u32 sub_02020358(TextPrinter *printer); static void sub_020204B8(TextPrinter *printer); static u16 *sub_020204C0(void); static void sub_02020548(TextPrinter *printer); -void sub_0201FFE0(const struct FontInfo *fontData) { - _0210F6D8 = fontData; +void SetFontsPointer(const struct FontInfo *fonts) { + gFonts = fonts; } static u8 CreateTextPrinterSysTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority) { @@ -63,7 +57,7 @@ static void DestroyTextPrinterSysTask(u8 printerId) { sTextPrinterTasks[printerId] = NULL; } -static BOOL sub_02020068(u8 printerId) { +static BOOL TextPrinterSysTaskIsActive(u8 printerId) { return sTextPrinterTasks[printerId] != NULL; } @@ -74,10 +68,10 @@ void ResetAllTextPrinters(void) { } u8 TextPrinterCheckActive(u8 printerId) { - return sub_02020068(printerId); + return TextPrinterSysTaskIsActive(printerId); } -void sub_020200A0(u8 printerId) { +void RemoveTextPrinter(u8 printerId) { DestroyTextPrinterSysTask(printerId); } @@ -91,12 +85,12 @@ u8 AddTextPrinterParameterized(Window *window, FontID fontId, String *string, u3 template.y = y; template.currentX = x; template.currentY = y; - template.letterSpacing = _0210F6D8[fontId].letterSpacing; - template.lineSpacing = _0210F6D8[fontId].lineSpacing; - template.unk14 = _0210F6D8[fontId].unk; - template.fgColor = _0210F6D8[fontId].fgColor; - template.bgColor = _0210F6D8[fontId].bgColor; - template.shadowColor = _0210F6D8[fontId].shadowColor; + template.letterSpacing = gFonts[fontId].letterSpacing; + template.lineSpacing = gFonts[fontId].lineSpacing; + template.unk14 = gFonts[fontId].unk; + template.fgColor = gFonts[fontId].fgColor; + template.bgColor = gFonts[fontId].bgColor; + template.shadowColor = gFonts[fontId].shadowColor; template.unk18 = 0; template.unk1A = 0; template.unk1B = 0xFF; @@ -114,9 +108,9 @@ u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *s template.y = y; template.currentX = x; template.currentY = y; - template.letterSpacing = _0210F6D8[fontId].letterSpacing; - template.lineSpacing = _0210F6D8[fontId].lineSpacing; - template.unk14 = _0210F6D8[fontId].unk; + template.letterSpacing = gFonts[fontId].letterSpacing; + template.lineSpacing = gFonts[fontId].lineSpacing; + template.unk14 = gFonts[fontId].unk; template.fgColor = (color >> 16) & 0xFF; template.shadowColor = (color >> 8) & 0xFF; template.bgColor = (color >> 0) & 0xFF; @@ -139,7 +133,7 @@ u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, St template.currentY = y; template.letterSpacing = letterSpacing; template.lineSpacing = lineSpacing; - template.unk14 = _0210F6D8[fontId].unk; + template.unk14 = gFonts[fontId].unk; template.fgColor = (color >> 16) & 0xFF; template.shadowColor = (color >> 8) & 0xFF; template.bgColor = (color >> 0) & 0xFF; @@ -151,7 +145,7 @@ u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, St } static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallback_t callback) { - if (_0210F6D8 == NULL) { + if (gFonts == NULL) { return 0xFF; } @@ -168,14 +162,14 @@ static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallba printer->template = *template; printer->template.currentChar.raw = String_cstr(printer->template.currentChar.wrapped); printer->callback = callback; - _021D1F6C.unk0 = 0; + _021D1F6C = 0; sub_020204B8(printer); if (speed != TEXT_SPEED_NOTRANSFER && speed != TEXT_SPEED_INSTANT) { printer->textSpeedBottom--; printer->textSpeedTop = 1; - printer->id = CreateTextPrinterSysTask((SysTaskFunc)sub_020202EC, printer, 1); + printer->id = CreateTextPrinterSysTask((SysTaskFunc)RunTextPrinter, printer, 1); return printer->id; } @@ -184,7 +178,7 @@ static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallba printer->textSpeedBottom = 0; printer->textSpeedTop = 0; - sub_0202036C(template->fgColor, template->bgColor, template->shadowColor); + GenerateFontHalfRowLookupTable(template->fgColor, template->bgColor, template->shadowColor); for (; i < 0x400; i++) { if (sub_02020358(printer) == 1) { @@ -202,15 +196,15 @@ static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallba return MAX_TEXT_PRINTERS; } -static void sub_020202EC(SysTask *task, TextPrinter *printer) { - if (_021D1F6C.unk0 != 0) { +static void RunTextPrinter(SysTask *task, TextPrinter *printer) { + if (_021D1F6C != 0) { return; } if (printer->unk2D == 0) { printer->unk2E = 0; - sub_0202036C(printer->template.fgColor, printer->template.bgColor, printer->template.shadowColor); + GenerateFontHalfRowLookupTable(printer->template.fgColor, printer->template.bgColor, printer->template.shadowColor); switch (sub_02020358(printer)) { case 0: @@ -238,138 +232,48 @@ static u32 sub_02020358(TextPrinter *printer) { return ret; } -// https://decomp.me/scratch/YCL75 -#ifdef NONMATCHING -void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor) { +void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) { u32 colors[4]; colors[0] = 0; colors[1] = fgColor; colors[2] = shadowColor; colors[3] = bgColor; - _021D1F6C.bgColor = bgColor; - _021D1F6C.fgColor = fgColor; - _021D1F6C.shadowColor = shadowColor; + sBgColor = bgColor; + sFgColor = fgColor; + sShadowColor = shadowColor; u32 index = 0; for (int i = 0; i < 4; i++) { for (int j = 0; j < 4; j++) { for (int k = 0; k < 4; k++) { for (int l = 0; l < 4; l++) { - _021D1F94[index++] = (colors[l] << 12) | (colors[k] << 8) | (colors[j] << 4) | colors[i]; + sFontHalfRowLookupTable[index++] = (colors[l] << 12) | (colors[k] << 8) | (colors[j] << 4) | colors[i]; } } } } } -#else -asm void sub_0202036C(u8 fgColor, u8 bgColor, u8 shadowColor) { - push {r3, r4, r5, r6, r7, lr} - sub sp, #0x30 - ldr r3, [pc, #0x94] // _02020408 ; =_021D1F6C - mov r5, #0 - str r5, [sp, #0x20] - str r0, [sp, #0x24] - str r2, [sp, #0x28] - str r1, [sp, #0x2c] - strh r1, [r3, #6] - strh r0, [r3, #2] - add r0, sp, #0x20 - strh r2, [r3, #4] - str r5, [sp, #0x14] - str r0, [sp, #8] - mov ip, r0 - mov lr, r0 - str r0, [sp, #0x18] -_0202038E: - mov r0, #0 - str r0, [sp, #0x10] - ldr r0, [sp, #0x18] - str r0, [sp, #4] - ldr r0, [sp, #8] - ldr r0, [r0, #0] - str r0, [sp, #0x1c] -_0202039C: - mov r0, #0 - str r0, [sp, #0xc] - mov r0, lr - str r0, [sp] - ldr r0, [sp, #4] - ldr r0, [r0, #0] - lsl r7, r0, #4 -_020203AA: - ldr r0, [sp] - mov r3, #0 - ldr r0, [r0, #0] - mov r4, ip - lsl r6, r0, #8 -_020203B4: - ldr r0, [r4, #0] - add r1, r7, #0 - lsl r0, r0, #0xc - orr r0, r6 - orr r1, r0 - ldr r0, [sp, #0x1c] - add r3, r3, #1 - add r2, r0, #0 - orr r2, r1 - lsl r1, r5, #1 - ldr r0, [pc, #0x40] // _0202040C ; =_021D1F94 - add r5, r5, #1 - add r4, r4, #4 - strh r2, [r0, r1] - cmp r3, #4 - blt _020203B4 - ldr r0, [sp] - add r0, r0, #4 - str r0, [sp] - ldr r0, [sp, #0xc] - add r0, r0, #1 - str r0, [sp, #0xc] - cmp r0, #4 - blt _020203AA - ldr r0, [sp, #4] - add r0, r0, #4 - str r0, [sp, #4] - ldr r0, [sp, #0x10] - add r0, r0, #1 - str r0, [sp, #0x10] - cmp r0, #4 - blt _0202039C - ldr r0, [sp, #8] - add r0, r0, #4 - str r0, [sp, #8] - ldr r0, [sp, #0x14] - add r0, r0, #1 - str r0, [sp, #0x14] - cmp r0, #4 - blt _0202038E - add sp, #0x30 - pop {r3, r4, r5, r6, r7, pc} -_02020408: DCD _021D1F6C -_0202040C: DCD _021D1F94 -} -#endif void DecompressGlyphTile(const u8* src, u8* dest) { const u16 *src16 = (u16*)src; u16 *dest16 = (u16*)dest; - dest16[0] = _021D1F94[src16[0] / 256]; - dest16[1] = _021D1F94[src16[0] & 0xFF]; - dest16[2] = _021D1F94[src16[1] / 256]; - dest16[3] = _021D1F94[src16[1] & 0xFF]; - dest16[4] = _021D1F94[src16[2] / 256]; - dest16[5] = _021D1F94[src16[2] & 0xFF]; - dest16[6] = _021D1F94[src16[3] / 256]; - dest16[7] = _021D1F94[src16[3] & 0xFF]; - dest16[8] = _021D1F94[src16[4] / 256]; - dest16[9] = _021D1F94[src16[4] & 0xFF]; - dest16[10] = _021D1F94[src16[5] / 256]; - dest16[11] = _021D1F94[src16[5] & 0xFF]; - dest16[12] = _021D1F94[src16[6] / 256]; - dest16[13] = _021D1F94[src16[6] & 0xFF]; - dest16[14] = _021D1F94[src16[7] / 256]; - dest16[15] = _021D1F94[src16[7] & 0xFF]; + dest16[0] = sFontHalfRowLookupTable[(u32)src16[0] >> 8]; + dest16[1] = sFontHalfRowLookupTable[(u32)src16[0] & 0xFF]; + dest16[2] = sFontHalfRowLookupTable[(u32)src16[1] >> 8]; + dest16[3] = sFontHalfRowLookupTable[(u32)src16[1] & 0xFF]; + dest16[4] = sFontHalfRowLookupTable[(u32)src16[2] >> 8]; + dest16[5] = sFontHalfRowLookupTable[(u32)src16[2] & 0xFF]; + dest16[6] = sFontHalfRowLookupTable[(u32)src16[3] >> 8]; + dest16[7] = sFontHalfRowLookupTable[(u32)src16[3] & 0xFF]; + dest16[8] = sFontHalfRowLookupTable[(u32)src16[4] >> 8]; + dest16[9] = sFontHalfRowLookupTable[(u32)src16[4] & 0xFF]; + dest16[10] = sFontHalfRowLookupTable[(u32)src16[5] >> 8]; + dest16[11] = sFontHalfRowLookupTable[(u32)src16[5] & 0xFF]; + dest16[12] = sFontHalfRowLookupTable[(u32)src16[6] >> 8]; + dest16[13] = sFontHalfRowLookupTable[(u32)src16[6] & 0xFF]; + dest16[14] = sFontHalfRowLookupTable[(u32)src16[7] >> 8]; + dest16[15] = sFontHalfRowLookupTable[(u32)src16[7] & 0xFF]; } static void sub_020204B8(TextPrinter *printer) { @@ -377,11 +281,11 @@ static void sub_020204B8(TextPrinter *printer) { } static u16 *sub_020204C0(void) { - u16 *ret = AllocFromHeap(HEAP_ID_DEFAULT, 0x300 * sizeof(u16)); + u16 *ret = AllocFromHeap(HEAP_ID_DEFAULT, 32 * 24 * sizeof(u16)); NNSG2dCharacterData *g2dCharData; void *charData = GfGfxLoader_GetCharData(NARC_graphic_font, 6, FALSE, &g2dCharData, HEAP_ID_DEFAULT); - MI_CpuCopy32(g2dCharData->pRawData, ret, 0x300 * sizeof(u16)); + MI_CpuCopy32(g2dCharData->pRawData, ret, 32 * 24 * sizeof(u16)); FreeToHeap(charData); return ret; @@ -397,7 +301,7 @@ void sub_020204FC(TextPrinter *printer, u32 x, u32 y, u16 fieldNum) { printer->unk30 = sub_020204C0(); } - void *startAddr = (void*)printer->unk30 + (fieldNum * 0x180); + u16 *startAddr = (void*)printer->unk30 + (fieldNum * (24 * 8 * sizeof(u16))); u16 destX = (GetWindowWidth(window) - 3) * 8; BlitBitmapRectToWindow(window, startAddr, 0, 0, 24, 32, destX, 0, 24, 32); } From eb3f13ef767edbda02fcd4a9221b5332479595d3 Mon Sep 17 00:00:00 2001 From: tgsm Date: Sat, 16 Dec 2023 14:27:02 -0600 Subject: [PATCH 5/8] text: Remove no-longer-used asm/include/text.inc --- asm/include/text.inc | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 asm/include/text.inc diff --git a/asm/include/text.inc b/asm/include/text.inc deleted file mode 100644 index 60516f4c4..000000000 --- a/asm/include/text.inc +++ /dev/null @@ -1,26 +0,0 @@ -#include -#pragma once -.public FontID_RenderText -.public GfGfxLoader_GetCharData -.public sub_0200E358 -.public DestroySysTask -.public AllocFromHeap -.public FreeToHeap -.public CopyWindowToVram -.public BlitBitmapRectToWindow -.public GetWindowWidth -.public sub_0201F988 -.public SetFontsPointer -.public ResetAllTextPrinters -.public TextPrinterCheckActive -.public RemoveTextPrinter -.public AddTextPrinterParameterized -.public AddTextPrinterParameterizedWithColor -.public AddTextPrinterParameterizedWithColorAndSpacing -.public AddTextPrinter -.public GenerateFontHalfRowLookupTable -.public DecompressGlyphTile -.public sub_020204FC -.public GF_AssertFail -.public String_cstr -.public MIi_CpuCopy32 From 6ea98d1e48950b4de00b1c0400baccf387691505 Mon Sep 17 00:00:00 2001 From: tgsm Date: Mon, 18 Dec 2023 09:21:56 -0600 Subject: [PATCH 6/8] text: Address review comments + import an enum from pokeemerald --- asm/include/render_text.inc | 2 +- asm/render_text.s | 2 +- include/font.h | 2 +- include/font_types_def.h | 7 ++++++ include/render_text.h | 2 +- include/text.h | 2 +- src/font.c | 2 +- src/text.c | 44 ++++++++++++++++++------------------- 8 files changed, 35 insertions(+), 28 deletions(-) diff --git a/asm/include/render_text.inc b/asm/include/render_text.inc index b20d4c30b..460bf0f3a 100644 --- a/asm/include/render_text.inc +++ b/asm/include/render_text.inc @@ -35,7 +35,7 @@ .public MsgArray_GetControlCode .public MsgArray_ControlCodeGetField .public GenerateFontHalfRowLookupTable -.public sub_020204FC +.public RenderScreenFocusIndicatorTile .public sub_020252F4 .public sub_02025320 .public GF_AssertFail diff --git a/asm/render_text.s b/asm/render_text.s index d7d96d95b..54457e84a 100644 --- a/asm/render_text.s +++ b/asm/render_text.s @@ -414,7 +414,7 @@ _02002470: ldrh r1, [r4, #0xc] ldrh r2, [r4, #0xe] add r0, r4, #0 - bl sub_020204FC + bl RenderScreenFocusIndicatorTile add r0, r4, #0 add r0, #0x29 ldrb r0, [r0] diff --git a/include/font.h b/include/font.h index 3e718420f..51db44bc7 100644 --- a/include/font.h +++ b/include/font.h @@ -11,7 +11,7 @@ void FontID_SetAccessDirect(FontID fontId, HeapID heapId); void FontID_SetAccessLazy(FontID fontId); void FontID_Release(FontID fontId); struct GlyphInfo *FontID_TryLoadGlyph(FontID fontId, u16 glyphId); -BOOL FontID_RenderText(int fontId, struct TextPrinter *printer); +enum RenderResult FontID_RenderText(int fontId, struct TextPrinter *printer); u32 FontID_FlatArray_GetWidth(FontID fontId, const u16 *string, u32 letterSpacing); u32 FontID_FlatArray_GetWidthFirstLine(FontID fontId, const u16 *string, u32 letterSpacing); u32 FontID_String_GetWidth(FontID fontId, String *string, u32 letterSpacing); diff --git a/include/font_types_def.h b/include/font_types_def.h index 16bf9c791..577293b3e 100644 --- a/include/font_types_def.h +++ b/include/font_types_def.h @@ -63,4 +63,11 @@ typedef struct TextPrinter { u16 *unk30; } TextPrinter; +enum RenderResult { + RENDER_PRINT, + RENDER_FINISH, + RENDER_REPEAT, // Run render function again, if e.g. a control code is encountered. + RENDER_UPDATE, +}; + #endif //POKEHEARTGOLD_FONT_TYPES_DEF_H diff --git a/include/render_text.h b/include/render_text.h index 25e565a4a..30e03da2c 100644 --- a/include/render_text.h +++ b/include/render_text.h @@ -13,7 +13,7 @@ struct TextPrinterSubStruct { u8 autoScrollDelay : 8; }; -BOOL RenderText(struct TextPrinter *printer); +enum RenderResult RenderText(struct TextPrinter *printer); void TextFlags_SetCanABSpeedUpPrint(BOOL enable); void sub_02002B50(BOOL enable); void sub_02002B8C(BOOL enable); diff --git a/include/text.h b/include/text.h index 9a4657db3..bfce03f04 100644 --- a/include/text.h +++ b/include/text.h @@ -23,6 +23,6 @@ u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *s u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, String *string, u32 x, u32 y, u32 textSpeed, u32 color, u32 letterSpacing, u32 lineSpacing, PrinterCallback_t callback); void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor); void DecompressGlyphTile(const u8 *src, u8 *dest); -void sub_020204FC(TextPrinter *printer, u32 x, u32 y, u16 fieldNum); +void RenderScreenFocusIndicatorTile(TextPrinter *printer, u32 unusedX, u32 unusedY, u16 fieldNum); #endif //POKEHEARTGOLD_TEXT_H diff --git a/src/font.c b/src/font.c index 55048e0c9..77a966298 100644 --- a/src/font.c +++ b/src/font.c @@ -102,7 +102,7 @@ struct GlyphInfo *FontID_TryLoadGlyph(FontID fontId, u16 glyphId) { return &sFontWork->glyph_buffer; } -BOOL FontID_RenderText(int fontId, struct TextPrinter *printer) { +enum RenderResult FontID_RenderText(int fontId, struct TextPrinter *printer) { struct TextPrinterSubStruct *sub; sub = (struct TextPrinterSubStruct *)printer->subStructFields; diff --git a/src/text.c b/src/text.c index 05a142bb7..16e8cbb71 100644 --- a/src/text.c +++ b/src/text.c @@ -4,20 +4,20 @@ #include "text.h" #include "unk_0201F79C.h" -const struct FontInfo *gFonts; +static const struct FontInfo *gFonts; -u8 _021D1F6C; -u16 sFgColor, sShadowColor, sBgColor; -SysTask *sTextPrinterTasks[MAX_TEXT_PRINTERS]; -u16 sFontHalfRowLookupTable[4 * 4 * 4 * 4]; +static u8 _021D1F6C; +static u16 sFgColor, sShadowColor, sBgColor; +static SysTask *sTextPrinterTasks[MAX_TEXT_PRINTERS]; +static u16 sFontHalfRowLookupTable[4 * 4 * 4 * 4]; static u8 CreateTextPrinterSysTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority); static BOOL TextPrinterSysTaskIsActive(u8 printerId); static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallback_t callback); static void RunTextPrinter(SysTask *task, TextPrinter *printer); -static u32 sub_02020358(TextPrinter *printer); +static enum RenderResult RenderFont(TextPrinter *printer); static void sub_020204B8(TextPrinter *printer); -static u16 *sub_020204C0(void); +static u16 *LoadScreenFocusIndicatorGraphics(void); static void sub_02020548(TextPrinter *printer); void SetFontsPointer(const struct FontInfo *fonts) { @@ -181,7 +181,7 @@ static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallba GenerateFontHalfRowLookupTable(template->fgColor, template->bgColor, template->shadowColor); for (; i < 0x400; i++) { - if (sub_02020358(printer) == 1) { + if (RenderFont(printer) == RENDER_FINISH) { break; } } @@ -206,16 +206,16 @@ static void RunTextPrinter(SysTask *task, TextPrinter *printer) { GenerateFontHalfRowLookupTable(printer->template.fgColor, printer->template.bgColor, printer->template.shadowColor); - switch (sub_02020358(printer)) { - case 0: + switch (RenderFont(printer)) { + case RENDER_PRINT: CopyWindowToVram(printer->template.window); // fallthrough - case 3: + case RENDER_UPDATE: if (printer->callback != NULL) { printer->unk2D = printer->callback(&printer->template, printer->unk2E); } return; - case 1: + case RENDER_FINISH: DestroyTextPrinterSysTask(printer->id); return; } @@ -224,12 +224,12 @@ static void RunTextPrinter(SysTask *task, TextPrinter *printer) { } } -static u32 sub_02020358(TextPrinter *printer) { - u32 ret; +static enum RenderResult RenderFont(TextPrinter *printer) { + enum RenderResult result; do { - ret = FontID_RenderText(printer->template.fontId, printer); - } while (ret == 2); - return ret; + result = FontID_RenderText(printer->template.fontId, printer); + } while (result == RENDER_REPEAT); + return result; } void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) { @@ -280,7 +280,7 @@ static void sub_020204B8(TextPrinter *printer) { printer->unk30 = NULL; } -static u16 *sub_020204C0(void) { +static u16 *LoadScreenFocusIndicatorGraphics(void) { u16 *ret = AllocFromHeap(HEAP_ID_DEFAULT, 32 * 24 * sizeof(u16)); NNSG2dCharacterData *g2dCharData; @@ -291,14 +291,14 @@ static u16 *sub_020204C0(void) { return ret; } -void sub_020204FC(TextPrinter *printer, u32 x, u32 y, u16 fieldNum) { - (void)x; - (void)y; +void RenderScreenFocusIndicatorTile(TextPrinter *printer, u32 unusedX, u32 unusedY, u16 fieldNum) { + (void)unusedX; + (void)unusedY; Window *window = printer->template.window; if (printer->unk30 == NULL) { - printer->unk30 = sub_020204C0(); + printer->unk30 = LoadScreenFocusIndicatorGraphics(); } u16 *startAddr = (void*)printer->unk30 + (fieldNum * (24 * 8 * sizeof(u16))); From cd206e39277be84780721a1e7740faf620faa6f9 Mon Sep 17 00:00:00 2001 From: tgsm Date: Mon, 25 Dec 2023 16:04:26 -0600 Subject: [PATCH 7/8] text: Address more review comments, fix speed/color constants --- asm/alph_puzzle_data.s | 6 +++--- include/font.h | 2 +- include/font_types_def.h | 4 ++-- include/render_text.h | 2 +- src/alph_puzzle.c | 2 +- src/credits/credits.c | 4 ++-- src/font.c | 2 +- src/list_menu.c | 4 ++-- src/scrcmd_c.c | 2 +- src/text.c | 34 ++++++++++++++++----------------- src/voltorb_flip/voltorb_flip.c | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/asm/alph_puzzle_data.s b/asm/alph_puzzle_data.s index 1f5363cad..5e41109a5 100644 --- a/asm/alph_puzzle_data.s +++ b/asm/alph_puzzle_data.s @@ -28,9 +28,9 @@ ov110_021E6D9C: ; 0x021E6D9C .public ov110_021E6DA4 ov110_021E6DA4: ; 0x021E6DA4 - .word 0x00010200 - .word 0x00030400 - .word 0x00050600 + .word (1 << 16) | (2 << 8) | 0 + .word (3 << 16) | (4 << 8) | 0 + .word (5 << 16) | (6 << 8) | 0 .public ov110_021E6DB0 ov110_021E6DB0: ; 0x021E6DB0 diff --git a/include/font.h b/include/font.h index 51db44bc7..36c87b010 100644 --- a/include/font.h +++ b/include/font.h @@ -11,7 +11,7 @@ void FontID_SetAccessDirect(FontID fontId, HeapID heapId); void FontID_SetAccessLazy(FontID fontId); void FontID_Release(FontID fontId); struct GlyphInfo *FontID_TryLoadGlyph(FontID fontId, u16 glyphId); -enum RenderResult FontID_RenderText(int fontId, struct TextPrinter *printer); +RenderResult FontID_RenderText(int fontId, TextPrinter *printer); u32 FontID_FlatArray_GetWidth(FontID fontId, const u16 *string, u32 letterSpacing); u32 FontID_FlatArray_GetWidthFirstLine(FontID fontId, const u16 *string, u32 letterSpacing); u32 FontID_String_GetWidth(FontID fontId, String *string, u32 letterSpacing); diff --git a/include/font_types_def.h b/include/font_types_def.h index 577293b3e..baf4c8f52 100644 --- a/include/font_types_def.h +++ b/include/font_types_def.h @@ -63,11 +63,11 @@ typedef struct TextPrinter { u16 *unk30; } TextPrinter; -enum RenderResult { +typedef enum RenderResult { RENDER_PRINT, RENDER_FINISH, RENDER_REPEAT, // Run render function again, if e.g. a control code is encountered. RENDER_UPDATE, -}; +} RenderResult; #endif //POKEHEARTGOLD_FONT_TYPES_DEF_H diff --git a/include/render_text.h b/include/render_text.h index 30e03da2c..d51265987 100644 --- a/include/render_text.h +++ b/include/render_text.h @@ -13,7 +13,7 @@ struct TextPrinterSubStruct { u8 autoScrollDelay : 8; }; -enum RenderResult RenderText(struct TextPrinter *printer); +RenderResult RenderText(TextPrinter *printer); void TextFlags_SetCanABSpeedUpPrint(BOOL enable); void sub_02002B50(BOOL enable); void sub_02002B8C(BOOL enable); diff --git a/src/alph_puzzle.c b/src/alph_puzzle.c index 28ad1e991..45530e9f9 100644 --- a/src/alph_puzzle.c +++ b/src/alph_puzzle.c @@ -823,7 +823,7 @@ void ov110_021E6904(AlphPuzzleData *data, int a1) { } u32 width = FontID_String_GetWidth(4, data->quitText, 0); - AddTextPrinterParameterizedWithColor(data->window, 4, data->quitText, (48 - width) / 2, 4, 0xFF, ov110_021E6DA4[a1], NULL); + AddTextPrinterParameterizedWithColor(data->window, 4, data->quitText, (48 - width) / 2, 4, TEXT_SPEED_NOTRANSFER, ov110_021E6DA4[a1], NULL); ScheduleWindowCopyToVram(data->window); } diff --git a/src/credits/credits.c b/src/credits/credits.c index a61c5c2d8..6386462c0 100644 --- a/src/credits/credits.c +++ b/src/credits/credits.c @@ -248,7 +248,7 @@ BOOL CreditsApp_OvyInit(OVY_MANAGER *man, int *state) { // Print game title ReadMsgDataIntoString(work->pageWork.msgData, GAME_TITLE_MSG_NO, work->pageWork.string); FillWindowPixelBuffer(&work->pageWork.window, 0); - AddTextPrinterParameterizedWithColor(&work->pageWork.window, 0, work->pageWork.string, 0, 70, TEXT_SPEED_NOTRANSFER, 0x00010200, NULL); + AddTextPrinterParameterizedWithColor(&work->pageWork.window, 0, work->pageWork.string, 0, 70, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); CopyWindowToVram(&work->pageWork.window); // Initialize to first line of the credits @@ -930,7 +930,7 @@ static void LoadPage(PageWork *ptr) { u8 xPos = sCreditMsgLines[ptr->pageState.line].x; u8 yPos = sCreditMsgLines[ptr->pageState.line].y; ReadMsgDataIntoString(ptr->msgData, msgno, ptr->string); - AddTextPrinterParameterizedWithColor(&ptr->window, 0, ptr->string, xPos, yPos, TEXT_SPEED_NOTRANSFER, 0x00010200, NULL); + AddTextPrinterParameterizedWithColor(&ptr->window, 0, ptr->string, xPos, yPos, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); if (++ptr->pageState.line >= NELEMS(sCreditMsgLines)) { break; } diff --git a/src/font.c b/src/font.c index 77a966298..883dd331c 100644 --- a/src/font.c +++ b/src/font.c @@ -102,7 +102,7 @@ struct GlyphInfo *FontID_TryLoadGlyph(FontID fontId, u16 glyphId) { return &sFontWork->glyph_buffer; } -enum RenderResult FontID_RenderText(int fontId, struct TextPrinter *printer) { +RenderResult FontID_RenderText(int fontId, TextPrinter *printer) { struct TextPrinterSubStruct *sub; sub = (struct TextPrinterSubStruct *)printer->subStructFields; diff --git a/src/list_menu.c b/src/list_menu.c index 478011c28..08a6c3c3f 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -178,9 +178,9 @@ s32 ListMenuGetTemplateField(struct ListMenu *list, enum ListMenuAttr attr) { static void ListMenuPrint(struct ListMenu *list, String *str, u8 x, u8 y) { if (str != NULL) { if (list->overrideEnabled) { - AddTextPrinterParameterizedWithColorAndSpacing(list->template.window, list->fontId, str, x, y, 0xFF, MAKE_TEXT_COLOR(list->cursorPal, list->cursorShadowPal, list->fillValue), list->lettersSpacing, 0, NULL); + AddTextPrinterParameterizedWithColorAndSpacing(list->template.window, list->fontId, str, x, y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(list->cursorPal, list->cursorShadowPal, list->fillValue), list->lettersSpacing, 0, NULL); } else { - AddTextPrinterParameterizedWithColorAndSpacing(list->template.window, list->template.fontId, str, x, y, 0xFF, MAKE_TEXT_COLOR(list->template.cursorPal, list->template.cursorShadowPal, list->template.fillValue), list->template.lettersSpacing, 0, NULL); + AddTextPrinterParameterizedWithColorAndSpacing(list->template.window, list->template.fontId, str, x, y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(list->template.cursorPal, list->template.cursorShadowPal, list->template.fillValue), list->template.lettersSpacing, 0, NULL); } } } diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 0000ce684..7b94e2958 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -787,7 +787,7 @@ BOOL ScrCmd_DirectionSignpost(ScriptContext* ctx) { ReadMsgDataIntoString(ctx->msgdata, msg_no, *tmp_str); StringExpandPlaceholders(*msg_fmt, *unk1, *tmp_str); Window* window = ov01_021F3D80(fieldSystem->unk68); - AddTextPrinterParameterizedWithColor(window, 1, *unk1, 0, 0, 0, MAKE_TEXT_COLOR(2, 10, 15), NULL); + AddTextPrinterParameterizedWithColor(window, 1, *unk1, 0, 0, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(2, 10, 15), NULL); return TRUE; } diff --git a/src/text.c b/src/text.c index 16e8cbb71..d3b6cc077 100644 --- a/src/text.c +++ b/src/text.c @@ -4,7 +4,7 @@ #include "text.h" #include "unk_0201F79C.h" -static const struct FontInfo *gFonts; +static const struct FontInfo *sFonts; static u8 _021D1F6C; static u16 sFgColor, sShadowColor, sBgColor; @@ -15,13 +15,13 @@ static u8 CreateTextPrinterSysTask(SysTaskFunc taskFunc, TextPrinter *printer, u static BOOL TextPrinterSysTaskIsActive(u8 printerId); static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallback_t callback); static void RunTextPrinter(SysTask *task, TextPrinter *printer); -static enum RenderResult RenderFont(TextPrinter *printer); +static RenderResult RenderFont(TextPrinter *printer); static void sub_020204B8(TextPrinter *printer); static u16 *LoadScreenFocusIndicatorGraphics(void); static void sub_02020548(TextPrinter *printer); void SetFontsPointer(const struct FontInfo *fonts) { - gFonts = fonts; + sFonts = fonts; } static u8 CreateTextPrinterSysTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority) { @@ -85,12 +85,12 @@ u8 AddTextPrinterParameterized(Window *window, FontID fontId, String *string, u3 template.y = y; template.currentX = x; template.currentY = y; - template.letterSpacing = gFonts[fontId].letterSpacing; - template.lineSpacing = gFonts[fontId].lineSpacing; - template.unk14 = gFonts[fontId].unk; - template.fgColor = gFonts[fontId].fgColor; - template.bgColor = gFonts[fontId].bgColor; - template.shadowColor = gFonts[fontId].shadowColor; + template.letterSpacing = sFonts[fontId].letterSpacing; + template.lineSpacing = sFonts[fontId].lineSpacing; + template.unk14 = sFonts[fontId].unk; + template.fgColor = sFonts[fontId].fgColor; + template.bgColor = sFonts[fontId].bgColor; + template.shadowColor = sFonts[fontId].shadowColor; template.unk18 = 0; template.unk1A = 0; template.unk1B = 0xFF; @@ -108,9 +108,9 @@ u8 AddTextPrinterParameterizedWithColor(Window *window, FontID fontId, String *s template.y = y; template.currentX = x; template.currentY = y; - template.letterSpacing = gFonts[fontId].letterSpacing; - template.lineSpacing = gFonts[fontId].lineSpacing; - template.unk14 = gFonts[fontId].unk; + template.letterSpacing = sFonts[fontId].letterSpacing; + template.lineSpacing = sFonts[fontId].lineSpacing; + template.unk14 = sFonts[fontId].unk; template.fgColor = (color >> 16) & 0xFF; template.shadowColor = (color >> 8) & 0xFF; template.bgColor = (color >> 0) & 0xFF; @@ -133,7 +133,7 @@ u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, St template.currentY = y; template.letterSpacing = letterSpacing; template.lineSpacing = lineSpacing; - template.unk14 = gFonts[fontId].unk; + template.unk14 = sFonts[fontId].unk; template.fgColor = (color >> 16) & 0xFF; template.shadowColor = (color >> 8) & 0xFF; template.bgColor = (color >> 0) & 0xFF; @@ -145,12 +145,12 @@ u8 AddTextPrinterParameterizedWithColorAndSpacing(Window *window, int fontId, St } static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallback_t callback) { - if (gFonts == NULL) { + if (sFonts == NULL) { return 0xFF; } TextPrinter *printer = AllocFromHeap(HEAP_ID_DEFAULT, sizeof(TextPrinter)); - printer->active = 1; + printer->active = TRUE; printer->state = 0; printer->textSpeedBottom = speed; printer->delayCounter = 0; @@ -224,8 +224,8 @@ static void RunTextPrinter(SysTask *task, TextPrinter *printer) { } } -static enum RenderResult RenderFont(TextPrinter *printer) { - enum RenderResult result; +static RenderResult RenderFont(TextPrinter *printer) { + RenderResult result; do { result = FontID_RenderText(printer->template.fontId, printer); } while (result == RENDER_REPEAT); diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index 200fa0031..f28569860 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -1529,11 +1529,11 @@ static void PaintMessageOnWindow(VoltorbFlipAppWork *work, FontID fontId, u8 msg PrintMessageOnWindow(work, fontId, msgNo, window, x, y, 0x00010200); } -static void PrintMessageOnWindow(VoltorbFlipAppWork *work, FontID fontId, u8 msgNo, Window *window, u8 x, u8 y, u32 textSpeed) { +static void PrintMessageOnWindow(VoltorbFlipAppWork *work, FontID fontId, u8 msgNo, Window *window, u8 x, u8 y, u32 textColor) { FillWindowPixelBuffer(window, 0); String *str = ReadMsgData_ExpandPlaceholders(work->msgFmt, work->msgData, msgNo, work->heapId); - AddTextPrinterParameterizedWithColor(window, fontId, str, x, y, 0xff, textSpeed, 0); + AddTextPrinterParameterizedWithColor(window, fontId, str, x, y, TEXT_SPEED_NOTRANSFER, textColor, 0); ScheduleWindowCopyToVram(window); String_Delete(str); From 28d550a2e6e5c77da6ab71b8c010fdf98d5435d8 Mon Sep 17 00:00:00 2001 From: tgsm Date: Mon, 25 Dec 2023 17:24:58 -0600 Subject: [PATCH 8/8] text: Remove unneeded casts --- src/text.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/text.c b/src/text.c index d3b6cc077..c5c1a8731 100644 --- a/src/text.c +++ b/src/text.c @@ -292,9 +292,6 @@ static u16 *LoadScreenFocusIndicatorGraphics(void) { } void RenderScreenFocusIndicatorTile(TextPrinter *printer, u32 unusedX, u32 unusedY, u16 fieldNum) { - (void)unusedX; - (void)unusedY; - Window *window = printer->template.window; if (printer->unk30 == NULL) {