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/script_pokemon_util_80F87D8.s | |
| parent | 8731a8caa5602a516972329f7aa0624794b29ff2 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_pokemon
Diffstat (limited to 'asm/script_pokemon_util_80F87D8.s')
| -rw-r--r-- | asm/script_pokemon_util_80F87D8.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index e68634ac0..0ff6bff00 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -1063,7 +1063,7 @@ sub_80F9088: @ 80F9088 lsrs r0, 24 cmp r0, 0x1 bne _080F90D4 - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts adds r0, r5, 0 bl DestroyTask b _080F90D4 |