summaryrefslogtreecommitdiff
path: root/asm/rom_80A92F4.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/rom_80A92F4.s')
-rw-r--r--asm/rom_80A92F4.s1988
1 files changed, 994 insertions, 994 deletions
diff --git a/asm/rom_80A92F4.s b/asm/rom_80A92F4.s
index 8dabce13d..07a72e235 100644
--- a/asm/rom_80A92F4.s
+++ b/asm/rom_80A92F4.s
@@ -1053,7 +1053,7 @@ sub_80A9C70: @ 80A9C70
ldrb r6, [r0]
ldr r0, =sub_80A9DB4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1251,7 +1251,7 @@ _080A9E10:
cmp r0, 0x2
bne _080A9E3E
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080A9E3E
_080A9E3A:
adds r0, r1, 0x1
@@ -1903,7 +1903,7 @@ move_anim_start_t2: @ 80AA364
bl move_something
ldr r0, =task0A_80788BC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -1950,7 +1950,7 @@ task0A_80788BC: @ 80AA3B4
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080AA3F6:
pop {r4}
pop {r0}
@@ -2568,7 +2568,7 @@ _080AA8C4:
ldr r1, =0x0600d800
bl LZ77UnCompVram
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r1, =0x0300301c
@@ -2598,7 +2598,7 @@ _080AA8C4:
_080AA998:
ldr r0, =task_title_screen_1
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -2747,7 +2747,7 @@ _080AAB1E:
@ void c2_title_screen_2()
c2_title_screen_2: @ 80AAB2C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -3276,7 +3276,7 @@ _080AAF9C:
sub_80AAFA4: @ 80AAFA4
push {r4-r6,lr}
ldr r0, =sub_80AB1B0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -3357,7 +3357,7 @@ sub_80AAFA4: @ 80AAFA4
strb r0, [r1]
ldr r0, =sub_80AB160
movs r1, 0x50
- bl AddTask
+ bl CreateTask
ldr r1, =0x000006c9
adds r4, r1
strb r0, [r4]
@@ -6280,7 +6280,7 @@ sub_80AC81C: @ 80AC81C
push {lr}
ldr r0, =task50_0807B6D4
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -6395,7 +6395,7 @@ _080AC910:
_080AC918:
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AC922:
pop {r4,r5}
pop {r0}
@@ -10730,7 +10730,7 @@ bag_add_task0_by_acit: @ 80AED28
push {lr}
ldr r0, =sub_80AECA8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -10860,7 +10860,7 @@ sub_80AEE20: @ 80AEE20
cmp r4, 0xF
bne _080AEE4C
ldr r0, =sub_80AECA8
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080AEE3E
@@ -10873,15 +10873,15 @@ _080AEE3E:
_080AEE4C:
ldr r5, =sub_80AECA8
adds r0, r5, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _080AEE68
adds r0, r5, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080AEE68:
ldr r1, =0x02038bc4
movs r0, 0xD
@@ -10904,7 +10904,7 @@ sub_80AEE84: @ 80AEE84
cmp r4, 0xF
bne _080AEEB0
ldr r0, =sub_80AECA8
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080AEEA2
@@ -10917,15 +10917,15 @@ _080AEEA2:
_080AEEB0:
ldr r5, =sub_80AECA8
adds r0, r5, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _080AEECC
adds r0, r5, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080AEECC:
ldr r1, =0x02038bc4
movs r0, 0xD
@@ -11230,7 +11230,7 @@ task0A_nop_for_a_while: @ 80AF10C
cmp r0, 0x1
bne _080AF120
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080AF120:
pop {r4}
pop {r0}
@@ -11245,7 +11245,7 @@ sub_80AF128: @ 80AF128
bl pal_fill_black
ldr r0, =task0A_nop_for_a_while
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -11260,7 +11260,7 @@ task0A_asap_script_env_2_enable_and_set_ctx_running: @ 80AF148
cmp r0, 0x1
bne _080AF160
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080AF160:
pop {r4}
@@ -11276,7 +11276,7 @@ sub_80AF168: @ 80AF168
bl pal_fill_black
ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -11289,7 +11289,7 @@ sub_80AF188: @ 80AF188
bl pal_fill_black
ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -11347,7 +11347,7 @@ _080AF1FC:
bne _080AF20E
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AF20E:
pop {r4,r5}
pop {r0}
@@ -11362,7 +11362,7 @@ sub_80AF214: @ 80AF214
bl palette_bg_faded_fill_black
ldr r0, =task_mpl_807DD60
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -11426,7 +11426,7 @@ _080AF298:
bl sub_8009F18
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AF2AE:
pop {r4,r5}
pop {r0}
@@ -11475,7 +11475,7 @@ _080AF2FA:
bl sub_8086C2C
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AF30C:
pop {r4,r5}
pop {r0}
@@ -11490,7 +11490,7 @@ sub_80AF314: @ 80AF314
bl palette_bg_faded_fill_black
ldr r0, =sub_80AF234
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -11534,7 +11534,7 @@ _080AF36C:
_080AF37E:
adds r0, r1, 0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -11588,7 +11588,7 @@ sub_80AF3E8: @ 80AF3E8
bl audio_play
ldr r0, =task0A_mpl_807E31C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
pop {r0}
bx r0
@@ -11604,7 +11604,7 @@ sub_80AF40C: @ 80AF40C
bl audio_play
ldr r0, =task_map_chg_seq_0807E2CC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
movs r0, 0xE
bl sub_8085540
@@ -11734,7 +11734,7 @@ _080AF536:
_080AF540:
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080AF54A:
pop {r4-r7}
pop {r0}
@@ -11823,7 +11823,7 @@ _080AF5EC:
_080AF600:
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080AF60A:
pop {r4-r7}
pop {r0}
@@ -11862,7 +11862,7 @@ _080AF644:
bl sub_809757C
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AF65A:
pop {r4,r5}
pop {r0}
@@ -11878,10 +11878,10 @@ sub_80AF660: @ 80AF660
cmp r0, 0x1
bne _080AF67C
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_809FA34
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_080AF67C:
pop {r4}
pop {r0}
@@ -11895,7 +11895,7 @@ sub_80AF688: @ 80AF688
bl pal_fill_black
ldr r0, =sub_80AF660
movs r1, 0x50
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
pop {r0}
bx r0
@@ -11921,7 +11921,7 @@ task_mpl_807E3C8: @ 80AF6B0
bne _080AF6CC
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_80984F4
_080AF6CC:
pop {r4}
@@ -11936,7 +11936,7 @@ sub_80AF6D4: @ 80AF6D4
bl pal_fill_black
ldr r0, =task_mpl_807E3C8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -11950,7 +11950,7 @@ sub_80AF6F0: @ 80AF6F0
bl pal_fill_black
ldr r0, =task_mpl_807E3C8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -11996,7 +11996,7 @@ sub_80AF734: @ 80AF734
str r1, [r0]
ldr r0, =sub_80AFA0C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -12014,7 +12014,7 @@ sp13E_warp_to_last_warp: @ 80AF76C
str r1, [r0]
ldr r0, =sub_80AFA0C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -12034,7 +12034,7 @@ sub_80AF79C: @ 80AF79C
str r1, [r0]
ldr r0, =sub_80AFA0C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -12049,7 +12049,7 @@ sub_80AF7D0: @ 80AF7D0
str r1, [r0]
ldr r0, =sub_80AFA88
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -12112,7 +12112,7 @@ sub_80AF848: @ 80AF848
bl audio_play
ldr r0, =sub_80AFA0C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005dac
ldr r0, =sub_80AF3E8
str r0, [r1]
@@ -12134,7 +12134,7 @@ sub_80AF87C: @ 80AF87C
bl audio_play
ldr r0, =sub_80AFA0C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005dac
ldr r0, =sub_80AF40C
str r0, [r1]
@@ -12150,7 +12150,7 @@ sub_80AF8B8: @ 80AF8B8
bl sub_80AF0B4
ldr r0, =sub_80AFA0C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005dac
ldr r0, =sub_80FB768
str r0, [r1]
@@ -12204,7 +12204,7 @@ _080AF92E:
ldr r0, =sub_8086074
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AF93E:
pop {r4,r5}
pop {r0}
@@ -12222,7 +12222,7 @@ sub_80AF948: @ 80AF948
bl audio_play
ldr r0, =sub_80AF8E0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -12284,7 +12284,7 @@ _080AF9D0:
ldr r0, =c2_load_new_map
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AF9E8:
pop {r4,r5}
pop {r0}
@@ -12297,7 +12297,7 @@ sub_80AF9F8: @ 80AF9F8
push {lr}
ldr r0, =sub_80AF96C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -12356,7 +12356,7 @@ _080AFA6C:
ldr r0, =c2_load_new_map
bl SetMainCallback2
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080AFA7C:
pop {r4-r6}
pop {r0}
@@ -12577,7 +12577,7 @@ _080AFC46:
ldr r0, =sub_8086024
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AFC56:
pop {r4,r5}
pop {r0}
@@ -12599,7 +12599,7 @@ sub_80AFC60: @ 80AFC60
str r1, [r0]
ldr r0, =task0A_fade_n_map_maybe
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -12894,12 +12894,12 @@ _080AFE64:
.pool
_080AFEB4:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080AFEC6
_080AFEBC:
bl dp12_8087EA4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AFEC6:
pop {r4-r6}
pop {r0}
@@ -12987,12 +12987,12 @@ _080AFF28:
.pool
_080AFF78:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080AFF8A
_080AFF80:
bl dp12_8087EA4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080AFF8A:
pop {r4-r6}
pop {r0}
@@ -13005,13 +13005,13 @@ sub_80AFF90: @ 80AFF90
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =sub_80AFE08
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080AFFAC
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080AFFAC:
pop {r4}
pop {r0}
@@ -13024,13 +13024,13 @@ sub_80AFFB8: @ 80AFFB8
push {r4,lr}
ldr r4, =sub_80AFF90
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080AFFD0
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_080AFFD0:
pop {r4}
pop {r0}
@@ -13054,7 +13054,7 @@ sub_80AFFDC: @ 80AFFDC
lsrs r7, r0, 24
ldr r0, =sub_80AFE08
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
@@ -13103,7 +13103,7 @@ sub_80B003C: @ 80B003C
lsrs r7, r0, 24
ldr r0, =sub_80AFECC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
@@ -13265,7 +13265,7 @@ _080B0198:
bl sub_809757C
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B01B6:
pop {r4,r5}
pop {r0}
@@ -13329,7 +13329,7 @@ _080B022A:
ldr r0, =c2_load_new_map
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B023A:
pop {r4,r5}
pop {r0}
@@ -13343,7 +13343,7 @@ sub_80B0244: @ 80B0244
bl script_env_2_enable
ldr r0, =sub_80AFA0C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005dac
ldr r0, =sub_80AF3E8
str r0, [r1]
@@ -13361,7 +13361,7 @@ sub_80B0268: @ 80B0268
str r1, [r0]
ldr r0, =sub_80B01BC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -13573,7 +13573,7 @@ _080B0424:
b _080B052C
_080B0450:
ldr r0, =sub_80AFECC
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080B052C
@@ -13669,7 +13669,7 @@ _080B04F2:
bl SetGpuReg
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B052C:
add sp, 0x8
pop {r4,r5}
@@ -13682,7 +13682,7 @@ sub_80B0534: @ 80B0534
push {lr}
ldr r0, =sub_80B0318
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -13726,7 +13726,7 @@ _080B0580:
sub_80B058C: @ 80B058C
push {lr}
ldr r0, =sub_80B0318
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -13747,7 +13747,7 @@ sub_80B05B4: @ 80B05B4
bl sub_80859B0
ldr r0, =task50_0807F0C8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -13764,7 +13764,7 @@ task50_0807F0C8: @ 80B05CC
cmp r0, 0x1
bne _080B05E8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080B05E8:
pop {r4}
@@ -13813,7 +13813,7 @@ _080B062E:
bl prev_quest_postbuffer_cursor_backup_reset
bl overworld_poison_timer_set
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B0652:
pop {r4,r5}
pop {r0}
@@ -13832,7 +13832,7 @@ task_add_01_battle_start: @ 80B065C
lsrs r5, 16
ldr r0, =task01_battle_start
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -15125,7 +15125,7 @@ sub_80B1158: @ 80B1158
movs r2, 0
movs r3, 0
bl sub_80F9244
- bl clear_tasks
+ bl ResetTasks
bl sub_806E64C
ldr r0, =sub_80B11A8
bl SetMainCallback2
@@ -15141,7 +15141,7 @@ sub_80B1158: @ 80B1158
sub_80B11A8: @ 80B11A8
push {lr}
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
bl sub_8145F20
lsls r0, 24
lsrs r0, 24
@@ -17323,14 +17323,14 @@ sub_80B236C: @ 80B236C
lsrs r5, r1, 24
ldr r4, =sub_80B2634
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _080B23A0
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -17661,7 +17661,7 @@ sub_80B2600: @ 80B2600
movs r0, 0x2
bl sub_800A4D8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B262A:
pop {r4}
pop {r0}
@@ -18311,7 +18311,7 @@ _080B2BEC:
bl script_env_2_enable_and_set_ctx_running
lsls r0, r4, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _080B2C22
.pool
_080B2C10:
@@ -18406,7 +18406,7 @@ sub_80B2CB0: @ 80B2CB0
ldrb r0, [r4, 0x12]
bl RemoveWindow
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B2CDE:
pop {r4,r5}
pop {r0}
@@ -18435,7 +18435,7 @@ sub_80B2CEC: @ 80B2CEC
bl RemoveWindow
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -18463,7 +18463,7 @@ sub_80B2D2C: @ 80B2D2C
bl textbox_close
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -18616,14 +18616,14 @@ sub_80B2EA8: @ 80B2EA8
push {r4,lr}
ldr r4, =sub_80B2EE4
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _080B2ED4
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
@@ -18740,7 +18740,7 @@ _080B2F82:
_080B2FA8:
bl script_env_2_enable_and_set_ctx_running
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
b _080B2FC6
_080B2FB4:
ldr r0, =0x03003124
@@ -18749,7 +18749,7 @@ _080B2FB4:
bne _080B2FC6
bl script_env_2_enable_and_set_ctx_running
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080B2FC6:
pop {r3,r4}
mov r8, r3
@@ -18818,7 +18818,7 @@ sub_80B3028: @ 80B3028
sub_80B3050: @ 80B3050
push {lr}
ldr r0, =sub_80B3144
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _080B3068
@@ -18896,7 +18896,7 @@ _080B3124:
_080B3128:
ldr r0, =sub_80B3144
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
_080B3134:
@@ -18923,7 +18923,7 @@ sub_80B3144: @ 80B3144
bl sub_800A2BC
ldr r0, =task00_08081A90
movs r1, 0x50
- bl AddTask
+ bl CreateTask
b _080B3184
.pool
_080B3178:
@@ -19027,7 +19027,7 @@ sub_80B3220: @ 80B3220
bl sub_800AB18
bl sub_8009F18
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B3248:
pop {r4}
pop {r0}
@@ -19187,7 +19187,7 @@ _080B3378:
ldr r0, =sub_80B360C
str r0, [r1, 0x8]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B33A0:
pop {r4,r5}
pop {r0}
@@ -19360,7 +19360,7 @@ _080B3504:
ldr r0, =sub_80B360C
str r0, [r1, 0x8]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B3532:
pop {r4-r7}
pop {r0}
@@ -19449,7 +19449,7 @@ _080B35F8:
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
_080B35FE:
- bl RunActiveTasks
+ bl RunTasks
pop {r4}
pop {r0}
bx r0
@@ -19639,7 +19639,7 @@ _080B379E:
strh r0, [r5, 0x8]
bl sub_80872C4
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080B37CC
_080B37B2:
movs r0, 0x3
@@ -19650,7 +19650,7 @@ _080B37B8:
movs r0, 0x1
bl sub_8197AE8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080B37CC:
pop {r4,r5}
@@ -19665,12 +19665,12 @@ sub_80B37D4: @ 80B37D4
ldr r4, =sub_80B3728
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
adds r2, r5, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl script_env_2_set_ctx_paused
pop {r4,r5}
pop {r0}
@@ -19741,7 +19741,7 @@ _080B3870:
ldr r0, =sub_80773AC
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B3884:
pop {r4,r5}
pop {r0}
@@ -19811,7 +19811,7 @@ _080B3908:
beq _080B391C
bl sub_8013F78
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B391C:
pop {r4,r5}
pop {r0}
@@ -19843,7 +19843,7 @@ sub_80B3950: @ 80B3950
push {lr}
ldr r0, =sub_80B37FC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -19883,7 +19883,7 @@ sub_80B39A4: @ 80B39A4
push {lr}
ldr r0, =sub_80B3728
movs r1, 0x50
- bl AddTask
+ bl CreateTask
bl script_env_2_set_ctx_paused
pop {r0}
bx r0
@@ -19964,7 +19964,7 @@ task00_08081A90: @ 80B3A30
ldr r0, =c2_800ACD4
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B3A62:
ldr r0, =0x03003124
ldrb r0, [r0]
@@ -19983,12 +19983,12 @@ _080B3A62:
bl SetMainCallback2
_080B3A86:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080B3AA6
.pool
_080B3AA0:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B3AA6:
pop {r4,r5}
pop {r0}
@@ -20006,7 +20006,7 @@ sub_80B3AAC: @ 80B3AAC
bne _080B3AC4
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B3AC4:
pop {r4}
pop {r0}
@@ -20066,14 +20066,14 @@ _080B3B2A:
cmp r0, 0
beq _080B3B40
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080B3BB8
.pool
_080B3B40:
bl sub_8009734
ldr r0, =task00_08081A90
movs r1, 0x1
- bl AddTask
+ bl CreateTask
b _080B3B96
.pool
_080B3B54:
@@ -20123,7 +20123,7 @@ _080B3B9E:
cmp r0, 0x1
bne _080B3BB8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B3BB8:
pop {r4,r5}
pop {r0}
@@ -20750,7 +20750,7 @@ TrainerApproachPlayer: @ 80B406C
lsrs r5, 24
ldr r0, =c3_8081EDC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
ldr r4, =0x03006090
ldr r3, =0x030060a8
ldrb r2, [r3]
@@ -20803,7 +20803,7 @@ _080B40E8:
ldr r4, =c3_8081EDC
adds r0, r5, 0
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -20841,7 +20841,7 @@ c3_8081EDC: @ 80B4118
cmp r0, 0
bne _080B4150
adds r0, r6, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080B416C
.pool
_080B4150:
@@ -21098,7 +21098,7 @@ sub_80B4318: @ 80B4318
beq _080B434A
_080B4344:
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080B434A:
movs r0, 0
pop {r4,r5}
@@ -21369,7 +21369,7 @@ _080B44FA:
adds r0, r4, 0
bl sub_808F23C
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080B456E
.pool
_080B4564:
@@ -21391,7 +21391,7 @@ sub_80B4578: @ 80B4578
adds r4, r0, 0
ldr r0, =sub_80B44C8
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -21424,7 +21424,7 @@ sub_80B45BC: @ 80B45BC
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r0}
bx r0
@@ -25028,7 +25028,7 @@ sub_80B61A0: @ 80B61A0
lsrs r4, 24
ldr r0, =sub_80B61E4
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -25183,10 +25183,10 @@ sub_80B62B4: @ 80B62B4
movs r0, 0x19
bl FieldEffectActiveListRemove
ldr r0, =sub_80B61E4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B62E6:
pop {r0}
bx r0
@@ -25202,7 +25202,7 @@ sub_80B62F4: @ 80B62F4
lsrs r4, 24
ldr r0, =sub_80B6330
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -25264,7 +25264,7 @@ sub_80B6360: @ 80B6360
lsrs r0, 24
strh r0, [r4, 0x14]
ldr r0, =sub_80B6330
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -25369,10 +25369,10 @@ sub_80B642C: @ 80B642C
movs r0, 0x3E
bl FieldEffectActiveListRemove
ldr r0, =sub_80B6330
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B645E:
pop {r0}
bx r0
@@ -26084,7 +26084,7 @@ mapldr_080842E8: @ 80B69FC
bl pal_fill_black
ldr r0, =task00_8084310
movs r1, 0
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
bl player_bitmagic
ldr r1, =0x03005dac
@@ -26141,7 +26141,7 @@ _080B6A64:
ldr r0, =mapldr_08084390
str r0, [r1]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B6A8A:
pop {r4-r6}
pop {r0}
@@ -26156,7 +26156,7 @@ mapldr_08084390: @ 80B6AA4
bl pal_fill_black
ldr r0, =c3_080843F8
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r4, =0x02037350
ldr r3, =0x02037590
ldrb r1, [r3, 0x5]
@@ -26227,7 +26227,7 @@ _080B6B3E:
bl script_env_2_disable
bl sub_809757C
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B6B58:
pop {r4,r5}
pop {r0}
@@ -26244,7 +26244,7 @@ sub_80B6B68: @ 80B6B68
bl player_bitmagic
ldr r0, =sub_80B6B94
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005dac
movs r0, 0
str r0, [r1]
@@ -26587,10 +26587,10 @@ sub_80B6E18: @ 80B6E18
bl sub_809757C
bl InstallCameraPanAheadCallback
ldr r0, =sub_80B6B94
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -26606,7 +26606,7 @@ sub_80B6E4C: @ 80B6E4C
lsls r1, 24
lsrs r1, 24
ldr r0, =sub_80B6E88
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -26892,10 +26892,10 @@ sub_80B7060: @ 80B7060
ldr r0, =c2_load_new_map
bl SetMainCallback2
ldr r0, =sub_80B6E88
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B709C:
pop {r0}
bx r0
@@ -26910,7 +26910,7 @@ sub_80B70B4: @ 80B70B4
bl script_env_2_enable
ldr r0, =sub_80B70DC
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005dac
movs r0, 0
str r0, [r1]
@@ -27210,10 +27210,10 @@ sub_80B72F4: @ 80B72F4
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
ldr r0, =sub_80B70DC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B7338:
movs r0, 0
pop {r4}
@@ -27228,7 +27228,7 @@ oei_waterfall: @ 80B734C
ldr r4, =sub_80B7384
adds r0, r4, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -27396,10 +27396,10 @@ _080B748E:
ldr r0, =0x02037590
strb r4, [r0, 0x6]
ldr r0, =sub_80B7384
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0x2B
bl FieldEffectActiveListRemove
movs r0, 0
@@ -27421,7 +27421,7 @@ sub_80B74D0: @ 80B74D0
ldr r4, =sub_80B750C
adds r0, r4, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -27528,10 +27528,10 @@ dive_3_unknown: @ 80B7580
mov r0, sp
bl dive_warp
ldr r0, =sub_80B750C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0x2C
bl FieldEffectActiveListRemove
_080B75C4:
@@ -27549,7 +27549,7 @@ sub_80B75D8: @ 80B75D8
lsls r1, 24
lsrs r1, 24
ldr r0, =sub_80B75F0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -27858,10 +27858,10 @@ sub_80B7814: @ 80B7814
ldr r0, =c2_load_new_map
bl SetMainCallback2
ldr r0, =sub_80B75F0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B784C:
movs r0, 0
pop {r1}
@@ -27879,7 +27879,7 @@ mapldr_080851BC: @ 80B7868
movs r1, 0
str r1, [r0]
ldr r0, =sub_80B7890
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -28046,10 +28046,10 @@ sub_80B79BC: @ 80B79BC
bl script_env_2_disable
bl sub_809757C
ldr r0, =sub_80B7890
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B79E6:
movs r0, 0
pop {r1}
@@ -28128,7 +28128,7 @@ sub_80B7A74: @ 80B7A74
lsls r1, 24
lsrs r1, 24
ldr r0, =sub_80B7A8C
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -28333,10 +28333,10 @@ sub_80B7BF4: @ 80B7BF4
ldr r0, =c2_load_new_map
bl SetMainCallback2
ldr r0, =sub_80B7A8C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B7C2C:
movs r0, 0
pop {r1}
@@ -28415,7 +28415,7 @@ sub_80B7CC8: @ 80B7CC8
bl player_bitmagic
ldr r0, =sub_80B7CE4
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -28530,10 +28530,10 @@ _080B7D86:
ldr r0, =c2_load_new_map
bl SetMainCallback2
ldr r0, =sub_80B7CE4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _080B7E40
.pool
_080B7DF8:
@@ -28603,7 +28603,7 @@ mapldr_080859D4: @ 80B7E48
strb r1, [r0, 0x1]
ldr r0, =sub_80B7E94
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -28710,10 +28710,10 @@ _080B7F32:
bl script_env_2_disable
bl sub_809757C
ldr r0, =sub_80B7E94
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _080B7FC0
.pool
_080B7F7C:
@@ -28763,7 +28763,7 @@ sub_80B7FC8: @ 80B7FC8
push {lr}
ldr r0, =sub_80B7FDC
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -29014,10 +29014,10 @@ _080B81B8:
ldr r0, =mapldr_08085D88
str r0, [r1]
ldr r0, =sub_80B7FDC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B81E6:
pop {r4}
pop {r0}
@@ -29049,7 +29049,7 @@ mapldr_08085D88: @ 80B8200
bl CameraObjectReset2
ldr r0, =sub_80B8250
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -29321,10 +29321,10 @@ sub_80B8410: @ 80B8410
bl CameraObjectReset1
bl sub_809757C
ldr r0, =sub_80B8250
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B8484:
add sp, 0x8
pop {r4,r5}
@@ -29351,7 +29351,7 @@ _080B84BC:
ldr r0, =sub_80B88B4
_080B84BE:
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =0x02038c08
@@ -29738,10 +29738,10 @@ overworld_bg_setup_2: @ 80B87B8
movs r0, 0x6
bl FieldEffectActiveListRemove
ldr r0, =sub_80B8554
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -29754,7 +29754,7 @@ sub_80B880C: @ 80B880C
push {r4,lr}
sub sp, 0x4
ldr r0, =sub_80B8554
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -30068,10 +30068,10 @@ sub_80B8A64: @ 80B8A64
movs r0, 0x6
bl FieldEffectActiveListRemove
ldr r0, =sub_80B88B4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
add sp, 0x8
pop {r4}
pop {r0}
@@ -30084,7 +30084,7 @@ sub_80B8AE0: @ 80B8AE0
push {r4,lr}
sub sp, 0x4
ldr r0, =sub_80B88B4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -30409,7 +30409,7 @@ sub_80B8D44: @ 80B8D44
push {lr}
ldr r0, =sub_80B8D84
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -30657,10 +30657,10 @@ sub_80B8F24: @ 80B8F24
movs r0, 0x9
bl FieldEffectActiveListRemove
ldr r0, =sub_80B8D84
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B8F84:
pop {r4,r5}
pop {r0}
@@ -30910,7 +30910,7 @@ sub_80B91A4: @ 80B91A4
push {lr}
ldr r0, =sub_80B91D4
movs r1, 0xFE
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -31276,10 +31276,10 @@ sub_80B9494: @ 80B9494
movs r0, 0x1F
bl FieldEffectActiveListRemove
ldr r0, =sub_80B91D4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B94B6:
pop {r0}
bx r0
@@ -31673,7 +31673,7 @@ sub_80B97C0: @ 80B97C0
push {lr}
ldr r0, =sub_80B97D4
movs r1, 0xFE
- bl AddTask
+ bl CreateTask
movs r0, 0
pop {r1}
bx r1
@@ -32032,10 +32032,10 @@ _080B9A94:
movs r0, 0x20
bl FieldEffectActiveListRemove
ldr r0, =sub_80B97D4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080B9ACA:
pop {r4-r7}
pop {r0}
@@ -32058,7 +32058,7 @@ sub_80B9ADC: @ 80B9ADC
bne _080B9B2C
ldr r0, =sub_80B9BE8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -32159,7 +32159,7 @@ _080B9BB6:
cmp r0, 0
bne _080B9BC8
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B9BC8:
pop {r4,r5}
pop {r0}
@@ -32216,7 +32216,7 @@ sub_80B9C28: @ 80B9C28
adds r5, r0, 0
ldr r0, =sub_80B9B3C
movs r1, 0x5A
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -32305,7 +32305,7 @@ sub_80B9CDC: @ 80B9CDC
cmp r0, 0
bne _080B9D16
ldr r0, =sub_80B9B3C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080B9D16
@@ -32317,7 +32317,7 @@ sub_80B9CDC: @ 80B9CDC
movs r0, 0x41
bl FieldEffectActiveListRemove
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B9D16:
pop {r4,r5}
pop {r0}
@@ -32506,7 +32506,7 @@ sub_80B9E28: @ 80B9E28
bl npc_coords_shift
ldr r0, =sub_80B9EDC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005e00
@@ -32647,7 +32647,7 @@ _080B9F7C:
movs r0, 0x42
bl FieldEffectActiveListRemove
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_080B9FAC:
pop {r4-r7}
pop {r0}
@@ -32674,7 +32674,7 @@ remove_some_task: @ 80B9FB8
ldrb r0, [r4, 0x18]
cmp r0, 0xFF
beq _080B9FE2
- bl remove_task
+ bl DestroyTask
movs r0, 0xFF
strb r0, [r4, 0x18]
_080B9FE2:
@@ -32870,7 +32870,7 @@ task00_for_dp12: @ 80BA174
cmp r0, 0
beq _080BA1A4
mov r0, r12
- bl remove_task
+ bl DestroyTask
ldr r1, =0x02039b28
movs r0, 0xFF
strb r0, [r1, 0x18]
@@ -33163,7 +33163,7 @@ sub_80BA384: @ 80BA384
bl sub_80BA038
ldr r0, =task00_for_dp12
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =0x03005e00
@@ -33243,7 +33243,7 @@ _080BA47E:
thumb_func_start sub_80BA4B0
sub_80BA4B0: @ 80BA4B0
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -33446,7 +33446,7 @@ _080BA56A:
_080BA69C:
bl sub_80A1A74
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
ldr r1, =0x030022c0
movs r0, 0x87
@@ -33533,7 +33533,7 @@ _080BA760:
_080BA774:
ldr r0, =sub_80BA83C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005e00
@@ -33975,7 +33975,7 @@ sub_80BAB08: @ 80BAB08
cmp r0, 0
bne _080BAB2C
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
bl FreeAllWindowBuffers
ldr r0, =0x030022c0
ldr r0, [r0, 0x8]
@@ -35301,7 +35301,7 @@ _080BB582:
.pool
_080BB5FC:
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_80A1A74
bl ResetObjectPaletteAllocator
@@ -35322,7 +35322,7 @@ _080BB628:
bl sub_80BB384
ldr r0, =sub_80BB78C
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, [r4]
ldr r5, =0x03005d90
ldr r0, [r5]
@@ -35435,7 +35435,7 @@ _080BB74C:
thumb_func_start sub_80BB774
sub_80BB774: @ 80BB774
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -36164,7 +36164,7 @@ _080BBE18:
bl sub_80BDA40
bl sub_80BC890
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_8086194
bl SetMainCallback2
ldr r0, =0x03007420
@@ -41100,7 +41100,7 @@ sub_80BE91C: @ 80BE91C
str r0, [r1]
ldr r0, =sub_80BEA24
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -41926,7 +41926,7 @@ sub_80BF070: @ 80BF070
bl sub_818D820
bl sub_80BEDB0
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080BF09C:
pop {r4}
pop {r0}
@@ -43360,7 +43360,7 @@ sub_80BFDF4: @ 80BFDF4
lsrs r4, 16
ldr r0, =sub_80BFE38
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -43755,7 +43755,7 @@ _080C0168:
movs r2, 0x20
bl decompress_palette
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080C01BA:
pop {r4-r6}
pop {r0}
@@ -45908,7 +45908,7 @@ sub_80C1258: @ 80C1258
push {lr}
ldr r0, =sub_80C12E0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -47153,7 +47153,7 @@ sub_80C1D70: @ 80C1D70
bne _080C1D8C
bl sub_80C152C
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080C1D8C:
pop {r4}
pop {r0}
@@ -48348,7 +48348,7 @@ sub_80C26D4: @ 80C26D4
thumb_func_start sub_80C2710
sub_80C2710: @ 80C2710
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -48375,7 +48375,7 @@ sub_80C2728: @ 80C2728
movs r0, 0
str r0, [r5]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -49840,11 +49840,11 @@ sub_80C3404: @ 80C3404
thumb_func_start sub_80C3414
sub_80C3414: @ 80C3414
push {lr}
- bl clear_tasks
+ bl ResetTasks
bl remove_some_task
ldr r0, =sub_80C2760
movs r1, 0
- bl AddTask
+ bl CreateTask
bl sub_80C4EE4
bl sub_80C3190
pop {r0}
@@ -52194,7 +52194,7 @@ sub_80C4918: @ 80C4918
ldr r4, =sub_80C4960
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -52210,7 +52210,7 @@ sub_80C4918: @ 80C4918
sub_80C4940: @ 80C4940
push {lr}
ldr r0, =sub_80C4960
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -52773,10 +52773,10 @@ sub_80C4DB0: @ 80C4DB0
movs r0, 0
bl SetHBlankCallback
ldr r0, =sub_80C4960
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -53524,7 +53524,7 @@ _080C5416:
thumb_func_start sub_80C5438
sub_80C5438: @ 80C5438
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
pop {r0}
@@ -53539,7 +53539,7 @@ sub_80C544C: @ 80C544C
beq _080C5464
ldr r0, =sub_80C5A48
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, =sub_80C5438
bl SetMainCallback2
_080C5464:
@@ -53604,7 +53604,7 @@ _080C54EE:
bl sub_80C50D0
b _080C56F4
_080C54F4:
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl sub_80A1A74
@@ -53887,7 +53887,7 @@ _080C57A6:
b _080C57E4
_080C57AC:
bl sub_80C50D0
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
b _080C57E4
@@ -53997,7 +53997,7 @@ sub_80C5868: @ 80C5868
bgt _080C58AC
ldr r0, =sub_80C5BD8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -54018,7 +54018,7 @@ _080C58AC:
strb r0, [r2, 0xE]
ldr r0, =sub_80C5A48
movs r1, 0
- bl AddTask
+ bl CreateTask
_080C58C0:
ldr r0, =sub_80C5438
bl SetMainCallback2
@@ -54156,7 +54156,7 @@ _080C59D4:
orrs r0, r1
strb r0, [r2, 0xE]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_80C5934
bl SetMainCallback2
b _080C5A1A
@@ -54339,7 +54339,7 @@ _080C5B48:
ldr r0, =sub_80C5470
bl SetMainCallback2
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080C5B5E:
ldr r0, =0x030022c0
ldrh r1, [r0, 0x2E]
@@ -54352,7 +54352,7 @@ _080C5B5E:
ldr r0, =sub_80C5470
bl SetMainCallback2
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
b _080C5BCA
.pool
_080C5B88:
@@ -54566,7 +54566,7 @@ _080C5D3C:
cmp r0, 0
bne _080C5D64
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_80C5934
bl SetMainCallback2
b _080C5D82
@@ -55410,10 +55410,10 @@ _080C6466:
bl AllocZeroed
str r0, [r5]
str r4, [r0]
- bl clear_tasks
+ bl ResetTasks
ldr r0, =sub_80C67BC
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, =sub_80C5438
bl SetMainCallback2
pop {r4,r5}
@@ -55425,7 +55425,7 @@ _080C6466:
thumb_func_start sub_80C6498
sub_80C6498: @ 80C6498
push {r4,lr}
- bl clear_tasks
+ bl ResetTasks
ldr r4, =0x02039cf4
ldr r0, [r4]
ldr r0, [r0]
@@ -55883,7 +55883,7 @@ _080C68C8:
b _080C68E0
_080C68CE:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
bl sub_80C6498
b _080C68E0
_080C68DA:
@@ -57286,7 +57286,7 @@ _080C73D0:
lsrs r0, 24
bl RemoveWindow
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080C756A
_080C73F6:
movs r3, 0xC
@@ -57459,7 +57459,7 @@ _080C7544:
lsrs r0, 24
bl RemoveWindow
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080C756A:
add sp, 0x10
pop {r4-r7}
@@ -57473,7 +57473,7 @@ sub_80C7578: @ 80C7578
push {lr}
ldr r0, =c3_0808C39C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -57500,7 +57500,7 @@ mapldr_0808C6D8: @ 80C75A8
ldr r4, =c3_0808C39C
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -58435,7 +58435,7 @@ sub_80C7D28: @ 80C7D28
thumb_func_start c2_Box
c2_Box: @ 80C7D54
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl do_scheduled_bg_tilemap_copies_to_vram
bl sub_80CA028
bl sub_80CAA14
@@ -58450,7 +58450,7 @@ sub_80C7D74: @ 80C7D74
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- bl clear_tasks
+ bl ResetTasks
ldr r0, =0x02039d0d
strb r5, [r0]
ldr r4, =0x02039d08
@@ -58475,7 +58475,7 @@ _080C7DA8:
strb r1, [r0]
ldr r0, =task_box_related_3
movs r1, 0x3
- bl AddTask
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x4]
bl get_preferred_box
@@ -58493,7 +58493,7 @@ _080C7DD4:
thumb_func_start c2_808CE60
c2_808CE60: @ 80C7DEC
push {r4,lr}
- bl clear_tasks
+ bl ResetTasks
ldr r4, =0x02039d08
ldr r0, =0x000062c4
bl Alloc
@@ -58517,7 +58517,7 @@ _080C7E18:
strb r2, [r0]
ldr r0, =task_box_related_3
movs r1, 0x3
- bl AddTask
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x4]
ldr r0, =c2_Box
@@ -62159,7 +62159,7 @@ _080C9F48:
bl GoToBagMenu
_080C9F56:
mov r0, r8
- bl remove_task
+ bl DestroyTask
add sp, 0x8
pop {r3}
mov r8, r3
@@ -66499,7 +66499,7 @@ sub_80CC32C: @ 80CC32C
lsrs r4, 24
ldr r0, =sub_80CC370
movs r1, 0x2
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -66518,7 +66518,7 @@ sub_80CC32C: @ 80CC32C
sub_80CC35C: @ 80CC35C
push {lr}
ldr r0, =sub_80CC370
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -66616,7 +66616,7 @@ _080CC426:
.pool
_080CC44C:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _080CC458
_080CC454:
movs r0, 0
@@ -77264,10 +77264,10 @@ _080D1CFC:
.pool
thumb_func_end sub_80D1CCC
- thumb_func_start nullsub_40
-nullsub_40: @ 80D1D04
+ thumb_func_start TaskDummy0
+TaskDummy0: @ 80D1D04
bx lr
- thumb_func_end nullsub_40
+ thumb_func_end TaskDummy0
thumb_func_start nullsub_98
nullsub_98: @ 80D1D08
@@ -80230,7 +80230,7 @@ exec_movement: @ 80D32E8
b _080D3332
_080D330A:
ldr r0, =sub_80D3660
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080D331C
@@ -80305,7 +80305,7 @@ sub_80D338C: @ 80D338C
adds r0, r4, 0
bl sub_80D361C
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080D33A6:
pop {r4}
pop {r0}
@@ -80319,7 +80319,7 @@ sub_80D33AC: @ 80D33AC
lsls r1, 24
lsrs r1, 24
ldr r0, =sub_80D3660
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r2, 0x1
@@ -80351,7 +80351,7 @@ _080D33CC:
sub_80D33F4: @ 80D33F4
push {lr}
ldr r0, =sub_80D3660
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -82860,13 +82860,13 @@ AddMapNamePopUpWindowTask: @ 80D47E4
beq _080D486C
ldr r4, =Task_MapNamePopUpWindow
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080D4844
adds r0, r4, 0
movs r1, 0x5A
- bl AddTask
+ bl CreateTask
ldr r4, =0x02039dd4
strb r0, [r4]
movs r0, 0x12
@@ -83044,7 +83044,7 @@ _080D496E:
HideMapNamePopUpWindow: @ 80D4974
push {lr}
ldr r0, =Task_MapNamePopUpWindow
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _080D49A4
@@ -83059,7 +83059,7 @@ HideMapNamePopUpWindow: @ 80D4974
bl SetGpuReg_ForcedBlank
ldr r0, =0x02039dd4
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
_080D49A4:
pop {r0}
bx r0
@@ -88758,10 +88758,10 @@ itemid_get_x28: @ 80D7644
.pool
thumb_func_end itemid_get_x28
- thumb_func_start nullsub_41
-nullsub_41: @ 80D7668
+ thumb_func_start TaskDummy1
+TaskDummy1: @ 80D7668
bx lr
- thumb_func_end nullsub_41
+ thumb_func_end TaskDummy1
thumb_func_start sub_80D766C
sub_80D766C: @ 80D766C
@@ -89324,7 +89324,7 @@ _080D7B4E:
orrs r0, r1
strb r0, [r2, 0x8]
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
ldr r1, =0x0300301c
movs r0, 0x4
@@ -89380,7 +89380,7 @@ _080D7C04:
bl SetVBlankCallback
ldr r0, =sub_80D7C7C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, =0x02039f34
ldr r1, [r1]
ldr r1, [r1]
@@ -89518,14 +89518,14 @@ _080D7D3A:
_080D7D62:
ldr r0, =sub_80D7DAC
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
strh r4, [r0, 0x8]
- ldr r1, =nullsub_41
+ ldr r1, =TaskDummy1
str r1, [r0]
b _080D7D9E
.pool
@@ -89551,7 +89551,7 @@ sub_80D7DAC: @ 80D7DAC
lsrs r0, 24
ldr r1, =sub_80FC998
ldr r2, =sub_80D7DC8
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
@@ -89592,7 +89592,7 @@ sub_80D7DE8: @ 80D7DE8
bgt _080D7E2A
bl link_get_multiplayer_id
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x02039f34
ldr r0, [r0]
ldr r0, [r0]
@@ -90039,7 +90039,7 @@ _080D822C:
sub_80D823C: @ 80D823C
push {r4,r5,lr}
bl CallObjectCallbacks
- bl RunActiveTasks
+ bl RunTasks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
movs r4, 0
@@ -90732,18 +90732,18 @@ sub_80D8894: @ 80D8894
ldr r4, =sub_80FC9F8
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =sub_80D892C
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
- ldr r1, =nullsub_41
+ ldr r1, =TaskDummy1
str r1, [r0]
bl sub_80DBF68
movs r0, 0
@@ -90771,7 +90771,7 @@ sub_80D892C: @ 80D892C
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r2, =0x03005e00
ldr r0, =0x02039f34
ldr r0, [r0]
@@ -91150,12 +91150,12 @@ _080D8CD4:
ldr r4, =sub_80FCC88
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =sub_80DA110
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl sub_80DBF68
ldr r1, =0x03005e00
mov r0, r10
@@ -93486,7 +93486,7 @@ sub_80DA110: @ 80DA110
negs r1, r1
ands r1, r2
strb r1, [r3, 0x7]
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.pool
@@ -93599,12 +93599,12 @@ _080DA1F4:
ldr r4, =sub_80FCC88
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =sub_80DA110
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl sub_80DBF68
strh r6, [r5, 0x8]
b _080DA250
@@ -94269,18 +94269,18 @@ sub_80DA7A0: @ 80DA7A0
ldr r5, =sub_80FCACC
adds r0, r5, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =sub_80DA7EC
adds r1, r5, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, =nullsub_41
+ ldr r1, =TaskDummy1
str r1, [r0]
bl sub_80DBF68
movs r0, 0
@@ -94297,7 +94297,7 @@ sub_80DA7EC: @ 80DA7EC
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -94334,7 +94334,7 @@ sub_80DA830: @ 80DA830
cmp r0, 0
bne _080DA860
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x03005dac
ldr r1, =sub_80DA874
str r1, [r0]
@@ -97390,7 +97390,7 @@ sub_80DC028: @ 80DC028
strb r0, [r1, 0x2]
ldr r0, =sub_80DC0F4
movs r1, 0x14
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
lsls r5, 16
@@ -97498,7 +97498,7 @@ _080DC126:
cmp r0, 0
bne _080DC15C
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x02039f34
ldr r0, [r0]
ldr r0, [r0, 0x14]
@@ -98083,7 +98083,7 @@ sub_80DC5E8: @ 80DC5E8
push {r4,lr}
ldr r0, =sub_80DC728
movs r1, 0x1E
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x02039f34
@@ -98155,7 +98155,7 @@ sub_80DC674: @ 80DC674
lsrs r4, 24
ldr r0, =sub_80DC6A4
movs r1, 0x1F
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -98227,7 +98227,7 @@ _080DC6DC:
movs r2, 0
bl pal_fade_1
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080DC716:
pop {r4-r7}
pop {r0}
@@ -98342,7 +98342,7 @@ sub_80DC7EC: @ 80DC7EC
push {r4,lr}
ldr r0, =sub_80DC8D0
movs r1, 0x1E
- bl AddTask
+ bl CreateTask
ldr r1, =0x02039f34
ldr r1, [r1]
ldr r1, [r1]
@@ -100575,7 +100575,7 @@ sub_80DDA20: @ 80DDA20
push {r4,r5,lr}
ldr r0, =c3_08130B10
movs r1, 0xA
- bl AddTask
+ bl CreateTask
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -100677,7 +100677,7 @@ _080DDACA:
movs r3, 0x1F
bl pal_fade_1
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080DDAFE:
pop {r4-r6}
pop {r0}
@@ -100690,7 +100690,7 @@ sub_80DDB0C: @ 80DDB0C
push {r4,lr}
ldr r0, =sub_80DDB6C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r3, =0x02020630
ldr r4, =0x02039f34
ldr r2, [r4]
@@ -100781,7 +100781,7 @@ _080DDBB8:
ands r0, r1
strb r0, [r2, 0x6]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_080DDBD4:
pop {r4,r5}
pop {r0}
@@ -100817,7 +100817,7 @@ sub_80DDBE8: @ 80DDBE8
_080DDC1C:
ldr r0, =task08_080CD1CC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r2, [r4]
ldr r0, [r2]
adds r0, 0x58
@@ -100901,7 +100901,7 @@ _080DDC9C:
ands r0, r1
strb r0, [r2, 0x6]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080DDCC4:
pop {r4,r5}
pop {r0}
@@ -100917,7 +100917,7 @@ sub_80DDCDC: @ 80DDCDC
lsrs r4, 24
ldr r0, =sub_80DDD20
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -101003,7 +101003,7 @@ _080DDD70:
ands r0, r1
strb r0, [r2, 0x6]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080DDD9C:
pop {r4,r5}
pop {r0}
@@ -101068,7 +101068,7 @@ sub_80DDE0C: @ 80DDE0C
push {lr}
ldr r0, =sub_80DDE30
movs r1, 0xF
- bl AddTask
+ bl CreateTask
ldr r0, =0x02039f34
ldr r0, [r0]
ldr r2, [r0]
@@ -101144,7 +101144,7 @@ _080DDE8C:
ands r0, r1
strb r0, [r2, 0x6]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080DDEBA:
pop {r4,r5}
pop {r0}
@@ -101162,7 +101162,7 @@ sub_80DDED0: @ 80DDED0
lsrs r5, r1, 24
ldr r0, =sub_80DDF80
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
lsls r4, 24
@@ -101288,7 +101288,7 @@ _080DDFB8:
cmp r1, r0
bne _080DDFFC
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x02039f34
ldr r0, [r0]
ldr r2, [r0]
@@ -101939,12 +101939,12 @@ _080DE552:
ldr r4, =sub_80FCC88
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =sub_80DA110
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl sub_80DBF68
movs r0, 0x2
strh r0, [r5, 0x8]
@@ -102193,7 +102193,7 @@ _080DE74C:
ble _080DE6AE
ldr r0, =sub_80DE794
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -102291,7 +102291,7 @@ _080DE7EE:
ands r0, r1
strb r0, [r2, 0x7]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080DE822:
pop {r4-r6}
pop {r0}
@@ -104698,7 +104698,7 @@ _080DFAF8:
bl CopyWindowToVram
ldr r0, =Task_ShopMenu
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
add sp, 0x10
@@ -104870,7 +104870,7 @@ HandleShopMenuQuit: @ 80DFC68
bl SaveRecordedItemPurchasesForTVShow
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r5, [r5]
cmp r5, 0
beq _080DFC98
@@ -104900,7 +104900,7 @@ Task_GoToBuyOrSellMenu: @ 80DFCA4
cmp r0, 0
bne _080DFCD2
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldrh r0, [r4, 0x10]
lsls r0, 16
ldrh r1, [r4, 0x12]
@@ -104920,7 +104920,7 @@ MapPostLoadHook_ExitBuyOrSellMenu: @ 80DFCE0
bl pal_fill_black
ldr r0, =Task_ExitSellMenu
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -104971,7 +104971,7 @@ ReturnToShopMenuAfterExitingSellMenu: @ 80DFD44
ldrb r0, [r0, 0xF]
bl CreateShopMenu
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -104982,7 +104982,7 @@ ReturnToShopMenuAfterExitingSellMenu: @ 80DFD44
@ void CB2_BuyMenu()
CB2_BuyMenu: @ 80DFD64
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -105022,7 +105022,7 @@ _080DFDAC:
bl BuyMenuAddScrollIndicatorArrows
ldr r0, =Task_BuyMenu
movs r1, 0x8
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -105070,7 +105070,7 @@ _080DFE20:
bl ResetObjectPaletteAllocator
bl sub_80A1A74
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl clear_scheduled_bg_copies_to_vram
ldr r4, =0x02039f70
ldr r0, =0x000020b0
@@ -107326,7 +107326,7 @@ Task_ExitBuyMenu: @ 80E11B0
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080E11D6:
pop {r4}
pop {r0}
@@ -107754,7 +107754,7 @@ sub_80E150C: @ 80E150C
ldr r6, =sub_80E1444
adds r0, r6, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -107799,7 +107799,7 @@ sub_80E1570: @ 80E1570
push {lr}
ldr r0, =0x02039f8c
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.pool
@@ -108959,7 +108959,7 @@ Multichoice: @ 80E1E08
lsls r3, 24
lsrs r4, r3, 24
ldr r0, =sub_80E2058
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -109005,7 +109005,7 @@ sub_80E1E58: @ 80E1E58
lsls r4, 24
lsrs r4, 24
ldr r0, =sub_80E2058
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -109200,7 +109200,7 @@ _080E1FF0:
bls _080E1FE6
adds r0, r6, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
@@ -109310,7 +109310,7 @@ _080E20EC:
ldrb r0, [r5, 0xC]
bl sub_80E2A78
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080E20FC:
pop {r4-r6}
@@ -109324,7 +109324,7 @@ yes_no_box: @ 80E2108
push {r4,lr}
ldr r4, =task_yes_no_maybe
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -109335,7 +109335,7 @@ yes_no_box: @ 80E2108
bl sub_8197930
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
movs r0, 0x1
b _080E213A
.pool
@@ -109416,7 +109416,7 @@ _080E21B8:
strh r0, [r1]
_080E21BA:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080E21C4:
pop {r4}
@@ -109448,7 +109448,7 @@ sub_80E21D0: @ 80E21D0
lsrs r4, 24
mov r10, r4
ldr r0, =sub_80E2308
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -109510,7 +109510,7 @@ _080E2246:
lsrs r6, 24
ldr r0, =sub_80E2308
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005e00
@@ -109607,7 +109607,7 @@ _080E2350:
ldrb r0, [r5, 0xC]
bl sub_80E2A78
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080E2360:
pop {r4,r5}
@@ -109621,7 +109621,7 @@ _080E2360:
sp109_CreatePCMenu: @ 80E236C
push {lr}
ldr r0, =sub_80E2058
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -109828,7 +109828,7 @@ sub_80E2514: @ 80E2514
sub_80E2548: @ 80E2548
push {lr}
ldr r0, =sub_80E2058
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -110267,7 +110267,7 @@ _080E28EC:
ldrb r0, [r4, 0x12]
bl sub_80E2A78
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080E28F8:
pop {r4,r5}
pop {r0}
@@ -110288,7 +110288,7 @@ sub_80E2900: @ 80E2900
lsrs r6, r2, 24
ldr r4, =task_picbox
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -110309,7 +110309,7 @@ sub_80E2900: @ 80E2900
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -110368,7 +110368,7 @@ _080E29BA:
picbox_close: @ 80E29C4
push {lr}
ldr r0, =task_picbox
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -110395,7 +110395,7 @@ _080E29F6:
sub_80E29FC: @ 80E29FC
push {lr}
ldr r0, =task_picbox
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -110583,7 +110583,7 @@ _080E2B70:
sp106_CreateStartMenu: @ 80E2B7C
push {lr}
ldr r0, =sub_80E2058
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -110734,7 +110734,7 @@ sub_80E2CC4: @ 80E2CC4
strb r0, [r1]
ldr r0, =sub_80E2058
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -110923,7 +110923,7 @@ _080E2E5E:
bl ResetObjectPaletteAllocator
b _080E2E86
_080E2E68:
- bl clear_tasks
+ bl ResetTasks
b _080E2E86
_080E2E6E:
bl choose_name_or_words_screen_apply_bg_pals
@@ -111283,7 +111283,7 @@ sub_80E3194: @ 80E3194
push {lr}
ldr r0, =sub_80E31B0
movs r1, 0x2
- bl AddTask
+ bl CreateTask
ldr r0, =sub_80E4F58
bl SetMainCallback2
pop {r0}
@@ -111625,10 +111625,10 @@ _080E34A0:
ldr r0, [r0]
bl SetMainCallback2
ldr r0, =sub_80E31B0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
bl FreeAllWindowBuffers
ldr r0, [r4]
bl Free
@@ -111893,7 +111893,7 @@ sub_80E373C: @ 80E373C
ldr r4, =sub_80E375C
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -111935,7 +111935,7 @@ _080E376E:
sub_80E3794: @ 80E3794
push {lr}
ldr r0, =sub_80E375C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -112111,10 +112111,10 @@ _080E38EA:
sub_80E3904: @ 80E3904
push {lr}
ldr r0, =sub_80E375C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -112126,7 +112126,7 @@ sub_80E3920: @ 80E3920
push {lr}
ldr r0, =c3_0809E58C
movs r1, 0x3
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -112151,7 +112151,7 @@ sub_80E3948: @ 80E3948
lsls r2, 24
lsrs r6, r2, 24
ldr r0, =c3_0809E58C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -113412,10 +113412,10 @@ sub_80E4354: @ 80E4354
.pool
thumb_func_end sub_80E4354
- thumb_func_start nullsub_42
-nullsub_42: @ 80E4380
+ thumb_func_start TaskDummy2
+TaskDummy2: @ 80E4380
bx lr
- thumb_func_end nullsub_42
+ thumb_func_end TaskDummy2
thumb_func_start sub_80E4384
sub_80E4384: @ 80E4384
@@ -113725,7 +113725,7 @@ sub_80E45F8: @ 80E45F8
push {lr}
ldr r0, =sub_80E465C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -113735,7 +113735,7 @@ sub_80E45F8: @ 80E45F8
sub_80E460C: @ 80E460C
push {lr}
ldr r0, =sub_80E465C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -113756,7 +113756,7 @@ sub_80E4630: @ 80E4630
lsls r4, 24
lsrs r4, 24
ldr r0, =sub_80E465C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -114192,10 +114192,10 @@ sub_80E498C: @ 80E498C
.pool
thumb_func_end sub_80E498C
- thumb_func_start nullsub_43
-nullsub_43: @ 80E49B8
+ thumb_func_start TaskDummy3
+TaskDummy3: @ 80E49B8
bx lr
- thumb_func_end nullsub_43
+ thumb_func_end TaskDummy3
thumb_func_start sub_80E49BC
sub_80E49BC: @ 80E49BC
@@ -114873,7 +114873,7 @@ sub_80E4EF0: @ 80E4EF0
thumb_func_start sub_80E4F58
sub_80E4F58: @ 80E4F58
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -118816,7 +118816,7 @@ sub_80E6D54: @ 80E6D54
adds r1, r4, 0
bl sub_81659DC
adds r0, r4, 0
- bl nullsub_44
+ bl TaskDummy4
bl link_get_multiplayer_id
lsls r0, 24
cmp r0, 0
@@ -119198,13 +119198,13 @@ _080E71A0:
strh r0, [r5]
ldr r0, =sub_80E7324
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldr r0, =sub_80E7128
movs r1, 0x51
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1E]
@@ -119227,13 +119227,13 @@ _080E7218:
bl FlagSet
bl sub_80FB074
ldrb r0, [r5, 0x1E]
- bl remove_task
+ bl DestroyTask
b _080E730A
.pool
_080E724C:
ldr r0, =sub_80E7FF8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
@@ -119305,13 +119305,13 @@ _080E72C0:
beq _080E72F8
ldr r0, =sub_80AF2B4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
_080E72F8:
movs r0, 0
movs r1, 0x1
bl sub_8197434
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080E730A:
pop {r4,r5}
@@ -119525,7 +119525,7 @@ _080E7490:
bl sub_80E7808
ldr r0, =sub_80E7630
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -119552,7 +119552,7 @@ _080E7504:
bl sub_80E7808
ldr r0, =sub_80E7630
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -119821,7 +119821,7 @@ _080E773E:
cmp r4, r0
bne _080E7752
ldr r0, [sp]
- bl remove_task
+ bl DestroyTask
_080E7752:
add sp, 0xC
pop {r3-r5}
@@ -119854,7 +119854,7 @@ sub_80E776C: @ 80E776C
cmp r0, 0
bne _080E7794
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_080E7794:
pop {r4}
pop {r0}
@@ -121008,7 +121008,7 @@ _080E8090:
cmp r0, 0
bne _080E810A
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080E810A
.pool
_080E80A4:
@@ -121019,12 +121019,12 @@ _080E80A4:
bne _080E810A
ldr r0, =sub_8153688
movs r1, 0x5
- bl AddTask
+ bl CreateTask
b _080E80F2
.pool
_080E80C0:
ldr r0, =sub_8153688
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080E810A
@@ -121055,7 +121055,7 @@ _080E80FA:
cmp r0, 0
beq _080E810A
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080E810A:
pop {r4,r5}
pop {r0}
@@ -122311,10 +122311,10 @@ _080E8AAE:
bx r0
thumb_func_end sub_80E8A54
- thumb_func_start nullsub_44
-nullsub_44: @ 80E8ABC
+ thumb_func_start TaskDummy4
+TaskDummy4: @ 80E8ABC
bx lr
- thumb_func_end nullsub_44
+ thumb_func_end TaskDummy4
thumb_func_start sub_80E8AC0
sub_80E8AC0: @ 80E8AC0
@@ -123030,7 +123030,7 @@ _080E9030:
ldr r0, =c2_load_new_map
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080E904A:
pop {r4}
pop {r0}
@@ -123043,7 +123043,7 @@ sub_80E9068: @ 80E9068
push {lr}
ldr r0, =sub_80E8FD0
movs r1, 0
- bl AddTask
+ bl CreateTask
movs r0, 0x1
movs r1, 0
bl fade_screen
@@ -123105,7 +123105,7 @@ sub_80E90C8: @ 80E90C8
bne _080E90F8
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080E90F8:
pop {r4}
pop {r0}
@@ -123151,7 +123151,7 @@ sub_80E9108: @ 80E9108
bl pal_fill_black
ldr r0, =sub_80E90C8
movs r1, 0
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -123207,7 +123207,7 @@ sub_80E916C: @ 80E916C
ldr r0, =c2_load_new_map
bl SetMainCallback2
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080E91D4:
add sp, 0x4
pop {r4-r6}
@@ -123221,7 +123221,7 @@ sub_80E91F8: @ 80E91F8
push {lr}
ldr r0, =sub_80E916C
movs r1, 0
- bl AddTask
+ bl CreateTask
movs r0, 0x1
movs r1, 0
bl fade_screen
@@ -123831,7 +123831,7 @@ _080E96F4:
bl SetMainCallback2
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080E9714:
pop {r4,r5}
pop {r0}
@@ -123844,7 +123844,7 @@ sub_80E9728: @ 80E9728
push {lr}
ldr r0, =sub_80E96A4
movs r1, 0
- bl AddTask
+ bl CreateTask
movs r0, 0x1
movs r1, 0
bl fade_screen
@@ -124479,7 +124479,7 @@ sub_80E9C74: @ 80E9C74
push {lr}
ldr r0, =sub_8126AD8
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -124490,7 +124490,7 @@ sub_80E9C88: @ 80E9C88
push {lr}
ldr r0, =sub_80E9C9C
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -125116,7 +125116,7 @@ _080EA1F4:
bl script_env_1_execute_new_script
_080EA1FA:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -129211,7 +129211,7 @@ _080EC708:
bl sub_80ED610
b _080EC724
_080EC70E:
- bl nullsub_45
+ bl TaskDummy5
b _080EC724
_080EC714:
bl sub_80ECF5C
@@ -130979,10 +130979,10 @@ _080ED706:
bx r0
thumb_func_end sub_80ED610
- thumb_func_start nullsub_45
-nullsub_45: @ 80ED714
+ thumb_func_start TaskDummy5
+TaskDummy5: @ 80ED714
bx lr
- thumb_func_end nullsub_45
+ thumb_func_end TaskDummy5
thumb_func_start sub_80ED718
sub_80ED718: @ 80ED718
@@ -145479,7 +145479,7 @@ sub_80F5B00: @ 80F5B00
bl dp12_8087EA4
bl sub_80A1A74
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
bl sub_80F591C
bl sub_80F6A9C
@@ -145513,7 +145513,7 @@ sub_80F5B00: @ 80F5B00
strb r0, [r5, 0x8]
ldr r0, =sub_80F5CE4
movs r1, 0x5
- bl AddTask
+ bl CreateTask
ldr r1, [r4]
ldr r1, [r1]
strb r0, [r1, 0x2]
@@ -145528,7 +145528,7 @@ sub_80F5B00: @ 80F5B00
strh r0, [r1]
ldr r0, =sub_80F68B4
movs r1, 0x14
- bl AddTask
+ bl CreateTask
bl sub_80F7880
ldr r0, =0x02039f2a
ldrb r1, [r0]
@@ -145560,7 +145560,7 @@ sub_80F5C00: @ 80F5C00
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
movs r0, 0x1
bl CopyBgTilemapBufferToVram
@@ -145840,13 +145840,13 @@ sub_80F5ED8: @ 80F5ED8
beq _080F5EFC
ldr r0, =sub_80F5F14
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, =nullsub_4
+ ldr r1, =TaskDummy
str r1, [r0]
_080F5EFC:
pop {r4}
@@ -145862,7 +145862,7 @@ sub_80F5F14: @ 80F5F14
lsrs r0, 24
ldr r1, =sub_80FC998
ldr r2, =sub_80F5F30
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
@@ -145878,7 +145878,7 @@ sub_80F5F30: @ 80F5F30
cmp r0, 0
beq _080F5F60
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r2, =0x03005e00
ldr r0, =0x0203a034
ldr r0, [r0]
@@ -145915,7 +145915,7 @@ sub_80F5F74: @ 80F5F74
bne _080F5FC4
ldr r0, =sub_80F68F0
movs r1, 0x14
- bl AddTask
+ bl CreateTask
ldr r0, =gUnknown_085ED1B8
ldr r1, =0x0203a034
ldr r1, [r1]
@@ -146285,7 +146285,7 @@ _080F6292:
_080F6298:
ldr r0, =sub_80F73DC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -146328,7 +146328,7 @@ _080F62F2:
strh r0, [r4, 0xA]
ldr r0, =sub_80F74BC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -146588,7 +146588,7 @@ _080F64F2:
bl LoadCompressedObjectPalette
ldr r0, =sub_80F7670
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r0, =0x03005e00
mov r4, r10
adds r1, r4, r7
@@ -146930,7 +146930,7 @@ sub_80F6820: @ 80F6820
ldr r0, [r0]
ldr r0, [r0]
ldrb r0, [r0, 0x3]
- bl remove_task
+ bl DestroyTask
ldr r0, =0x0000ffff
b _080F686E
.pool
@@ -146955,7 +146955,7 @@ _080F6884:
movs r1, 0
bl SetGpuReg
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl FreeAllWindowBuffers
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
@@ -148433,7 +148433,7 @@ _080F741C:
adds r0, 0x1
strb r0, [r1, 0x5]
mov r0, r8
- bl remove_task
+ bl DestroyTask
movs r0, 0x18
bl audio_play
_080F74A4:
@@ -148766,7 +148766,7 @@ _080F7732:
cmp r0, 0
beq _080F7744
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_080F7744:
pop {r3}
mov r8, r3
@@ -148851,7 +148851,7 @@ sub_80F77E0: @ 80F77E0
lsrs r5, 24
ldr r0, =sub_80F7824
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -149224,7 +149224,7 @@ _080F7AAC:
bl FillBgTilemapBufferRect_Palette0
ldr r0, =sub_80F7CA8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
mov r0, r10
@@ -149318,7 +149318,7 @@ _080F7B7C:
bl FillBgTilemapBufferRect_Palette0
ldr r0, =sub_80F7CA8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =0x0203a034
@@ -149600,7 +149600,7 @@ _080F7DCA:
subs r0, 0x1
strb r0, [r1, 0x14]
mov r0, r8
- bl remove_task
+ bl DestroyTask
_080F7DDC:
add sp, 0x8
pop {r3,r4}
@@ -150315,7 +150315,7 @@ sub_80F83E0: @ 80F83E0
cmp r0, 0
bne _080F83FE
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_80F83D0
bl SetMainCallback2
_080F83FE:
@@ -150331,7 +150331,7 @@ sub_80F840C: @ 80F840C
bl script_env_2_enable
ldr r0, =sub_80F83E0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -150371,7 +150371,7 @@ sub_80F8458: @ 80F8458
cmp r0, 0
bne _080F8476
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_80F5B00
bl SetMainCallback2
_080F8476:
@@ -150387,7 +150387,7 @@ sub_80F8484: @ 80F8484
bl script_env_2_enable
ldr r0, =sub_80F8458
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -150421,14 +150421,14 @@ sub_80F84C4: @ 80F84C4
ldr r6, =sub_80FC580
adds r0, r6, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, =sub_80F8508
adds r0, r4, 0
adds r1, r6, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -150458,7 +150458,7 @@ sub_80F8508: @ 80F8508
ldr r1, =sub_80FC6BC
ldr r2, =sub_80F8568
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
b _080F8556
.pool
_080F8540:
@@ -150486,7 +150486,7 @@ sub_80F8568: @ 80F8568
lsrs r0, 24
ldr r1, =sub_80FC804
ldr r2, =sub_80F8584
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
@@ -150499,7 +150499,7 @@ sub_80F8584: @ 80F8584
lsrs r0, 24
ldr r1, =sub_80FCE48
ldr r2, =sub_80F85A0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
@@ -150512,7 +150512,7 @@ sub_80F85A0: @ 80F85A0
lsrs r0, 24
ldr r1, =sub_80FC894
ldr r2, =sub_80F85BC
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
@@ -150626,7 +150626,7 @@ _080F8678:
ldr r1, =sub_80FCF40
ldr r2, =sub_80F86B8
adds r0, r6, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
add sp, 0x8
pop {r3,r4}
mov r8, r3
@@ -150648,7 +150648,7 @@ sub_80F86B8: @ 80F86B8
ldr r1, =sub_80FCFD0
ldr r2, =sub_80F8714
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r4}
pop {r0}
bx r0
@@ -150720,7 +150720,7 @@ _080F874C:
cmp r4, 0
bge _080F874C
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x03005d8c
ldr r0, [r0]
movs r1, 0x4
@@ -150770,7 +150770,7 @@ sub_80F87B4: @ 80F87B4
cmp r0, 0
bne _080F87D0
adds r0, r1, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
_080F87D0:
@@ -151437,7 +151437,7 @@ sub_80F8D28: @ 80F8D28
push {r5-r7}
ldr r7, =sub_80F8EE8
adds r0, r7, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -151465,7 +151465,7 @@ _080F8D44:
mov r8, r1
adds r0, r7, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =0x03005e00
@@ -151603,7 +151603,7 @@ _080F8E9C:
sub_80F8EB8: @ 80F8EB8
push {lr}
ldr r0, =sub_80F8EE8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -151702,7 +151702,7 @@ _080F8F84:
ldrb r0, [r0, 0x12]
bl sub_80E2A78
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080F8F98:
pop {r4,r5}
pop {r0}
@@ -151808,7 +151808,7 @@ sub_80F905C: @ 80F905C
_080F9074:
ldr r0, =sub_80F9088
movs r1, 0x5
- bl AddTask
+ bl CreateTask
movs r0, 0x1
_080F907E:
pop {r1}
@@ -151839,7 +151839,7 @@ sub_80F9088: @ 80F9088
bne _080F90D4
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080F90D4
.pool
_080F90C0:
@@ -152662,7 +152662,7 @@ _080F9714:
_080F9718:
bl script_env_2_enable_and_set_ctx_running
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080F9722:
pop {r4-r6}
pop {r0}
@@ -152675,7 +152675,7 @@ sub_80F972C: @ 80F972C
push {lr}
ldr r0, =sub_80F9654
movs r1, 0x50
- bl AddTask
+ bl CreateTask
bl script_env_2_set_ctx_paused
pop {r0}
bx r0
@@ -153282,7 +153282,7 @@ sub_80F9BF4: @ 80F9BF4
sub_80F9C1C: @ 80F9C1C
push {lr}
ldr r0, =sub_80F9C90
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -153294,7 +153294,7 @@ sub_80F9C1C: @ 80F9C1C
sub_80F9C30: @ 80F9C30
push {lr}
ldr r0, =sub_80F9DFC
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -153311,7 +153311,7 @@ sub_80F9C44: @ 80F9C44
lsls r3, 24
lsrs r3, 24
adds r1, r3, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -153508,7 +153508,7 @@ _080F9DDE:
movs r0, 0x50
bl SetGpuReg
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080F9DF4
_080F9DEE:
ldrh r0, [r4, 0x8]
@@ -153681,7 +153681,7 @@ _080F9F2C:
movs r1, 0
bl SetGpuReg
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080F9F54
_080F9F4E:
ldrh r0, [r4, 0x8]
@@ -154322,7 +154322,7 @@ sub_80FA458: @ 80FA458
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r0, =sub_80FA4A0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -154426,7 +154426,7 @@ _080FA540:
bl FieldEffectActiveListRemove
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080FA574
_080FA56E:
ldrh r0, [r4, 0x4]
@@ -154500,7 +154500,7 @@ sub_80FA5E4: @ 80FA5E4
lsrs r6, 16
ldr r0, =sub_80FA62C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -154576,7 +154576,7 @@ _080FA66C:
cmp r0, 0x3
bne _080FA6A0
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080FA6A4
_080FA6A0:
adds r0, r1, 0x1
@@ -154701,7 +154701,7 @@ sub_80FA754: @ 80FA754
ldrsh r1, [r1, r3]
bl sub_80FA704
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080FA78C
.pool
_080FA788:
@@ -154738,7 +154738,7 @@ _080FA7BC:
bne _080FA7DE
ldr r0, =sub_80FA754
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -154885,7 +154885,7 @@ _080FA958:
bl audio_play
_080FA95E:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080FA96A
_080FA966:
adds r0, r2, 0x1
@@ -154904,7 +154904,7 @@ sub_80FA970: @ 80FA970
lsrs r4, 16
ldr r0, =sub_80FA7EC
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -155476,7 +155476,7 @@ _080FAE82:
b _080FAE92
_080FAE8A:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _080FAEA2
_080FAE92:
ldrh r0, [r1, 0x2]
@@ -155498,7 +155498,7 @@ overworld_posion_effect: @ 80FAEA8
bl audio_play
ldr r0, =task50_overworld_posion_effect
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -155508,7 +155508,7 @@ overworld_posion_effect: @ 80FAEA8
c3_80A0DD8_is_running: @ 80FAEC0
push {lr}
ldr r0, =task50_overworld_posion_effect
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -155642,7 +155642,7 @@ sub_80FAFD4: @ 80FAFD4
lsrs r0, 24
bl SetPlayerAvatarTransitionFlags
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r4}
pop {r0}
@@ -155654,7 +155654,7 @@ sub_80FAFF8: @ 80FAFF8
push {lr}
ldr r0, =sub_80FAED4
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -155896,7 +155896,7 @@ _080FB1DC:
cmp r0, 0x13
bne _080FB1F0
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _080FB2A8
.pool
_080FB1F0:
@@ -156024,7 +156024,7 @@ _080FB2F0:
cmp r0, 0x13
bne _080FB304
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
b _080FB358
.pool
_080FB304:
@@ -156122,7 +156122,7 @@ _080FB3C0:
strh r0, [r4, 0x2]
ldr r0, =sub_80FB0F8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x4]
@@ -156165,10 +156165,10 @@ _080FB404:
ble _080FB4D8
strh r2, [r4, 0x2]
ldrb r0, [r4, 0x4]
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_80FB1AC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x6]
@@ -156237,7 +156237,7 @@ _080FB492:
movs r0, 0x34
bl audio_play
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
_080FB4D8:
pop {r4,r5}
@@ -156271,7 +156271,7 @@ sub_80FB4E0: @ 80FB4E0
bl CpuFastSet
ldr r0, =sub_80FB36C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r0}
bx r0
@@ -156283,7 +156283,7 @@ sub_80FB540: @ 80FB540
push {r4-r6,lr}
sub sp, 0x4
ldr r0, =sub_80FB36C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -156480,7 +156480,7 @@ _080FB6C4:
bl copy_saved_warp2_bank_and_enter_x_to_warp1
bl sp13E_warp_to_last_warp
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080FB6E2:
pop {r4-r7}
pop {r0}
@@ -156561,7 +156561,7 @@ sub_80FB768: @ 80FB768
bl pal_fill_black
ldr r0, =sub_80FB5E8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
pop {r0}
bx r0
@@ -158439,7 +158439,7 @@ _080FC63A:
strb r1, [r0]
_080FC64A:
adds r0, r7, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080FC650:
pop {r4-r7}
pop {r0}
@@ -158625,7 +158625,7 @@ _080FC7DC:
strh r0, [r1, 0x1E]
strh r0, [r1, 0x20]
adds r0, r7, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080FC7F4:
pop {r3}
mov r8, r3
@@ -158654,7 +158654,7 @@ sub_80FC804: @ 80FC804
movs r0, 0
strh r0, [r5, 0x8]
adds r0, r2, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080FC880
.pool
_080FC830:
@@ -158815,7 +158815,7 @@ _080FC96E:
strh r0, [r1, 0x1E]
strh r0, [r1, 0x20]
adds r0, r6, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080FC986:
pop {r3,r4}
mov r8, r3
@@ -158845,7 +158845,7 @@ sub_80FC998: @ 80FC998
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r2, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080FC9F0
.pool
_080FC9C4:
@@ -158899,7 +158899,7 @@ sub_80FC9F8: @ 80FC9F8
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080FCAB2
.pool
_080FCA30:
@@ -159154,7 +159154,7 @@ _080FCC78:
movs r0, 0
strh r0, [r2, 0x8]
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080FCC82:
pop {r4}
pop {r0}
@@ -159347,7 +159347,7 @@ _080FCE38:
movs r0, 0
strh r0, [r2, 0x8]
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080FCE42:
pop {r4}
pop {r0}
@@ -159466,7 +159466,7 @@ _080FCF16:
strh r0, [r1, 0x1E]
strh r0, [r1, 0x20]
adds r0, r6, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080FCF2E:
pop {r3,r4}
mov r8, r3
@@ -159504,7 +159504,7 @@ sub_80FCF40: @ 80FCF40
strh r0, [r4, 0x8]
strh r0, [r4, 0x20]
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080FCFBE
.pool
_080FCF80:
@@ -159570,7 +159570,7 @@ sub_80FCFD0: @ 80FCFD0
strh r0, [r4, 0x8]
strh r0, [r4, 0x20]
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080FD04E
.pool
_080FD010:
@@ -159706,7 +159706,7 @@ MapPostLoadHook_UseItem: @ 80FD124
bl pal_fill_black
ldr r0, =Task_CallItemUseOnFieldCallback
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -159820,7 +159820,7 @@ CleanUpAfterFailingToUseRegisteredKeyItemOnField: @ 80FD1F8
movs r1, 0x1
bl sub_8197434
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_80984F4
bl script_env_2_disable
pop {r4}
@@ -160002,7 +160002,7 @@ _080FD37E:
bl sub_80984F4
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -160126,7 +160126,7 @@ ItemUseOnFieldCB_Rod: @ 80FD468
lsrs r0, 24
bl StartFishing
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -160293,7 +160293,7 @@ sub_80FD5CC: @ 80FD5CC
bl sub_80984F4
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -161123,7 +161123,7 @@ sub_80FDC00: @ 80FDC00
movs r0, 0
bl sub_81357FC
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080FDC24:
pop {r4}
pop {r0}
@@ -161273,7 +161273,7 @@ sub_80FDD74: @ 80FDD74
ldr r0, =gUnknown_08274482
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -161335,7 +161335,7 @@ sub_80FDE08: @ 80FDE08
ldr r0, =gUnknown_082744C0
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -161394,7 +161394,7 @@ sub_80FDE7C: @ 80FDE7C
ldr r0, =gUnknown_08242CFC
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -161858,7 +161858,7 @@ task08_080A1C44: @ 80FE2BC
bl player_avatar_init_params_reset
bl sub_80B7CC8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -180592,7 +180592,7 @@ _08107A32:
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -181313,7 +181313,7 @@ _0810800C:
bne _08108022
bl remove_some_task
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_08108022:
add sp, 0xC
pop {r4-r7}
@@ -182122,7 +182122,7 @@ _0810866A:
ldr r6, =sub_81152DC
adds r0, r6, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -182143,7 +182143,7 @@ _081086B4:
strh r0, [r5]
adds r0, r6, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -199523,7 +199523,7 @@ sub_811131C: @ 811131C
cmp r0, 0
beq _0811134E
ldr r0, =sub_81110A4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -207681,7 +207681,7 @@ _0811564A:
_0811565A:
ldr r0, =sub_81156D0
ldrb r1, [r6, 0x2]
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -207748,7 +207748,7 @@ sub_81156D0: @ 81156D0
ldr r0, =0x02022e22
strh r1, [r0]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
b _0811571C
.pool
_08115710:
@@ -211535,7 +211535,7 @@ sub_8117660: @ 8117660
bl sub_80A6DAC
ldr r0, =sub_81176D8
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =0x0203841e
@@ -211629,7 +211629,7 @@ sub_81176D8: @ 81176D8
movs r0, 0x1
bl sub_80A6DAC
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0811773E:
pop {r4-r7}
pop {r0}
@@ -212676,7 +212676,7 @@ sub_8117FD0: @ 8117FD0
orrs r0, r1
strb r0, [r3]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08118014:
pop {r4}
pop {r0}
@@ -212948,7 +212948,7 @@ _08118250:
ldr r0, [r0]
_08118258:
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =0x03005e00
@@ -212975,7 +212975,7 @@ sub_811828C: @ 811828C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r0, =0x02022e18
movs r1, 0
strh r1, [r0]
@@ -216916,10 +216916,10 @@ sub_811A20C: @ 811A20C
lsrs r6, 24
lsls r5, 24
lsrs r5, 24
- bl clear_tasks
+ bl ResetTasks
ldr r0, =sub_811A2C0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -216933,11 +216933,11 @@ sub_811A20C: @ 811A20C
adds r0, r4, 0
movs r1, 0x2
mov r2, r8
- bl set_word_task_arg
+ bl SetWordTaskArg
adds r0, r4, 0
movs r1, 0x4
mov r2, r9
- bl set_word_task_arg
+ bl SetWordTaskArg
ldr r0, =sub_811A278
bl SetMainCallback2
pop {r3,r4}
@@ -216952,7 +216952,7 @@ sub_811A20C: @ 811A20C
thumb_func_start sub_811A278
sub_811A278: @ 811A278
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -217136,7 +217136,7 @@ _0811A3EC:
bne _0811A41C
adds r0, r2, 0
movs r1, 0x4
- bl get_word_task_arg
+ bl GetWordTaskArg
bl sub_811A4D0
b _0811A41C
.pool
@@ -217200,7 +217200,7 @@ _0811A482:
ldrb r4, [r6, 0x2]
adds r0, r5, 0
movs r1, 0x2
- bl get_word_task_arg
+ bl GetWordTaskArg
adds r1, r0, 0
ldrb r2, [r6, 0xE]
adds r0, r4, 0
@@ -217214,7 +217214,7 @@ _0811A49C:
bne _0811A4C0
adds r0, r5, 0
movs r1, 0x4
- bl get_word_task_arg
+ bl GetWordTaskArg
bl sub_811A4D0
b _0811A4C0
_0811A4B0:
@@ -217637,7 +217637,7 @@ sub_811A8A4: @ 811A8A4
lsrs r0, 16
bl sub_811A868
adds r4, r0, 0
- bl clear_tasks
+ bl ResetTasks
ldr r0, =gUnknown_08597530
lsls r4, 3
adds r0, 0x4
@@ -228597,7 +228597,7 @@ sub_811FC80: @ 811FC80
str r7, [r4, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [r4, 0x10]
- ldr r0, =nullsub_47
+ ldr r0, =TaskDummy7
str r0, [r4, 0x14]
mov r0, sp
bl LoadObjectPics
@@ -228836,10 +228836,10 @@ _0811FF28:
.pool
thumb_func_end sub_811FC80
- thumb_func_start nullsub_47
-nullsub_47: @ 811FF3C
+ thumb_func_start TaskDummy7
+TaskDummy7: @ 811FF3C
bx lr
- thumb_func_end nullsub_47
+ thumb_func_end TaskDummy7
thumb_func_start sub_811FF40
sub_811FF40: @ 811FF40
@@ -228959,7 +228959,7 @@ sub_811FFD4: @ 811FFD4
str r2, [sp, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [sp, 0x10]
- ldr r0, =nullsub_47
+ ldr r0, =TaskDummy7
str r0, [sp, 0x14]
lsls r3, 23
lsrs r3, 16
@@ -229770,7 +229770,7 @@ sub_81206C0: @ 81206C0
lsrs r4, 24
ldr r0, =sub_8120944
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -230243,7 +230243,7 @@ _08120A7E:
bl sub_82E0308
bl script_env_2_enable_and_set_ctx_running
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
b _08120B50
.pool
_08120AB0:
@@ -231407,7 +231407,7 @@ _08121364:
ldrb r0, [r0]
bl sub_80E2A78
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_08121376:
pop {r4-r6}
@@ -231421,7 +231421,7 @@ sub_8121388: @ 8121388
push {lr}
ldr r0, =sub_81212FC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -231745,7 +231745,7 @@ _08121688:
bl sub_80A1A74
b _081219D4
_0812168E:
- bl clear_tasks
+ bl ResetTasks
b _081219D4
_08121694:
bl ResetAllObjectData
@@ -237128,10 +237128,10 @@ _081240C6:
.pool
thumb_func_end sub_8124088
- thumb_func_start nullsub_48
-nullsub_48: @ 81240D0
+ thumb_func_start TaskDummy8
+TaskDummy8: @ 81240D0
bx lr
- thumb_func_end nullsub_48
+ thumb_func_end TaskDummy8
thumb_func_start sub_81240D4
sub_81240D4: @ 81240D4
@@ -237203,7 +237203,7 @@ _08124158:
lsls r1, 3
orrs r0, r1
str r0, [r2, 0x4]
- ldr r0, =nullsub_48
+ ldr r0, =TaskDummy8
_0812416E:
str r0, [sp, 0x14]
adds r0, r2, 0
@@ -242634,7 +242634,7 @@ sub_8126D6C: @ 8126D6C
ldr r0, =gUnknown_0823B4E8
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _08126D9E
.pool
_08126D98:
@@ -246326,7 +246326,7 @@ _08128C30:
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08128C4C:
pop {r4,r5}
pop {r0}
@@ -246400,7 +246400,7 @@ sub_8128CD4: @ 8128CD4
bl pal_fill_black
ldr r0, =sub_8128C64
movs r1, 0x8
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -249084,7 +249084,7 @@ _0812A29C:
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0812A2B2:
pop {r4,r5}
pop {r0}
@@ -249161,7 +249161,7 @@ sub_812A334: @ 812A334
bl sub_8126ABC
ldr r0, =sub_812A2C4
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -249376,7 +249376,7 @@ _0812A518:
ldr r0, =sub_812A588
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0812A530:
add sp, 0x4
pop {r4,r5}
@@ -249401,7 +249401,7 @@ sub_812A540: @ 812A540
bl sub_812A6D4
ldr r0, =sub_812A4DC
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -249520,7 +249520,7 @@ _0812A666:
thumb_func_start sub_812A670
sub_812A670: @ 812A670
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -249568,9 +249568,9 @@ sub_812A6D4: @ 812A6D4
adds r5, r1, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, =nullsub_49
+ ldr r0, =TaskDummy9
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -249592,8 +249592,8 @@ sub_812A6D4: @ 812A6D4
thumb_func_start sub_812A710
sub_812A710: @ 812A710
push {lr}
- ldr r0, =nullsub_49
- bl get_task_id_by_function
+ ldr r0, =TaskDummy9
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 2
@@ -249615,10 +249615,10 @@ sub_812A710: @ 812A710
.pool
thumb_func_end sub_812A710
- thumb_func_start nullsub_49
-nullsub_49: @ 812A74C
+ thumb_func_start TaskDummy9
+TaskDummy9: @ 812A74C
bx lr
- thumb_func_end nullsub_49
+ thumb_func_end TaskDummy9
thumb_func_start sub_812A750
sub_812A750: @ 812A750
@@ -249904,7 +249904,7 @@ sub_812A9AC: @ 812A9AC
movs r0, 0x80
strb r0, [r1]
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
pop {r0}
bx r0
.pool
@@ -250004,7 +250004,7 @@ sub_812AAA8: @ 812AAA8
ldr r4, =sub_812AAC8
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -251994,7 +251994,7 @@ sub_812BABC: @ 812BABC
ldr r4, =sub_812BAFC
adds r0, r4, 0
movs r1, 0x4
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -252008,7 +252008,7 @@ sub_812BABC: @ 812BABC
sub_812BADC: @ 812BADC
push {lr}
ldr r0, =sub_812BAFC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -252180,10 +252180,10 @@ sub_812BC20: @ 812BC20
cmp r0, 0
beq _0812BC3A
ldr r0, =sub_812BAFC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0812BC3A:
movs r0, 0
pop {r1}
@@ -252473,7 +252473,7 @@ sub_812BE5C: @ 812BE5C
_0812BE64:
adds r0, r5, 0
movs r1, 0x2
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -254465,7 +254465,7 @@ sub_812CD40: @ 812CD40
ldr r5, =sub_812CD74
adds r0, r5, 0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -254572,7 +254572,7 @@ sub_812CDF4: @ 812CDF4
movs r3, 0x52
bl sub_812FA78
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -254927,7 +254927,7 @@ sub_812D0B0: @ 812D0B0
ldr r4, =sub_812D128
adds r0, r4, 0
movs r1, 0x6
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -254948,7 +254948,7 @@ sub_812D0B0: @ 812D0B0
sub_812D0E0: @ 812D0E0
push {lr}
ldr r0, =sub_812D128
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
@@ -254965,7 +254965,7 @@ sub_812D0E0: @ 812D0E0
.pool
_0812D10C:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =gUnknown_085A84AC
ldr r0, [r0]
movs r1, 0x10
@@ -255032,7 +255032,7 @@ sub_812D188: @ 812D188
push {lr}
ldr r0, =sub_812D230
movs r1, 0x8
- bl AddTask
+ bl CreateTask
ldr r1, =0x0203ab34
ldr r1, [r1]
adds r1, 0x3E
@@ -255446,7 +255446,7 @@ sub_812D4AC: @ 812D4AC
ldr r4, =sub_812D4EC
adds r0, r4, 0
movs r1, 0x7
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -255460,7 +255460,7 @@ sub_812D4AC: @ 812D4AC
sub_812D4CC: @ 812D4CC
push {lr}
ldr r0, =sub_812D4EC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -256088,10 +256088,10 @@ sub_812D9A4: @ 812D9A4
cmp r0, 0
bne _0812DA04
ldr r0, =sub_812D4EC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _0812DA1A
.pool
_0812DA04:
@@ -256160,10 +256160,10 @@ sub_812DA6C: @ 812DA6C
cmp r0, 0
beq _0812DA86
ldr r0, =sub_812D4EC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0812DA86:
pop {r0}
bx r0
@@ -256328,10 +256328,10 @@ sub_812DBBC: @ 812DBBC
bl sub_812E8C4
bl sub_812ED8C
ldr r0, =sub_812D4EC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.pool
@@ -256410,7 +256410,7 @@ sub_812DC80: @ 812DC80
ldr r5, =sub_812DCD4
adds r0, r5, 0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -256430,7 +256430,7 @@ sub_812DC80: @ 812DC80
sub_812DCB4: @ 812DCB4
push {lr}
ldr r0, =sub_812DCD4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -256664,10 +256664,10 @@ sub_812DE48: @ 812DE48
sub_812DE7C: @ 812DE7C
push {lr}
ldr r0, =sub_812DCD4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.pool
@@ -256678,7 +256678,7 @@ sub_812DE94: @ 812DE94
push {lr}
ldr r0, =sub_812E0B0
movs r1, 0x3
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r1, r0, 24
ldr r0, =0x0203ab34
@@ -268186,7 +268186,7 @@ _08133C18:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r4,r5}
pop {r0}
@@ -268352,7 +268352,7 @@ sub_8133D8C: @ 8133D8C
push {lr}
ldr r0, =sub_8127208
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -268397,7 +268397,7 @@ _08133DFC:
strh r0, [r1]
_08133E04:
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r4-r6}
pop {r0}
@@ -268413,7 +268413,7 @@ sub_8133E1C: @ 8133E1C
ldr r2, =0x020375e4
movs r1, 0
strh r1, [r2]
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r0}
bx r0
@@ -268476,7 +268476,7 @@ sub_8133EC0: @ 8133EC0
push {lr}
ldr r0, =sub_8133C48
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl sub_8133A78
@@ -268626,7 +268626,7 @@ set_256color_bg_bg0: @ 8133F0C
bl sub_809882C
bl clear_scheduled_bg_copies_to_vram
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_80A1A74
bl ResetObjectPaletteAllocator
@@ -268692,7 +268692,7 @@ set_256color_bg_bg0: @ 8133F0C
bl ShowBg
ldr r0, =sub_81341FC
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -268780,7 +268780,7 @@ set_256color_bg_bg0: @ 8133F0C
thumb_func_start sub_81341E0
sub_81341E0: @ 81341E0
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -269634,7 +269634,7 @@ _08134906:
bl sub_809882C
bl clear_scheduled_bg_copies_to_vram
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_80A1A74
bl ResetObjectPaletteAllocator
@@ -269707,7 +269707,7 @@ Cb2_StartWallClock: @ 81349F4
bl LZ77UnCompVram
ldr r0, =sub_8134CB8
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -269848,7 +269848,7 @@ Cb2_ViewWallClock: @ 8134B44
bl LZ77UnCompVram
ldr r0, =sub_8134F10
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
adds r0, r7, 0
@@ -269984,7 +269984,7 @@ _08134BA4:
thumb_func_start sub_8134C9C
sub_8134C9C: @ 8134C9C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -271017,7 +271017,7 @@ oei_task_add: @ 8135478
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r0, =task08_080C9820
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -271212,7 +271212,7 @@ sub_813561C: @ 813561C
movs r0, 0
strb r0, [r1, 0x6]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -271396,7 +271396,7 @@ sub_81357BC: @ 81357BC
_081357D6:
ldr r0, =task08_080A1C44
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -271533,7 +271533,7 @@ sub_8135908: @ 8135908
thumb_func_start sub_813591C
sub_813591C: @ 813591C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -271657,7 +271657,7 @@ _08135A36:
bne _08135A46
b _08135B9E
_08135A46:
- bl clear_tasks
+ bl ResetTasks
b _08135B9E
.pool
_08135A54:
@@ -271741,7 +271741,7 @@ _08135B14:
_08135B1A:
ldr r0, =sub_81365C8
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -272980,7 +272980,7 @@ _081365AC:
ldr r0, [r0]
bl Free
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081365BE:
pop {r4-r6}
pop {r0}
@@ -274381,7 +274381,7 @@ sub_81371B4: @ 81371B4
thumb_func_start sub_81371D4
sub_81371D4: @ 81371D4
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -274466,7 +274466,7 @@ c2_change_map: @ 8137200
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl sub_80A1A74
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
ldr r3, =0x04000208
ldrh r2, [r3]
@@ -274635,7 +274635,7 @@ sub_81373F0: @ 81373F0
push {lr}
ldr r0, =sub_8137404
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -274829,7 +274829,7 @@ sub_81375A8: @ 81375A8
push {lr}
ldr r0, =sub_81375BC
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -275319,7 +275319,7 @@ sub_81379D8: @ 81379D8
beq _081379F2
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081379F2:
pop {r4}
pop {r0}
@@ -275331,7 +275331,7 @@ sub_81379F8: @ 81379F8
push {lr}
ldr r0, =sub_81379D8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -275640,7 +275640,7 @@ mapldr_080CA5C0: @ 8137C5C
bl pal_fade_maybe
ldr r0, =sub_8137C94
movs r1, 0xA
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r0}
bx r0
@@ -275659,7 +275659,7 @@ sub_8137C94: @ 8137C94
cmp r0, 0
bne _08137CAC
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_08137CAC:
pop {r0}
bx r0
@@ -277118,7 +277118,7 @@ sub_81388E4: @ 81388E4
bl audio_play
ldr r0, =sub_8138910
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -277155,7 +277155,7 @@ sub_8138910: @ 8138910
cmp r0, 0x5
bne _08138970
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
b _08138970
.pool
@@ -277589,14 +277589,14 @@ sp0D9_ComputerRelated: @ 8138CA4
push {r4,lr}
ldr r4, =sub_8138CE8
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08138CD8
adds r0, r4, 0
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -277696,7 +277696,7 @@ _08138D4C:
cmp r0, 0x5
bne _08138D7C
ldrb r0, [r4, 0xA]
- bl remove_task
+ bl DestroyTask
_08138D7C:
ldrh r0, [r4, 0xE]
adds r0, 0x1
@@ -277871,14 +277871,14 @@ sub_8138EC0: @ 8138EC0
push {r4,lr}
ldr r4, =sub_8138F04
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08138EF4
adds r0, r4, 0
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -277969,7 +277969,7 @@ _08138F7A:
cmp r0, 0x5
bne _08138F9A
ldrb r0, [r4, 0xA]
- bl remove_task
+ bl DestroyTask
_08138F9A:
ldrh r0, [r4, 0xE]
adds r0, 0x1
@@ -278707,7 +278707,7 @@ sub_8139560: @ 8139560
push {lr}
ldr r0, =sub_81395BC
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -278792,7 +278792,7 @@ sub_8139620: @ 8139620
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r0}
bx r0
@@ -279358,7 +279358,7 @@ sub_8139A78: @ 8139A78
push {r4-r6,lr}
ldr r0, =sub_8139AF4
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -279451,7 +279451,7 @@ sub_8139AF4: @ 8139AF4
movs r0, 0x49
bl audio_play
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
bl InstallCameraPanAheadCallback
_08139B54:
@@ -279559,14 +279559,14 @@ sub_8139C2C: @ 8139C2C
lsrs r5, r1, 24
ldr r4, =sub_8139C80
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08139C6C
adds r0, r4, 0
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -279713,7 +279713,7 @@ _08139D62:
cmp r1, r0
bne _08139D7C
ldr r0, [sp]
- bl remove_task
+ bl DestroyTask
_08139D7C:
ldrh r0, [r6, 0x2]
adds r0, 0x1
@@ -280143,7 +280143,7 @@ sub_813A128: @ 813A128
push {r4,lr}
ldr r0, =sub_813A2DC
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 2
@@ -280349,7 +280349,7 @@ _0813A2C6:
movs r0, 0x7F
strh r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0813A2D2:
pop {r4}
pop {r0}
@@ -280540,7 +280540,7 @@ sub_813A46C: @ 813A46C
movs r0, 0x5
bl audio_play
ldr r0, =sub_813A4EC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -280704,7 +280704,7 @@ sub_813A570: @ 813A570
lsrs r0, 24
bl RemoveWindow
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
add sp, 0x4
pop {r4,r5}
@@ -280743,7 +280743,7 @@ _0813A624:
sub_813A630: @ 813A630
push {lr}
ldr r0, =sub_813A600
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -281656,7 +281656,7 @@ sub_813ADD4: @ 813ADD4
push {r6,r7}
sub sp, 0x18
ldr r0, =sub_813A600
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -281819,7 +281819,7 @@ _0813AF38:
sub_813AF48: @ 813AF48
push {r4,r5,lr}
ldr r0, =sub_813A600
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xFF
@@ -281862,7 +281862,7 @@ sub_813AF48: @ 813AF48
lsrs r0, 24
bl RemoveWindow
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0813AFB6:
pop {r4,r5}
pop {r0}
@@ -281875,7 +281875,7 @@ sub_813AFC8: @ 813AFC8
push {lr}
ldr r0, =task_deoxys_sound
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -281942,7 +281942,7 @@ _0813B06A:
bl script_env_2_enable_and_set_ctx_running
_0813B070:
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
b _0813B0A2
.pool
_0813B080:
@@ -281959,7 +281959,7 @@ _0813B080:
movs r0, 0x1
strh r0, [r1]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_0813B0A2:
pop {r3}
mov r8, r3
@@ -282002,7 +282002,7 @@ _0813B0F0:
_0813B0F8:
ldr r0, =sub_813B160
movs r1, 0x8
- bl AddTask
+ bl CreateTask
ldr r3, =0x02038c08
movs r0, 0x1
str r0, [r3]
@@ -282058,7 +282058,7 @@ sub_813B160: @ 813B160
bne _0813B17C
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0813B17C:
pop {r4}
pop {r0}
@@ -282534,7 +282534,7 @@ sub_813B534: @ 813B534
bne _0813B552
ldr r0, =sub_80B3AF8
movs r1, 0x5
- bl AddTask
+ bl CreateTask
_0813B552:
pop {r0}
bx r0
@@ -282546,7 +282546,7 @@ sub_813B568: @ 813B568
push {lr}
ldr r0, =sub_813B57C
movs r1, 0x5
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -282588,7 +282588,7 @@ _0813B5A8:
.4byte _0813B7A8
_0813B5D0:
ldr r0, =sub_80B3AF8
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _0813B5DE
@@ -282799,7 +282799,7 @@ _0813B7B4:
str r1, [r0]
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0813B7C6:
pop {r4,r5}
pop {r0}
@@ -282836,7 +282836,7 @@ sub_813B80C: @ 813B80C
push {lr}
ldr r0, =sub_813B824
movs r1, 0x8
- bl AddTask
+ bl CreateTask
movs r0, 0x9D
bl audio_play
pop {r0}
@@ -282880,7 +282880,7 @@ _0813B858:
cmp r1, r0
bne _0813B86C
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0813B86C:
pop {r4,r5}
pop {r0}
@@ -282893,7 +282893,7 @@ sub_813B880: @ 813B880
push {lr}
ldr r0, =_fwalk
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -282989,7 +282989,7 @@ _0813B8F4:
cmp r0, 0x3
bne _0813B94E
mov r0, r9
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_0813B94E:
pop {r3-r5}
@@ -284592,7 +284592,7 @@ sub_813C664: @ 813C664
bl sub_813C6A8
bl FreeAllWindowBuffers
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0813C694:
pop {r4}
pop {r0}
@@ -284763,7 +284763,7 @@ _0813C6FA:
sub_813C80C: @ 813C80C
push {lr}
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_80A1A74
bl ResetObjectPaletteAllocator
@@ -284865,7 +284865,7 @@ sub_813C8D8: @ 813C8D8
thumb_func_start sub_813C8EC
sub_813C8EC: @ 813C8EC
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -284993,7 +284993,7 @@ _0813CA14:
bl sub_81D5C8C
ldr r0, =sub_813C5BC
movs r1, 0x8
- bl AddTask
+ bl CreateTask
ldr r0, =sub_813C8EC
bl SetMainCallback2
ldr r0, =0x030022c0
@@ -286238,7 +286238,7 @@ sub_813D3D8: @ 813D3D8
strb r1, [r6]
ldr r0, =sub_813D42C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -286518,7 +286518,7 @@ _0813D652:
strb r0, [r1]
bl sub_813D6B4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl sub_81C4EB4
ldr r0, [r4]
bl Free
@@ -286898,7 +286898,7 @@ _0813D9A4:
sub_813D9B0: @ 813D9B0
push {lr}
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_813D9B0
@@ -286952,7 +286952,7 @@ _0813DA00:
ldrb r5, [r6, 0xE]
ldrb r6, [r6, 0x1C]
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
adds r0, r7, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -286980,7 +286980,7 @@ sub_813DA40: @ 813DA40
lsrs r6, 24
ldr r0, =sub_813D9C0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -287082,7 +287082,7 @@ evolution_cutscene: @ 813DA8C
bl sub_8035AA4
bl ResetAllObjectData
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
ldr r0, =0x0300301c
movs r2, 0x4
@@ -287230,7 +287230,7 @@ evolution_cutscene: @ 813DA8C
bl sub_817BE78
ldr r0, =evovle_mon_maybe
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, =0x0203ab80
ldr r2, [r1]
lsls r1, r0, 24
@@ -287809,7 +287809,7 @@ sub_813E1D4: @ 813E1D4
bl sub_817BE78
ldr r0, =sub_813F1B8
movs r1, 0
- bl AddTask
+ bl CreateTask
mov r1, r9
ldr r2, [r1]
lsls r1, r0, 24
@@ -287876,7 +287876,7 @@ sub_813E3A4: @ 813E3A4
bl PrepareSpritesForOamLoad
bl RunTextPrinters
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_813E3A4
@@ -287888,7 +287888,7 @@ sub_813E3C0: @ 813E3C0
bl PrepareSpritesForOamLoad
bl RunTextPrinters
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_813E3C0
@@ -288663,7 +288663,7 @@ _0813EAF6:
bl evovle_mon_internal_maybe
_0813EB06:
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
bl sub_805F094
ldr r4, =0x0203ab80
ldr r0, [r4]
@@ -289823,7 +289823,7 @@ _0813F624:
b _0813FCC4
_0813F634:
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
ldr r4, =0x0203ab80
ldr r0, [r4]
bl Free
@@ -290690,7 +290690,7 @@ _0813FE8C:
cmp r0, 0x4
bne _0813FE9A
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_0813FE9A:
pop {r4-r6}
pop {r0}
@@ -290705,7 +290705,7 @@ sub_813FEA4: @ 813FEA4
lsrs r4, r0, 24
ldr r0, =sub_813FEE8
movs r1, 0x7
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r4, 0
@@ -290801,13 +290801,13 @@ _0813FF2C:
adds r0, 0x10
strh r0, [r6]
ldr r0, =sub_813FDEC
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _0813FFA6
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
mov r0, r8
strh r4, [r0]
mov r1, r9
@@ -290948,7 +290948,7 @@ _081400C4:
_081400DE:
ldr r0, =sub_813FDEC
movs r1, 0x5
- bl AddTask
+ bl CreateTask
adds r0, r5, 0
bl sub_813FEA4
add sp, 0x4
@@ -290962,7 +290962,7 @@ _081400DE:
sub_8140100: @ 8140100
push {lr}
ldr r0, =sub_813FDEC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -290988,20 +290988,20 @@ _0814011E:
sub_8140134: @ 8140134
push {lr}
ldr r0, =sub_813FDEC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _08140148
- bl remove_task
+ bl DestroyTask
_08140148:
ldr r0, =sub_813FEE8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _0814015A
- bl remove_task
+ bl DestroyTask
_0814015A:
movs r0, 0
movs r1, 0xA0
@@ -291105,7 +291105,7 @@ _08140232:
thumb_func_start sub_8140238
sub_8140238: @ 8140238
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
ldr r0, =0x0203ab88
@@ -291540,7 +291540,7 @@ _08140630:
_08140650:
bl sub_80A1A74
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl reset_temp_tile_data_buffers
b _081407F8
_08140662:
@@ -291659,7 +291659,7 @@ _0814077A:
bl sub_80A27B0
ldr r0, =sub_81408A8
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r5, =0x0203ab88
ldr r1, [r5]
adds r1, 0xA4
@@ -291681,7 +291681,7 @@ _0814077A:
bl sub_80EDE84
ldr r0, =sub_8140814
movs r1, 0x1
- bl AddTask
+ bl CreateTask
ldr r1, [r5]
adds r1, 0xA5
strb r0, [r1]
@@ -291894,7 +291894,7 @@ sub_8140994: @ 8140994
ldr r0, [r0]
adds r0, 0xA5
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
adds r0, r4, 0
bl sub_8141DE4
pop {r4}
@@ -294354,7 +294354,7 @@ sub_8141E7C: @ 8141E7C
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08141EDE:
pop {r4,r5}
pop {r0}
@@ -295603,7 +295603,7 @@ sub_81428E4: @ 81428E4
ldr r0, =sub_81405CC
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08142908:
pop {r4}
pop {r0}
@@ -295667,7 +295667,7 @@ sub_814297C: @ 814297C
bl HideCoinsWindow
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -295701,7 +295701,7 @@ sub_81429A0: @ 81429A0
bl sub_819746C
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081429DE:
pop {r4}
pop {r0}
@@ -295913,7 +295913,7 @@ sub_8142BC8: @ 8142BC8
bl ShowCoinsWindow
ldr r0, =sub_8142A88
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -302080,7 +302080,7 @@ _08145EAC:
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
_08145EC0:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -302130,7 +302130,7 @@ sub_8145F10: @ 8145F10
sub_8145F20: @ 8145F20
push {r4,lr}
ldr r0, =sub_8145FA8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
@@ -302147,7 +302147,7 @@ sub_8145F20: @ 8145F20
.pool
_08145F4C:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r4, =0x0203aba0
ldr r0, [r4]
bl Free
@@ -302169,7 +302169,7 @@ sub_8145F6C: @ 8145F6C
lsrs r4, 24
ldr r0, =sub_8145FA8
movs r1, 0x2
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -302240,7 +302240,7 @@ sub_8145FE0: @ 8145FE0
.pool
_0814601C:
movs r1, 0x4
- bl AddTask
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -302261,7 +302261,7 @@ sub_8146030: @ 8146030
lsls r0, 2
adds r0, r1
ldr r0, [r0]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -302291,7 +302291,7 @@ sub_8146064: @ 8146064
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl AddTask
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -302314,7 +302314,7 @@ sub_814608C: @ 814608C
lsls r0, 2
adds r0, r1
ldr r0, [r0]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -302363,7 +302363,7 @@ _081460F4:
cmp r0, 0
beq _08146104
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08146104:
add sp, 0x4
pop {r4}
@@ -302487,10 +302487,10 @@ sub_81461D8: @ 81461D8
cmp r0, 0
bne _081461F4
ldr r0, =sub_814610C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_081461F4:
movs r0, 0
pop {r1}
@@ -302605,10 +302605,10 @@ sub_81462A8: @ 81462A8
cmp r0, 0
bne _081462FA
ldr r0, =sub_8146204
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_081462FA:
ldr r0, [r4]
ldrb r1, [r0]
@@ -302788,10 +302788,10 @@ _08146448:
cmp r0, 0
bne _0814648E
ldr r0, =sub_8146384
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0814648E:
ldr r0, [r6]
ldrb r1, [r0]
@@ -303663,10 +303663,10 @@ sub_8146BA8: @ 8146BA8
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, [r4]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08146BDE:
movs r0, 0
pop {r4}
@@ -303998,10 +303998,10 @@ _08146E34:
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, [r4]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _08146EB0
.pool
_08146E90:
@@ -304251,10 +304251,10 @@ sub_81470A4: @ 81470A4
bne _081470C4
bl sub_8149F84
ldr r0, =sub_8146F94
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_081470C4:
movs r0, 0
pop {r1}
@@ -304969,10 +304969,10 @@ sub_8147648: @ 8147648
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, =sub_8147204
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -305187,10 +305187,10 @@ _08147838:
cmp r0, 0
bne _0814785A
ldr r0, =sub_8147718
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0814785A:
ldr r0, =0x0203aba0
ldr r1, [r0]
@@ -305419,10 +305419,10 @@ sub_8147A18: @ 8147A18
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, =sub_81478EC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -306216,10 +306216,10 @@ sub_814808C: @ 814808C
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, [r4]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r4}
pop {r1}
@@ -306919,10 +306919,10 @@ sub_814865C: @ 814865C
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, =sub_81484D0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -307488,10 +307488,10 @@ sub_8148B14: @ 8148B14
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, =sub_8148760
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -307620,10 +307620,10 @@ sub_8148C28: @ 8148C28
movs r0, 0
bl SetVBlankCallback
ldr r0, [r4]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _08148CDE
.pool
_08148C6C:
@@ -307802,10 +307802,10 @@ _08148D9A:
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, [r4]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08148DD6:
ldrh r2, [r4, 0x12]
ldrb r0, [r4, 0x12]
@@ -308084,10 +308084,10 @@ sub_8149008: @ 8149008
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, [r4]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
pop {r4}
pop {r1}
@@ -308962,10 +308962,10 @@ sub_8149740: @ 8149740
bls _08149766
bl sub_8149F84
ldr r0, =sub_8149578
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08149766:
movs r0, 0
pop {r1}
@@ -309323,10 +309323,10 @@ sub_8149A40: @ 8149A40
bne _08149A60
bl sub_8149F84
ldr r0, =sub_814995C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08149A60:
movs r0, 0
pop {r1}
@@ -309605,10 +309605,10 @@ sub_8149C60: @ 8149C60
ldrh r0, [r1, 0xA]
bl sub_8149F84
ldr r0, =sub_8149A6C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
b _08149CC4
.pool
@@ -309734,7 +309734,7 @@ sub_8149D78: @ 8149D78
ldr r0, =sub_8149DFC
movs r1, 0x3
str r3, [sp]
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -309763,7 +309763,7 @@ sub_8149D78: @ 8149D78
sub_8149DDC: @ 8149DDC
push {lr}
ldr r0, =sub_8149DFC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -309901,10 +309901,10 @@ _08149ECA:
cmp r0, 0
bne _08149EF8
ldr r0, =sub_8149DFC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _08149EFE
.pool
_08149EF8:
@@ -310861,10 +310861,10 @@ _0814A632:
cmp r0, 0
bne _0814A654
ldr r0, =sub_814A3F4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0814A654:
ldrh r0, [r4, 0x16]
subs r0, 0x11
@@ -311531,10 +311531,10 @@ sub_814ABA0: @ 814ABA0
movs r2, 0
bl sub_80A2A20
ldr r0, [r4]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
add sp, 0x8
pop {r4}
@@ -311620,7 +311620,7 @@ sub_814AC38: @ 814AC38
strh r5, [r6, 0xC]
ldr r0, =sub_814ABE4
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
bl GenerateRandomNumber
@@ -311805,10 +311805,10 @@ sub_814ADD8: @ 814ADD8
cmp r0, 0x3F
ble _0814AE2E
ldr r0, =sub_814ABE4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -311853,10 +311853,10 @@ sub_814AE40: @ 814AE40
movs r2, 0
bl sub_80A2A20
ldr r0, [r5]
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -312708,7 +312708,7 @@ sub_814B5A8: @ 814B5A8
bl FreeObjectPaletteByTag
ldr r0, =c3_0802FDF4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r0, =0x0202406e
mov r8, r0
ldrb r1, [r7]
@@ -317000,7 +317000,7 @@ _0814DC06:
strb r0, [r1, 0x5]
ldr r0, =sub_814DCCC
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, =0x03005e00
@@ -317157,7 +317157,7 @@ _0814DD9C:
mov r3, r9
strb r3, [r2]
mov r0, r8
- bl remove_task
+ bl DestroyTask
_0814DDB4:
pop {r3,r4}
mov r8, r3
@@ -320602,7 +320602,7 @@ sub_814FC70: @ 814FC70
ldr r0, =sub_814FCC8
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0814FC8E:
pop {r4}
pop {r0}
@@ -320617,7 +320617,7 @@ sub_814FC9C: @ 814FC9C
bl script_env_2_enable
ldr r0, =sub_814FC70
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -320749,7 +320749,7 @@ _0814FD4E:
.pool
_0814FDD8:
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
bl sub_80A1A74
bl reset_temp_tile_data_buffers
@@ -320894,7 +320894,7 @@ _0814FF5C:
.pool
_0814FF7C:
bl sub_8150D28
- bl RunActiveTasks
+ bl RunTasks
ldr r1, =0x030022c0
movs r0, 0x87
lsls r0, 3
@@ -321169,7 +321169,7 @@ _081501C8:
bl SetMainCallback2
ldr r0, =sub_81503E4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, =0x020375e0
ldrh r0, [r0]
cmp r0, 0
@@ -321181,7 +321181,7 @@ _08150218:
ldr r0, =sub_8150664
_0815021A:
movs r1, 0x1
- bl AddTask
+ bl CreateTask
ldr r1, =0x0203abac
ldr r1, [r1]
_08150224:
@@ -321200,7 +321200,7 @@ _08150226:
thumb_func_start mainloop
mainloop: @ 815023C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -321246,7 +321246,7 @@ _08150298:
lsrs r4, r0, 24
cmp r4, 0x13
bls _08150298
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_80A1A74
movs r0, 0
@@ -321543,10 +321543,10 @@ _08150528:
movs r0, 0
bl SetVBlankCallback
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
ldr r0, [r5]
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
ldr r0, =c2_8011A1C
bl SetMainCallback2
_08150542:
@@ -327865,7 +327865,7 @@ _081537A8:
movs r0, 0
strb r0, [r1]
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_081537C2:
pop {r4}
pop {r0}
@@ -341089,7 +341089,7 @@ sub_8159F5C: @ 8159F5C
bl pal_fade_maybe
ldr r0, =sub_8159FEC
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -341144,7 +341144,7 @@ sub_8159FEC: @ 8159FEC
cmp r0, 0x1
bne _0815A044
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _0815A088
.pool
_0815A044:
@@ -341203,7 +341203,7 @@ sub_815A090: @ 815A090
ldr r0, =gUnknown_08290CAE
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0815A0BE:
pop {r4}
pop {r0}
@@ -341834,7 +341834,7 @@ _0815A59C:
cmp r1, r0
bne _0815A5AC
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0815A5AC:
pop {r3,r4}
mov r8, r3
@@ -341955,7 +341955,7 @@ _0815A692:
cmp r1, r0
bne _0815A6A2
mov r0, r8
- bl remove_task
+ bl DestroyTask
_0815A6A2:
pop {r3-r5}
mov r8, r3
@@ -348225,7 +348225,7 @@ _0815D9F2:
cmp r0, 0
bgt _0815DA12
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r1, =0x020383fe
ldrb r0, [r1]
subs r0, 0x1
@@ -353708,7 +353708,7 @@ sub_8160638: @ 8160638
bl script_env_2_enable
ldr r0, =sub_8160664
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -353739,7 +353739,7 @@ sub_8160664: @ 8160664
ldr r0, =sub_80AF168
str r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08160688:
pop {r4}
pop {r0}
@@ -353752,7 +353752,7 @@ sub_81606A0: @ 81606A0
push {r4-r6,lr}
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
bl clear_scheduled_bg_copies_to_vram
ldr r6, =0x0203bc34
movs r0, 0x8C
@@ -353806,7 +353806,7 @@ sub_8160740: @ 8160740
push {r4,r5,lr}
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
bl clear_scheduled_bg_copies_to_vram
ldr r5, =0x0203bc34
movs r0, 0x8C
@@ -353889,7 +353889,7 @@ sub_81607EC: @ 81607EC
sub_816082C: @ 816082C
push {lr}
bl sub_8160868
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -359793,7 +359793,7 @@ sub_8163A8C: @ 8163A8C
ldr r0, =sub_8036760
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08163AB0:
pop {r4}
pop {r0}
@@ -359896,7 +359896,7 @@ _08163B98:
_08163BA6:
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0
@@ -359928,7 +359928,7 @@ _08163BC4:
ble _08163BC4
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0xC
@@ -359963,7 +359963,7 @@ _08163C18:
strh r0, [r1]
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0xD
@@ -359993,7 +359993,7 @@ _08163C8A:
_08163C9A:
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl sub_806E694
movs r0, 0x3
@@ -360032,7 +360032,7 @@ _08163D0C:
_08163D12:
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0x4
@@ -360061,7 +360061,7 @@ _08163D58:
_08163D5E:
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0x5
@@ -360084,7 +360084,7 @@ _08163D8E:
bl sub_8163590
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0x6
@@ -360107,7 +360107,7 @@ _08163DC8:
bl sub_8163048
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0xA
@@ -360122,7 +360122,7 @@ _08163DF4:
_08163E00:
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0x7
@@ -360153,7 +360153,7 @@ _08163E2C:
strh r5, [r0]
ldr r0, =sub_8163A8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
movs r0, 0x12
@@ -368781,7 +368781,7 @@ _08168842:
bl FreeObjectPaletteByTag
ldr r0, =c3_0802FDF4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r2, =0x0202406e
mov r0, r8
ldrb r1, [r0]
@@ -372487,7 +372487,7 @@ sub_816A90C: @ 816A90C
strb r0, [r1, 0x5]
ldr r0, =sub_816AC04
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, =0x03005e00
@@ -372748,7 +372748,7 @@ _0816AC28:
str r1, [r0]
strb r5, [r4]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_0816AC5E:
pop {r4-r6}
pop {r0}
@@ -372997,9 +372997,9 @@ sub_816AE58: @ 816AE58
ldr r1, =0x0203bcb4
movs r0, 0x4
strb r0, [r1]
- ldr r0, =nullsub_4
+ ldr r0, =TaskDummy
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085E8D80
@@ -373019,9 +373019,9 @@ sub_816AE98: @ 816AE98
ldr r1, =0x0203bcb4
movs r0, 0x3
strb r0, [r1]
- ldr r0, =nullsub_4
+ ldr r0, =TaskDummy
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085E8D80
@@ -373325,7 +373325,7 @@ _0816B180:
bl script_env_2_enable_and_set_ctx_running
_0816B184:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -373505,7 +373505,7 @@ sub_816B2F0: @ 816B2F0
bl overworld_free_bg_tilemaps
bl sub_81AAC14
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0816B310:
pop {r4}
pop {r0}
@@ -373535,7 +373535,7 @@ mapldr_080EBC0C: @ 816B33C
bl sub_81973C4
ldr r0, =sub_816B368
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -374198,7 +374198,7 @@ sub_816B8A4: @ 816B8A4
movs r2, 0x1
bl sub_8121478
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0816B8E6:
pop {r4}
pop {r0}
@@ -374225,7 +374225,7 @@ pal_fill_for_maplights_or_black: @ 816B920
bl sub_81973A4
ldr r0, =task00_080EBBDC
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =0x0203bcb8
@@ -374241,7 +374241,7 @@ pal_fill_for_maplights_or_black: @ 816B920
.pool
_0816B954:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0816B95A:
bl pal_fill_black
pop {r4}
@@ -374457,7 +374457,7 @@ sub_816BAF8: @ 816BAF8
bl overworld_free_bg_tilemaps
bl sub_81B8448
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0816BB1C:
pop {r4}
pop {r0}
@@ -374483,7 +374483,7 @@ sub_816BB48: @ 816BB48
push {r4-r6,lr}
ldr r0, =task00_080EBBDC
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
ldr r5, =0x0203bcb8
@@ -374521,7 +374521,7 @@ _0816BB7E:
.pool
_0816BBA8:
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_0816BBAE:
bl pal_fill_black
pop {r4-r6}
@@ -376380,7 +376380,7 @@ sub_816CBE8: @ 816CBE8
thumb_func_start sub_816CC00
sub_816CC00: @ 816CC00
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -376441,17 +376441,17 @@ load_copyright_graphics: @ 816CC70
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
- ldr r0, =gUnknown_08DC3D74
+ ldr r0, =gIntroCopyright_Gfx
movs r6, 0xC0
lsls r6, 19
adds r3, r6
adds r1, r3, 0
bl LZ77UnCompVram
- ldr r0, =gUnknown_08DC3FD4
+ ldr r0, =gIntroCopyright_Tilemap
adds r4, r6
adds r1, r4, 0
bl LZ77UnCompVram
- ldr r0, =gUnknown_08DC3D54
+ ldr r0, =gIntroCopyright_Pal
adds r1, r5, 0
movs r2, 0x20
bl gpu_pal_apply
@@ -376546,7 +376546,7 @@ _0816CCF4:
movs r2, 0
bl load_copyright_graphics
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
movs r0, 0x1
@@ -376614,7 +376614,7 @@ _0816CE2C:
bne _0816CEA0
ldr r0, =task_intro_1
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, =sub_816CC00
bl SetMainCallback2
ldr r5, =0x030062b0
@@ -376962,7 +376962,7 @@ _0816D1BE:
bne _0816D1CC
ldr r0, =task_intro_3_1
movs r1, 0
- bl AddTask
+ bl CreateTask
_0816D1CC:
ldr r0, [r5]
cmp r0, 0xFB
@@ -376989,7 +376989,7 @@ _0816D1EE:
bne _0816D200
ldr r0, =task_intro_3_2
movs r1, 0
- bl AddTask
+ bl CreateTask
_0816D200:
ldr r1, [r5]
movs r0, 0xB8
@@ -377030,7 +377030,7 @@ _0816D240:
bne _0816D252
ldr r0, =task_intro_3_3
movs r1, 0
- bl AddTask
+ bl CreateTask
_0816D252:
ldr r0, [r5]
cmp r0, r4
@@ -377131,7 +377131,7 @@ _0816D324:
cmp r0, 0x3C
ble _0816D332
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0816D332:
pop {r4,r5}
pop {r0}
@@ -377477,7 +377477,7 @@ task_intro_8: @ 816D650
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x8]
- bl remove_task
+ bl DestroyTask
_0816D67C:
ldr r1, [r5]
ldr r0, =0x0000079a
@@ -380180,7 +380180,7 @@ task_intro_27: @ 816ED20
strh r1, [r4, 0x10]
ldr r0, =sub_816EEA8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -380317,7 +380317,7 @@ task_intro_29: @ 816EE90
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_816CC54
bl SetMainCallback2
pop {r0}
@@ -380563,7 +380563,7 @@ _0816F0A0:
cmp r0, 0
bne _0816F0B2
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_0816F0B2:
add sp, 0x4
pop {r4,r5}
@@ -380695,7 +380695,7 @@ _0816F1BC:
movs r1, 0
bl SetGpuReg
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0816F1DA:
pop {r4,r5}
pop {r0}
@@ -380790,7 +380790,7 @@ _0816F284:
movs r1, 0
bl SetGpuReg
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0816F2A2:
pop {r4,r5}
pop {r0}
@@ -384401,7 +384401,7 @@ sub_8171030: @ 8171030
str r1, [r0]
ldr r0, =sub_81710A8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r0, =sub_8170EF0
str r0, [r4]
_0817108A:
@@ -384446,7 +384446,7 @@ sub_81710A8: @ 81710A8
movs r1, 0
bl StartObjectImageAnim
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081710F4:
pop {r4-r6}
pop {r0}
@@ -384571,9 +384571,9 @@ sub_81711E8: @ 81711E8
asrs r0, 16
cmp r0, 0xA
bne _08171224
- ldr r0, =nullsub_4
+ ldr r0, =TaskDummy
movs r1, 0x32
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x38]
@@ -384733,7 +384733,7 @@ _08171354:
cmp r0, 0xA
ble _0817137C
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
adds r0, r7, 0
movs r1, 0x2
bl StartObjectImageAnim
@@ -386038,7 +386038,7 @@ sub_8171D98: @ 8171D98
adds r0, r1
ldr r0, [r0]
movs r1, 0x5
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -386199,7 +386199,7 @@ _08171EEC:
strh r0, [r1, 0x3C]
_08171F22:
mov r0, r8
- bl remove_task
+ bl DestroyTask
b _08171F58
.pool
_08171F48:
@@ -386380,7 +386380,7 @@ _0817206A:
strh r0, [r1, 0x3C]
_08172092:
mov r0, r9
- bl remove_task
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -386498,7 +386498,7 @@ _0817216E:
strh r0, [r1, 0x3C]
_08172196:
mov r0, r9
- bl remove_task
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -386614,7 +386614,7 @@ _0817226E:
strh r0, [r1, 0x3C]
_08172296:
mov r0, r9
- bl remove_task
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -386734,7 +386734,7 @@ _08172376:
strh r0, [r1, 0x3C]
_0817239E:
mov r0, r9
- bl remove_task
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -386875,7 +386875,7 @@ _0817248C:
strh r0, [r1, 0x3C]
_081724D0:
mov r0, r8
- bl remove_task
+ bl DestroyTask
_081724D6:
add sp, 0x18
pop {r3-r5}
@@ -387035,7 +387035,7 @@ _081725FE:
strh r0, [r1, 0x3C]
_08172626:
mov r0, r9
- bl remove_task
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -387221,7 +387221,7 @@ _08172790:
strh r0, [r1, 0x3C]
_081727C4:
ldr r0, [sp]
- bl remove_task
+ bl DestroyTask
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -387332,7 +387332,7 @@ _08172880:
strh r0, [r1, 0x3C]
_081728A8:
mov r0, r9
- bl remove_task
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -387437,7 +387437,7 @@ _08172998:
cmp r4, 0xB
bgt _081729AA
ldr r0, [r5]
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -387489,7 +387489,7 @@ sub_81729E8: @ 81729E8
lsrs r7, r3, 24
ldr r0, =sub_8172AB0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -387621,7 +387621,7 @@ _08172B08:
movs r3, 0
bl pal_fade_maybe
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08172B30:
add sp, 0x4
pop {r4,r5}
@@ -387709,7 +387709,7 @@ sub_8172B90: @ 8172B90
.pool
_08172BE4:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_08172BEA:
pop {r4}
pop {r0}
@@ -388138,13 +388138,13 @@ _08172F6E:
ldr r5, =sub_8172FEC
adds r0, r5, 0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r3, =0x03005e00
@@ -388423,7 +388423,7 @@ sub_81731B0: @ 81731B0
strb r1, [r0, 0x1]
_081731EA:
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_081731F0:
pop {r0}
bx r0
@@ -388838,7 +388838,7 @@ sub_817354C: @ 817354C
thumb_func_start sub_8173560
sub_8173560: @ 8173560
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl RunTextPrinters
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
@@ -388970,7 +388970,7 @@ sub_8173694: @ 8173694
bne _081736C4
ldr r0, =sub_817371C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -388999,7 +388999,7 @@ sub_81736D8: @ 81736D8
bne _08173708
ldr r0, =sub_817371C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -389374,7 +389374,7 @@ _08173A06:
str r0, [r5]
_08173A16:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _08173A4C
.pool
_08173A34:
@@ -390205,7 +390205,7 @@ _081740FA:
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
ldr r4, =0x0203bcdc
ldr r0, [r4]
cmp r0, 0
@@ -390332,7 +390332,7 @@ _08174240:
b _081742A2
.pool
_08174280:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -390363,7 +390363,7 @@ _081742B0:
bl SetGpuReg
ldr r0, =sub_8174324
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r2, 0
@@ -391107,7 +391107,7 @@ _08174928:
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
ldr r4, =0x0203bcdc
ldr r0, [r4]
cmp r0, 0
@@ -391796,7 +391796,7 @@ _08174EEA:
sub_8174F70: @ 8174F70
push {lr}
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl reset_temp_tile_data_buffers
bl dp13_810BB8C
@@ -392165,7 +392165,7 @@ sub_8175280: @ 8175280
strh r0, [r4]
ldr r0, =sub_8175364
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -392190,12 +392190,12 @@ _081752AA:
sub_81752C0: @ 81752C0
push {r4,lr}
ldr r0, =sub_8175364
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _081752D4
- bl remove_task
+ bl DestroyTask
_081752D4:
bl sub_8152254
ldr r4, =0x000003e9
@@ -392302,7 +392302,7 @@ _0817539C:
cmp r0, 0
bne _081753B8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x020375e0
strh r7, [r0]
ldr r1, =0x020375e2
@@ -392433,7 +392433,7 @@ sub_81754C8: @ 81754C8
thumb_func_start sub_81754DC
sub_81754DC: @ 81754DC
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
ldr r0, =0x030022c0
ldrh r1, [r0, 0x2C]
@@ -392457,7 +392457,7 @@ sub_81754DC: @ 81754DC
cmp r1, r0
bne _08175522
bl sub_81754C8
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
ldr r1, =0x0203bce5
movs r0, 0x1
@@ -392585,11 +392585,11 @@ sub_8175620: @ 8175620
lsls r1, 9
bl InitHeap
bl sub_80A1A74
- bl clear_tasks
+ bl ResetTasks
bl sub_8175548
ldr r0, =sub_8175744
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =0x03005e00
@@ -392631,7 +392631,7 @@ _0817566A:
bl SetGpuReg
ldr r0, =sub_8175DA0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -392983,7 +392983,7 @@ _0817596E:
_081759F0:
ldr r0, =sub_81760FC
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r2, =0x03005e00
lsls r4, r6, 2
adds r4, r6
@@ -393709,7 +393709,7 @@ _08175FFC:
movs r1, 0x1
strh r1, [r0, 0x10]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_81755A4
ldr r4, =0x0203bce8
ldr r0, [r4]
@@ -394913,7 +394913,7 @@ _081769D4:
_081769E0:
ldr r0, =sub_817651C
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r6, =0x03005e00
lsls r1, r7, 2
adds r1, r7
@@ -394947,7 +394947,7 @@ _081769E0:
strh r7, [r0, 0xC]
ldr r0, =sub_817624C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xA]
@@ -395215,7 +395215,7 @@ sub_8176CA0: @ 8176CA0
beq _08176CC6
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0x8]
_08176CC6:
@@ -395226,7 +395226,7 @@ _08176CC6:
beq _08176CDC
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0xA]
_08176CDC:
@@ -395237,7 +395237,7 @@ _08176CDC:
beq _08176CF2
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0xC]
_08176CF2:
@@ -395248,7 +395248,7 @@ _08176CF2:
beq _08176D08
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0xE]
_08176D08:
@@ -395278,7 +395278,7 @@ sub_8176D1C: @ 8176D1C
adds r3, r6
adds r1, r3, 0
bl LZ77UnCompVram
- ldr r0, =gUnknown_08DC3D54
+ ldr r0, =gIntroCopyright_Pal
adds r1, r5, 0
movs r2, 0x20
bl gpu_pal_apply
@@ -396775,7 +396775,7 @@ sub_8177888: @ 8177888
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_80A1A74
bl ResetObjectPaletteAllocator
@@ -396830,7 +396830,7 @@ _0817797C:
bl SetMainCallback2
ldr r0, =sub_8177A20
movs r1, 0
- bl AddTask
+ bl CreateTask
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -396841,7 +396841,7 @@ _0817797C:
thumb_func_start sub_8177A08
sub_8177A08: @ 8177A08
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -396923,7 +396923,7 @@ sub_8177A98: @ 8177A98
bl Free
bl FreeAllWindowBuffers
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_80861E8
bl SetMainCallback2
_08177AC2:
@@ -397095,7 +397095,7 @@ sub_8177C14: @ 8177C14
thumb_func_start sub_8177C54
sub_8177C54: @ 8177C54
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -397202,7 +397202,7 @@ _08177D4C:
lsls r0, 24
cmp r0, 0
bne _08177DDC
- bl clear_tasks
+ bl ResetTasks
b _08177DDC
_08177D5C:
bl sub_8177E14
@@ -397239,7 +397239,7 @@ _08177D9C:
_08177DA6:
ldr r0, =sub_8178654
movs r1, 0
- bl AddTask
+ bl CreateTask
b _08177DDC
.pool
_08177DB4:
@@ -398206,7 +398206,7 @@ sub_8178610: @ 8178610
ldr r0, =bag_menu_mail_related
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08178642:
pop {r4}
pop {r0}
@@ -398630,7 +398630,7 @@ sub_8178974: @ 8178974
sub sp, 0x8
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, =sub_8178944
bl SetVBlankCallback
movs r0, 0
@@ -398678,9 +398678,9 @@ _081789AC:
bl SetGpuReg
ldr r0, =sub_8009404
movs r1, 0
- bl AddTask
+ bl CreateTask
bl sub_80A2F30
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl RunTextPrinters
@@ -399181,7 +399181,7 @@ _08178E58:
movs r1, 0xD
strb r1, [r0]
_08178E98:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl RunTextPrinters
@@ -399480,7 +399480,7 @@ _08178FF8:
bl SetWindowAttribute
bl DeactivateAllTextPrinters
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl sub_80A1A74
ldr r0, =gUnknown_085B0A00
movs r1, 0
@@ -400078,7 +400078,7 @@ sub_8179700: @ 8179700
push {lr}
ldr r0, =sub_8179778
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -400107,7 +400107,7 @@ sub_817973C: @ 817973C
push {lr}
ldr r0, =sub_8179778
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -400169,7 +400169,7 @@ sub_8179778: @ 8179778
cmp r1, r0
bne _081797D0
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
bl InstallCameraPanAheadCallback
_081797D0:
@@ -400579,7 +400579,7 @@ _08179B5C:
thumb_func_start sub_8179B68
sub_8179B68: @ 8179B68
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -401207,7 +401207,7 @@ sub_817A168: @ 817A168
push {lr}
ldr r0, =sub_817A030
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -401363,7 +401363,7 @@ sub_817A2C0: @ 817A2C0
ldr r0, [r0, 0x8]
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl FreeAllWindowBuffers
ldr r0, =0x0203bd18
ldr r0, [r0]
@@ -402450,7 +402450,7 @@ c2_clear_save_data_screen_2: @ 817ACC8
beq _0817ACDC
ldr r0, =sub_817ACE4
movs r1, 0
- bl AddTask
+ bl CreateTask
_0817ACDC:
pop {r0}
bx r0
@@ -402545,7 +402545,7 @@ _0817ADA0:
movs r0, 0x5
bl audio_play
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_817AFD4
bl SetMainCallback2
_0817ADB2:
@@ -402564,7 +402564,7 @@ sub_817ADC0: @ 817ADC0
lsrs r4, 24
bl calls_flash_erase_block
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =sub_817AFD4
bl SetMainCallback2
pop {r4}
@@ -402576,7 +402576,7 @@ sub_817ADC0: @ 817ADC0
thumb_func_start sub_817ADE4
sub_817ADE4: @ 817ADE4
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -402707,7 +402707,7 @@ _0817AEEC:
lsrs r1, r0, 16
cmp r1, r2
bls _0817AEEC
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
@@ -403143,7 +403143,7 @@ sub_817B3DC: @ 817B3DC
mov r0, r9
movs r1, 0
str r3, [sp]
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -404477,7 +404477,7 @@ sub_817BE94: @ 817BE94
lsrs r4, 16
ldr r0, =sub_817BEC4
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -404608,7 +404608,7 @@ sub_817BF84: @ 817BF84
.pool
_0817BFA8:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_0817BFAE:
pop {r4}
pop {r0}
@@ -404620,7 +404620,7 @@ sub_817BFB4: @ 817BFB4
push {lr}
ldr r0, =sub_817BFCC
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -404704,7 +404704,7 @@ sub_817C058: @ 817C058
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_817C058
@@ -404714,7 +404714,7 @@ sub_817C068: @ 817C068
push {lr}
ldr r0, =sub_817C080
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -404819,7 +404819,7 @@ sub_817C134: @ 817C134
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_817C134
@@ -404832,7 +404832,7 @@ sub_817C144: @ 817C144
lsrs r4, 16
ldr r0, =sub_817C174
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -404964,7 +404964,7 @@ sub_817C260: @ 817C260
cmp r0, 0
bne _0817C278
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_0817C278:
pop {r0}
bx r0
@@ -404979,7 +404979,7 @@ sub_817C280: @ 817C280
lsrs r4, 16
ldr r0, =sub_817C2B0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -405131,7 +405131,7 @@ _0817C3BA:
bls _0817C3BA
adds r0, r3, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -405547,7 +405547,7 @@ sub_817C67C: @ 817C67C
negs r2, r2
ands r2, r3
strb r2, [r1]
- bl remove_task
+ bl DestroyTask
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -405635,7 +405635,7 @@ sub_817C72C: @ 817C72C
movs r3, 0x4
orrs r2, r3
strb r2, [r1]
- bl remove_task
+ bl DestroyTask
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -410892,7 +410892,7 @@ _0817F508:
strh r0, [r3, 0x32]
strh r2, [r3, 0x30]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0817F528:
pop {r3}
mov r8, r3
@@ -410910,7 +410910,7 @@ sub_817F544: @ 817F544
lsrs r4, 24
ldr r0, =sub_817F498
movs r1, 0x80
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -410951,7 +410951,7 @@ sub_817F594: @ 817F594
lsrs r6, 24
ldr r0, =sub_817F498
movs r1, 0x80
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005e00
@@ -424072,7 +424072,7 @@ sub_8185B1C: @ 8185B1C
ldr r0, =sub_8036760
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08185B4A:
pop {r4}
pop {r0}
@@ -424385,7 +424385,7 @@ sub_8185E24: @ 8185E24
bl sub_8185B60
ldr r0, =sub_8185B1C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -424415,7 +424415,7 @@ sub_8185E8C: @ 8185E8C
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_8185E8C
@@ -430681,7 +430681,7 @@ sub_8189438: @ 8189438
bl oamt_set_x3A_32
ldr r0, =c3_0803D564
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, =0x03005e00
@@ -430820,7 +430820,7 @@ _081895F4:
mov r0, r9
strb r0, [r2]
mov r0, r8
- bl remove_task
+ bl DestroyTask
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -432415,7 +432415,7 @@ sub_818A37C: @ 818A37C
bl FreeObjectPaletteByTag
ldr r0, =c3_0802FDF4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r0, =0x0202406e
mov r8, r0
ldrb r1, [r7]
@@ -436860,7 +436860,7 @@ _0818CB5A:
strb r0, [r1, 0x5]
ldr r0, =sub_818CC24
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, =0x03005e00
@@ -437017,7 +437017,7 @@ _0818CCF4:
mov r3, r9
strb r3, [r2]
mov r0, r8
- bl remove_task
+ bl DestroyTask
_0818CD0C:
pop {r3,r4}
mov r8, r3
@@ -443593,7 +443593,7 @@ sub_81903B8: @ 81903B8
push {r4,r5,lr}
ldr r0, =sub_8190400
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =0x03005e00
@@ -443851,7 +443851,7 @@ _0819064A:
bl sub_80D2F04
ldr r0, =sub_8190CD4
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =0x03005e00
@@ -443970,7 +443970,7 @@ _08190746:
strh r0, [r4, 0x30]
_0819076C:
mov r0, r10
- bl remove_task
+ bl DestroyTask
_08190772:
add sp, 0xC
pop {r3-r5}
@@ -447010,7 +447010,7 @@ _0819218E:
_081921C4:
ldr r0, =sub_8194220
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
ldr r2, =0x03005e00
@@ -447037,7 +447037,7 @@ _081921C4:
strh r0, [r1, 0x10]
_081921FC:
mov r0, r8
- bl remove_task
+ bl DestroyTask
_08192202:
add sp, 0x4
pop {r3-r5}
@@ -449735,7 +449735,7 @@ sub_81938A4: @ 81938A4
push {lr}
ldr r0, =sub_8194220
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -449784,7 +449784,7 @@ sub_81938E0: @ 81938E0
strh r1, [r0]
ldr r0, =sub_8194220
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -449978,7 +449978,7 @@ _08193ABA:
str r6, [r4]
ldr r0, =sub_8190400
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =0x03005e00
@@ -450023,7 +450023,7 @@ _08193B20:
str r6, [r4]
ldr r0, =sub_8190400
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =0x03005e00
@@ -450069,9 +450069,9 @@ _08193B84:
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x16]
- bl remove_task
+ bl DestroyTask
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08193BC2:
add sp, 0x4
pop {r4-r7}
@@ -450255,7 +450255,7 @@ sub_8193D40: @ 8193D40
push {lr}
ldr r0, =sub_8194220
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -451476,7 +451476,7 @@ _081947C8:
bne _08194844
ldr r0, =sub_819395C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =0x03005e00
@@ -451499,7 +451499,7 @@ _081947C8:
_08194844:
ldr r0, =sub_8194950
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
@@ -451557,7 +451557,7 @@ _081948A4:
ldr r2, [r3, 0x8]
bl sub_80BA038
mov r0, r8
- bl remove_task
+ bl DestroyTask
_081948C2:
add sp, 0x28
pop {r3-r5}
@@ -451845,7 +451845,7 @@ _08194B24:
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08194B3C:
add sp, 0x14
pop {r3,r4}
@@ -451864,7 +451864,7 @@ sub_8194B54: @ 8194B54
bl PrepareSpritesForOamLoad
bl RunTextPrinters
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_8194B54
@@ -454393,7 +454393,7 @@ sub_8196080: @ 8196080
sub_8196094: @ 8196094
push {lr}
ldr r0, =sub_81960E0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -454417,7 +454417,7 @@ _081960C2:
bl audio_play
ldr r0, =sub_81960E0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -454453,7 +454453,7 @@ sub_81960E0: @ 81960E0
cmp r0, 0x7
bls _0819611E
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0819611E:
pop {r4,r5}
pop {r0}
@@ -454532,7 +454532,7 @@ _081961D8:
bl RemoveWindow
adds r0, r6, 0
_081961E0:
- bl remove_task
+ bl DestroyTask
movs r0, 0
_081961E6:
add sp, 0x4
@@ -454578,7 +454578,7 @@ sub_81961F0: @ 81961F0
bl WriteSequenceToBgTilemapBuffer
ldr r0, =sub_8196694
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xA]
@@ -454771,7 +454771,7 @@ _081963C0:
movs r3, 0xE
bl FillBgTilemapBufferRect_Palette0
ldrb r0, [r4, 0xA]
- bl remove_task
+ bl DestroyTask
ldrb r0, [r4, 0x4]
bl RemoveWindow
movs r0, 0
@@ -461942,7 +461942,7 @@ _08199B36:
beq _08199B6E
ldr r0, =task_free_buf_after_copying_tile_data_to_vram
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -461962,7 +461962,7 @@ _08199B36:
adds r0, r4, 0
movs r1, 0x1
adds r2, r6, 0
- bl set_word_task_arg
+ bl SetWordTaskArg
_08199B6E:
add sp, 0x8
pop {r3,r4}
@@ -461993,10 +461993,10 @@ task_free_buf_after_copying_tile_data_to_vram: @ 8199B84
bne _08199BB4
adds r0, r4, 0
movs r1, 0x1
- bl get_word_task_arg
+ bl GetWordTaskArg
bl Free
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08199BB4:
pop {r4}
pop {r0}
@@ -463207,7 +463207,7 @@ sub_819A4C8: @ 819A4C8
bl PrepareSpritesForOamLoad
bl RunTextPrinters
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_819A4C8
@@ -463382,7 +463382,7 @@ _0819A5C0:
_0819A69C:
bl sub_80A1A74
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
ldr r0, =gUnknown_08DC0754
ldr r5, =0x0203ce2c
@@ -463609,7 +463609,7 @@ _0819A8EE:
_0819A8FC:
ldr r0, =sub_819C69C
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r2, =0x0300127c
ldr r1, [r2]
ldr r3, =0x000002a1
@@ -463630,7 +463630,7 @@ _0819A8FC:
strh r5, [r0, 0x8]
ldr r0, =sub_819B378
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 2
@@ -463657,7 +463657,7 @@ _0819A954:
strb r2, [r0]
ldr r0, =sub_819B124
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 2
@@ -464294,7 +464294,7 @@ _0819AE64:
ldr r2, =0x000002a1
adds r0, r2
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
ldr r1, [r4]
movs r3, 0xA6
lsls r3, 2
@@ -464338,7 +464338,7 @@ _0819AEE8:
adds r1, r3
strh r0, [r1]
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r1, [r4]
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -464434,7 +464434,7 @@ _0819AFB8:
ldr r1, =0x000002a1
adds r0, r1
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
bl sub_819AB40
ldr r4, =0x0203ce2c
ldr r0, [r4]
@@ -464455,7 +464455,7 @@ _0819AFB8:
ldr r0, =sub_80861B0
bl SetMainCallback2
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_0819B00E:
add sp, 0x4
pop {r4-r7}
@@ -466431,7 +466431,7 @@ sub_819C040: @ 819C040
strb r1, [r0]
ldr r0, =sub_819C1D0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -466657,7 +466657,7 @@ _0819C29E:
b _0819C2C6
_0819C2BA:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
bl sub_819BF2C
b _0819C2CC
_0819C2C6:
@@ -466807,7 +466807,7 @@ _0819C2FC:
movs r0, 0
bl ClearGpuRegBits
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
b _0819C4A4
.pool
_0819C410:
@@ -466992,7 +466992,7 @@ sub_819C568: @ 819C568
bl sub_818D820
ldr r0, =sub_819C2D4
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -467280,7 +467280,7 @@ sub_819C7E0: @ 819C7E0
bl PrepareSpritesForOamLoad
bl RunTextPrinters
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_819C7E0
@@ -467457,7 +467457,7 @@ _0819C950:
ldr r0, [r4]
adds r0, 0x21
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
ldr r1, [r4]
ldr r0, [r1, 0x2C]
adds r1, 0x30
@@ -467486,7 +467486,7 @@ _0819C950:
.pool
_0819C9C4:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r2, =0x03001284
ldr r1, [r2]
movs r0, 0x1
@@ -467600,7 +467600,7 @@ _0819CAA4:
ldr r0, [r7]
adds r0, 0x21
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
bl sub_819E538
ldr r4, =0x0203ce40
ldr r0, [r4]
@@ -467625,7 +467625,7 @@ _0819CAA4:
ldr r0, =sub_80861B0
bl SetMainCallback2
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_0819CAFE:
add sp, 0x4
pop {r4-r7}
@@ -468613,7 +468613,7 @@ _0819D306:
cmp r7, 0x1
bne _0819D310
ldr r0, [sp]
- bl remove_task
+ bl DestroyTask
_0819D310:
add sp, 0x10
pop {r3-r5}
@@ -468795,7 +468795,7 @@ _0819D40E:
movs r1, 0x1
strh r1, [r0, 0xE]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
b _0819D570
.pool
_0819D480:
@@ -468918,7 +468918,7 @@ _0819D520:
movs r1, 0x1
strh r1, [r0, 0x10]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_0819D570:
pop {r3-r5}
mov r8, r3
@@ -469033,7 +469033,7 @@ _0819D64E:
bne _0819D6B0
ldr r0, =sub_819D324
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =0x03005e00
@@ -469061,7 +469061,7 @@ _0819D64E:
_0819D6B0:
ldr r0, =sub_819D324
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r3, =0x03005e00
@@ -469099,7 +469099,7 @@ _0819D6F0:
bne _0819D734
ldr r0, =sub_819D324
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
strh r7, [r6, 0x10]
@@ -469206,7 +469206,7 @@ _0819D7E0:
bne _0819D828
ldr r0, =sub_819D324
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r3, =0x03005e00
@@ -469234,7 +469234,7 @@ _0819D7E0:
_0819D828:
ldr r0, =sub_819D324
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r3, =0x03005e00
@@ -469271,7 +469271,7 @@ _0819D868:
bne _0819D8A8
ldr r0, =sub_819D324
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
strh r7, [r5, 0x10]
@@ -469508,7 +469508,7 @@ _0819DA58:
_0819DA8C:
ldr r0, =sub_819D12C
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r2, =0x03005e00
ldr r0, =0x03001284
ldr r0, [r0]
@@ -469524,7 +469524,7 @@ _0819DA8C:
.pool
_0819DABC:
ldr r0, =sub_819D12C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _0819DACA
@@ -469838,7 +469838,7 @@ _0819DCD4:
_0819DDA8:
bl sub_80A1A74
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
bl dp13_810BB8C
ldr r0, =gUnknown_08DC0754
@@ -470070,7 +470070,7 @@ _0819E00E:
_0819E01C:
ldr r0, =sub_819CF54
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r6, =0x03001284
ldr r1, [r6]
adds r1, 0x21
@@ -470089,7 +470089,7 @@ _0819E01C:
strh r5, [r0, 0x8]
ldr r0, =sub_819CE40
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 2
@@ -470117,7 +470117,7 @@ _0819E06C:
strb r3, [r2]
ldr r0, =sub_819CD34
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 2
@@ -472504,7 +472504,7 @@ sub_819F3F8: @ 819F3F8
bl sub_818D820
ldr r0, =sub_819F7B4
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -472742,7 +472742,7 @@ sub_819F600: @ 819F600
strb r0, [r2]
ldr r0, =sub_819F69C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -472907,7 +472907,7 @@ _0819F760:
b _0819F7A6
_0819F77C:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x03005e00
lsls r1, r5, 2
adds r1, r5
@@ -472995,7 +472995,7 @@ sub_819F7B4: @ 819F7B4
movs r0, 0
bl ClearGpuRegBits
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _0819F8D8
.pool
_0819F844:
@@ -474937,7 +474937,7 @@ _081A0768:
ldrb r0, [r4, 0xC]
bl sub_81A07E8
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_081A0778:
pop {r4,r5}
@@ -475025,7 +475025,7 @@ sub_81A0804: @ 81A0804
lsrs r6, r2, 24
ldr r0, =sub_81A070C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x03005e00
@@ -475318,7 +475318,7 @@ sub_81A0A34: @ 81A0A34
cmp r0, 0
bne _081A0A68
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, =0x020375e2
ldrh r0, [r0]
cmp r0, 0
@@ -475564,7 +475564,7 @@ _081A0C7A:
bl AddTextPrinterForMessage
ldr r0, =sub_81A0A34
movs r1, 0x1
- bl AddTask
+ bl CreateTask
_081A0C8E:
pop {r0}
bx r0
@@ -476848,7 +476848,7 @@ sub_81A16B4: @ 81A16B4
beq _081A16D4
_081A16CE:
adds r0, r2, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_081A16D4:
pop {r0}
bx r0
@@ -476885,7 +476885,7 @@ _081A16F6:
str r1, [r2]
bl _call_via_r1
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081A1718:
pop {r4}
pop {r0}
@@ -476899,7 +476899,7 @@ sub_81A172C: @ 81A172C
adds r4, r0, 0
ldr r0, =sub_81A16DC
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -476923,12 +476923,12 @@ sub_81A175C: @ 81A175C
ldr r4, =sub_81A16B4
adds r0, r4, 0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
adds r2, r5, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r4,r5}
pop {r0}
bx r0
@@ -487836,7 +487836,7 @@ sub_81A7580: @ 81A7580
push {lr}
ldr r0, =sub_81A7EE4
movs r1, 0x2
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -488958,10 +488958,10 @@ _081A7E22:
cmp r0, 0
bne _081A7E50
ldr r0, =sub_81A7D54
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _081A7E56
.pool
_081A7E50:
@@ -489000,7 +489000,7 @@ sub_81A7E60: @ 81A7E60
ldr r0, =sub_81A7D54
movs r1, 0x3
str r3, [sp]
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -489029,7 +489029,7 @@ sub_81A7E60: @ 81A7E60
sub_81A7EC4: @ 81A7EC4
push {lr}
ldr r0, =sub_81A7D54
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -489079,7 +489079,7 @@ _081A7F1C:
beq _081A7F30
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081A7F30:
add sp, 0x4
pop {r4}
@@ -492073,7 +492073,7 @@ sub_81A97C8: @ 81A97C8
push {lr}
ldr r0, =sub_81A97DC
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -492102,7 +492102,7 @@ sub_81A97DC: @ 81A97DC
movs r2, 0x10
bl CpuSet
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081A980C:
pop {r4}
pop {r0}
@@ -494775,7 +494775,7 @@ _081AAD3A:
thumb_func_start c2_bag_3
c2_bag_3: @ 81AAD5C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -494902,7 +494902,7 @@ _081AAE86:
lsls r0, 24
cmp r0, 0
bne _081AAE94
- bl clear_tasks
+ bl ResetTasks
_081AAE94:
ldr r1, =0x030022c0
movs r2, 0x87
@@ -495274,7 +495274,7 @@ _081AB204:
ldr r0, =Task_BagMenu
_081AB206:
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -496136,7 +496136,7 @@ _081AB98A:
bl ResetObjectPaletteAllocator
bl free_bag_item_list_buffers
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081AB9A0:
pop {r4,r5}
pop {r0}
@@ -497011,7 +497011,7 @@ _081AC09A:
adds r0, r2
ldr r2, [r0]
adds r0, r6, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -497052,7 +497052,7 @@ _081AC148:
ldrsb r1, [r6, r1]
bl ChangeBagPocketId
adds r0, r7, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
movs r1, 0x1
negs r1, r1
adds r0, r7, 0
@@ -497064,7 +497064,7 @@ _081AC164:
ldrsb r1, [r6, r1]
bl ChangeBagPocketId
adds r0, r7, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
adds r0, r7, 0
movs r1, 0x1
_081AC178:
@@ -497149,7 +497149,7 @@ _081AC1DC:
bl bag_menu_add_pocket_scroll_arrow_indicators_maybe
bl bag_menu_add_list_scroll_arrow_indicators_maybe
adds r0, r7, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_081AC22E:
pop {r4-r7}
pop {r0}
@@ -499282,7 +499282,7 @@ _081AD550:
ldrh r0, [r0]
bl itemid_get_overworld_function
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -501337,7 +501337,7 @@ _081AE6EC:
bl ListMenuRemoveCursorObject
_081AE6FC:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -501603,7 +501603,7 @@ ListMenuInitInternal: @ 81AE8D4
lsrs r6, 16
ldr r0, =ListMenuDummyTask
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -503049,7 +503049,7 @@ _081AF3DC:
_081AF3EE:
ldr r0, =Task_ScrollIndicatorArrowPair
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -503357,7 +503357,7 @@ _081AF648:
adds r0, r4
bl RemoveObjectAndFreeTiles
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
pop {r4-r6}
pop {r0}
bx r0
@@ -503643,7 +503643,7 @@ _081AF884:
_081AF896:
ldr r0, =Task_RedOutlineCursor
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -503822,7 +503822,7 @@ _081AFA06:
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4-r6}
pop {r0}
bx r0
@@ -503905,7 +503905,7 @@ _081AFAB4:
_081AFAC6:
ldr r0, =Task_RedArrowCursor
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -504034,7 +504034,7 @@ _081AFBC8:
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4-r6}
pop {r0}
bx r0
@@ -504792,7 +504792,7 @@ _081B0194:
thumb_func_start sub_81B01B0
sub_81B01B0: @ 81B01B0
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl do_scheduled_bg_tilemap_copies_to_vram
@@ -504924,7 +504924,7 @@ _081B02EC:
beq _081B02F8
b _081B0484
_081B02F8:
- bl clear_tasks
+ bl ResetTasks
b _081B0484
_081B02FE:
bl sub_81B209C
@@ -505067,7 +505067,7 @@ _081B0430:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, [r4]
ldrh r0, [r0, 0xA]
lsrs r0, 2
@@ -505140,7 +505140,7 @@ sub_81B04BC: @ 81B04BC
bl pal_fade_maybe
ldr r0, =sub_81B04F8
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, =sub_81B01CC
bl SetVBlankCallback
ldr r0, =sub_81B01B0
@@ -505167,7 +505167,7 @@ sub_81B04F8: @ 81B04F8
bl SetMainCallback2
bl sub_81B06F4
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081B051C:
pop {r4}
pop {r0}
@@ -506888,7 +506888,7 @@ _081B133E:
bl ResetAllObjectData
bl sub_81B06F4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081B134C:
pop {r4,r5}
pop {r0}
@@ -507923,7 +507923,7 @@ sub_81B1B5C: @ 81B1B5C
bl sub_81B3300
ldr r0, =sub_81B1B8C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -507966,7 +507966,7 @@ sub_81B1B8C: @ 81B1B8C
bl ClearWindowTilemap
_081B1BC2:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081B1BC8:
pop {r4,r5}
pop {r0}
@@ -507978,7 +507978,7 @@ _081B1BC8:
sub_81B1BD4: @ 81B1BD4
push {lr}
ldr r0, =sub_81B1B8C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -508342,7 +508342,7 @@ _081B1EDC:
bl ConvertIntToDecimalString
_081B1EF8:
mov r0, r8
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_081B1EFE:
pop {r3}
mov r8, r3
@@ -508408,7 +508408,7 @@ sub_81B1F18: @ 81B1F18
ldr r1, =sub_81B1E60
mov r0, r8
adds r2, r7, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -508466,7 +508466,7 @@ _081B1FFE:
_081B2002:
ldr r1, =sub_81B1E60
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
_081B200A:
pop {r4,r5}
pop {r0}
@@ -514817,7 +514817,7 @@ hm_add_c3_launch_phase_2: @ 81B5738
bl pal_fill_black
ldr r0, =task_launch_hm_phase_2
movs r1, 0x8
- bl AddTask
+ bl CreateTask
movs r0, 0x1
pop {r1}
bx r1
@@ -514843,7 +514843,7 @@ task_launch_hm_phase_2: @ 81B5750
ldr r0, [r0]
bl _call_via_r0
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081B577C:
pop {r4}
pop {r0}
@@ -518654,7 +518654,7 @@ sub_81B7810: @ 81B7810
movs r2, 0x1
bl sub_813DA40
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _081B786E
.pool
_081B7860:
@@ -521923,7 +521923,7 @@ hm_add_c3_without_phase_2: @ 81B93C8
bl pal_fill_black
ldr r0, =task_hm_without_phase_2
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
pop {r1}
bx r1
@@ -521940,7 +521940,7 @@ task_hm_without_phase_2: @ 81B93E0
cmp r0, 0
beq _081B93FE
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
_081B93FE:
@@ -521958,7 +521958,7 @@ sub_81B9404: @ 81B9404
bl fade_screen
ldr r0, =sub_81B9424
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -521990,7 +521990,7 @@ sub_81B9424: @ 81B9424
movs r3, 0
bl sub_81B0038
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081B945C:
add sp, 0xC
pop {r4,r5}
@@ -522034,7 +522034,7 @@ sub_81B94B0: @ 81B94B0
bl fade_screen
ldr r0, =sub_81B94D0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -522066,7 +522066,7 @@ sub_81B94D0: @ 81B94D0
movs r3, 0
bl sub_81B0038
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081B9508:
add sp, 0xC
pop {r4,r5}
@@ -522084,7 +522084,7 @@ sub_81B951C: @ 81B951C
bl fade_screen
ldr r0, =sub_81B953C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -522116,7 +522116,7 @@ sub_81B953C: @ 81B953C
movs r3, 0
bl sub_81B0038
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081B9574:
add sp, 0xC
pop {r4,r5}
@@ -522205,7 +522205,7 @@ sub_81B9620: @ 81B9620
bl fade_screen
ldr r0, =sub_81B9640
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.pool
@@ -522237,7 +522237,7 @@ sub_81B9640: @ 81B9640
movs r3, 0
bl sub_81B0038
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_081B9678:
add sp, 0xC
pop {r4,r5}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 04:57:11 +0000