Standartize AddTextPrinterParametrized functions,

15 files changed, 218 insertions, 1110 deletions

diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index ffbd7c58d..45da56996 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -6,900 +6,8 @@
 	.text
 
 
-	thumb_func_start sub_819E538
-sub_819E538: @ 819E538
-	push {r4-r7,lr}
-	movs r5, 0
-_0819E53C:
-	ldr r6, =sFactorySwapScreen
-	ldr r0, [r6]
-	adds r0, 0x5
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, =gSprites
-	adds r0, r4
-	bl DestroySprite
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x2
-	bls _0819E53C
-	ldr r0, [r6]
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	ldr r0, [r6]
-	ldrb r1, [r0, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	ldr r0, [r6]
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	movs r5, 0
-_0819E590:
-	movs r4, 0
-	lsls r6, r5, 1
-_0819E594:
-	ldr r0, =sFactorySwapScreen
-	ldr r0, [r0]
-	adds r1, r6, r5
-	adds r1, r4, r1
-	adds r0, 0x8
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl DestroySprite
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x2
-	bls _0819E594
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bls _0819E590
-	movs r5, 0
-_0819E5C6:
-	movs r4, 0
-	adds r7, r5, 0x1
-	lsls r6, r5, 1
-_0819E5CC:
-	ldr r0, =sFactorySwapScreen
-	ldr r0, [r0]
-	adds r1, r4, r6
-	adds r0, 0xE
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl DestroySprite
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1
-	bls _0819E5CC
-	lsls r0, r7, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bls _0819E5C6
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819E538
-
-	thumb_func_start sub_819E608
-sub_819E608: @ 819E608
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x2
-	bhi _0819E65C
-	ldr r4, =gSprites
-	ldr r5, =sFactorySwapScreen
-	ldr r0, [r5]
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	bl sub_819E8EC
-	ldr r0, [r5]
-	ldrb r2, [r0, 0x4]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r4
-	adds r0, 0x5
-	adds r0, r6
-	ldrb r2, [r0]
-	lsls r0, r2, 4
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrh r0, [r0, 0x20]
-	strh r0, [r1, 0x20]
-	b _0819E684
-	.pool
-_0819E65C:
-	ldr r2, =gSprites
-	ldr r3, =sFactorySwapScreen
-	ldr r0, [r3]
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r0, [r3]
-	ldr r1, [r0, 0x18]
-	lsls r0, r6, 3
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_819E838
-_0819E684:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819E608
-
-	thumb_func_start Swap_UpdateBallCursorPosition
-Swap_UpdateBallCursorPosition: @ 819E694
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x5
-	bl PlaySE
-	lsls r4, 24
-	cmp r4, 0
-	ble _0819E6C0
-	ldr r1, =sFactorySwapScreen
-	ldr r2, [r1]
-	ldrb r0, [r2, 0x3]
-	adds r0, 0x1
-	ldrb r3, [r2, 0x17]
-	cmp r0, r3
-	bne _0819E6D8
-	movs r0, 0
-	b _0819E6D8
-	.pool
-_0819E6C0:
-	ldr r0, =sFactorySwapScreen
-	ldr r2, [r0]
-	ldrb r3, [r2, 0x3]
-	adds r1, r0, 0
-	cmp r3, 0
-	beq _0819E6D4
-	subs r0, r3, 0x1
-	b _0819E6D8
-	.pool
-_0819E6D4:
-	ldrb r0, [r2, 0x17]
-	subs r0, 0x1
-_0819E6D8:
-	strb r0, [r2, 0x3]
-	ldr r0, [r1]
-	ldrb r0, [r0, 0x3]
-	bl sub_819E608
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end Swap_UpdateBallCursorPosition
-
-	thumb_func_start Swap_UpdateActionCursorPosition
-Swap_UpdateActionCursorPosition: @ 819E6E8
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x5
-	bl PlaySE
-	lsls r4, 24
-	cmp r4, 0
-	ble _0819E728
-	ldr r0, =sFactorySwapScreen
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x3]
-	adds r4, r0, 0
-	cmp r1, 0x2
-	bhi _0819E714
-	movs r0, 0x3
-	strb r0, [r2, 0x3]
-	b _0819E74A
-	.pool
-_0819E714:
-	ldrb r0, [r2, 0x3]
-	adds r0, 0x1
-	ldrb r1, [r2, 0x17]
-	cmp r0, r1
-	beq _0819E722
-	strb r0, [r2, 0x3]
-	b _0819E74A
-_0819E722:
-	movs r0, 0
-	strb r0, [r2, 0x3]
-	b _0819E74A
-_0819E728:
-	ldr r0, =sFactorySwapScreen
-	ldr r1, [r0]
-	ldrb r3, [r1, 0x3]
-	adds r2, r3, 0
-	adds r4, r0, 0
-	cmp r2, 0x2
-	bls _0819E744
-	cmp r2, 0
-	beq _0819E744
-	subs r0, r3, 0x1
-	b _0819E748
-	.pool
-_0819E744:
-	ldrb r0, [r1, 0x17]
-	subs r0, 0x1
-_0819E748:
-	strb r0, [r1, 0x3]
-_0819E74A:
-	ldr r0, [r4]
-	ldrb r0, [r0, 0x3]
-	bl sub_819E608
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end Swap_UpdateActionCursorPosition
-
-	thumb_func_start Swap_UpdateYesNoCursorPosition
-Swap_UpdateYesNoCursorPosition: @ 819E758
-	push {lr}
-	lsls r0, 24
-	cmp r0, 0
-	ble _0819E778
-	ldr r0, =sFactorySwapScreen
-	ldr r1, [r0]
-	ldrb r3, [r1, 0x16]
-	adds r2, r0, 0
-	cmp r3, 0x1
-	beq _0819E774
-	adds r0, r3, 0x1
-	b _0819E78E
-	.pool
-_0819E774:
-	movs r0, 0
-	b _0819E78E
-_0819E778:
-	ldr r0, =sFactorySwapScreen
-	ldr r1, [r0]
-	ldrb r3, [r1, 0x16]
-	adds r2, r0, 0
-	cmp r3, 0
-	beq _0819E78C
-	subs r0, r3, 0x1
-	b _0819E78E
-	.pool
-_0819E78C:
-	movs r0, 0x1
-_0819E78E:
-	strb r0, [r1, 0x16]
-	ldr r3, =gSprites
-	ldr r2, [r2]
-	ldrb r0, [r2, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2, 0x16]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	ldrb r0, [r2, 0x2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2, 0x16]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Swap_UpdateYesNoCursorPosition
-
-	thumb_func_start Swap_UpdateMenuCursorPosition
-Swap_UpdateMenuCursorPosition: @ 819E7C0
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x5
-	bl PlaySE
-	lsls r4, 24
-	cmp r4, 0
-	ble _0819E7EC
-	ldr r0, =sFactorySwapScreen
-	ldr r1, [r0]
-	ldrb r3, [r1]
-	adds r2, r0, 0
-	cmp r3, 0x2
-	beq _0819E7E8
-	adds r0, r3, 0x1
-	b _0819E802
-	.pool
-_0819E7E8:
-	movs r0, 0
-	b _0819E802
-_0819E7EC:
-	ldr r0, =sFactorySwapScreen
-	ldr r1, [r0]
-	ldrb r3, [r1]
-	adds r2, r0, 0
-	cmp r3, 0
-	beq _0819E800
-	subs r0, r3, 0x1
-	b _0819E802
-	.pool
-_0819E800:
-	movs r0, 0x2
-_0819E802:
-	strb r0, [r1]
-	ldr r3, =gSprites
-	ldr r2, [r2]
-	ldrb r0, [r2, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	ldrb r0, [r2, 0x2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Swap_UpdateMenuCursorPosition
-
-	thumb_func_start sub_819E838
-sub_819E838: @ 819E838
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r4, 0
-	movs r0, 0x5
-	negs r0, r0
-	mov r9, r0
-	movs r2, 0x4
-	mov r8, r2
-	ldr r0, =gSprites
-	mov r12, r0
-	ldr r7, =sFactorySwapScreen
-_0819E856:
-	cmp r6, 0x2
-	bne _0819E898
-	ldr r5, =gSprites
-	ldr r3, =sFactorySwapScreen
-	ldr r0, [r3]
-	adds r0, 0xB
-	adds r0, r4
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1]
-	cmp r4, 0x1
-	bhi _0819E8D4
-	ldr r0, [r3]
-	adds r0, 0x10
-	adds r0, r4
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	b _0819E8CA
-	.pool
-_0819E898:
-	cmp r6, 0x3
-	bne _0819E8D4
-	cmp r4, 0x1
-	bhi _0819E8BA
-	ldr r0, [r7]
-	adds r0, 0x10
-	adds r0, r4
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	add r1, r12
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	mov r0, r9
-	ands r0, r2
-	strb r0, [r1]
-_0819E8BA:
-	ldr r0, [r7]
-	adds r0, 0xB
-	adds r0, r4
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	add r0, r12
-_0819E8CA:
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	mov r2, r8
-	orrs r1, r2
-	strb r1, [r0]
-_0819E8D4:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x2
-	bls _0819E856
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_819E838
-
-	thumb_func_start sub_819E8EC
-sub_819E8EC: @ 819E8EC
-	push {r4-r6,lr}
-	movs r2, 0
-	ldr r5, =gSprites
-	ldr r4, =sFactorySwapScreen
-	adds r6, r5, 0
-	movs r3, 0x4
-_0819E8F8:
-	ldr r0, [r4]
-	adds r0, 0xB
-	adds r0, r2
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	orrs r1, r3
-	strb r1, [r0]
-	cmp r2, 0x1
-	bhi _0819E92C
-	ldr r0, [r4]
-	adds r0, 0x10
-	adds r0, r2
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	orrs r1, r3
-	strb r1, [r0]
-_0819E92C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x2
-	bls _0819E8F8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819E8EC
-
-	thumb_func_start Swap_ShowMenuOptions
-Swap_ShowMenuOptions: @ 819E944
-	push {r4,r5,lr}
-	ldr r0, =sFactorySwapScreen
-	ldr r3, [r0]
-	ldrb r1, [r3, 0x15]
-	adds r5, r0, 0
-	cmp r1, 0x1
-	bne _0819E95C
-	movs r0, 0
-	strb r0, [r3, 0x15]
-	b _0819E960
-	.pool
-_0819E95C:
-	movs r0, 0
-	strb r0, [r3]
-_0819E960:
-	ldr r4, =gSprites
-	ldr r2, [r5]
-	ldrb r1, [r2, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xB0
-	strh r1, [r0, 0x20]
-	ldrb r0, [r2, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	ldrb r1, [r2, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xD0
-	strh r1, [r0, 0x20]
-	ldrb r0, [r2, 0x2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrb r0, [r2]
-	lsls r0, 4
-	adds r0, 0x70
-	strh r0, [r1, 0x22]
-	ldrb r0, [r2, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	adds r1, 0x3E
-	ldrb r3, [r1]
-	movs r2, 0x5
-	negs r2, r2
-	adds r0, r2, 0
-	ands r0, r3
-	strb r0, [r1]
-	ldr r0, [r5]
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	ands r2, r1
-	strb r2, [r0]
-	bl sub_819EC20
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Swap_ShowMenuOptions
-
-	thumb_func_start sub_819E9E0
-sub_819E9E0: @ 819E9E0
-	push {r4,r5,lr}
-	ldr r5, =sFactorySwapScreen
-	ldr r1, [r5]
-	movs r0, 0
-	strb r0, [r1, 0x16]
-	ldr r4, =gSprites
-	ldr r2, [r5]
-	ldrb r1, [r2, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xB0
-	strh r1, [r0, 0x20]
-	ldrb r1, [r2, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r3, 0x70
-	strh r3, [r0, 0x22]
-	ldrb r1, [r2, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xD0
-	strh r1, [r0, 0x20]
-	ldrb r1, [r2, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r3, [r0, 0x22]
-	ldrb r0, [r2, 0x1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	adds r1, 0x3E
-	ldrb r3, [r1]
-	movs r2, 0x5
-	negs r2, r2
-	adds r0, r2, 0
-	ands r0, r3
-	strb r0, [r1]
-	ldr r0, [r5]
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	ands r2, r1
-	strb r2, [r0]
-	bl sub_819EC94
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819E9E0
-
-	thumb_func_start sub_819EA64
-sub_819EA64: @ 819EA64
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r5, =gSprites
-	ldr r3, =sFactorySwapScreen
-	ldr r0, [r3]
-	ldrb r1, [r0, 0x1]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	ldr r0, [r3]
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	orrs r1, r2
-	strb r1, [r0]
-	adds r0, r4, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl CopyWindowToVram
-	adds r0, r4, 0
-	bl ClearWindowTilemap
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_819EA64
-
-	thumb_func_start sub_819EAC0
-sub_819EAC0: @ 819EAC0
-	push {lr}
-	movs r0, 0x1
-	bl PutWindowTilemap
-	movs r0, 0x1
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0x1
-	movs r1, 0x2
-	bl CopyWindowToVram
-	pop {r0}
-	bx r0
-	thumb_func_end sub_819EAC0
-
-	thumb_func_start sub_819EADC
-sub_819EADC: @ 819EADC
-	push {lr}
-	movs r0, 0x7
-	bl PutWindowTilemap
-	movs r0, 0x7
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0x7
-	movs r1, 0x2
-	bl CopyWindowToVram
-	pop {r0}
-	bx r0
-	thumb_func_end sub_819EADC
-
-	thumb_func_start sub_819EAF8
-sub_819EAF8: @ 819EAF8
-	push {lr}
-	bl sub_819EAC0
-	movs r0, 0x5
-	bl PutWindowTilemap
-	movs r0, 0x5
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0x5
-	movs r1, 0x2
-	bl CopyWindowToVram
-	pop {r0}
-	bx r0
-	thumb_func_end sub_819EAF8
-
-	thumb_func_start Swap_PrintPkmnSwap
-Swap_PrintPkmnSwap: @ 819EB18
-	push {lr}
-	sub sp, 0xC
-	movs r0, 0
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r2, =gText_PkmnSwap
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	str r0, [sp, 0x4]
-	str r0, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x2
-	bl PrintTextOnWindow
-	movs r0, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Swap_PrintPkmnSwap
-
-	thumb_func_start Swap_PrintMonSpecies
-Swap_PrintMonSpecies: @ 819EB4C
-	push {r4,lr}
-	sub sp, 0xC
-	movs r0, 0x1
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	ldr r0, =sFactorySwapScreen
-	ldr r1, [r0]
-	ldrb r0, [r1, 0x3]
-	cmp r0, 0x2
-	bls _0819EB70
-	movs r0, 0x1
-	movs r1, 0x2
-	bl CopyWindowToVram
-	b _0819EBD4
-	.pool
-_0819EB70:
-	ldrb r2, [r1, 0x3]
-	ldrb r0, [r1, 0x14]
-	cmp r0, 0
-	bne _0819EB84
-	movs r0, 0x64
-	muls r0, r2
-	ldr r1, =gPlayerParty
-	b _0819EB8A
-	.pool
-_0819EB84:
-	movs r0, 0x64
-	muls r0, r2
-	ldr r1, =gEnemyParty
-_0819EB8A:
-	adds r0, r1
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 16
-	lsrs r1, r0, 16
-	ldr r4, =gStringVar4
-	movs r0, 0xB
-	muls r1, r0
-	ldr r0, =gSpeciesNames
-	adds r1, r0
-	adds r0, r4, 0
-	bl StringCopy
-	movs r0, 0x1
-	adds r1, r4, 0
-	movs r2, 0x56
-	bl GetStringRightAlignXOffset
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r0, =gUnknown_08610925
-	str r0, [sp]
-	movs r0, 0
-	str r0, [sp, 0x4]
-	str r4, [sp, 0x8]
-	movs r0, 0x1
-	movs r1, 0x1
-	movs r3, 0x1
-	bl AddTextPrinterParameterized3
-	movs r0, 0x1
-	movs r1, 0x3
-	bl CopyWindowToVram
-_0819EBD4:
-	add sp, 0xC
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Swap_PrintMonSpecies
-
-	thumb_func_start Swap_PrintOnInfoWindow
-Swap_PrintOnInfoWindow: @ 819EBEC
-	push {r4,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	movs r0, 0x2
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0x5
-	str r0, [sp]
-	movs r0, 0
-	str r0, [sp, 0x4]
-	str r0, [sp, 0x8]
-	movs r0, 0x2
-	movs r1, 0x1
-	adds r2, r4, 0
-	movs r3, 0x2
-	bl PrintTextOnWindow
-	movs r0, 0x2
-	movs r1, 0x2
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end Swap_PrintOnInfoWindow
-
-	thumb_func_start sub_819EC20
-sub_819EC20: @ 819EC20
+	thumb_func_start Swap_PrintMenuOptions
+Swap_PrintMenuOptions: @ 819EC20
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0x3
@@ -944,10 +52,10 @@ sub_819EC20: @ 819EC20
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_819EC20
+	thumb_func_end Swap_PrintMenuOptions
 
-	thumb_func_start sub_819EC94
-sub_819EC94: @ 819EC94
+	thumb_func_start Swap_PrintYesNoOptions
+Swap_PrintYesNoOptions: @ 819EC94
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0x4
@@ -983,7 +91,7 @@ sub_819EC94: @ 819EC94
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_819EC94
+	thumb_func_end Swap_PrintYesNoOptions
 
 	thumb_func_start sub_819ECF0
 sub_819ECF0: @ 819ECF0
@@ -1356,7 +464,7 @@ _0819EFF2:
 	movs r0, 0x8
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x8
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -4176,7 +3284,7 @@ _081A06B8:
 	adds r0, r5, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -6802,7 +5910,7 @@ sub_81A1C4C: @ 81A1C4C
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}
@@ -6841,7 +5949,7 @@ _081A1C9E:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0x4
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x34
 	pop {r4}
 	pop {r0}
@@ -6883,7 +5991,7 @@ sub_81A1CD8: @ 81A1CD8
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A1D24
@@ -6908,7 +6016,7 @@ _081A1D24:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -7142,7 +6250,7 @@ _081A1F28:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r6]
 	ldr r2, =gText_OpenLv
 	movs r1, 0x61
@@ -7152,7 +6260,7 @@ _081A1F28:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0xA
 	bl sub_81A1C90
 	mov r0, r8
@@ -7255,7 +6363,7 @@ sub_81A2008: @ 81A2008
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r12
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =gStringVar1
 	adds r1, r4, 0
 	movs r2, 0x1
@@ -7275,7 +6383,7 @@ sub_81A2008: @ 81A2008
 	movs r1, 0x1
 	adds r2, r4, 0
 	adds r3, r6, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r3-r5}
 	mov r8, r3
@@ -7413,7 +6521,7 @@ _081A2184:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	ldr r2, =gText_OpenLv
@@ -7423,7 +6531,7 @@ _081A2184:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0xA
 	bl sub_81A1C90
 	str r6, [sp]
@@ -7549,7 +6657,7 @@ sub_81A22B8: @ 81A22B8
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A2304
@@ -7574,7 +6682,7 @@ _081A2304:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -7767,7 +6875,7 @@ _081A24B0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r6]
 	ldr r2, =gText_OpenLv
 	movs r1, 0x61
@@ -7777,7 +6885,7 @@ _081A24B0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0xA
 	bl sub_81A1C90
 	mov r0, r8
@@ -7877,7 +6985,7 @@ sub_81A258C: @ 81A258C
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r12
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =gStringVar1
 	adds r1, r4, 0
 	movs r2, 0x1
@@ -7897,7 +7005,7 @@ sub_81A258C: @ 81A258C
 	movs r1, 0x1
 	adds r2, r4, 0
 	adds r3, r6, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r3-r5}
 	mov r8, r3
@@ -8005,7 +7113,7 @@ sub_81A2698: @ 81A2698
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r6]
 	ldr r2, =gText_OpenLv
 	movs r1, 0x61
@@ -8014,7 +7122,7 @@ sub_81A2698: @ 81A2698
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0xA
 	bl sub_81A1C90
 	movs r0, 0
@@ -8130,7 +7238,7 @@ sub_81A27E8: @ 81A27E8
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A2834
@@ -8155,7 +7263,7 @@ _081A2834:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -8310,7 +7418,7 @@ sub_81A2968: @ 81A2968
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r5]
 	ldr r2, =gText_OpenLv
 	movs r1, 0x61
@@ -8319,7 +7427,7 @@ sub_81A2968: @ 81A2968
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x48
 	movs r2, 0x7E
@@ -8392,7 +7500,7 @@ sub_81A2A28: @ 81A2A28
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r12
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =0x0000270f
 	cmp r7, r0
 	bls _081A2A80
@@ -8418,7 +7526,7 @@ _081A2A80:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0x10]
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r5, 0
 	ldr r1, [sp, 0xC]
 	movs r2, 0x1
@@ -8437,7 +7545,7 @@ _081A2A80:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0x14]
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x18
 	pop {r3-r5}
 	mov r8, r3
@@ -8693,7 +7801,7 @@ _081A2CE0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	mov r1, r8
 	ldrb r0, [r1]
 	ldr r2, =gText_RentalSwap
@@ -8702,7 +7810,7 @@ _081A2CE0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x98
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	mov r1, r8
 	ldrb r0, [r1]
 	ldr r2, =gText_OpenLv
@@ -8712,7 +7820,7 @@ _081A2CE0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0xA
 	bl sub_81A1C90
 	movs r4, 0x9E
@@ -8798,7 +7906,7 @@ sub_81A2DB4: @ 81A2DB4
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A2E00
@@ -8823,7 +7931,7 @@ _081A2E00:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -8978,7 +8086,7 @@ sub_81A2F38: @ 81A2F38
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r5]
 	ldr r2, =gText_OpenLv
 	movs r1, 0x61
@@ -8987,7 +8095,7 @@ sub_81A2F38: @ 81A2F38
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0xA
 	bl sub_81A1C90
 	movs r0, 0
@@ -9058,7 +8166,7 @@ sub_81A2FF8: @ 81A2FF8
 	movs r5, 0
 	str r5, [sp, 0x8]
 	mov r2, r9
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r7, =gText_1st
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -9076,7 +8184,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r7, =gText_2nd
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -9093,7 +8201,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r7, =gText_3rd
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -9110,7 +8218,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r7, =gText_4th
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -9127,7 +8235,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	ldr r2, =gText_Cool
 	movs r1, 0x29
@@ -9136,7 +8244,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	ldr r2, =gText_Beauty
 	movs r1, 0x39
@@ -9145,7 +8253,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	ldr r2, =gText_Cute
 	movs r1, 0x49
@@ -9154,7 +8262,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	ldr r2, =gText_Smart
 	movs r1, 0x59
@@ -9163,7 +8271,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	ldr r2, =gText_Tough
 	movs r1, 0x69
@@ -9172,7 +8280,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r1, 0
 _081A314A:
 	movs r5, 0
@@ -9210,7 +8318,7 @@ _081A315C:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r9
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r4, 0x2
 	adds r5, 0x1
 	cmp r5, 0x3
@@ -11497,7 +10605,7 @@ sub_81A4594: @ 81A4594
 	adds r0, r5, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0xFF
 	strb r0, [r6, 0xD]
 	ldrh r0, [r6, 0x4]
@@ -11520,7 +10628,7 @@ sub_81A4594: @ 81A4594
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r1, [r6, 0x4]
 	ldr r0, =0x0000270f
 	cmp r1, r0
@@ -11556,7 +10664,7 @@ _081A4618:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _081A465C:
 	add sp, 0x2C
 	pop {r3-r5}
@@ -11607,7 +10715,7 @@ sub_81A4684: @ 81A4684
 	str r3, [sp, 0x8]
 	movs r1, 0x1
 	mov r3, r12
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r0, [r5, 0x8]
 	cmp r0, 0
 	beq _081A47BC
@@ -11638,7 +10746,7 @@ sub_81A4684: @ 81A4684
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r4, r5, 0
 	adds r4, 0x12
 	adds r0, r4, 0
@@ -11679,7 +10787,7 @@ _081A473C:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r1, [r5, 0x8]
 	ldr r0, =0x0000270f
 	cmp r1, r0
@@ -11715,7 +10823,7 @@ _081A4778:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _081A47BC:
 	add sp, 0x2C
 	pop {r3-r5}
@@ -11990,7 +11098,7 @@ sub_81A4998: @ 81A4998
 	str r5, [sp, 0x8]
 	adds r2, r6, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r1, =gUnknown_08611D00
 	ldr r2, [sp, 0x90]
 	lsls r0, r2, 2
@@ -12012,7 +11120,7 @@ sub_81A4998: @ 81A4998
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	cmp r7, 0x9
 	bne _081A4A6C
 	ldr r2, =gSaveBlock2Ptr
diff --git a/asm/cable_club.s b/asm/cable_club.s
index 0297c2f80..6f4917a19 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -74,7 +74,7 @@ sub_80B23B0: @ 80B23B0
 	adds r0, r4, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r4, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
diff --git a/asm/contest_painting.s b/asm/contest_painting.s
index 8bb38eeed..f7c146e3e 100644
--- a/asm/contest_painting.s
+++ b/asm/contest_painting.s
@@ -438,7 +438,7 @@ _081301A6:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x1
 	bl CopyBgTilemapBufferToVram
 _081301D4:
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index ffe8e171b..e99c885cc 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -4644,7 +4644,7 @@ sub_811D028: @ 811D028
 	str r4, [sp]
 	str r5, [sp, 0x4]
 	str r6, [sp, 0x8]
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r4-r6}
 	pop {r0}
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index a1f115376..0abbf014f 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -3022,7 +3022,7 @@ _0808CA94:
 	movs r0, 0
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r0, [r4, 0xC]
 	adds r0, 0x1
 	strh r0, [r4, 0xC]
@@ -3133,7 +3133,7 @@ fish6: @ 808CB6C
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -3266,7 +3266,7 @@ fish9: @ 808CC64
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -3423,7 +3423,7 @@ fishB: @ 808CD94
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	movs r0, 0xD
 	strh r0, [r5, 0x8]
 	movs r0, 0x1
@@ -3471,7 +3471,7 @@ fishC: @ 808CE04
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 67fc563fb..67fdab266 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -4454,7 +4454,7 @@ _081B243E:
 	adds r0, r4, 0
 	movs r1, 0
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	adds r0, r4, 0
 	bl PutWindowTilemap
 	adds r0, r4, 0
@@ -5938,7 +5938,7 @@ _081B3104:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 _081B313C:
@@ -6132,7 +6132,7 @@ _081B328C:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	mov r2, r9
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -6193,7 +6193,7 @@ sub_81B3300: @ 81B3300
 	movs r0, 0x6
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
@@ -12508,7 +12508,7 @@ _081B6A40:
 	adds r0, r6, 0
 	mov r1, r10
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	cmp r4, 0
 	beq _081B6A82
 	adds r0, r7, 0x1
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 481a85d8d..9d5603085 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -4387,7 +4387,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, [r6]
 	ldr r1, =0x00000d1d
 	adds r2, r1
@@ -4398,7 +4398,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, [r6]
 	ldr r0, =0x00000d41
 	adds r2, r0
@@ -4409,7 +4409,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0xA
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, [r6]
 	ldr r1, =0x00000d65
 	adds r2, r1
@@ -4420,7 +4420,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	b _080CA5E8
 	.pool
 _080CA588:
@@ -4434,7 +4434,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, [r6]
 	ldr r1, =0x00000cf9
 	adds r2, r1
@@ -4445,7 +4445,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, [r6]
 	ldr r0, =0x00000d1d
 	adds r2, r0
@@ -4456,7 +4456,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0x6
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, [r6]
 	ldr r1, =0x00000d41
 	adds r2, r1
@@ -4467,7 +4467,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0xA
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _080CA5E8:
 	movs r0, 0
 	movs r1, 0x2
@@ -5337,7 +5337,7 @@ _080CAD30:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x1
 	movs r1, 0x2
 	movs r2, 0xE
@@ -18189,7 +18189,7 @@ _080D17DA:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0x4
-	bl sub_8199F74
+	bl AddTextPrinterParameterized5
 	add sp, 0x14
 	pop {r4}
 	pop {r0}
diff --git a/asm/pokenav.s b/asm/pokenav.s
index e69a9ef8c..4851cd221 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -2559,7 +2559,7 @@ _081C8434:
 	str r6, [sp, 0x8]
 	adds r2, r7, 0
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r0, [r4, 0xC]
 	adds r0, 0x1
 	strh r0, [r4, 0xC]
@@ -3769,7 +3769,7 @@ sub_81C8D4C: @ 81C8D4C
 	str r2, [sp, 0x8]
 	adds r2, r5, 0
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r4, 0
 	movs r1, 0
 	bl sub_81C8C64
@@ -3897,7 +3897,7 @@ sub_81C8E54: @ 81C8E54
 	movs r1, 0x7
 	adds r2, r5, 0
 	movs r3, 0x2
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r0, [r7, 0x8]
 	ldrb r1, [r7, 0x4]
 	str r1, [sp]
@@ -10073,7 +10073,7 @@ sub_81CBE88: @ 81CBE88
 	movs r1, 0x7
 	adds r2, r3, 0
 	movs r3, 0x2
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -10108,7 +10108,7 @@ sub_81CBEB4: @ 81CBEB4
 	adds r0, r5, 0
 	movs r1, 0x7
 	adds r2, r6, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r4-r6}
 	pop {r0}
