fix for merge

This commit is contained in:
jiangzhengwenjz
2019-06-04 01:54:51 +08:00
2535 changed files with 59634 additions and 59721 deletions
+2 -2
View File
@@ -782,7 +782,7 @@ ListMenuPrint: @ 8107428
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
ldrb r1, [r5, 0x3]
movs r0, 0x7F
ands r0, r1
@@ -820,7 +820,7 @@ _08107494:
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized4
_081074D2:
add sp, 0x18
pop {r4-r7}