through sub_80D7DE8

This commit is contained in:
PikalaxALT
2018-05-02 08:43:27 -04:00
parent ef29d17c41
commit 4bf0950421
11 changed files with 105 additions and 231 deletions
+1 -211
View File
@@ -5,216 +5,6 @@
.text
thumb_func_start sub_80D7C7C
sub_80D7C7C: @ 80D7C7C
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
bne _080D7CA2
ldr r0, =gTasks
lsls r1, r3, 2
adds r1, r3
lsls r1, 3
adds r1, r0
strh r2, [r1, 0x8]
ldr r0, =sub_80D7CB4
str r0, [r1]
_080D7CA2:
pop {r0}
bx r0
.pool
thumb_func_end sub_80D7C7C
thumb_func_start sub_80D7CB4
sub_80D7CB4: @ 80D7CB4
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _080D7D90
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _080D7D3A
ldr r2, =gTasks
lsls r1, r5, 2
adds r0, r1, r5
lsls r0, 3
adds r4, r0, r2
movs r2, 0x8
ldrsh r0, [r4, r2]
adds r6, r1, 0
cmp r0, 0x1
beq _080D7D04
cmp r0, 0x1
bgt _080D7CF4
cmp r0, 0
beq _080D7CFA
b _080D7D3A
.pool
_080D7CF4:
cmp r0, 0x2
beq _080D7D28
b _080D7D3A
_080D7CFA:
bl sub_80DBF68
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_080D7D04:
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _080D7D9E
bl sub_800ADF8
ldr r0, =gTasks
adds r1, r6, r5
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
b _080D7D9E
.pool
_080D7D28:
bl sub_800A520
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080D7D9E
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_080D7D3A:
ldr r2, =gPaletteFade
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _080D7D9E
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
strb r0, [r2, 0x8]
ldr r0, =gIsLinkContest
ldrb r1, [r0]
movs r0, 0x2
ands r0, r1
cmp r0, 0
bne _080D7D62
bl sub_80DBF68
_080D7D62:
ldr r0, =sub_80D7DAC
movs r1, 0
bl CreateTask
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
strh r4, [r0, 0x8]
ldr r1, =TaskDummy1
str r1, [r0]
b _080D7D9E
.pool
_080D7D90:
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
adds r1, r0
ldr r0, =sub_80D80C8
str r0, [r1]
_080D7D9E:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80D7CB4
thumb_func_start sub_80D7DAC
sub_80D7DAC: @ 80D7DAC
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =sub_80FC998
ldr r2, =sub_80D7DC8
bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
thumb_func_end sub_80D7DAC
thumb_func_start sub_80D7DC8
sub_80D7DC8: @ 80D7DC8
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
movs r0, 0x1
strh r0, [r1, 0x8]
ldr r0, =sub_80D7DE8
str r0, [r1]
bx lr
.pool
thumb_func_end sub_80D7DC8
thumb_func_start sub_80D7DE8
sub_80D7DE8: @ 80D7DE8
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r5
ldrh r1, [r0, 0x8]
subs r1, 0x1
strh r1, [r0, 0x8]
lsls r1, 16
cmp r1, 0
bgt _080D7E2A
bl GetMultiplayerId
adds r0, r4, 0
bl DestroyTask
ldr r0, =gContestResources
ldr r0, [r0]
ldr r0, [r0]
ldrb r1, [r0, 0x8]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r5
ldr r1, =sub_80D80C8
str r1, [r0]
ldr r1, =gRngValue
ldr r0, =gUnknown_030060B8
ldr r0, [r0]
str r0, [r1]
_080D7E2A:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_80D7DE8
thumb_func_start sub_80D7E44
sub_80D7E44: @ 80D7E44
push {r4-r7,lr}
@@ -4722,7 +4512,7 @@ _080DA65C:
bl sub_80DF4F8
bl sub_80DF750
_080DA668:
ldr r1, =gUnknown_030060B8
ldr r1, =gContestRngValue
ldr r0, =gRngValue
ldr r0, [r0]
str r0, [r1]
+1 -1
View File
@@ -434,7 +434,7 @@ _080FC858:
adds r1, r4, 0
movs r2, 0x4
bl memcpy
ldr r0, =gUnknown_030060B8
ldr r0, =gContestRngValue
adds r1, r4, 0
movs r2, 0x4
bl memcpy
+1 -1
View File
@@ -558,7 +558,7 @@ _081DA2AC:
adds r1, r4, 0
movs r2, 0x4
bl memcpy
ldr r0, =gUnknown_030060B8
ldr r0, =gContestRngValue
adds r1, r4, 0
movs r2, 0x4
bl memcpy
+2 -2
View File
@@ -979,7 +979,7 @@ sub_80F8FE8: @ 80F8FE8
ands r0, r1
cmp r0, 0
beq _080F9020
ldr r2, =gUnknown_030060B8
ldr r2, =gContestRngValue
ldr r1, [r2]
ldr r0, =0x41c64e6d
muls r0, r1
@@ -1007,7 +1007,7 @@ _080F902A:
thumb_func_start sub_80F903C
sub_80F903C: @ 80F903C
ldr r2, =gUnknown_030060B8
ldr r2, =gContestRngValue
ldr r1, [r2]
ldr r0, =0x41c64e6d
muls r0, r1