dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Ported task.c and others from pokeruby

Browse Source
This commit is contained in:
Diegoisawesome
2016-10-31 03:14:22 -05:00
parent 6874afafe5
commit 4df1937738
30 changed files with 3274 additions and 2216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
asm/main_menu.s
View File

@@ -8,7 +8,7 @@
@ void CB2_MainMenu()
CB2_MainMenu: @ 802F6B0
push {lr}
bl RunActiveTasks
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
bl fade_and_return_progress_probably
@@ -127,7 +127,7 @@ InitMainMenu: @ 802F6F4
movs r2, 0x20
bl gpu_pal_apply
bl remove_some_task
bl clear_tasks
bl ResetTasks
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
cmp r4, 0
@@ -216,7 +216,7 @@ _0802F7FE:
bl HideBg
ldr r0, =Task_MainMenuCheckSaveFile
movs r1, 0
bl AddTask
bl CreateTask
movs r0, 0
add sp, 0xC
pop {r4,r5}
@@ -1502,7 +1502,7 @@ _08030488:
_0803048A:
bl SetMainCallback2
adds r0, r6, 0
bl remove_task
bl DestroyTask
b _08030514
.pool
_0803049C:
@@ -1610,7 +1610,7 @@ _08030578:
ldr r0, =c2_title_screen_1
bl SetMainCallback2
adds r0, r5, 0
bl remove_task
bl DestroyTask
_0803058C:
pop {r4,r5}
pop {r0}
@@ -2292,7 +2292,7 @@ _08030B7C:
cmp r0, 0x5F
ble _08030BBA
adds r0, r4, 0
bl remove_task
bl DestroyTask
ldrb r1, [r7]
lsls r0, r1, 2
adds r0, r1
@@ -2941,7 +2941,7 @@ task_new_game_prof_birch_speech_17: @ 8031090
lsrs r0, 24
bl set_default_player_name
adds r0, r4, 0
bl remove_task
bl DestroyTask
ldr r0, =0x03005d90
ldr r1, [r0]
ldrb r2, [r1, 0x8]
@@ -3591,7 +3591,7 @@ task_new_game_prof_birch_speech_part2_12: @ 8031630
ldr r0, =CB2_NewGame
bl SetMainCallback2
adds r0, r4, 0
bl remove_task
bl DestroyTask
_08031666:
pop {r4}
pop {r0}
@@ -3692,10 +3692,10 @@ new_game_prof_birch_speech_part2_start: @ 8031678
movs r1, 0x1
movs r2, 0x10
bl gpu_pal_apply
bl clear_tasks
bl ResetTasks
ldr r0, =task_new_game_prof_birch_speech_part2_1
movs r1, 0
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
@@ -4035,7 +4035,7 @@ sub_8031A5C: @ 8031A5C
movs r0, 0x1
strh r0, [r1, 0x12]
adds r0, r3, 0
bl remove_task
bl DestroyTask
b _08031AC4
.pool
_08031A94:
@@ -4100,7 +4100,7 @@ sub_8031ACC: @ 8031ACC
strh r6, [r0, 0x12]
ldr r0, =sub_8031A5C
movs r1, 0
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -4145,7 +4145,7 @@ sub_8031B3C: @ 8031B3C
movs r0, 0x1
strh r0, [r1, 0x12]
adds r0, r3, 0
bl remove_task
bl DestroyTask
b _08031BA4
.pool
_08031B74:
@@ -4211,7 +4211,7 @@ sub_8031BAC: @ 8031BAC
strh r6, [r0, 0x12]
ldr r0, =sub_8031B3C
movs r1, 0
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -4258,7 +4258,7 @@ _08031C40:
cmp r0, 0x8
bne _08031C52
adds r0, r2, 0
bl remove_task
bl DestroyTask
b _08031C7C
_08031C52:
ldrh r2, [r1, 0x10]
@@ -4300,7 +4300,7 @@ sub_8031C88: @ 8031C88
lsrs r5, 24
ldr r0, =sub_8031C1C
movs r1, 0
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -4347,7 +4347,7 @@ _08031CEC:
cmp r0, 0
bne _08031CFE
adds r0, r2, 0
bl remove_task
bl DestroyTask
b _08031D28
_08031CFE:
ldrh r2, [r1, 0x10]
@@ -4389,7 +4389,7 @@ sub_8031D34: @ 8031D34
lsrs r5, 24
ldr r0, =sub_8031CC8
movs r1, 0
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -5163,7 +5163,7 @@ sub_80323A0: @ 80323A0
strb r0, [r1]
ldr r0, =sub_8030A70
movs r1, 0
bl AddTask
bl CreateTask
_080323C0:
pop {r0}
bx r0

