ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Several nonmatching functions

Browse Source 
Huge and difficult.
This commit is contained in:
Phlosioneer 2019-03-06 22:27:30 -05:00
parent 4345ba8e6c
commit 0da83abad2
5 changed files with 1110 additions and 960 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

952
asm/menu_unknown.s
View File

@ -6,958 +6,6 @@
.text .text
thumb_func_start sub_81D2108
sub_81D2108: @ 81D2108
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
adds r6, r0, 0
movs r1, 0xD5
lsls r1, 2
adds r0, r6, r1
ldrb r0, [r0]
cmp r0, 0
beq _081D21BE
adds r0, r6, 0
bl sub_81D24A4
adds r0, r6, 0
bl sub_81D2634
movs r7, 0
ldr r5, =gScanlineEffectRegBuffers
mov r12, r5
movs r0, 0xF0
lsls r0, 3
add r0, r12
mov r9, r0
movs r1, 0xA0
lsls r1, 1
adds r1, r6, r1
str r1, [sp]
ldr r5, =0x0000ffff
mov r8, r5
movs r0, 0xA1
lsls r0, 1
adds r0, r6, r0
str r0, [sp, 0x4]
movs r1, 0x92
lsls r1, 2
adds r1, r6, r1
str r1, [sp, 0x8]
ldr r5, =0x0000024a
adds r5, r6
mov r10, r5
_081D215E:
adds r2, r7, 0
adds r2, 0x37
lsls r3, r2, 2
mov r0, r9
adds r0, r3, r0
str r0, [sp, 0xC]
add r3, r12
lsls r4, r7, 2
ldr r1, [sp]
adds r0, r1, r4
ldrh r0, [r0]
lsls r0, 8
ldr r5, [sp, 0x4]
adds r1, r5, r4
ldrh r1, [r1]
orrs r0, r1
strh r0, [r3]
mov r1, r8
ands r0, r1
ldr r5, [sp, 0xC]
strh r0, [r5]
lsls r2, 1
adds r2, 0x1
lsls r2, 1
mov r0, r9
adds r3, r2, r0
add r2, r12
ldr r1, [sp, 0x8]
adds r0, r1, r4
ldrh r0, [r0]
lsls r0, 8
add r4, r10
ldrh r1, [r4]
orrs r0, r1
strh r0, [r2]
mov r5, r8
ands r0, r5
strh r0, [r3]
adds r0, r7, 0x1
lsls r0, 16
lsrs r7, r0, 16
cmp r7, 0x41
bls _081D215E
movs r0, 0xD5
lsls r0, 2
adds r1, r6, r0
movs r0, 0
strb r0, [r1]
_081D21BE:
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D2108
thumb_func_start sub_81D21DC
sub_81D21DC: @ 81D21DC
push {r4,r5,lr}
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x3
bls _081D21E8
movs r1, 0
_081D21E8:
movs r0, 0x1
lsls r0, r1
movs r5, 0x1F
bics r5, r0
movs r0, 0x40
movs r1, 0xF0
bl SetGpuReg
movs r0, 0x42
movs r1, 0x9B
bl SetGpuReg
ldr r4, =0x00003879
movs r0, 0x44
adds r1, r4, 0
bl SetGpuReg
movs r0, 0x46
adds r1, r4, 0
bl SetGpuReg
ldr r1, =0x00003f3f
movs r0, 0x48
bl SetGpuReg
movs r0, 0x4A
adds r1, r5, 0
bl SetGpuReg
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D21DC
thumb_func_start sub_81D2230
sub_81D2230: @ 81D2230
push {r4-r7,lr}
mov r12, r0
movs r4, 0
movs r7, 0x96
lsls r7, 1
add r7, r12
ldr r6, =0x00000352
add r6, r12
mov r5, r12
adds r5, 0x64
_081D2244:
lsls r2, r4, 2
adds r3, r7, r2
ldrh r1, [r6]
lsls r0, r1, 2
adds r0, r1
lsls r0, 2
adds r2, r0
adds r2, r5, r2
ldr r0, [r2]
str r0, [r3]
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x4
bls _081D2244
movs r1, 0xD5
lsls r1, 2
add r1, r12
movs r0, 0x1
strb r0, [r1]
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D2230
thumb_func_start sub_81D2278
sub_81D2278: @ 81D2278
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x18
str r0, [sp]
adds r6, r1, 0
adds r5, r2, 0
str r3, [sp, 0x4]
ldr r0, [sp, 0x38]
ldr r7, [sp, 0x3C]
lsls r0, 24
lsrs r0, 24
mov r9, r0
movs r0, 0
str r0, [sp, 0xC]
ldrh r0, [r5, 0x2]
ldrh r1, [r3, 0x2]
cmp r0, r1
bcs _081D22B2
adds r2, r0, 0
mov r10, r2
ldrh r0, [r3, 0x2]
ldrh r1, [r5]
lsls r4, r1, 10
ldrh r3, [r3]
str r3, [sp, 0x8]
b _081D22C6
_081D22B2:
ldrh r0, [r5, 0x2]
ldr r1, [sp, 0x4]
ldrh r1, [r1, 0x2]
mov r10, r1
ldr r2, [sp, 0x4]
ldrh r1, [r2]
lsls r4, r1, 10
ldrh r3, [r5]
str r3, [sp, 0x8]
mov r2, r10
_081D22C6:
subs r0, r2
lsls r0, 16
lsrs r0, 16
mov r8, r0
cmp r0, 0
beq _081D22DE
subs r0, r3, r1
lsls r0, 10
mov r1, r8
bl __divsi3
str r0, [sp, 0xC]
_081D22DE:
mov r0, r8
adds r0, 0x1
lsls r0, 16
lsrs r0, 16
mov r8, r0
cmp r7, 0
bne _081D2328
mov r0, r10
subs r0, 0x38
lsls r0, 2
adds r6, r0
movs r5, 0
mov r3, r9
lsls r3, 1
mov r12, r3
ldr r0, [sp, 0x8]
add r0, r9
str r0, [sp, 0x10]
cmp r7, r8
bcs _081D23B6
movs r7, 0x1
_081D2308:
adds r2, r3, r6
asrs r1, r4, 10
asrs r0, r4, 9
ands r0, r7
adds r1, r0
add r1, r9
strh r1, [r2]
ldr r1, [sp, 0xC]
adds r4, r1
adds r6, 0x4
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r8
bcc _081D2308
b _081D23B6
_081D2328:
ldr r2, [sp, 0xC]
cmp r2, 0
ble _081D23C0
mov r0, r10
subs r0, 0x38
lsls r0, 2
adds r7, r0
movs r5, 0
mov r3, r9
lsls r3, 1
mov r12, r3
ldr r0, [sp, 0x8]
add r0, r9
str r0, [sp, 0x10]
cmp r5, r8
bcs _081D237A
ldr r0, =0x00026bff
cmp r4, r0
bgt _081D237A
mov r1, r12
str r1, [sp, 0x14]
_081D2352:
ldr r3, [sp, 0x14]
adds r2, r3, r7
asrs r1, r4, 10
asrs r0, r4, 9
movs r3, 0x1
ands r0, r3
adds r1, r0
add r1, r9
strh r1, [r2]
ldr r0, [sp, 0xC]
adds r4, r0
adds r7, 0x4
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r8
bcs _081D237A
ldr r1, =0x00026bff
cmp r4, r1
ble _081D2352
_081D237A:
mov r2, r10
adds r1, r2, r5
ldr r3, [sp]
movs r2, 0xD4
lsls r2, 2
adds r0, r3, r2
strh r1, [r0]
ldrh r0, [r0]
subs r0, 0x38
lsls r0, 2
adds r6, r0
cmp r5, r8
bcs _081D23B6
mov r3, r12
movs r7, 0x1
_081D2398:
adds r2, r3, r6
asrs r1, r4, 10
asrs r0, r4, 9
ands r0, r7
adds r1, r0
add r1, r9
strh r1, [r2]
ldr r0, [sp, 0xC]
adds r4, r0
adds r6, 0x4
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r8
bcc _081D2398
_081D23B6:
subs r0, r6, 0x4
b _081D248C
.pool
_081D23C0:
ldr r1, [sp, 0xC]
cmp r1, 0
bge _081D2464
mov r0, r10
subs r0, 0x38
lsls r0, 2
adds r6, r0
movs r5, 0
mov r2, r9
lsls r2, 1
mov r12, r2
ldr r3, [sp, 0x8]
add r3, r9
str r3, [sp, 0x10]
cmp r5, r8
bcs _081D241E
adds r3, r2, r6
asrs r1, r4, 10
asrs r0, r4, 9
movs r2, 0x1
ands r0, r2
adds r1, r0
add r1, r9
strh r1, [r3]
b _081D2414
_081D23F2:
ldr r0, [sp, 0xC]
adds r4, r0
adds r6, 0x4
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r8
bcs _081D241E
mov r1, r12
adds r3, r1, r6
asrs r2, r4, 10
asrs r0, r4, 9
movs r1, 0x1
ands r0, r1
adds r2, r0
add r2, r9
strh r2, [r3]
_081D2414:
ldr r0, =0x00026bff
cmp r4, r0
bgt _081D23F2
movs r0, 0x9B
strh r0, [r3]
_081D241E:
mov r2, r10
adds r1, r2, r5
ldr r3, [sp]
movs r2, 0xD4
lsls r2, 2
adds r0, r3, r2
strh r1, [r0]
ldrh r0, [r0]
subs r0, 0x38
lsls r0, 2
adds r7, r0
cmp r5, r8
bcs _081D245A
mov r3, r12
movs r6, 0x1
_081D243C:
adds r2, r3, r7
asrs r1, r4, 10
asrs r0, r4, 9
ands r0, r6
adds r1, r0
add r1, r9
strh r1, [r2]
ldr r0, [sp, 0xC]
adds r4, r0
adds r7, 0x4
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r8
bcc _081D243C
_081D245A:
subs r0, r7, 0x4
b _081D248C
.pool
_081D2464:
ldr r1, [sp]
movs r2, 0xD4
lsls r2, 2
adds r0, r1, r2
mov r3, r10
strh r3, [r0]
mov r0, r10
subs r0, 0x38
lsls r0, 2
adds r6, r0
adds r7, r0
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r6, 0x2]
ldr r1, [sp, 0x4]
ldrh r0, [r1]
strh r0, [r7]
movs r0, 0x9B
strh r0, [r7, 0x2]
b _081D2494
_081D248C:
add r0, r12
mov r2, sp
ldrh r2, [r2, 0x10]
strh r2, [r0]
_081D2494:
add sp, 0x18
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81D2278
thumb_func_start sub_81D24A4
sub_81D24A4: @ 81D24A4
push {r4-r7,lr}
sub sp, 0x8
adds r4, r0, 0
movs r0, 0x97
lsls r0, 1
adds r2, r4, r0
movs r3, 0x99
lsls r3, 1
adds r1, r4, r3
ldrh r0, [r2]
ldrh r3, [r1]
cmp r0, r3
bcs _081D24E0
adds r7, r0, 0
movs r0, 0xA0
lsls r0, 1
adds r1, r4, r0
movs r3, 0x96
lsls r3, 1
adds r2, r4, r3
subs r0, 0x10
adds r3, r4, r0
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
adds r0, r4, 0
bl sub_81D2278
b _081D2500
_081D24E0:
ldrh r7, [r1]
movs r2, 0xA0
lsls r2, 1
adds r1, r4, r2
movs r3, 0x98
lsls r3, 1
adds r2, r4, r3
movs r0, 0x96
lsls r0, 1
adds r3, r4, r0
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
adds r0, r4, 0
bl sub_81D2278
_081D2500:
movs r1, 0xA0
lsls r1, 1
adds r5, r4, r1
movs r3, 0x98
lsls r3, 1
adds r2, r4, r3
movs r0, 0x9A
lsls r0, 1
adds r6, r4, r0
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
adds r0, r4, 0
adds r1, r5, 0
adds r3, r6, 0
bl sub_81D2278
movs r2, 0
movs r1, 0x9B
lsls r1, 1
adds r0, r4, r1
movs r3, 0x9D
lsls r3, 1
adds r1, r4, r3
ldrh r0, [r0]
ldrh r1, [r1]
cmp r0, r1
bhi _081D253C
movs r2, 0x1
_081D253C:
movs r0, 0x9C
lsls r0, 1
adds r3, r4, r0
str r2, [sp]
movs r1, 0x92
lsls r1, 2
adds r0, r4, r1
str r0, [sp, 0x4]
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
bl sub_81D2278
movs r2, 0x38
cmp r2, r7
bcs _081D257E
adds r6, r5, 0
movs r3, 0
movs r0, 0xA1
lsls r0, 1
adds r5, r4, r0
_081D2566:
adds r0, r2, 0
subs r0, 0x38
lsls r0, 2
adds r1, r6, r0
strh r3, [r1]
adds r0, r5, r0
strh r3, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, r7
bcc _081D2566
_081D257E:
movs r1, 0x97
lsls r1, 1
adds r0, r4, r1
ldrh r2, [r0]
movs r3, 0xD4
lsls r3, 2
adds r0, r4, r3
ldrh r1, [r0]
cmp r2, r1
bhi _081D25B2
movs r1, 0xA0
lsls r1, 1
adds r3, r4, r1
movs r5, 0x9B
adds r1, r0, 0
_081D259C:
adds r0, r2, 0
subs r0, 0x38
lsls r0, 2
adds r0, r3, r0
strh r5, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
ldrh r0, [r1]
cmp r2, r0
bls _081D259C
_081D25B2:
movs r2, 0x9B
lsls r2, 1
adds r1, r4, r2
movs r3, 0xD4
lsls r3, 2
adds r0, r4, r3
ldrh r0, [r0]
ldrh r1, [r1]
cmp r0, r1
bcs _081D25C8
adds r0, r1, 0
_081D25C8:
adds r0, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0x79
bhi _081D25F8
movs r0, 0xA0
lsls r0, 1
adds r6, r4, r0
movs r3, 0
movs r1, 0xA1
lsls r1, 1
adds r5, r4, r1
_081D25E0:
adds r0, r2, 0
subs r0, 0x38
lsls r0, 2
adds r1, r6, r0
strh r3, [r1]
adds r0, r5, r0
strh r3, [r0]
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0x79
bls _081D25E0
_081D25F8:
movs r2, 0x38
movs r3, 0xA0
lsls r3, 1
adds r5, r4, r3
movs r0, 0xA1
lsls r0, 1
adds r4, r0
movs r6, 0x9B
_081D2608:
adds r0, r2, 0
subs r0, 0x38
lsls r1, r0, 2
adds r3, r5, r1
ldrh r0, [r3]
cmp r0, 0
bne _081D2620
adds r0, r4, r1
ldrh r0, [r0]
cmp r0, 0
beq _081D2620
strh r6, [r3]
_081D2620:
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0x79
bls _081D2608
add sp, 0x8
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81D24A4
thumb_func_start sub_81D2634
sub_81D2634: @ 81D2634
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
movs r0, 0x97
lsls r0, 1
adds r2, r4, r0
movs r3, 0x9F
lsls r3, 1
adds r1, r4, r3
ldrh r0, [r2]
ldrh r5, [r1]
cmp r0, r5
bcs _081D266E
adds r6, r0, 0
movs r0, 0x92
lsls r0, 2
adds r1, r4, r0
subs r3, 0x12
adds r2, r4, r3
movs r5, 0x9E
lsls r5, 1
adds r3, r4, r5
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
adds r0, r4, 0
bl sub_81D2278
b _081D2690
_081D266E:
ldrh r6, [r1]
movs r0, 0x92
lsls r0, 2
adds r1, r4, r0
movs r3, 0x9E
lsls r3, 1
adds r2, r4, r3
movs r5, 0x96
lsls r5, 1
adds r3, r4, r5
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
adds r0, r4, 0
bl sub_81D2278
_081D2690:
movs r0, 0x92
lsls r0, 2
adds r5, r4, r0
movs r1, 0x9E
lsls r1, 1
adds r2, r4, r1
movs r0, 0x9C
lsls r0, 1
adds r3, r4, r0
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
adds r0, r4, 0
adds r1, r5, 0
bl sub_81D2278
cmp r6, 0x38
ble _081D26C8
movs r0, 0
adds r1, r5, 0
adds r2, r6, 0
subs r2, 0x38
_081D26BC:
strh r0, [r1]
strh r0, [r1, 0x2]
adds r1, 0x4
subs r2, 0x1
cmp r2, 0
bne _081D26BC
_081D26C8:
movs r1, 0x97
lsls r1, 1
adds r0, r4, r1
ldrh r2, [r0]
movs r3, 0xD4
lsls r3, 2
adds r0, r4, r3
ldrh r5, [r0]
cmp r2, r5
bgt _081D26F6
movs r3, 0x9B
adds r1, r0, 0
lsls r0, r2, 2
movs r5, 0xB5
lsls r5, 1
adds r0, r5
adds r0, r4
_081D26EA:
strh r3, [r0]
adds r0, 0x4
adds r2, 0x1
ldrh r5, [r1]
cmp r2, r5
ble _081D26EA
_081D26F6:
movs r1, 0x9D
lsls r1, 1
adds r0, r4, r1
ldrh r0, [r0]
adds r1, r0, 0x1
movs r2, 0xD4
lsls r2, 2
adds r0, r4, r2
ldrh r0, [r0]
cmp r0, r1
bge _081D270E
adds r0, r1, 0
_081D270E:
adds r2, r0, 0
cmp r2, 0x79
bgt _081D272C
movs r1, 0
lsls r0, r2, 2
movs r3, 0xB4
lsls r3, 1
adds r0, r3
adds r0, r4
_081D2720:
strh r1, [r0]
strh r1, [r0, 0x2]
adds r0, 0x4
adds r2, 0x1
cmp r2, 0x79
ble _081D2720
_081D272C:
movs r3, 0
movs r5, 0x92
lsls r5, 2
adds r1, r4, r5
movs r2, 0x41
_081D2736:
ldrh r0, [r1]
ldrh r4, [r1, 0x2]
cmp r0, r4
bcc _081D2742
strh r3, [r1, 0x2]
strh r3, [r1]
_081D2742:
adds r1, 0x4
subs r2, 0x1
cmp r2, 0
bge _081D2736
add sp, 0x8
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_81D2634
thumb_func_start sub_81D2754
sub_81D2754: @ 81D2754
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
adds r6, r0, 0
mov r8, r1
ldr r1, =gUnknown_08625410
ldrb r0, [r6]
adds r0, r1
ldrb r2, [r0]
adds r6, 0x1
movs r0, 0x9B
mov r3, r8
strh r0, [r3]
movs r0, 0x5B
subs r0, r2
strh r0, [r3, 0x2]
movs r7, 0x40
movs r0, 0
mov r12, r0
movs r2, 0x1
mov r9, r2
ldr r3, =gSineTable
mov r10, r3
_081D2786:
adds r0, r7, 0
adds r0, 0x33
lsls r0, 24
lsrs r7, r0, 24
mov r1, r12
lsls r0, r1, 24
movs r2, 0xFF
lsls r2, 24
adds r0, r2
lsrs r3, r0, 24
mov r12, r3
cmp r0, 0
bge _081D27A4
movs r0, 0x4
mov r12, r0
_081D27A4:
mov r1, r12
lsls r0, r1, 24
asrs r4, r0, 24
cmp r4, 0x2
bne _081D27B4
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
_081D27B4:
ldrb r0, [r6]
ldr r2, =gUnknown_08625410
adds r0, r2
ldrb r2, [r0]
adds r6, 0x1
lsls r0, r4, 2
mov r1, r8
adds r3, r0, r1
adds r0, r7, 0
adds r0, 0x40
lsls r0, 1
add r0, r10
movs r1, 0
ldrsh r0, [r0, r1]
muls r0, r2
asrs r5, r0, 8
adds r0, r5, 0
adds r0, 0x9B
strh r0, [r3]
lsls r0, r7, 1
add r0, r10
movs r1, 0
ldrsh r0, [r0, r1]
adds r1, r2, 0
muls r1, r0
asrs r1, 8
movs r0, 0x5B
subs r0, r1
strh r0, [r3, 0x2]
cmp r4, 0x2
bgt _081D2800
cmp r2, 0x20
bne _081D27FA
cmp r4, 0x2
beq _081D2800
_081D27FA:
adds r0, r5, 0
adds r0, 0x9C
strh r0, [r3]
_081D2800:
mov r0, r9
adds r0, 0x1
lsls r0, 16
lsrs r0, 16
mov r9, r0
cmp r0, 0x4
bls _081D2786
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D2754
thumb_func_start InitMoveRelearnerWindows thumb_func_start InitMoveRelearnerWindows
InitMoveRelearnerWindows: @ 81D2824 InitMoveRelearnerWindows: @ 81D2824
push {r4,r5,lr} push {r4,r5,lr}