@@ -10156,7 +10156,7 @@ _081CBF24:
 	movs r1, 0x7
 	add r2, sp, 0xC
 	adds r3, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x2C
 	pop {r4,r5}
 	pop {r0}
@@ -10190,7 +10190,7 @@ _081CBF76:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0x10
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x80
 	lsls r0, 21
 	adds r6, r0
@@ -10375,7 +10375,7 @@ sub_81CC0E0: @ 81CC0E0
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x20
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -10409,7 +10409,7 @@ sub_81CC11C: @ 81CC11C
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -10452,7 +10452,7 @@ sub_81CC158: @ 81CC158
 	adds r0, r2, 0
 	adds r2, r5, 0
 	movs r3, 0x20
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}
@@ -11694,7 +11694,7 @@ _081CCB44:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r1, [r5]
 	ldrb r2, [r5, 0x3]
 	adds r0, r4, 0
@@ -11726,7 +11726,7 @@ _081CCB8E:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r1, =0x00001041
 	movs r0, 0xC
 	str r0, [sp]
@@ -11756,7 +11756,7 @@ _081CCBDC:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrh r1, [r5]
 	ldrb r2, [r5, 0x3]
 	adds r0, r4, 0
@@ -12035,7 +12035,7 @@ _081CCE08:
 	movs r1, 0x7
 	adds r2, r6, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x80
 	lsls r0, 21
 	adds r4, r0