402
asm/rom_80093CC.s
View File

File diff suppressed because it is too large Load Diff

388
asm/rom_8032654.s
View File

File diff suppressed because it is too large Load Diff

78
asm/rom_80A18F4.s
View File

@@ -2560,7 +2560,7 @@ sub_80A2C44: @ 80A2C44
lsrs r5, 24
mov r8, r5
ldr r0, =sub_80A2D54
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =0x03005e00
@@ -2600,7 +2600,7 @@ _080A2CC4:
adds r0, r5, 0
movs r1, 0x5
mov r2, r10
bl set_word_task_arg
bl SetWordTaskArg
ldr r0, =0x03005e00
adds r1, r4, r5
lsls r1, 3
@@ -2661,10 +2661,10 @@ sub_80A2D34: @ 80A2D34
push {lr}
b _080A2D3C
_080A2D38:
bl remove_task
bl DestroyTask
_080A2D3C:
ldr r0, =sub_80A2D54
bl get_task_id_by_function
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -2686,7 +2686,7 @@ sub_80A2D54: @ 80A2D54
adds r4, r0, r1
adds r0, r5, 0
movs r1, 0x5
bl get_word_task_arg
bl GetWordTaskArg
adds r3, r0, 0
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -2712,7 +2712,7 @@ sub_80A2D54: @ 80A2D54
cmp r0, r2
bne _080A2DAC
adds r0, r5, 0
bl remove_task
bl DestroyTask
b _080A2DCC
.pool
_080A2DAC:
@@ -3128,7 +3128,7 @@ _080A311A:
task_is_not_running_overworld_fanfare: @ 80A3120
push {lr}
ldr r0, =task50_overworld_fanfare
bl is_function_an_active_task
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3160,7 +3160,7 @@ _080A3158:
ldr r0, =0x03007420
bl m4aMPlayContinue
adds r0, r4, 0
bl remove_task
bl DestroyTask
_080A3164:
pop {r4}
pop {r0}
@@ -3174,14 +3174,14 @@ task_add_50_overworld_fanfare_if_not_running: @ 80A3170
push {r4,lr}
ldr r4, =task50_overworld_fanfare
adds r0, r4, 0
bl is_function_an_active_task
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080A318A
adds r0, r4, 0
movs r1, 0x50
bl AddTask
bl CreateTask
_080A318A:
pop {r4}
pop {r0}
@@ -3786,7 +3786,7 @@ _080A365E:
sub_80A3678: @ 80A3678
push {lr}
ldr r0, =sub_80A370C
bl is_function_an_active_task
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3887,7 +3887,7 @@ _080A3724:
lsls r2, 1
bl MPlayVolumeControl
adds r0, r4, 0
bl remove_task
bl DestroyTask
_080A3742:
pop {r4}
pop {r0}
@@ -3900,14 +3900,14 @@ sub_80A3754: @ 80A3754
push {r4,lr}
ldr r4, =sub_80A370C
adds r0, r4, 0
bl is_function_an_active_task
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080A376E
adds r0, r4, 0
movs r1, 0x50
bl AddTask
bl CreateTask
_080A376E:
pop {r4}
pop {r0}
@@ -4432,7 +4432,7 @@ move_anim_task_del: @ 80A3C1C
push {lr}
lsls r0, 24
lsrs r0, 24
bl remove_task
bl DestroyTask
ldr r1, =0x020383fe
ldrb r0, [r1]
subs r0, 0x1
@@ -4447,7 +4447,7 @@ move_anim_related_task_del: @ 80A3C38
push {lr}
lsls r0, 24
lsrs r0, 24
bl remove_task
bl DestroyTask
ldr r1, =0x020383ff
ldrb r0, [r1]
subs r0, 0x1
@@ -4804,7 +4804,7 @@ _080A3F04:
_080A3F1C:
adds r0, r6, 0
adds r1, r7, 0
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r6
@@ -5053,7 +5053,7 @@ sub_80A40F4: @ 80A40F4
_080A4148:
ldr r0, =task_pA_ma0A_obj_to_bg_pal
movs r1, 0xA
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
mov r1, r8
@@ -5164,7 +5164,7 @@ _080A4232:
bl sub_80A438C
ldr r0, =sub_80A40F4
movs r1, 0xA
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x020383fe
@@ -5216,7 +5216,7 @@ _080A42A6:
bl sub_80A438C
ldr r0, =sub_80A40F4
movs r1, 0xA
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =0x020383fe
@@ -5971,7 +5971,7 @@ _080A4948:
_080A494A:
ldr r0, =sub_80A4980
movs r1, 0x5
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -6035,7 +6035,7 @@ _080A49C6:
adds r0, r4, 0
bl sub_80A477C
ldrb r0, [r6]
bl remove_task
bl DestroyTask
movs r0, 0xFF
strb r0, [r6]
_080A49DE:
@@ -6053,12 +6053,12 @@ _080A49DE:
adds r0, r4, 0
bl sub_80A477C
ldrb r0, [r6, 0x1]
bl remove_task
bl DestroyTask
movs r0, 0xFF
strb r0, [r6, 0x1]
_080A4A04:
adds r0, r5, 0
bl remove_task
bl DestroyTask
_080A4A0A:
pop {r4-r6}
pop {r0}
@@ -6250,7 +6250,7 @@ _080A4B78:
_080A4B7A:
ldr r0, =sub_80A4BB0
movs r1, 0x5
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -6338,7 +6338,7 @@ _080A4C0C:
bl sub_80A477C
_080A4C38:
adds r0, r6, 0
bl remove_task
bl DestroyTask
_080A4C3E:
pop {r4-r6}
pop {r0}
@@ -6600,7 +6600,7 @@ ma14_load_background: @ 80A4E18
str r0, [r1]
ldr r0, =task_p5_load_battle_screen_elements
movs r1, 0x5
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -6635,7 +6635,7 @@ sub_80A4E5C: @ 80A4E5C
str r1, [r2]
ldr r0, =task_p5_load_battle_screen_elements
movs r1, 0x5
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
@@ -6780,7 +6780,7 @@ _080A4F94:
cmp r0, 0x3
bne _080A4FBC
adds r0, r5, 0
bl remove_task
bl DestroyTask
ldr r0, =0x02038433
strb r4, [r0]
_080A4FBC:
@@ -6895,7 +6895,7 @@ ma15_load_battle_screen_elements: @ 80A50AC
str r0, [r1]
ldr r0, =task_p5_load_battle_screen_elements
movs r1, 0x5
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -7324,7 +7324,7 @@ ma1B_8073C2C: @ 80A53B8
lsrs r4, 24
ldr r0, =c3_08073CEC
movs r1, 0x1
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -7421,7 +7421,7 @@ _080A54E0:
_080A54E4:
lsrs r4, r2, 16
adds r0, r5, 0
bl remove_task
bl DestroyTask
ldr r1, =0x020383ff
ldrb r0, [r1]
subs r0, 0x1
@@ -7464,7 +7464,7 @@ sub_80A5508: @ 80A5508
mov r10, r1
ldr r0, =c3_08073CEC
movs r1, 0x1
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -7553,7 +7553,7 @@ sub_80A559C: @ 80A559C
lsrs r4, 24
ldr r0, =c3_08073CEC
movs r1, 0x1
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -7619,7 +7619,7 @@ ma1C_8073ED0: @ 80A565C
lsrs r4, 24
ldr r0, =sub_80A56E4
movs r1, 0x1
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -7689,7 +7689,7 @@ sub_80A56E4: @ 80A56E4
cmp r4, 0
bne _080A5732
adds r0, r5, 0
bl remove_task
bl DestroyTask
ldr r1, =0x020383ff
ldrb r0, [r1]
subs r0, 0x1
@@ -7724,7 +7724,7 @@ ma1D_08073FB4: @ 80A5740
lsrs r4, 24
ldr r0, =sub_80A57B4
movs r1, 0x1
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =0x03005e00
@@ -7774,7 +7774,7 @@ sub_80A57B4: @ 80A57B4
ldrsb r1, [r2, r1]
bl audio_play_and_stuff
adds r0, r4, 0
bl remove_task
bl DestroyTask
ldr r1, =0x020383ff
ldrb r0, [r1]
subs r0, 0x1
@@ -7829,7 +7829,7 @@ _080A582A:
_080A5842:
adds r0, r6, 0
movs r1, 0x1
bl AddTask
bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r6

