merge mail with master, fix conflicts

This commit is contained in:
DizzyEggg
2017-12-17 20:22:56 +01:00
217 changed files with 22013 additions and 26319 deletions
+1 -1
View File
@@ -277,7 +277,7 @@ Task_CallYesOrNoCallback: @ 8121FDC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8198C58
bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0