diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
| commit | a83d07e1b3134ff7c23a3ac39552f8285a0c09b4 (patch) | |
| tree | 0feb901cc447f2b76c006e54affa906977be8ab9 /asm/script_menu.s | |
| parent | 625b1b69493313224277dcfd957269cc9945eb84 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_berry
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} |