1988
asm/rom_80A92F4.s
View File

File diff suppressed because it is too large Load Diff

278
asm/rom_81BAD84.s
View File

File diff suppressed because it is too large Load Diff

528
asm/task.s
View File

@@ -1,528 +0,0 @@
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start clear_tasks
@ void clear_tasks()
clear_tasks: @ 80A8F50
push {r4-r7,lr}
movs r4, 0
ldr r6, =0x03005e00
adds r7, r6, 0
adds r7, 0x8
_080A8F5A:
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r2, r0, r6
movs r1, 0
strb r1, [r2, 0x4]
ldr r1, =nullsub_4
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 _080A8F5A
ldr r0, =0x03005e00
movs r1, 0xFE
strb r1, [r0, 0x5]
ldr r1, =0x0000025e
adds r0, r1
ldrb r1, [r0]
orrs r1, r5
strb r1, [r0]
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end clear_tasks
thumb_func_start AddTask
@ int AddTask(void ( *func)(int task_id), u8 priority)
AddTask: @ 80A8FB0
push {r4-r7,lr}
adds r2, r0, 0
lsls r1, 24
lsrs r1, 24
movs r6, 0
ldr r7, =0x03005e00
_080A8FBC:
lsls r0, r6, 2
adds r0, r6
lsls r5, r0, 3
adds r4, r5, r7
ldrb r0, [r4, 0x4]
cmp r0, 0
bne _080A8FF0
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 _080A8FFC
.pool
_080A8FF0:
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0xF
bls _080A8FBC
movs r0, 0
_080A8FFC:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end AddTask
thumb_func_start insert_task_in_order_by_priority
@ void insert_task_in_order_by_priority(int task_id)
insert_task_in_order_by_priority: @ 80A9004
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 _080A9034
ldr r1, =0x03005e00
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 _080A9090
.pool
_080A9034:
ldr r6, =0x03005e00
lsls r0, r4, 2
mov r12, r0
mov r8, r6
adds r0, r4
lsls r0, 3
adds r2, r0, r6
_080A9042:
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 _080A9074
ldrb r0, [r3, 0x5]
strb r0, [r2, 0x5]
strb r1, [r2, 0x6]
ldrb r0, [r3, 0x5]
cmp r0, 0xFE
beq _080A906C
adds r1, r0, 0
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
add r0, r8
strb r4, [r0, 0x6]
_080A906C:
strb r4, [r3, 0x5]
b _080A9090
.pool
_080A9074:
ldrb r0, [r3, 0x6]
cmp r0, 0xFF
beq _080A907E
adds r1, r0, 0
b _080A9042
_080A907E:
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]
_080A9090:
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
@ void remove_task(int task_id)
remove_task: @ 80A909C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r4, =0x03005e00
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r2, r1, r4
ldrb r0, [r2, 0x4]
cmp r0, 0
beq _080A9106
movs r0, 0
strb r0, [r2, 0x4]
ldrb r3, [r2, 0x5]
cmp r3, 0xFE
bne _080A90D4
ldrb r0, [r2, 0x6]
cmp r0, 0xFF
beq _080A9106
adds r1, r0, 0
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
strb r3, [r0, 0x5]
b _080A9106
.pool
_080A90D4:
ldrb r3, [r2, 0x6]
adds r0, r3, 0
cmp r0, 0xFF
bne _080A90EC
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 _080A9106
_080A90EC:
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]
_080A9106:
pop {r4}
pop {r0}
bx r0
thumb_func_end remove_task
thumb_func_start RunActiveTasks
@ void RunActiveTasks()
RunActiveTasks: @ 80A910C
push {r4,r5,lr}
bl get_first_active_task
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
beq _080A9130
ldr r5, =0x03005e00
_080A911C:
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 _080A911C
_080A9130:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end RunActiveTasks
thumb_func_start get_first_active_task
@ int get_first_active_task()
get_first_active_task: @ 80A913C
push {lr}
movs r2, 0
ldr r0, =0x03005e00
ldrb r1, [r0, 0x4]
adds r3, r0, 0
cmp r1, 0x1
bne _080A9150
ldrb r0, [r3, 0x5]
cmp r0, 0xFE
beq _080A916E
_080A9150:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xF
bhi _080A916E
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
adds r1, r0, r3
ldrb r0, [r1, 0x4]
cmp r0, 0x1
bne _080A9150
ldrb r0, [r1, 0x5]
cmp r0, 0xFE
bne _080A9150
_080A916E:
adds r0, r2, 0
pop {r1}
bx r1
.pool
thumb_func_end get_first_active_task
thumb_func_start nullsub_4
nullsub_4: @ 80A9178
bx lr
thumb_func_end nullsub_4
thumb_func_start set_task_function_and_args_14_15
set_task_function_and_args_14_15: @ 80A917C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =0x03005e00
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
.pool
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: @ 80A91B0
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =0x03005e00
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
.pool
thumb_func_end set_task_function_to_args_14_15
thumb_func_start is_function_an_active_task
@ int is_function_an_active_task(void ( *func)(int task_id))
is_function_an_active_task: @ 80A91E4
push {r4,lr}
adds r3, r0, 0
movs r2, 0
ldr r4, =0x03005e00
_080A91EC:
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
adds r1, r0, r4
ldrb r0, [r1, 0x4]
cmp r0, 0x1
bne _080A9208
ldr r0, [r1]
cmp r0, r3
bne _080A9208
movs r0, 0x1
b _080A9214
.pool
_080A9208:
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xF
bls _080A91EC
movs r0, 0
_080A9214:
pop {r4}
pop {r1}
bx r1
thumb_func_end is_function_an_active_task
thumb_func_start get_task_id_by_function
@ int get_task_id_by_function(void ( *func)(int task_id))
get_task_id_by_function: @ 80A921C
push {lr}
adds r3, r0, 0
movs r2, 0
ldr r1, =0x03005e00
_080A9224:
ldrb r0, [r1, 0x4]
cmp r0, 0x1
bne _080A923C
ldr r0, [r1]
cmp r0, r3
bne _080A923C
lsls r0, r2, 24
lsrs r0, 24
b _080A9246
.pool
_080A923C:
adds r1, 0x28
adds r2, 0x1
cmp r2, 0xF
ble _080A9224
movs r0, 0xFF
_080A9246:
pop {r1}
bx r1
thumb_func_end get_task_id_by_function
thumb_func_start sub_80A924C
sub_80A924C: @ 80A924C
push {lr}
movs r2, 0
movs r1, 0
ldr r3, =0x03005e00
_080A9254:
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r3
ldrb r0, [r0, 0x4]
cmp r0, 0x1
bne _080A9268
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
_080A9268:
adds r0, r1, 0x1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xF
bls _080A9254
adds r0, r2, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_80A924C
thumb_func_start set_word_task_arg
set_word_task_arg: @ 80A927C
push {r4,r5,lr}
adds r5, r2, 0
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r3, r1, 24
cmp r3, 0xE
bhi _080A92AA
ldr r2, =0x03005e00
lsls r0, r3, 1
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
adds r0, r1
adds r2, 0x8
adds r0, r2
strh r5, [r0]
adds r0, r3, 0x1
lsls r0, 1
adds r0, r1
adds r0, r2
lsrs r1, r5, 16
strh r1, [r0]
_080A92AA:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end set_word_task_arg
thumb_func_start get_word_task_arg
get_word_task_arg: @ 80A92B4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r1, 24
cmp r1, 0xE
bls _080A92C6
movs r0, 0
b _080A92E8
_080A92C6:
ldr r3, =0x03005e00
lsls r0, r1, 1
lsls r2, r4, 2
adds r2, r4
lsls r2, 3
adds r0, r2
adds r3, 0x8
adds r0, r3
ldrh r0, [r0]
adds r1, 0x1
lsls r1, 1
adds r1, r2
adds r1, r3
movs r2, 0
ldrsh r1, [r1, r2]
lsls r1, 16
orrs r0, r1
_080A92E8:
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end get_word_task_arg
.align 2, 0 @ Don't pad with nop.

4
asm/tileset_animation.s
View File

@@ -1814,7 +1814,7 @@ sub_80A1818: @ 80A1818
movs r1, 0x10
bl pal_fade_1
ldr r0, =sub_8149DFC
bl get_task_id_by_function
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -1846,7 +1846,7 @@ sub_80A1884: @ 80A1884
movs r2, 0x10
bl CpuSet
ldr r0, =sub_8149DFC
bl get_task_id_by_function
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF