Merge remote-tracking branch 'pret/master'

2017-09-16 03:21:42 -05:00
parent 448497dfbb 78009a835f
commit 6ba1dc8169
58 changed files with 1542 additions and 1925 deletions
@@ -12499,7 +12499,7 @@ sub_8160624: @ 8160624
 sub_8160638: @ 8160638
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, =sub_8160664
 	movs r1, 0xA
 	bl CreateTask