diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 03:21:42 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 03:21:42 -0500 |
| commit | 6ba1dc8169f148adc9f7f68fec0490dc017c892a (patch) | |
| tree | 7dfe1cc18efed9adff4c24f279586b369554b434 /asm/contest.s | |
| parent | 448497dfbbc1157c640bc09745454b3c97dc947e (diff) | |
| parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/contest.s b/asm/contest.s index bc062dd94..11f9a0ac8 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -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 |