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
@@ -5599,8 +5599,8 @@ _080DA860:
 	thumb_func_start sub_80DA874
 sub_80DA874: @ 80DA874
 	push {lr}
-	bl script_env_2_disable
-	bl script_env_2_enable_and_set_ctx_running
+	bl ScriptContext2_Disable
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80DA874