diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
| commit | 6cbea9af6dba53cf5b74a37d0161188f7eb3b3ac (patch) | |
| tree | a2c5ca082bf9359ab056743afe4811f8c378be8a /asm/field_tasks.s | |
| parent | 4a71a61e58507281252eb0406fea966d6fb7ebd4 (diff) | |
| parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'asm/field_tasks.s')
| -rw-r--r-- | asm/field_tasks.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 4befe0ca7..09f5bbc9b 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -88,7 +88,7 @@ sub_809D908: @ 809D908 bl sub_809D8B8 adds r0, r4, 0x2 adds r1, r4, 0x4 - bl wild_encounter_related + bl UpdateAmbientCry _0809D930: pop {r4} pop {r0} @@ -96,8 +96,8 @@ _0809D930: .pool thumb_func_end sub_809D908 - thumb_func_start overworld_ensure_per_step_coros_running -overworld_ensure_per_step_coros_running: @ 809D93C + thumb_func_start SetUpFieldTasks +SetUpFieldTasks: @ 809D93C push {r4,r5,lr} ldr r5, =task_per_step_callback_manager adds r0, r5, 0 @@ -142,7 +142,7 @@ _0809D992: pop {r0} bx r0 .pool - thumb_func_end overworld_ensure_per_step_coros_running + thumb_func_end SetUpFieldTasks thumb_func_start ActivatePerStepCallback ActivatePerStepCallback: @ 809D9A8 @@ -182,8 +182,8 @@ _0809D9EA: bx r0 thumb_func_end ActivatePerStepCallback - thumb_func_start wild_encounter_reset_coro_args -wild_encounter_reset_coro_args: @ 809D9F0 + thumb_func_start ResetFieldTasksArgs +ResetFieldTasksArgs: @ 809D9F0 push {lr} ldr r0, =task_per_step_callback_manager bl FindTaskIdByFunc @@ -207,7 +207,7 @@ _0809DA1A: pop {r0} bx r0 .pool - thumb_func_end wild_encounter_reset_coro_args + thumb_func_end ResetFieldTasksArgs thumb_func_start nullsub_34 nullsub_34: @ 809DA2C |