Merge branch 'master' into quest_log

2018-11-02 14:16:03 -04:00
parent 46e006b94c c0a9d62091
commit 5391289fc1
61 changed files with 629 additions and 1257 deletions
@@ -4273,7 +4273,7 @@ sub_812A424: @ 812A424
 	str r7, [sp, 0x8]
 	movs r1, 0x2
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x18]
 	ldr r2, _0812A518 @ =gUnknown_841793C
@@ -4283,7 +4283,7 @@ sub_812A424: @ 812A424
 	str r7, [sp, 0x8]
 	movs r1, 0x2
 	movs r3, 0x8
-	bl PrintTextOnWindow
+	bl AddTextPrinterParameterized
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x18]
 	movs r1, 0x1