through sub_800D294; fix sub_800CF34

This commit is contained in:
PikalaxALT
2017-11-29 23:58:48 -05:00
parent 295e45c788
commit c906978692
3 changed files with 89 additions and 452 deletions

View File

@@ -5,141 +5,6 @@
.text
thumb_func_start sub_800D20C
sub_800D20C: @ 800D20C
push {r4,r5,lr}
ldr r5, =gUnknown_03004140
ldrb r0, [r5, 0x4]
cmp r0, 0xF
bne _0800D258
ldr r1, =gUnknown_03007880
ldrb r2, [r5, 0x10]
lsls r0, r2, 2
adds r0, r1
ldr r0, [r0]
ldrh r0, [r0]
cmp r0, 0x26
bne _0800D258
movs r4, 0
strb r4, [r5, 0x5]
strb r4, [r5, 0x4]
movs r0, 0x4
adds r1, r2, 0
bl rfu_clearSlot
adds r2, r5, 0
adds r2, 0x24
movs r1, 0x1
ldrb r0, [r5, 0x10]
lsls r1, r0
ldrb r0, [r2]
bics r0, r1
strb r0, [r2]
ldrb r0, [r5, 0x10]
lsls r0, 1
adds r1, r5, 0
adds r1, 0x28
adds r0, r1
strh r4, [r0]
movs r0, 0x24
movs r1, 0
bl sub_800D30C
_0800D258:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_800D20C
thumb_func_start sub_800D268
sub_800D268: @ 800D268
push {lr}
ldr r1, =gUnknown_03004140
ldrb r0, [r1, 0x6]
cmp r0, 0
bne _0800D28C
ldrb r0, [r1, 0xA]
cmp r0, 0x1
bne _0800D28C
ldrb r0, [r1, 0x4]
strb r0, [r1, 0x11]
ldrb r0, [r1, 0x5]
strb r0, [r1, 0x12]
movs r0, 0x10
strb r0, [r1, 0x4]
movs r0, 0x11
strb r0, [r1, 0x5]
movs r0, 0x2
strb r0, [r1, 0xA]
_0800D28C:
pop {r0}
bx r0
.pool
thumb_func_end sub_800D268
thumb_func_start sub_800D294
sub_800D294: @ 800D294
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
movs r6, 0
movs r5, 0
ldr r1, =gUnknown_03007890
ldr r0, [r1]
ldrb r0, [r0, 0x8]
cmp r6, r0
bcs _0800D2F0
mov r8, r0
ldr r0, =gUnknown_03004140
mov r10, r0
mov r9, r1
_0800D2B4:
mov r1, r10
ldr r3, [r1, 0x20]
ldrh r2, [r3]
adds r0, r5, 0x1
mov r12, r0
ldr r1, =0x0000ffff
cmp r2, r1
beq _0800D2E6
mov r1, r9
ldr r0, [r1]
lsls r1, r5, 5
adds r0, r1
ldrh r4, [r0, 0x18]
ldr r7, =0x0000ffff
movs r1, 0x1
lsls r1, r5
_0800D2D4:
cmp r4, r2
bne _0800D2DE
orrs r6, r1
lsls r0, r6, 24
lsrs r6, r0, 24
_0800D2DE:
adds r3, 0x2
ldrh r2, [r3]
cmp r2, r7
bne _0800D2D4
_0800D2E6:
mov r1, r12
lsls r0, r1, 24
lsrs r5, r0, 24
cmp r5, r8
bcc _0800D2B4
_0800D2F0:
adds r0, r6, 0
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_800D294
thumb_func_start sub_800D30C
sub_800D30C: @ 800D30C
push {r4,lr}