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
@@ -14165,7 +14165,7 @@ _0807F0BE:
 sub_807F0E4: @ 807F0E4
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, =sub_807F110
 	movs r1, 0xA
 	bl CreateTask