@@ -15151,7 +15151,7 @@ _081CE7DA:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	b _081CE924
 _081CE800:
 	bl sub_81CDD5C
@@ -15176,7 +15176,7 @@ _081CE80C:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add r1, sp, 0xC
 	movs r0, 0xFC
 	strb r0, [r1]
@@ -15202,7 +15202,7 @@ _081CE80C:
 	movs r1, 0x1
 	add r2, sp, 0xC
 	movs r3, 0x4
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	bl sub_81CDD48
 	adds r1, r0, 0
 	lsls r1, 16
@@ -15218,7 +15218,7 @@ _081CE80C:
 	movs r1, 0x1
 	add r2, sp, 0xC
 	movs r3, 0x1C
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	b _081CE924
 	.pool
 _081CE89C:
@@ -17198,7 +17198,7 @@ sub_81CF7F4: @ 81CF7F4
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r4, 0
 	adds r1, r7, 0
 	movs r2, 0x1
@@ -17214,7 +17214,7 @@ sub_81CF7F4: @ 81CF7F4
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0x22
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	mov r1, r8
 	ldrb r0, [r1, 0x8]
 	movs r1, 0x2
@@ -18597,7 +18597,7 @@ sub_81D02B0: @ 81D02B0
 	adds r0, r4, 0
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0x1C
 	pop {r4,r5}
 	pop {r0}
