diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-12 23:02:08 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-12 23:02:08 +0200 |
| commit | c9603c40d86053a571023845b5c32c8ff381cabe (patch) | |
| tree | d79f28da3ffd3c2eff489c62072204395cccfc2b /asm/field_tasks.s | |
| parent | 8731a8caa5602a516972329f7aa0624794b29ff2 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_pokemon
Diffstat (limited to 'asm/field_tasks.s')
| -rw-r--r-- | asm/field_tasks.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index fb99bbc0e..0abd11da4 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -80,7 +80,7 @@ sub_809D908: @ 809D908 lsls r1, 3 ldr r0, =gTasks + 0x8 adds r4, r1, r0 - bl script_env_2_is_enabled + bl ScriptContext2_IsEnabled lsls r0, 24 cmp r0, 0 bne _0809D930 |