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/trader.s | |
parent | 625b1b69493313224277dcfd957269cc9945eb84 (diff) | |
parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) |
Merge branch 'master' into decomp_berry
Diffstat (limited to 'asm/trader.s')
-rw-r--r-- | asm/trader.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/trader.s b/asm/trader.s index b5d8d47bc..bddf53324 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -257,7 +257,7 @@ _08133C18: bl schedule_bg_copy_tilemap_to_vram adds r0, r5, 0 bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts pop {r4,r5} pop {r0} bx r0 @@ -468,7 +468,7 @@ _08133DFC: _08133E04: adds r0, r6, 0 bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts pop {r4-r6} pop {r0} bx r0 @@ -484,7 +484,7 @@ sub_8133E1C: @ 8133E1C movs r1, 0 strh r1, [r2] bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts pop {r0} bx r0 .pool |