Merge branch 'master' into link

This commit is contained in:
PikalaxALT committed 2018-01-21 23:20:13 -05:00
commit d4e8c20f84
1241 files changed
+5063 -3232

No files matched your search

+1 -1
View File
@@ -4122,7 +4122,7 @@ sub_80867D8: @ 80867D8
movs r0, 0
movs r1, 0
bl SetGpuReg
bl remove_some_task
bl ScanlineEffect_Stop
ldr r2, =0x05000002
mov r1, sp
movs r0, 0