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/script_menu.s | |
parent | 448497dfbbc1157c640bc09745454b3c97dc947e (diff) | |
parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/script_menu.s')
-rw-r--r-- | asm/script_menu.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/script_menu.s b/asm/script_menu.s index 41e4dcec8..6c5e6d2bd 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -371,7 +371,7 @@ _080E20EC: bl sub_80E2A78 adds r0, r6, 0 bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts _080E20FC: pop {r4-r6} pop {r0} @@ -477,7 +477,7 @@ _080E21B8: _080E21BA: adds r0, r4, 0 bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts _080E21C4: pop {r4} pop {r0} @@ -668,7 +668,7 @@ _080E2350: bl sub_80E2A78 adds r0, r4, 0 bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts _080E2360: pop {r4,r5} pop {r0} |