summaryrefslogtreecommitdiff
path: root/asm/trader.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-12 23:02:08 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-12 23:02:08 +0200
commitc9603c40d86053a571023845b5c32c8ff381cabe (patch)
treed79f28da3ffd3c2eff489c62072204395cccfc2b /asm/trader.s
parent8731a8caa5602a516972329f7aa0624794b29ff2 (diff)
parent0918cadae3c2ab22993099bd474d40f93a893d5d (diff)
Merge branch 'master' into decomp_pokemon
Diffstat (limited to 'asm/trader.s')
-rw-r--r--asm/trader.s6
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