fix for merge

2019-06-04 01:54:51 +08:00
parent 94091f1589 5bcafd74ec
commit 67542ec22d
2535 changed files with 59634 additions and 59721 deletions
@@ -941,7 +941,7 @@ sub_810DB5C: @ 810DB5C
 	movs r1, 0x80
 	movs r2, 0x8
 	movs r3, 0x68
-	bl AddScrollIndicatorArrowPairParametrized
+	bl AddScrollIndicatorArrowPairParameterized
 	ldr r1, [r4]
 	strb r0, [r1, 0x8]
 	add sp, 0x10
@@ -972,7 +972,7 @@ sub_810DB98: @ 810DB98
 	movs r1, 0xD4
 	movs r2, 0x78
 	movs r3, 0x98
-	bl AddScrollIndicatorArrowPairParametrized
+	bl AddScrollIndicatorArrowPairParameterized
 	ldr r1, [r4]
 	strb r0, [r1, 0x8]
 	add sp, 0x10
@@ -2782,7 +2782,7 @@ sub_810EA34: @ 810EA34
 	str r4, [sp, 0xC]
 	str r2, [sp, 0x10]
 	mov r2, r9
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized4
 	add sp, 0x14
 	pop {r3,r4}
 	mov r8, r3