Merge branch 'master' into decomp_pokemon

2017-09-12 23:02:08 +02:00
parent 8731a8caa5 0918cadae3
commit c9603c40d8
53 changed files with 1012 additions and 1446 deletions
@@ -468,7 +468,7 @@ sub_807172C: @ 807172C
 	thumb_func_start sub_8071740
 sub_8071740: @ 8071740
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, =sub_8071760
 	movs r1, 0xA
 	bl CreateTask