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/trader.s | |
| parent | 448497dfbbc1157c640bc09745454b3c97dc947e (diff) | |
| parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) | |
Merge remote-tracking branch 'pret/master'
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 592291d88..e93bceccb 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 |