@@ -20260,7 +20260,7 @@ sub_81D0FF0: @ 81D0FF0
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r6]
 	cmp r0, 0
 	beq _081D1040
@@ -20305,7 +20305,7 @@ _081D104A:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x3C
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r4, 0
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -20379,7 +20379,7 @@ sub_81D10D0: @ 81D10D0
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	mov r1, r8
 	ldrb r0, [r1, 0xC]
 	movs r1, 0x2
@@ -21106,7 +21106,7 @@ _081D1D8C:
 	movs r1, 0x1
 	movs r2, 0x8
 	adds r3, r5, 0
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 _081D1DAC:
 	add sp, 0x34
 	pop {r4,r5}
@@ -22636,7 +22636,7 @@ sub_81D28FC: @ 81D28FC
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r5, =gText_PPSlash
 	movs r1, 0x29
 	mov r10, r1
@@ -22648,7 +22648,7 @@ sub_81D28FC: @ 81D28FC
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r5, =gText_PowerSlash
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -22665,7 +22665,7 @@ sub_81D28FC: @ 81D28FC
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r5, =gText_AccuracySlash
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -22682,7 +22682,7 @@ sub_81D28FC: @ 81D28FC
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x2
 	negs r0, r0
 	cmp r9, r0
@@ -22713,7 +22713,7 @@ _081D29C4:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r1, =gText_PPSlash
 	movs r0, 0x1
 	movs r2, 0
