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/fldeff_strength.s | |
| parent | 625b1b69493313224277dcfd957269cc9945eb84 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_berry
Diffstat (limited to 'asm/fldeff_strength.s')
| -rw-r--r-- | asm/fldeff_strength.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 412eaff5d..3dc64467e 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -85,7 +85,7 @@ sub_8145E74: @ 8145E74 push {lr} movs r0, 0x28 bl FieldEffectActiveListRemove - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts pop {r0} bx r0 thumb_func_end sub_8145E74 |