Merge branch 'master' into field_map_obj

This commit is contained in:
PikalaxALT
2017-09-13 19:29:19 -04:00
221 changed files with 152332 additions and 152431 deletions
+1 -1
View File
@@ -246,7 +246,7 @@ sub_80FB768: @ 80FB768
ldr r0, =sub_80FB5E8
movs r1, 0x50
bl CreateTask
bl script_env_2_enable
bl ScriptContext2_Enable
pop {r0}
bx r0
.pool