@@ -22734,7 +22734,7 @@ _081D29C4:
 	movs r0, 0
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r6, 0x1]
 	cmp r0, 0x1
 	bhi _081D2A3C
@@ -22758,7 +22758,7 @@ _081D2A4A:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x6A
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r6, 0x3]
 	cmp r0, 0
 	bne _081D2A70
@@ -22783,7 +22783,7 @@ _081D2A7E:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x6A
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r1, =gMoveDescriptionPointers
 	mov r0, r9
 	subs r0, 0x1
@@ -22798,7 +22798,7 @@ _081D2A7E:
 	movs r1, 0x7
 	adds r2, r5, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _081D2AB6:
 	add sp, 0x2C
 	pop {r3-r5}
@@ -22837,7 +22837,7 @@ sub_81D2ACC: @ 81D2ACC
 	str r6, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r5, =gText_Appeal2
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -22853,7 +22853,7 @@ sub_81D2ACC: @ 81D2ACC
 	movs r0, 0x1
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r5, =gText_Jam2
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -22868,7 +22868,7 @@ sub_81D2ACC: @ 81D2ACC
 	movs r0, 0x1
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x2
 	negs r0, r0
 	cmp r4, r0
@@ -22896,7 +22896,7 @@ _081D2B6C:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r1, =gContestEffectDescriptionPointers
 	ldrb r0, [r4]
 	lsls r0, 2
