Merge pull request #288 from PikalaxALT/dodrio_berry_picking
Dodrio Berry Picking
This commit is contained in:
PikalaxALT
File diff suppressed because it is too large
Load Diff
@@ -1,734 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_815A61C
|
||||
sub_815A61C: @ 815A61C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x20
|
||||
ldr r4, [sp, 0x48]
|
||||
lsls r4, 24
|
||||
str r4, [sp, 0x1C]
|
||||
movs r4, 0x14
|
||||
adds r4, r0
|
||||
mov r9, r4
|
||||
mov r5, sp
|
||||
movs r4, 0x2
|
||||
strb r4, [r5]
|
||||
mov r10, sp
|
||||
mov r5, r9
|
||||
ldrb r4, [r5, 0xB]
|
||||
movs r7, 0xF
|
||||
adds r5, r7, 0
|
||||
ands r5, r4
|
||||
mov r6, r10
|
||||
ldrb r6, [r6, 0x1]
|
||||
mov r8, r6
|
||||
movs r4, 0x10
|
||||
negs r4, r4
|
||||
mov r6, r8
|
||||
ands r4, r6
|
||||
orrs r4, r5
|
||||
mov r5, r10
|
||||
strb r4, [r5, 0x1]
|
||||
mov r8, sp
|
||||
mov r6, r9
|
||||
ldrb r5, [r6, 0xC]
|
||||
lsls r5, 4
|
||||
ands r4, r7
|
||||
orrs r4, r5
|
||||
mov r5, r8
|
||||
strb r4, [r5, 0x1]
|
||||
ldrb r5, [r6, 0xD]
|
||||
movs r6, 0xF
|
||||
ands r5, r6
|
||||
mov r4, r10
|
||||
ldrb r4, [r4, 0x2]
|
||||
mov r8, r4
|
||||
movs r4, 0x10
|
||||
negs r4, r4
|
||||
mov r6, r8
|
||||
ands r4, r6
|
||||
orrs r4, r5
|
||||
mov r5, r10
|
||||
strb r4, [r5, 0x2]
|
||||
mov r8, sp
|
||||
mov r6, r9
|
||||
ldrb r5, [r6, 0xE]
|
||||
lsls r5, 4
|
||||
ands r4, r7
|
||||
orrs r4, r5
|
||||
mov r5, r8
|
||||
strb r4, [r5, 0x2]
|
||||
ldrb r5, [r6, 0xF]
|
||||
movs r6, 0xF
|
||||
ands r5, r6
|
||||
mov r4, r10
|
||||
ldrb r4, [r4, 0x3]
|
||||
mov r8, r4
|
||||
movs r4, 0x10
|
||||
negs r4, r4
|
||||
mov r6, r8
|
||||
ands r4, r6
|
||||
orrs r4, r5
|
||||
mov r5, r10
|
||||
strb r4, [r5, 0x3]
|
||||
mov r8, sp
|
||||
mov r6, r9
|
||||
ldrb r5, [r6, 0x10]
|
||||
lsls r5, 4
|
||||
ands r4, r7
|
||||
orrs r4, r5
|
||||
mov r5, r8
|
||||
strb r4, [r5, 0x3]
|
||||
ldrb r5, [r6, 0x11]
|
||||
movs r6, 0xF
|
||||
ands r5, r6
|
||||
mov r4, r10
|
||||
ldrb r4, [r4, 0x4]
|
||||
mov r8, r4
|
||||
movs r4, 0x10
|
||||
negs r4, r4
|
||||
mov r6, r8
|
||||
ands r4, r6
|
||||
orrs r4, r5
|
||||
mov r5, r10
|
||||
strb r4, [r5, 0x4]
|
||||
mov r8, sp
|
||||
mov r6, r9
|
||||
ldrb r5, [r6, 0x12]
|
||||
lsls r5, 4
|
||||
ands r4, r7
|
||||
orrs r4, r5
|
||||
mov r5, r8
|
||||
strb r4, [r5, 0x4]
|
||||
ldrb r4, [r6, 0x13]
|
||||
movs r6, 0xF
|
||||
ands r4, r6
|
||||
mov r6, r8
|
||||
ldrb r5, [r6, 0x5]
|
||||
movs r6, 0x10
|
||||
negs r6, r6
|
||||
ands r6, r5
|
||||
orrs r6, r4
|
||||
str r6, [sp, 0xC]
|
||||
mov r4, r8
|
||||
strb r6, [r4, 0x5]
|
||||
mov r5, sp
|
||||
mov r6, r9
|
||||
ldrb r4, [r6, 0x14]
|
||||
lsls r4, 4
|
||||
ldr r6, [sp, 0xC]
|
||||
ands r6, r7
|
||||
orrs r6, r4
|
||||
strb r6, [r5, 0x5]
|
||||
mov r7, sp
|
||||
movs r4, 0x3
|
||||
mov r8, r4
|
||||
ldrb r0, [r0, 0x14]
|
||||
mov r5, r8
|
||||
ands r0, r5
|
||||
ldrb r5, [r7, 0x6]
|
||||
movs r6, 0x4
|
||||
negs r6, r6
|
||||
mov r10, r6
|
||||
mov r4, r10
|
||||
ands r4, r5
|
||||
orrs r4, r0
|
||||
strb r4, [r7, 0x6]
|
||||
mov r5, r9
|
||||
ldrb r0, [r5, 0x1]
|
||||
mov r6, r8
|
||||
ands r0, r6
|
||||
lsls r0, 2
|
||||
movs r5, 0xD
|
||||
negs r5, r5
|
||||
ands r5, r4
|
||||
orrs r5, r0
|
||||
strb r5, [r7, 0x6]
|
||||
mov r0, r9
|
||||
ldrb r4, [r0, 0x2]
|
||||
ands r4, r6
|
||||
lsls r4, 4
|
||||
movs r0, 0x31
|
||||
negs r0, r0
|
||||
ands r0, r5
|
||||
orrs r0, r4
|
||||
strb r0, [r7, 0x6]
|
||||
mov r5, sp
|
||||
mov r6, r9
|
||||
ldrb r4, [r6, 0x3]
|
||||
lsls r4, 6
|
||||
movs r6, 0x3F
|
||||
ands r0, r6
|
||||
orrs r0, r4
|
||||
strb r0, [r5, 0x6]
|
||||
mov r4, r9
|
||||
ldrb r0, [r4, 0x4]
|
||||
mov r5, r8
|
||||
ands r0, r5
|
||||
ldrb r5, [r7, 0x7]
|
||||
mov r4, r10
|
||||
ands r4, r5
|
||||
orrs r4, r0
|
||||
strb r4, [r7, 0x7]
|
||||
mov r6, r9
|
||||
ldrb r0, [r6, 0x5]
|
||||
mov r5, r8
|
||||
ands r0, r5
|
||||
lsls r0, 2
|
||||
movs r5, 0xD
|
||||
negs r5, r5
|
||||
ands r5, r4
|
||||
orrs r5, r0
|
||||
strb r5, [r7, 0x7]
|
||||
ldrb r4, [r6, 0x6]
|
||||
mov r6, r8
|
||||
ands r4, r6
|
||||
lsls r4, 4
|
||||
movs r0, 0x31
|
||||
negs r0, r0
|
||||
ands r0, r5
|
||||
orrs r0, r4
|
||||
strb r0, [r7, 0x7]
|
||||
mov r5, sp
|
||||
mov r6, r9
|
||||
ldrb r4, [r6, 0x7]
|
||||
lsls r4, 6
|
||||
movs r6, 0x3F
|
||||
ands r0, r6
|
||||
orrs r0, r4
|
||||
strb r0, [r5, 0x7]
|
||||
mov r8, sp
|
||||
mov r0, r9
|
||||
ldrb r4, [r0, 0x8]
|
||||
movs r7, 0x3
|
||||
adds r0, r7, 0
|
||||
ands r0, r4
|
||||
mov r4, r8
|
||||
ldrb r5, [r4, 0x8]
|
||||
mov r4, r10
|
||||
ands r4, r5
|
||||
orrs r4, r0
|
||||
mov r5, r8
|
||||
strb r4, [r5, 0x8]
|
||||
mov r6, r9
|
||||
ldrb r5, [r6, 0x9]
|
||||
adds r0, r7, 0
|
||||
ands r0, r5
|
||||
lsls r0, 2
|
||||
movs r5, 0xD
|
||||
negs r5, r5
|
||||
ands r5, r4
|
||||
orrs r5, r0
|
||||
mov r0, r8
|
||||
strb r5, [r0, 0x8]
|
||||
ldrb r0, [r1]
|
||||
adds r4, r7, 0
|
||||
ands r4, r0
|
||||
lsls r4, 4
|
||||
movs r0, 0x31
|
||||
negs r0, r0
|
||||
ands r0, r5
|
||||
orrs r0, r4
|
||||
mov r4, r8
|
||||
strb r0, [r4, 0x8]
|
||||
mov r5, sp
|
||||
ldrb r4, [r2]
|
||||
lsls r4, 6
|
||||
movs r6, 0x3F
|
||||
ands r0, r6
|
||||
orrs r0, r4
|
||||
strb r0, [r5, 0x8]
|
||||
ldrb r4, [r3]
|
||||
adds r0, r7, 0
|
||||
ands r0, r4
|
||||
ldrb r4, [r5, 0x9]
|
||||
mov r6, r10
|
||||
ands r6, r4
|
||||
orrs r6, r0
|
||||
mov r10, r6
|
||||
strb r6, [r5, 0x9]
|
||||
ldr r0, [sp, 0x40]
|
||||
ldrb r4, [r0]
|
||||
adds r0, r7, 0
|
||||
ands r0, r4
|
||||
lsls r0, 2
|
||||
movs r4, 0xD
|
||||
negs r4, r4
|
||||
ands r6, r4
|
||||
orrs r6, r0
|
||||
str r6, [sp, 0x10]
|
||||
strb r6, [r5, 0x9]
|
||||
mov r4, sp
|
||||
ldr r5, [sp, 0x44]
|
||||
ldrb r0, [r5]
|
||||
adds r6, r7, 0
|
||||
ands r6, r0
|
||||
lsls r0, r6, 4
|
||||
subs r7, 0x34
|
||||
ldr r5, [sp, 0x10]
|
||||
ands r7, r5
|
||||
orrs r7, r0
|
||||
strb r7, [r4, 0x9]
|
||||
mov r5, sp
|
||||
ldrb r0, [r1, 0x4]
|
||||
movs r6, 0x1
|
||||
mov r12, r6
|
||||
mov r4, r12
|
||||
ands r4, r0
|
||||
lsls r4, 6
|
||||
movs r0, 0x41
|
||||
negs r0, r0
|
||||
mov r10, r0
|
||||
ands r0, r7
|
||||
orrs r0, r4
|
||||
strb r0, [r5, 0x9]
|
||||
ldrb r4, [r2, 0x4]
|
||||
lsls r4, 7
|
||||
movs r5, 0x7F
|
||||
ands r0, r5
|
||||
orrs r0, r4
|
||||
mov r4, r8
|
||||
strb r0, [r4, 0x9]
|
||||
ldrb r4, [r3, 0x4]
|
||||
mov r0, r12
|
||||
ands r0, r4
|
||||
mov r5, r8
|
||||
ldrb r4, [r5, 0xA]
|
||||
movs r7, 0x2
|
||||
negs r7, r7
|
||||
adds r5, r7, 0
|
||||
ands r5, r4
|
||||
orrs r5, r0
|
||||
mov r6, r8
|
||||
strb r5, [r6, 0xA]
|
||||
mov r9, sp
|
||||
ldr r4, [sp, 0x40]
|
||||
ldrb r0, [r4, 0x4]
|
||||
mov r4, r12
|
||||
ands r4, r0
|
||||
lsls r4, 1
|
||||
movs r6, 0x3
|
||||
negs r6, r6
|
||||
mov r8, r6
|
||||
mov r0, r8
|
||||
ands r0, r5
|
||||
orrs r0, r4
|
||||
mov r4, r9
|
||||
strb r0, [r4, 0xA]
|
||||
ldr r6, [sp, 0x44]
|
||||
ldrb r5, [r6, 0x4]
|
||||
mov r4, r12
|
||||
ands r4, r5
|
||||
lsls r4, 2
|
||||
movs r5, 0x5
|
||||
negs r5, r5
|
||||
ands r0, r5
|
||||
orrs r0, r4
|
||||
mov r4, r9
|
||||
strb r0, [r4, 0xA]
|
||||
mov r4, sp
|
||||
ldrb r1, [r1, 0x8]
|
||||
mov r0, r12
|
||||
ands r0, r1
|
||||
lsls r0, 2
|
||||
ldrb r1, [r4, 0xB]
|
||||
ands r5, r1
|
||||
orrs r5, r0
|
||||
strb r5, [r4, 0xB]
|
||||
ldrb r1, [r2, 0x8]
|
||||
mov r0, r12
|
||||
ands r0, r1
|
||||
lsls r0, 3
|
||||
movs r1, 0x9
|
||||
negs r1, r1
|
||||
ands r1, r5
|
||||
orrs r1, r0
|
||||
strb r1, [r4, 0xB]
|
||||
ldrb r2, [r3, 0x8]
|
||||
mov r0, r12
|
||||
ands r0, r2
|
||||
lsls r0, 4
|
||||
movs r2, 0x11
|
||||
negs r2, r2
|
||||
ands r2, r1
|
||||
orrs r2, r0
|
||||
strb r2, [r4, 0xB]
|
||||
mov r3, sp
|
||||
ldr r5, [sp, 0x40]
|
||||
ldrb r0, [r5, 0x8]
|
||||
mov r1, r12
|
||||
ands r1, r0
|
||||
lsls r1, 5
|
||||
movs r0, 0x21
|
||||
negs r0, r0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r3, 0xB]
|
||||
mov r2, sp
|
||||
ldrb r1, [r6, 0x8]
|
||||
mov r6, r12
|
||||
ands r6, r1
|
||||
lsls r1, r6, 6
|
||||
mov r3, r10
|
||||
ands r0, r3
|
||||
orrs r0, r1
|
||||
strb r0, [r2, 0xB]
|
||||
ldr r4, [sp, 0x1C]
|
||||
lsrs r3, r4, 21
|
||||
ldrb r1, [r2, 0xA]
|
||||
movs r0, 0x7
|
||||
ands r0, r1
|
||||
orrs r0, r3
|
||||
strb r0, [r2, 0xA]
|
||||
mov r1, sp
|
||||
ldr r5, [sp, 0x4C]
|
||||
movs r6, 0x1
|
||||
ands r5, r6
|
||||
lsls r2, r5, 1
|
||||
ldrb r0, [r1, 0xB]
|
||||
mov r3, r8
|
||||
ands r3, r0
|
||||
orrs r3, r2
|
||||
mov r8, r3
|
||||
strb r3, [r1, 0xB]
|
||||
mov r0, sp
|
||||
ldr r4, [sp, 0x50]
|
||||
ands r4, r6
|
||||
mov r5, r8
|
||||
ands r5, r7
|
||||
orrs r5, r4
|
||||
strb r5, [r0, 0xB]
|
||||
bl RfuPrepareSend0x2f00
|
||||
add sp, 0x20
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_815A61C
|
||||
|
||||
thumb_func_start sub_815A950
|
||||
sub_815A950: @ 815A950
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
push {r6,r7}
|
||||
adds r7, r1, 0
|
||||
adds r5, r2, 0
|
||||
adds r6, r3, 0
|
||||
ldr r0, [sp, 0x1C]
|
||||
mov r12, r0
|
||||
ldr r1, [sp, 0x20]
|
||||
mov r8, r1
|
||||
ldr r0, [sp, 0x24]
|
||||
mov r9, r0
|
||||
adds r2, r7, 0
|
||||
adds r2, 0x14
|
||||
ldr r4, _0815A98C @ =gRecvCmds
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0xFF
|
||||
lsls r1, 8
|
||||
ands r1, r0
|
||||
movs r0, 0xBC
|
||||
lsls r0, 6
|
||||
cmp r1, r0
|
||||
bne _0815A988
|
||||
adds r3, r4, 0x2
|
||||
ldrb r0, [r4, 0x2]
|
||||
cmp r0, 0x2
|
||||
beq _0815A990
|
||||
_0815A988:
|
||||
movs r0, 0
|
||||
b _0815AACA
|
||||
.align 2, 0
|
||||
_0815A98C: .4byte gRecvCmds
|
||||
_0815A990:
|
||||
ldrb r0, [r3, 0x1]
|
||||
lsls r0, 28
|
||||
lsrs r0, 28
|
||||
strb r0, [r2, 0xB]
|
||||
ldrb r0, [r3, 0x1]
|
||||
lsrs r0, 4
|
||||
strb r0, [r2, 0xC]
|
||||
ldrb r0, [r3, 0x2]
|
||||
lsls r0, 28
|
||||
lsrs r0, 28
|
||||
strb r0, [r2, 0xD]
|
||||
ldrb r0, [r3, 0x2]
|
||||
lsrs r0, 4
|
||||
strb r0, [r2, 0xE]
|
||||
ldrb r0, [r3, 0x3]
|
||||
lsls r0, 28
|
||||
lsrs r0, 28
|
||||
strb r0, [r2, 0xF]
|
||||
ldrb r0, [r3, 0x3]
|
||||
lsrs r0, 4
|
||||
strb r0, [r2, 0x10]
|
||||
ldrb r0, [r3, 0x4]
|
||||
lsls r0, 28
|
||||
lsrs r0, 28
|
||||
strb r0, [r2, 0x11]
|
||||
ldrb r0, [r3, 0x4]
|
||||
lsrs r0, 4
|
||||
strb r0, [r2, 0x12]
|
||||
ldrb r0, [r3, 0x5]
|
||||
lsls r0, 28
|
||||
lsrs r0, 28
|
||||
strb r0, [r2, 0x13]
|
||||
ldrb r0, [r3, 0x5]
|
||||
lsrs r0, 4
|
||||
strb r0, [r2, 0x14]
|
||||
ldrb r0, [r3, 0x1]
|
||||
lsls r0, 28
|
||||
lsrs r0, 28
|
||||
strb r0, [r2, 0x15]
|
||||
ldrb r0, [r3, 0x6]
|
||||
lsls r0, 30
|
||||
lsrs r0, 30
|
||||
strb r0, [r7, 0x14]
|
||||
ldrb r0, [r3, 0x6]
|
||||
lsls r0, 28
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0x1]
|
||||
ldrb r0, [r3, 0x6]
|
||||
lsls r0, 26
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0x2]
|
||||
ldrb r0, [r3, 0x6]
|
||||
lsrs r0, 6
|
||||
strb r0, [r2, 0x3]
|
||||
ldrb r0, [r3, 0x7]
|
||||
lsls r0, 30
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0x4]
|
||||
ldrb r0, [r3, 0x7]
|
||||
lsls r0, 28
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0x5]
|
||||
ldrb r0, [r3, 0x7]
|
||||
lsls r0, 26
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0x6]
|
||||
ldrb r0, [r3, 0x7]
|
||||
lsrs r0, 6
|
||||
strb r0, [r2, 0x7]
|
||||
ldrb r0, [r3, 0x8]
|
||||
lsls r0, 30
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0x8]
|
||||
ldrb r0, [r3, 0x8]
|
||||
lsls r0, 28
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0x9]
|
||||
ldrb r0, [r3, 0x6]
|
||||
lsls r0, 30
|
||||
lsrs r0, 30
|
||||
strb r0, [r2, 0xA]
|
||||
ldrb r0, [r3, 0x8]
|
||||
lsls r0, 26
|
||||
lsrs r0, 30
|
||||
strb r0, [r5]
|
||||
ldrb r0, [r3, 0x9]
|
||||
lsls r0, 25
|
||||
lsrs r0, 31
|
||||
strb r0, [r5, 0x4]
|
||||
ldrb r0, [r3, 0xB]
|
||||
lsls r0, 29
|
||||
lsrs r0, 31
|
||||
strb r0, [r5, 0x8]
|
||||
ldrb r0, [r3, 0x8]
|
||||
lsrs r0, 6
|
||||
strb r0, [r6]
|
||||
ldrb r0, [r3, 0x9]
|
||||
lsrs r0, 7
|
||||
strb r0, [r6, 0x4]
|
||||
ldrb r0, [r3, 0xB]
|
||||
lsls r0, 28
|
||||
lsrs r0, 31
|
||||
strb r0, [r6, 0x8]
|
||||
ldrb r0, [r3, 0x9]
|
||||
lsls r0, 30
|
||||
lsrs r0, 30
|
||||
mov r1, r12
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r3, 0xA]
|
||||
lsls r0, 31
|
||||
lsrs r0, 31
|
||||
strb r0, [r1, 0x4]
|
||||
ldrb r0, [r3, 0xB]
|
||||
lsls r0, 27
|
||||
lsrs r0, 31
|
||||
strb r0, [r1, 0x8]
|
||||
ldrb r0, [r3, 0x9]
|
||||
lsls r0, 28
|
||||
lsrs r0, 30
|
||||
mov r1, r8
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r3, 0xA]
|
||||
lsls r0, 30
|
||||
lsrs r0, 31
|
||||
strb r0, [r1, 0x4]
|
||||
ldrb r0, [r3, 0xB]
|
||||
lsls r0, 26
|
||||
lsrs r0, 31
|
||||
strb r0, [r1, 0x8]
|
||||
ldrb r0, [r3, 0x9]
|
||||
lsls r0, 26
|
||||
lsrs r0, 30
|
||||
mov r1, r9
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r3, 0xA]
|
||||
lsls r0, 29
|
||||
lsrs r0, 31
|
||||
strb r0, [r1, 0x4]
|
||||
ldrb r0, [r3, 0xB]
|
||||
lsls r0, 25
|
||||
lsrs r0, 31
|
||||
strb r0, [r1, 0x8]
|
||||
ldrb r0, [r3, 0xA]
|
||||
lsrs r0, 3
|
||||
ldr r1, [sp, 0x28]
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r3, 0xB]
|
||||
lsls r0, 30
|
||||
lsrs r0, 31
|
||||
ldr r1, [sp, 0x2C]
|
||||
str r0, [r1]
|
||||
ldrb r0, [r3, 0xB]
|
||||
lsls r0, 31
|
||||
lsrs r0, 31
|
||||
ldr r1, [sp, 0x30]
|
||||
str r0, [r1]
|
||||
movs r0, 0x1
|
||||
_0815AACA:
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_815A950
|
||||
|
||||
thumb_func_start sub_815AAD8
|
||||
sub_815AAD8: @ 815AAD8
|
||||
push {lr}
|
||||
sub sp, 0x8
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r3, _0815AB00 @ =0xffffff00
|
||||
ldr r1, [sp]
|
||||
ands r1, r3
|
||||
movs r2, 0x3
|
||||
orrs r1, r2
|
||||
str r1, [sp]
|
||||
ldr r1, [sp, 0x4]
|
||||
ands r1, r3
|
||||
orrs r1, r0
|
||||
str r1, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl RfuPrepareSend0x2f00
|
||||
add sp, 0x8
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0815AB00: .4byte 0xffffff00
|
||||
thumb_func_end sub_815AAD8
|
||||
|
||||
thumb_func_start sub_815AB04
|
||||
sub_815AB04: @ 815AB04
|
||||
push {r4,lr}
|
||||
adds r2, r0, 0
|
||||
adds r4, r1, 0
|
||||
ldr r3, _0815AB2C @ =gRecvCmds
|
||||
ldrh r0, [r3]
|
||||
movs r1, 0xFF
|
||||
lsls r1, 8
|
||||
ands r1, r0
|
||||
movs r0, 0xBC
|
||||
lsls r0, 6
|
||||
cmp r1, r0
|
||||
bne _0815AB28
|
||||
lsls r0, r2, 4
|
||||
adds r1, r3, 0x2
|
||||
adds r1, r0, r1
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0x3
|
||||
beq _0815AB30
|
||||
_0815AB28:
|
||||
movs r0, 0
|
||||
b _0815AB36
|
||||
.align 2, 0
|
||||
_0815AB2C: .4byte gRecvCmds
|
||||
_0815AB30:
|
||||
ldrb r0, [r1, 0x4]
|
||||
strb r0, [r4]
|
||||
movs r0, 0x1
|
||||
_0815AB36:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_815AB04
|
||||
|
||||
thumb_func_start sub_815AB3C
|
||||
sub_815AB3C: @ 815AB3C
|
||||
push {lr}
|
||||
sub sp, 0x8
|
||||
ldr r2, _0815AB5C @ =0xffffff00
|
||||
ldr r1, [sp]
|
||||
ands r1, r2
|
||||
movs r2, 0x4
|
||||
orrs r1, r2
|
||||
str r1, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
mov r0, sp
|
||||
bl RfuPrepareSend0x2f00
|
||||
add sp, 0x8
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0815AB5C: .4byte 0xffffff00
|
||||
thumb_func_end sub_815AB3C
|
||||
|
||||
thumb_func_start sub_815AB60
|
||||
sub_815AB60: @ 815AB60
|
||||
push {lr}
|
||||
adds r2, r0, 0
|
||||
ldr r3, _0815AB88 @ =gRecvCmds
|
||||
ldrh r0, [r3]
|
||||
movs r1, 0xFF
|
||||
lsls r1, 8
|
||||
ands r1, r0
|
||||
movs r0, 0xBC
|
||||
lsls r0, 6
|
||||
cmp r1, r0
|
||||
bne _0815AB82
|
||||
lsls r0, r2, 4
|
||||
adds r1, r3, 0x2
|
||||
adds r1, r0, r1
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0x4
|
||||
beq _0815AB8C
|
||||
_0815AB82:
|
||||
movs r0, 0
|
||||
b _0815AB8E
|
||||
.align 2, 0
|
||||
_0815AB88: .4byte gRecvCmds
|
||||
_0815AB8C:
|
||||
ldr r0, [r1, 0x4]
|
||||
_0815AB8E:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_815AB60
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
@@ -1,6 +1,106 @@
|
||||
#ifndef GUARD_DODRIO_BERRY_PICKING_H
|
||||
#define GUARD_DODRIO_BERRY_PICKING_H
|
||||
|
||||
struct DodrioSubstruct_0160
|
||||
{
|
||||
/*0x0000 : 0x3000*/ u16 ALIGNED(4) tilemapBuffers[3][BG_SCREEN_SIZE];
|
||||
/*0x3000 : 0x3160*/ bool32 finished;
|
||||
/*0x3004 : 0x3164*/ u8 ALIGNED(4) unk3004;
|
||||
/*0x3008 : 0x3168*/ u8 ALIGNED(4) unk3008[10];
|
||||
/*0x3014 : 0x3174*/ u8 ALIGNED(4) state;
|
||||
/*0x3018 : 0x3178*/ u8 ALIGNED(4) unk3018;
|
||||
/*0x301C : 0x317C*/ u16 ALIGNED(4) unk301C;
|
||||
/*0x3020 : 0x3180*/ u8 ALIGNED(4) unk3020;
|
||||
/*0x3024 : 0x3184*/ u8 ALIGNED(4) unk3024;
|
||||
/*0x3024 : 0x3184*/ void (*unk3028)(void);
|
||||
}; // size = 0x302C
|
||||
|
||||
struct DodrioSubstruct_318C
|
||||
{
|
||||
bool8 isShiny;
|
||||
};
|
||||
|
||||
struct DodrioSubstruct_31A0_14
|
||||
{
|
||||
u8 unk0[11];
|
||||
u8 unkB[11];
|
||||
};
|
||||
|
||||
struct DodrioSubstruct_31A0_2C
|
||||
{
|
||||
u8 unk0;
|
||||
u8 ALIGNED(4) unk4;
|
||||
u8 ALIGNED(4) unk8;
|
||||
};
|
||||
|
||||
struct DodrioSubstruct_31A0
|
||||
{
|
||||
u8 name[0x10];
|
||||
u32 unk10;
|
||||
struct DodrioSubstruct_31A0_14 unk14;
|
||||
struct DodrioSubstruct_31A0_2C unk2C;
|
||||
u8 filler_35[4];
|
||||
}; // size = 0x3C
|
||||
|
||||
struct DodrioSubstruct_3308
|
||||
{
|
||||
u8 unk0;
|
||||
u32 unk4;
|
||||
};
|
||||
|
||||
void StartDodrioBerryPicking(u16 species, MainCallback callback);
|
||||
|
||||
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8);
|
||||
u32 sub_815AB04(u32 arg0, u8 *arg1);
|
||||
bool32 sub_815AB60(u32 a0);
|
||||
void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8);
|
||||
void sub_815A5BC(s32 a0);
|
||||
void sub_815AAD8(u8 a0);
|
||||
void sub_815AB3C(u32 a0);
|
||||
u8 sub_815A5E8(s32 a0);
|
||||
u32 IncrementWithLimit(u32, u32);
|
||||
void sub_8153A9C(void);
|
||||
void sub_8153AFC(struct DodrioSubstruct_318C * unk318C, u8 a1, u8 a2, u8 a3);
|
||||
void sub_8153BC0(u8 a0);
|
||||
void sub_8153BF8(u8 a0);
|
||||
void sub_8153D08(u8 playerCount);
|
||||
u8 sub_8155E8C(void);
|
||||
u8 sub_81533B4(void);
|
||||
void sub_8153DA8(u8 a0, u8 a1);
|
||||
void sub_8153D80(bool8 a0, u8 a1);
|
||||
void sub_8153FC8(u8 a0);
|
||||
void sub_8153DD8(void);
|
||||
void sub_8153E28(void);
|
||||
void sub_8153ED8(void);
|
||||
bool32 sub_8153F1C(void);
|
||||
void sub_81540DC(bool8 a0);
|
||||
void sub_8154128(void);
|
||||
void sub_815417C(void);
|
||||
void sub_8154274(void);
|
||||
void sub_81542EC(u8 a0, u8 a1);
|
||||
void sub_8154370(u8 a0, u8 a1);
|
||||
void sub_8154398(u16 a0, u8 a1);
|
||||
void sub_8154438(void);
|
||||
void sub_81544F0(void);
|
||||
void sub_8154540(void);
|
||||
void sub_8154578(void);
|
||||
void sub_81545BC(bool8 a0);
|
||||
void sub_81546C0(void);
|
||||
void sub_8154730(void);
|
||||
void sub_8154968(struct DodrioSubstruct_0160 * unk0160);
|
||||
void sub_81549D4(u8 a0);
|
||||
u8 *sub_81533C4(u8 id);
|
||||
u8 sub_81537AC(u8 id);
|
||||
void sub_81536A0(struct DodrioSubstruct_3308 *dst, u8 id);
|
||||
u32 sub_81534AC(void);
|
||||
u32 Min(u32 x, u32 y);
|
||||
u16 sub_8153404(u8 arg0, u8 arg1);
|
||||
u32 sub_81534F0(u8 arg0);
|
||||
u32 sub_81535B0(void);
|
||||
u16 sub_8153390(void);
|
||||
u8 sub_815372C(void);
|
||||
bool32 sub_8155E68(void);
|
||||
void ShowDodrioBerryPickingRecords(void);
|
||||
void IsDodrioInParty(void);
|
||||
|
||||
#endif //GUARD_DODRIO_BERRY_PICKING_H
|
||||
|
||||
+15
-14
@@ -105,20 +105,21 @@
|
||||
} \
|
||||
}
|
||||
|
||||
#define DmaClearLarge(dmaNum, dest, size, block, bit) \
|
||||
{ \
|
||||
u32 _size = size; \
|
||||
while (1) \
|
||||
{ \
|
||||
DmaFill##bit(dmaNum, 0, dest, (block)); \
|
||||
dest += (block); \
|
||||
_size -= (block); \
|
||||
if (_size <= (block)) \
|
||||
{ \
|
||||
DmaFill##bit(dmaNum, 0, dest, _size); \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
#define DmaClearLarge(dmaNum, dest, size, block, bit) \
|
||||
{ \
|
||||
void *_dest = dest; \
|
||||
u32 _size = size; \
|
||||
while (1) \
|
||||
{ \
|
||||
DmaFill##bit(dmaNum, 0, _dest, (block)); \
|
||||
_dest += (block); \
|
||||
_size -= (block); \
|
||||
if (_size <= (block)) \
|
||||
{ \
|
||||
DmaFill##bit(dmaNum, 0, _dest, _size); \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
#define DmaFillLarge(dmaNum, value, dest, size, block, bit) \
|
||||
|
||||
+1
-1
@@ -114,7 +114,7 @@ extern const u8 gText_TurnedOverItemsWorthYen[];
|
||||
extern const u8 gPokedudeText_TMTypes[];
|
||||
extern const u8 gPokedudeText_ReadTMDescription[];
|
||||
extern const u8 gFameCheckerText_Cancel[];
|
||||
extern const u8 gFameCheckerText_ListMenuCursor[];
|
||||
extern const u8 gText_SelectorArrow2[];
|
||||
extern const u8 gFameCheckerText_FameCheckerWillBeClosed[];
|
||||
extern const u8 gFameCheckerText_ClearTextbox[];
|
||||
extern const u8 gFameCheckerText_MainScreenUI[]; // "{DPAD_ANY}PICK {DPAD_UPDOWN}SELECT {A_BUTTON}OK$"
|
||||
|
||||
+4
-3
@@ -286,11 +286,11 @@ SECTIONS {
|
||||
src/braille_text.o(.text);
|
||||
src/text_window.o(.text);
|
||||
src/quest_log_player.o(.text);
|
||||
asm/dodrio_berry_picking.o(.text);
|
||||
src/dodrio_berry_picking.o(.text);
|
||||
src/dodrio_berry_picking_2.o(.text);
|
||||
src/battle_controller_pokedude.o(.text);
|
||||
src/quest_log_objects.o(.text);
|
||||
src/dodrio_berry_picking_2.o(.text);
|
||||
asm/dodrio_berry_picking_2.o(.text);
|
||||
src/dodrio_berry_picking_3.o(.text);
|
||||
src/teachy_tv.o(.text);
|
||||
src/ereader_helpers.o(.text);
|
||||
src/digit_obj_util.o(.text);
|
||||
@@ -579,6 +579,7 @@ SECTIONS {
|
||||
src/text_window_graphics.o(.rodata);
|
||||
src/quest_log_player.o(.rodata);
|
||||
src/dodrio_berry_picking.o(.rodata);
|
||||
src/dodrio_berry_picking_2.o(.rodata);
|
||||
src/battle_controller_pokedude.o(.rodata);
|
||||
src/teachy_tv.o(.rodata);
|
||||
src/digit_obj_util.o(.rodata);
|
||||
|
||||
+1
-1
@@ -748,7 +748,7 @@ static void BerryPouchSetArrowCursorAt(u8 y, u8 colorIdx)
|
||||
}
|
||||
else
|
||||
{
|
||||
BerryPouchPrint(0, 2, gFameCheckerText_ListMenuCursor, 1, y, 0, 0, 0, colorIdx);
|
||||
BerryPouchPrint(0, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,247 @@
|
||||
#ifndef GUARD_DATA_DODRIO_BERRY_PICKING_H
|
||||
#define GUARD_DATA_DODRIO_BERRY_PICKING_H
|
||||
|
||||
static const struct BgTemplate sUnknown_847565C[] =
|
||||
{
|
||||
{
|
||||
.bg = 0,
|
||||
.charBaseIndex = 0,
|
||||
.mapBaseIndex = 30,
|
||||
.screenSize = 0,
|
||||
.paletteMode = 0,
|
||||
.priority = 0,
|
||||
.baseTile = 0
|
||||
},
|
||||
{
|
||||
.bg = 1,
|
||||
.charBaseIndex = 2,
|
||||
.mapBaseIndex = 12,
|
||||
.screenSize = 1,
|
||||
.paletteMode = 0,
|
||||
.priority = 1,
|
||||
.baseTile = 0
|
||||
},
|
||||
{
|
||||
.bg = 2,
|
||||
.charBaseIndex = 2,
|
||||
.mapBaseIndex = 14,
|
||||
.screenSize = 1,
|
||||
.paletteMode = 0,
|
||||
.priority = 1,
|
||||
.baseTile = 0
|
||||
},
|
||||
{
|
||||
.bg = 3,
|
||||
.charBaseIndex = 3,
|
||||
.mapBaseIndex = 31,
|
||||
.screenSize = 0,
|
||||
.paletteMode = 0,
|
||||
.priority = 2,
|
||||
.baseTile = 0
|
||||
},
|
||||
};
|
||||
|
||||
// Unknown unreferenced data, feel free to remove.
|
||||
static const u32 sUnused[] = {255, 0};
|
||||
|
||||
static const struct WindowTemplate sUnknown_8475674[] =
|
||||
{
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 1,
|
||||
.tilemapTop = 1,
|
||||
.width = 28,
|
||||
.height = 3,
|
||||
.paletteNum = 13,
|
||||
.baseBlock = 0x13,
|
||||
},
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 1,
|
||||
.tilemapTop = 6,
|
||||
.width = 28,
|
||||
.height = 13,
|
||||
.paletteNum = 13,
|
||||
.baseBlock = 0x67,
|
||||
}
|
||||
};
|
||||
|
||||
static const struct WindowTemplate sUnknown_8475684 =
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 1,
|
||||
.tilemapTop = 6,
|
||||
.width = 28,
|
||||
.height = 7,
|
||||
.paletteNum = 13,
|
||||
.baseBlock = 0x67,
|
||||
};
|
||||
|
||||
static const struct WindowTemplate sUnknown_847568C[] =
|
||||
{
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 1,
|
||||
.tilemapTop = 8,
|
||||
.width = 19,
|
||||
.height = 3,
|
||||
.paletteNum = 13,
|
||||
.baseBlock = 0x13,
|
||||
},
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 22,
|
||||
.tilemapTop = 7,
|
||||
.width = 6,
|
||||
.height = 4,
|
||||
.paletteNum = 13,
|
||||
.baseBlock = 0x4C,
|
||||
}
|
||||
};
|
||||
|
||||
static const struct WindowTemplate sUnknown_847569C =
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 4,
|
||||
.tilemapTop = 6,
|
||||
.width = 22,
|
||||
.height = 5,
|
||||
.paletteNum = 13,
|
||||
.baseBlock = 0x13,
|
||||
};
|
||||
|
||||
static const struct WindowTemplate sUnknown_84756A4 =
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 5,
|
||||
.tilemapTop = 8,
|
||||
.width = 19,
|
||||
.height = 3,
|
||||
.paletteNum = 13,
|
||||
.baseBlock = 0x13,
|
||||
};
|
||||
|
||||
static const u8 sUnknown_8471F50[5][5][11] =
|
||||
{
|
||||
{
|
||||
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
|
||||
},
|
||||
{
|
||||
{0, 1, 2, 3, 4, 5, 6, 3, 8, 9, 0},
|
||||
{0, 1, 2, 5, 6, 3, 4, 5, 8, 9, 0},
|
||||
},
|
||||
{
|
||||
{0, 1, 2, 3, 4, 5, 6, 7, 2, 9, 0},
|
||||
{0, 1, 4, 5, 6, 7, 2, 3, 4, 9, 0},
|
||||
{0, 1, 6, 7, 2, 3, 4, 5, 6, 9, 0},
|
||||
},
|
||||
{
|
||||
{0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 0},
|
||||
{0, 3, 4, 5, 6, 7, 8, 1, 2, 3, 0},
|
||||
{0, 5, 6, 7, 8, 1, 2, 3, 4, 5, 0},
|
||||
{0, 7, 8, 1, 2, 3, 4, 5, 6, 7, 0},
|
||||
},
|
||||
{
|
||||
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
|
||||
{2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2},
|
||||
{4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4},
|
||||
{6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6},
|
||||
{8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8},
|
||||
},
|
||||
};
|
||||
|
||||
static const u8 sUnknown_8472063[5][5][3] =
|
||||
{
|
||||
{
|
||||
{4, 5, 6},
|
||||
},
|
||||
{
|
||||
{3, 4, 5},
|
||||
{5, 6, 3},
|
||||
},
|
||||
{
|
||||
{4, 5, 6},
|
||||
{6, 7, 2},
|
||||
{2, 3, 4},
|
||||
},
|
||||
{
|
||||
{3, 4, 5},
|
||||
{5, 6, 7},
|
||||
{7, 8, 1},
|
||||
{1, 2, 3},
|
||||
},
|
||||
{
|
||||
{4, 5, 6},
|
||||
{6, 7, 8},
|
||||
{8, 9, 0},
|
||||
{0, 1, 2},
|
||||
{2, 3, 4},
|
||||
},
|
||||
};
|
||||
|
||||
static const u8 sUnknown_84720AE[5][5][3] =
|
||||
{
|
||||
{
|
||||
{1, 0, 1},
|
||||
},
|
||||
{
|
||||
{1, 0, 1},
|
||||
{0, 1, 0},
|
||||
},
|
||||
{
|
||||
{2, 0, 1},
|
||||
{0, 1, 2},
|
||||
{1, 2, 0},
|
||||
},
|
||||
{
|
||||
{3, 0, 1},
|
||||
{0, 1, 2},
|
||||
{1, 2, 3},
|
||||
{2, 3, 0},
|
||||
},
|
||||
{
|
||||
{4, 0, 1},
|
||||
{0, 1, 2},
|
||||
{1, 2, 3},
|
||||
{2, 3, 4},
|
||||
{3, 4, 0},
|
||||
},
|
||||
};
|
||||
|
||||
ALIGNED(4)
|
||||
static const u8 sUnknown_84720FC[5][11] =
|
||||
{
|
||||
{9, 9, 9, 9, 1, 1, 1, 9, 9, 9, 9},
|
||||
{9, 9, 9, 0, 0, 1, 1, 0, 9, 9, 9},
|
||||
{9, 9, 2, 2, 0, 0, 1, 1, 1, 9, 9},
|
||||
{9, 3, 3, 0, 0, 1, 1, 2, 2, 3, 9},
|
||||
{3, 3, 4, 4, 0, 0, 1, 1, 2, 2, 3},
|
||||
};
|
||||
|
||||
static const u8 sUnknown_8472133[5][5] =
|
||||
{
|
||||
{5},
|
||||
{4, 6},
|
||||
{3, 5, 7},
|
||||
{2, 4, 6, 8},
|
||||
{1, 3, 5, 6, 9},
|
||||
};
|
||||
|
||||
static const u16 sDodrioBerryBgPal1[] = INCBIN_U16("graphics/link_games/dodrioberry_bg1.gbapal",
|
||||
"graphics/link_games/dodrioberry_bg2.gbapal");
|
||||
static const u16 sDodrioBerryPkmnPal[] = INCBIN_U16("graphics/link_games/dodrioberry_pkmn.gbapal");
|
||||
static const u16 sDodrioBerryShinyPal[] = INCBIN_U16("graphics/link_games/dodrioberry_shiny.gbapal");
|
||||
static const u16 sDodrioBerryStatusPal[] = INCBIN_U16("graphics/link_games/dodrioberry_status.gbapal");
|
||||
static const u16 sDodrioBerrySpritesPal[] = INCBIN_U16("graphics/link_games/dodrioberry_berrysprites.gbapal");
|
||||
static const u32 sDodrioBerrySpritesGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_berrysprites.4bpp.lz");
|
||||
static const u16 sDodrioBerryPlatformPal[] = INCBIN_U16("graphics/link_games/dodrioberry_platform.gbapal");
|
||||
static const u32 sDodrioBerryBgGfx1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.4bpp.lz");
|
||||
static const u32 sDodrioBerryBgGfx2[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2.4bpp.lz");
|
||||
static const u32 sDodrioBerryStatusGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_status.4bpp.lz");
|
||||
static const u32 sDodrioBerryPlatformGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_platform.4bpp.lz");
|
||||
static const u32 sDodrioBerryPkmnGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_pkmn.4bpp.lz");
|
||||
static const u32 sDodrioBerryBgTilemap1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz");
|
||||
static const u32 sDodrioBerryBgTilemap2Right[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz");
|
||||
static const u32 sDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz");
|
||||
|
||||
#endif //GUARD_DATA_DODRIO_BERRY_PICKING_H
|
||||
+2344
-778
File diff suppressed because it is too large
Load Diff
+1607
-13
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,659 @@
|
||||
#include "global.h"
|
||||
#include "dodrio_berry_picking.h"
|
||||
#include "link.h"
|
||||
#include "link_rfu.h"
|
||||
|
||||
void sub_815A5BC(s32 a0)
|
||||
{
|
||||
struct Padded_U8 data[2];
|
||||
data[0].value = 1;
|
||||
data[1].value = a0;
|
||||
RfuPrepareSend0x2f00(data);
|
||||
}
|
||||
|
||||
u8 sub_815A5E8(s32 a0)
|
||||
{
|
||||
u8 * r1;
|
||||
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
|
||||
return 0;
|
||||
r1 = (u8 *)&gRecvCmds[a0][1];
|
||||
if (r1[0] == 1)
|
||||
return r1[4];
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct UnkPacket2
|
||||
{
|
||||
u8 id;
|
||||
u8 unk1_0:4;
|
||||
u8 unk1_1:4;
|
||||
u8 unk2_0:4;
|
||||
u8 unk2_1:4;
|
||||
u8 unk3_0:4;
|
||||
u8 unk3_1:4;
|
||||
u8 unk4_0:4;
|
||||
u8 unk4_1:4;
|
||||
u8 unk5_0:4;
|
||||
u8 unk5_1:4;
|
||||
u8 unk6_0:2;
|
||||
u8 unk6_1:2;
|
||||
u8 unk6_2:2;
|
||||
u8 unk6_3:2;
|
||||
u8 unk7_0:2;
|
||||
u8 unk7_1:2;
|
||||
u8 unk7_2:2;
|
||||
u8 unk7_3:2;
|
||||
u8 unk8_0:2;
|
||||
u8 unk8_1:2;
|
||||
u8 unk8_2:2;
|
||||
u8 unk8_3:2;
|
||||
u8 unk9_0:2;
|
||||
u8 unk9_1:2;
|
||||
u8 unk9_2:2;
|
||||
u8 unk9_3:1;
|
||||
u8 unk9_4:1;
|
||||
u8 unkA_0:1;
|
||||
u8 unkA_1:1;
|
||||
u8 unkA_2:1;
|
||||
u8 unkA_3:5;
|
||||
u8 unkB_0:1;
|
||||
u8 unkB_1:1;
|
||||
u8 unkB_2:1;
|
||||
u8 unkB_3:1;
|
||||
u8 unkB_4:1;
|
||||
u8 unkB_5:1;
|
||||
u8 unkB_6:1;
|
||||
};
|
||||
|
||||
// Yeah not even attempting this lol
|
||||
#ifdef NONMATCHING
|
||||
static void sub_815A61C(struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 arg6, u32 arg7, u32 arg8)
|
||||
{
|
||||
struct UnkPacket2 packet;
|
||||
struct DodrioSubstruct_31A0_14 * ptr = &arg0->unk14;
|
||||
|
||||
packet.id = 2;
|
||||
packet.unk1_0 = ptr->unkB[0];
|
||||
packet.unk1_1 = ptr->unkB[1];
|
||||
packet.unk2_0 = ptr->unkB[2];
|
||||
packet.unk2_1 = ptr->unkB[3];
|
||||
packet.unk3_0 = ptr->unkB[4];
|
||||
packet.unk3_1 = ptr->unkB[5];
|
||||
packet.unk4_0 = ptr->unkB[6];
|
||||
packet.unk4_1 = ptr->unkB[7];
|
||||
packet.unk5_0 = ptr->unkB[8];
|
||||
packet.unk5_1 = ptr->unkB[9];
|
||||
|
||||
packet.unk6_0 = ptr->unk0[0];
|
||||
packet.unk6_1 = ptr->unk0[1];
|
||||
packet.unk6_2 = ptr->unk0[2];
|
||||
packet.unk6_3 = ptr->unk0[3];
|
||||
packet.unk7_0 = ptr->unk0[4];
|
||||
packet.unk7_1 = ptr->unk0[5];
|
||||
packet.unk7_2 = ptr->unk0[6];
|
||||
packet.unk7_3 = ptr->unk0[7];
|
||||
packet.unk8_0 = ptr->unk0[8];
|
||||
packet.unk8_1 = ptr->unk0[9];
|
||||
|
||||
packet.unk8_2 = arg1->unk0;
|
||||
packet.unk8_3 = arg2->unk0;
|
||||
packet.unk9_0 = arg3->unk0;
|
||||
packet.unk9_1 = arg4->unk0;
|
||||
packet.unk9_2 = arg5->unk0;
|
||||
|
||||
packet.unk9_3 = arg1->unk4;
|
||||
packet.unk9_4 = arg2->unk4;
|
||||
packet.unkA_0 = arg3->unk4;
|
||||
packet.unkA_1 = arg4->unk4;
|
||||
packet.unkA_2 = arg5->unk4;
|
||||
|
||||
packet.unkB_2 = arg1->unk8;
|
||||
packet.unkB_3 = arg2->unk8;
|
||||
packet.unkB_4 = arg3->unk8;
|
||||
packet.unkB_5 = arg4->unk8;
|
||||
packet.unkB_6 = arg5->unk8;
|
||||
|
||||
packet.unkA_3 = arg6;
|
||||
packet.unkB_1 = arg7;
|
||||
packet.unkB_0 = arg8;
|
||||
RfuPrepareSend0x2f00(&packet);
|
||||
}
|
||||
#else
|
||||
NAKED
|
||||
void sub_815A61C(struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 arg6, u32 arg7, u32 arg8)
|
||||
{
|
||||
asm_unified(" push {r4-r7,lr}\n\
|
||||
mov r7, r10\n\
|
||||
mov r6, r9\n\
|
||||
mov r5, r8\n\
|
||||
push {r5-r7}\n\
|
||||
sub sp, 0x20\n\
|
||||
ldr r4, [sp, 0x48]\n\
|
||||
lsls r4, 24\n\
|
||||
str r4, [sp, 0x1C]\n\
|
||||
movs r4, 0x14\n\
|
||||
adds r4, r0\n\
|
||||
mov r9, r4\n\
|
||||
mov r5, sp\n\
|
||||
movs r4, 0x2\n\
|
||||
strb r4, [r5]\n\
|
||||
mov r10, sp\n\
|
||||
mov r5, r9\n\
|
||||
ldrb r4, [r5, 0xB]\n\
|
||||
movs r7, 0xF\n\
|
||||
adds r5, r7, 0\n\
|
||||
ands r5, r4\n\
|
||||
mov r6, r10\n\
|
||||
ldrb r6, [r6, 0x1]\n\
|
||||
mov r8, r6\n\
|
||||
movs r4, 0x10\n\
|
||||
negs r4, r4\n\
|
||||
mov r6, r8\n\
|
||||
ands r4, r6\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r10\n\
|
||||
strb r4, [r5, 0x1]\n\
|
||||
mov r8, sp\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r5, [r6, 0xC]\n\
|
||||
lsls r5, 4\n\
|
||||
ands r4, r7\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r8\n\
|
||||
strb r4, [r5, 0x1]\n\
|
||||
ldrb r5, [r6, 0xD]\n\
|
||||
movs r6, 0xF\n\
|
||||
ands r5, r6\n\
|
||||
mov r4, r10\n\
|
||||
ldrb r4, [r4, 0x2]\n\
|
||||
mov r8, r4\n\
|
||||
movs r4, 0x10\n\
|
||||
negs r4, r4\n\
|
||||
mov r6, r8\n\
|
||||
ands r4, r6\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r10\n\
|
||||
strb r4, [r5, 0x2]\n\
|
||||
mov r8, sp\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r5, [r6, 0xE]\n\
|
||||
lsls r5, 4\n\
|
||||
ands r4, r7\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r8\n\
|
||||
strb r4, [r5, 0x2]\n\
|
||||
ldrb r5, [r6, 0xF]\n\
|
||||
movs r6, 0xF\n\
|
||||
ands r5, r6\n\
|
||||
mov r4, r10\n\
|
||||
ldrb r4, [r4, 0x3]\n\
|
||||
mov r8, r4\n\
|
||||
movs r4, 0x10\n\
|
||||
negs r4, r4\n\
|
||||
mov r6, r8\n\
|
||||
ands r4, r6\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r10\n\
|
||||
strb r4, [r5, 0x3]\n\
|
||||
mov r8, sp\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r5, [r6, 0x10]\n\
|
||||
lsls r5, 4\n\
|
||||
ands r4, r7\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r8\n\
|
||||
strb r4, [r5, 0x3]\n\
|
||||
ldrb r5, [r6, 0x11]\n\
|
||||
movs r6, 0xF\n\
|
||||
ands r5, r6\n\
|
||||
mov r4, r10\n\
|
||||
ldrb r4, [r4, 0x4]\n\
|
||||
mov r8, r4\n\
|
||||
movs r4, 0x10\n\
|
||||
negs r4, r4\n\
|
||||
mov r6, r8\n\
|
||||
ands r4, r6\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r10\n\
|
||||
strb r4, [r5, 0x4]\n\
|
||||
mov r8, sp\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r5, [r6, 0x12]\n\
|
||||
lsls r5, 4\n\
|
||||
ands r4, r7\n\
|
||||
orrs r4, r5\n\
|
||||
mov r5, r8\n\
|
||||
strb r4, [r5, 0x4]\n\
|
||||
ldrb r4, [r6, 0x13]\n\
|
||||
movs r6, 0xF\n\
|
||||
ands r4, r6\n\
|
||||
mov r6, r8\n\
|
||||
ldrb r5, [r6, 0x5]\n\
|
||||
movs r6, 0x10\n\
|
||||
negs r6, r6\n\
|
||||
ands r6, r5\n\
|
||||
orrs r6, r4\n\
|
||||
str r6, [sp, 0xC]\n\
|
||||
mov r4, r8\n\
|
||||
strb r6, [r4, 0x5]\n\
|
||||
mov r5, sp\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r4, [r6, 0x14]\n\
|
||||
lsls r4, 4\n\
|
||||
ldr r6, [sp, 0xC]\n\
|
||||
ands r6, r7\n\
|
||||
orrs r6, r4\n\
|
||||
strb r6, [r5, 0x5]\n\
|
||||
mov r7, sp\n\
|
||||
movs r4, 0x3\n\
|
||||
mov r8, r4\n\
|
||||
ldrb r0, [r0, 0x14]\n\
|
||||
mov r5, r8\n\
|
||||
ands r0, r5\n\
|
||||
ldrb r5, [r7, 0x6]\n\
|
||||
movs r6, 0x4\n\
|
||||
negs r6, r6\n\
|
||||
mov r10, r6\n\
|
||||
mov r4, r10\n\
|
||||
ands r4, r5\n\
|
||||
orrs r4, r0\n\
|
||||
strb r4, [r7, 0x6]\n\
|
||||
mov r5, r9\n\
|
||||
ldrb r0, [r5, 0x1]\n\
|
||||
mov r6, r8\n\
|
||||
ands r0, r6\n\
|
||||
lsls r0, 2\n\
|
||||
movs r5, 0xD\n\
|
||||
negs r5, r5\n\
|
||||
ands r5, r4\n\
|
||||
orrs r5, r0\n\
|
||||
strb r5, [r7, 0x6]\n\
|
||||
mov r0, r9\n\
|
||||
ldrb r4, [r0, 0x2]\n\
|
||||
ands r4, r6\n\
|
||||
lsls r4, 4\n\
|
||||
movs r0, 0x31\n\
|
||||
negs r0, r0\n\
|
||||
ands r0, r5\n\
|
||||
orrs r0, r4\n\
|
||||
strb r0, [r7, 0x6]\n\
|
||||
mov r5, sp\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r4, [r6, 0x3]\n\
|
||||
lsls r4, 6\n\
|
||||
movs r6, 0x3F\n\
|
||||
ands r0, r6\n\
|
||||
orrs r0, r4\n\
|
||||
strb r0, [r5, 0x6]\n\
|
||||
mov r4, r9\n\
|
||||
ldrb r0, [r4, 0x4]\n\
|
||||
mov r5, r8\n\
|
||||
ands r0, r5\n\
|
||||
ldrb r5, [r7, 0x7]\n\
|
||||
mov r4, r10\n\
|
||||
ands r4, r5\n\
|
||||
orrs r4, r0\n\
|
||||
strb r4, [r7, 0x7]\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r0, [r6, 0x5]\n\
|
||||
mov r5, r8\n\
|
||||
ands r0, r5\n\
|
||||
lsls r0, 2\n\
|
||||
movs r5, 0xD\n\
|
||||
negs r5, r5\n\
|
||||
ands r5, r4\n\
|
||||
orrs r5, r0\n\
|
||||
strb r5, [r7, 0x7]\n\
|
||||
ldrb r4, [r6, 0x6]\n\
|
||||
mov r6, r8\n\
|
||||
ands r4, r6\n\
|
||||
lsls r4, 4\n\
|
||||
movs r0, 0x31\n\
|
||||
negs r0, r0\n\
|
||||
ands r0, r5\n\
|
||||
orrs r0, r4\n\
|
||||
strb r0, [r7, 0x7]\n\
|
||||
mov r5, sp\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r4, [r6, 0x7]\n\
|
||||
lsls r4, 6\n\
|
||||
movs r6, 0x3F\n\
|
||||
ands r0, r6\n\
|
||||
orrs r0, r4\n\
|
||||
strb r0, [r5, 0x7]\n\
|
||||
mov r8, sp\n\
|
||||
mov r0, r9\n\
|
||||
ldrb r4, [r0, 0x8]\n\
|
||||
movs r7, 0x3\n\
|
||||
adds r0, r7, 0\n\
|
||||
ands r0, r4\n\
|
||||
mov r4, r8\n\
|
||||
ldrb r5, [r4, 0x8]\n\
|
||||
mov r4, r10\n\
|
||||
ands r4, r5\n\
|
||||
orrs r4, r0\n\
|
||||
mov r5, r8\n\
|
||||
strb r4, [r5, 0x8]\n\
|
||||
mov r6, r9\n\
|
||||
ldrb r5, [r6, 0x9]\n\
|
||||
adds r0, r7, 0\n\
|
||||
ands r0, r5\n\
|
||||
lsls r0, 2\n\
|
||||
movs r5, 0xD\n\
|
||||
negs r5, r5\n\
|
||||
ands r5, r4\n\
|
||||
orrs r5, r0\n\
|
||||
mov r0, r8\n\
|
||||
strb r5, [r0, 0x8]\n\
|
||||
ldrb r0, [r1]\n\
|
||||
adds r4, r7, 0\n\
|
||||
ands r4, r0\n\
|
||||
lsls r4, 4\n\
|
||||
movs r0, 0x31\n\
|
||||
negs r0, r0\n\
|
||||
ands r0, r5\n\
|
||||
orrs r0, r4\n\
|
||||
mov r4, r8\n\
|
||||
strb r0, [r4, 0x8]\n\
|
||||
mov r5, sp\n\
|
||||
ldrb r4, [r2]\n\
|
||||
lsls r4, 6\n\
|
||||
movs r6, 0x3F\n\
|
||||
ands r0, r6\n\
|
||||
orrs r0, r4\n\
|
||||
strb r0, [r5, 0x8]\n\
|
||||
ldrb r4, [r3]\n\
|
||||
adds r0, r7, 0\n\
|
||||
ands r0, r4\n\
|
||||
ldrb r4, [r5, 0x9]\n\
|
||||
mov r6, r10\n\
|
||||
ands r6, r4\n\
|
||||
orrs r6, r0\n\
|
||||
mov r10, r6\n\
|
||||
strb r6, [r5, 0x9]\n\
|
||||
ldr r0, [sp, 0x40]\n\
|
||||
ldrb r4, [r0]\n\
|
||||
adds r0, r7, 0\n\
|
||||
ands r0, r4\n\
|
||||
lsls r0, 2\n\
|
||||
movs r4, 0xD\n\
|
||||
negs r4, r4\n\
|
||||
ands r6, r4\n\
|
||||
orrs r6, r0\n\
|
||||
str r6, [sp, 0x10]\n\
|
||||
strb r6, [r5, 0x9]\n\
|
||||
mov r4, sp\n\
|
||||
ldr r5, [sp, 0x44]\n\
|
||||
ldrb r0, [r5]\n\
|
||||
adds r6, r7, 0\n\
|
||||
ands r6, r0\n\
|
||||
lsls r0, r6, 4\n\
|
||||
subs r7, 0x34\n\
|
||||
ldr r5, [sp, 0x10]\n\
|
||||
ands r7, r5\n\
|
||||
orrs r7, r0\n\
|
||||
strb r7, [r4, 0x9]\n\
|
||||
mov r5, sp\n\
|
||||
ldrb r0, [r1, 0x4]\n\
|
||||
movs r6, 0x1\n\
|
||||
mov r12, r6\n\
|
||||
mov r4, r12\n\
|
||||
ands r4, r0\n\
|
||||
lsls r4, 6\n\
|
||||
movs r0, 0x41\n\
|
||||
negs r0, r0\n\
|
||||
mov r10, r0\n\
|
||||
ands r0, r7\n\
|
||||
orrs r0, r4\n\
|
||||
strb r0, [r5, 0x9]\n\
|
||||
ldrb r4, [r2, 0x4]\n\
|
||||
lsls r4, 7\n\
|
||||
movs r5, 0x7F\n\
|
||||
ands r0, r5\n\
|
||||
orrs r0, r4\n\
|
||||
mov r4, r8\n\
|
||||
strb r0, [r4, 0x9]\n\
|
||||
ldrb r4, [r3, 0x4]\n\
|
||||
mov r0, r12\n\
|
||||
ands r0, r4\n\
|
||||
mov r5, r8\n\
|
||||
ldrb r4, [r5, 0xA]\n\
|
||||
movs r7, 0x2\n\
|
||||
negs r7, r7\n\
|
||||
adds r5, r7, 0\n\
|
||||
ands r5, r4\n\
|
||||
orrs r5, r0\n\
|
||||
mov r6, r8\n\
|
||||
strb r5, [r6, 0xA]\n\
|
||||
mov r9, sp\n\
|
||||
ldr r4, [sp, 0x40]\n\
|
||||
ldrb r0, [r4, 0x4]\n\
|
||||
mov r4, r12\n\
|
||||
ands r4, r0\n\
|
||||
lsls r4, 1\n\
|
||||
movs r6, 0x3\n\
|
||||
negs r6, r6\n\
|
||||
mov r8, r6\n\
|
||||
mov r0, r8\n\
|
||||
ands r0, r5\n\
|
||||
orrs r0, r4\n\
|
||||
mov r4, r9\n\
|
||||
strb r0, [r4, 0xA]\n\
|
||||
ldr r6, [sp, 0x44]\n\
|
||||
ldrb r5, [r6, 0x4]\n\
|
||||
mov r4, r12\n\
|
||||
ands r4, r5\n\
|
||||
lsls r4, 2\n\
|
||||
movs r5, 0x5\n\
|
||||
negs r5, r5\n\
|
||||
ands r0, r5\n\
|
||||
orrs r0, r4\n\
|
||||
mov r4, r9\n\
|
||||
strb r0, [r4, 0xA]\n\
|
||||
mov r4, sp\n\
|
||||
ldrb r1, [r1, 0x8]\n\
|
||||
mov r0, r12\n\
|
||||
ands r0, r1\n\
|
||||
lsls r0, 2\n\
|
||||
ldrb r1, [r4, 0xB]\n\
|
||||
ands r5, r1\n\
|
||||
orrs r5, r0\n\
|
||||
strb r5, [r4, 0xB]\n\
|
||||
ldrb r1, [r2, 0x8]\n\
|
||||
mov r0, r12\n\
|
||||
ands r0, r1\n\
|
||||
lsls r0, 3\n\
|
||||
movs r1, 0x9\n\
|
||||
negs r1, r1\n\
|
||||
ands r1, r5\n\
|
||||
orrs r1, r0\n\
|
||||
strb r1, [r4, 0xB]\n\
|
||||
ldrb r2, [r3, 0x8]\n\
|
||||
mov r0, r12\n\
|
||||
ands r0, r2\n\
|
||||
lsls r0, 4\n\
|
||||
movs r2, 0x11\n\
|
||||
negs r2, r2\n\
|
||||
ands r2, r1\n\
|
||||
orrs r2, r0\n\
|
||||
strb r2, [r4, 0xB]\n\
|
||||
mov r3, sp\n\
|
||||
ldr r5, [sp, 0x40]\n\
|
||||
ldrb r0, [r5, 0x8]\n\
|
||||
mov r1, r12\n\
|
||||
ands r1, r0\n\
|
||||
lsls r1, 5\n\
|
||||
movs r0, 0x21\n\
|
||||
negs r0, r0\n\
|
||||
ands r0, r2\n\
|
||||
orrs r0, r1\n\
|
||||
strb r0, [r3, 0xB]\n\
|
||||
mov r2, sp\n\
|
||||
ldrb r1, [r6, 0x8]\n\
|
||||
mov r6, r12\n\
|
||||
ands r6, r1\n\
|
||||
lsls r1, r6, 6\n\
|
||||
mov r3, r10\n\
|
||||
ands r0, r3\n\
|
||||
orrs r0, r1\n\
|
||||
strb r0, [r2, 0xB]\n\
|
||||
ldr r4, [sp, 0x1C]\n\
|
||||
lsrs r3, r4, 21\n\
|
||||
ldrb r1, [r2, 0xA]\n\
|
||||
movs r0, 0x7\n\
|
||||
ands r0, r1\n\
|
||||
orrs r0, r3\n\
|
||||
strb r0, [r2, 0xA]\n\
|
||||
mov r1, sp\n\
|
||||
ldr r5, [sp, 0x4C]\n\
|
||||
movs r6, 0x1\n\
|
||||
ands r5, r6\n\
|
||||
lsls r2, r5, 1\n\
|
||||
ldrb r0, [r1, 0xB]\n\
|
||||
mov r3, r8\n\
|
||||
ands r3, r0\n\
|
||||
orrs r3, r2\n\
|
||||
mov r8, r3\n\
|
||||
strb r3, [r1, 0xB]\n\
|
||||
mov r0, sp\n\
|
||||
ldr r4, [sp, 0x50]\n\
|
||||
ands r4, r6\n\
|
||||
mov r5, r8\n\
|
||||
ands r5, r7\n\
|
||||
orrs r5, r4\n\
|
||||
strb r5, [r0, 0xB]\n\
|
||||
bl RfuPrepareSend0x2f00\n\
|
||||
add sp, 0x20\n\
|
||||
pop {r3-r5}\n\
|
||||
mov r8, r3\n\
|
||||
mov r9, r4\n\
|
||||
mov r10, r5\n\
|
||||
pop {r4-r7}\n\
|
||||
pop {r0}\n\
|
||||
bx r0\n\
|
||||
");
|
||||
}
|
||||
#endif
|
||||
|
||||
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 *arg6, u32 *arg7, u32 *arg8)
|
||||
{
|
||||
struct UnkPacket2 * packet;
|
||||
struct DodrioSubstruct_31A0_14 * ptr = &arg0->unk14;
|
||||
|
||||
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
|
||||
return 0;
|
||||
|
||||
packet = (void *)&gRecvCmds[0][1];
|
||||
if (packet->id == 2)
|
||||
{
|
||||
ptr->unkB[0] = packet->unk1_0;
|
||||
ptr->unkB[1] = packet->unk1_1;
|
||||
ptr->unkB[2] = packet->unk2_0;
|
||||
ptr->unkB[3] = packet->unk2_1;
|
||||
ptr->unkB[4] = packet->unk3_0;
|
||||
ptr->unkB[5] = packet->unk3_1;
|
||||
ptr->unkB[6] = packet->unk4_0;
|
||||
ptr->unkB[7] = packet->unk4_1;
|
||||
ptr->unkB[8] = packet->unk5_0;
|
||||
ptr->unkB[9] = packet->unk5_1;
|
||||
ptr->unkB[10] = packet->unk1_0;
|
||||
|
||||
ptr->unk0[0] = packet->unk6_0;
|
||||
ptr->unk0[1] = packet->unk6_1;
|
||||
ptr->unk0[2] = packet->unk6_2;
|
||||
ptr->unk0[3] = packet->unk6_3;
|
||||
ptr->unk0[4] = packet->unk7_0;
|
||||
ptr->unk0[5] = packet->unk7_1;
|
||||
ptr->unk0[6] = packet->unk7_2;
|
||||
ptr->unk0[7] = packet->unk7_3;
|
||||
ptr->unk0[8] = packet->unk8_0;
|
||||
ptr->unk0[9] = packet->unk8_1;
|
||||
ptr->unk0[10] = packet->unk6_0;
|
||||
|
||||
arg1->unk0 = packet->unk8_2;
|
||||
arg1->unk4 = packet->unk9_3;
|
||||
arg1->unk8 = packet->unkB_2;
|
||||
|
||||
arg2->unk0 = packet->unk8_3;
|
||||
arg2->unk4 = packet->unk9_4;
|
||||
arg2->unk8 = packet->unkB_3;
|
||||
|
||||
arg3->unk0 = packet->unk9_0;
|
||||
arg3->unk4 = packet->unkA_0;
|
||||
arg3->unk8 = packet->unkB_4;
|
||||
|
||||
arg4->unk0 = packet->unk9_1;
|
||||
arg4->unk4 = packet->unkA_1;
|
||||
arg4->unk8 = packet->unkB_5;
|
||||
|
||||
arg5->unk0 = packet->unk9_2;
|
||||
arg5->unk4 = packet->unkA_2;
|
||||
arg5->unk8 = packet->unkB_6;
|
||||
|
||||
*arg6 = packet->unkA_3;
|
||||
*arg7 = packet->unkB_1;
|
||||
*arg8 = packet->unkB_0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct UnkPacket3
|
||||
{
|
||||
u8 id;
|
||||
u8 ALIGNED(4) unk4;
|
||||
};
|
||||
|
||||
void sub_815AAD8(u8 arg0)
|
||||
{
|
||||
struct UnkPacket3 packet;
|
||||
packet.id = 3;
|
||||
packet.unk4 = arg0;
|
||||
RfuPrepareSend0x2f00(&packet);
|
||||
}
|
||||
|
||||
u32 sub_815AB04(u32 arg0, u8 *arg1)
|
||||
{
|
||||
struct UnkPacket3 * packet;
|
||||
|
||||
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
|
||||
return 0;
|
||||
|
||||
packet = (void *)&gRecvCmds[arg0][1];
|
||||
if (packet->id == 3)
|
||||
{
|
||||
*arg1 = packet->unk4;
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct UnkPacket4
|
||||
{
|
||||
u8 id;
|
||||
u32 unk4;
|
||||
};
|
||||
|
||||
void sub_815AB3C(u32 arg0)
|
||||
{
|
||||
struct UnkPacket4 packet;
|
||||
packet.id = 4;
|
||||
packet.unk4 = arg0;
|
||||
RfuPrepareSend0x2f00(&packet);
|
||||
}
|
||||
|
||||
u32 sub_815AB60(u32 arg0)
|
||||
{
|
||||
struct UnkPacket4 * packet;
|
||||
|
||||
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
|
||||
return 0;
|
||||
|
||||
packet = (void *)&gRecvCmds[arg0][1];
|
||||
if (packet->id == 4)
|
||||
return packet->unk4;
|
||||
|
||||
return 0;
|
||||
}
|
||||
+2
-2
@@ -1536,7 +1536,7 @@ static void PlaceListMenuCursor(bool8 isActive)
|
||||
{
|
||||
u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId);
|
||||
if (isActive == TRUE)
|
||||
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor);
|
||||
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gText_SelectorArrow2);
|
||||
else
|
||||
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_White, 0, gFameCheckerText_ListMenuCursor);
|
||||
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_White, 0, gText_SelectorArrow2);
|
||||
}
|
||||
|
||||
+1
-1
@@ -1085,7 +1085,7 @@ void PlaceListMenuCursor(void)
|
||||
u8 glyphHeight = GetFontAttribute(2, 1) + 1;
|
||||
u8 x = gHelpSystemListMenu.sub.left;
|
||||
u8 y = gHelpSystemListMenu.sub.top + glyphHeight * gHelpSystemListMenu.cursorPos;
|
||||
HelpSystem_PrintTextAt(gFameCheckerText_ListMenuCursor, x, y);
|
||||
HelpSystem_PrintTextAt(gText_SelectorArrow2, x, y);
|
||||
}
|
||||
|
||||
void sub_813C860(u8 i)
|
||||
|
||||
+1
-1
@@ -740,7 +740,7 @@ static void bag_menu_print_cursor(u8 y, u8 colorIdx)
|
||||
}
|
||||
else
|
||||
{
|
||||
BagPrintTextOnWindow(0, 2, gFameCheckerText_ListMenuCursor, 1, y, 0, 0, 0, colorIdx);
|
||||
BagPrintTextOnWindow(0, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -577,7 +577,7 @@ static void ItemPc_PrintOrRemoveCursorAt(u8 y, u8 colorIdx)
|
||||
}
|
||||
else
|
||||
{
|
||||
ItemPc_AddTextPrinterParameterized(0, 2, gFameCheckerText_ListMenuCursor, 0, y, 0, 0, 0, colorIdx);
|
||||
ItemPc_AddTextPrinterParameterized(0, 2, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -413,7 +413,7 @@ static void ListMenuDrawCursor(struct ListMenu *list)
|
||||
switch (list->template.cursorKind)
|
||||
{
|
||||
case 0:
|
||||
ListMenuPrint(list, gFameCheckerText_ListMenuCursor, x, y);
|
||||
ListMenuPrint(list, gText_SelectorArrow2, x, y);
|
||||
break;
|
||||
case 1:
|
||||
break;
|
||||
|
||||
+2
-2
@@ -303,7 +303,7 @@ static void Menu_RedrawCursor(u8 oldPos, u8 newPos)
|
||||
width = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
|
||||
height = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
|
||||
FillWindowPixelRect(sMenu.windowId, 1, sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height);
|
||||
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gFameCheckerText_ListMenuCursor, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0);
|
||||
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow2, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0);
|
||||
}
|
||||
|
||||
u8 Menu_MoveCursor(s8 cursorDelta)
|
||||
@@ -645,7 +645,7 @@ static void MultichoiceGrid_RedrawCursor(u8 oldCursorPos, u8 newCursorPos)
|
||||
FillWindowPixelRect(sMenu.windowId, PIXEL_FILL(1), xPos, yPos, cursorWidth, cursorHeight);
|
||||
xPos = (newCursorPos % sMenu.columns) * sMenu.optionWidth + sMenu.left;
|
||||
yPos = (newCursorPos / sMenu.columns) * sMenu.optionHeight + sMenu.top;
|
||||
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gFameCheckerText_ListMenuCursor, xPos, yPos, 0, 0);
|
||||
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow2, xPos, yPos, 0, 0);
|
||||
}
|
||||
|
||||
static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY)
|
||||
|
||||
+1
-1
@@ -668,7 +668,7 @@ static void BuyMenuPrintCursorAtYPosition(u8 y, u8 a1)
|
||||
}
|
||||
else
|
||||
{
|
||||
BuyMenuPrint(4, 2, gFameCheckerText_ListMenuCursor, 1, y, 0, 0, 0, a1);
|
||||
BuyMenuPrint(4, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, a1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+15
-14
@@ -6,6 +6,7 @@
|
||||
#include "m4a.h"
|
||||
#include "main.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/fanfares.h"
|
||||
#include "task.h"
|
||||
|
||||
struct Fanfare
|
||||
@@ -41,20 +42,20 @@ extern struct ToneData gCryTable[];
|
||||
extern struct ToneData gCryTable2[];
|
||||
|
||||
static const struct Fanfare sFanfares[] = {
|
||||
{ MUS_FANFA1, 80 },
|
||||
{ MUS_FANFA4, 160 },
|
||||
{ MUS_FANFA5, 220 },
|
||||
{ MUS_ME_WAZA, 220 },
|
||||
{ MUS_ME_ASA, 160 },
|
||||
{ MUS_ME_BACHI, 340 },
|
||||
{ MUS_ME_WASURE, 180 },
|
||||
{ MUS_ME_KINOMI, 120 },
|
||||
{ MUS_ME_B_BIG, 250 },
|
||||
{ MUS_ME_B_SMALL, 150 },
|
||||
{ MUS_ME_ZANNEN, 160 },
|
||||
{ MUS_POKEFUE, 450 },
|
||||
{ MUS_FAN5, 170 },
|
||||
{ MUS_FAN2, 196 }
|
||||
[FANFARE_00] = { MUS_FANFA1, 80 },
|
||||
[FANFARE_01] = { MUS_FANFA4, 160 },
|
||||
[FANFARE_02] = { MUS_FANFA5, 220 },
|
||||
[FANFARE_03] = { MUS_ME_WAZA, 220 },
|
||||
[FANFARE_04] = { MUS_ME_ASA, 160 },
|
||||
[FANFARE_05] = { MUS_ME_BACHI, 340 },
|
||||
[FANFARE_06] = { MUS_ME_WASURE, 180 },
|
||||
[FANFARE_07] = { MUS_ME_KINOMI, 120 },
|
||||
[FANFARE_08] = { MUS_ME_B_BIG, 250 },
|
||||
[FANFARE_09] = { MUS_ME_B_SMALL, 150 },
|
||||
[FANFARE_10] = { MUS_ME_ZANNEN, 160 },
|
||||
[FANFARE_POKEFLUTE] = { MUS_POKEFUE, 450 },
|
||||
[FANFARE_KEY_ITEM] = { MUS_FAN5, 170 },
|
||||
[FANFARE_DEX_EVAL] = { MUS_FAN2, 196 }
|
||||
};
|
||||
|
||||
extern u16 SpeciesToCryId(u16);
|
||||
|
||||
+1
-1
@@ -152,7 +152,7 @@ const u8 gUnknown_841622C[] = _("{PLUS}");
|
||||
const u8 gUnknown_841622F[] = _("{ESCAPE 0x03}");
|
||||
const u8 gUnknown_8416233[] = _("{ID}{NO}");
|
||||
const u8 gUnknown_8416238[] = _("{PP}");
|
||||
const u8 gFameCheckerText_ListMenuCursor[] = _("▶");
|
||||
const u8 gText_SelectorArrow2[] = _("▶");
|
||||
const u8 gUnknown_841623D[] = _("YES\nNO");
|
||||
const u8 gText_GoBackToThePreviousMenu[] = _("Go back to the\nprevious menu.");
|
||||
const u8 gText_WhatWouldYouLikeToDo[] = _("What would you like to do?");
|
||||
|
||||
+1
-1
@@ -612,7 +612,7 @@ static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1)
|
||||
}
|
||||
else
|
||||
{
|
||||
AddTextPrinterParameterized_ColorByIndex(0, 2, gFameCheckerText_ListMenuCursor, 0, a0, 0, 0, 0, a1);
|
||||
AddTextPrinterParameterized_ColorByIndex(0, 2, gText_SelectorArrow2, 0, a0, 0, 0, 0, a1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-6
@@ -86,17 +86,12 @@ gUnknown_3002038: @ 3002038
|
||||
|
||||
.align 2
|
||||
.include "src/wireless_communication_status_screen.o"
|
||||
|
||||
.align 2
|
||||
gUnknown_3002044: @ 3002044
|
||||
.space 0x4
|
||||
|
||||
.include "src/dodrio_berry_picking.o"
|
||||
.align 3
|
||||
.include "src/ereader_helpers.o"
|
||||
|
||||
.align 3
|
||||
.include "src/digit_obj_util.o"
|
||||
|
||||
.align 3
|
||||
.include "asm/m4a_1.o"
|
||||
.align 3
|
||||
|
||||
+3
-22
@@ -449,29 +449,10 @@ gUnknown_203B170: @ 203B170
|
||||
.include "src/pokemon_jump_4.o"
|
||||
.align 2
|
||||
.include "src/berry_crush.o"
|
||||
|
||||
.align 2
|
||||
gUnknown_203F3E0: @ 203F3E0
|
||||
.space 0x4
|
||||
|
||||
gUnknown_203F3E4: @ 203F3E4
|
||||
.space 0x14
|
||||
|
||||
gUnknown_203F3F8: @ 203F3F8
|
||||
.space 0x8
|
||||
|
||||
gUnknown_203F400: @ 203F400
|
||||
.space 0x2C
|
||||
|
||||
gUnknown_203F42C: @ 203F42C
|
||||
.space 0x10
|
||||
|
||||
gUnknown_203F43C: @ 203F43C
|
||||
.space 0x4
|
||||
|
||||
gUnknown_203F440: @ 203F440
|
||||
.space 0x4
|
||||
|
||||
.include "src/dodrio_berry_picking.o"
|
||||
.align 2
|
||||
.include "src/dodrio_berry_picking_2.o"
|
||||
.align 2
|
||||
.include "src/teachy_tv.o"
|
||||
.align 2
|
||||
|
||||
Reference in New Issue
Block a user