nonmatching sub_8110BE8

This commit is contained in:
PikalaxALT
2018-10-10 19:43:12 -04:00
parent 572929c352
commit 7e35bd4266
3 changed files with 216 additions and 178 deletions
-175
View File
@@ -5,181 +5,6 @@
.text
thumb_func_start sub_8110BE8
sub_8110BE8: @ 8110BE8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
lsls r0, 24
lsrs r0, 24
ldr r4, _08110C54 @ =gSaveBlock1Ptr
movs r1, 0xCD
lsls r1, 3
muls r0, r1
movs r1, 0x98
lsls r1, 5
adds r0, r1
ldr r1, [r4]
adds r7, r1, r0
adds r0, r7, 0
bl sub_815A008
movs r6, 0
mov r9, r4
movs r2, 0x8D
lsls r2, 3
mov r8, r2
ldr r3, _08110C58 @ =0x0000046a
mov r10, r3
_08110C1C:
mov r4, r9
ldr r1, [r4]
lsls r2, r6, 1
adds r0, r2, r6
lsls r0, 3
adds r1, r0
ldr r0, _08110C5C @ =0x000008e4
adds r1, r0
ldrh r4, [r1]
movs r3, 0
ldrsh r0, [r1, r3]
mov r12, r2
cmp r0, 0
bge _08110C64
lsls r3, r6, 2
adds r2, r7, r3
negs r0, r0
mov r4, r8
adds r1, r2, r4
strb r0, [r1]
ldr r0, _08110C60 @ =0x00000469
adds r2, r0
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
b _08110C7C
.align 2, 0
_08110C54: .4byte gSaveBlock1Ptr
_08110C58: .4byte 0x0000046a
_08110C5C: .4byte 0x000008e4
_08110C60: .4byte 0x00000469
_08110C64:
lsls r3, r6, 2
adds r1, r7, r3
mov r2, r8
adds r0, r1, r2
strb r4, [r0]
ldr r4, _08110CBC @ =0x00000469
adds r1, r4
ldrb r2, [r1]
movs r0, 0x2
negs r0, r0
ands r0, r2
strb r0, [r1]
_08110C7C:
adds r5, r3, 0
mov r1, r9
ldr r0, [r1]
mov r2, r12
adds r1, r2, r6
lsls r1, 3
adds r0, r1
ldr r3, _08110CC0 @ =0x000008e6
adds r1, r0, r3
ldrh r2, [r1]
movs r4, 0
ldrsh r0, [r1, r4]
cmp r0, 0
bge _08110CC8
adds r3, r7, r5
adds r1, r0, 0
negs r1, r1
lsls r1, 24
mov r2, r8
adds r4, r3, r2
lsrs r1, 15
ldr r0, [r4]
ldr r2, _08110CC4 @ =0xfffe01ff
ands r0, r2
orrs r0, r1
str r0, [r4]
add r3, r10
ldrb r0, [r3]
movs r1, 0x2
orrs r0, r1
b _08110CE6
.align 2, 0
_08110CBC: .4byte 0x00000469
_08110CC0: .4byte 0x000008e6
_08110CC4: .4byte 0xfffe01ff
_08110CC8:
adds r3, r7, r5
lsls r2, 24
mov r0, r8
adds r4, r3, r0
lsrs r2, 15
ldr r0, [r4]
ldr r1, _08110D38 @ =0xfffe01ff
ands r0, r1
orrs r0, r2
str r0, [r4]
add r3, r10
ldrb r1, [r3]
movs r0, 0x3
negs r0, r0
ands r0, r1
_08110CE6:
strb r0, [r3]
adds r5, r7, r5
mov r1, r9
ldr r0, [r1]
mov r2, r12
adds r3, r2, r6
lsls r3, 3
adds r0, r3
ldr r4, _08110D3C @ =0x000008e8
adds r0, r4
ldrb r1, [r0]
mov r0, r10
adds r4, r5, r0
lsls r1, 2
ldrb r2, [r4]
movs r0, 0x3
ands r0, r2
orrs r0, r1
strb r0, [r4]
mov r1, r9
ldr r0, [r1]
adds r0, r3
ldr r2, _08110D40 @ =0x000008e9
adds r0, r2
ldrb r0, [r0]
ldr r3, _08110D44 @ =0x0000046b
adds r5, r3
strb r0, [r5]
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
cmp r6, 0x3F
bhi _08110D2A
b _08110C1C
_08110D2A:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08110D38: .4byte 0xfffe01ff
_08110D3C: .4byte 0x000008e8
_08110D40: .4byte 0x000008e9
_08110D44: .4byte 0x0000046b
thumb_func_end sub_8110BE8
thumb_func_start sub_8110D48
sub_8110D48: @ 8110D48
push {r4,r5,lr}