@@ -22910,7 +22910,7 @@ _081D2B6C:
 	movs r1, 0x7
 	adds r2, r5, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x1
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -22971,7 +22971,7 @@ sub_81D2BF4: @ 81D2BF4
 	str r0, [sp, 0xC]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index d96e3c294..84573367a 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -5689,7 +5689,7 @@ _08018720:
 	movs r1, 0x1
 	movs r2, 0x4
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	movs r0, 0
 	adds r1, r7, 0
 	movs r2, 0xDE
@@ -5705,7 +5705,7 @@ _08018720:
 	movs r0, 0
 	movs r1, 0
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	movs r0, 0
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -5877,7 +5877,7 @@ sub_8018884: @ 8018884
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r2, 0xF
@@ -6230,7 +6230,7 @@ _08018B4A:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	ldrb r0, [r4]
 	movs r1, 0x1
 	movs r2, 0xF
@@ -6376,7 +6376,7 @@ _08018C8C:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	ldrb r0, [r5]
 	movs r1, 0x1
 	movs r2, 0xF
@@ -9928,7 +9928,7 @@ _0801A93A:
 	adds r0, r7, 0
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	add sp, 0x18
 	pop {r4-r7}
 	pop {r0}
@@ -10249,7 +10249,7 @@ sub_801AB68: @ 801AB68
 	movs r1, 0x1
 	adds r2, r6, 0
 	ldr r3, [sp, 0x14]
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	add sp, 0x18
 	pop {r3-r5}
 	mov r8, r3
