through sub_81537AC

This commit is contained in:
PikalaxALT
2020-03-04 15:14:59 -05:00
parent 6871f3dd33
commit ff13649f47
2 changed files with 281 additions and 907 deletions
+2 -907
View File
@@ -5,911 +5,6 @@
.text
thumb_func_start sub_8153150
sub_8153150: @ 8153150
push {r4,r5,lr}
movs r4, 0
ldr r0, _08153168 @ =gUnknown_203F3E0
ldr r0, [r0]
adds r0, 0x24
ldrb r0, [r0]
cmp r0, 0x4
beq _0815316C
cmp r0, 0x5
beq _08153170
b _08153172
.align 2, 0
_08153168: .4byte gUnknown_203F3E0
_0815316C:
movs r4, 0x1
b _08153172
_08153170:
movs r4, 0x2
_08153172:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
bl __umodsi3
lsls r0, 24
lsrs r0, 24
movs r3, 0
lsls r1, r4, 2
ldr r5, _081531B4 @ =gUnknown_203F3E0
ldr r2, _081531B8 @ =sUnknown_8475558
adds r1, r4
lsls r1, 1
adds r0, r1
adds r0, r2
ldrb r2, [r0]
_08153196:
ldr r1, [r5]
lsls r0, r3, 1
adds r0, r3
lsls r0, 2
adds r1, 0x52
adds r1, r0
strh r2, [r1]
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x4
bls _08153196
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_081531B4: .4byte gUnknown_203F3E0
_081531B8: .4byte sUnknown_8475558
thumb_func_end sub_8153150
thumb_func_start sub_81531BC
sub_81531BC: @ 81531BC
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, _081531F4 @ =gUnknown_203F3E0
ldr r2, [r1]
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
adds r0, r2, 0
adds r0, 0x4A
adds r0, r1
ldrh r3, [r0]
adds r0, r2, 0
adds r0, 0x4C
adds r0, r1
ldrh r0, [r0]
adds r2, 0x4E
adds r2, r1
adds r3, r0
ldrh r2, [r2]
adds r0, r3, r2
ldr r1, _081531F8 @ =0x0000270f
cmp r0, r1
bls _081531EE
adds r0, r1, 0
_081531EE:
pop {r1}
bx r1
.align 2, 0
_081531F4: .4byte gUnknown_203F3E0
_081531F8: .4byte 0x0000270f
thumb_func_end sub_81531BC
thumb_func_start sub_81531FC
sub_81531FC: @ 81531FC
push {r4-r6,lr}
ldr r5, _08153264 @ =gUnknown_203F3E0
ldr r0, [r5]
adds r0, 0x28
ldrb r0, [r0]
bl sub_81531BC
ldr r1, _08153268 @ =0x0000270f
bl sub_815379C
adds r4, r0, 0
ldr r0, [r5]
adds r0, 0x28
ldrb r0, [r0]
bl sub_8153424
ldr r1, _0815326C @ =0x000f4236
bl sub_815379C
adds r2, r0, 0
ldr r3, _08153270 @ =gSaveBlock2Ptr
ldr r0, [r3]
movs r6, 0xB1
lsls r6, 4
adds r1, r0, r6
ldr r0, [r1]
cmp r0, r2
bcs _08153236
str r2, [r1]
_08153236:
ldr r0, [r3]
ldr r2, _08153274 @ =0x00000b14
adds r1, r0, r2
ldrh r0, [r1]
cmp r0, r4
bcs _08153244
strh r4, [r1]
_08153244:
ldr r0, [r3]
ldr r6, _08153278 @ =0x00000b16
adds r2, r0, r6
ldr r0, [r5]
movs r1, 0x8A
lsls r1, 1
adds r0, r1
ldrh r1, [r0]
ldrh r0, [r2]
cmp r0, r1
bcs _0815325C
strh r1, [r2]
_0815325C:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08153264: .4byte gUnknown_203F3E0
_08153268: .4byte 0x0000270f
_0815326C: .4byte 0x000f4236
_08153270: .4byte gSaveBlock2Ptr
_08153274: .4byte 0x00000b14
_08153278: .4byte 0x00000b16
thumb_func_end sub_81531FC
thumb_func_start sub_815327C
sub_815327C: @ 815327C
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _081532B4 @ =gUnknown_203F3E0
ldr r0, [r1]
adds r0, 0x9B
ldrb r6, [r0]
movs r3, 0x3
adds r5, r1, 0
adds r4, r5, 0
_08153290:
ldr r0, [r4]
adds r0, 0x98
adds r2, r0, r3
subs r1, r3, 0x1
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
lsls r1, 24
lsrs r3, r1, 24
cmp r3, 0
bne _08153290
ldr r0, [r5]
adds r0, 0x98
strb r7, [r0]
adds r0, r6, 0
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_081532B4: .4byte gUnknown_203F3E0
thumb_func_end sub_815327C
thumb_func_start sub_81532B8
sub_81532B8: @ 81532B8
push {r4,lr}
ldr r4, _081532EC @ =gUnknown_203F3E0
ldr r3, [r4]
adds r0, r3, 0
adds r0, 0x28
ldrb r1, [r0]
adds r0, 0x88
adds r2, r0, r1
ldrb r0, [r2]
cmp r0, 0
bne _08153360
ldr r0, _081532F0 @ =gMain
ldrh r2, [r0, 0x2E]
movs r0, 0x40
ands r0, r2
cmp r0, 0
beq _081532F8
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r0, r3, r0
ldr r1, _081532F4 @ =0x000031cc
adds r0, r1
movs r1, 0x2
b _0815332E
.align 2, 0
_081532EC: .4byte gUnknown_203F3E0
_081532F0: .4byte gMain
_081532F4: .4byte 0x000031cc
_081532F8:
movs r0, 0x20
ands r0, r2
cmp r0, 0
beq _08153314
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r0, r3, r0
ldr r1, _08153310 @ =0x000031cc
adds r0, r1
movs r1, 0x3
b _0815332E
.align 2, 0
_08153310: .4byte 0x000031cc
_08153314:
movs r0, 0x10
ands r0, r2
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0
beq _0815334C
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r0, r3, r0
ldr r1, _08153348 @ =0x000031cc
adds r0, r1
movs r1, 0x1
_0815332E:
strb r1, [r0]
ldr r0, [r4]
adds r1, r0, 0
adds r1, 0x28
adds r0, 0xB0
ldrb r1, [r1]
adds r0, r1
movs r1, 0x6
strb r1, [r0]
movs r0, 0xCD
bl PlaySE
b _08153364
.align 2, 0
_08153348: .4byte 0x000031cc
_0815334C:
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r0, r3, r0
ldr r1, _0815335C @ =0x000031cc
adds r0, r1
strb r2, [r0]
b _08153364
.align 2, 0
_0815335C: .4byte 0x000031cc
_08153360:
subs r0, 0x1
strb r0, [r2]
_08153364:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81532B8
thumb_func_start sub_815336C
sub_815336C: @ 815336C
ldr r0, _08153388 @ =gUnknown_203F3E0
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x28
ldrb r2, [r0]
lsls r0, r2, 4
subs r0, r2
lsls r0, 2
adds r1, r0
ldr r0, _0815338C @ =0x000031cc
adds r1, r0
movs r0, 0
strb r0, [r1]
bx lr
.align 2, 0
_08153388: .4byte gUnknown_203F3E0
_0815338C: .4byte 0x000031cc
thumb_func_end sub_815336C
thumb_func_start sub_8153390
sub_8153390: @ 8153390
ldr r0, _081533B0 @ =gUnknown_203F3E0
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x28
ldrb r2, [r0]
lsls r0, r2, 1
adds r0, r2
lsls r0, 2
adds r1, 0x52
adds r1, r0
ldrh r0, [r1]
adds r0, 0x85
lsls r0, 16
lsrs r0, 16
bx lr
.align 2, 0
_081533B0: .4byte gUnknown_203F3E0
thumb_func_end sub_8153390
thumb_func_start sub_81533B4
sub_81533B4: @ 81533B4
ldr r0, _081533C0 @ =gUnknown_203F3E0
ldr r0, [r0]
adds r0, 0x24
ldrb r0, [r0]
bx lr
.align 2, 0
_081533C0: .4byte gUnknown_203F3E0
thumb_func_end sub_81533B4
thumb_func_start sub_81533C4
sub_81533C4: @ 81533C4
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _081533E4 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
cmp r0, 0
bne _081533F0
ldr r0, _081533E8 @ =gUnknown_203F3E0
lsls r1, r2, 4
subs r1, r2
lsls r1, 2
ldr r2, _081533EC @ =0x000031a0
adds r1, r2
ldr r0, [r0]
b _081533F8
.align 2, 0
_081533E4: .4byte gReceivedRemoteLinkPlayers
_081533E8: .4byte gUnknown_203F3E0
_081533EC: .4byte 0x000031a0
_081533F0:
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
ldr r1, _08153400 @ =gLinkPlayers + 8
_081533F8:
adds r0, r1
pop {r1}
bx r1
.align 2, 0
_08153400: .4byte gLinkPlayers + 8
thumb_func_end sub_81533C4
thumb_func_start sub_8153404
sub_8153404: @ 8153404
lsls r0, 24
lsrs r0, 24
lsls r1, 24
ldr r2, _08153420 @ =gUnknown_203F3E0
ldr r3, [r2]
lsrs r1, 23
lsls r2, r0, 1
adds r2, r0
lsls r2, 2
adds r1, r2
adds r3, 0x4A
adds r3, r1
ldrh r0, [r3]
bx lr
.align 2, 0
_08153420: .4byte gUnknown_203F3E0
thumb_func_end sub_8153404
thumb_func_start sub_8153424
sub_8153424: @ 8153424
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
movs r5, 0
movs r3, 0
ldr r0, _08153490 @ =gUnknown_203F3E0
mov r9, r0
ldr r2, _08153494 @ =sUnknown_84755D8
mov r10, r2
ldr r2, [r0]
lsls r1, r4, 1
adds r0, r1, r4
lsls r0, 2
str r0, [sp]
adds r6, r2, 0
adds r6, 0x4A
mov r12, r1
mov r8, r10
_08153452:
lsls r1, r3, 1
ldr r7, [sp]
adds r0, r1, r7
adds r0, r6, r0
ldrh r2, [r0]
add r1, r8
movs r7, 0
ldrsh r0, [r1, r7]
muls r0, r2
adds r5, r0
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x2
bls _08153452
mov r0, r9
ldr r1, [r0]
mov r2, r12
adds r0, r2, r4
lsls r0, 2
adds r1, 0x50
adds r1, r0
ldrh r1, [r1]
mov r3, r10
movs r7, 0x6
ldrsh r0, [r3, r7]
muls r0, r1
cmp r5, r0
bls _08153498
subs r0, r5, r0
b _0815349A
.align 2, 0
_08153490: .4byte gUnknown_203F3E0
_08153494: .4byte sUnknown_84755D8
_08153498:
movs r0, 0
_0815349A:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8153424
thumb_func_start sub_81534AC
sub_81534AC: @ 81534AC
push {r4-r6,lr}
ldr r0, _081534E8 @ =gUnknown_203F3E0
ldr r0, [r0]
adds r0, 0x24
ldrb r6, [r0]
movs r0, 0
bl sub_8153424
adds r5, r0, 0
movs r4, 0x1
cmp r4, r6
bcs _081534DA
_081534C4:
adds r0, r4, 0
bl sub_8153424
cmp r0, r5
bls _081534D0
adds r5, r0, 0
_081534D0:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r6
bcc _081534C4
_081534DA:
ldr r1, _081534EC @ =0x000f4236
adds r0, r5, 0
bl sub_815379C
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_081534E8: .4byte gUnknown_203F3E0
_081534EC: .4byte 0x000f4236
thumb_func_end sub_81534AC
thumb_func_start sub_81534F0
sub_81534F0: @ 81534F0
push {r4,r5,lr}
lsls r0, 24
ldr r1, _08153530 @ =gUnknown_203F3E0
ldr r2, [r1]
adds r1, r2, 0
adds r1, 0x24
ldrb r5, [r1]
lsrs r4, r0, 23
adds r2, 0x4A
adds r0, r2, r4
ldrh r3, [r0]
movs r1, 0
cmp r1, r5
bcs _08153528
_0815350C:
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r4, r0
adds r0, r2, r0
ldrh r0, [r0]
cmp r0, r3
bls _0815351E
adds r3, r0, 0
_0815351E:
adds r0, r1, 0x1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, r5
bcc _0815350C
_08153528:
adds r0, r3, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_08153530: .4byte gUnknown_203F3E0
thumb_func_end sub_81534F0
thumb_func_start sub_8153534
sub_8153534: @ 8153534
push {r4-r7,lr}
sub sp, 0x14
lsls r0, 24
lsrs r7, r0, 24
movs r6, 0x1
ldr r0, _081535AC @ =gUnknown_203F3E0
ldr r0, [r0]
adds r0, 0x24
ldrb r5, [r0]
movs r4, 0
cmp r4, r5
bcs _08153562
_0815354C:
adds r0, r4, 0
bl sub_8153424
lsls r1, r4, 2
add r1, sp
str r0, [r1]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r5
bcc _0815354C
_08153562:
lsls r7, 2
mov r12, r7
cmp r6, 0
beq _0815359C
subs r7, r5, 0x1
_0815356C:
movs r6, 0
movs r4, 0
cmp r6, r7
bge _08153598
adds r5, r7, 0
_08153576:
lsls r0, r4, 2
mov r2, sp
adds r1, r2, r0
adds r4, 0x1
lsls r0, r4, 2
adds r3, r2, r0
ldr r0, [r1]
ldr r2, [r3]
cmp r0, r2
bcs _08153590
str r2, [r1]
str r0, [r3]
movs r6, 0x1
_08153590:
lsls r0, r4, 24
lsrs r4, r0, 24
cmp r4, r5
blt _08153576
_08153598:
cmp r6, 0
bne _0815356C
_0815359C:
mov r0, sp
add r0, r12
ldr r0, [r0]
add sp, 0x14
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_081535AC: .4byte gUnknown_203F3E0
thumb_func_end sub_8153534
thumb_func_start sub_81535B0
sub_81535B0: @ 81535B0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
movs r0, 0
mov r10, r0
mov r8, r0
mov r9, r0
ldr r6, _08153690 @ =gUnknown_203F3E0
ldr r0, [r6]
adds r0, 0x24
ldrb r5, [r0]
bl sub_81534AC
bl sub_81534AC
cmp r0, 0
bne _08153604
movs r4, 0
cmp r9, r5
bcs _08153604
adds r2, r6, 0
ldr r1, _08153694 @ =0x00003308
mov r12, r1
movs r7, 0
movs r6, 0x4
ldr r3, _08153698 @ =0x0000330c
_081535E8:
ldr r0, [r2]
lsls r1, r4, 3
adds r0, r1
add r0, r12
strb r6, [r0]
ldr r0, [r2]
adds r0, r3
adds r0, r1
str r7, [r0]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r5
bcc _081535E8
_08153604:
movs r4, 0
cmp r4, r5
bcs _0815362E
_0815360A:
adds r0, r4, 0
bl sub_8153424
ldr r1, _0815369C @ =0x000f4236
bl sub_815379C
ldr r1, _08153690 @ =gUnknown_203F3E0
ldr r1, [r1]
lsls r2, r4, 3
ldr r3, _08153698 @ =0x0000330c
adds r1, r3
adds r1, r2
str r0, [r1]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r5
bcc _0815360A
_0815362E:
mov r0, r10
bl sub_8153534
adds r6, r0, 0
mov r3, r8
movs r4, 0
cmp r4, r5
bcs _0815367A
ldr r7, _08153690 @ =gUnknown_203F3E0
mov r10, r7
_08153642:
mov r0, r10
ldr r2, [r0]
lsls r1, r4, 3
ldr r7, _08153698 @ =0x0000330c
adds r0, r2, r7
adds r0, r1
ldr r0, [r0]
cmp r6, r0
bne _08153670
adds r0, r2, r1
ldr r1, _08153694 @ =0x00003308
adds r0, r1
strb r3, [r0]
mov r0, r8
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r8, r0
mov r0, r9
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r9, r0
_08153670:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r5
bcc _08153642
_0815367A:
mov r10, r8
cmp r9, r5
bcc _0815362E
movs r0, 0
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_08153690: .4byte gUnknown_203F3E0
_08153694: .4byte 0x00003308
_08153698: .4byte 0x0000330c
_0815369C: .4byte 0x000f4236
thumb_func_end sub_81535B0
thumb_func_start sub_81536A0
sub_81536A0: @ 81536A0
lsls r1, 24
ldr r2, _081536B8 @ =gUnknown_203F3E0
ldr r2, [r2]
lsrs r1, 21
ldr r3, _081536BC @ =0x00003308
adds r2, r3
adds r2, r1
ldr r1, [r2]
ldr r2, [r2, 0x4]
str r1, [r0]
str r2, [r0, 0x4]
bx lr
.align 2, 0
_081536B8: .4byte gUnknown_203F3E0
_081536BC: .4byte 0x00003308
thumb_func_end sub_81536A0
thumb_func_start sub_81536C0
sub_81536C0: @ 81536C0
push {r4-r7,lr}
sub sp, 0x14
lsls r0, 24
lsrs r6, r0, 24
movs r7, 0
ldr r0, _08153728 @ =gUnknown_203F3E0
ldr r0, [r0]
adds r0, 0x24
ldrb r5, [r0]
mov r0, sp
movs r1, 0
movs r2, 0x14
bl memset
movs r4, 0
cmp r7, r5
bcs _081536F8
_081536E2:
adds r0, r4, 0
bl sub_8153424
lsls r1, r4, 2
add r1, sp
str r0, [r1]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r5
bcc _081536E2
_081536F8:
lsls r0, r6, 2
add r0, sp
ldr r1, [r0]
movs r4, 0
_08153700:
cmp r4, r6
beq _08153714
lsls r0, r4, 2
add r0, sp
ldr r0, [r0]
cmp r1, r0
bcs _08153714
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
_08153714:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x4
bls _08153700
adds r0, r7, 0
add sp, 0x14
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_08153728: .4byte gUnknown_203F3E0
thumb_func_end sub_81536C0
thumb_func_start sub_815372C
sub_815372C: @ 815372C
push {r4-r6,lr}
ldr r0, _08153754 @ =gUnknown_203F3E0
ldr r0, [r0]
adds r0, 0x28
ldrb r4, [r0]
bl sub_8153390
lsls r0, 16
lsrs r5, r0, 16
adds r6, r5, 0
adds r0, r4, 0
bl sub_8153424
adds r4, r0, 0
bl sub_81534AC
cmp r4, r0
beq _08153758
movs r0, 0x3
b _08153786
.align 2, 0
_08153754: .4byte gUnknown_203F3E0
_08153758:
adds r0, r5, 0
movs r1, 0x1
bl CheckBagHasSpace
lsls r0, 24
cmp r0, 0
bne _0815376A
movs r0, 0x2
b _08153786
_0815376A:
adds r0, r6, 0
movs r1, 0x1
bl AddBagItem
adds r0, r6, 0
movs r1, 0x1
bl CheckBagHasSpace
lsls r0, 24
cmp r0, 0
beq _08153784
movs r0, 0
b _08153786
_08153784:
movs r0, 0x1
_08153786:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_815372C
thumb_func_start IncrementWithLimit
IncrementWithLimit: @ 815378C
push {lr}
adds r2, r0, 0
adds r0, r1, 0
cmp r2, r0
bcs _08153798
adds r0, r2, 0x1
_08153798:
pop {r1}
bx r1
thumb_func_end IncrementWithLimit
thumb_func_start sub_815379C
sub_815379C: @ 815379C
push {lr}
adds r2, r0, 0
adds r0, r1, 0
cmp r2, r0
bcs _081537A8
adds r0, r2, 0
_081537A8:
pop {r1}
bx r1
thumb_func_end sub_815379C
thumb_func_start sub_81537AC
sub_81537AC: @ 81537AC
lsls r0, 24
lsrs r0, 24
ldr r1, _081537BC @ =gUnknown_203F3E0
ldr r1, [r1]
adds r1, 0x34
adds r1, r0
ldrb r0, [r1]
bx lr
.align 2, 0
_081537BC: .4byte gUnknown_203F3E0
thumb_func_end sub_81537AC
thumb_func_start IsDodrioInParty
IsDodrioInParty: @ 81537C0
push {r4-r6,lr}
@@ -4182,14 +3277,14 @@ _0815512E:
lsls r0, 16
lsrs r0, 16
ldr r1, _081551C8 @ =0x0000270f
bl sub_815379C
bl Min
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl sub_81534F0
ldr r1, _081551C8 @ =0x0000270f
bl sub_815379C
bl Min
lsls r0, 16
lsrs r6, r0, 16
add r0, sp, 0xC
+279
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "gflib.h"
#include "dodrio_berry_picking.h"
#include "item.h"
#include "link.h"
#include "link_rfu.h"
#include "m4a.h"
@@ -10,6 +11,7 @@
#include "task.h"
#include "constants/songs.h"
#include "constants/fanfares.h"
#include "constants/items.h"
struct DodrioSubstruct_0160
{
@@ -166,7 +168,9 @@ void sub_81531FC(void);
u8 sub_815327C(u8);
void sub_81532B8(void);
void sub_815336C(void);
u32 sub_8153424(u8 mpId);
u32 sub_81534AC(void);
u32 Min(u32 x, u32 y);
void sub_8153A9C(void);
void sub_8153AFC(struct DodrioSubstruct_318C * unk318C, u8 a1, u8 a2, u8 a3);
void sub_8153BC0(u8 a0);
@@ -2332,6 +2336,281 @@ void sub_8153048(void)
const s16 sUnknown_84755D8[] = {10, 30, 50, 50};
void sub_8153150(void)
{
u8 i, var = 0, var2 = 0;
switch (gUnknown_203F3E0->unk24)
{
case 4: var = 1; break;
case 5: var = 2; break;
}
var2 = Random() % 10;
for (i = 0; i < 5; i++)
gUnknown_203F3E0->unk4A[i][4] = sUnknown_8475558[var][var2];
}
u32 sub_81531BC(u8 arg0)
{
u32 sum = gUnknown_203F3E0->unk4A[arg0][0]
+ gUnknown_203F3E0->unk4A[arg0][1]
+ gUnknown_203F3E0->unk4A[arg0][2];
return min(sum, 9999);
}
void sub_81531FC(void)
{
u32 berriesPicked = Min(sub_81531BC(gUnknown_203F3E0->multiplayerId), 9999);
u32 score = Min(sub_8153424(gUnknown_203F3E0->multiplayerId), 999990);
if (gSaveBlock2Ptr->berryPick.bestScore < score)
gSaveBlock2Ptr->berryPick.bestScore = score;
if (gSaveBlock2Ptr->berryPick.berriesPicked < berriesPicked)
gSaveBlock2Ptr->berryPick.berriesPicked = berriesPicked;
if (gSaveBlock2Ptr->berryPick.berriesPickedInRow < gUnknown_203F3E0->unk114)
gSaveBlock2Ptr->berryPick.berriesPickedInRow = gUnknown_203F3E0->unk114;
}
u8 sub_815327C(u8 arg0)
{
u8 i, saved;
saved = gUnknown_203F3E0->unk98[3];
for (i = 3; i != 0; i--)
gUnknown_203F3E0->unk98[i] = gUnknown_203F3E0->unk98[i - 1];
gUnknown_203F3E0->unk98[0] = arg0;
return saved;
}
void sub_81532B8(void)
{
if (gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] == 0)
{
if (gMain.newKeys & DPAD_UP)
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 2;
gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6;
PlaySE(SE_W204);
}
else if (gMain.newKeys & DPAD_LEFT)
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 3;
gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6;
PlaySE(SE_W204);
}
else if (gMain.newKeys & DPAD_RIGHT)
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 1;
gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6;
PlaySE(SE_W204);
}
else
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 0;
}
}
else
{
gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId]--;
}
}
void sub_815336C(void)
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 0;
}
u16 sub_8153390(void)
{
return gUnknown_203F3E0->unk4A[gUnknown_203F3E0->multiplayerId][4] + FIRST_BERRY_INDEX;
}
u8 sub_81533B4(void)
{
return gUnknown_203F3E0->unk24;
}
u8 *sub_81533C4(u8 id)
{
if (gReceivedRemoteLinkPlayers)
return gLinkPlayers[id].name;
else
return gUnknown_203F3E0->unk31A0[id].name;
}
u16 sub_8153404(u8 arg0, u8 arg1)
{
return gUnknown_203F3E0->unk4A[arg0][arg1];
}
u32 sub_8153424(u8 arg0)
{
u8 i;
u32 var, sum = 0;
for (i = 0; i < 3; i++)
sum += gUnknown_203F3E0->unk4A[arg0][i] * sUnknown_84755D8[i];
var = gUnknown_203F3E0->unk4A[arg0][3] * sUnknown_84755D8[3];
if (sum <= var)
return 0;
else
return sum - var;
}
u32 sub_81534AC(void)
{
u8 i, count = gUnknown_203F3E0->unk24;
u32 maxVar = sub_8153424(0);
for (i = 1; i < count; i++)
{
u32 var = sub_8153424(i);
if (var > maxVar)
maxVar = var;
}
return Min(maxVar, 999990);
}
u32 sub_81534F0(u8 arg0)
{
u8 i, count = gUnknown_203F3E0->unk24;
u16 maxVar = gUnknown_203F3E0->unk4A[0][arg0];
for (i = 0; i < count; i++)
{
u16 var = gUnknown_203F3E0->unk4A[i][arg0];
if (var > maxVar)
maxVar = var;
}
return maxVar;
}
u32 sub_8153534(u8 arg0)
{
u32 vals[5], temp;
s16 r6 = TRUE;
u8 i, count = gUnknown_203F3E0->unk24;
for (i = 0; i < count; i++)
vals[i] = temp = sub_8153424(i);
while (r6)
{
r6 = FALSE;
for (i = 0; i < count - 1; i++)
{
if (vals[i] < vals[i + 1])
{
SWAP(vals[i], vals[i + 1], temp);
r6 = TRUE;
}
}
}
return vals[arg0];
}
u32 sub_81535B0(void)
{
u8 i, r10 = 0, r8 = 0, r9 = 0, count = gUnknown_203F3E0->unk24;
// Function called two times for some reason.
sub_81534AC();
if (sub_81534AC() == 0)
{
for (i = 0; i < count; i++)
{
gUnknown_203F3E0->unk3308[i].unk0 = 4;
gUnknown_203F3E0->unk3308[i].unk4 = 0;
}
}
for (i = 0; i < count; i++)
gUnknown_203F3E0->unk3308[i].unk4 = Min(sub_8153424(i), 999990);
do
{
u32 r6 = sub_8153534(r10);
u8 r3 = r8;
for (i = 0; i < count; i++)
{
if (r6 == gUnknown_203F3E0->unk3308[i].unk4)
{
gUnknown_203F3E0->unk3308[i].unk0 = r3;
r8++;
r9++;
}
}
r10 = r8;
} while (r9 < count);
return 0;
}
void sub_81536A0(struct DodrioSubstruct_3308 *dst, u8 id)
{
*dst = gUnknown_203F3E0->unk3308[id];
}
u8 sub_81536C0(u8 arg0)
{
u8 i, ret = 0, count = gUnknown_203F3E0->unk24;
u32 var, vars[5] = {0};
for (i = 0; i < count; i++)
vars[i] = sub_8153424(i);
var = vars[arg0];
for (i = 0; i < 5; i++)
{
if (i != arg0 && var < vars[i])
ret++;
}
return ret;
}
u8 sub_815372C(void)
{
u8 multiplayerId = gUnknown_203F3E0->multiplayerId;
u16 itemId = sub_8153390();
if (sub_8153424(multiplayerId) != sub_81534AC())
return 3;
if (!CheckBagHasSpace(itemId, 1))
return 2;
AddBagItem(itemId, 1);
if (!CheckBagHasSpace(itemId, 1))
return 1;
return 0;
}
// Really? What next, u32 Add(u32 a)return a+1;?
u32 IncrementWithLimit(u32 a, u32 max)
{
if (a < max)
return a + 1;
else
return max;
}
// Gamefreak pls, min(a, b) ((a) < (b) ? (a) : (b)) is a well-known macro
u32 Min(u32 a, u32 b)
{
if (a < b)
return a;
else
return b;
}
u8 sub_81537AC(u8 id)
{
return gUnknown_203F3E0->unk34[id];
}
// Data related to printing saved results.
const struct WindowTemplate sUnknown_84755E0 =
{