summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/macros/function.s6
-rw-r--r--asm/rom.s2543
-rw-r--r--include/task.h27
-rw-r--r--iwram_syms.txt2
-rw-r--r--src/task.c295
5 files changed, 1370 insertions, 1503 deletions
diff --git a/asm/macros/function.s b/asm/macros/function.s
index b109595df..67fb373a8 100644
--- a/asm/macros/function.s
+++ b/asm/macros/function.s
@@ -2,7 +2,7 @@
.align 2, 0
.global \name
.arm
- .type \name, %function
+ .type \name, function
.endm
.macro arm_func_end name
@@ -14,14 +14,14 @@
.global \name
.thumb
.thumb_func
- .type \name, %function
+ .type \name, function
.endm
.macro non_word_aligned_thumb_func_start name
.global \name
.thumb
.thumb_func
- .type \name, %function
+ .type \name, function
.endm
.macro thumb_func_end name
diff --git a/asm/rom.s b/asm/rom.s
index b0858bd94..743291338 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -14075,7 +14075,7 @@ sub_8007080: ; 8007080
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_8007080
@@ -14225,7 +14225,7 @@ sub_80071A4: ; 80071A4
push {r4-r6,lr}
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, _08007248
bl SetVBlankCallback
ldr r4, _0800724C
@@ -14268,8 +14268,8 @@ _080071E4:
strh r0, [r1]
ldr r0, _08007260
movs r1, 0
- bl AddTask
- bl RunActiveTasks
+ bl CreateTask
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -14279,7 +14279,7 @@ _080071E4:
bl sub_8007280
ldr r0, _08007268
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, _0800726C
bl SetMainCallback2
pop {r4-r6}
@@ -14428,7 +14428,7 @@ task02_080097CC: ; 8007340
movs r0, 0x1
strb r0, [r1]
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_0800736A:
pop {r0}
bx r0
@@ -14479,7 +14479,7 @@ _080073B6:
ble _080073B6
ldr r0, _08007408
movs r1, 0x2
- bl AddTask
+ bl CreateTask
pop {r4-r6}
pop {r0}
bx r0
@@ -14728,7 +14728,7 @@ c2_08009A8C: ; 80075CC
movs r1, 0x1
movs r2, 0
bl sub_8007428
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -16910,7 +16910,7 @@ sub_80085BC: ; 80085BC
movs r1, 0
movs r2, 0x2
bl rboxid_80040B8
- bl clear_tasks
+ bl ResetTasks
ldr r0, _08008638
bl SetVBlankCallback
ldr r4, _0800863C
@@ -16936,9 +16936,9 @@ sub_80085BC: ; 80085BC
strb r1, [r0]
ldr r0, _08008648
movs r1, 0
- bl AddTask
+ bl CreateTask
bl sub_8074D08
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -18383,7 +18383,7 @@ _080090F0: .4byte 0x0000efff
thumb_func_start sub_80096C4
sub_80096C4: ; 80096C4
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -18484,7 +18484,7 @@ sub_8009708: ; 8009708
movs r2, 0x20
bl gpu_pal_apply
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r0, _080097D4
@@ -18556,7 +18556,7 @@ _080097EE:
strh r0, [r1]
ldr r0, _08009870
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08009874
@@ -19452,7 +19452,7 @@ _08009F78:
_08009F80:
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _08009FA4
.align 2
_08009F8C: .4byte 0x03001770
@@ -19462,7 +19462,7 @@ _08009F98:
ldr r0, _08009FAC
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08009FA4:
pop {r4,r5}
pop {r0}
@@ -19485,7 +19485,7 @@ main_menu_handle_b_pressed: ; 8009FB0
ldr r0, _08009FD8
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08009FCE:
pop {r4}
pop {r0}
@@ -21591,7 +21591,7 @@ sub_800B034: ; 800B034
ldr r0, _0800B05C
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0800B052:
pop {r4}
pop {r0}
@@ -21669,10 +21669,10 @@ new_game_prof_birch_speech_part2_start: ; 800B060
movs r1, 0
movs r2, 0x40
bl gpu_pal_apply
- bl clear_tasks
+ bl ResetTasks
ldr r0, _0800B15C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _0800B160
@@ -22042,7 +22042,7 @@ sub_800B3EC: ; 800B3EC
movs r0, 0x1
strh r0, [r1, 0x12]
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _0800B44E
.align 2
_0800B420: .4byte 0x03004b20
@@ -22109,7 +22109,7 @@ sub_800B458: ; 800B458
strh r6, [r0, 0x12]
ldr r0, _0800B4C4
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -22157,7 +22157,7 @@ sub_800B4C8: ; 800B4C8
movs r0, 0x1
strh r0, [r1, 0x12]
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _0800B52A
.align 2
_0800B4FC: .4byte 0x03004b20
@@ -22226,7 +22226,7 @@ sub_800B534: ; 800B534
strh r6, [r0, 0x12]
ldr r0, _0800B5A4
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -22277,7 +22277,7 @@ _0800B5CC:
cmp r0, 0x8
bne _0800B5DE
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _0800B608
_0800B5DE:
ldrh r2, [r1, 0x10]
@@ -22320,7 +22320,7 @@ sub_800B614: ; 800B614
lsrs r5, 24
ldr r0, _0800B64C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0800B650
@@ -22370,7 +22370,7 @@ _0800B678:
cmp r0, 0
bne _0800B68A
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _0800B6B4
_0800B68A:
ldrh r2, [r1, 0x10]
@@ -22413,7 +22413,7 @@ sub_800B6C0: ; 800B6C0
lsrs r5, 24
ldr r0, _0800B6F8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0800B6FC
@@ -22628,7 +22628,7 @@ sub_800B858: ; 800B858
bl sub_8007378
ldr r0, _0800B880
movs r1, 0
- bl AddTask
+ bl CreateTask
bl sub_800BF28
_0800B876:
pop {r0}
@@ -23479,7 +23479,7 @@ sub_800BF28: ; 800BF28
sub sp, 0x4
ldr r0, _0800BFD0
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r2, _0800BFD4
strb r0, [r2]
ldr r5, _0800BFD8
@@ -23517,7 +23517,7 @@ sub_800BF28: ; 800BF28
strh r4, [r0, 0x26]
ldr r0, _0800BFDC
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r2, _0800BFE0
strb r0, [r2]
ldrb r1, [r2]
@@ -27893,7 +27893,7 @@ _0800E154:
movs r0, 0x78
bl audio_play
mov r0, r9
- bl remove_task
+ bl DestroyTask
ldr r4, _0800E224
ldr r0, _0800E228
mov r8, r0
@@ -28793,7 +28793,7 @@ _0800E868:
bl sub_800D6D4
bl sub_800DAB8
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl sub_800E23C
bl ResetObjectPaletteAllocator
ldr r1, _0800E968
@@ -29244,7 +29244,7 @@ _0800EC98: .4byte gUnknown_081F96C8
thumb_func_start sub_800EC9C
sub_800EC9C: ; 800EC9C
push {r4-r7,lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl link_get_multiplayer_id
@@ -29440,7 +29440,7 @@ _0800EE38:
bl sub_800EB08
ldr r0, _0800EE78
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _0800EE7C
@@ -29772,7 +29772,7 @@ sub_800F104: ; 800F104
ldr r0, _0800F154
adds r0, r4
mov r8, r0
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
ldr r5, _0800F158
@@ -29954,7 +29954,7 @@ sub_800F298: ; 800F298
ldr r1, _0800F2D4
adds r0, r1
strb r6, [r0]
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
ldr r0, _0800F2D8
@@ -30140,7 +30140,7 @@ _0800F41C:
bl memcpy
ldr r0, _0800F47C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0800F480
@@ -30640,7 +30640,7 @@ sub_800F808: ; 800F808
ldr r0, _0800F824
bl sub_800374C
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
.align 2
@@ -31780,7 +31780,7 @@ _08010084:
bl decompress_palette
bl sub_800D74C
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl sub_800E23C
ldr r1, _0801019C
movs r0, 0x37
@@ -31793,7 +31793,7 @@ _08010084:
bl SetVBlankCallback
ldr r0, _080101A8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080101AC
@@ -31856,7 +31856,7 @@ sub_80101B8: ; 80101B8
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_80101B8
@@ -89886,7 +89886,7 @@ c3_0802FDF4: ; 802D86C
lsls r2, 1
bl MPlayVolumeControl
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0802D88E:
pop {r4}
pop {r0}
@@ -90121,7 +90121,7 @@ _0802DA58:
ldr r1, _0802DA7C
str r1, [r0]
mov r0, r9
- bl remove_task
+ bl DestroyTask
b _0802DA86
.align 2
_0802DA78: .4byte 0x03004330
@@ -90380,7 +90380,7 @@ _0802DC7C:
ldr r1, _0802DCAC
str r1, [r0]
mov r0, r8
- bl remove_task
+ bl DestroyTask
_0802DC98:
add sp, 0x8
pop {r3-r5}
@@ -90555,7 +90555,7 @@ sub_802DDC4: ; 802DDC4
ldr r1, _0802DE0C
str r1, [r0]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -90728,7 +90728,7 @@ sub_802DF30: ; 802DF30
lsls r1, 3
adds r1, r3
ldrb r4, [r1, 0x8]
- bl remove_task
+ bl DestroyTask
adds r0, r4, 0
bl sub_8094E20
_0802DF6A:
@@ -95330,7 +95330,7 @@ sub_8030594: ; 8030594
sub sp, 0x4
ldr r0, _08030644
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
ldr r3, _08030648
ldr r5, _0803064C
ldrb r1, [r5]
@@ -95413,7 +95413,7 @@ _08030600:
pop {r0}
bx r0
.align 2
-_08030644: .4byte nullsub_54
+_08030644: .4byte TaskDummy
_08030648: .4byte 0x0300434c
_0803064C: .4byte 0x02024a60
_08030650: .4byte 0x03004b20
@@ -95605,7 +95605,7 @@ _080307D0:
orrs r4, r0
ldr r0, _08030824
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08030828
@@ -96331,7 +96331,7 @@ sub_8030CC0: ; 8030CC0
strb r0, [r1, 0x5]
ldr r0, _08030E1C
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _08030E20
@@ -96552,7 +96552,7 @@ _08030F70:
mov r3, r9
strb r3, [r2]
mov r0, r8
- bl remove_task
+ bl DestroyTask
_08030F88:
pop {r3,r4}
mov r8, r3
@@ -97336,7 +97336,7 @@ _08031578:
bl move_something
ldr r0, _080315E0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080315E4
@@ -97404,7 +97404,7 @@ sub_80315E8: ; 80315E8
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08031626:
pop {r4}
pop {r0}
@@ -97459,7 +97459,7 @@ move_anim_start_t4: ; 8031660
bl move_something
ldr r0, _080316C0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080316C4
@@ -97521,7 +97521,7 @@ sub_80316CC: ; 80316CC
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0803170A:
pop {r4}
pop {r0}
@@ -101003,7 +101003,7 @@ sub_80332D0: ; 80332D0
bne _080332F6
ldr r0, _08033304
movs r1, 0xA
- bl AddTask
+ bl CreateTask
bl sub_80334EC
_080332F6:
pop {r0}
@@ -105927,7 +105927,7 @@ sub_8035B04: ; 8035B04
bl oamt_set_x3A_32
ldr r0, _08035BF4
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _08035BF8
@@ -106106,7 +106106,7 @@ _08035CF0:
mov r0, r9
strb r0, [r2]
mov r0, r8
- bl remove_task
+ bl DestroyTask
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -110169,7 +110169,7 @@ sub_8037D2C: ; 8037D2C
bne _08037D52
ldr r0, _08037D60
movs r1, 0xA
- bl AddTask
+ bl CreateTask
bl dp01_tbl4_exec_completed
_08037D52:
pop {r0}
@@ -114651,7 +114651,7 @@ sub_803A1B8: ; 803A1B8
bl oamt_set_x3A_32
ldr r0, _0803A2A8
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _0803A2AC
@@ -114804,7 +114804,7 @@ _0803A370:
mov r0, r9
strb r0, [r2]
mov r0, r8
- bl remove_task
+ bl DestroyTask
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -132066,7 +132066,7 @@ _0804279C:
strh r0, [r2]
strb r0, [r3]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
movs r0, 0xF
movs r1, 0x6
movs r2, 0x1D
@@ -132091,7 +132091,7 @@ _080427E8:
movs r1, 0x2
strb r1, [r0]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
movs r0, 0xF
movs r1, 0x6
movs r2, 0x1D
@@ -132143,7 +132143,7 @@ sub_8042824: ; 8042824
bl InitMenu
ldr r0, _08042884
movs r1, 0x3
- bl AddTask
+ bl CreateTask
add sp, 0x6C
pop {r4}
pop {r0}
@@ -132642,7 +132642,7 @@ sub_8042C80: ; 8042C80
bl script_env_2_enable
ldr r0, _08042CA8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -132674,7 +132674,7 @@ sub_8042CAC: ; 8042CAC
ldr r0, _08042CE4
str r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08042CD0:
pop {r4}
pop {r0}
@@ -132730,7 +132730,7 @@ _08042D34:
strb r1, [r0, 0x4]
adds r0, 0x3A
strb r2, [r0]
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r0, _08042D80
@@ -133023,7 +133023,7 @@ _08042FE4:
ldr r0, _08043008
bl sub_8075474
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08042FF8:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -133095,7 +133095,7 @@ _08043068:
strb r0, [r1, 0x2]
ldr r0, _0804309C
movs r1, 0x5
- bl AddTask
+ bl CreateTask
b _080432BA
.align 2
_08043098: .4byte 0x0300481c
@@ -133352,7 +133352,7 @@ _080432A8:
ldr r0, _080432E0
bl SetMainCallback2
_080432BA:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -136614,7 +136614,7 @@ _08044C2E:
_08044C38:
ldr r0, _08044C98
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _08044C9C
@@ -136659,7 +136659,7 @@ _08044C62:
pop {r1}
bx r1
.align 2
-_08044C98: .4byte nullsub_54
+_08044C98: .4byte TaskDummy
_08044C9C: .4byte 0x03004b20
thumb_func_end sub_8044804
@@ -137020,7 +137020,7 @@ _08044F4C:
adds r0, 0x2
strh r5, [r0]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_08044F62:
add sp, 0x8
pop {r4-r6}
@@ -137118,7 +137118,7 @@ _0804500C:
adds r0, 0x2
strh r5, [r0]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08045022:
add sp, 0x8
pop {r4-r7}
@@ -139679,7 +139679,7 @@ sub_8046400: ; 8046400
strb r1, [r0]
ldr r0, _0804645C
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08046460
@@ -139866,7 +139866,7 @@ _080465A6:
cmp r2, 0
bne _080465CC
mov r0, r10
- bl remove_task
+ bl DestroyTask
b _08046616
.align 2
_080465C4: .4byte 0x02024c08
@@ -139917,7 +139917,7 @@ _08046616:
.align 2
_08046628: .4byte 0x0000ffd8
_0804662C: .4byte 0x03004b20
-_08046630: .4byte nullsub_54
+_08046630: .4byte TaskDummy
thumb_func_end sub_8046464
thumb_func_start objc_0804ABD4
@@ -139992,7 +139992,7 @@ objc_0804ABD4: ; 8046634
mov r0, r8
strh r0, [r7, 0x3C]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080466E4
str r0, [r7, 0x1C]
_080466D4:
@@ -140645,7 +140645,7 @@ _08046BD0:
bl sub_8075114
_08046BEE:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _08046C72
_08046BF6:
lsls r0, r4, 2
@@ -140710,7 +140710,7 @@ _08046C60:
movs r2, 0
bl sub_8075114
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08046C72:
pop {r4-r6}
pop {r0}
@@ -140895,7 +140895,7 @@ _08046DF4:
_08046DF6:
ldr r0, _08046E6C
movs r1, 0x3
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08046E70
@@ -143163,7 +143163,7 @@ _08047F48:
bl sub_804AA88
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, [r5]
adds r0, 0xC8
ldr r1, _08048020
@@ -143296,7 +143296,7 @@ _08048058:
strb r2, [r0]
ldr r0, _080480B0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
b _080484C6
.align 2
_08048098: .4byte 0x03002b74
@@ -143787,7 +143787,7 @@ _080484A8:
ldr r0, _080484F0
strb r4, [r0]
_080484C6:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -143858,7 +143858,7 @@ _0804857C:
str r6, [r5]
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, [r5]
adds r0, 0xC8
ldr r1, _08048638
@@ -144348,7 +144348,7 @@ _080489B0:
ldr r0, _080489F0
strb r4, [r0]
_080489CA:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -144495,7 +144495,7 @@ sub_8048AB4: ; 8048AB4
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -149783,7 +149783,7 @@ _0804B47C:
lsls r1, 19
movs r0, 0
strh r0, [r1]
- bl clear_tasks
+ bl ResetTasks
bl AllocZeroed
ldr r6, _0804B570
ldr r5, _0804B574
@@ -150109,7 +150109,7 @@ _0804B75C:
ldr r0, _0804B78C
bl SetMainCallback2
_0804B76E:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -150186,7 +150186,7 @@ _0804B7F4:
movs r3, 0
mov r8, r3
strh r6, [r0]
- bl clear_tasks
+ bl ResetTasks
ldr r5, _0804B8F4
ldr r0, _0804B8F8
str r0, [r5]
@@ -150380,7 +150380,7 @@ _0804B9E0:
ldr r0, _0804BA14
bl SetMainCallback2
_0804B9F2:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -150614,7 +150614,7 @@ _0804BBC8: .4byte 0x03004828
sub_804BBCC: ; 804BBCC
push {lr}
bl sub_804C29C
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -153590,7 +153590,7 @@ _0804D614:
lsls r0, 24
cmp r0, 0
bne _0804D622
- bl RunActiveTasks
+ bl RunTasks
_0804D622:
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
@@ -154312,7 +154312,7 @@ sub_804DB84: ; 804DB84
_0804DBE6:
bl sub_804BB78
bl sub_804D63C
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -154364,7 +154364,7 @@ sub_804DC18: ; 804DC18
adds r0, 0x9D
strb r1, [r0]
_0804DC64:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -154840,7 +154840,7 @@ _0804E11A:
lsls r0, 24
cmp r0, 0
bne _0804E128
- bl RunActiveTasks
+ bl RunTasks
_0804E128:
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
@@ -154866,7 +154866,7 @@ sub_804E144: ; 804E144
ldr r0, _0804E170
bl SetMainCallback2
_0804E158:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -154884,7 +154884,7 @@ sub_804E174: ; 804E174
bl script_env_2_enable
ldr r0, _0804E19C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -154916,7 +154916,7 @@ sub_804E1A0: ; 804E1A0
ldr r0, _0804E1D8
str r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0804E1C4:
pop {r4}
pop {r0}
@@ -156036,7 +156036,7 @@ _0804EA20:
_0804EBBC:
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, _0804EC60
bl SetVBlankCallback
ldr r4, _0804EC64
@@ -156661,7 +156661,7 @@ _0804F0BC:
ldr r0, _0804F0F0
bl SetMainCallback2
_0804F0CE:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -156685,7 +156685,7 @@ sub_804F0F4: ; 804F0F4
strh r0, [r1]
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, _0804F158
bl SetVBlankCallback
ldr r4, _0804F15C
@@ -157515,7 +157515,7 @@ _0804F754:
_0804F792:
ldm r6!, {r0}
lsrs r1, r5, 24
- bl AddTask
+ bl CreateTask
ldr r1, _0804F804
ldr r1, [r1]
movs r2, 0xA4
@@ -157552,7 +157552,7 @@ _0804F7D6:
bl audio_play
bl sub_804E290
_0804F7E6:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -157622,7 +157622,7 @@ sub_804F844: ; 804F844
ldr r0, _0804F88C
strh r0, [r1]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_0804F87C:
pop {r4}
pop {r0}
@@ -157644,7 +157644,7 @@ sub_804F890: ; 804F890
lsrs r4, 24
ldr r0, _0804F8C0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0804F8C4
@@ -158864,7 +158864,7 @@ _08050218:
ldr r0, _080502A0
bl SetMainCallback2
_0805027E:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -159864,7 +159864,7 @@ _080509CC:
adds r0, r1
adds r0, r4
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -160234,7 +160234,7 @@ _08050CB6:
ldrh r0, [r0]
bl sub_8051A3C
bl sub_805123C
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -160719,7 +160719,7 @@ _080510B6:
bl SetMainCallback2
_080510C4:
bl sub_805123C
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -160878,7 +160878,7 @@ _08051218:
bl SetMainCallback2
_0805121E:
bl sub_805123C
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -161606,7 +161606,7 @@ _080517A0:
beq _0805180C
bl sub_8007E4C
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _0805180C
.align 2
_080517B8: .4byte 0x03004b20
@@ -161644,7 +161644,7 @@ _080517F8:
cmp r0, 0x1
bne _0805180C
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0805180C:
add sp, 0x4
pop {r4-r6}
@@ -162647,7 +162647,7 @@ _08051F86:
bl sub_805201C
ldr r0, _08051FF0
movs r1, 0x6
- bl AddTask
+ bl CreateTask
ldr r0, [r4]
adds r0, 0xAB
movs r1, 0x1
@@ -163277,7 +163277,7 @@ sub_80524BC: ; 80524BC
push {r4,lr}
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, _0805251C
bl SetVBlankCallback
ldr r4, _08052520
@@ -163294,7 +163294,7 @@ sub_80524BC: ; 80524BC
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -164032,7 +164032,7 @@ _08052AF4: .4byte 0x020297e0
sub_8052AF8: ; 8052AF8
push {lr}
bl sub_8052918
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -164158,7 +164158,7 @@ _08052BF6:
ldrh r0, [r0]
bl sub_8075474
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08052C16:
pop {r4,r5}
pop {r0}
@@ -167178,7 +167178,7 @@ _0805436C: .4byte c2_overworld
c2_overworld_basic: ; 8054370
push {lr}
bl script_env_2_run_current_script
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl CameraUpdate
bl UpdateCameraPanning
@@ -168335,7 +168335,7 @@ _08054D48: .4byte 0x00007060
sub_8054D4C: ; 8054D4C
push {r4,lr}
adds r4, r0, 0
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_8073B94
bl dp12_8087EA4
@@ -176660,7 +176660,7 @@ task50_overworld_door: ; 80584C8
cmp r0, 0
bne _080584F6
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080584F6:
pop {r4}
pop {r0}
@@ -176721,14 +176721,14 @@ task_overworld_door_add_if_inactive: ; 8058538
mov r8, r3
ldr r4, _08058584
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0805858C
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -177026,7 +177026,7 @@ _08058774:
sub_805877C: ; 805877C
push {lr}
ldr r0, _0805878C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -180119,7 +180119,7 @@ task_add_bump_boulder: ; 8059DF0
ldr r6, _08059E24
adds r0, r6, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08059E28
@@ -180297,10 +180297,10 @@ sub_8059F40: ; 8059F40
strb r0, [r1, 0x6]
bl script_env_2_disable
ldr r0, _08059F90
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08059F82:
movs r0, 0
pop {r4,r5}
@@ -180317,7 +180317,7 @@ sub_8059F94: ; 8059F94
ldr r4, _08059FB0
adds r0, r4, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -180405,10 +180405,10 @@ sub_805A000: ; 805A000
orrs r0, r1
strb r0, [r5, 0x1]
ldr r0, _0805A068
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0805A05C:
movs r0, 0
pop {r4-r6}
@@ -180425,7 +180425,7 @@ sub_805A06C: ; 805A06C
ldr r4, _0805A088
adds r0, r4, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -180615,10 +180615,10 @@ sub_805A1B8: ; 805A1B8
movs r0, 0
strb r0, [r1, 0x6]
ldr r0, _0805A208
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0805A1FC:
movs r0, 0
pop {r4,r5}
@@ -180650,7 +180650,7 @@ sub_805A20C: ; 805A20C
ldr r5, _0805A25C
adds r0, r5, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0805A260
@@ -180764,7 +180764,7 @@ sub_805A2D0: ; 805A2D0
adds r0, r1
bl RemoveObjectAndFreeTiles
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0805A336:
pop {r4-r6}
pop {r0}
@@ -180784,7 +180784,7 @@ StartFishing: ; 805A348
ldr r5, _0805A374
adds r0, r5, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0805A378
@@ -181344,10 +181344,10 @@ _0805A780:
movs r0, 0x1
bl sub_80BE97C
ldr r0, _0805A7B8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0805A7A8:
movs r0, 0
pop {r3}
@@ -181541,10 +181541,10 @@ fishF: ; 805A914
movs r0, 0
bl sub_80BE97C
ldr r0, _0805A950
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0805A946:
movs r0, 0
pop {r1}
@@ -204220,7 +204220,7 @@ _08064B1C:
movs r0, 0
strb r0, [r1]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08064B28:
pop {r4,r5}
pop {r0}
@@ -204235,7 +204235,7 @@ task_add_textbox: ; 8064B38
push {lr}
ldr r0, _08064B48
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -204246,12 +204246,12 @@ _08064B48: .4byte sub_8064AA0
task_del_textbox: ; 8064B4C
push {lr}
ldr r0, _08064B64
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _08064B60
- bl remove_task
+ bl DestroyTask
_08064B60:
pop {r0}
bx r0
@@ -204478,7 +204478,7 @@ sub_8064CDC: ; 8064CDC
beq _08064CF6
bl sub_80594C0
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08064CF6:
pop {r4}
pop {r0}
@@ -204489,7 +204489,7 @@ _08064CF6:
sub_8064CFC: ; 8064CFC
push {lr}
ldr r0, _08064D14
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08064D18
@@ -204511,7 +204511,7 @@ sub_8064D20: ; 8064D20
bl player_bitmagic
ldr r0, _08064D34
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -204569,7 +204569,7 @@ _08064D8A:
cmp r0, 0
beq _08064DA0
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_08064DA0:
pop {r4-r6}
pop {r0}
@@ -204584,7 +204584,7 @@ _08064DB0: .4byte 0x03004ae0
sub_8064DB4: ; 8064DB4
push {lr}
ldr r0, _08064DCC
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08064DD0
@@ -204608,7 +204608,7 @@ sub_8064DD8: ; 8064DD8
bl sub_8064470
ldr r0, _08064E20
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r2, _08064E24
@@ -214237,14 +214237,14 @@ overworld_ensure_per_step_coros_running: ; 80694EC
push {r4,r5,lr}
ldr r5, _08069548
adds r0, r5, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _08069516
adds r0, r5, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0806954C
@@ -214256,23 +214256,23 @@ overworld_ensure_per_step_coros_running: ; 80694EC
_08069516:
ldr r4, _08069550
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0806952C
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_0806952C:
ldr r4, _08069554
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08069542
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_08069542:
pop {r4,r5}
pop {r0}
@@ -214290,7 +214290,7 @@ activate_per_step_callback: ; 8069558
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08069590
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -214328,11 +214328,11 @@ _0806959A:
wild_encounter_reset_coro_args: ; 80695A0
push {lr}
ldr r0, _080695D0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _080695D4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -217147,7 +217147,7 @@ _0806AB16:
bl remove_some_task
bl dp12_8087EA4
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl sub_8073B94
ldr r4, _0806ABA0
adds r0, r4, 0
@@ -217166,7 +217166,7 @@ _0806AB16:
bl SetMainCallback2
ldr r0, _0806ABAC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -217184,7 +217184,7 @@ _0806ABAC: .4byte sub_806ACCC
thumb_func_start sub_806ABB0
sub_806ABB0: ; 806ABB0
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -217290,7 +217290,7 @@ _0806AC80:
cmp r0, 0
beq _0806ACB0
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl DoSoftReset
b _0806ACC4
.align 2
@@ -217308,7 +217308,7 @@ _0806ACB0:
movs r0, 0x5
bl audio_play
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0806ACC4:
add sp, 0x8
pop {r4,r5}
@@ -217393,7 +217393,7 @@ _0806AD68:
bl RtcCalcLocalTime
ldr r0, _0806AD7C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x2]
@@ -217425,7 +217425,7 @@ _0806AD96:
str r1, [r2, 0x4]
ldr r0, _0806ADD4
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x2]
@@ -217455,7 +217455,7 @@ _0806ADD8:
cmp r0, 0
bne _0806AE08
ldrb r0, [r5, 0x2]
- bl remove_task
+ bl DestroyTask
_0806ADFC:
movs r0, 0x2
strh r0, [r5]
@@ -217464,7 +217464,7 @@ _0806ADFC:
_0806AE04: .4byte 0x03004b20
_0806AE08:
ldrb r0, [r5, 0x2]
- bl remove_task
+ bl DestroyTask
bl RtcReset
ldr r4, _0806AE4C
movs r1, 0
@@ -217543,7 +217543,7 @@ _0806AEAE:
cmp r0, 0
bne _0806AEC4
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl DoSoftReset
_0806AEC4:
add sp, 0x4
@@ -217588,7 +217588,7 @@ _0806AEF8:
adds r6, 0x1
cmp r6, 0x5
ble _0806AEF8
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
add sp, 0x4
pop {r4-r6}
@@ -218016,7 +218016,7 @@ _0806B282:
beq _0806B298
cmp r0, 0x5
beq _0806B298
- bl clear_tasks
+ bl ResetTasks
_0806B298:
ldr r1, _0806B2A4
ldr r2, _0806B2A8
@@ -218036,7 +218036,7 @@ _0806B2B2:
adds r0, r4, r1
ldr r0, [r0]
movs r1, 0
- bl AddTask
+ bl CreateTask
movs r2, 0x98
lsls r2, 2
adds r1, r4, r2
@@ -221155,7 +221155,7 @@ sub_806CA60: ; 806CA60
strb r4, [r5]
ldr r0, _0806CAE4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, _0806CAE8
bl object_new_hidden_with_callback
strb r0, [r5, 0x1]
@@ -221196,7 +221196,7 @@ sub_806CA60: ; 806CA60
bx r0
.align 2
_0806CAD8: .4byte 0x03004b20
-_0806CADC: .4byte nullsub_54
+_0806CADC: .4byte TaskDummy
_0806CAE0: .4byte 0x02001000
_0806CAE4: .4byte sub_806CB74
_0806CAE8: .4byte nullsub_2
@@ -221380,9 +221380,9 @@ sub_806CC2C: ; 806CC2C
movs r0, 0x2
strb r0, [r1]
ldrb r0, [r5]
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -225017,7 +225017,7 @@ sub_806E834: ; 806E834
bl AddTextPrinterWithCallbackForMessage
ldr r0, _0806E87C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0806E880
@@ -225064,7 +225064,7 @@ sub_806E884: ; 806E884
bl Reset
_0806E8BA:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0806E8C0:
pop {r4,r5}
pop {r0}
@@ -225205,11 +225205,11 @@ sub_806E964: ; 806E964
bl sub_806E834
ldr r0, _0806E9EC
movs r1, 0x5
- bl AddTask
+ bl CreateTask
b _0806EA78
.align 2
_0806E9D4: .4byte 0x03004b20
-_0806E9D8: .4byte nullsub_54
+_0806E9D8: .4byte TaskDummy
_0806E9DC: .4byte 0x0201c000
_0806E9E0: .4byte 0x0202e8f4
_0806E9E4: .4byte 0x0202e8f8
@@ -225231,7 +225231,7 @@ _0806E9F0:
bl sub_806E834
ldr r0, _0806EA40
movs r1, 0x5
- bl AddTask
+ bl CreateTask
adds r0, r5, 0
bl itemid_is_mail
lsls r0, 24
@@ -225269,7 +225269,7 @@ _0806EA66:
bl sub_806EBF0
ldr r0, _0806EA88
movs r1, 0x5
- bl AddTask
+ bl CreateTask
_0806EA78:
pop {r3-r5}
mov r8, r3
@@ -225304,7 +225304,7 @@ party_menu_link_mon_held_item_object: ; 806EA8C
ldr r1, [r4, 0x10]
str r1, [r0]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0806EABA:
pop {r4,r5}
pop {r0}
@@ -225534,11 +225534,11 @@ sub_806EC44: ; 806EC44
bl sub_806E834
ldr r0, _0806ECB8
movs r1, 0x5
- bl AddTask
+ bl CreateTask
b _0806ECDA
.align 2
_0806ECA0: .4byte 0x03004b20
-_0806ECA4: .4byte nullsub_54
+_0806ECA4: .4byte TaskDummy
_0806ECA8: .4byte 0x0201c000
_0806ECAC: .4byte 0x0202e8f4
_0806ECB0: .4byte 0x02028280
@@ -225555,7 +225555,7 @@ _0806ECBC:
bl sub_806E834
ldr r0, _0806ECE4
movs r1, 0x5
- bl AddTask
+ bl CreateTask
_0806ECDA:
pop {r4,r5}
pop {r0}
@@ -225599,11 +225599,11 @@ sub_806ECE8: ; 806ECE8
bl sub_806E834
ldr r0, _0806ED4C
movs r1, 0x5
- bl AddTask
+ bl CreateTask
b _0806EDA2
.align 2
_0806ED38: .4byte 0x03004b20
-_0806ED3C: .4byte nullsub_54
+_0806ED3C: .4byte TaskDummy
_0806ED40: .4byte 0x0201c000
_0806ED44: .4byte 0x020234cc
_0806ED48: .4byte gUnknown_0840F213
@@ -225645,7 +225645,7 @@ _0806ED92:
_0806ED9A:
ldr r0, _0806EDB0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
_0806EDA2:
add sp, 0x4
pop {r4-r6}
@@ -225719,13 +225719,13 @@ sub_806EE08: ; 806EE08
bl sub_806E834
ldr r0, _0806EE58
movs r1, 0x5
- bl AddTask
+ bl CreateTask
pop {r4}
pop {r0}
bx r0
.align 2
_0806EE48: .4byte 0x03004b20
-_0806EE4C: .4byte nullsub_54
+_0806EE4C: .4byte TaskDummy
_0806EE50: .4byte 0x0201c000
_0806EE54: .4byte gUnknown_0840F0E8
_0806EE58: .4byte sub_806EFEC
@@ -226027,13 +226027,13 @@ sub_806F06C: ; 806F06C
bl sub_806E8D0
ldr r0, _0806F0B0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
pop {r4-r6}
pop {r0}
bx r0
.align 2
_0806F0A8: .4byte 0x03004b20
-_0806F0AC: .4byte nullsub_54
+_0806F0AC: .4byte TaskDummy
_0806F0B0: .4byte sub_806F0B4
thumb_func_end sub_806F06C
@@ -226295,7 +226295,7 @@ _0806F2DC:
ldr r1, [r4, 0x10]
str r1, [r0]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_0806F2F2:
pop {r4-r6}
pop {r0}
@@ -226341,7 +226341,7 @@ _0806F338:
ldr r1, [r4, 0x10]
str r1, [r0]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_0806F34E:
pop {r4-r6}
pop {r0}
@@ -226459,7 +226459,7 @@ sub_806F3FC: ; 806F3FC
str r4, [sp]
bl sub_809D9F0
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0806F430:
add sp, 0x4
pop {r4,r5}
@@ -226560,7 +226560,7 @@ sub_806F490: ; 806F490
bl sub_806E834
ldr r0, _0806F538
movs r1, 0x5
- bl AddTask
+ bl CreateTask
_0806F506:
pop {r4,r5}
pop {r0}
@@ -226568,7 +226568,7 @@ _0806F506:
.align 2
_0806F50C: .4byte 0x0202f388
_0806F510: .4byte 0x03004b20
-_0806F514: .4byte nullsub_54
+_0806F514: .4byte TaskDummy
_0806F518: .4byte 0x0203855e
_0806F51C: .4byte sub_808B508
_0806F520: .4byte 0x0201c000
@@ -226657,7 +226657,7 @@ sub_806F588: ; 806F588
bl sub_806E834
ldr r0, _0806F610
movs r1, 0x5
- bl AddTask
+ bl CreateTask
_0806F5E0:
pop {r4}
pop {r0}
@@ -226665,7 +226665,7 @@ _0806F5E0:
.align 2
_0806F5E8: .4byte 0x0202f388
_0806F5EC: .4byte 0x03004b20
-_0806F5F0: .4byte nullsub_54
+_0806F5F0: .4byte TaskDummy
_0806F5F4: .4byte 0x0203855e
_0806F5F8: .4byte sub_808B508
_0806F5FC: .4byte 0x020232cc
@@ -227286,7 +227286,7 @@ sub_806FB0C: ; 806FB0C
ldr r1, [r2, 0x10]
str r1, [r0]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0806FB32:
pop {r4}
pop {r0}
@@ -227316,7 +227316,7 @@ sub_806FB44: ; 806FB44
ldr r1, [r2, 0x14]
str r1, [r0]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0806FB6A:
pop {r4}
pop {r0}
@@ -227665,7 +227665,7 @@ sub_806FE2C: ; 806FE2C
ldr r0, _0806FED8
str r0, [r1]
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
adds r0, r4, 0
@@ -227723,7 +227723,7 @@ _0806FEC2:
b _0806FEE6
.align 2
_0806FED4: .4byte 0x03004b20
-_0806FED8: .4byte nullsub_54
+_0806FED8: .4byte TaskDummy
_0806FEDC: .4byte 0x0201c000
_0806FEE0:
movs r0, 0x1
@@ -227965,7 +227965,7 @@ sub_8070088: ; 8070088
beq _08070118
adds r0, r5, 0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
@@ -227997,14 +227997,14 @@ sub_8070088: ; 8070088
cmp r0, 0
beq _08070134
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08070118:
ldr r0, _08070130
str r0, [r7]
b _080701B0
.align 2
_08070120: .4byte 0x03004b20
-_08070124: .4byte nullsub_54
+_08070124: .4byte TaskDummy
_08070128: .4byte 0x0201c000
_0807012C: .4byte 0x03004360
_08070130: .4byte sub_80701DC
@@ -228162,7 +228162,7 @@ _0807023E:
bl sub_806E834
ldr r0, _080702AC
movs r1, 0x8
- bl AddTask
+ bl CreateTask
b _080702C6
.align 2
_08070280: .4byte 0x0201b000
@@ -228174,7 +228174,7 @@ _08070294: .4byte 0x0201c000
_08070298: .4byte 0x0202e8f4
_0807029C: .4byte 0xfffff280
_080702A0: .4byte 0x03004b20
-_080702A4: .4byte nullsub_54
+_080702A4: .4byte TaskDummy
_080702A8: .4byte gUnknown_0840EF85
_080702AC: .4byte sub_806FB0C
_080702B0:
@@ -228372,7 +228372,7 @@ _0807041C:
ldr r0, _0807046C
str r0, [r1]
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
adds r0, r6, 0
@@ -228398,7 +228398,7 @@ _0807041C:
.align 2
_08070464: .4byte gItemEffectTable
_08070468: .4byte 0x03004b20
-_0807046C: .4byte nullsub_54
+_0807046C: .4byte TaskDummy
_08070470:
movs r0, 0x5
bl audio_play
@@ -228510,7 +228510,7 @@ _0807054C:
movs r1, 0
bl sub_806D538
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -228624,7 +228624,7 @@ dp05_pp_up: ; 8070624
bl sub_80702E4
ldr r0, _08070678
movs r1, 0x5
- bl AddTask
+ bl CreateTask
ldr r1, _0807067C
movs r0, 0
strh r0, [r1, 0x2E]
@@ -228633,7 +228633,7 @@ dp05_pp_up: ; 8070624
bx r0
.align 2
_0807066C: .4byte 0x03004b20
-_08070670: .4byte nullsub_54
+_08070670: .4byte TaskDummy
_08070674: .4byte 0x0201c000
_08070678: .4byte sub_8070374
_0807067C: .4byte 0x03001770
@@ -228688,7 +228688,7 @@ _080706B2:
b _080706F6
.align 2
_080706E0: .4byte 0x03004b20
-_080706E4: .4byte nullsub_54
+_080706E4: .4byte TaskDummy
_080706E8: .4byte 0x0201c000
_080706EC: .4byte 0xfffff264
_080706F0: .4byte gUnknown_08376D1C
@@ -228707,7 +228707,7 @@ _080706F6:
bl sub_806E834
ldr r0, _08070720
movs r1, 0x5
- bl AddTask
+ bl CreateTask
b _0807077C
.align 2
_08070718: .4byte 0x0202e8f4
@@ -228748,7 +228748,7 @@ _08070724:
bl sub_806E834
ldr r0, _0807079C
movs r1, 0x5
- bl AddTask
+ bl CreateTask
_0807077C:
pop {r4-r7}
pop {r0}
@@ -229224,7 +229224,7 @@ _08070B40:
movs r2, 0x1
bl sub_8111924
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
b _08070C2C
.align 2
_08070B6C: .4byte 0x03005e94
@@ -229370,7 +229370,7 @@ _08070C8C:
movs r2, 0x1
bl sub_8111924
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
b _08070D68
.align 2
_08070CB8: .4byte 0x03005e94
@@ -229475,7 +229475,7 @@ sub_8070D90: ; 8070D90
adds r1, r4
ldr r2, [r3, 0x10]
str r2, [r1]
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -229525,11 +229525,11 @@ sub_8070DBC: ; 8070DBC
bl sub_806E834
ldr r0, _08070E34
movs r1, 0x5
- bl AddTask
+ bl CreateTask
b _08070E40
.align 2
_08070E18: .4byte 0x03004b20
-_08070E1C: .4byte nullsub_54
+_08070E1C: .4byte TaskDummy
_08070E20: .4byte 0x03005e94
_08070E24: .4byte sub_80A53F8
_08070E28: .4byte 0x0201c000
@@ -230105,7 +230105,7 @@ task50_startmenu: ; 8071254
movs r0, 0
strh r0, [r4]
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_0807127A:
pop {r4,r5}
pop {r0}
@@ -230123,12 +230123,12 @@ sub_8071284: ; 8071284
ldr r4, _080712B0
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
pop {r4,r5}
pop {r0}
bx r0
@@ -230176,7 +230176,7 @@ _080712F0:
cmp r0, 0x1
bne _08071306
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08071306:
pop {r4}
pop {r0}
@@ -230639,7 +230639,7 @@ sub_807166C: ; 807166C
bl sub_807160C
ldr r0, _08071680
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -230701,7 +230701,7 @@ _080716E8:
strh r1, [r0]
_080716EC:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080716F6:
pop {r4}
@@ -231214,7 +231214,7 @@ _08071A9C: .4byte 0x81000200
_08071AA0: .4byte 0x81000800
_08071AA4:
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl sub_8073B94
bl dp12_8087EA4
b _08071B10
@@ -231283,7 +231283,7 @@ sub_8071B28: ; 8071B28
beq _08071B42
ldr r0, _08071B4C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
ldr r0, _08071B50
bl SetMainCallback2
_08071B42:
@@ -231298,7 +231298,7 @@ _08071B50: .4byte sub_8071B54
thumb_func_start sub_8071B54
sub_8071B54: ; 8071B54
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -231386,7 +231386,7 @@ _08071C06:
ldr r0, [r0, 0x8]
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08071C14:
add sp, 0x4
pop {r4,r5}
@@ -238245,7 +238245,7 @@ _08074EF2:
task_is_not_running_overworld_fanfare: ; 8074EF8
push {lr}
ldr r0, _08074F0C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -238279,7 +238279,7 @@ _08074F30:
ldr r0, _08074F44
bl m4aMPlayContinue
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08074F3C:
pop {r4}
pop {r0}
@@ -238293,14 +238293,14 @@ task_add_50_overworld_fanfare_if_not_running: ; 8074F48
push {r4,lr}
ldr r4, _08074F68
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08074F62
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_08074F62:
pop {r4}
pop {r0}
@@ -238840,7 +238840,7 @@ _08075370: .4byte 0x0202f79c
sub_8075374: ; 8075374
push {lr}
ldr r0, _0807538C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -238947,7 +238947,7 @@ _08075420:
lsls r2, 1
bl MPlayVolumeControl
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0807543E:
pop {r4}
pop {r0}
@@ -238963,14 +238963,14 @@ sub_8075450: ; 8075450
push {r4,lr}
ldr r4, _08075470
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0807546A
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_0807546A:
pop {r4}
pop {r0}
@@ -239559,7 +239559,7 @@ move_anim_task_del: ; 8075908
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r1, _08075920
ldrb r0, [r1]
subs r0, 0x1
@@ -239575,7 +239575,7 @@ move_anim_related_task_del: ; 8075924
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r1, _0807593C
ldrb r0, [r1]
subs r0, 0x1
@@ -239959,7 +239959,7 @@ _08075BF0:
_08075C08:
adds r0, r6, 0
adds r1, r7, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r6
@@ -240261,7 +240261,7 @@ _08075E4A:
ldrb r4, [r0]
ldr r0, _08075E9C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _08075EA0
@@ -240356,7 +240356,7 @@ _08075F16:
ldrb r4, [r0]
ldr r0, _08075F68
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _08075F6C
@@ -241342,7 +241342,7 @@ _080766F4:
_080766F6:
ldr r0, _08076720
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08076724
@@ -241410,7 +241410,7 @@ _08076772:
adds r0, r4, 0
bl sub_8076464
ldrb r0, [r6]
- bl remove_task
+ bl DestroyTask
movs r0, 0xFF
strb r0, [r6]
_0807678A:
@@ -241428,12 +241428,12 @@ _0807678A:
adds r0, r4, 0
bl sub_8076464
ldrb r0, [r6, 0x1]
- bl remove_task
+ bl DestroyTask
movs r0, 0xFF
strb r0, [r6, 0x1]
_080767B0:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080767B6:
pop {r4-r6}
pop {r0}
@@ -241667,7 +241667,7 @@ _0807696C:
_0807696E:
ldr r0, _08076998
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807699C
@@ -241759,7 +241759,7 @@ _08076A00:
bl sub_8076464
_08076A2C:
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_08076A32:
pop {r4-r6}
pop {r0}
@@ -242037,7 +242037,7 @@ ma14_load_background: ; 8076C08
str r0, [r1]
ldr r0, _08076C40
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08076C44
@@ -242076,7 +242076,7 @@ sub_8076C4C: ; 8076C4C
str r1, [r2]
ldr r0, _08076C90
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
@@ -242232,7 +242232,7 @@ _08076D84:
cmp r0, 0x3
bne _08076DAC
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08076DB4
strb r4, [r0]
_08076DAC:
@@ -242381,7 +242381,7 @@ ma15_load_battle_screen_elements: ; 8076ECC
str r0, [r1]
ldr r0, _08076F00
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08076F04
@@ -242833,7 +242833,7 @@ ma1B_8073C2C: ; 80771D0
lsrs r4, 24
ldr r0, _08077284
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08077288
@@ -242935,7 +242935,7 @@ _080772F8:
_080772FC:
lsrs r4, r2, 16
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r1, _0807731C
ldrb r0, [r1]
subs r0, 0x1
@@ -242979,7 +242979,7 @@ sub_8077320: ; 8077320
mov r10, r1
ldr r0, _080773A8
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080773AC
@@ -243072,7 +243072,7 @@ sub_80773B4: ; 80773B4
lsrs r4, 24
ldr r0, _08077468
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807746C
@@ -243142,7 +243142,7 @@ ma1C_8073ED0: ; 8077474
lsrs r4, 24
ldr r0, _080774F0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080774F4
@@ -243216,7 +243216,7 @@ sub_80774FC: ; 80774FC
cmp r4, 0
bne _0807754A
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r1, _08077554
ldrb r0, [r1]
subs r0, 0x1
@@ -243253,7 +243253,7 @@ ma1D_08073FB4: ; 8077558
lsrs r4, 24
ldr r0, _080775C0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080775C4
@@ -243307,7 +243307,7 @@ sub_80775CC: ; 80775CC
ldrsb r1, [r2, r1]
bl audio_play_and_stuff
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r1, _0807760C
ldrb r0, [r1]
subs r0, 0x1
@@ -243364,7 +243364,7 @@ _08077642:
_0807765A:
adds r0, r6, 0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r6
@@ -250274,464 +250274,7 @@ _0807AA20: .4byte sub_8078B34
_0807AA24: .4byte move_anim_8072740
thumb_func_end sub_807A9BC
- thumb_func_start clear_tasks
-clear_tasks: ; 807AA28
- push {r4-r7,lr}
- movs r4, 0
- ldr r6, _0807AA7C
- adds r7, r6, 0
- adds r7, 0x8
-_0807AA32:
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r2, r0, r6
- movs r1, 0
- strb r1, [r2, 0x4]
- ldr r1, _0807AA80
- str r1, [r2]
- strb r4, [r2, 0x5]
- adds r4, 0x1
- strb r4, [r2, 0x6]
- movs r1, 0x1
- negs r1, r1
- adds r5, r1, 0
- movs r1, 0xFF
- strb r1, [r2, 0x7]
- adds r0, r7
- movs r1, 0
- movs r2, 0x20
- bl memset
- lsls r4, 24
- lsrs r4, 24
- cmp r4, 0xF
- bls _0807AA32
- ldr r0, _0807AA7C
- movs r1, 0xFE
- strb r1, [r0, 0x5]
- ldr r1, _0807AA84
- adds r0, r1
- ldrb r1, [r0]
- orrs r1, r5
- strb r1, [r0]
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2
-_0807AA7C: .4byte 0x03004b20
-_0807AA80: .4byte nullsub_54
-_0807AA84: .4byte 0x0000025e
- thumb_func_end clear_tasks
-
- thumb_func_start AddTask
-AddTask: ; 807AA88
- push {r4-r7,lr}
- adds r2, r0, 0
- lsls r1, 24
- lsrs r1, 24
- movs r6, 0
- ldr r7, _0807AAC4
-_0807AA94:
- lsls r0, r6, 2
- adds r0, r6
- lsls r5, r0, 3
- adds r4, r5, r7
- ldrb r0, [r4, 0x4]
- cmp r0, 0
- bne _0807AAC8
- str r2, [r4]
- strb r1, [r4, 0x7]
- adds r0, r6, 0
- bl insert_task_in_order_by_priority
- adds r0, r7, 0
- adds r0, 0x8
- adds r0, r5, r0
- movs r1, 0
- movs r2, 0x20
- bl memset
- movs r0, 0x1
- strb r0, [r4, 0x4]
- adds r0, r6, 0
- b _0807AAD4
- .align 2
-_0807AAC4: .4byte 0x03004b20
-_0807AAC8:
- adds r0, r6, 0x1
- lsls r0, 24
- lsrs r6, r0, 24
- cmp r6, 0xF
- bls _0807AA94
- movs r0, 0
-_0807AAD4:
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end AddTask
-
- thumb_func_start insert_task_in_order_by_priority
-insert_task_in_order_by_priority: ; 807AADC
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- lsls r0, 24
- lsrs r4, r0, 24
- bl get_first_active_task
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0x10
- bne _0807AB0C
- ldr r1, _0807AB08
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- movs r1, 0xFE
- strb r1, [r0, 0x5]
- movs r1, 0xFF
- strb r1, [r0, 0x6]
- b _0807AB68
- .align 2
-_0807AB08: .4byte 0x03004b20
-_0807AB0C:
- ldr r6, _0807AB48
- lsls r0, r4, 2
- mov r12, r0
- mov r8, r6
- adds r0, r4
- lsls r0, 3
- adds r2, r0, r6
-_0807AB1A:
- lsls r0, r1, 2
- adds r0, r1
- lsls r5, r0, 3
- mov r7, r8
- adds r3, r5, r7
- ldrb r0, [r2, 0x7]
- ldrb r7, [r3, 0x7]
- cmp r0, r7
- bcs _0807AB4C
- ldrb r0, [r3, 0x5]
- strb r0, [r2, 0x5]
- strb r1, [r2, 0x6]
- ldrb r0, [r3, 0x5]
- cmp r0, 0xFE
- beq _0807AB44
- adds r1, r0, 0
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- add r0, r8
- strb r4, [r0, 0x6]
-_0807AB44:
- strb r4, [r3, 0x5]
- b _0807AB68
- .align 2
-_0807AB48: .4byte 0x03004b20
-_0807AB4C:
- ldrb r0, [r3, 0x6]
- cmp r0, 0xFF
- beq _0807AB56
- adds r1, r0, 0
- b _0807AB1A
-_0807AB56:
- mov r2, r12
- adds r0, r2, r4
- lsls r0, 3
- adds r0, r6
- strb r1, [r0, 0x5]
- adds r2, r5, r6
- ldrb r1, [r2, 0x6]
- strb r1, [r0, 0x6]
- strb r4, [r2, 0x6]
-_0807AB68:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end insert_task_in_order_by_priority
-
- thumb_func_start remove_task
-remove_task: ; 807AB74
- push {r4,lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r4, _0807ABA8
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r2, r1, r4
- ldrb r0, [r2, 0x4]
- cmp r0, 0
- beq _0807ABDE
- movs r0, 0
- strb r0, [r2, 0x4]
- ldrb r3, [r2, 0x5]
- cmp r3, 0xFE
- bne _0807ABAC
- ldrb r0, [r2, 0x6]
- cmp r0, 0xFF
- beq _0807ABDE
- adds r1, r0, 0
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r4
- strb r3, [r0, 0x5]
- b _0807ABDE
- .align 2
-_0807ABA8: .4byte 0x03004b20
-_0807ABAC:
- ldrb r3, [r2, 0x6]
- adds r0, r3, 0
- cmp r0, 0xFF
- bne _0807ABC4
- ldrb r0, [r2, 0x5]
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r4
- movs r0, 0xFF
- strb r0, [r1, 0x6]
- b _0807ABDE
-_0807ABC4:
- ldrb r1, [r2, 0x5]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r4
- strb r3, [r0, 0x6]
- ldrb r1, [r2, 0x6]
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r4
- ldrb r1, [r2, 0x5]
- strb r1, [r0, 0x5]
-_0807ABDE:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end remove_task
-
- thumb_func_start RunActiveTasks
-RunActiveTasks: ; 807ABE4
- push {r4,r5,lr}
- bl get_first_active_task
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x10
- beq _0807AC08
- ldr r5, _0807AC10
-_0807ABF4:
- lsls r4, r0, 2
- adds r4, r0
- lsls r4, 3
- adds r4, r5
- ldr r1, [r4]
- bl _call_via_r1
- ldrb r0, [r4, 0x6]
- cmp r0, 0xFF
- bne _0807ABF4
-_0807AC08:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2
-_0807AC10: .4byte 0x03004b20
- thumb_func_end RunActiveTasks
-
- thumb_func_start get_first_active_task
-get_first_active_task: ; 807AC14
- push {lr}
- movs r2, 0
- ldr r0, _0807AC4C
- ldrb r1, [r0, 0x4]
- adds r3, r0, 0
- cmp r1, 0x1
- bne _0807AC28
- ldrb r0, [r3, 0x5]
- cmp r0, 0xFE
- beq _0807AC46
-_0807AC28:
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, 0xF
- bhi _0807AC46
- lsls r0, r2, 2
- adds r0, r2
- lsls r0, 3
- adds r1, r0, r3
- ldrb r0, [r1, 0x4]
- cmp r0, 0x1
- bne _0807AC28
- ldrb r0, [r1, 0x5]
- cmp r0, 0xFE
- bne _0807AC28
-_0807AC46:
- adds r0, r2, 0
- pop {r1}
- bx r1
- .align 2
-_0807AC4C: .4byte 0x03004b20
- thumb_func_end get_first_active_task
-
- thumb_func_start nullsub_54
-nullsub_54: ; 807AC50
- bx lr
- thumb_func_end nullsub_54
-
- thumb_func_start set_task_function_and_args_14_15
-set_task_function_and_args_14_15: ; 807AC54
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _0807AC84
- lsls r3, r0, 2
- adds r3, r0
- lsls r3, 3
- adds r0, r3, 0
- adds r0, 0x1C
- adds r4, r5, 0
- adds r4, 0x8
- adds r0, r4
- strh r2, [r0]
- adds r0, r3, 0
- adds r0, 0x1E
- adds r0, r4
- lsrs r2, 16
- strh r2, [r0]
- adds r3, r5
- str r1, [r3]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2
-_0807AC84: .4byte 0x03004b20
- thumb_func_end set_task_function_and_args_14_15
-
- thumb_func_start set_task_function_to_args_14_15
-set_task_function_to_args_14_15: ; 807AC88
- push {r4,lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r3, _0807ACB8
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r4, r1, r3
- adds r0, r1, 0
- adds r0, 0x1C
- adds r3, 0x8
- adds r0, r3
- ldrh r2, [r0]
- adds r1, 0x1E
- adds r1, r3
- movs r3, 0
- ldrsh r0, [r1, r3]
- lsls r0, 16
- orrs r2, r0
- str r2, [r4]
- pop {r4}
- pop {r0}
- bx r0
- .align 2
-_0807ACB8: .4byte 0x03004b20
- thumb_func_end set_task_function_to_args_14_15
-
- thumb_func_start is_function_an_active_task
-is_function_an_active_task: ; 807ACBC
- push {r4,lr}
- adds r3, r0, 0
- movs r2, 0
- ldr r4, _0807ACDC
-_0807ACC4:
- lsls r0, r2, 2
- adds r0, r2
- lsls r0, 3
- adds r1, r0, r4
- ldrb r0, [r1, 0x4]
- cmp r0, 0x1
- bne _0807ACE0
- ldr r0, [r1]
- cmp r0, r3
- bne _0807ACE0
- movs r0, 0x1
- b _0807ACEC
- .align 2
-_0807ACDC: .4byte 0x03004b20
-_0807ACE0:
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, 0xF
- bls _0807ACC4
- movs r0, 0
-_0807ACEC:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end is_function_an_active_task
-
- thumb_func_start get_task_id_by_function
-get_task_id_by_function: ; 807ACF4
- push {lr}
- adds r3, r0, 0
- movs r2, 0
- ldr r1, _0807AD10
-_0807ACFC:
- ldrb r0, [r1, 0x4]
- cmp r0, 0x1
- bne _0807AD14
- ldr r0, [r1]
- cmp r0, r3
- bne _0807AD14
- lsls r0, r2, 24
- lsrs r0, 24
- b _0807AD1E
- .align 2
-_0807AD10: .4byte 0x03004b20
-_0807AD14:
- adds r1, 0x28
- adds r2, 0x1
- cmp r2, 0xF
- ble _0807ACFC
- movs r0, 0xFF
-_0807AD1E:
- pop {r1}
- bx r1
- thumb_func_end get_task_id_by_function
-
- thumb_func_start sub_807AD24
-sub_807AD24: ; 807AD24
- push {lr}
- movs r2, 0
- movs r1, 0
- ldr r3, _0807AD50
-_0807AD2C:
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- adds r0, r3
- ldrb r0, [r0, 0x4]
- cmp r0, 0x1
- bne _0807AD40
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
-_0807AD40:
- adds r0, r1, 0x1
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0xF
- bls _0807AD2C
- adds r0, r2, 0
- pop {r1}
- bx r1
- .align 2
-_0807AD50: .4byte 0x03004b20
- thumb_func_end sub_807AD24
+ .include "genasm/task.s"
thumb_func_start nullsub_14
nullsub_14: ; 807AD54
@@ -251837,7 +251380,7 @@ sub_807B69C: ; 807B69C
ldrb r6, [r0]
ldr r0, _0807B744
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -252045,7 +251588,7 @@ _0807B83C:
cmp r0, 0x2
bne _0807B86A
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _0807B86A
_0807B866:
adds r0, r1, 0x1
@@ -252710,7 +252253,7 @@ move_anim_start_t2: ; 807BD5C
bl move_something
ldr r0, _0807BDA4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807BDA8
@@ -252760,7 +252303,7 @@ sub_807BDAC: ; 807BDAC
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0807BDEA:
pop {r4}
pop {r0}
@@ -253309,7 +252852,7 @@ _0807C1E4:
movs r2, 0x40
bl gpu_pal_apply
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r1, _0807C29C
@@ -253356,7 +252899,7 @@ _0807C2B4: .4byte 0x0000043c
_0807C2B8:
ldr r0, _0807C2F0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807C2F4
@@ -253535,7 +253078,7 @@ _0807C450: .4byte sub_807C454
thumb_func_start sub_807C454
sub_807C454: ; 807C454
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -254022,7 +253565,7 @@ _0807C820:
sub_807C828: ; 807C828
push {r4-r6,lr}
ldr r0, _0807C8EC
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -254103,7 +253646,7 @@ sub_807C828: ; 807C828
strb r0, [r1]
ldr r0, _0807C914
movs r1, 0x50
- bl AddTask
+ bl CreateTask
ldr r1, _0807C918
adds r4, r1
strb r0, [r4]
@@ -257481,7 +257024,7 @@ sub_807E25C: ; 807E25C
push {lr}
ldr r0, _0807E26C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -257605,7 +257148,7 @@ _0807E350: .4byte 0x04000048
_0807E354:
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0807E35E:
pop {r4}
pop {r0}
@@ -262578,7 +262121,7 @@ task0A_asap_script_env_2_enable_and_set_ctx_running: ; 8080970
cmp r0, 0x1
bne _08080988
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_08080988:
pop {r4}
@@ -262594,7 +262137,7 @@ sub_8080990: ; 8080990
bl pal_fill_black
ldr r0, _080809AC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -262608,7 +262151,7 @@ sub_80809B0: ; 80809B0
bl pal_fill_black
ldr r0, _080809C8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -262668,7 +262211,7 @@ _08080A24:
bne _08080A36
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08080A36:
pop {r4,r5}
pop {r0}
@@ -262683,7 +262226,7 @@ sub_8080A3C: ; 8080A3C
bl palette_bg_faded_fill_white
ldr r0, _08080A58
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -262736,7 +262279,7 @@ _08080AA6:
bl sub_8007B14
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08080ABC:
pop {r4,r5}
pop {r0}
@@ -262751,7 +262294,7 @@ sub_8080AC4: ; 8080AC4
bl palette_bg_faded_fill_white
ldr r0, _08080AE0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -262797,7 +262340,7 @@ _08080B1C:
_08080B2E:
adds r0, r1, 0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -262838,7 +262381,7 @@ sub_8080B78: ; 8080B78
bl audio_play
ldr r0, _08080B98
movs r1, 0xA
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
pop {r0}
bx r0
@@ -262971,7 +262514,7 @@ _08080C9A:
_08080CA4:
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08080CAE:
pop {r4-r7}
pop {r0}
@@ -263062,7 +262605,7 @@ _08080D50:
_08080D64:
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08080D6E:
pop {r4-r7}
pop {r0}
@@ -263102,7 +262645,7 @@ _08080DA8:
bl sub_806451C
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08080DBE:
pop {r4,r5}
pop {r0}
@@ -263118,10 +262661,10 @@ sub_8080DC4: ; 8080DC4
cmp r0, 0x1
bne _08080DE0
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08080DE8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_08080DE0:
pop {r4}
pop {r0}
@@ -263153,7 +262696,7 @@ task_mpl_807E3C8: ; 8080E04
bne _08080E20
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_8064E2C
_08080E20:
pop {r4}
@@ -263168,7 +262711,7 @@ sub_8080E28: ; 8080E28
bl pal_fill_black
ldr r0, _08080E40
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -263183,7 +262726,7 @@ sub_8080E44: ; 8080E44
bl pal_fill_black
ldr r0, _08080E60
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -263231,7 +262774,7 @@ sub_8080E88: ; 8080E88
str r1, [r0]
ldr r0, _08080EBC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -263252,7 +262795,7 @@ sp13E_warp_to_last_warp: ; 8080EC0
str r1, [r0]
ldr r0, _08080EEC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -263270,7 +262813,7 @@ sub_8080EF0: ; 8080EF0
str r1, [r0]
ldr r0, _08080F10
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -263338,7 +262881,7 @@ sub_8080F68: ; 8080F68
bl audio_play
ldr r0, _08080F90
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, _08080F94
ldr r0, _08080F98
str r0, [r1]
@@ -263357,7 +262900,7 @@ sub_8080F9C: ; 8080F9C
bl sub_8080918
ldr r0, _08080FB8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, _08080FBC
ldr r0, _08080FC0
str r0, [r1]
@@ -263415,7 +262958,7 @@ _08081012:
ldr r0, _08081028
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08081022:
pop {r4,r5}
pop {r0}
@@ -263434,7 +262977,7 @@ sub_808102C: ; 808102C
bl audio_play
ldr r0, _0808104C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -263498,7 +263041,7 @@ _080810B4:
ldr r0, _080810D8
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080810CC:
pop {r4,r5}
pop {r0}
@@ -263513,7 +263056,7 @@ sub_80810DC: ; 80810DC
push {lr}
ldr r0, _080810EC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -263567,7 +263110,7 @@ _08081142:
ldr r0, _08081158
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08081152:
pop {r4,r5}
pop {r0}
@@ -263795,7 +263338,7 @@ _0808131A:
ldr r0, _08081330
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0808132A:
pop {r4,r5}
pop {r0}
@@ -263818,7 +263361,7 @@ sub_8081334: ; 8081334
str r1, [r0]
ldr r0, _08081368
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -264017,12 +263560,12 @@ _080814C8: .4byte 0x03004dc0
_080814CC: .4byte 0x03004de0
_080814D0:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080814E2
_080814D8:
bl dp12_8087EA4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080814E2:
pop {r4-r6}
pop {r0}
@@ -264035,13 +263578,13 @@ sub_80814E8: ; 80814E8
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0808150C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08081504
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08081504:
pop {r4}
pop {r0}
@@ -264055,13 +263598,13 @@ sub_8081510: ; 8081510
push {r4,lr}
ldr r4, _08081530
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08081528
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_08081528:
pop {r4}
pop {r0}
@@ -264086,7 +263629,7 @@ sub_8081534: ; 8081534
lsrs r7, r0, 24
ldr r0, _08081578
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
@@ -264396,7 +263939,7 @@ _08081790:
b _08081892
_080817BC:
ldr r0, _080817D4
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08081892
@@ -264495,7 +264038,7 @@ _08081852:
strh r0, [r1]
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08081892:
add sp, 0x8
pop {r4-r7}
@@ -264511,7 +264054,7 @@ sub_80818A4: ; 80818A4
push {lr}
ldr r0, _080818CC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -264558,7 +264101,7 @@ _080818F0:
sub_80818FC: ; 80818FC
push {lr}
ldr r0, _0808191C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _08081920
@@ -264581,7 +264124,7 @@ sub_8081924: ; 8081924
bl sub_8054044
ldr r0, _08081938
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -264599,7 +264142,7 @@ task50_0807F0C8: ; 808193C
cmp r0, 0x1
bne _08081958
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_08081958:
pop {r4}
@@ -264647,7 +264190,7 @@ _0808199A:
bl prev_quest_postbuffer_cursor_backup_reset
bl overworld_poison_timer_set
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080819BA:
pop {r4,r5}
pop {r0}
@@ -264667,7 +264210,7 @@ task_add_01_battle_start: ; 80819C4
lsrs r5, 16
ldr r0, _080819F8
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080819FC
@@ -265658,7 +265201,7 @@ sub_8082188: ; 8082188
movs r2, 0
movs r3, 0
bl sub_80C5374
- bl clear_tasks
+ bl ResetTasks
bl sub_80408BC
ldr r0, _080821D4
bl SetMainCallback2
@@ -265677,7 +265220,7 @@ _080821D4: .4byte sub_80821D8
sub_80821D8: ; 80821D8
push {lr}
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
bl sub_811AAE8
lsls r0, 24
lsrs r0, 24
@@ -267187,14 +266730,14 @@ sub_8082CD4: ; 8082CD4
lsrs r5, r1, 24
ldr r4, _08082D10
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _08082D08
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08082D14
@@ -267491,7 +267034,7 @@ sub_8082EEC: ; 8082EEC
movs r0, 0x2
bl sub_8007E9C
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08082F16:
pop {r4}
pop {r0}
@@ -268019,7 +267562,7 @@ _0808335A:
bl sub_8082D4C
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080833B6
.align 2
_08083394: .4byte 0x03002b80
@@ -268056,7 +267599,7 @@ sub_80833C4: ; 80833C4
bl sub_8082D4C
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080833E0:
pop {r4}
pop {r0}
@@ -268078,7 +267621,7 @@ sub_80833EC: ; 80833EC
bl textbox_close
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -268099,7 +267642,7 @@ sub_8083418: ; 8083418
bl textbox_close
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -268283,7 +267826,7 @@ _08083578:
_08083586:
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080835CE
.align 2
_08083594: .4byte 0x0202e8dc
@@ -268310,7 +267853,7 @@ _080835BC:
bne _080835CE
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080835CE:
pop {r4,r5}
pop {r0}
@@ -268324,14 +267867,14 @@ sub_80835D8: ; 80835D8
push {r4,lr}
ldr r4, _0808360C
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _08083604
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _08083610
@@ -268396,7 +267939,7 @@ _08083660: .4byte 0x020239f8
sub_8083664: ; 8083664
push {lr}
ldr r0, _08083678
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _0808367C
@@ -268462,7 +268005,7 @@ _080836F0:
_080836F4:
ldr r0, _0808370C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
_08083700:
@@ -268492,7 +268035,7 @@ sub_8083710: ; 8083710
bl sub_8007CC8
ldr r0, _08083740
movs r1, 0x50
- bl AddTask
+ bl CreateTask
b _08083750
.align 2
_0808373C: .4byte 0x03004b28
@@ -268605,7 +268148,7 @@ sub_80837EC: ; 80837EC
bl sub_800826C
bl sub_8007B14
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08083814:
pop {r4}
pop {r0}
@@ -268758,7 +268301,7 @@ _0808392E:
ldr r0, _08083954
str r0, [r1, 0x8]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08083940:
pop {r4,r5}
pop {r0}
@@ -268897,7 +268440,7 @@ _08083A52:
movs r0, 0
strh r0, [r5, 0x8]
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _08083A7E
_08083A62:
movs r0, 0x3
@@ -268908,7 +268451,7 @@ _08083A68:
bl textbox_close
bl sub_8071EF4
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_08083A7E:
pop {r4,r5}
@@ -268923,12 +268466,12 @@ sub_8083A84: ; 8083A84
ldr r4, _08083AA8
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 sub_80655F0
pop {r4,r5}
pop {r0}
@@ -269003,7 +268546,7 @@ _08083B20:
ldr r0, _08083B40
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08083B34:
pop {r4,r5}
pop {r0}
@@ -269021,7 +268564,7 @@ sub_8083B44: ; 8083B44
lsrs r4, 24
bl sub_8083B6C
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -269043,7 +268586,7 @@ sub_8083B6C: ; 8083B6C
push {lr}
ldr r0, _08083B7C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -269082,12 +268625,12 @@ sub_8083BB0: ; 8083BB0
ldr r4, _08083BD4
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08083BD8
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl sub_80655F0
pop {r4}
pop {r0}
@@ -269178,14 +268721,14 @@ sub_8083C50: ; 8083C50
ldr r0, _08083C9C
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08083C82:
ldr r0, _08083CA0
ldrb r0, [r0]
cmp r0, 0
beq _08083C90
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08083C90:
pop {r4,r5}
pop {r0}
@@ -269207,7 +268750,7 @@ sub_8083CA4: ; 8083CA4
bne _08083CBC
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08083CBC:
pop {r4}
pop {r0}
@@ -270030,7 +269573,7 @@ sub_80842C8: ; 80842C8
lsrs r4, 24
ldr r0, _080842F4
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -270056,14 +269599,14 @@ sub_80842FC: ; 80842FC
adds r6, r0, 0
ldr r5, _08084334
adds r0, r5, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, _08084338
lsls r0, r4, 2
adds r0, r4
@@ -270102,7 +269645,7 @@ sub_808433C: ; 808433C
cmp r0, 0
bne _0808436C
adds r0, r6, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _08084388
.align 2
_08084368: .4byte 0x03004b20
@@ -270364,7 +269907,7 @@ sub_8084534: ; 8084534
beq _08084566
_08084560:
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_08084566:
movs r0, 0
pop {r4,r5}
@@ -270640,7 +270183,7 @@ _08084716:
adds r0, r4, 0
bl sub_805C774
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _0808478A
.align 2
_08084778: .4byte 0x03004b20
@@ -270664,7 +270207,7 @@ sub_8084794: ; 8084794
adds r4, r0, 0
ldr r0, _080847C0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -270700,7 +270243,7 @@ sub_80847D8: ; 80847D8
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
@@ -273610,7 +273153,7 @@ sub_8085D80: ; 8085D80
lsrs r4, 24
ldr r0, _08085DBC
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -273771,10 +273314,10 @@ sub_8085E94: ; 8085E94
movs r0, 0x19
bl FieldEffectActiveListRemove
ldr r0, _08085ED0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08085EC6:
pop {r0}
bx r0
@@ -273792,7 +273335,7 @@ sub_8085ED4: ; 8085ED4
lsrs r4, 24
ldr r0, _08085F08
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -273858,7 +273401,7 @@ sub_8085F40: ; 8085F40
lsrs r0, 24
strh r0, [r4, 0x14]
ldr r0, _08085FB0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -273966,10 +273509,10 @@ sub_808600C: ; 808600C
movs r0, 0x3E
bl FieldEffectActiveListRemove
ldr r0, _08086048
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0808603E:
pop {r0}
bx r0
@@ -274714,7 +274257,7 @@ mapldr_080842E8: ; 80865DC
bl pal_fill_black
ldr r0, _080865FC
movs r1, 0
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
bl player_bitmagic
ldr r1, _08086600
@@ -274772,7 +274315,7 @@ _08086640:
ldr r0, _08086680
str r0, [r1]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_08086666:
pop {r4-r6}
pop {r0}
@@ -274793,7 +274336,7 @@ mapldr_08084390: ; 8086684
bl pal_fill_black
ldr r0, _080866DC
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r4, _080866E0
ldr r3, _080866E4
ldrb r1, [r3, 0x5]
@@ -274868,7 +274411,7 @@ _0808671E:
bl script_env_2_disable
bl sub_806451C
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08086738:
pop {r4,r5}
pop {r0}
@@ -274887,7 +274430,7 @@ sub_8086748: ; 8086748
bl player_bitmagic
ldr r0, _0808676C
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _08086770
movs r0, 0
str r0, [r1]
@@ -275244,10 +274787,10 @@ sub_80869F8: ; 80869F8
bl sub_806451C
bl InstallCameraPanAheadCallback
ldr r0, _08086A28
- 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
@@ -275265,7 +274808,7 @@ sub_8086A2C: ; 8086A2C
lsls r1, 24
lsrs r1, 24
ldr r0, _08086A60
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08086A64
@@ -275561,10 +275104,10 @@ sub_8086C40: ; 8086C40
ldr r0, _08086C8C
bl SetMainCallback2
ldr r0, _08086C90
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08086C7C:
pop {r0}
bx r0
@@ -275584,7 +275127,7 @@ sub_8086C94: ; 8086C94
bl script_env_2_enable
ldr r0, _08086CB4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _08086CB8
movs r0, 0
str r0, [r1]
@@ -275898,10 +275441,10 @@ sub_8086ED4: ; 8086ED4
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
ldr r0, _08086F28
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08086F18:
movs r0, 0
pop {r4}
@@ -275919,7 +275462,7 @@ sub_8086F2C: ; 8086F2C
ldr r4, _08086F58
adds r0, r4, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08086F5C
@@ -276096,10 +275639,10 @@ _0808706E:
ldr r0, _0808709C
strb r4, [r0, 0x6]
ldr r0, _080870A0
- 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
@@ -276123,7 +275666,7 @@ sub_80870B0: ; 80870B0
ldr r4, _080870E0
adds r0, r4, 0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080870E4
@@ -276237,10 +275780,10 @@ dive_3_unknown: ; 8087160
mov r0, sp
bl dive_warp
ldr r0, _080871B4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0x2C
bl FieldEffectActiveListRemove
_080871A4:
@@ -276261,7 +275804,7 @@ sub_80871B8: ; 80871B8
lsls r1, 24
lsrs r1, 24
ldr r0, _080871CC
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -276579,10 +276122,10 @@ sub_80873F4: ; 80873F4
ldr r0, _08087440
bl SetMainCallback2
ldr r0, _08087444
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0808742C:
movs r0, 0
pop {r1}
@@ -276605,7 +276148,7 @@ mapldr_080851BC: ; 8087448
movs r1, 0
str r1, [r0]
ldr r0, _0808746C
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -276782,10 +276325,10 @@ sub_808759C: ; 808759C
bl script_env_2_disable
bl sub_806451C
ldr r0, _080875D0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_080875C6:
movs r0, 0
pop {r1}
@@ -276869,7 +276412,7 @@ sub_8087654: ; 8087654
lsls r1, 24
lsrs r1, 24
ldr r0, _08087668
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -277083,10 +276626,10 @@ sub_80877D4: ; 80877D4
ldr r0, _08087820
bl SetMainCallback2
ldr r0, _08087824
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0808780C:
movs r0, 0
pop {r1}
@@ -277173,7 +276716,7 @@ sub_80878A8: ; 80878A8
bl player_bitmagic
ldr r0, _080878C0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -277291,10 +276834,10 @@ _08087966:
ldr r0, _080879D0
bl SetMainCallback2
ldr r0, _080879D4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _08087A20
.align 2
_080879B8: .4byte gUnknown_0839F380
@@ -277372,7 +276915,7 @@ mapldr_080859D4: ; 8087A28
strb r1, [r0, 0x1]
ldr r0, _08087A70
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -277485,10 +277028,10 @@ _08087B12:
bl script_env_2_disable
bl sub_806451C
ldr r0, _08087B58
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _08087BA0
.align 2
_08087B4C: .4byte gUnknown_0839F380
@@ -277542,7 +277085,7 @@ sub_8087BA8: ; 8087BA8
push {lr}
ldr r0, _08087BB8
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -277794,10 +277337,10 @@ sub_8087D78: ; 8087D78
ldr r0, _08087DC4
str r0, [r1]
ldr r0, _08087DC8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08087DB4:
pop {r0}
bx r0
@@ -277833,7 +277376,7 @@ mapldr_08085D88: ; 8087DCC
bl CameraObjectReset2
ldr r0, _08087E18
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -278119,10 +277662,10 @@ sub_8087FDC: ; 8087FDC
bl CameraObjectReset1
bl sub_806451C
ldr r0, _08088064
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08088050:
add sp, 0x8
pop {r4,r5}
@@ -278154,7 +277697,7 @@ _08088088:
ldr r0, _080880B8
_0808808A:
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _080880BC
@@ -278564,10 +278107,10 @@ sub_8088380: ; 8088380
movs r0, 0x6
bl FieldEffectActiveListRemove
ldr r0, _080883D8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -278583,7 +278126,7 @@ sub_80883DC: ; 80883DC
push {r4,lr}
sub sp, 0x4
ldr r0, _08088430
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -278920,10 +278463,10 @@ sub_808862C: ; 808862C
movs r0, 0x6
bl FieldEffectActiveListRemove
ldr r0, _080886AC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -278941,7 +278484,7 @@ sub_80886B0: ; 80886B0
push {r4,lr}
sub sp, 0x4
ldr r0, _080886EC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -279277,7 +278820,7 @@ sub_8088914: ; 8088914
push {lr}
ldr r0, _08088944
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08088948
@@ -279541,10 +279084,10 @@ sub_8088AF4: ; 8088AF4
movs r0, 0x9
bl FieldEffectActiveListRemove
ldr r0, _08088B64
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08088B54:
pop {r4,r5}
pop {r0}
@@ -279669,7 +279212,7 @@ sub_8088C40: ; 8088C40
push {lr}
ldr r0, _08088C64
movs r1, 0xFE
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08088C68
@@ -280056,10 +279599,10 @@ sub_8088F30: ; 8088F30
movs r0, 0x1F
bl FieldEffectActiveListRemove
ldr r0, _08088F5C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08088F52:
pop {r0}
bx r0
@@ -280470,7 +280013,7 @@ sub_808925C: ; 808925C
push {lr}
ldr r0, _0808926C
movs r1, 0xFE
- bl AddTask
+ bl CreateTask
movs r0, 0
pop {r1}
bx r1
@@ -280847,10 +280390,10 @@ _08089530:
movs r0, 0x20
bl FieldEffectActiveListRemove
ldr r0, _08089574
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08089566:
pop {r4-r7}
pop {r0}
@@ -280880,7 +280423,7 @@ remove_some_task: ; 8089578
ldrb r0, [r4, 0x18]
cmp r0, 0xFF
beq _080895A2
- bl remove_task
+ bl DestroyTask
movs r0, 0xFF
strb r0, [r4, 0x18]
_080895A2:
@@ -281102,7 +280645,7 @@ task00_for_dp12: ; 8089734
cmp r0, 0
beq _08089764
mov r0, r12
- bl remove_task
+ bl DestroyTask
ldr r1, _08089760
movs r0, 0xFF
strb r0, [r1, 0x18]
@@ -281412,7 +280955,7 @@ sub_8089944: ; 8089944
bl sub_80895F8
ldr r0, _08089A58
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08089A5C
@@ -281988,7 +281531,7 @@ sub_8089E4C: ; 8089E4C
ldr r0, _08089E80
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08089E72:
pop {r4}
pop {r0}
@@ -282121,7 +281664,7 @@ sub_8089F44: ; 8089F44
lsls r4, 24
lsrs r4, 24
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08089FB8
ldr r1, _08089FBC
adds r0, r1
@@ -282190,7 +281733,7 @@ sub_808A004: ; 808A004
lsrs r0, 24
ldr r1, _0808A024
ldr r2, _0808A028
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
movs r0, 0x13
movs r1, 0
movs r2, 0x1D
@@ -282390,7 +281933,7 @@ sub_808A180: ; 808A180
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
lsls r1, r4, 3
adds r1, r4
lsls r1, 2
@@ -282554,7 +282097,7 @@ sub_808A2DC: ; 808A2DC
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
lsls r1, r4, 3
adds r1, r4
lsls r1, 2
@@ -282592,7 +282135,7 @@ _0808A348: .4byte sub_808A2DC
thumb_func_start sub_808A34C
sub_808A34C: ; 808A34C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_808A34C
@@ -282685,7 +282228,7 @@ sub_808A3F8: ; 808A3F8
beq _0808A47E
ldr r0, _0808A464
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _0808A468
@@ -282728,7 +282271,7 @@ _0808A470: .4byte 0x03004360
_0808A474: .4byte sub_808A34C
_0808A478:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0808A47E:
ldr r2, _0808A4A4
ldrb r0, [r2, 0x8]
@@ -282927,7 +282470,7 @@ sub_808A604: ; 808A604
ldr r0, _0808A62C
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0808A622:
pop {r4}
pop {r0}
@@ -283222,7 +282765,7 @@ sub_808A848: ; 808A848
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
@@ -283588,7 +283131,7 @@ _0808AB78:
bl SetMainCallback2
_0808AB7E:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0808AB84:
pop {r4}
pop {r0}
@@ -283603,7 +283146,7 @@ sub_808AB90: ; 808AB90
bl pal_fill_black
ldr r0, _0808ABA4
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -283634,7 +283177,7 @@ sub_808ABA8: ; 808ABA8
ldr r0, [r0]
bl _call_via_r0
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0808ABDE:
pop {r4}
pop {r0}
@@ -284467,7 +284010,7 @@ sub_808B25C: ; 808B25C
ldr r0, _0808B284
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0808B27A:
pop {r4}
pop {r0}
@@ -284491,7 +284034,7 @@ sub_808B288: ; 808B288
ldr r0, _0808B2B0
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0808B2A6:
pop {r4}
pop {r0}
@@ -284596,7 +284139,7 @@ sub_808B338: ; 808B338
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
lsls r1, r4, 3
adds r1, r4
lsls r1, 2
@@ -284702,7 +284245,7 @@ _0808B416:
bl pokemon_setattr
ldr r0, _0808B478
movs r1, 0x5
- bl AddTask
+ bl CreateTask
mov r0, r8
ldrb r1, [r0, 0x8]
movs r0, 0x7F
@@ -284929,7 +284472,7 @@ _0808B60C: .4byte 0x03005cf0
thumb_func_start sub_808B610
sub_808B610: ; 808B610
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -285080,7 +284623,7 @@ _0808B754: .4byte 0x0000043c
_0808B758:
bl sub_8073B94
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
b _0808B95C
_0808B76A:
@@ -285202,7 +284745,7 @@ _0808B870: .4byte 0x00007140
_0808B874:
ldr r0, _0808B96C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _0808B970
@@ -285647,7 +285190,7 @@ sub_808BC10: ; 808BC10
cmp r0, 0
bne _0808BC30
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _0808BC38
ldr r0, [r0, 0x8]
bl SetMainCallback2
@@ -286598,7 +286141,7 @@ _0808C33C: .4byte 0x040000d4
_0808C340: .4byte 0x81000800
_0808C344:
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_8073B94
bl ResetObjectPaletteAllocator
@@ -286660,7 +286203,7 @@ _0808C3C8:
bl sub_808C0CC
ldr r0, _0808C450
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, [r4]
ldr r5, _0808C454
ldrb r1, [r5, 0x19]
@@ -286821,7 +286364,7 @@ InitMainMenu: ; 808C540
lsls r0, 2
bl sub_8091060
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl sub_8073B94
ldr r3, _0808C59C
ldrh r2, [r3]
@@ -286864,12 +286407,12 @@ _0808C5BC:
ldr r0, _0808C5E8
_0808C5BE:
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
adds r0, r5, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r2, _0808C5EC
lsls r1, r4, 2
adds r1, r4
@@ -286889,7 +286432,7 @@ _0808C5EC: .4byte 0x03004b20
thumb_func_start sub_808C5F0
sub_808C5F0: ; 808C5F0
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -287686,7 +287229,7 @@ _0808CC7A:
ldrh r0, [r0]
strb r0, [r4, 0x18]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _0808CCB8
bl SetMainCallback2
ldr r0, _0808CCBC
@@ -292361,7 +291904,7 @@ sub_808F210: ; 808F210
str r0, [r1]
ldr r0, _0808F248
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0808F24C
@@ -293164,7 +292707,7 @@ sub_808F8B8: ; 808F8B8
cmp r0, 0
bne _0808F8D0
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_0808F8D0:
pop {r0}
bx r0
@@ -294854,7 +294397,7 @@ sub_809070C: ; 809070C
lsrs r4, 16
ldr r0, _08090748
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0809074C
@@ -295425,7 +294968,7 @@ sub_8090B8C: ; 8090B8C
movs r2, 0x20
bl decompress_palette
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_08090C0C:
pop {r4-r6}
pop {r0}
@@ -297823,7 +297366,7 @@ sub_8091E3C: ; 8091E3C
push {lr}
ldr r0, _08091E50
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -299005,7 +298548,7 @@ sub_80927F0: ; 80927F0
cmp r0, 0
bne _08092808
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_08092808:
pop {r0}
bx r0
@@ -300305,7 +299848,7 @@ _08093238: .4byte sub_809323C
thumb_func_start sub_809323C
sub_809323C: ; 809323C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -300363,7 +299906,7 @@ sub_80932AC: ; 80932AC
adds r4, r0, 0
ldr r0, _080932DC
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -300394,7 +299937,7 @@ sub_80932E4: ; 80932E4
lsrs r4, 24
ldr r0, _0809331C
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -300421,7 +299964,7 @@ _08093320: .4byte 0x03004b20
sub_8093324: ; 8093324
push {r4,r5,lr}
ldr r0, _0809336C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -301022,7 +300565,7 @@ sub_80937A4: ; 80937A4
bl sub_8073B94
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
pop {r0}
bx r0
thumb_func_end sub_80937A4
@@ -301080,7 +300623,7 @@ sub_809380C: ; 809380C
ldr r4, _08093828
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -301308,7 +300851,7 @@ sub_80939A4: ; 80939A4
push {lr}
ldr r0, _080939B8
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, _080939BC
bl sub_8071E2C
pop {r0}
@@ -301322,12 +300865,12 @@ _080939BC: .4byte gUnknown_081E6DC4
sub_80939C0: ; 80939C0
push {lr}
ldr r0, _080939D8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _080939D4
- bl remove_task
+ bl DestroyTask
_080939D4:
pop {r0}
bx r0
@@ -301380,7 +300923,7 @@ sub_8093A28: ; 8093A28
ldr r4, _08093A44
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -301395,7 +300938,7 @@ _08093A44: .4byte sub_8093A68
sub_8093A48: ; 8093A48
push {lr}
ldr r0, _08093A5C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -301808,10 +301351,10 @@ sub_8093D50: ; 8093D50
bl SetHBlankCallback
bl sub_8093E04
ldr r0, _08093D78
- 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
@@ -304516,7 +304059,7 @@ _080951C8:
ldr r1, _0809520C
ldr r2, _08095210
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
b _08095268
.align 2
_08095204: .4byte 0x03004360
@@ -304619,7 +304162,7 @@ sub_80952B4: ; 80952B4
bne _080952D6
bl sub_8094D60
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080952E0
bl SetMainCallback2
_080952D6:
@@ -304684,7 +304227,7 @@ sub_8095330: ; 8095330
bne _08095350
bl sub_8094D60
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_80A6DCC
_08095350:
pop {r4}
@@ -304747,7 +304290,7 @@ _08095392:
ldrb r0, [r4]
ldr r1, _080953E8
ldr r2, _080953EC
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r0, _080953F0
bl SetMainCallback2
b _08095400
@@ -304891,7 +304434,7 @@ sub_80954DC: ; 80954DC
cmp r0, 0
bne _08095522
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08095530
ldr r1, _08095534
adds r0, r1
@@ -305319,7 +304862,7 @@ sub_80958C4: ; 80958C4
movs r1, 0
bl sub_806D538
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
pop {r4,r5}
pop {r0}
bx r0
@@ -306262,7 +305805,7 @@ _08095FC8:
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080960F4
_08095FE8:
movs r3, 0xC
@@ -306392,7 +305935,7 @@ _080960DC:
ldrb r0, [r4, 0xC]
bl task_intro_29
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080960F4:
pop {r4,r5}
pop {r0}
@@ -306406,7 +305949,7 @@ sub_8096100: ; 8096100
push {lr}
ldr r0, _08096128
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0809612C
@@ -306430,7 +305973,7 @@ sub_8096130: ; 8096130
push {lr}
ldr r0, _0809615C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08096160
@@ -307318,7 +306861,7 @@ sub_8096804: ; 8096804
bl ResetAllObjectData
bl FreeAllObjectTiles
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r1, _0809683C
movs r2, 0xA0
lsls r2, 2
@@ -321518,7 +321061,7 @@ sub_809D824: ; 809D824
thumb_func_start sub_809D844
sub_809D844: ; 809D844
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -321794,7 +321337,7 @@ _0809DA6C:
ldr r0, _0809DA7C
_0809DA6E:
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _0809DA80
strb r0, [r1, 0xF]
_0809DA78:
@@ -322605,7 +322148,7 @@ sub_809E13C: ; 809E13C
ldr r0, [r4, 0x4]
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0809E182:
pop {r4,r5}
pop {r0}
@@ -324619,13 +324162,13 @@ _0809F168:
beq _0809F1A6
_0809F17C:
ldr r0, _0809F1B0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _0809F1A6
ldr r0, _0809F1B4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -328750,7 +328293,7 @@ _080A1286:
_080A129A:
bl sub_80A1D18
mov r0, r8
- bl remove_task
+ bl DestroyTask
_080A12A4:
pop {r3}
mov r8, r3
@@ -328783,7 +328326,7 @@ sub_80A12D0: ; 80A12D0
bl sub_80A18E4
ldr r0, _080A1310
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080A1314
@@ -328955,7 +328498,7 @@ _080A1410:
bl sub_80A1FF8
_080A1444:
mov r0, r10
- bl remove_task
+ bl DestroyTask
_080A144A:
movs r1, 0x2
ldrsh r0, [r7, r1]
@@ -328973,7 +328516,7 @@ _080A1460:
adds r1, r7, 0x6
bl sub_80A0428
mov r0, r10
- bl remove_task
+ bl DestroyTask
_080A1470:
add sp, 0x4
pop {r3-r5}
@@ -329007,14 +328550,14 @@ sub_80A1488: ; 80A1488
_080A14A6:
ldr r5, _080A14E0
adds r0, r5, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
bne _080A14C2
adds r0, r5, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
_080A14C2:
@@ -329185,7 +328728,7 @@ _080A15DC:
bl sub_80A1FF8
_080A1610:
mov r0, r10
- bl remove_task
+ bl DestroyTask
_080A1616:
movs r1, 0x2
ldrsh r0, [r7, r1]
@@ -329203,7 +328746,7 @@ _080A162C:
adds r1, r7, 0x6
bl sub_80A0428
mov r0, r10
- bl remove_task
+ bl DestroyTask
_080A163C:
add sp, 0x4
pop {r3-r5}
@@ -329237,14 +328780,14 @@ sub_80A1654: ; 80A1654
_080A1672:
ldr r5, _080A16AC
adds r0, r5, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
bne _080A168E
adds r0, r5, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
_080A168E:
@@ -330649,7 +330192,7 @@ exec_movement: ; 80A20D4
b _080A211E
_080A20F6:
ldr r0, _080A2128
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080A2108
@@ -330725,7 +330268,7 @@ sub_80A2178: ; 80A2178
adds r0, r4, 0
bl sub_80A2408
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080A2192:
pop {r4}
pop {r0}
@@ -330739,7 +330282,7 @@ sub_80A2198: ; 80A2198
lsls r1, 24
lsrs r1, 24
ldr r0, _080A21D4
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r2, 0x1
@@ -330774,7 +330317,7 @@ _080A21DC: .4byte 0x0000ffff
sub_80A21E0: ; 80A21E0
push {lr}
ldr r0, _080A21F0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -332591,14 +332134,14 @@ AddMapNamePopUpWindowTask: ; 80A2F54
beq _080A2FE4
ldr r4, _080A2FAC
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
bne _080A2FBC
adds r0, r4, 0
movs r1, 0x5A
- bl AddTask
+ bl CreateTask
ldr r4, _080A2FB0
strb r0, [r4]
ldr r1, _080A2FB4
@@ -332755,7 +332298,7 @@ _080A30A0: .4byte 0x04000012
HideMapNamePopUpWindow: ; 80A30A4
push {lr}
ldr r0, _080A30D4
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _080A30D0
@@ -332770,7 +332313,7 @@ HideMapNamePopUpWindow: ; 80A30A4
strh r0, [r1]
ldr r0, _080A30DC
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
_080A30D0:
pop {r0}
bx r0
@@ -332813,7 +332356,7 @@ sub_80A3118: ; 80A3118
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl sub_80A740C
bl fade_and_return_progress_probably
pop {r0}
@@ -333214,7 +332757,7 @@ _080A34D2:
ldr r1, _080A34E4
movs r0, 0
strb r0, [r1]
- bl clear_tasks
+ bl ResetTasks
movs r0, 0x1
_080A34DE:
pop {r1}
@@ -333759,12 +333302,12 @@ _080A38F2:
adds r0, 0x1
strb r0, [r1]
ldr r0, _080A3950
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl sub_80A37C0
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
bl sub_80A736C
movs r0, 0x2
movs r1, 0
@@ -334076,14 +333619,14 @@ _080A3B2C:
strb r4, [r0]
ldr r4, _080A3BBC
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _080A3B90
adds r0, r4, 0
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
_080A3B90:
@@ -337229,7 +336772,7 @@ sub_80A53CC: ; 80A53CC
bl sub_80A3770
ldr r0, _080A53F0
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A53F4
strb r0, [r1]
_080A53EA:
@@ -338112,7 +337655,7 @@ sub_80A5B00: ; 80A5B00
bl SetMainCallback2
bl gpu_pal_allocator_reset__manage_upper_four
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080A5B32:
pop {r4}
pop {r0}
@@ -338131,10 +337674,10 @@ _080A5B42:
lsrs r0, 24
cmp r0, 0x1
bne _080A5B68
- bl clear_tasks
+ bl ResetTasks
ldr r0, _080A5B60
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A5B64
strb r0, [r1]
b _080A5B74
@@ -338305,7 +337848,7 @@ sub_80A5C9C: ; 80A5C9C
movs r3, 0x13
bl Reset
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_8064E2C
bl script_env_2_disable
pop {r4}
@@ -338319,7 +337862,7 @@ sub_80A5CC4: ; 80A5CC4
bl pal_fill_black
ldr r0, _080A5CD8
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -338359,7 +337902,7 @@ _080A5D06:
bne _080A5D28
ldr r0, _080A5D20
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A5D24
strb r0, [r1]
b _080A5D34
@@ -338929,7 +338472,7 @@ sub_80A61A8: ; 80A61A8
bne _080A61C2
ldr r0, _080A61C8
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A61CC
strb r0, [r1]
_080A61C2:
@@ -339073,7 +338616,7 @@ sub_80A62D8: ; 80A62D8
bne _080A62F2
ldr r0, _080A62F8
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A62FC
strb r0, [r1]
_080A62F2:
@@ -339781,7 +339324,7 @@ sub_80A68A4: ; 80A68A4
bne _080A68BE
ldr r0, _080A68C4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A68C8
strb r0, [r1]
_080A68BE:
@@ -339866,7 +339409,7 @@ _080A6942:
bne _080A6968
ldr r0, _080A6960
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A6964
strb r0, [r1]
bl sub_80A699C
@@ -339973,7 +339516,7 @@ sub_80A6A08: ; 80A6A08
bne _080A6A22
ldr r0, _080A6A28
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A6A2C
strb r0, [r1]
_080A6A22:
@@ -340364,7 +339907,7 @@ sub_80A6D1C: ; 80A6D1C
ldrh r0, [r4]
bl itemid_get_overworld_function
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080A6D7C
@@ -340405,7 +339948,7 @@ _080A6D9A:
bne _080A6DBC
ldr r0, _080A6DB4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080A6DB8
strb r0, [r1]
b _080A6DC8
@@ -340871,7 +340414,7 @@ _080A716C:
bne _080A7160
ldr r0, _080A7198
movs r1, 0
- bl AddTask
+ bl CreateTask
strb r0, [r4]
ldrb r1, [r4]
lsls r0, r1, 2
@@ -346634,7 +346177,7 @@ sub_80A9BBC: ; 80A9BBC
bl pal_fade_maybe
ldr r0, _080A9BE0
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
movs r0, 0x1
add sp, 0x4
pop {r1}
@@ -346655,7 +346198,7 @@ sub_80A9BE4: ; 80A9BE4
cmp r0, 0
bne _080A9C10
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080A9C18
ldrb r1, [r0]
movs r0, 0x1
@@ -346702,17 +346245,17 @@ sub_80A9C40: ; 80A9C40
ldr r5, _080A9C88
adds r0, r5, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _080A9C8C
adds r0, r4, 0
adds r1, r5, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r0, _080A9C90
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080A9C94
@@ -346748,7 +346291,7 @@ sub_80A9C98: ; 80A9C98
ldr r1, _080A9CB8
ldr r2, _080A9CBC
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r4}
pop {r0}
bx r0
@@ -346764,7 +346307,7 @@ sub_80A9CC0: ; 80A9CC0
lsrs r0, 24
ldr r1, _080A9CD4
ldr r2, _080A9CD8
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -346779,7 +346322,7 @@ sub_80A9CDC: ; 80A9CDC
lsrs r0, 24
ldr r1, _080A9CF0
ldr r2, _080A9CF4
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -346802,9 +346345,9 @@ sub_80A9CF8: ; 80A9CF8
lsls r1, 3
adds r1, r0
ldrb r0, [r1, 0x1C]
- bl remove_task
+ bl DestroyTask
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_8071C20
_080A9D20:
pop {r4}
@@ -346871,7 +346414,7 @@ _080A9D6E:
ldr r1, _080A9DB4
ldr r2, _080A9DB8
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
add sp, 0x4
pop {r4}
pop {r0}
@@ -346891,7 +346434,7 @@ sub_80A9DBC: ; 80A9DBC
lsrs r0, 24
ldr r1, _080A9DD0
ldr r2, _080A9DD4
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -346911,9 +346454,9 @@ sub_80A9DD8: ; 80A9DD8
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x1C]
- bl remove_task
+ bl DestroyTask
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_8071C20
pop {r4}
pop {r0}
@@ -347088,7 +346631,7 @@ sub_80A9F10: ; 80A9F10
movs r0, 0x1
strb r0, [r1]
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080A9F3E:
pop {r4}
pop {r0}
@@ -347231,7 +346774,7 @@ sub_80AA064: ; 80AA064
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
ldr r0, _080AA088
ldrh r0, [r0, 0x2E]
@@ -347317,7 +346860,7 @@ sub_80AA10C: ; 80AA10C
bl dp12_8087EA4
bl sub_8073B94
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
bl sub_80A9FE4
ldr r0, _080AA23C
@@ -349323,7 +348866,7 @@ sub_80AB084: ; 80AB084
ldr r1, _080AB16C
movs r0, 0x8
strh r0, [r1]
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
ldr r0, _080AB170
bl SetMainCallback2
@@ -349818,7 +349361,7 @@ _080AB4E0:
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
ldr r1, _080AB544
movs r0, 0x4
@@ -349883,7 +349426,7 @@ _080AB578:
bl SetVBlankCallback
ldr r0, _080AB5C8
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r1, _080AB5CC
strb r0, [r1, 0x8]
ldr r0, _080AB5D0
@@ -349954,7 +349497,7 @@ sub_80AB604: ; 80AB604
bl sub_80AF860
ldr r0, _080AB650
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080AB654
lsls r0, r4, 2
adds r0, r4
@@ -349993,7 +349536,7 @@ sub_80AB678: ; 80AB678
lsrs r0, 24
ldr r1, _080AB68C
ldr r2, _080AB690
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -350038,7 +349581,7 @@ sub_80AB6B4: ; 80AB6B4
bgt _080AB6F2
bl link_get_multiplayer_id
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080AB6FC
ldrb r1, [r0, 0x8]
lsls r0, r1, 2
@@ -350500,7 +350043,7 @@ _080ABAA8: .4byte sub_80ABB70
sub_80ABAAC: ; 80ABAAC
push {lr}
bl CallObjectCallbacks
- bl RunActiveTasks
+ bl RunTasks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
pop {r0}
@@ -351234,12 +350777,12 @@ sub_80AC0C8: ; 80AC0C8
ldr r4, _080AC12C
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080AC130
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, _080AC134
lsls r0, r5, 2
adds r0, r5
@@ -351282,7 +350825,7 @@ sub_80AC15C: ; 80AC15C
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r2, _080AC17C
ldr r0, _080AC180
ldrb r1, [r0, 0x8]
@@ -351603,12 +351146,12 @@ _080AC458:
ldr r4, _080AC48C
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080AC490
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl sub_80AF860
ldr r1, _080AC494
mov r0, r9
@@ -354079,7 +353622,7 @@ sub_80AD8DC: ; 80AD8DC
negs r1, r1
ands r1, r2
strb r1, [r3, 0x7]
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.align 2
@@ -354194,12 +353737,12 @@ _080AD9B8:
ldr r4, _080AD9E0
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080AD9E4
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl sub_80AF860
strh r6, [r5, 0x8]
b _080ADA10
@@ -354923,12 +354466,12 @@ sub_80ADF4C: ; 80ADF4C
ldr r5, _080ADF88
adds r0, r5, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080ADF8C
adds r1, r5, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, _080ADF90
lsls r0, r4, 2
adds r0, r4
@@ -354955,7 +354498,7 @@ sub_80ADF98: ; 80ADF98
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -354993,7 +354536,7 @@ sub_80ADFD8: ; 80ADFD8
cmp r0, 0
bne _080ADFFC
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080AE004
ldr r1, _080AE008
str r1, [r0]
@@ -358282,7 +357825,7 @@ sub_80AF89C: ; 80AF89C
strb r0, [r2, 0x2]
ldr r0, _080AF944
movs r1, 0x14
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r7, r0, 0
@@ -358358,7 +357901,7 @@ sub_80AF94C: ; 80AF94C
adds r0, r5, 0
bl nullsub_19
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
lsls r1, r5, 2
ldr r0, _080AF98C
adds r1, r0
@@ -358667,7 +358210,7 @@ sub_80AFBA0: ; 80AFBA0
strb r0, [r2, 0x2]
ldr r0, _080AFC34
movs r1, 0x14
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
lsls r5, 16
@@ -358789,7 +358332,7 @@ _080AFCA6:
adds r0, r7, 0
bl nullsub_19
mov r0, r8
- bl remove_task
+ bl DestroyTask
lsls r1, r7, 2
ldr r0, _080AFCD8
adds r1, r0
@@ -359649,7 +359192,7 @@ sub_80B0324: ; 80B0324
push {r4,lr}
ldr r0, _080B035C
movs r1, 0x1E
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _080B0360
@@ -359721,7 +359264,7 @@ sub_80B03A8: ; 80B03A8
lsrs r4, 24
ldr r0, _080B03D0
movs r1, 0x1F
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080B03D4
@@ -359792,7 +359335,7 @@ _080B040C:
movs r2, 0
bl pal_fade_1
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B0444:
pop {r4-r7}
pop {r0}
@@ -359911,7 +359454,7 @@ sub_80B0518: ; 80B0518
push {r4,lr}
ldr r0, _080B0540
movs r1, 0x1E
- bl AddTask
+ bl CreateTask
ldr r1, _080B0544
strb r0, [r1, 0xE]
movs r4, 0
@@ -360157,7 +359700,7 @@ sub_80B06E0: ; 80B06E0
adds r7, r0, 0
ldr r0, _080B073C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
movs r3, 0
@@ -360492,7 +360035,7 @@ _080B0964:
cmp r4, 0x3
bls _080B0964
ldr r0, [sp]
- bl remove_task
+ bl DestroyTask
_080B0980:
add sp, 0x20
pop {r3-r5}
@@ -362668,7 +362211,7 @@ sub_80B1A2C: ; 80B1A2C
push {r4,r5,lr}
ldr r0, _080B1A60
movs r1, 0xA
- bl AddTask
+ bl CreateTask
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -362772,7 +362315,7 @@ _080B1AD6:
movs r3, 0x1F
bl pal_fade_1
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B1B06:
pop {r4-r6}
pop {r0}
@@ -362787,7 +362330,7 @@ sub_80B1B14: ; 80B1B14
push {r4,lr}
ldr r0, _080B1B58
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r4, _080B1B5C
ldr r3, _080B1B60
adds r2, r3, 0
@@ -362874,7 +362417,7 @@ _080B1BB2:
ands r0, r1
strb r0, [r4, 0x6]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_080B1BCA:
pop {r4,r5}
pop {r0}
@@ -362913,7 +362456,7 @@ _080B1C08: .4byte 0x02019204
_080B1C0C:
ldr r0, _080B1C30
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldrb r1, [r5]
lsls r0, r1, 4
adds r0, r1
@@ -362991,7 +362534,7 @@ _080B1C82:
ands r0, r1
strb r0, [r5, 0x6]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B1CA6:
pop {r4,r5}
pop {r0}
@@ -363011,7 +362554,7 @@ sub_80B1CBC: ; 80B1CBC
lsrs r4, 24
ldr r0, _080B1CF0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080B1CF4
@@ -363099,7 +362642,7 @@ _080B1D50:
ands r0, r1
strb r0, [r2, 0x6]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B1D78:
pop {r4,r5}
pop {r0}
@@ -363163,7 +362706,7 @@ sub_80B1DDC: ; 80B1DDC
push {lr}
ldr r0, _080B1DF4
movs r1, 0xF
- bl AddTask
+ bl CreateTask
ldr r2, _080B1DF8
ldrb r0, [r2, 0x6]
movs r1, 0x80
@@ -363246,7 +362789,7 @@ _080B1E66:
ands r0, r1
strb r0, [r2, 0x6]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B1E8E:
pop {r4-r6}
pop {r0}
@@ -363269,7 +362812,7 @@ sub_80B1EA8: ; 80B1EA8
lsrs r5, r1, 24
ldr r0, _080B1EE4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
lsls r4, 24
@@ -363396,7 +362939,7 @@ _080B1F84:
cmp r1, r0
bne _080B1FC4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r2, _080B1FCC
ldrb r1, [r2, 0x7]
movs r0, 0x2
@@ -364023,12 +363566,12 @@ _080B249E:
ldr r4, _080B24C8
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080B24CC
adds r1, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
bl sub_80AF860
movs r0, 0x2
strh r0, [r5, 0x8]
@@ -364275,7 +363818,7 @@ _080B267A:
ble _080B25F6
ldr r0, _080B26BC
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080B26C0
@@ -364372,7 +363915,7 @@ _080B271A:
ands r0, r1
strb r0, [r2, 0x7]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080B274A:
pop {r4-r6}
pop {r0}
@@ -365202,7 +364745,7 @@ _080B2DBC:
bl InitMenu
ldr r0, _080B2DF8
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
add sp, 0x8
@@ -365417,7 +364960,7 @@ HandleShopMenuQuit: ; 80B2F64
bl sub_80BE3BC
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080B2F9C
ldr r0, [r0]
cmp r0, 0
@@ -365453,7 +364996,7 @@ sub_80B2FA0: ; 80B2FA0
orrs r0, r1
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B2FCE:
pop {r4}
pop {r0}
@@ -365473,7 +365016,7 @@ ReturnToShopMenuAfterExitingSellMenu: ; 80B2FDC
ldrb r0, [r0, 0xC]
bl CreateShopMenu
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -365527,7 +365070,7 @@ sub_80B3050: ; 80B3050
bl pal_fill_black
ldr r0, _080B3064
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -365566,7 +365109,7 @@ sub_80B3094: ; 80B3094
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -365666,7 +365209,7 @@ BuyMenuDrawGraphics: ; 80B3108
bl ResetObjectPaletteAllocator
bl sub_8073B94
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
ldr r4, _080B3228
adds r0, r4, 0
bl ShowBg
@@ -365696,7 +365239,7 @@ BuyMenuDrawGraphics: ; 80B3108
bl sub_80B3270
ldr r0, _080B3234
movs r1, 0x8
- bl AddTask
+ bl CreateTask
bl sub_80B3240
movs r0, 0x1
negs r0, r0
@@ -367996,7 +367539,7 @@ Task_ExitBuyMenu: ; 80B4438
ldr r0, _080B446C
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080B4462:
pop {r4}
pop {r0}
@@ -368469,7 +368012,7 @@ sub_80B47D8: ; 80B47D8
ldr r6, _080B481C
adds r0, r6, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -368517,7 +368060,7 @@ sub_80B483C: ; 80B483C
push {lr}
ldr r0, _080B484C
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.align 2
@@ -369647,7 +369190,7 @@ sub_80B5054: ; 80B5054
lsls r3, 24
lsrs r5, r3, 24
ldr r0, _080B5098
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -369700,7 +369243,7 @@ sub_80B50B0: ; 80B50B0
lsls r4, 24
lsrs r4, 24
ldr r0, _080B5100
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -369910,7 +369453,7 @@ sub_80B5230: ; 80B5230
ldr r0, _080B5298
movs r1, 0x50
str r3, [sp]
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080B529C
@@ -370018,7 +369561,7 @@ _080B532C:
ldrb r3, [r3, 0xE]
bl Reset
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080B534E:
pop {r4,r5}
@@ -370042,7 +369585,7 @@ Multichoice: ; 80B535C
lsls r3, 24
lsrs r5, r3, 24
ldr r0, _080B539C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -370176,7 +369719,7 @@ yes_no_box: ; 80B546C
lsrs r4, r1, 24
ldr r6, _080B54B4
adds r0, r6, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -370190,7 +369733,7 @@ yes_no_box: ; 80B546C
bl sub_8072974
adds r0, r6, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080B54BC
@@ -370300,7 +369843,7 @@ _080B5542:
lsrs r3, 24
bl Reset
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080B556A:
pop {r4}
@@ -370336,7 +369879,7 @@ sub_80B5578: ; 80B5578
movs r7, 0
ldr r0, _080B55B8
mov r10, r0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -370364,7 +369907,7 @@ _080B55BC:
bl sub_807274C
mov r0, r10
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -370496,7 +370039,7 @@ _080B56D2:
ldrb r3, [r3, 0xE]
bl Reset
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080B56F4:
pop {r4,r5}
@@ -370511,7 +370054,7 @@ _080B5700: .4byte 0x03004b20
sp109_CreatePCMenu: ; 80B5704
push {lr}
ldr r0, _080B5724
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -370719,7 +370262,7 @@ _080B58A0:
lsrs r3, 24
bl Reset
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080B58BE:
pop {r4,r5}
pop {r0}
@@ -370737,7 +370280,7 @@ sub_80B58C4: ; 80B58C4
lsrs r5, r2, 24
ldr r4, _080B595C
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -370755,7 +370298,7 @@ sub_80B58C4: ; 80B58C4
bl DrawDefaultWindow
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _080B5960
@@ -370816,7 +370359,7 @@ _080B596E:
picbox_close: ; 80B5974
push {lr}
ldr r0, _080B5998
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -370846,7 +370389,7 @@ _080B59A6:
sub_80B59AC: ; 80B59AC
push {lr}
ldr r0, _080B59C0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -370963,7 +370506,7 @@ _080B5A9C: .4byte sub_80B5AA0
thumb_func_start sub_80B5AA0
sub_80B5AA0: ; 80B5AA0
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -371032,7 +370575,7 @@ AddNamingScreenTask: ; 80B5B10
lsrs r6, 16
ldr r0, _080B5B74
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -371070,7 +370613,7 @@ _080B5B78: .4byte 0x03004b20
GetNamingScreenParameters: ; 80B5B7C
push {r4-r6,lr}
ldr r0, _080B5BD8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -371105,7 +370648,7 @@ GetNamingScreenParameters: ; 80B5B7C
adds r0, r4, 0
bl LoadWordFromTwoHalfwords
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4-r6}
pop {r0}
bx r0
@@ -371383,7 +370926,7 @@ NamingScreen_ResetObjects: ; 80B5DE4
bl sub_8073B94
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
pop {r0}
bx r0
thumb_func_end NamingScreen_ResetObjects
@@ -371430,7 +370973,7 @@ sub_80B5E50: ; 80B5E50
ldr r4, _080B5E6C
adds r0, r4, 0
movs r1, 0x2
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -371909,7 +371452,7 @@ sub_80B61D8: ; 80B61D8
push {lr}
ldr r0, _080B61E8
movs r1, 0x1
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -371920,7 +371463,7 @@ _080B61E8: .4byte sub_80B623C
sub_80B61EC: ; 80B61EC
push {lr}
ldr r0, _080B6208
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _080B620C
@@ -371943,7 +371486,7 @@ sub_80B6210: ; 80B6210
lsls r4, 24
lsrs r4, 24
ldr r0, _080B6234
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _080B6238
@@ -372242,7 +371785,7 @@ sub_80B6438: ; 80B6438
push {lr}
ldr r0, _080B6458
movs r1, 0x3
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080B645C
@@ -372269,7 +371812,7 @@ sub_80B6460: ; 80B6460
lsls r2, 24
lsrs r6, r2, 24
ldr r0, _080B6498
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -372476,7 +372019,7 @@ sub_80B65F0: ; 80B65F0
ldr r4, _080B660C
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -372491,7 +372034,7 @@ _080B660C: .4byte sub_80B6630
sub_80B6610: ; 80B6610
push {lr}
ldr r0, _080B6624
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -372668,10 +372211,10 @@ _080B6754: .4byte 0x02000000
sub_80B6758: ; 80B6758
push {lr}
ldr r0, _080B6770
- 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
@@ -378847,13 +378390,13 @@ _080B94C8:
strh r0, [r4]
ldr r0, _080B9514
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldr r0, _080B9518
movs r1, 0x51
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1E]
@@ -378880,7 +378423,7 @@ _080B951C:
bl FlagSet
bl sub_80C7240
ldrb r0, [r4, 0x1E]
- bl remove_task
+ bl DestroyTask
b _080B95E6
.align 2
_080B9548: .4byte 0x03004b20
@@ -378888,7 +378431,7 @@ _080B954C: .4byte 0x00000834
_080B9550:
ldr r0, _080B956C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
@@ -378951,7 +378494,7 @@ _080B95C0:
bl sub_8055588
bl sub_8071EF4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080B95E6:
pop {r4,r5}
@@ -379163,7 +378706,7 @@ _080B9760:
bl sub_80B9A50
ldr r0, _080B97B8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -379426,7 +378969,7 @@ _080B998A:
cmp r1, r0
bne _080B999E
ldr r0, [sp]
- bl remove_task
+ bl DestroyTask
_080B999E:
add sp, 0x10
pop {r3-r5}
@@ -379460,7 +379003,7 @@ sub_80B99B4: ; 80B99B4
cmp r0, 0
bne _080B99DC
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_080B99DC:
pop {r4}
pop {r0}
@@ -380350,7 +379893,7 @@ _080BA08E:
cmp r0, 0
bne _080BA09C
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_080BA09C:
pop {r4}
pop {r0}
@@ -380362,7 +379905,7 @@ _080BA0A4: .4byte 0x03002fa4
thumb_func_start sub_80BA0A8
sub_80BA0A8: ; 80BA0A8
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -380448,7 +379991,7 @@ sub_80BA0EC: ; 80BA0EC
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl sub_8073B94
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
ldr r0, _080BA220
bl ShowBg
@@ -380504,7 +380047,7 @@ sub_80BA0EC: ; 80BA0EC
strh r0, [r6]
ldr r0, _080BA24C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080BA250
@@ -381081,7 +380624,7 @@ sub_80BA68C: ; 80BA68C
cmp r0, 0
bne _080BA6AA
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080BA6B4
bl SetMainCallback2
_080BA6AA:
@@ -383632,7 +383175,7 @@ _080BBAB6:
ldr r0, _080BBAEC
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080BBAD0:
pop {r4}
pop {r0}
@@ -383651,7 +383194,7 @@ sub_80BBAF0: ; 80BBAF0
push {lr}
ldr r0, _080BBB1C
movs r1, 0
- bl AddTask
+ bl CreateTask
movs r0, 0x1
movs r1, 0
bl fade_screen
@@ -383716,7 +383259,7 @@ sub_80BBB50: ; 80BBB50
bne _080BBB80
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080BBB80:
pop {r4}
pop {r0}
@@ -383760,7 +383303,7 @@ sub_80BBB90: ; 80BBB90
bl pal_fill_black
ldr r0, _080BBBE8
movs r1, 0
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -383816,7 +383359,7 @@ sub_80BBBEC: ; 80BBBEC
ldr r0, _080BBC74
bl SetMainCallback2
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_080BBC52:
add sp, 0x4
pop {r4-r6}
@@ -383837,7 +383380,7 @@ sub_80BBC78: ; 80BBC78
push {lr}
ldr r0, _080BBCA0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080BBCA4
@@ -384394,7 +383937,7 @@ _080BC0C4:
bl SetMainCallback2
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080BC0E4:
pop {r4,r5}
pop {r0}
@@ -384410,7 +383953,7 @@ sub_80BC0F8: ; 80BC0F8
push {lr}
ldr r0, _080BC110
movs r1, 0
- bl AddTask
+ bl CreateTask
movs r0, 0x1
movs r1, 0
bl fade_screen
@@ -385066,7 +384609,7 @@ sub_80BC604: ; 80BC604
push {lr}
ldr r0, _080BC614
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -385078,7 +384621,7 @@ sub_80BC618: ; 80BC618
push {lr}
ldr r0, _080BC628
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -385884,7 +385427,7 @@ _080BCC8C:
bl script_env_1_execute_new_script
_080BCC92:
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -396733,7 +396276,7 @@ sub_80C2358: ; 80C2358
bl dp12_8087EA4
bl sub_8073B94
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
bl sub_80C2144
bl sub_80C310C
@@ -396765,7 +396308,7 @@ sub_80C2358: ; 80C2358
strb r0, [r5, 0x8]
ldr r0, _080C2414
movs r1, 0x5
- bl AddTask
+ bl CreateTask
strb r0, [r4, 0x2]
ldr r0, _080C2418
bl SetMainCallback2
@@ -396778,7 +396321,7 @@ sub_80C2358: ; 80C2358
strh r0, [r1]
ldr r0, _080C2428
movs r1, 0x14
- bl AddTask
+ bl CreateTask
bl sub_80C3F00
movs r0, 0xDF
lsls r0, 1
@@ -396806,7 +396349,7 @@ sub_80C2430: ; 80C2430
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -396952,7 +396495,7 @@ sub_80C255C: ; 80C255C
bne _080C258C
ldr r0, _080C2598
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r1, _080C259C
lsls r0, r4, 2
adds r0, r4
@@ -396968,7 +396511,7 @@ _080C258C:
_080C2594: .4byte 0x03002fa4
_080C2598: .4byte sub_80C25A4
_080C259C: .4byte 0x03004b20
-_080C25A0: .4byte nullsub_54
+_080C25A0: .4byte TaskDummy
thumb_func_end sub_80C255C
thumb_func_start sub_80C25A4
@@ -396978,7 +396521,7 @@ sub_80C25A4: ; 80C25A4
lsrs r0, 24
ldr r1, _080C25B8
ldr r2, _080C25BC
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -396996,7 +396539,7 @@ sub_80C25C0: ; 80C25C0
cmp r0, 0
beq _080C25EC
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r2, _080C25F4
ldr r0, _080C25F8
ldrb r1, [r0, 0x2]
@@ -397034,7 +396577,7 @@ sub_80C2600: ; 80C2600
bne _080C2654
ldr r0, _080C2648
movs r1, 0x14
- bl AddTask
+ bl CreateTask
ldr r4, _080C264C
ldr r0, _080C2650
ldrb r1, [r0]
@@ -397413,7 +396956,7 @@ _080C28FE:
_080C2904:
ldr r0, _080C2930
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -397457,7 +397000,7 @@ _080C295A:
strh r0, [r4, 0xA]
ldr r0, _080C2994
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -397736,7 +397279,7 @@ _080C2B14:
bl LoadCompressedObjectPalette
ldr r0, _080C2BFC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r0, _080C2C00
mov r4, r10
adds r1, r4, r7
@@ -398117,7 +397660,7 @@ sub_80C2EA0: ; 80C2EA0
bne _080C2EE8
ldr r0, _080C2EE0
ldrb r0, [r0, 0x3]
- bl remove_task
+ bl DestroyTask
ldr r0, _080C2EE4
b _080C2EEE
.align 2
@@ -398145,7 +397688,7 @@ _080C2F04:
adds r0, 0x4
strh r3, [r0]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080C2F24
bl SetMainCallback2
_080C2F18:
@@ -399692,7 +399235,7 @@ _080C3A94:
adds r0, 0x1
strb r0, [r1, 0x5]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
movs r0, 0x18
bl audio_play
_080C3B12:
@@ -400048,7 +399591,7 @@ _080C3DBE:
cmp r0, 0
beq _080C3DCC
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_080C3DCC:
pop {r3}
mov r8, r3
@@ -400136,7 +399679,7 @@ sub_80C3E60: ; 80C3E60
lsrs r5, 24
ldr r0, _080C3E98
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080C3E9C
@@ -400490,7 +400033,7 @@ _080C4102:
strh r1, [r0]
ldr r0, _080C4188
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r0, [r4]
@@ -400576,7 +400119,7 @@ _080C41B6:
strh r2, [r0]
ldr r0, _080C422C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r0, [r6, 0xC]
@@ -400850,7 +400393,7 @@ _080C43CE:
subs r0, 0x1
strb r0, [r1, 0x14]
mov r0, r12
- bl remove_task
+ bl DestroyTask
_080C43DC:
pop {r3-r5}
mov r8, r3
@@ -401479,7 +401022,7 @@ sub_80C489C: ; 80C489C
cmp r0, 0
bne _080C48BA
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080C48C4
bl SetMainCallback2
_080C48BA:
@@ -401497,7 +401040,7 @@ sub_80C48C8: ; 80C48C8
bl script_env_2_enable
ldr r0, _080C48F0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -401541,7 +401084,7 @@ sub_80C4914: ; 80C4914
cmp r0, 0
bne _080C4932
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _080C493C
bl SetMainCallback2
_080C4932:
@@ -401559,7 +401102,7 @@ sub_80C4940: ; 80C4940
bl script_env_2_enable
ldr r0, _080C4968
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -401596,14 +401139,14 @@ sub_80C4980: ; 80C4980
ldr r6, _080C49B8
adds r0, r6, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _080C49BC
adds r0, r4, 0
adds r1, r6, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
ldr r1, _080C49C0
lsls r0, r4, 2
adds r0, r4
@@ -401631,7 +401174,7 @@ sub_80C49C4: ; 80C49C4
ldr r1, _080C49E8
ldr r2, _080C49EC
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r4}
pop {r0}
bx r0
@@ -401648,7 +401191,7 @@ sub_80C49F0: ; 80C49F0
lsrs r0, 24
ldr r1, _080C4A04
ldr r2, _080C4A08
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -401663,7 +401206,7 @@ sub_80C4A0C: ; 80C4A0C
lsrs r0, 24
ldr r1, _080C4A20
ldr r2, _080C4A24
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -401678,7 +401221,7 @@ sub_80C4A28: ; 80C4A28
lsrs r0, 24
ldr r1, _080C4A3C
ldr r2, _080C4A40
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.align 2
@@ -401772,7 +401315,7 @@ _080C4AB8:
ldr r1, _080C4B04
ldr r2, _080C4B08
adds r0, r5, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
add sp, 0x8
pop {r3}
mov r8, r3
@@ -401798,7 +401341,7 @@ sub_80C4B0C: ; 80C4B0C
ldr r1, _080C4B2C
ldr r2, _080C4B30
adds r0, r4, 0
- bl set_task_function_and_args_14_15
+ bl SetTaskFuncWithFollowupFunc
pop {r4}
pop {r0}
bx r0
@@ -401859,7 +401402,7 @@ _080C4B88: .4byte 0x03004b20
_080C4B8C: .4byte sub_80C4BA4
_080C4B90:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
_080C4B9E:
@@ -401900,7 +401443,7 @@ sub_80C4BCC: ; 80C4BCC
cmp r0, 0
bne _080C4BE8
adds r0, r1, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
_080C4BE8:
@@ -402503,7 +402046,7 @@ sub_80C5050: ; 80C5050
sub sp, 0xC
ldr r4, _080C513C
adds r0, r4, 0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -402532,7 +402075,7 @@ sub_80C5050: ; 80C5050
mov r9, r1
adds r0, r4, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _080C5148
@@ -402622,7 +402165,7 @@ _080C5160: .4byte nullsub_2
sub_80C5164: ; 80C5164
push {lr}
ldr r0, _080C5188
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -402715,7 +402258,7 @@ _080C5204:
lsrs r3, 24
bl Reset
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080C5222:
pop {r4,r5}
pop {r0}
@@ -403514,7 +403057,7 @@ _080C580C:
_080C5810:
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080C581A:
pop {r4,r5}
pop {r0}
@@ -403528,7 +403071,7 @@ sub_80C5824: ; 80C5824
push {lr}
ldr r0, _080C5838
movs r1, 0x50
- bl AddTask
+ bl CreateTask
bl sub_80655F0
pop {r0}
bx r0
@@ -405480,7 +405023,7 @@ sub_80C6718: ; 80C6718
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r0, _080C6758
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080C675C
@@ -405588,7 +405131,7 @@ _080C6800:
bl FieldEffectActiveListRemove
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080C6834
_080C682E:
ldrh r0, [r4, 0x4]
@@ -405664,7 +405207,7 @@ sub_80C68A4: ; 80C68A4
lsrs r6, 16
ldr r0, _080C68E4
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080C68E8
@@ -405743,7 +405286,7 @@ _080C692C:
cmp r0, 0x3
bne _080C6960
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _080C6964
_080C6960:
adds r0, r1, 0x1
@@ -405870,7 +405413,7 @@ sub_80C6A14: ; 80C6A14
ldrsh r1, [r1, r3]
bl sub_80C69C4
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080C6A4C
.align 2
_080C6A44: .4byte 0x03004b20
@@ -405908,7 +405451,7 @@ _080C6A7C:
bne _080C6A9E
ldr r0, _080C6AA4
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080C6AA8
@@ -406060,7 +405603,7 @@ _080C6C18:
bl audio_play
_080C6C1E:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080C6C2A
_080C6C26:
adds r0, r2, 0x1
@@ -406079,7 +405622,7 @@ sub_80C6C30: ; 80C6C30
lsrs r4, 16
ldr r0, _080C6C5C
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080C6C60
@@ -406596,7 +406139,7 @@ _080C7052:
b _080C7062
_080C705A:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _080C706C
_080C7062:
ldr r2, _080C7070
@@ -406618,7 +406161,7 @@ overworld_posion_effect: ; 80C7074
bl audio_play
ldr r0, _080C7088
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -406629,7 +406172,7 @@ _080C7088: .4byte task50_overworld_posion_effect
c3_80A0DD8_is_running: ; 80C708C
push {lr}
ldr r0, _080C709C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -406774,7 +406317,7 @@ sub_80C71A0: ; 80C71A0
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}
@@ -406786,7 +406329,7 @@ sub_80C71C4: ; 80C71C4
push {lr}
ldr r0, _080C71D4
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -407035,7 +406578,7 @@ _080C73A4:
cmp r0, 0x13
bne _080C73B8
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
b _080C746A
.align 2
_080C73B4: .4byte 0x03004b28
@@ -407165,7 +406708,7 @@ _080C74B4:
cmp r0, 0x13
bne _080C74C8
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
b _080C7516
.align 2
_080C74C4: .4byte 0x03004b28
@@ -407265,7 +406808,7 @@ _080C7580:
strh r0, [r4, 0x2]
ldr r0, _080C75A4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x4]
@@ -407309,10 +406852,10 @@ _080C75C4:
ble _080C7698
strh r2, [r4, 0x2]
ldrb r0, [r4, 0x4]
- bl remove_task
+ bl DestroyTask
ldr r0, _080C760C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x6]
@@ -407384,7 +406927,7 @@ _080C7652:
movs r0, 0x34
bl audio_play
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
_080C7698:
pop {r4,r5}
@@ -407418,7 +406961,7 @@ sub_80C76A0: ; 80C76A0
bl CpuFastSet
ldr r0, _080C76FC
movs r1, 0xA
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r0}
bx r0
@@ -407436,7 +406979,7 @@ sub_80C7700: ; 80C7700
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _080C774C
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -407637,7 +407180,7 @@ _080C7878:
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
_080C7896:
pop {r4-r7}
pop {r0}
@@ -407722,7 +407265,7 @@ sub_80C791C: ; 80C791C
bl pal_fill_black
ldr r0, _080C7954
movs r1, 0x50
- bl AddTask
+ bl CreateTask
bl script_env_2_enable
pop {r0}
bx r0
@@ -409522,7 +409065,7 @@ sub_80C8660: ; 80C8660
movs r0, 0x1
strb r0, [r1]
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080C868E:
pop {r4}
pop {r0}
@@ -409640,7 +409183,7 @@ sub_80C8734: ; 80C8734
movs r0, 0
strh r0, [r4, 0x8]
mov r0, r9
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C8896
.align 2
_080C8768: .4byte 0x03004b20
@@ -409816,7 +409359,7 @@ sub_80C88AC: ; 80C88AC
movs r0, 0
strh r0, [r5, 0x8]
adds r0, r2, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C8924
.align 2
_080C88D4: .4byte 0x03004b20
@@ -409887,7 +409430,7 @@ sub_80C8938: ; 80C8938
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C89CE
.align 2
_080C8968: .4byte 0x03004b20
@@ -409969,7 +409512,7 @@ sub_80C89DC: ; 80C89DC
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r2, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C8A30
.align 2
_080C8A04: .4byte 0x03004b20
@@ -410018,7 +409561,7 @@ sub_80C8A38: ; 80C8A38
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C8AC2
.align 2
_080C8A60: .4byte 0x03004b20
@@ -410267,7 +409810,7 @@ _080C8C70:
movs r0, 0
strh r0, [r2, 0x8]
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080C8C7A:
pop {r4}
pop {r0}
@@ -410456,7 +409999,7 @@ _080C8E0C:
movs r0, 0
strh r0, [r2, 0x8]
adds r0, r4, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
_080C8E16:
pop {r4}
pop {r0}
@@ -410486,7 +410029,7 @@ sub_80C8E1C: ; 80C8E1C
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r5, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C8EAE
.align 2
_080C8E4C: .4byte 0x03004b20
@@ -410566,7 +410109,7 @@ sub_80C8EBC: ; 80C8EBC
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r2, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C8F22
.align 2
_080C8EE4: .4byte 0x03004b20
@@ -410627,7 +410170,7 @@ sub_80C8F34: ; 80C8F34
movs r0, 0
strh r0, [r4, 0x8]
adds r0, r2, 0
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
b _080C8F9A
.align 2
_080C8F5C: .4byte 0x03004b20
@@ -410914,7 +410457,7 @@ sub_80C9154: ; 80C9154
movs r2, 0
bl sub_80F890C
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080C9180:
add sp, 0x24
pop {r4}
@@ -411079,7 +410622,7 @@ _080C92CA:
bl sub_8064E2C
bl script_env_2_disable
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -411207,7 +410750,7 @@ ItemUseOnFieldCB_Rod: ; 80C93B8
lsrs r0, 24
bl StartFishing
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -411391,7 +410934,7 @@ sub_80C9520: ; 80C9520
bl sub_8064E2C
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -412444,7 +411987,7 @@ sub_80C9D00: ; 80C9D00
ldr r0, _080C9D2C
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -412499,7 +412042,7 @@ sub_80C9D74: ; 80C9D74
ldr r0, _080C9D94
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -412996,7 +412539,7 @@ task08_080A1C44: ; 80CA170
bl player_avatar_init_params_reset
bl sub_80878A8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -413280,7 +412823,7 @@ sub_80CA394: ; 80CA394
bl sub_8094E4C
bl gpu_pal_allocator_reset__manage_upper_four
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080CA3B4:
pop {r4}
pop {r0}
@@ -432826,7 +432369,7 @@ _080D3A0E:
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -433604,7 +433147,7 @@ _080D401C:
bne _080D4032
bl remove_some_task
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_080D4032:
add sp, 0xC
pop {r4-r7}
@@ -434443,7 +433986,7 @@ _080D467A:
ldr r6, _080D470C
adds r0, r6, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -434464,7 +434007,7 @@ _080D46C4:
strh r0, [r5]
adds r0, r6, 0
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -453324,7 +452867,7 @@ sub_80DD87C: ; 80DD87C
cmp r0, 0
beq _080DD8AE
ldr r0, _080DD8B4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -461972,7 +461515,7 @@ _080E1BD2:
_080E1BE2:
ldr r0, _080E1C44
ldrb r1, [r6, 0x2]
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -462045,7 +461588,7 @@ sub_80E1C58: ; 80E1C58
ldr r0, _080E1C94
strh r1, [r0]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
b _080E1CA4
.align 2
_080E1C88: .4byte 0x03004b20
@@ -465898,7 +465441,7 @@ sub_80E3A58: ; 80E3A58
bl sub_80789D4
ldr r0, _080E3AC0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080E3AC4
@@ -465996,7 +465539,7 @@ sub_80E3AD0: ; 80E3AD0
movs r0, 0x1
bl sub_80789D4
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_080E3B36:
pop {r4-r7}
pop {r0}
@@ -467076,7 +466619,7 @@ sub_80E4368: ; 80E4368
orrs r0, r1
strb r0, [r3]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080E43A8:
pop {r4}
pop {r0}
@@ -467127,7 +466670,7 @@ _080E4400:
ldr r0, [r0]
_080E4408:
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080E4438
@@ -467156,7 +466699,7 @@ sub_80E443C: ; 80E443C
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r0, _080E4474
movs r1, 0
strh r1, [r0]
@@ -482659,7 +482202,7 @@ _080EBB1C:
bl ResetObjectPaletteAllocator
b _080EBBC0
_080EBB22:
- bl clear_tasks
+ bl ResetTasks
b _080EBBC0
_080EBB28:
bl remove_some_task
@@ -482961,7 +482504,7 @@ sub_80EBD90: ; 80EBD90
bl _call_via_r0
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
bl sub_80F19FC
pop {r0}
@@ -490104,7 +489647,7 @@ sub_80EF7D4: ; 80EF7D4
strh r1, [r0]
ldr r0, _080EF80C
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _080EF810
@@ -490125,7 +489668,7 @@ _080EF810: .4byte 0x00006da4
sub_80EF814: ; 80EF814
push {lr}
ldr r0, _080EF834
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _080EF830
@@ -490134,7 +489677,7 @@ sub_80EF814: ; 80EF814
ldr r1, _080EF83C
adds r0, r1
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
_080EF830:
pop {r0}
bx r0
@@ -507458,7 +507001,7 @@ sub_80F7F80: ; 80F7F80
lsrs r4, 24
ldr r0, _080F7FA8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F7FAC
@@ -507899,7 +507442,7 @@ _080F82D8:
bl sub_81DE0D0
bl script_env_2_enable_and_set_ctx_running
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
b _080F83C8
.align 2
_080F8304: .4byte 0x020234cc
@@ -508626,7 +508169,7 @@ _080F8848:
movs r3, 0xC
bl Reset
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
_080F8862:
add sp, 0x8
@@ -508643,7 +508186,7 @@ sub_80F8874: ; 80F8874
push {lr}
ldr r0, _080F8884
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -508939,7 +508482,7 @@ _080F8AC8:
bl sub_8073B94
b _080F8D30
_080F8ACE:
- bl clear_tasks
+ bl ResetTasks
b _080F8D30
_080F8AD4:
bl ResetAllObjectData
@@ -510948,7 +510491,7 @@ sub_80F99CC: ; 80F99CC
bl script_env_2_enable
ldr r0, _080F9A04
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F9A08
@@ -510979,7 +510522,7 @@ sub_80F9A0C: ; 80F9A0C
bl script_env_2_enable
ldr r0, _080F9A44
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F9A48
@@ -511010,7 +510553,7 @@ sub_80F9A4C: ; 80F9A4C
bl script_env_2_enable
ldr r0, _080F9A84
movs r1, 0xA
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F9A88
@@ -511058,7 +510601,7 @@ sub_80F9A8C: ; 80F9A8C
movs r1, 0
bl sub_806AFAC
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_080F9ABE:
pop {r4}
pop {r0}
@@ -520624,7 +520167,7 @@ gpu_pal_decompress_alloc_tag_and_upload: ; 80FE3C4
ldr r0, _080FE408
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _080FE412
.align 2
_080FE404: .4byte 0x0201f000
@@ -524584,7 +524127,7 @@ _08100300:
ldr r0, _08100330
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0810031C:
pop {r4,r5}
pop {r0}
@@ -524630,7 +524173,7 @@ sub_8100364: ; 8100364
bl pal_fill_black
ldr r0, _08100388
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl sub_80FE7EC
@@ -527122,7 +526665,7 @@ _08101620:
ldr r0, _08101644
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08101636:
pop {r4,r5}
pop {r0}
@@ -527167,7 +526710,7 @@ sub_8101678: ; 8101678
bl sub_80FE220
ldr r0, _08101694
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -527519,7 +527062,7 @@ _08101950: .4byte sub_8101954
thumb_func_start sub_8101954
sub_8101954: ; 8101954
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -527570,7 +527113,7 @@ sub_81019B0: ; 81019B0
lsrs r4, 24
ldr r0, _081019E4
movs r1, 0xFF
- bl AddTask
+ bl CreateTask
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -527595,7 +527138,7 @@ _081019E8: .4byte 0x03004b20
sub_81019EC: ; 81019EC
push {lr}
ldr r0, _08101A18
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 2
@@ -527946,7 +527489,7 @@ sub_8101CA0: ; 8101CA0
movs r0, 0x80
strb r0, [r1]
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
pop {r0}
bx r0
.align 2
@@ -527991,7 +527534,7 @@ sub_8101D04: ; 8101D04
ldr r4, _08101D20
adds r0, r4, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -529777,7 +529320,7 @@ sub_8102A24: ; 8102A24
ldr r4, _08102A40
adds r0, r4, 0
movs r1, 0x4
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -529792,7 +529335,7 @@ _08102A40: .4byte sub_8102A64
sub_8102A44: ; 8102A44
push {lr}
ldr r0, _08102A58
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -529967,10 +529510,10 @@ sub_8102B80: ; 8102B80
cmp r0, 0
beq _08102B9A
ldr r0, _08102BA0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_08102B9A:
movs r0, 0
pop {r1}
@@ -530261,7 +529804,7 @@ sub_8102DA8: ; 8102DA8
_08102DB2:
adds r0, r5, 0
movs r1, 0x2
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -532249,7 +531792,7 @@ sub_8103C14: ; 8103C14
ldr r5, _08103C40
adds r0, r5, 0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08103C44
@@ -532361,7 +531904,7 @@ sub_8103CC8: ; 8103CC8
movs r3, 0x52
bl sub_81065A8
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -532727,7 +532270,7 @@ sub_8103F70: ; 8103F70
ldr r4, _08103F98
adds r0, r4, 0
movs r1, 0x6
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08103F9C
@@ -532750,7 +532293,7 @@ _08103F9C: .4byte 0x03004b20
sub_8103FA0: ; 8103FA0
push {lr}
ldr r0, _08103FC4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _08103FC8
@@ -532769,7 +532312,7 @@ _08103FC4: .4byte sub_8103FE8
_08103FC8: .4byte 0x03004b20
_08103FCC:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08103FE4
ldr r0, [r0]
movs r1, 0x10
@@ -532839,7 +532382,7 @@ sub_8104048: ; 8104048
push {lr}
ldr r0, _0810405C
movs r1, 0x8
- bl AddTask
+ bl CreateTask
ldr r1, _08104060
adds r1, 0x3E
strb r0, [r1]
@@ -533233,7 +532776,7 @@ sub_810430C: ; 810430C
ldr r4, _08104328
adds r0, r4, 0
movs r1, 0x7
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -533248,7 +532791,7 @@ _08104328: .4byte sub_810434C
sub_810432C: ; 810432C
push {lr}
ldr r0, _08104340
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -533882,10 +533425,10 @@ sub_81047EC: ; 81047EC
cmp r0, 0
bne _08104844
ldr r0, _08104840
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _0810485A
.align 2
_08104834: .4byte 0x02000000
@@ -533957,10 +533500,10 @@ sub_81048A8: ; 81048A8
cmp r0, 0
beq _081048C2
ldr r0, _081048C8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_081048C2:
pop {r0}
bx r0
@@ -534129,10 +533672,10 @@ sub_81049F8: ; 81049F8
bl sub_8105524
bl sub_81059B8
ldr r0, _08104A3C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.align 2
@@ -534220,7 +533763,7 @@ sub_8104AB8: ; 8104AB8
ldr r5, _08104AE4
adds r0, r5, 0
movs r1, 0x1
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08104AE8
@@ -534242,7 +533785,7 @@ _08104AE8: .4byte 0x03004b20
sub_8104AEC: ; 8104AEC
push {lr}
ldr r0, _08104B00
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -534424,10 +533967,10 @@ _08104C40: .4byte 0x02000000
sub_8104C44: ; 8104C44
push {lr}
ldr r0, _08104C58
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
.align 2
@@ -534439,7 +533982,7 @@ sub_8104C5C: ; 8104C5C
push {lr}
ldr r0, _08104C9C
movs r1, 0x3
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _08104CA0
@@ -544964,7 +544507,7 @@ _08109B58:
movs r3, 0xC
bl Reset
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r4}
pop {r0}
@@ -545164,7 +544707,7 @@ sub_8109CF0: ; 8109CF0
push {lr}
ldr r0, _08109D00
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -545232,7 +544775,7 @@ _08109D8C:
strh r0, [r1]
_08109D94:
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r4-r6}
pop {r0}
@@ -545258,7 +544801,7 @@ sub_8109DAC: ; 8109DAC
movs r0, 0
strh r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
pop {r4}
pop {r0}
@@ -545310,7 +544853,7 @@ sub_8109E34: ; 8109E34
push {lr}
ldr r0, _08109E4C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl sub_8109A48
@@ -545429,7 +544972,7 @@ sub_8109E80: ; 8109E80
ldr r1, _0810A0B8
bl LZ77UnCompVram
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_8073B94
bl ResetObjectPaletteAllocator
@@ -545511,7 +545054,7 @@ sub_8109E80: ; 8109E80
strh r0, [r3]
ldr r0, _0810A104
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -545632,7 +545175,7 @@ _0810A118: .4byte gUnknown_083F76B8
thumb_func_start sub_810A11C
sub_810A11C: ; 810A11C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -546512,7 +546055,7 @@ _0810A80C:
bl gpu_pal_apply
_0810A816:
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_8073B94
bl ResetObjectPaletteAllocator
@@ -546615,7 +546158,7 @@ Cb2_StartWallClock: ; 810A8F4
bl LZ77UnCompVram
ldr r0, _0810A9F8
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -546747,7 +546290,7 @@ Cb2_ViewWallClock: ; 810AA14
bl LZ77UnCompVram
ldr r0, _0810AA60
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
adds r0, r7, 0
@@ -546875,7 +546418,7 @@ _0810AB38: .4byte gUnknown_083F7B40
thumb_func_start sub_810AB3C
sub_810AB3C: ; 810AB3C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -547959,7 +547502,7 @@ oei_task_add: ; 810B328
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r0, _0810B348
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -548173,7 +547716,7 @@ sub_810B4CC: ; 810B4CC
movs r0, 0
strb r0, [r1, 0x6]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -548355,7 +547898,7 @@ sub_810B634: ; 810B634
_0810B64E:
ldr r0, _0810B66C
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810B670
@@ -548378,7 +547921,7 @@ sub_810B674: ; 810B674
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -548494,7 +548037,7 @@ _0810B792:
ldrb r0, [r0]
cmp r0, 0x2
beq _0810B79E
- bl clear_tasks
+ bl ResetTasks
_0810B79E:
ldr r1, _0810B7AC
ldr r0, _0810B7B0
@@ -548714,7 +548257,7 @@ _0810B96E:
bne _0810B988
ldr r0, _0810B984
movs r1, 0
- bl AddTask
+ bl CreateTask
b _0810B994
.align 2
_0810B984: .4byte sub_810BF7C
@@ -549918,7 +549461,7 @@ _0810C2E8:
ldr r0, [r1]
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0810C300:
pop {r4,r5}
pop {r0}
@@ -550147,7 +549690,7 @@ sub_810C4C4: ; 810C4C4
ldr r1, _0810C504
bl sub_8136130
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0810C4F0:
pop {r4}
pop {r0}
@@ -551120,7 +550663,7 @@ _0810CC50: .4byte gUnknown_081B694A
thumb_func_start sub_810CC54
sub_810CC54: ; 810CC54
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -551195,7 +550738,7 @@ sub_810CC80: ; 810CC80
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl sub_8073B94
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
ldr r3, _0810CD48
ldrh r2, [r3]
@@ -551377,7 +550920,7 @@ sub_810CE48: ; 810CE48
push {lr}
ldr r0, _0810CE58
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -551597,7 +551140,7 @@ sub_810CFF8: ; 810CFF8
push {lr}
ldr r0, _0810D008
movs r1, 0
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -552084,7 +551627,7 @@ sub_810D3C8: ; 810D3C8
beq _0810D3E2
bl script_env_2_enable_and_set_ctx_running
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0810D3E2:
pop {r4}
pop {r0}
@@ -552096,7 +551639,7 @@ sub_810D3E8: ; 810D3E8
push {lr}
ldr r0, _0810D3F8
movs r1, 0x50
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -552440,7 +551983,7 @@ mapldr_080CA5C0: ; 810D64C
bl sub_80B5838
ldr r0, _0810D680
movs r1, 0xA
- bl AddTask
+ bl CreateTask
add sp, 0x4
pop {r0}
bx r0
@@ -552460,7 +552003,7 @@ sub_810D684: ; 810D684
cmp r0, 0
bne _0810D69C
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_0810D69C:
pop {r0}
bx r0
@@ -553695,7 +553238,7 @@ sub_810E070: ; 810E070
bl audio_play
ldr r0, _0810E098
movs r1, 0x8
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -553735,7 +553278,7 @@ sub_810E09C: ; 810E09C
cmp r0, 0x5
bne _0810E0FC
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
b _0810E0FC
.align 2
@@ -554196,14 +553739,14 @@ sub_810E424: ; 810E424
push {r4,lr}
ldr r4, _0810E460
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0810E458
adds r0, r4, 0
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810E464
@@ -554306,7 +553849,7 @@ _0810E4CC:
cmp r0, 0x5
bne _0810E4FC
ldrb r0, [r4, 0xA]
- bl remove_task
+ bl DestroyTask
_0810E4FC:
ldrh r0, [r4, 0xE]
adds r0, 0x1
@@ -554490,14 +554033,14 @@ sub_810E638: ; 810E638
push {r4,lr}
ldr r4, _0810E674
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0810E66C
adds r0, r4, 0
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810E678
@@ -554593,7 +554136,7 @@ _0810E6F2:
cmp r0, 0x5
bne _0810E712
ldrb r0, [r4, 0xA]
- bl remove_task
+ bl DestroyTask
_0810E712:
ldrh r0, [r4, 0xE]
adds r0, 0x1
@@ -554868,7 +554411,7 @@ _0810E924:
bl sub_810E944
ldr r0, _0810E940
movs r1, 0x8
- bl AddTask
+ bl CreateTask
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -555022,7 +554565,7 @@ _0810EA5C:
bl sub_810EEDC
bl sub_8071EF4
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
b _0810EABC
.align 2
_0810EA88: .4byte 0x0202e8dc
@@ -555212,7 +554755,7 @@ sub_810EBEC: ; 810EBEC
push {lr}
ldr r0, _0810EC2C
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810EC30
@@ -555298,7 +554841,7 @@ sub_810EC9C: ; 810EC9C
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
@@ -555354,14 +554897,14 @@ sub_810ECFC: ; 810ECFC
push {r4,lr}
ldr r4, _0810ED38
adds r0, r4, 0
- bl is_function_an_active_task
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0810ED30
adds r0, r4, 0
movs r1, 0x8
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810ED3C
@@ -555544,7 +555087,7 @@ _0810EE92:
cmp r0, 0x8
bne _0810EEB2
ldrb r0, [r5, 0xA]
- bl remove_task
+ bl DestroyTask
_0810EEB2:
ldrh r0, [r5, 0xE]
adds r0, 0x1
@@ -555851,7 +555394,7 @@ _0810F0CA:
strb r0, [r1]
ldr r0, _0810F114
movs r1, 0x8
- bl AddTask
+ bl CreateTask
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -556704,7 +556247,7 @@ sub_810F758: ; 810F758
push {lr}
ldr r0, _0810F798
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810F79C
@@ -556796,7 +556339,7 @@ sub_810F814: ; 810F814
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
@@ -558719,7 +558262,7 @@ _081106C8:
strh r0, [r1]
bl sub_8073B94
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl FreeAllObjectTiles
bl ResetObjectPaletteAllocator
ldr r0, _08110710
@@ -560410,7 +559953,7 @@ sub_81113AC: ; 81113AC
strb r3, [r1]
ldr r0, _081113E4
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _081113E8
@@ -560705,7 +560248,7 @@ _0811160A:
ldrh r0, [r5, 0xA]
strb r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
b _0811164C
.align 2
_08111630: .4byte 0x0202f388
@@ -561019,7 +560562,7 @@ _0811188E:
sub_8111894: ; 8111894
push {lr}
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_8111894
@@ -561076,7 +560619,7 @@ _081118E4:
lsls r4, 24
lsrs r4, 24
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
adds r0, r7, 0
adds r1, r5, 0
adds r2, r6, 0
@@ -561108,7 +560651,7 @@ sub_8111924: ; 8111924
lsrs r6, 24
ldr r0, _08111978
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0811197C
@@ -561217,7 +560760,7 @@ evolution_cutscene: ; 8111984
bl sub_800DAB8
bl ResetAllObjectData
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
ldr r0, _08111C44
movs r3, 0x4
@@ -561377,7 +560920,7 @@ evolution_cutscene: ; 8111984
bl sub_8149954
ldr r0, _08111C74
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r1, r0, 24
lsrs r2, r1, 24
ldr r4, _08111C68
@@ -562047,7 +561590,7 @@ sub_81120E4: ; 81120E4
bl sub_8149954
ldr r0, _08112264
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r1, r0, 24
lsrs r2, r1, 24
mov r1, r9
@@ -562111,7 +561654,7 @@ sub_8112270: ; 8112270
ldr r0, _0811228C
bl sub_800374C
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
.align 2
@@ -562128,7 +561671,7 @@ sub_8112290: ; 8112290
adds r0, 0x4
bl sub_80035AC
bl fade_and_return_progress_probably
- bl RunActiveTasks
+ bl RunTasks
pop {r0}
bx r0
.align 2
@@ -562868,7 +562411,7 @@ _0811290A:
bl sub_81122B4
_0811291A:
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08112930
ldr r0, [r0]
bl SetMainCallback2
@@ -564173,7 +563716,7 @@ _0811346C:
b _08113B3A
_08113478:
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _0811348C
ldr r0, [r0]
bl SetMainCallback2
@@ -567726,7 +567269,7 @@ nullsub_24: ; 81150F8
thumb_func_start sub_81150FC
sub_81150FC: ; 81150FC
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
ldr r0, _08115120
@@ -568106,7 +567649,7 @@ _08115440: .4byte 0x0000043c
_08115444:
bl sub_8073B94
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
ldr r1, _08115458
ldr r0, _0811545C
adds r1, r0
@@ -568256,7 +567799,7 @@ _0811558C:
bl sub_80748D0
ldr r0, _08115618
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r4, _0811561C
adds r1, r4, 0
adds r1, 0xA4
@@ -568277,7 +567820,7 @@ _0811558C:
strh r0, [r1, 0x22]
ldr r0, _0811562C
movs r1, 0x1
- bl AddTask
+ bl CreateTask
adds r4, 0xA5
strb r0, [r4]
ldr r0, _08115630
@@ -568495,7 +568038,7 @@ sub_81157AC: ; 81157AC
ldr r0, _081157CC
adds r0, 0xA5
ldrb r0, [r0]
- bl remove_task
+ bl DestroyTask
adds r0, r4, 0
bl sub_8116AB0
pop {r4}
@@ -570968,7 +570511,7 @@ sub_8116B40: ; 8116B40
ldr r0, _08116BBC
bl SetMainCallback2
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08116B9E:
pop {r4,r5}
pop {r0}
@@ -572225,7 +571768,7 @@ sub_8117528: ; 8117528
ldr r0, _08117558
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0811754C:
pop {r4}
pop {r0}
@@ -572292,7 +571835,7 @@ sub_81175C0: ; 81175C0
bl sub_8071EF4
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -572329,7 +571872,7 @@ _08117608:
bl sub_8071EF4
bl script_env_2_disable
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0811761C:
pop {r4}
pop {r0}
@@ -572548,7 +572091,7 @@ sub_81177FC: ; 81177FC
bl script_env_2_enable
ldr r0, _08117828
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0811782C
@@ -579066,7 +578609,7 @@ sub_811AAD8: ; 811AAD8
sub_811AAE8: ; 811AAE8
push {lr}
ldr r0, _0811AB0C
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _0811AB10
@@ -579085,7 +578628,7 @@ _0811AB0C: .4byte sub_811AB50
_0811AB10: .4byte 0x03004b20
_0811AB14:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
movs r0, 0x1
_0811AB1C:
pop {r1}
@@ -579100,7 +578643,7 @@ sub_811AB20: ; 811AB20
lsrs r4, 24
ldr r0, _0811AB48
movs r1, 0x2
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0811AB4C
@@ -579175,7 +578718,7 @@ _0811ABBC: .4byte 0x04000100
_0811ABC0: .4byte gUnknown_083FD70C
_0811ABC4:
movs r1, 0x4
- bl AddTask
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -579196,7 +578739,7 @@ sub_811ABD8: ; 811ABD8
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
@@ -579227,7 +578770,7 @@ sub_811AC0C: ; 811AC0C
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl AddTask
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -579251,7 +578794,7 @@ sub_811AC34: ; 811AC34
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
@@ -579302,7 +578845,7 @@ _0811AC9C:
cmp r0, 0
beq _0811ACAC
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0811ACAC:
add sp, 0x4
pop {r4}
@@ -579432,10 +578975,10 @@ sub_811AD80: ; 811AD80
cmp r0, 0
bne _0811AD9C
ldr r0, _0811ADA8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811AD9C:
movs r0, 0
pop {r1}
@@ -579570,10 +579113,10 @@ sub_811AE70: ; 811AE70
cmp r0, 0
bne _0811AEBE
ldr r0, _0811AEDC
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811AEBE:
ldrb r0, [r4]
adds r0, 0x1
@@ -579780,10 +579323,10 @@ _0811B026:
cmp r0, 0
bne _0811B06A
ldr r0, _0811B088
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811B06A:
ldrb r0, [r6]
adds r0, 0x1
@@ -580295,10 +579838,10 @@ _0811B426:
ldrh r0, [r1, 0xA]
bl sub_811D6D4
ldr r0, _0811B4A0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811B462:
ldrh r1, [r4, 0xE]
movs r2, 0xE
@@ -580574,10 +580117,10 @@ sub_811B688: ; 811B688
bne _0811B6A8
bl sub_811D6D4
ldr r0, _0811B6B0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811B6A8:
movs r0, 0
pop {r1}
@@ -581288,10 +580831,10 @@ sub_811BBEC: ; 811BBEC
ldrh r0, [r1, 0xA]
bl sub_811D6D4
ldr r0, _0811BC28
- 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
@@ -581531,10 +581074,10 @@ _0811BDEC:
cmp r0, 0
bne _0811BE0E
ldr r0, _0811BE38
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811BE0E:
ldr r0, _0811BE28
ldrb r1, [r0]
@@ -581777,10 +581320,10 @@ sub_811BFC4: ; 811BFC4
ldrh r0, [r1, 0xA]
bl sub_811D6D4
ldr r0, _0811C000
- 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
@@ -582617,10 +582160,10 @@ sub_811C630: ; 811C630
ldrh r0, [r1, 0xA]
bl sub_811D6D4
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}
@@ -583362,10 +582905,10 @@ sub_811CBE8: ; 811CBE8
ldrh r0, [r1, 0xA]
bl sub_811D6D4
ldr r0, _0811CC24
- 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
@@ -583704,10 +583247,10 @@ sub_811CEB0: ; 811CEB0
bls _0811CED4
bl sub_811D6D4
ldr r0, _0811CEE0
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811CED4:
movs r0, 0
pop {r1}
@@ -584084,10 +583627,10 @@ sub_811D19C: ; 811D19C
bne _0811D1BC
bl sub_811D6D4
ldr r0, _0811D1C4
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
_0811D1BC:
movs r0, 0
pop {r1}
@@ -584373,10 +583916,10 @@ sub_811D3B0: ; 811D3B0
ldrh r0, [r1, 0xA]
bl sub_811D6D4
ldr r0, _0811D3F8
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
b _0811D414
.align 2
@@ -584515,7 +584058,7 @@ sub_811D4C8: ; 811D4C8
ldr r0, _0811D524
movs r1, 0x3
str r3, [sp]
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0811D528
@@ -584546,7 +584089,7 @@ _0811D528: .4byte 0x03004b20
sub_811D52C: ; 811D52C
push {lr}
ldr r0, _0811D540
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -584688,10 +584231,10 @@ _0811D61A:
cmp r0, 0
bne _0811D648
ldr r0, _0811D644
- bl get_task_id_by_function
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
b _0811D64E
.align 2
_0811D640: .4byte 0x00002d6b
@@ -586113,7 +585656,7 @@ sub_811E0CC: ; 811E0CC
bl FreeObjectPaletteByTag
ldr r0, _0811E19C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r0, _0811E1A0
mov r8, r0
ldrb r1, [r7]
@@ -590646,7 +590189,7 @@ sub_8120588: ; 8120588
strb r0, [r1, 0x5]
ldr r0, _08120700
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _08120704
@@ -590823,7 +590366,7 @@ _081207EC:
mov r3, r9
strb r3, [r2]
mov r0, r8
- bl remove_task
+ bl DestroyTask
_08120804:
pop {r3,r4}
mov r8, r3
@@ -594362,7 +593905,7 @@ sub_8122450: ; 8122450
ldr r0, [r0, 0x8]
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08122470:
pop {r4}
pop {r0}
@@ -594570,7 +594113,7 @@ sub_81225D4: ; 81225D4
lsls r4, 24
lsrs r4, 24
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08122648
ldr r1, _0812264C
adds r0, r1
@@ -595870,7 +595413,7 @@ sub_8123034: ; 8123034
lsls r4, 24
lsrs r4, 24
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _081230A8
ldr r1, _081230AC
adds r0, r1
@@ -596011,7 +595554,7 @@ sub_8123170: ; 8123170
ldr r0, _081231A8
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08123194:
pop {r4}
pop {r0}
@@ -596029,7 +595572,7 @@ sub_81231AC: ; 81231AC
bl pal_fill_black
ldr r0, _081231C0
movs r1, 0xA
- bl AddTask
+ bl CreateTask
pop {r0}
bx r0
.align 2
@@ -596047,7 +595590,7 @@ sub_81231C4: ; 81231C4
cmp r0, 0x1
bne _081231E4
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
_081231E4:
@@ -596070,7 +595613,7 @@ sub_81231EC: ; 81231EC
ldr r0, _08123214
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0812320A:
pop {r4}
pop {r0}
@@ -596087,7 +595630,7 @@ sub_8123218: ; 8123218
bl script_env_2_enable
ldr r0, _08123240
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -596251,7 +595794,7 @@ _0812337C: .4byte 0x03001770
_08123380: .4byte 0x0000043c
_08123384:
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl ResetObjectPaletteAllocator
bl sub_8073B94
bl sub_807C828
@@ -596351,7 +595894,7 @@ _0812347C: .4byte 0x03001770
_08123480: .4byte 0x0000043c
_08123484:
bl sub_8124118
- bl RunActiveTasks
+ bl RunTasks
ldr r1, _08123498
ldr r0, _0812349C
adds r1, r0
@@ -596617,7 +596160,7 @@ _081236B0:
bl SetMainCallback2
ldr r0, _081236F4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, _081236F8
ldrh r0, [r0]
cmp r0, 0
@@ -596636,7 +596179,7 @@ _08123700:
ldr r0, _0812371C
_08123702:
movs r1, 0x1
- bl AddTask
+ bl CreateTask
ldr r1, _08123720
ldr r1, [r1]
_0812370C:
@@ -596657,7 +596200,7 @@ _08123720: .4byte 0x02039274
thumb_func_start mainloop
mainloop: ; 8123724
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -596694,7 +596237,7 @@ _08123766:
lsrs r4, r0, 24
cmp r4, 0x13
bls _08123766
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_8073B94
ldr r2, _0812385C
@@ -596991,10 +596534,10 @@ _081239BC:
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, _081239E0
bl SetMainCallback2
_081239D6:
@@ -614983,7 +614526,7 @@ sub_812C01C: ; 812C01C
bl pal_fade_maybe
ldr r0, _0812C07C
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0812C080
@@ -615035,7 +614578,7 @@ sub_812C084: ; 812C084
cmp r0, 0x1
bne _0812C0D0
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
b _0812C110
.align 2
_0812C0C8: .4byte 0x0202f388
@@ -615091,7 +614634,7 @@ sub_812C118: ; 812C118
ldr r0, _0812C140
bl script_env_1_execute_new_script
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0812C136:
pop {r4}
pop {r0}
@@ -615740,7 +615283,7 @@ _0812C5F8:
cmp r1, r0
bne _0812C608
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0812C608:
pop {r3,r4}
mov r8, r3
@@ -615868,7 +615411,7 @@ _0812C6EE:
cmp r1, r0
bne _0812C6FE
mov r0, r8
- bl remove_task
+ bl DestroyTask
_0812C6FE:
pop {r3-r5}
mov r8, r3
@@ -622544,7 +622087,7 @@ _0812FACA:
cmp r0, 0
bgt _0812FAEA
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
ldr r1, _0812FAF4
ldrb r0, [r1]
subs r0, 0x1
@@ -628206,7 +627749,7 @@ sub_8132670: ; 8132670
bl script_env_2_enable
ldr r0, _08132698
movs r1, 0xA
- bl AddTask
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -628238,7 +627781,7 @@ sub_813269C: ; 813269C
ldr r0, _081326D4
str r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_081326C0:
pop {r4}
pop {r0}
@@ -628259,7 +627802,7 @@ sub_81326D8: ; 81326D8
strh r0, [r1]
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r4, _08132778
ldr r0, _0813277C
str r0, [r4]
@@ -628301,7 +627844,7 @@ sub_81326D8: ; 81326D8
movs r1, 0
movs r2, 0x2
bl rboxid_80040B8
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -628329,7 +627872,7 @@ sub_81327A4: ; 81327A4
push {r4,r5,lr}
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r4, _08132844
ldr r0, _08132848
str r0, [r4]
@@ -628377,7 +627920,7 @@ sub_81327A4: ; 81327A4
movs r1, 0
movs r2, 0x2
bl rboxid_80040B8
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -628445,7 +627988,7 @@ _081328A6:
movs r1, 0
strb r1, [r0]
_081328C8:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -631213,7 +630756,7 @@ sub_8133EF8: ; 8133EF8
movs r1, 0
bl sub_806D538
ldrb r0, [r4]
- bl set_task_function_to_args_14_15
+ bl SwitchTaskToFollowupFunc
pop {r4}
pop {r0}
bx r0
@@ -634141,7 +633684,7 @@ sub_8135534: ; 8135534
ldr r0, _08135568
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08135558:
pop {r4}
pop {r0}
@@ -634208,7 +633751,7 @@ _081355AE:
_081355D6:
ldr r0, _081355FC
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
bl sub_8082138
@@ -634245,7 +633788,7 @@ _08135606:
strh r0, [r1]
ldr r0, _08135664
movs r1, 0x1
- bl AddTask
+ bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
bl sub_8082138
@@ -638412,7 +637955,7 @@ _081376DC:
bl FreeObjectPaletteByTag
ldr r0, _081377A4
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r2, _081377A8
ldrb r1, [r7]
lsls r0, r1, 1
@@ -642387,7 +641930,7 @@ sub_8139750: ; 8139750
strb r0, [r1, 0x5]
ldr r0, _081398A0
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _081398A4
@@ -642663,7 +642206,7 @@ _08139A50:
str r1, [r0]
strb r5, [r4]
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
_08139A86:
pop {r4-r6}
pop {r0}
@@ -642931,7 +642474,7 @@ sub_8139C74: ; 8139C74
strb r0, [r1]
ldr r0, _08139CA8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _08139CAC
@@ -642944,7 +642487,7 @@ sub_8139C74: ; 8139C74
_08139C9C: .4byte 0x02039314
_08139CA0: .4byte gUnknown_084062B8
_08139CA4: .4byte 0x030007b4
-_08139CA8: .4byte nullsub_54
+_08139CA8: .4byte TaskDummy
_08139CAC: .4byte gUnknown_0840E6B5
_08139CB0: .4byte sub_8139CF4
thumb_func_end sub_8139C74
@@ -642960,7 +642503,7 @@ sub_8139CB4: ; 8139CB4
strb r0, [r1]
ldr r0, _08139CE8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _08139CEC
@@ -642973,7 +642516,7 @@ sub_8139CB4: ; 8139CB4
_08139CDC: .4byte 0x02039314
_08139CE0: .4byte gUnknown_084062BC
_08139CE4: .4byte 0x030007b4
-_08139CE8: .4byte nullsub_54
+_08139CE8: .4byte TaskDummy
_08139CEC: .4byte gUnknown_0840E6B5
_08139CF0: .4byte sub_8139CF4
thumb_func_end sub_8139CB4
@@ -643268,7 +642811,7 @@ _08139F3C:
bl script_env_2_enable_and_set_ctx_running
_08139F4C:
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -643428,7 +642971,7 @@ sub_813A078: ; 813A078
bne _0813A094
bl sub_80A6A30
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0813A094:
pop {r4}
pop {r0}
@@ -643493,7 +643036,7 @@ sub_813A0F8: ; 813A0F8
bl sub_8139F58
ldr r0, _0813A114
movs r1, 0
- bl AddTask
+ bl CreateTask
bl pal_fill_black
pop {r0}
bx r0
@@ -645947,7 +645490,7 @@ sub_813B454: ; 813B454
movs r2, 0x1
bl sub_80F890C
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0813B488:
pop {r4}
pop {r0}
@@ -645990,7 +645533,7 @@ sub_813B4D0: ; 813B4D0
push {lr}
ldr r0, _0813B4EC
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl sub_813B108
@@ -646205,7 +645748,7 @@ sub_813B66C: ; 813B66C
movs r0, 0x3
strb r0, [r1]
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_0813B690:
pop {r4}
pop {r0}
@@ -646221,7 +645764,7 @@ sub_813B6A4: ; 813B6A4
push {r4-r6,lr}
ldr r0, _0813B6F0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
ldr r5, _0813B6F4
@@ -646343,7 +645886,7 @@ sub_813B784: ; 813B784
thumb_func_start sub_813B798
sub_813B798: ; 813B798
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -646525,7 +646068,7 @@ _0813B890:
movs r2, 0
bl sub_813B808
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
movs r0, 0x1
@@ -646622,7 +646165,7 @@ _0813B9F0:
bne _0813BA38
ldr r0, _0813BA18
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, _0813BA1C
bl SetMainCallback2
ldr r1, _0813BA20
@@ -647032,7 +646575,7 @@ _0813BD80:
bne _0813BDA0
ldr r0, _0813BDE0
movs r1, 0
- bl AddTask
+ bl CreateTask
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -647573,7 +647116,7 @@ sub_813C1F4: ; 813C1F4
lsls r4, 3
adds r4, r0
ldrb r0, [r4, 0x8]
- bl remove_task
+ bl DestroyTask
ldr r0, _0813C22C
str r0, [r4]
_0813C218:
@@ -647977,7 +647520,7 @@ sub_813C54C: ; 813C54C
strh r0, [r1]
ldr r0, _0813C5C4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r5, _0813C5C8
lsls r1, r4, 2
adds r1, r4
@@ -648648,7 +648191,7 @@ sub_813CADC: ; 813CADC
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
ldr r0, _0813CAF0
bl SetMainCallback2
pop {r0}
@@ -649067,7 +648610,7 @@ _0813CE14:
adds r0, 0x2
strh r2, [r0]
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_0813CE26:
pop {r4}
pop {r0}
@@ -655114,7 +654657,7 @@ sub_813FCBC: ; 813FCBC
str r1, [r0]
ldr r0, _0813FD2C
movs r1, 0xA
- bl AddTask
+ bl CreateTask
ldr r0, _0813FD30
str r0, [r4]
_0813FD16:
@@ -655165,7 +654708,7 @@ sub_813FD34: ; 813FD34
movs r1, 0
bl StartObjectImageAnim
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0813FD80:
pop {r4-r6}
pop {r0}
@@ -655299,7 +654842,7 @@ sub_813FE70: ; 813FE70
bne _0813FEAC
ldr r0, _0813FEB4
movs r1, 0x32
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x38]
@@ -655322,7 +654865,7 @@ _0813FEAC:
pop {r0}
bx r0
.align 2
-_0813FEB4: .4byte nullsub_54
+_0813FEB4: .4byte TaskDummy
_0813FEB8: .4byte sub_813FEC8
_0813FEBC: .4byte 0x02020004
_0813FEC0: .4byte 0x02024be0
@@ -655474,7 +655017,7 @@ _0813FFDC:
cmp r0, 0xA
ble _08140004
adds r0, r6, 0
- bl remove_task
+ bl DestroyTask
adds r0, r7, 0
movs r1, 0x2
bl StartObjectImageAnim
@@ -656632,7 +656175,7 @@ _081408B6:
adds r0, r1
ldr r0, [r0]
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r1, _08140920
@@ -656759,7 +656302,7 @@ _081409B6:
movs r0, 0x1
strh r0, [r2, 0x3C]
mov r0, r9
- bl remove_task
+ bl DestroyTask
b _081409F6
.align 2
_081409D0: .4byte 0x03004b20
@@ -656928,7 +656471,7 @@ _08140AA8:
adds r0, r5, r0
strh r2, [r0, 0x3C]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -657032,7 +656575,7 @@ _08140B80:
adds r0, r5, r0
strh r1, [r0, 0x3C]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -657135,7 +656678,7 @@ _08140C58:
adds r0, r5, r0
strh r2, [r0, 0x3C]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -657241,7 +656784,7 @@ _08140D2C:
adds r0, r5, r0
strh r2, [r0, 0x3C]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -657370,7 +656913,7 @@ _08140E20:
movs r1, 0x1
strh r1, [r0, 0x3C]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
_08140EA4:
add sp, 0x14
pop {r3-r5}
@@ -657518,7 +657061,7 @@ _08140F68:
movs r1, 0x1
strh r1, [r0, 0x3C]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -657703,7 +657246,7 @@ _08141122:
movs r0, 0x1
strh r0, [r1, 0x3C]
ldr r0, [sp]
- bl remove_task
+ bl DestroyTask
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -657797,7 +657340,7 @@ _081411A8:
movs r1, 0x1
strh r1, [r0, 0x3C]
adds r0, r7, 0
- bl remove_task
+ bl DestroyTask
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -657946,7 +657489,7 @@ sub_8141314: ; 8141314
lsrs r7, r3, 24
ldr r0, _08141378
movs r1, 0x5
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -658087,7 +657630,7 @@ _08141434:
movs r3, 0
bl pal_fade_maybe
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0814145C:
add sp, 0x4
pop {r4,r5}
@@ -658183,7 +657726,7 @@ _08141508: .4byte 0x03004b20
_0814150C: .4byte gUnknown_0840B4D4
_08141510:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_08141516:
pop {r4}
pop {r0}
@@ -658645,13 +658188,13 @@ _081418A2:
ldr r5, _081418F4
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, _081418F8
@@ -658945,7 +658488,7 @@ sub_8141AD8: ; 8141AD8
strb r1, [r0, 0x1]
_08141B0E:
adds r0, r3, 0
- bl remove_task
+ bl DestroyTask
_08141B14:
pop {r0}
bx r0
@@ -659367,7 +658910,7 @@ sub_8141E38: ; 8141E38
thumb_func_start sub_8141E4C
sub_8141E4C: ; 8141E4C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -659518,7 +659061,7 @@ sub_8141F90: ; 8141F90
bne _08141FB6
ldr r0, _08141FBC
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08141FC0
@@ -659545,7 +659088,7 @@ sub_8141FC4: ; 8141FC4
bne _08141FEA
ldr r0, _08141FF0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08141FF4
@@ -660682,7 +660225,7 @@ sub_81428A0: ; 81428A0
cmp r0, 0
bne _081428BE
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _081428C8
bl SetMainCallback2
_081428BE:
@@ -660831,7 +660374,7 @@ _081429EC:
strh r0, [r1]
ldr r0, _08142A20
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r0, _08142A24
bl SetMainCallback2
_08142A12:
@@ -661555,7 +661098,7 @@ sub_8142FCC: ; 8142FCC
cmp r0, 0
beq _08142FE6
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
bl sub_810D62C
_08142FE6:
pop {r4}
@@ -662259,7 +661802,7 @@ _0814356C: .4byte gUnknown_08E8EA78
sub_8143570: ; 8143570
push {r4,lr}
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r1, _081435A8
@@ -662760,7 +662303,7 @@ sub_8143948: ; 8143948
thumb_func_start sub_814395C
sub_814395C: ; 814395C
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -662786,7 +662329,7 @@ sub_814395C: ; 814395C
cmp r1, r0
bne _081439B2
bl sub_8143948
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -662816,10 +662359,10 @@ sub_81439D0: ; 81439D0
movs r0, 0
bl SetVBlankCallback
bl sub_8073B94
- bl clear_tasks
+ bl ResetTasks
ldr r0, _08143AF0
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _08143AF4
@@ -662876,7 +662419,7 @@ _08143A0E:
strh r0, [r1]
ldr r0, _08143B10
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -663308,7 +662851,7 @@ _08143E08: .4byte gUnknown_0840CAB0
_08143E0C:
ldr r0, _08143EA0
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r2, _08143EA4
lsls r4, r6, 2
adds r4, r6
@@ -664097,7 +663640,7 @@ _08144428:
movs r1, 0x1
strh r1, [r0, 0x10]
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_08144446:
add sp, 0x4
pop {r3}
@@ -665335,7 +664878,7 @@ _08144DF0:
_08144DFC:
ldr r0, _08144EC4
movs r1, 0
- bl AddTask
+ bl CreateTask
ldr r6, _08144EC0
lsls r1, r7, 2
adds r1, r7
@@ -665369,7 +664912,7 @@ _08144DFC:
strh r7, [r0, 0xC]
ldr r0, _08144EC8
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xA]
@@ -665659,7 +665202,7 @@ sub_81450AC: ; 81450AC
beq _081450D2
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0x8]
_081450D2:
@@ -665670,7 +665213,7 @@ _081450D2:
beq _081450E8
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0xA]
_081450E8:
@@ -665681,7 +665224,7 @@ _081450E8:
beq _081450FE
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0xC]
_081450FE:
@@ -665692,7 +665235,7 @@ _081450FE:
beq _08145114
lsls r0, r1, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
movs r0, 0
strh r0, [r4, 0xE]
_08145114:
@@ -667382,7 +666925,7 @@ sub_8145D88: ; 8145D88
ldr r1, _08145ECC
bl LZ77UnCompVram
bl remove_some_task
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
bl sub_8073B94
bl ResetObjectPaletteAllocator
@@ -667436,7 +666979,7 @@ sub_8145D88: ; 8145D88
strh r0, [r1]
ldr r0, _08145EF8
movs r1, 0
- bl AddTask
+ bl CreateTask
add sp, 0xC
pop {r3}
mov r8, r3
@@ -667468,7 +667011,7 @@ _08145EF8: .4byte sub_8145F14
thumb_func_start sub_8145EFC
sub_8145EFC: ; 8145EFC
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -667552,7 +667095,7 @@ sub_8145F8C: ; 8145F8C
cmp r0, 0
bne _08145FAA
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08145FB4
bl SetMainCallback2
_08145FAA:
@@ -667609,7 +667152,7 @@ sub_8146014: ; 8146014
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -667877,7 +667420,7 @@ _0814625E:
bne _08146278
ldr r0, _08146274
movs r1, 0
- bl AddTask
+ bl CreateTask
b _08146284
.align 2
_08146274: .4byte sub_8146480
@@ -668090,7 +667633,7 @@ sub_814640C: ; 814640C
bl sub_80A7DD4
bl gpu_pal_allocator_reset__manage_upper_four
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08146432:
pop {r4}
pop {r0}
@@ -668743,7 +668286,7 @@ sub_8146930: ; 8146930
push {r4,lr}
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
- bl clear_tasks
+ bl ResetTasks
ldr r0, _0814699C
bl SetVBlankCallback
ldr r4, _081469A0
@@ -668763,9 +668306,9 @@ sub_8146930: ; 8146930
strh r0, [r1]
ldr r0, _081469A4
movs r1, 0
- bl AddTask
+ bl CreateTask
bl sub_8074D08
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -669266,7 +668809,7 @@ _08146DA4:
movs r1, 0xD
strb r1, [r0]
_08146DE4:
- bl RunActiveTasks
+ bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -669404,7 +668947,7 @@ _08146E6C:
ldr r1, _08146FE8
bl LZ77UnCompVram
bl ResetAllObjectData
- bl clear_tasks
+ bl ResetTasks
bl sub_8073B94
ldr r0, _08146FEC
movs r1, 0
@@ -670306,7 +669849,7 @@ sub_814768C: ; 814768C
bne _081476A2
ldr r0, _081476AC
movs r1, 0x50
- bl AddTask
+ bl CreateTask
_081476A2:
pop {r0}
bx r0
@@ -670381,7 +669924,7 @@ _08147730:
beq _08147748
bl sub_8064E2C
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_disable
b _0814776A
_08147748:
@@ -670399,7 +669942,7 @@ _0814775A:
ldr r0, _08147770
bl script_env_1_execute_new_script
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
_0814776A:
pop {r4,r5}
pop {r0}
@@ -670450,7 +669993,7 @@ sub_81477B4: ; 81477B4
push {lr}
ldr r0, _081477E8
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _081477EC
@@ -670481,7 +670024,7 @@ sub_81477F0: ; 81477F0
push {lr}
ldr r0, _08147824
movs r1, 0x9
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08147828
@@ -670545,7 +670088,7 @@ sub_814782C: ; 814782C
cmp r1, r0
bne _08147884
adds r0, r5, 0
- bl remove_task
+ bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
bl InstallCameraPanAheadCallback
_08147884:
@@ -670561,7 +670104,7 @@ sub_8147890: ; 8147890
push {lr}
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -671192,7 +670735,7 @@ sub_8147DDC: ; 8147DDC
lsrs r4, 24
ldr r0, _08147E08
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08147E0C
@@ -671342,7 +670885,7 @@ sub_8147F08: ; 8147F08
ldr r0, [r0, 0x8]
bl SetMainCallback2
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
_08147F34:
pop {r4}
pop {r0}
@@ -672392,7 +671935,7 @@ c2_clear_save_data_screen_2: ; 8148800
beq _08148814
ldr r0, _08148818
movs r1, 0
- bl AddTask
+ bl CreateTask
_08148814:
pop {r0}
bx r0
@@ -672515,7 +672058,7 @@ _0814890C:
movs r0, 0x5
bl audio_play
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _0814892C
bl SetMainCallback2
_0814891E:
@@ -672536,7 +672079,7 @@ sub_8148930: ; 8148930
lsrs r4, 24
bl calls_flash_erase_block
adds r0, r4, 0
- bl remove_task
+ bl DestroyTask
ldr r0, _08148950
bl SetMainCallback2
pop {r4}
@@ -672549,7 +672092,7 @@ _08148950: .4byte sub_8148B34
thumb_func_start sub_8148954
sub_8148954: ; 8148954
push {lr}
- bl RunActiveTasks
+ bl RunTasks
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -672668,7 +672211,7 @@ _08148A2C:
lsrs r1, r0, 16
cmp r1, r2
bls _08148A2C
- bl clear_tasks
+ bl ResetTasks
bl ResetAllObjectData
ldr r0, _08148AE0
bl ShowBg
@@ -673164,7 +672707,7 @@ sub_8148EC0: ; 8148EC0
mov r0, r9
movs r1, 0
str r3, [sp]
- bl AddTask
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -674556,7 +674099,7 @@ sub_8149970: ; 8149970
lsrs r4, 16
ldr r0, _08149998
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0814999C
@@ -674695,7 +674238,7 @@ sub_8149A60: ; 8149A60
_08149A80: .4byte 0x03004b20
_08149A84:
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_08149A8A:
pop {r4}
pop {r0}
@@ -674707,7 +674250,7 @@ sub_8149A90: ; 8149A90
push {lr}
ldr r0, _08149AA4
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -674796,7 +674339,7 @@ sub_8149B34: ; 8149B34
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_8149B34
@@ -674806,7 +674349,7 @@ sub_8149B44: ; 8149B44
push {lr}
ldr r0, _08149B58
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -674916,7 +674459,7 @@ sub_8149C10: ; 8149C10
push {lr}
lsls r0, 24
lsrs r0, 24
- bl remove_task
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_8149C10
@@ -674929,7 +674472,7 @@ sub_8149C20: ; 8149C20
lsrs r4, 16
ldr r0, _08149C48
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08149C4C
@@ -675074,7 +674617,7 @@ sub_8149D3C: ; 8149D3C
cmp r0, 0
bne _08149D54
adds r0, r2, 0
- bl remove_task
+ bl DestroyTask
_08149D54:
pop {r0}
bx r0
@@ -675090,7 +674633,7 @@ sub_8149D5C: ; 8149D5C
lsrs r4, 16
ldr r0, _08149D84
movs r1, 0
- bl AddTask
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08149D88
@@ -675255,7 +674798,7 @@ _08149E96:
bls _08149E96
adds r0, r3, 0
movs r1, 0
- bl AddTask
+ bl CreateTask
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -675684,7 +675227,7 @@ sub_814A158: ; 814A158
negs r2, r2
ands r2, r3
strb r2, [r1]
- bl remove_task
+ bl DestroyTask
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -675774,7 +675317,7 @@ sub_814A208: ; 814A208
movs r3, 0x4
orrs r2, r3
strb r2, [r1]
- bl remove_task
+ bl DestroyTask
pop {r3}
mov r8, r3
pop {r4-r6}
diff --git a/include/task.h b/include/task.h
new file mode 100644
index 000000000..cb01efbef
--- /dev/null
+++ b/include/task.h
@@ -0,0 +1,27 @@
+#ifndef GUARD_TASK_H
+#define GUARD_TASK_H
+
+typedef void (*TaskFunc)(u8 taskId);
+
+struct Task
+{
+ TaskFunc func;
+ bool8 isActive;
+ u8 prev;
+ u8 next;
+ u8 priority;
+ u16 data[16];
+};
+
+void ResetTasks();
+u8 CreateTask(TaskFunc func, u8 priority);
+void DestroyTask(u8 taskId);
+void RunTasks();
+void TaskDummy(u8 taskId);
+void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc);
+void SwitchTaskToFollowupFunc(u8 taskId);
+bool8 FuncIsActiveTask(TaskFunc func);
+u8 FindTaskIdByFunc(TaskFunc func);
+u8 GetTaskCount();
+
+#endif // GUARD_TASK_H
diff --git a/iwram_syms.txt b/iwram_syms.txt
index 1c14f71f7..844e2b433 100644
--- a/iwram_syms.txt
+++ b/iwram_syms.txt
@@ -10,3 +10,5 @@ gRtcLocked = 0x3000F36;
gUnknownStringVar = 0x3002900;
gLocalTime = 0x3004038;
+
+gTasks = 0x3004B20;
diff --git a/src/task.c b/src/task.c
new file mode 100644
index 000000000..f0f95c997
--- /dev/null
+++ b/src/task.c
@@ -0,0 +1,295 @@
+#include "global.h"
+#include "task.h"
+
+#define NUM_TASKS 16
+
+#define HEAD_SENTINEL 0xFE
+#define TAIL_SENTINEL 0xFF
+
+extern struct Task gTasks[];
+
+static void InsertTask(u8 newTaskId);
+static u8 FindFirstActiveTask();
+
+void ResetTasks()
+{
+ u8 i;
+
+ for (i = 0; i < NUM_TASKS; i++)
+ {
+ gTasks[i].isActive = FALSE;
+ gTasks[i].func = TaskDummy;
+ gTasks[i].prev = i;
+ gTasks[i].next = i + 1;
+ gTasks[i].priority = -1;
+ memset(gTasks[i].data, 0, sizeof(gTasks[i].data));
+ }
+
+ gTasks[0].prev = HEAD_SENTINEL;
+ gTasks[NUM_TASKS - 1].next = TAIL_SENTINEL;
+}
+
+u8 CreateTask(TaskFunc func, u8 priority)
+{
+ u8 i;
+
+ for (i = 0; i < NUM_TASKS; i++)
+ {
+ if (!gTasks[i].isActive)
+ {
+ gTasks[i].func = func;
+ gTasks[i].priority = priority;
+ InsertTask(i);
+ memset(gTasks[i].data, 0, sizeof(gTasks[i].data));
+ gTasks[i].isActive = TRUE;
+ return i;
+ }
+ }
+
+ return 0;
+}
+
+#ifdef NONMATCHING
+static void InsertTask(u8 newTaskId)
+{
+ u8 taskId = FindFirstActiveTask();
+
+ if (taskId == NUM_TASKS)
+ {
+ // The new task is the only task.
+ gTasks[newTaskId].prev = HEAD_SENTINEL;
+ gTasks[newTaskId].next = TAIL_SENTINEL;
+ return;
+ }
+
+ for (;;)
+ {
+ if (gTasks[newTaskId].priority < gTasks[taskId].priority)
+ {
+ // We've found a task with a higher priority value,
+ // so we insert the new task before it.
+ gTasks[newTaskId].prev = gTasks[taskId].prev;
+ gTasks[newTaskId].next = taskId;
+
+ if (gTasks[taskId].prev != HEAD_SENTINEL)
+ gTasks[gTasks[taskId].prev].next = newTaskId;
+
+ gTasks[taskId].prev = newTaskId;
+ return;
+ }
+
+ if (gTasks[taskId].next != TAIL_SENTINEL)
+ taskId = gTasks[taskId].next;
+ else
+ break;
+ }
+
+ // We've reached the end.
+ gTasks[newTaskId].prev = taskId;
+ gTasks[newTaskId].next = gTasks[taskId].next;
+ gTasks[taskId].next = newTaskId;
+}
+#else
+__attribute__((naked))
+static void InsertTask(u8 newTaskId)
+{
+ asm("push {r4, r5, r6, r7, lr}\n\
+ mov r7, r8\n\
+ push {r7}\n\
+ lsl r0, r0, #24\n\
+ lsr r4, r0, #24\n\
+ bl FindFirstActiveTask\n\
+ lsl r0, r0, #24\n\
+ lsr r1, r0, #24\n\
+ cmp r1, #16\n\
+ bne .LInsertTask_foundActiveTask\n\
+ ldr r1, .LInsertTask_gTasks1\n\
+ lsl r0, r4, #2\n\
+ add r0, r0, r4\n\
+ lsl r0, r0, #3\n\
+ add r0, r0, r1\n\
+ mov r1, #254\n\
+ strb r1, [r0, #5]\n\
+ mov r1, #255\n\
+ strb r1, [r0, #6]\n\
+ b .LInsertTask_done\n\
+ .align 2\n\
+.LInsertTask_gTasks1:\n\
+ .word gTasks\n\
+.LInsertTask_foundActiveTask:\n\
+ ldr r6, .LInsertTask_gTasks2\n\
+ lsl r0, r4, #2\n\
+ mov r12, r0\n\
+ mov r8, r6\n\
+ add r0, r0, r4\n\
+ lsl r0, r0, #3\n\
+ add r2, r0, r6\n\
+.LInsertTask_loop:\n\
+ lsl r0, r1, #2\n\
+ add r0, r0, r1\n\
+ lsl r5, r0, #3\n\
+ mov r7, r8\n\
+ add r3, r5, r7\n\
+ ldrb r0, [r2, #7]\n\
+ ldrb r7, [r3, #7]\n\
+ cmp r0, r7\n\
+ bcs .LInsertTask_next\n\
+ ldrb r0, [r3, #5]\n\
+ strb r0, [r2, #5]\n\
+ strb r1, [r2, #6]\n\
+ ldrb r0, [r3, #5]\n\
+ cmp r0, #254\n\
+ beq .LInsertTask_insertAtHead\n\
+ add r1, r0, #0\n\
+ lsl r0, r1, #2\n\
+ add r0, r0, r1\n\
+ lsl r0, r0, #3\n\
+ add r0, r0, r8\n\
+ strb r4, [r0, #6]\n\
+.LInsertTask_insertAtHead:\n\
+ strb r4, [r3, #5]\n\
+ b .LInsertTask_done\n\
+ .align 2\n\
+.LInsertTask_gTasks2:\n\
+ .word gTasks\n\
+.LInsertTask_next:\n\
+ ldrb r0, [r3, #6]\n\
+ cmp r0, #255\n\
+ beq .LInsertTask_insertAtTail\n\
+ add r1, r0, #0\n\
+ b .LInsertTask_loop\n\
+.LInsertTask_insertAtTail:\n\
+ mov r2, r12\n\
+ add r0, r2, r4\n\
+ lsl r0, r0, #3\n\
+ add r0, r0, r6\n\
+ strb r1, [r0, #5]\n\
+ add r2, r5, r6\n\
+ ldrb r1, [r2, #6]\n\
+ strb r1, [r0, #6]\n\
+ strb r4, [r2, #6]\n\
+.LInsertTask_done:\n\
+ pop {r3}\n\
+ mov r8, r3\n\
+ pop {r4, r5, r6, r7}\n\
+ pop {r0}\n\
+ bx r0\n");
+}
+#endif // NONMATCHING
+
+void DestroyTask(u8 taskId)
+{
+ if (gTasks[taskId].isActive)
+ {
+ gTasks[taskId].isActive = FALSE;
+
+ if (gTasks[taskId].prev == HEAD_SENTINEL)
+ {
+ if (gTasks[taskId].next != TAIL_SENTINEL)
+ gTasks[gTasks[taskId].next].prev = HEAD_SENTINEL;
+ }
+ else
+ {
+ if (gTasks[taskId].next == TAIL_SENTINEL)
+ {
+ gTasks[gTasks[taskId].prev].next = TAIL_SENTINEL;
+ }
+ else
+ {
+ gTasks[gTasks[taskId].prev].next = gTasks[taskId].next;
+ gTasks[gTasks[taskId].next].prev = gTasks[taskId].prev;
+ }
+ }
+ }
+}
+
+void RunTasks()
+{
+ u8 taskId = FindFirstActiveTask();
+
+ if (taskId != NUM_TASKS)
+ {
+ do
+ {
+ gTasks[taskId].func(taskId);
+ taskId = gTasks[taskId].next;
+ } while (taskId != TAIL_SENTINEL);
+ }
+}
+
+static u8 FindFirstActiveTask()
+{
+ u8 taskId;
+
+ for (taskId = 0; taskId < NUM_TASKS; taskId++)
+ if (gTasks[taskId].isActive == TRUE && gTasks[taskId].prev == HEAD_SENTINEL)
+ break;
+
+ return taskId;
+}
+
+void TaskDummy(u8 taskId)
+{
+}
+
+#define TASK_DATA_OP(taskId, offset, op) \
+{ \
+ u32 tasksAddr = (u32)gTasks; \
+ u32 addr = taskId * sizeof(struct Task) + offset; \
+ u32 dataAddr = tasksAddr + offsetof(struct Task, data); \
+ addr += dataAddr; \
+ op; \
+}
+
+void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc)
+{
+ TASK_DATA_OP(taskId, 28, *((u16 *)addr) = (u32)followupFunc)
+ TASK_DATA_OP(taskId, 30, *((u16 *)addr) = (u32)followupFunc >> 16)
+ gTasks[taskId].func = func;
+}
+
+void SwitchTaskToFollowupFunc(u8 taskId)
+{
+ s32 func;
+
+ gTasks[taskId].func = NULL;
+
+ TASK_DATA_OP(taskId, 28, func = *((u16 *)addr))
+ TASK_DATA_OP(taskId, 30, func |= *((s16 *)addr) << 16)
+
+ gTasks[taskId].func = (TaskFunc)func;
+}
+
+bool8 FuncIsActiveTask(TaskFunc func)
+{
+ u8 i;
+
+ for (i = 0; i < NUM_TASKS; i++)
+ if (gTasks[i].isActive == TRUE && gTasks[i].func == func)
+ return TRUE;
+
+ return FALSE;
+}
+
+u8 FindTaskIdByFunc(TaskFunc func)
+{
+ s32 i;
+
+ for (i = 0; i < NUM_TASKS; i++)
+ if (gTasks[i].isActive == TRUE && gTasks[i].func == func)
+ return (u8)i;
+
+ return -1;
+}
+
+u8 GetTaskCount()
+{
+ u8 i;
+ u8 count = 0;
+
+ for (i = 0; i < NUM_TASKS; i++)
+ if (gTasks[i].isActive == TRUE)
+ count++;
+
+ return count;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 21:05:50 +0000