@@ -20539,7 +20539,7 @@ sub_801FDDC: @ 801FDDC
 	str r4, [sp, 0x4]
 	str r6, [sp, 0x8]
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x18]
 	ldr r2, =gText_No
@@ -20549,7 +20549,7 @@ sub_801FDDC: @ 801FDDC
 	str r6, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x18]
 	movs r1, 0x1
@@ -20757,7 +20757,7 @@ _0801FFE2:
 	adds r0, r5, 0
 	movs r1, 0x1
 	adds r2, r6, 0
-	bl sub_8199F74
+	bl AddTextPrinterParameterized5
 	b _0802007A
 	.pool
 _08020050:
@@ -20779,7 +20779,7 @@ _08020050:
 	adds r0, r5, 0
 	movs r1, 0x1
 	adds r2, r6, 0
-	bl sub_8199F74
+	bl AddTextPrinterParameterized5
 _0802007A:
 	ldr r0, =gUnknown_02022C88
 	ldr r0, [r0]
@@ -25326,7 +25326,7 @@ _08022616:
 	str r4, [sp, 0x10]
 	movs r1, 0x2
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	b _0802269C
 	.pool
 _08022668:
@@ -25353,7 +25353,7 @@ _08022668:
 	str r4, [sp, 0x10]
 	movs r1, 0x2
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 _0802269C:
 	ldr r1, =0x000001bb
 	adds r0, r6, r1
@@ -26229,7 +26229,7 @@ _08022D42:
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	b _08022DB2
 	.pool
 _08022D90:
@@ -26248,7 +26248,7 @@ _08022D90:
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 _08022DB2:
 	movs r0, 0
 	movs r1, 0x3
@@ -28812,7 +28812,7 @@ _080241A6:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -29171,7 +29171,7 @@ _08024460:
 	str r1, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	b _080244AC
 	.pool
 _08024490:
@@ -29187,7 +29187,7 @@ _08024490:
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 _080244AC:
 	movs r0, 0
 	movs r1, 0x3
@@ -29653,7 +29653,7 @@ sub_80247D4: @ 80247D4
 	movs r1, 0x1
 	mov r2, r9
 	mov r3, r8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r3,r4}
 	mov r8, r3
@@ -29695,7 +29695,7 @@ sub_802482C: @ 802482C
 	adds r0, r6, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	str r4, [sp]
 	adds r0, r6, 0
 	mov r1, r8
@@ -36210,7 +36210,7 @@ sub_8027BEC: @ 8027BEC
 	adds r0, r7, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r6, 0
 	ldr r2, =gStringVar1
 	mov r8, r2
@@ -36252,7 +36252,7 @@ _08027C76:
 	adds r0, r7, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, [sp, 0x18]
 	lsls r3, r2, 3
 	subs r3, r5
@@ -36269,7 +36269,7 @@ _08027C76:
 	adds r0, r7, 0
 	movs r1, 0x1
 	mov r2, r8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r6, 0x1
 	cmp r6, 0x2
 	ble _08027C76
@@ -39648,7 +39648,7 @@ _08029774:
 	str r3, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	bl GetMultiplayerId
 	lsls r0, 24
 	lsrs r0, 24
@@ -39704,7 +39704,7 @@ _080297CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gUnknown_02022CF8
 	ldr r0, [r2]
 	add r0, r10
@@ -39719,7 +39719,7 @@ _080297CC:
 	movs r1, 0x1
 	ldr r2, =gText_SpacePoints
 	lsrs r3, 24
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -39858,7 +39858,7 @@ _0802996C:
 	movs r5, 0
 	str r5, [sp, 0x8]
 	mov r2, r8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r4]
 	add r0, r9
 	ldrb r0, [r0]
@@ -39869,7 +39869,7 @@ _0802996C:
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x44
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	mov r9, r5
 	ldr r0, [sp, 0xC]
 	cmp r9, r0
@@ -39997,7 +39997,7 @@ _08029AE0:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	ldr r2, =gStringVar4
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _08029B10:
 	adds r0, r7, 0x1
 	lsls r0, 24
@@ -40125,7 +40125,7 @@ _08029BFC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r6, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	b _08029F88
 	.pool
 _08029C60:
@@ -40291,7 +40291,7 @@ _08029DA0:
 	str r6, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	bl DynamicPlaceholderTextUtil_Reset
 	bl sub_802762C
 	lsls r0, 16
@@ -40317,7 +40317,7 @@ _08029DA0:
 	movs r1, 0x1
 	adds r2, r7, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	bl sub_80279C8
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -40363,7 +40363,7 @@ _08029EA8:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _08029EC8:
 	ldr r4, =gUnknown_02022CF8
 	ldr r0, [r4]
@@ -40597,7 +40597,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	add r0, r10
 	ldrb r0, [r0]
@@ -40609,7 +40609,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	add r0, r10
 	ldrb r0, [r0]
@@ -40622,7 +40622,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	add r0, r10
 	ldrb r0, [r0]
@@ -40634,7 +40634,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -40701,7 +40701,7 @@ _0802A1DC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -40714,7 +40714,7 @@ _0802A1DC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -40731,7 +40731,7 @@ _0802A1DC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -40901,7 +40901,7 @@ _0802A3AE:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	b _0802A410
 	.pool
 _0802A3D8:
@@ -41021,7 +41021,7 @@ _0802A4AC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	adds r0, r4
 	ldrb r0, [r0]
@@ -41181,7 +41181,7 @@ _0802A610:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r6]
 	adds r0, r4
 	ldrb r0, [r0]
@@ -47057,7 +47057,7 @@ _0802D46A:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -47141,7 +47141,7 @@ _0802D516:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -47259,7 +47259,7 @@ _0802D606:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -47339,7 +47339,7 @@ _0802D6AA:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -47538,7 +47538,7 @@ sub_802D7E8: @ 802D7E8
 	str r1, [sp, 0x4]
 	str r3, [sp, 0x8]
 	movs r1, 0x1
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -47592,7 +47592,7 @@ sub_802D884: @ 802D884
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -47645,7 +47645,7 @@ sub_802D8FC: @ 802D8FC
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -49203,7 +49203,7 @@ sub_802E500: @ 802E500
 	adds r0, r4, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r6, 0
 	adds r7, r4, 0
 	movs r0, 0xFF
