summaryrefslogtreecommitdiff
path: root/asm/field_tasks.s
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-10-12 02:06:19 -0500
committerDiegoisawesome <diego@domoreaweso.me>2017-10-12 02:06:19 -0500
commitf1b6358047dff266db01545d4a5927047e6756df (patch)
tree3905d3988e4c47acc33bbd984002d9fb767ac8ab /asm/field_tasks.s
parent8914645231c9301579ed39bdd9200ad50e5296d0 (diff)
Port/decomp scrcmd
Diffstat (limited to 'asm/field_tasks.s')
-rw-r--r--asm/field_tasks.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 6f8174fd8..39bd3b545 100644
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -46,7 +46,7 @@ _0809D8CA:
ands r0, r1
cmp r0, 0
beq _0809D8FC
- bl sub_809E7B0
+ bl DoTimeBasedEvents
ldrh r0, [r4]
adds r0, 0x1
b _0809D8FA
@@ -144,8 +144,8 @@ _0809D992:
.pool
thumb_func_end overworld_ensure_per_step_coros_running
- thumb_func_start activate_per_step_callback
-activate_per_step_callback: @ 809D9A8
+ thumb_func_start ActivatePerStepCallback
+ActivatePerStepCallback: @ 809D9A8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -180,7 +180,7 @@ _0809D9EA:
pop {r4}
pop {r0}
bx r0
- thumb_func_end activate_per_step_callback
+ thumb_func_end ActivatePerStepCallback
thumb_func_start wild_encounter_reset_coro_args
wild_encounter_reset_coro_args: @ 809D9F0