4
data/menu_unknown.s
View File

@ -3,8 +3,8 @@
.section .rodata .section .rodata
gUnknown_08625410:: @ 8625410 @gUnknown_08625410:: @ 8625410
.byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23 @ .byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23
gMoveRelearnerWindowTemplates:: @ 8625510s gMoveRelearnerWindowTemplates:: @ 8625510s
window_template 1, 1, 1, 16, 12, 0xF, 0x000A window_template 1, 1, 1, 16, 12, 0xF, 0x000A

8
include/menu_unknown.h
View File

@ -14,8 +14,10 @@ struct UnknownStruct_81D1ED4
u8 unk0[4][5]; u8 unk0[4][5];
struct UnknownSubStruct_81D1ED4 unk14[4][5]; struct UnknownSubStruct_81D1ED4 unk14[4][5];
struct UnknownSubStruct_81D1ED4 unk64[10][5]; struct UnknownSubStruct_81D1ED4 unk64[10][5];
struct UnknownSubStruct_81D1ED4 unk12C[4]; struct UnknownSubStruct_81D1ED4 unk12C[5];
u8 unk13C[0x216]; struct UnknownSubStruct_81D1ED4 unk13C[0x42];
struct UnknownSubStruct_81D1ED4 unk248[0x42];
u16 unk350;
u16 unk352; u16 unk352;
u8 unk354; u8 unk354;
u8 unk355; u8 unk355;
@ -37,7 +39,7 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0);
bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0);
void sub_81D3464(void *arg0); void sub_81D3464(void *arg0);
void sub_81D3480(void *arg0, u8 arg1); void sub_81D3480(void *arg0, u8 arg1);
void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, void *arg1); void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1);
void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]);
#endif // GUARD_MENU_UNKNOWN_H #endif // GUARD_MENU_UNKNOWN_H

1103
src/menu_unknown.c
View File

File diff suppressed because it is too large Load Diff

3
src/use_pokeblock.c
View File

@ -34,7 +34,6 @@ struct UsePokeblockSubStruct
struct UsePokeblockStruct struct UsePokeblockStruct
{ {
u8 field_0[0x7C58]; u8 field_0[0x7C58];
//u8 field_7C58[0x378];
struct UnknownStruct_81D1ED4 field_7C58; struct UnknownStruct_81D1ED4 field_7C58;
struct UsePokeblockSubStruct info; struct UsePokeblockSubStruct info;
}; };
@ -204,7 +203,7 @@ void sub_8166380(void)
gUnknown_0203BC90->field_50++; gUnknown_0203BC90->field_50++;
break; break;
case 11: case 11:
sub_81D2754(&gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]); sub_81D2754(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0]);
sub_81D20AC(&gUnknown_0203BCAC->field_7C58); sub_81D20AC(&gUnknown_0203BCAC->field_7C58);
gUnknown_0203BC90->field_50++; gUnknown_0203BC90->field_50++;
break; break;