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
@@ -1063,7 +1063,7 @@ sub_80F9088: @ 80F9088
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _080F90D4
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
 	b _080F90D4