@@ -49231,7 +49231,7 @@ _0802E58A:
 	adds r0, r7, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [sp, 0x20]
 	ldm r0!, {r1}
 	str r0, [sp, 0x20]
@@ -49258,7 +49258,7 @@ _0802E58A:
 	adds r0, r7, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x80
 	lsls r0, 21
 	add r8, r0
diff --git a/asm/roulette.s b/asm/roulette.s
index b0098daf6..f5d2dc372 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -519,7 +519,7 @@ _081406E0:
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -751,7 +751,7 @@ sub_8140914: @ 8140914
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r5]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -2655,7 +2655,7 @@ _08141902:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -2678,7 +2678,7 @@ _08141928:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -2816,7 +2816,7 @@ sub_8141A18: @ 8141A18
 	movs r1, 0x1
 	mov r2, r8
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r5]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3012,7 +3012,7 @@ _08141BB0:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3039,7 +3039,7 @@ _08141C58:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3071,7 +3071,7 @@ _08141CBC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3158,7 +3158,7 @@ _08141D44:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4676,7 +4676,7 @@ sub_81429F0: @ 81429F0
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4753,7 +4753,7 @@ sub_8142A88: @ 8142A88
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4778,7 +4778,7 @@ _08142B28:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4808,7 +4808,7 @@ _08142B78:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
diff --git a/asm/script_menu.s b/asm/script_menu.s
index b521121bf..bb145e78d 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -761,7 +761,7 @@ _080E23D4:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gText_LogOff
 	movs r0, 0x31
 	str r0, [sp]
@@ -770,7 +770,7 @@ _080E23D4:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	b _080E247A
 	.pool
 _080E2448:
@@ -795,7 +795,7 @@ _080E2448:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _080E247A:
 	ldr r0, =0x000008ab
 	bl FlagGet
@@ -813,7 +813,7 @@ _080E247A:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	b _080E24C6
 	.pool
 _080E24B0:
@@ -826,7 +826,7 @@ _080E24B0:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 _080E24C6:
 	ldr r4, =gStringVar4
 	ldr r1, =gText_PlayersPC
@@ -877,7 +877,7 @@ ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	add sp, 0x10
 	pop {r0}
 	bx r0
@@ -1228,7 +1228,7 @@ _080E2802:
 	adds r0, r6, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -1606,7 +1606,7 @@ _080E2B12:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 	b _080E2B70
 	.pool
 _080E2B40:
@@ -1630,7 +1630,7 @@ _080E2B40:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParameterized
+	bl AddTextPrinterParameterized2
 _080E2B70:
 	add sp, 0x10
 	pop {r4}
@@ -1687,7 +1687,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gText_MenuOptionPokemon
 	movs r0, 0x19
 	str r0, [sp]
@@ -1696,7 +1696,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gText_MenuOptionBag
 	movs r0, 0x29
 	str r0, [sp]
@@ -1705,7 +1705,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gText_MenuOptionPokenav
 	movs r0, 0x39
 	str r0, [sp]
@@ -1714,7 +1714,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, =gSaveBlock2Ptr
 	ldr r2, [r0]
 	movs r0, 0x49
@@ -1724,7 +1724,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gText_MenuOptionSave
 	movs r0, 0x59
 	str r0, [sp]
@@ -1733,7 +1733,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gText_MenuOptionOption
 	movs r0, 0x69
 	str r0, [sp]
@@ -1742,7 +1742,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r2, =gText_MenuOptionExit
 	movs r0, 0x79
 	str r0, [sp]
@@ -1751,7 +1751,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x10
 	str r0, [sp]
 	movs r0, 0x8
diff --git a/asm/shop.s b/asm/shop.s
index 30a5ec278..807237389 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -839,7 +839,7 @@ _080E0176:
 	adds r0, r6, 0
 	movs r1, 0x7
 	adds r3, r7, 0
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 _080E01AC:
 	add sp, 0x14
 	pop {r4-r7}
@@ -1201,7 +1201,7 @@ BuyMenuPrint: @ 80E04A4
 	str r6, [sp, 0xC]
 	str r1, [sp, 0x10]
 	movs r1, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	add sp, 0x14
 	pop {r4-r6}
 	pop {r0}
diff --git a/asm/trade.s b/asm/trade.s
index 30a22ff75..1c9d1f17b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -4608,7 +4608,7 @@ _080798BC:
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	adds r0, r5, 0
 	bl PutWindowTilemap
 	adds r0, r5, 0
@@ -5599,7 +5599,7 @@ sub_807A19C: @ 807A19C
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x14
 	movs r2, 0xC
@@ -14295,7 +14295,7 @@ sub_807F1A8: @ 807F1A8
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0x2
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	adds r0, r5, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 8ebcfbacc..2c38140c6 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -419,7 +419,7 @@ _080C2A2C:
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -8258,7 +8258,7 @@ _080C6E08:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	ldr r0, [sp, 0x4C]
 	mov r10, r4
 	cmp r0, 0x6
@@ -8410,7 +8410,7 @@ sub_80C6EAC: @ 80C6EAC
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0x2
-	bl AddTextPrinterParameterized2
+	bl AddTextPrinterParameterized4
 	lsrs r5, 1
 	adds r0, r7, 0
 	ldr r1, [sp, 0x24]
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s
index f4a2bdbb2..e04dedd9e 100644
--- a/asm/use_pokeblock.s
+++ b/asm/use_pokeblock.s
@@ -879,7 +879,7 @@ sub_8166D44: @ 8166D44
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x2
 	bl PutWindowTilemap
 	movs r0, 0x2
@@ -1095,7 +1095,7 @@ sub_8166F50: @ 8166F50
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	movs r0, 0x2
 	bl PutWindowTilemap
 	movs r0, 0x2
@@ -1134,7 +1134,7 @@ sub_8166FB0: @ 8166FB0
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -2536,7 +2536,7 @@ sub_8167BA0: @ 8167BA0
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r7]
 	ldr r1, =0x00008041
 	adds r0, r1