This commit is contained in:
Aetias
2024-04-16 18:18:21 +02:00
parent 528d882355
commit d7d3c3675c
66 changed files with 13784 additions and 13784 deletions
+362 -362
View File
File diff suppressed because it is too large Load Diff
+2043 -2043
View File
File diff suppressed because it is too large Load Diff
+33 -33
View File
@@ -58,17 +58,17 @@ _020c3470:
.global _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
arm_func_start _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
_ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori: ; 0x020c3484
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r10, r0
mvn r3, #0
str r3, [r10]
ldr r0, _020c3570 ; =data_027e103c
str r3, [r10, #4]
ldr r0, [r0]
mov sb, r2
mov r9, r2
ldrb r0, [r0, #0x24]
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _020c3574 ; =data_027e077c
ldr r2, _020c3578 ; =data_02056be4
ldr r0, [r0]
@@ -81,7 +81,7 @@ _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori: ; 0x020c3484
moveq r8, #0
add r7, r6, r0, lsl #2
cmp r6, r7
ldmhsia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmhsia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r4, #0
_020c34e8:
ldr r0, [r6]
@@ -89,7 +89,7 @@ _020c34e8:
ldrneb r1, [r0, #0x118]
cmpne r1, #0
beq _020c3560
mov r1, sb
mov r1, r9
bl _ZN5Actor18func_ov00_020c27a8Ei
cmp r0, #0
beq _020c3560
@@ -118,7 +118,7 @@ _020c3560:
add r6, r6, #4
cmp r6, r7
blo _020c34e8
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
_020c3570: .word data_027e103c
@@ -399,11 +399,11 @@ _020c38ec:
.global _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
arm_func_start _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
_ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p: ; 0x020c38fc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mvn r4, #0
mov sb, r0
str r4, [sb]
str r4, [sb, #4]
mov r9, r0
str r4, [r9]
str r4, [r9, #4]
ldr r5, [r1, #0x10]
ldr r0, [r1, #4]
mov r8, r2
@@ -411,7 +411,7 @@ _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p: ; 0x020c38fc
mov r7, r3
sub r4, r4, #0x80000000
cmp r5, r6
ldmhsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmhsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020c3930:
ldr r2, [r5]
cmp r2, #0
@@ -429,14 +429,14 @@ _020c3930:
ldr r1, [r5]
mov r4, r0
ldr r0, [r1, #8]
str r0, [sb]
str r0, [r9]
ldr r0, [r1, #0xc]
str r0, [sb, #4]
str r0, [r9, #4]
_020c397c:
add r5, r5, #4
cmp r5, r6
blo _020c3930
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.global _ZN12ActorManager18func_ov00_020c398cEv
@@ -462,21 +462,21 @@ _020c39a8: .word func_ov00_020c3f3c
.global _ZN12ActorManager18func_ov00_020c39acEjPjb
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPjb
_ZN12ActorManager18func_ov00_020c39acEjPjb: ; 0x020c39ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
movs r8, r2
mov r10, r0
mov sb, r1
mov r9, r1
mov r7, r3
bne _020c39d8
cmp r7, #0
addne sp, sp, #0x10
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020c39d8:
ldr r0, [r10, #0x10]
mov r4, #0
ldr r11, [r0, sb, lsl #2]
ldr r11, [r0, r9, lsl #2]
cmp r11, #0
ldrneb r0, [r11, #0x118]
cmpne r0, #0
@@ -490,7 +490,7 @@ _020c39d8:
cmp r0, #0
ble _020c3b20
_020c3a14:
cmp r5, sb
cmp r5, r9
ldrne r0, [r10, #0x10]
ldrne r0, [r0, r5, lsl #2]
cmpne r0, #0
@@ -562,7 +562,7 @@ _020c3b08:
_020c3b20:
mov r0, r4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPjb
.global _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -610,7 +610,7 @@ _020c3ba8:
.global _ZN12ActorManager18func_ov00_020c3bb0EiPi
arm_func_start _ZN12ActorManager18func_ov00_020c3bb0EiPi
_ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xd4
movs r10, r2
str r0, [sp]
@@ -625,7 +625,7 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
cmp r5, #0
addle sp, sp, #0xd4
movle r0, #0
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [sp]
mov r11, #0
ldr r0, [r0, #4]
@@ -646,11 +646,11 @@ _020c3c10:
mov r8, r6
cmp r5, #0
ble _020c3c88
add sb, sp, #0x14
add r9, sp, #0x14
add r4, sp, #8
_020c3c44:
ldr r3, [r7]
mov r0, sb
mov r0, r9
ldr r2, [r3, #0x48]
mov r1, r4
str r2, [sp, #8]
@@ -664,7 +664,7 @@ _020c3c44:
bne _020c3c88
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
add r9, r9, #0x18
blt _020c3c44
_020c3c88:
cmp r6, #0
@@ -692,7 +692,7 @@ _020c3cb8:
_020c3cd8:
mov r0, r11
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3bb0EiPi
_020c3ce4: .word data_027e0e60
@@ -700,7 +700,7 @@ _020c3ce4: .word data_027e0e60
.global _ZN12ActorManager18func_ov00_020c3ce8Eii
arm_func_start _ZN12ActorManager18func_ov00_020c3ce8Eii
_ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xcc
ldr r3, _020c3dcc ; =data_027e0e60
mov r11, r0
@@ -712,13 +712,13 @@ _ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8
mov r5, r0
cmp r5, #0
addle sp, sp, #0xcc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r11, #4]
ldr r7, [r11, #0x10]
cmp r0, #0
mov r6, #0
addle sp, sp, #0xcc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r4, sp, #0
_020c3d38:
ldr r1, [r7]
@@ -731,10 +731,10 @@ _020c3d38:
mov r8, #0
cmp r5, #0
ble _020c3db0
add sb, sp, #0xc
add r9, sp, #0xc
_020c3d64:
ldr r3, [r7]
mov r0, sb
mov r0, r9
ldr r2, [r3, #0x48]
mov r1, r4
str r2, [sp]
@@ -751,7 +751,7 @@ _020c3d64:
_020c3da0:
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
add r9, r9, #0x18
blt _020c3d64
_020c3db0:
ldr r0, [r11, #4]
@@ -760,7 +760,7 @@ _020c3db0:
add r7, r7, #4
blt _020c3d38
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3ce8Eii
_020c3dcc: .word data_027e0e60
+22 -22
View File
@@ -483,7 +483,7 @@ _020aa840: .word gItemManager
.global _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
arm_func_start _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
_ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x2c
mov r4, r1
mov r5, r0
@@ -506,7 +506,7 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
ldr r3, _020aabd0 ; =data_02050f54
mov r1, r0, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh sb, [r3, r2]
ldrsh r9, [r3, r2]
ldr r6, [sp, #0x20]
str r1, [sp]
mov r1, r1, asr #0x1f
@@ -524,16 +524,16 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
str r1, [sp, #0xc]
ldr r7, [sp, #0x28]
orr r2, r2, r3, lsl #20
smull r4, r3, r7, sb
smull r4, r3, r7, r9
adds r4, r4, #0x800
adc r3, r3, #0
mov r4, r4, lsr #0xc
orr r4, r4, r3, lsl #20
add r1, sp, #0x10
mov r8, sb, asr #0x1f
mov r8, r9, asr #0x1f
add r4, r2, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
smull r1, r0, r6, sb
smull r1, r0, r6, r9
adds r1, r1, #0x800
adc r0, r0, #0
mov r2, r1, lsr #0xc
@@ -583,10 +583,10 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
movgt r4, r1
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adds r3, r3, #0x800
adc r1, r2, #0
mov r2, r3, lsr #0xc
@@ -622,10 +622,10 @@ _020aaa04:
movlt r4, r1
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adds r3, r3, #0x800
adc r1, r2, #0
mov r2, r3, lsr #0xc
@@ -641,11 +641,11 @@ _020aaa98:
cmp r7, r4
movle r4, r7
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
adds r3, r3, #0x800
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adc r2, r2, #0
mov r3, r3, lsr #0xc
ldr r1, _020aabd4 ; =0x00000155
@@ -672,20 +672,20 @@ _020aaa98:
orr r2, r2, r1, lsl #20
add r1, r3, r2
str r1, [r0, #8]
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020aab34:
addge sp, sp, #0x2c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, r9, pc}
mvn r4, #0x154
cmp r7, r4
movge r4, r7
mov r0, r5
bl _ZN13LinkStateBase12GetPlayerVelEv
umull r3, r2, r4, sb
umull r3, r2, r4, r9
adds r3, r3, #0x800
mla r2, r4, r8, r2
mov r1, r4, asr #0x1f
mla r2, r1, sb, r2
mla r2, r1, r9, r2
adc r2, r2, #0
mov r3, r3, lsr #0xc
mvn r1, #0x154
@@ -712,7 +712,7 @@ _020aab34:
add r1, r3, r2
str r1, [r0, #8]
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
_020aabd0: .word data_02050f54
@@ -1345,7 +1345,7 @@ _020ab49c:
.global _ZN17LinkStateInteract8vfunc_34EP5Vec3p
arm_func_start _ZN17LinkStateInteract8vfunc_34EP5Vec3p
_ZN17LinkStateInteract8vfunc_34EP5Vec3p: ; 0x020ab4a4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r6, r0
mov r4, r1
bl _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
@@ -1390,10 +1390,10 @@ _020ab4ec:
mov r8, r0, lsl #0x1
mov r2, r8, lsl #0x1
mov r0, r5, lsl #0x1
ldrsh sb, [ip, r0]
ldrsh r9, [ip, r0]
adds r5, r1, #0x800
add r8, r8, #1
umull r1, r0, sb, r6
umull r1, r0, r9, r6
mov r5, r5, lsr #0xc
ldrsh r2, [ip, r2]
mov r8, r8, lsl #0x1
@@ -1403,8 +1403,8 @@ _020ab4ec:
mla lr, r3, r6, lr
adc r3, lr, #0
orr r5, r5, r3, lsl #20
mla r0, sb, r7, r0
mov r3, sb, asr #0x1f
mla r0, r9, r7, r0
mov r3, r9, asr #0x1f
mla r0, r3, r6, r0
smull r7, r6, r2, r5
smull r3, r2, ip, r5
@@ -1437,7 +1437,7 @@ _020ab5f4:
str r0, [r4, #4]
_020ab604:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN17LinkStateInteract8vfunc_34EP5Vec3p
_020ab60c: .word data_02050f54
+90 -90
View File
@@ -746,10 +746,10 @@ _020af774: .word data_027e0e60
.global _ZN13PlayerControl18func_ov00_020af778Ev
arm_func_start _ZN13PlayerControl18func_ov00_020af778Ev
_ZN13PlayerControl18func_ov00_020af778Ev: ; 0x020af778
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x14
mov sb, r0
ldrb r0, [sb, #0x78]
mov r9, r0
ldrb r0, [r9, #0x78]
cmp r0, #0
beq _020af7b8
ldr r0, _020afabc ; =data_027e0f74
@@ -764,54 +764,54 @@ _ZN13PlayerControl18func_ov00_020af778Ev: ; 0x020af778
beq _020af7cc
_020af7b8:
mov r0, #0xf
strh r0, [sb, #0xaa]
strh r0, [r9, #0xaa]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af7cc:
ldrsh r0, [sb, #0xaa]
ldrsh r0, [r9, #0xaa]
cmp r0, #0
ble _020af7ec
sub r0, r0, #1
strh r0, [sb, #0xaa]
strh r0, [r9, #0xaa]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af7ec:
bl _ZN13PlayerControl18func_ov00_020aeef8Ev
cmp r0, #0
bne _020af810
mvn r0, #0
str r0, [sb, #0x8c]
str r0, [sb, #0x90]
str r0, [r9, #0x8c]
str r0, [r9, #0x90]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af810:
ldrh r0, [sb, #0x34]
ldrh r0, [r9, #0x34]
mov r4, #0
mov r5, r4
tst r0, #2
beq _020af8b0
ldrsh r0, [sb, #0x60]
ldrsh r0, [r9, #0x60]
cmp r0, #0x15
bge _020af8b0
ldrsh r0, [sb, #0x68]
ldr r1, [sb, #0x28]
ldrsh r2, [sb, #0x66]
ldrsh r0, [r9, #0x68]
ldr r1, [r9, #0x28]
ldrsh r2, [r9, #0x66]
sub r1, r1, r0
mul r0, r1, r1
ldr r1, [sb, #0x24]
ldr r1, [r9, #0x24]
sub r1, r1, r2
mla r0, r1, r1, r0
cmp r0, #0x64
bge _020af8b0
mov r0, sb
mov r0, r9
mov r1, #7
mov r2, #1
bl _ZN13PlayerControl18func_ov00_020af2d4Ejb
cmp r0, #0
ldrneb r0, [sb, #0x79]
ldrneb r0, [r9, #0x79]
movne r4, #1
cmpne r0, #0
beq _020af8b0
@@ -845,14 +845,14 @@ _020af8dc:
mov r4, #0
beq _020afa68
ldr r0, _020afacc ; =data_027e0fe4
add r1, sb, #0x8c
add r1, r9, #0x8c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r6, r0
mov r7, r4
beq _020af97c
ldr r7, [r6, #0x12c]
mov r0, sb
mov r0, r9
mov r1, r7
mov r2, r8
bl _ZN13PlayerControl18func_ov00_020afe88Eib
@@ -868,18 +868,18 @@ _020af8dc:
cmp r0, #0
beq _020af97c
_020af944:
ldr r1, [sb, #0x8c]
ldr r1, [r9, #0x8c]
mvn r0, #0
str r1, [sb, #0x84]
ldr r2, [sb, #0x90]
str r1, [r9, #0x84]
ldr r2, [r9, #0x90]
mov r1, #0
str r2, [sb, #0x88]
str r0, [sb, #0x8c]
str r0, [sb, #0x90]
str r2, [r9, #0x88]
str r0, [r9, #0x8c]
str r0, [r9, #0x90]
mov r0, r6
strb r1, [sb, #0x80]
strb r1, [r9, #0x80]
mov r1, #0xf
strh r1, [sb, #0xa8]
strh r1, [r9, #0xa8]
bl _ZN5Actor16XzDistanceToLinkEv
mov r4, r0
_020af97c:
@@ -895,19 +895,19 @@ _020af97c:
bne _020af9e0
cmp r1, #0
beq _020afaa8
mov r0, sb
mov r0, r9
mov r2, r8
bl _ZN13PlayerControl18func_ov00_020afeecEib
cmp r0, #0
beq _020afaa8
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, r4
mov r3, r7
bl _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
add sp, sp, #0x14
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020af9e0:
mov r0, r5
ldr r2, [r0]
@@ -916,13 +916,13 @@ _020af9e0:
cmp r0, #0
beq _020afa18
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, r4
mov r3, r7
bl _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
add sp, sp, #0x14
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020afa18:
cmp r4, #0
bne _020afaa8
@@ -933,17 +933,17 @@ _020afa18:
cmp r0, #0
beq _020afaa8
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, #0
bl func_ov00_020b7d4c
add r1, sp, #8
mov r0, sb
mov r0, r9
mov r2, r4
mov r3, r7
bl _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
add sp, sp, #0x14
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020afa68:
ldr r1, _020afacc ; =data_027e0fe4
add r0, sp, #0
@@ -951,22 +951,22 @@ _020afa68:
mov r2, r4
bl _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
ldr r0, [sp]
str r0, [sb, #0x8c]
str r0, [r9, #0x8c]
ldr r0, [sp, #4]
str r0, [sb, #0x90]
ldrsh r0, [sb, #0x60]
str r0, [r9, #0x90]
ldrsh r0, [r9, #0x60]
cmp r0, #0
bne _020afaa8
ldr r0, [sb, #0x8c]
str r0, [sb, #0x94]
ldr r0, [sb, #0x90]
str r0, [sb, #0x98]
ldr r0, [r9, #0x8c]
str r0, [r9, #0x94]
ldr r0, [r9, #0x90]
str r0, [r9, #0x98]
_020afaa8:
cmp r4, #0
movgt r0, #1
movle r0, #0
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020af778Ev
_020afabc: .word data_027e0f74
@@ -1025,14 +1025,14 @@ _020afb68: .word data_027e0e60
.global _ZN13PlayerControl18func_ov00_020afb6cEv
arm_func_start _ZN13PlayerControl18func_ov00_020afb6cEv
_ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x20
mov sb, r0
mov r9, r0
bl _ZN13PlayerControl18func_ov00_020af778Ev
ldr r1, _020afe70 ; =data_027e0fe4
mov r4, r0
ldr r0, [r1]
add r1, sb, #0x84
add r1, r9, #0x84
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, _020afe74 ; =gItemManager
mov r5, r0
@@ -1043,7 +1043,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
mov r0, r6
bl _ZNK11ItemManager8GetFairyEi
cmp r5, #0
ldreqb r1, [sb, #0x81]
ldreqb r1, [r9, #0x81]
cmpeq r1, #0
bne _020afbcc
cmp r0, #0
@@ -1051,7 +1051,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
bl func_ov00_020bad18
_020afbcc:
cmp r5, #0
ldr r6, [sb, #0xa4]
ldr r6, [r9, #0xa4]
beq _020afce8
ldr r0, _020afe78 ; =data_027e0f94
add r1, r5, #0x48
@@ -1080,8 +1080,8 @@ _020afc20: ; jump table
b _020afc50 ; case 5
_020afc38:
sub r0, r8, #4
str r0, [sb, #0x84]
str r0, [sb, #0x88]
str r0, [r9, #0x84]
str r0, [r9, #0x88]
b _020afc9c
_020afc48:
mov r7, #1
@@ -1117,7 +1117,7 @@ _020afc9c:
cmp r0, #0
bne _020afcf4
add r1, sp, #0x10
mov r0, sb
mov r0, r9
mov r2, r7
bl _ZN13PlayerControl18func_ov00_020aff90Eii
cmp r4, #0
@@ -1130,17 +1130,17 @@ _020afc9c:
b _020afcf4
_020afce8:
mvn r0, #0
str r0, [sb, #0x84]
str r0, [sb, #0x88]
str r0, [r9, #0x84]
str r0, [r9, #0x88]
_020afcf4:
ldrb r0, [sb, #0x81]
ldrb r0, [r9, #0x81]
cmp r0, #0
beq _020afe24
ldr r0, _020afe84 ; =data_027e0e60
add r1, sb, #0x9c
add r1, r9, #0x9c
ldr r0, [r0]
bl func_ov00_020840c4
str r0, [sb, #0xa0]
str r0, [r9, #0xa0]
cmp r0, #0
beq _020afd88
ldr r1, [r0, #0x18]
@@ -1149,7 +1149,7 @@ _020afcf4:
str r1, [sp, #8]
ldr r0, [r0, #0x20]
str r0, [sp, #0xc]
ldr r0, [sb, #0xa0]
ldr r0, [r9, #0xa0]
ldr r1, [r0]
ldr r1, [r1, #0x54]
blx r1
@@ -1163,7 +1163,7 @@ _020afd5c:
ldr r1, [sp, #8]
add r0, r1, r0
str r0, [sp, #8]
ldr r0, [sb, #0xa0]
ldr r0, [r9, #0xa0]
ldrsb r0, [r0, #0x12]
cmp r0, #1
moveq r5, #1
@@ -1177,8 +1177,8 @@ _020afd88:
ldr r1, [r1, #4]
ldr r0, [r0]
str r1, [sp, #8]
ldrb r3, [sb, #0x9c]
ldrb r2, [sb, #0x9d]
ldrb r3, [r9, #0x9c]
ldrb r2, [r9, #0x9d]
sub r5, sp, #4
add r1, sp, #4
strb r3, [r5]
@@ -1196,14 +1196,14 @@ _020afdc4:
cmp r0, #0
bne _020afe10
add r1, sp, #4
mov r0, sb
mov r0, r9
mov r2, r5
bl _ZN13PlayerControl18func_ov00_020aff90Eii
cmp r4, #0
beq _020afe10
str r6, [sp]
ldrb r2, [sb, #0x9c]
ldrb r3, [sb, #0x9d]
ldrb r2, [r9, #0x9c]
ldrb r3, [r9, #0x9d]
ldr r0, _020afe80 ; =data_027e0ffc
add r1, sp, #4
bl func_ov00_020ced7c
@@ -1215,26 +1215,26 @@ _020afe10:
b _020afe2c
_020afe24:
mov r0, #0
str r0, [sb, #0xa0]
str r0, [r9, #0xa0]
_020afe2c:
ldrsh r1, [sb, #0xa8]
ldrsh r1, [r9, #0xa8]
cmp r1, #0
ble _020afe64
ldr r0, [sb, #0xa4]
ldr r0, [r9, #0xa4]
sub r0, r0, r6
cmp r0, #0x29
bgt _020afe64
sub r0, r1, #1
strh r0, [sb, #0xa8]
ldrsh r0, [sb, #0xa8]
strh r0, [r9, #0xa8]
ldrsh r0, [r9, #0xa8]
cmp r0, #0
bgt _020afe64
mov r0, sb
mov r0, r9
bl _ZN13PlayerControl13StopFollowingEv
_020afe64:
str r6, [sb, #0xa4]
str r6, [r9, #0xa4]
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020afb6cEv
_020afe70: .word data_027e0fe4
@@ -1909,7 +1909,7 @@ _020b0774: .word data_027e0e60
.global _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
arm_func_start _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x18
mov r8, r3
mov r3, #0
@@ -1918,7 +1918,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
ldr r3, _020b0aac ; =data_027e0f64
str r4, [sp, #0xc]
ldr r4, [r1, #4]
mov sb, r0
mov r9, r0
str r4, [sp, #0x10]
ldr r1, [r1, #8]
ldr r0, [r3]
@@ -1937,7 +1937,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r0, r4, lsl #0x10
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
@@ -1955,11 +1955,11 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
mov r1, r3, asr #0xb
add r2, r2, r0, lsr #20
add r3, r3, r1, lsr #20
ldr lr, [sb, #0x10]
ldr lr, [r9, #0x10]
ldr r4, [sp, #8]
ldr ip, [sb, #0x14]
ldr ip, [r9, #0x14]
ldr r5, [sp, #4]
mov r0, sb
mov r0, r9
mov r1, #1
mov r6, r2, asr #0xc
mov r7, r3, asr #0xc
@@ -1981,7 +1981,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b089c:
mvn r0, #0x17
sub r1, r0, r6
@@ -1998,7 +1998,7 @@ _020b089c:
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b08dc:
rsb r1, r6, #0
cmp r6, r1
@@ -2027,9 +2027,9 @@ _020b08dc:
_020b093c:
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b0948:
mov r0, sb
mov r0, r9
mov r1, #1
bl _ZN13PlayerControl13CheckTouchingEj
cmp r0, #0
@@ -2055,7 +2055,7 @@ _020b099c:
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b09b0:
cmp r6, #0
ble _020b09c4
@@ -2088,20 +2088,20 @@ _020b0a08:
str r0, [r8]
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b0a20:
mov r0, sb
mov r0, r9
mov r1, #1
bl _ZN13PlayerControl17CheckUntouchedNowEj
cmp r0, #0
beq _020b0aa0
ldr r3, [sb, #0x1c]
ldr r3, [r9, #0x1c]
ldr r2, [sp, #8]
cmp r6, #0
rsblt r6, r6, #0
cmp r7, #0
rsblt r7, r7, #0
ldr r1, [sb, #0x20]
ldr r1, [r9, #0x20]
ldr r0, [sp, #4]
sub r2, r3, r2
sub r1, r1, r0
@@ -2123,11 +2123,11 @@ _020b0a78:
_020b0a94:
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_020b0aa0:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
_020b0aac: .word data_027e0f64
+27 -27
View File
@@ -54,7 +54,7 @@ _020a9314:
.global _ZN12TouchGesture6UpdateEPv
arm_func_start _ZN12TouchGesture6UpdateEPv
_ZN12TouchGesture6UpdateEPv: ; 0x020a9334
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldrsh r2, [r1, #0x60]
cmp r2, #0
ble _020a9350
@@ -119,38 +119,38 @@ _020a93cc:
mov r8, r7
mov r1, r2
_020a9428:
add sb, r0, r1, lsl #1
ldrsh r10, [sb, #0x10]
ldrsh sb, [sb, #0x2c]
add r9, r0, r1, lsl #1
ldrsh r10, [r9, #0x10]
ldrsh r9, [r9, #0x2c]
add r2, r2, r10
cmp sb, r3
movlt r3, sb
cmp r9, r3
movlt r3, r9
blt _020a944c
cmp sb, ip
movgt ip, sb
cmp r9, ip
movgt ip, r9
_020a944c:
add sb, r0, r1, lsl #1
ldrsh sb, [sb, #0x48]
cmp sb, lr
movlt lr, sb
add r9, r0, r1, lsl #1
ldrsh r9, [r9, #0x48]
cmp r9, lr
movlt lr, r9
blt _020a9468
cmp sb, r4
movgt r4, sb
cmp r9, r4
movgt r4, r9
_020a9468:
add sb, r0, r1, lsl #1
ldrsh r11, [sb, #0x48]
ldrsh r10, [sb, #0x2c]
add sb, r10, r11
add r9, r0, r1, lsl #1
ldrsh r11, [r9, #0x48]
ldrsh r10, [r9, #0x2c]
add r9, r10, r11
sub r10, r10, r11
mov sb, sb, lsl #0x10
mov r9, r9, lsl #0x10
mov r10, r10, lsl #0x10
cmp r5, sb, asr #16
mov sb, sb, asr #0x10
cmp r5, r9, asr #16
mov r9, r9, asr #0x10
mov r10, r10, asr #0x10
movgt r5, sb
movgt r5, r9
bgt _020a94a0
cmp sb, r6
movgt r6, sb
cmp r9, r6
movgt r6, r9
_020a94a0:
cmp r10, r7
movlt r7, r10
@@ -171,21 +171,21 @@ _020a94b4:
subge r3, r8, r7
strb r1, [r0, #4]
cmpge r3, #0x46
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r3, _020a952c ; =0xffff2aab
cmp r2, r3
bge _020a9508
mov r2, #1
strb r2, [r0, #4]
str r1, [r0, #8]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020a9508:
rsb r1, r3, #0
cmp r2, r1
movgt r1, #1
strgtb r1, [r0, #4]
strgt r1, [r0, #8]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12TouchGesture6UpdateEPv
_020a9520: .word 0xffffd555
+28 -28
View File
@@ -4036,14 +4036,14 @@ _02079148: .word data_027e0c38
.global func_ov00_0207914c
arm_func_start func_ov00_0207914c
func_ov00_0207914c: ; 0x0207914c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _020791d8 ; =data_027e0e60
mov r11, r0
ldr r7, [r4]
mov r10, r1
mov r0, r7
mov sb, r2
mov r9, r2
mov r8, r3
bl func_ov00_02083394
mov r6, r0
@@ -4059,7 +4059,7 @@ func_ov00_0207914c: ; 0x0207914c
sub r0, r0, r5
sub r1, r1, r5
str r1, [sp]
stmib sp, {r0, sb}
stmib sp, {r0, r9}
ldrb r2, [sp, #0x38]
str r8, [sp, #0xc]
sub r3, r4, r6
@@ -4070,7 +4070,7 @@ func_ov00_0207914c: ; 0x0207914c
sub r2, r2, r6
bl func_ov00_02079024
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207914c
_020791d8: .word data_027e0e60
@@ -4095,14 +4095,14 @@ func_ov00_020791dc: ; 0x020791dc
.global func_ov00_0207920c
arm_func_start func_ov00_0207920c
func_ov00_0207920c: ; 0x0207920c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _0207929c ; =data_027e0e60
mov r11, r0
ldr r7, [r4]
mov r10, r1
mov r0, r7
mov sb, r2
mov r9, r2
mov r8, r3
bl func_ov00_02083394
mov r6, r0
@@ -4121,8 +4121,8 @@ func_ov00_0207920c: ; 0x0207920c
str r1, [sp]
str r0, [sp, #4]
mov r0, r11
str sb, [sp, #8]
add r1, sb, #4
str r9, [sp, #8]
add r1, r9, #4
str r1, [sp, #0xc]
str r8, [sp, #0x10]
ldr r2, [r10]
@@ -4130,7 +4130,7 @@ func_ov00_0207920c: ; 0x0207920c
sub r2, r2, r6
bl func_ov00_02079024
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207920c
_0207929c: .word data_027e0e60
@@ -4138,11 +4138,11 @@ _0207929c: .word data_027e0e60
.global func_ov00_020792a0
arm_func_start func_ov00_020792a0
func_ov00_020792a0: ; 0x020792a0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
ldr r0, [r0]
mov r10, r1
mov sb, r2
mov r9, r2
mov r8, r3
cmp r0, #0
ldr r7, [sp, #0x28]
@@ -4150,16 +4150,16 @@ func_ov00_020792a0: ; 0x020792a0
str r7, [sp]
bl func_ov03_020f0844
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_020792d4:
cmp r10, #0
ldreq r0, _020793b0 ; =data_027e0c38
ldreq r0, [r0, #0x14]
addeq sb, sb, r0, lsl #12
addeq r9, r9, r0, lsl #12
beq _020792f4
ldr r0, _020793b0 ; =data_027e0c38
ldr r0, [r0, #0x14]
add sb, sb, r0
add r9, r9, r0
_020792f4:
ldr r0, _020793b4 ; =data_027e0e60
ldr r6, [r0]
@@ -4182,16 +4182,16 @@ _020792f4:
bl func_01ff9b4c
cmp r10, #0
beq _02079368
mla r1, sb, r6, r5
mla r1, r9, r6, r5
str r1, [r7]
mov r1, #0
mla r0, r8, r0, r4
str r1, [r7, #4]
add sp, sp, #4
str r0, [r7, #8]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02079368:
smull r1, r2, sb, r6
smull r1, r2, r9, r6
adds r3, r1, #0x800
smull r1, r0, r8, r0
adc r2, r2, #0
@@ -4208,7 +4208,7 @@ _02079368:
add r0, r4, r1
str r0, [r7, #8]
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov00_020792a0
_020793b0: .word data_027e0c38
@@ -4275,9 +4275,9 @@ _02079458:
.global func_ov00_02079470
arm_func_start func_ov00_02079470
func_ov00_02079470: ; 0x02079470
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x14
mov sb, r0
mov r9, r0
mov r8, r1
mov r7, r2
mov r6, r3
@@ -4302,13 +4302,13 @@ _020794c8:
ldrb r0, [sp, #0x3c]
cmp r0, #0
bne _02079564
mov r0, sb
mov r0, r9
bl func_ov00_02078f54
cmp r0, #0
beq _02079564
ldrb r0, [sp, #0x38]
cmp r0, #0
ldrne r0, [sb]
ldrne r0, [r9]
cmpne r0, #0
beq _0207955c
ldr r1, _02079674 ; =gOverlayManager
@@ -4330,7 +4330,7 @@ _020794c8:
mov r0, #0
str r0, [sp, #0x10]
ldr r1, [r5]
mov r0, sb
mov r0, r9
mov r2, r1, lsl #0xc
mov r1, #1
mov r3, #0x100000
@@ -4371,7 +4371,7 @@ _02079564:
mov r0, #0
str r0, [sp, #0x10]
ldr r1, [r5]
mov r0, sb
mov r0, r9
mov r2, r1, lsl #0xc
mov r1, #1
mov r3, #0x100000
@@ -4379,7 +4379,7 @@ _02079564:
b _02079614
_020795f8:
mov ip, #0
mov r0, sb
mov r0, r9
mov r1, r8
mov r2, r5
mov r3, r4
@@ -4394,10 +4394,10 @@ _02079614:
str r0, [r4]
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_02079638:
ldr r1, [r5]
mov r0, sb
mov r0, r9
add r1, r1, r7
str r1, [r5]
ldr r2, [r4]
@@ -4408,7 +4408,7 @@ _02079638:
str r5, [r4]
bl func_ov00_020793d0
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov00_02079470
_0207966c: .word data_027e0e28
+797 -797
View File
File diff suppressed because it is too large Load Diff
+18 -18
View File
@@ -808,14 +808,14 @@ _020a9c08:
.global func_ov00_020a9c14
arm_func_start func_ov00_020a9c14
func_ov00_020a9c14: ; 0x020a9c14
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x94
mov r8, r2
movs sb, r1
movs r9, r1
cmpeq r8, #0
mov r10, r0
addeq sp, sp, #0x94
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r10, #0x68]
mov r0, r10
bl func_ov00_020a9624
@@ -854,7 +854,7 @@ _020a9c94:
add r1, sp, #0x4c
bl func_01ff83a0
cmp r0, #0
mov r0, sb, asr #0x4
mov r0, r9, asr #0x4
bne _020a9d48
mov r2, r0, lsl #0x1
add r0, r2, #1
@@ -886,7 +886,7 @@ _020a9c94:
mov r2, r0
bl func_01ff8690
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020a9d48:
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -916,7 +916,7 @@ _020a9d48:
mov r2, r0
bl func_01ff8690
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020a9c14
_020a9dbc: .word data_02050f54
@@ -957,27 +957,27 @@ _020a9e10:
.global func_ov00_020a9e28
arm_func_start func_ov00_020a9e28
func_ov00_020a9e28: ; 0x020a9e28
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
movs r6, r1
mov r7, r0
ldrne r0, [r6, #4]
mov r5, r2
ldrne r0, [r0, #8]
cmpne r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r0, r6
mov r4, #0
bl func_ov00_020c0e94
cmp r0, #0
bls _020a9e9c
mov r8, r4
mov sb, #1
mov r9, #1
_020a9e64:
ldr r0, [r7, #0x98]
mov r1, r4
ldrb r0, [r0, r4]
cmp r5, r0
moveq r2, sb
moveq r2, r9
movne r2, r8
mov r0, r6
bl func_ov00_020c0ea0
@@ -993,7 +993,7 @@ _020a9e9c:
mov r1, r6
ldr r2, [r2, #0x24]
blx r2
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov00_020a9e28
.global func_ov00_020a9eb4
@@ -1197,14 +1197,14 @@ func_ov00_020aa0f0: ; 0x020aa0f0
.global func_ov00_020aa124
arm_func_start func_ov00_020aa124
func_ov00_020aa124: ; 0x020aa124
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r8, r0
ldr r4, [r8, #0x94]
mov r7, r1
mov r6, r2
mov r5, r3
cmp r4, #0
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
@@ -1243,8 +1243,8 @@ func_ov00_020aa124: ; 0x020aa124
ldr r1, [r8, #0x94]
mov r2, r4
bl func_02019534
ldr sb, [r8, #0x84]
cmp sb, #0
ldr r9, [r8, #0x84]
cmp r9, #0
blt _020aa280
mov r0, r8
ldr r1, [r0]
@@ -1253,7 +1253,7 @@ func_ov00_020aa124: ; 0x020aa124
ldr r1, [r1, #8]
moveq r5, #0
blx r1
mov r1, sb
mov r1, r9
mov r2, r5
bl func_02019570
mov r0, r8
@@ -1287,7 +1287,7 @@ func_ov00_020aa124: ; 0x020aa124
_020aa280:
ldr r5, [r8, #0x8c]
cmp r5, #0
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldrb r0, [sp, #0x20]
cmp r0, #0
mov r0, r8
@@ -1326,7 +1326,7 @@ _020aa280:
ldr r1, [r8, #0x8c]
mov r2, r4
bl func_02019534
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov00_020aa124
_020aa328: .word data_ov00_020e9360
+235 -235
View File
File diff suppressed because it is too large Load Diff
+254 -254
View File
File diff suppressed because it is too large Load Diff
+34 -34
View File
@@ -209,7 +209,7 @@ func_ov00_020d5c54: ; 0x020d5c54
.global func_ov00_020d5cd8
arm_func_start func_ov00_020d5cd8
func_ov00_020d5cd8: ; 0x020d5cd8
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
ldr r3, [r0, #4]
ldr r2, [r0, #8]
ldr r4, [r0, #0xc]
@@ -218,7 +218,7 @@ func_ov00_020d5cd8: ; 0x020d5cd8
mul r5, r2, r2
mul ip, r4, r2
mul r7, lr, r3
mul sb, r4, r3
mul r9, r4, r3
mul r6, lr, r2
mul r8, lr, lr
add r10, r0, #0x800
@@ -228,13 +228,13 @@ func_ov00_020d5cd8: ; 0x020d5cd8
mov r4, r10, asr #0xc
add r3, ip, #0x800
add r2, r4, lr, asr #12
add ip, sb, #0x800
add ip, r9, #0x800
mov r2, r2, lsl #0x1
rsb r2, r2, #0x1000
add r8, r8, #0x800
mov sb, lr, asr #0xc
mov r9, lr, asr #0xc
add lr, r0, #0x800
add r0, sb, r8, asr #12
add r0, r9, r8, asr #12
mov r0, r0, lsl #0x1
add r4, r4, r8, asr #12
mov r4, r4, lsl #0x1
@@ -242,10 +242,10 @@ func_ov00_020d5cd8: ; 0x020d5cd8
mov r3, r3, asr #0xc
add r8, r3, r7, asr #12
rsb r7, r3, r7, asr #12
add sb, r6, #0x800
add r9, r6, #0x800
mov r3, ip, asr #0xc
rsb r6, r3, sb, asr #12
add r3, r3, sb, asr #12
rsb r6, r3, r9, asr #12
add r3, r3, r9, asr #12
str r2, [r1]
mov r2, r8, lsl #0x1
str r2, [r1, #4]
@@ -267,40 +267,40 @@ func_ov00_020d5cd8: ; 0x020d5cd8
str r0, [r1, #0x1c]
rsb r0, r4, #0x1000
str r0, [r1, #0x20]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov00_020d5cd8
.global func_ov00_020d5dc4
arm_func_start func_ov00_020d5dc4
func_ov00_020d5dc4: ; 0x020d5dc4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r4, [r0]
ldr r5, [r1]
ldmib r1, {r3, r11, lr}
ldmib r0, {r2, r10, ip}
mul sb, r4, lr
mul r9, r4, lr
mul r1, ip, r5
mul r6, r2, r11
add sb, sb, #0x800
add r9, r9, #0x800
mul r7, r2, lr
mul r8, ip, r3
add r7, r7, #0x800
add r1, r1, #0x800
mov sb, sb, asr #0xc
add sb, sb, r1, asr #12
mov r9, r9, asr #0xc
add r9, r9, r1, asr #12
add r6, r6, #0x800
add r6, sb, r6, asr #12
mul sb, r10, r3
add sb, sb, #0x800
sub r6, r6, sb, asr #12
mul sb, r10, r5
add r6, r9, r6, asr #12
mul r9, r10, r3
add r9, r9, #0x800
sub r6, r6, r9, asr #12
mul r9, r10, r5
mul r1, r10, lr
str r6, [r0]
add r8, r8, #0x800
mov r7, r7, asr #0xc
add r7, r7, r8, asr #12
add sb, sb, #0x800
add sb, r7, sb, asr #12
add r9, r9, #0x800
add r9, r7, r9, asr #12
mul r7, r4, r3
mul r3, r2, r3
mul r6, ip, r11
@@ -311,14 +311,14 @@ func_ov00_020d5dc4: ; 0x020d5dc4
mul r2, r10, r11
add r10, r1, #0x800
add r1, r8, #0x800
sub r1, sb, r1, asr #12
sub r1, r9, r1, asr #12
add r5, ip, #0x800
add r8, r6, #0x800
str r1, [r0, #4]
mov r6, r10, asr #0xc
add sb, r7, #0x800
add r9, r7, #0x800
add r7, r6, r8, asr #12
add r8, r7, sb, asr #12
add r8, r7, r9, asr #12
add r6, lr, #0x800
mov r5, r5, asr #0xc
add r7, r4, #0x800
@@ -330,13 +330,13 @@ func_ov00_020d5dc4: ; 0x020d5dc4
str r5, [r0, #8]
sub r1, r3, r1, asr #12
str r1, [r0, #0xc]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov00_020d5dc4
.global func_ov00_020d5eac
arm_func_start func_ov00_020d5eac
func_ov00_020d5eac: ; 0x020d5eac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r5, [r1]
ldr r4, [r0, #0xc]
ldr r2, [r0, #8]
@@ -347,7 +347,7 @@ func_ov00_020d5eac: ; 0x020d5eac
mul r7, r3, r2
add r10, r10, #0x800
mul r8, r3, r4
mul sb, lr, ip
mul r9, lr, ip
add r8, r8, #0x800
add r1, r1, #0x800
mov r10, r10, asr #0xc
@@ -364,24 +364,24 @@ func_ov00_020d5eac: ; 0x020d5eac
mul r7, lr, r2
mul lr, r5, r6
mul r6, r3, r6
add sb, sb, #0x800
add r9, r9, #0x800
mov r8, r8, asr #0xc
add r8, r8, sb, asr #12
add r8, r8, r9, asr #12
add r10, r10, #0x800
mul sb, r5, r2
mul r9, r5, r2
add r10, r8, r10, asr #12
mul r8, r5, ip
mul r5, r3, ip
mul r2, r11, r2
add r11, r1, #0x800
add r1, sb, #0x800
add r1, r9, #0x800
add r3, lr, #0x800
add sb, r7, #0x800
add r9, r7, #0x800
mov r7, r11, asr #0xc
sub r1, r10, r1, asr #12
str r1, [r0, #4]
add r8, r8, #0x800
add r7, r7, sb, asr #12
add r7, r7, r9, asr #12
add r4, r4, #0x800
mov r3, r3, asr #0xc
rsb r4, r3, r4, asr #12
@@ -394,7 +394,7 @@ func_ov00_020d5eac: ; 0x020d5eac
str r5, [r0, #8]
sub r1, r3, r1, asr #12
str r1, [r0, #0xc]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov00_020d5eac
.global func_ov00_020d5f98
+191 -191
View File
File diff suppressed because it is too large Load Diff
+42 -42
View File
@@ -263,7 +263,7 @@ _020ef080: .word gItemManager
.global func_ov02_020ef084
arm_func_start func_ov02_020ef084
func_ov02_020ef084: ; 0x020ef084
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0xc
ldr r2, _020ef998 ; =gItemManager
ldr r1, _020ef99c ; =0x91a2b3c5
@@ -295,7 +295,7 @@ _020ef0d0:
cmp r7, #0x80
blt _020ef0d0
mov r7, #0
mov sb, r5
mov r9, r5
add r8, r5, #0x10
mov r6, r7
_020ef108:
@@ -306,11 +306,11 @@ _020ef108:
mov r1, r7
bl func_ov02_020f0a54
cmp r0, #0
streqb r6, [sb, #0x6c]
streqb r6, [r9, #0x6c]
add r7, r7, #1
cmp r7, #3
add r8, r8, #0xf0
add sb, sb, #0xf0
add r9, r9, #0xf0
blt _020ef108
mov r2, #0x13
str r2, [sp]
@@ -871,7 +871,7 @@ _020ef96c:
str r1, [r5, #0xd14]
blx func_ov09_021144d0
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov02_020ef084
_020ef998: .word gItemManager
@@ -1323,7 +1323,7 @@ _020eff6c: .word 0x04000304
.global func_ov02_020eff70
arm_func_start func_ov02_020eff70
func_ov02_020eff70: ; 0x020eff70
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x48
mov r7, r0
add r0, sp, #0x28
@@ -1633,7 +1633,7 @@ _020f0414:
blx func_ov09_02113868
ldrb r0, [r7, #0xd0e]
mov r2, #2
mov sb, #0
mov r9, #0
cmp r0, #0
ldrne r0, _020f071c ; =data_ov09_0211f528
movne r1, #0x14000
@@ -1654,13 +1654,13 @@ _020f0414:
mov r6, r1
_020f0474:
mov r0, r6
mov r1, sb
mov r1, r9
mov r2, r4
mov r3, r5
str r8, [sp]
bl func_0203493c
add sb, sb, #1
cmp sb, #6
add r9, r9, #1
cmp r9, #6
ble _020f0474
ldr r0, _020f0724 ; =data_027e0f74
mov r1, #0xd4
@@ -1722,18 +1722,18 @@ _020f0560:
str r6, [sp]
bl func_0203493c
_020f0570:
mov sb, #0xd
mov r9, #0xd
add r8, sp, #0x28
mov r6, #0xef
_020f057c:
mov r0, r6
mov r1, sb
mov r1, r9
mov r2, r4
mov r3, r5
str r8, [sp]
bl func_0203493c
add sb, sb, #1
cmp sb, #0xe
add r9, r9, #1
cmp r9, #0xe
ble _020f057c
ldrb r0, [r7, #0xd0e]
cmp r0, #0
@@ -1828,13 +1828,13 @@ _020f06e0:
ldrb r0, [r7, #0xd0e]
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r1, #0x14000
ldr r0, _020f071c ; =data_ov09_0211f528
rsb r1, r1, #0
str r1, [r0]
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov02_020eff70
_020f071c: .word data_ov09_0211f528
@@ -6049,7 +6049,7 @@ func_ov02_020f3ae0: ; 0x020f3ae0
.global func_ov02_020f3ae4
arm_func_start func_ov02_020f3ae4
func_ov02_020f3ae4: ; 0x020f3ae4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x6c
str r0, [sp, #8]
add r0, sp, #0x4c
@@ -6099,12 +6099,12 @@ _020f3b80:
mov r1, r4
ldr r0, [r0]
blx _ZNK11ItemManager10GetUnk_098Ej
mov sb, r0
cmp sb, #0
mov r9, r0
cmp r9, #0
ble _020f3d9c
ldr r0, [sp, #0x24]
add r1, r4, #0xd
add r0, r0, sb
add r0, r0, r9
str r0, [sp, #0x24]
mov r0, #0x4d
mov r2, r5
@@ -6126,7 +6126,7 @@ _020f3b80:
bl func_0203493c
mov r0, #1
str r0, [sp, #0x28]
mov r1, sb
mov r1, r9
add r0, sp, #0x28
mov r2, r10
str r11, [sp, #0x34]
@@ -6157,8 +6157,8 @@ _020f3c58:
mov r1, #0xc
str r0, [sp, #0xc]
bl func_01ff9b4c
mov sb, r0
cmp sb, #0
mov r9, r0
cmp r9, #0
ble _020f3cc4
mov r0, #0x4d
add r1, r4, #0x2c
@@ -6167,7 +6167,7 @@ _020f3c58:
str r10, [sp]
bl func_0203493c
add r0, sp, #0x28
mov r1, sb
mov r1, r9
mov r2, r10
str r6, [sp, #0x34]
bl func_ov02_020f5f98
@@ -6179,7 +6179,7 @@ _020f3cc4:
str r10, [sp]
bl func_0203493c
mov r0, #0xc
mul r1, sb, r0
mul r1, r9, r0
ldr r0, [sp, #0xc]
mov r2, r10
sub r1, r0, r1
@@ -6195,8 +6195,8 @@ _020f3d00:
mov r1, #0x64
str r0, [sp, #0x10]
bl func_01ff9b4c
mov sb, r0
cmp sb, #0
mov r9, r0
cmp r9, #0
ble _020f3d5c
mov r0, #0x4d
add r1, r4, #0x13
@@ -6207,7 +6207,7 @@ _020f3d00:
mov r0, #0
stmia sp, {r0, r10}
mov r0, #0x4d
add r1, sb, #0x22
add r1, r9, #0x22
add r2, r4, #0x19
mov r3, r5
bl func_020349cc
@@ -6219,7 +6219,7 @@ _020f3d5c:
str r10, [sp]
bl func_0203493c
mov r0, #0x64
mul r1, sb, r0
mul r1, r9, r0
ldr r0, [sp, #0x10]
mov r2, r10
sub r1, r0, r1
@@ -6250,7 +6250,7 @@ _020f3d9c:
str r0, [sp, #0x20]
mov r11, #9
mov r8, #0x3b
mov sb, #0x42
mov r9, #0x42
mov r10, #0x19
add r6, sp, #0x4c
_020f3dfc:
@@ -6352,7 +6352,7 @@ _020f3f48:
mov r2, r6
sub r1, r0, r1
add r0, sp, #0x28
str sb, [sp, #0x34]
str r9, [sp, #0x34]
bl func_ov02_020f5f98
b _020f4020
_020f3f84:
@@ -6403,7 +6403,7 @@ _020f4020:
str r0, [sp, #0x20]
add r11, r11, #3
add r8, r8, #3
add sb, sb, #2
add r9, r9, #2
add r10, r10, #2
cmp r7, #2
blt _020f3dfc
@@ -6499,7 +6499,7 @@ _020f40fc:
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addeq sp, sp, #0x6c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r2, r5
mov r0, #0xec
mov r1, #6
@@ -6513,7 +6513,7 @@ _020f40fc:
str r4, [sp]
bl func_0203493c
add sp, sp, #0x6c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov02_020f3ae4
_020f41ec: .word gItemManager
@@ -8663,11 +8663,11 @@ _020f5f94: .word data_ov00_020eec9c
.global func_ov02_020f5f98
arm_func_start func_ov02_020f5f98
func_ov02_020f5f98: ; 0x020f5f98
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #8
mov r6, r0
ldr r0, [r6, #0x10]
ldrb sb, [r6, #0x20]
ldrb r9, [r6, #0x20]
ldr r7, [r6, #0xc]
ldr r8, [r6, #0x14]
mov r5, r1
@@ -8688,7 +8688,7 @@ _020f5fdc:
mov r10, r0
cmp r10, #0
bgt _020f5ffc
cmp sb, #0
cmp r9, #0
beq _020f6020
_020f5ffc:
ldr r0, [r6, #0x18]
@@ -8698,7 +8698,7 @@ _020f5ffc:
mov r3, r8
add r1, r1, r10
bl func_020349cc
mov sb, #1
mov r9, #1
b _020f6030
_020f6020:
ldr r0, [r6]
@@ -8717,7 +8717,7 @@ _020f6040:
mov r10, r0
cmp r10, #0
bgt _020f6060
cmp sb, #0
cmp r9, #0
beq _020f6084
_020f6060:
ldr r0, [r6, #0x18]
@@ -8727,7 +8727,7 @@ _020f6060:
mov r3, r8
add r1, r1, r10
bl func_020349cc
mov sb, #1
mov r9, #1
b _020f6094
_020f6084:
ldr r0, [r6]
@@ -8746,7 +8746,7 @@ _020f60a4:
mov r10, r0
cmp r10, #0
bgt _020f60c4
cmp sb, #0
cmp r9, #0
beq _020f60e4
_020f60c4:
ldr r0, [r6, #0x18]
@@ -8778,7 +8778,7 @@ _020f60f8:
bl func_020349cc
_020f6124:
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov02_020f5f98
.global func_ov02_020f612c
+210 -210
View File
File diff suppressed because it is too large Load Diff
+337 -337
View File
File diff suppressed because it is too large Load Diff
+26 -26
View File
@@ -1695,7 +1695,7 @@ _02101ee0:
.global func_ov06_02101ee8
arm_func_start func_ov06_02101ee8
func_ov06_02101ee8: ; 0x02101ee8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r8, r0
ldr r0, [r8]
mov r1, #0
@@ -1708,7 +1708,7 @@ func_ov06_02101ee8: ; 0x02101ee8
cmp r0, #0
ble _02101f9c
mvn r4, #0
add sb, r4, #0x10000
add r9, r4, #0x10000
_02101f20:
ldr r1, [r8]
add r0, r8, r7, lsl #1
@@ -1717,7 +1717,7 @@ _02101f20:
mov r0, r6
bl func_02023ea4
mov r1, r0
cmp r1, sb
cmp r1, r9
ldreq r0, [r6]
ldreqh r1, [r0, #2]
mov r0, r6
@@ -1744,7 +1744,7 @@ _02101f20:
_02101f9c:
mov r0, #0
strb r0, [r8, #0x41]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov06_02101ee8
.global func_ov06_02101fa8
@@ -2083,7 +2083,7 @@ _021023c4:
.global func_ov06_021023d8
arm_func_start func_ov06_021023d8
func_ov06_021023d8: ; 0x021023d8
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
mov r5, r0
ldr r1, [r5, #0x22c]
@@ -2095,7 +2095,7 @@ func_ov06_021023d8: ; 0x021023d8
mov r0, #1
mov r8, #0
strb r0, [sp, #0xe]
add sb, r5, #0x184
add r9, r5, #0x184
mov r7, r8
add r6, sp, #4
_02102414:
@@ -2106,7 +2106,7 @@ _02102414:
cmp r0, #0
beq _02102444
_0210242c:
mov r0, sb
mov r0, r9
mov r1, r7
mov r2, r4
mov r3, r6
@@ -2115,7 +2115,7 @@ _0210242c:
_02102444:
add r8, r8, #1
cmp r8, #7
add sb, sb, #0x18
add r9, r9, #0x18
blt _02102414
ldr r0, [r5, #0x178]
add r3, sp, #4
@@ -2156,7 +2156,7 @@ _02102490:
str r4, [sp]
bl func_ov06_02101fa8
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov06_021023d8
_021024ec: .word 0x00000102
@@ -2200,7 +2200,7 @@ _02102560: .word 0x04001014
.global func_ov06_02102564
arm_func_start func_ov06_02102564
func_ov06_02102564: ; 0x02102564
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r4, r0
ldr r0, [r4, #0x178]
mov r7, #0
@@ -2212,13 +2212,13 @@ func_ov06_02102564: ; 0x02102564
ldr r6, _021026b4 ; =data_027e0d78
cmp r0, #1
movne r0, r7
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov sb, r4
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r9, r4
add r10, r4, #0x184
mov r5, r7
_021025a4:
mov r0, r10
add r1, sb, #0x100
add r1, r9, #0x100
ldr ip, [r0]
ldrh r8, [r1, #0x8e]
ldr ip, [ip]
@@ -2233,18 +2233,18 @@ _021025a4:
cmp r0, #0
strne r7, [r4, #0x230]
movne r0, #1
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
add r7, r7, #1
cmp r7, #7
add sb, sb, #0x18
add r9, r9, #0x18
add r10, r10, #0x18
blt _021025a4
ldrb r0, [r4, #0x23b]
cmp r0, #0
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r1, [r4, #0x178]
ldr sb, [r6, #0x1c]
ldr r9, [r6, #0x1c]
ldr r0, [r1, #0xc]
ldr r5, [r1, #8]
add r0, r0, #1
@@ -2263,7 +2263,7 @@ _02102634:
beq _02102688
ldr r0, [r4, #0x234]
mov r1, r5
mov r2, sb
mov r2, r9
mov r3, r8
bl func_02034b90
cmp r0, #0
@@ -2274,7 +2274,7 @@ _02102634:
ldr r2, [r2, #4]
blx r2
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_02102688:
ldr r0, [r4, #0x178]
add r5, r5, #1
@@ -2287,7 +2287,7 @@ _021026a0:
mov r0, #0
ldrh r2, [r1, #6]
strh r2, [r1, #0xa]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov06_02102564
_021026b4: .word data_027e0d78
@@ -2780,7 +2780,7 @@ _02102d60: .word 0x00000103
.global func_ov06_02102d64
arm_func_start func_ov06_02102d64
func_ov06_02102d64: ; 0x02102d64
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov r10, r0
add r0, r10, #0x44
@@ -2816,15 +2816,15 @@ _02102db8:
sub r1, r7, r1
blx r2
mov r8, r0
ldr sb, [r10, #0x70]
ldr r9, [r10, #0x70]
mov r1, r8
mov r0, sb
mov r0, r9
bl func_02023ea4
mov r1, r0
cmp r1, r4
ldreq r0, [sb]
ldreq r0, [r9]
ldreqh r1, [r0, #2]
mov r0, sb
mov r0, r9
bl func_02023eec
str r5, [sp]
ldrsb r1, [r0, #2]
@@ -2850,7 +2850,7 @@ _02102e68:
mov r0, r10
bl func_ov06_02101ee8
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov06_02102d64
_02102e78: .word 0x0000ffff
+4 -4
View File
@@ -771,7 +771,7 @@ func_ov08_021135b8: ; 0x021135b8
.global func_ov08_021135bc
arm_func_start func_ov08_021135bc
func_ov08_021135bc: ; 0x021135bc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov r10, r0
mov r8, #0
@@ -782,7 +782,7 @@ func_ov08_021135bc: ; 0x021135bc
strh r8, [r10, #0xe]
mov r0, #0x1000
strh r0, [r10, #0x10]
mov sb, r1
mov r9, r1
strh r8, [r10, #0x12]
mov r5, r7, lsr #0x11
mov r6, #1
@@ -793,7 +793,7 @@ _02113600:
cmp r8, r0
bge _02113648
mov r0, #0x10
mov r1, sb
mov r1, r9
mov r2, #4
bl _ZN9SysObjectnwEmPjj
cmp r0, #0
@@ -821,7 +821,7 @@ _02113650:
bl func_ov00_020a1a3c
mov r0, r10
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov08_021135bc
.global func_ov08_02113678
+69 -69
View File
@@ -4762,20 +4762,20 @@ func_ov09_021152fc: ; 0x021152fc
.global func_ov09_0211530c
arm_func_start func_ov09_0211530c
func_ov09_0211530c: ; 0x0211530c
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x3c
mov sb, r0
ldr r0, [sb, #0x1c]
mov r9, r0
ldr r0, [r9, #0x1c]
mov r8, r1
ldr r1, [r0, #0x460]
mov r7, r2
mov r6, r3
bl func_ov00_020a9624
mov r5, r0
ldr r0, [sb, #0x20]
ldr r1, [sb, #0x60]
ldr r0, [r9, #0x20]
ldr r1, [r9, #0x60]
bl func_ov00_020a9624
ldrh r1, [sb, #0x94]
ldrh r1, [r9, #0x94]
mov r4, r0
ldr r3, _02115404 ; =data_02050f54
mov r1, r1, asr #0x4
@@ -4811,7 +4811,7 @@ func_ov09_0211530c: ; 0x0211530c
mov r2, r0
str r3, [sp, #8]
bl func_01ff9bc4
ldr r1, [sb, #0xc]
ldr r1, [r9, #0xc]
add r0, sp, #0xc
bl func_01fffbec
add r0, sp, #0xc
@@ -4823,7 +4823,7 @@ func_ov09_0211530c: ; 0x0211530c
add r0, sp, #0xc
bl func_01ff9bc4
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov09_0211530c
_02115404: .word data_02050f54
@@ -5029,7 +5029,7 @@ func_ov09_02115610: ; 0x02115610
.global func_ov09_021156a4
arm_func_start func_ov09_021156a4
func_ov09_021156a4: ; 0x021156a4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xdc
mov r5, r0
ldr r3, [r5, #0x6c]
@@ -5038,10 +5038,10 @@ func_ov09_021156a4: ; 0x021156a4
str r2, [sp, #8]
cmp r3, #0
addlt sp, sp, #0xdc
ldmltia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
cmp r6, #0
addeq sp, sp, #0xdc
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r1, [r5, #0x9a]
cmp r1, #0
bne _021156e8
@@ -5075,14 +5075,14 @@ _021156e8:
add r6, sp, #0x58
_02115750:
ldr r10, [sp, #0xc]
add sb, sp, #0x7c
add r9, sp, #0x7c
ldmia r10!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
ldmia r10!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
ldmia r10, {r0, r1, r2, r3}
mov lr, r11
stmia sb, {r0, r1, r2, r3}
stmia r9, {r0, r1, r2, r3}
ldmia lr!, {r0, r1, r2, r3}
add ip, sp, #0x34
stmia ip!, {r0, r1, r2, r3}
@@ -5133,13 +5133,13 @@ _02115804:
ldrsh r3, [r7, r3]
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
smull sb, r3, r1, r3
adds sb, sb, #0x800
smull r9, r3, r1, r3
adds r9, r9, #0x800
adc r1, r3, #0
mov r3, sb, lsr #0xc
mov r3, r9, lsr #0xc
orr r3, r3, r1, lsl #20
mov r1, r3, lsl #0x10
mov sb, r1, asr #0x10
mov r9, r1, asr #0x10
mov r1, r2, lsl #0x1
add r2, r7, r2, lsl #1
ldrsh r1, [r7, r1]
@@ -5150,16 +5150,16 @@ _02115804:
mov r0, r8
mov r2, r1
bl func_01ff8e84
mov r0, sb, lsl #0x10
mov r0, r9, lsl #0x10
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x1
mov r1, r0, lsl #0x1
add r0, r7, r0, lsl #1
ldrsh sb, [r0, #2]
ldrsh r9, [r0, #2]
ldrsh r10, [r7, r1]
mov r0, r8
mov r2, sb
mov r2, r9
mov r1, r10
blx func_01ff8abc
add r1, sp, #0x7c
@@ -5187,7 +5187,7 @@ _02115804:
mov r2, r1
bl func_01ff8690
mov r1, r10
mov r2, sb
mov r2, r9
mov r0, r6
blx func_01ff8230
add r1, sp, #0x34
@@ -5250,7 +5250,7 @@ _021159d0:
ldr r0, [r5, #0x54]
cmp r0, #0
addeq sp, sp, #0xdc
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r5, #0x58]
cmp r1, #0
bne _02115a44
@@ -5266,11 +5266,11 @@ _021159d0:
ldr r4, [r4, #0x10]
blx r4
add sp, sp, #0xdc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02115a44:
cmp r1, #1
addne sp, sp, #0xdc
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
@@ -5289,7 +5289,7 @@ _02115a44:
ldr r4, [r4, #0x10]
blx r4
add sp, sp, #0xdc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov09_021156a4
_02115a9c: .word data_02050f54
@@ -5360,7 +5360,7 @@ func_ov09_02115b10: ; 0x02115b10
.global func_ov09_02115b5c
arm_func_start func_ov09_02115b5c
func_ov09_02115b5c: ; 0x02115b5c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0xc0
mov r7, r1
ldr r1, [r7, #8]
@@ -5370,11 +5370,11 @@ func_ov09_02115b5c: ; 0x02115b5c
mov r8, r0
mov r5, #0
mvneq r6, #0
mvn sb, #0
mvn r9, #0
_02115b88:
add r0, r8, r5, lsl #2
ldr r0, [r0, #0x458]
cmp r0, sb
cmp r0, r9
bne _02115bb4
ldr r0, [r7, #4]
mov r1, r4
@@ -5468,10 +5468,10 @@ _02115cdc:
ldr r0, [r0, #0x14]
cmp r0, #1
addne sp, sp, #0xc0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
cmp r6, #1
addhi sp, sp, #0xc0
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, [r7, #4]
ldr r0, [r0]
and r0, r0, #4
@@ -5480,7 +5480,7 @@ _02115cdc:
movne r0, #0
cmp r0, #0
addne sp, sp, #0xc0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r0, sp, #0x30
mov r1, #0
bl func_0201b1bc
@@ -5500,7 +5500,7 @@ _02115cdc:
ldmia r5, {r0, r1, r2, r3}
stmia r4, {r0, r1, r2, r3}
add sp, sp, #0xc0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov09_02115b5c
_02115d74: .word data_ov09_0211d9a4
@@ -12746,13 +12746,13 @@ _02119c9c:
.global func_ov09_02119cd4
arm_func_start func_ov09_02119cd4
func_ov09_02119cd4: ; 0x02119cd4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r10, r0
ldr r0, [r10, #4]
cmp r0, #1
addls sp, sp, #0x18
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r3, _02119f98 ; =0x04000444
mov r1, #0
ldr r0, _02119f9c ; =0x21230000
@@ -12776,12 +12776,12 @@ func_ov09_02119cd4: ; 0x02119cd4
str r0, [r3, #0x28]
str r0, [r3, #0x28]
ldr r0, [r10, #4]
ldrh sb, [r10, #8]
ldrh r9, [r10, #8]
sub r0, r0, #1
cmp sb, r0
cmp r9, r0
bhs _02119f84
mov r0, #0x14
mla r7, sb, r0, r10
mla r7, r9, r0, r10
ldr r0, _02119fa4 ; =data_ov03_02100648
ldr r8, [r0]
_02119d6c:
@@ -12908,8 +12908,8 @@ _02119e98:
mov r0, r1, lsr #0x10
str r0, [r5]
ldr r0, [r10, #4]
add sb, sb, #1
cmp sb, r0
add r9, r9, #1
cmp r9, r0
add r7, r7, #0x14
bhs _02119f68
ldr r0, [r7, #4]
@@ -12923,14 +12923,14 @@ _02119f68:
str r1, [r0]
ldr r0, [r10, #4]
sub r0, r0, #1
cmp sb, r0
cmp r9, r0
blo _02119d6c
_02119f84:
ldr r0, _02119fb0 ; =0x04000448
mov r1, #1
str r1, [r0]
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov09_02119cd4
_02119f98: .word 0x04000444
@@ -13635,7 +13635,7 @@ func_ov09_0211a604: ; 0x0211a604
.global func_ov09_0211a69c
arm_func_start func_ov09_0211a69c
func_ov09_0211a69c: ; 0x0211a69c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r8, r0
ldr r0, [r8, #0x8a4]
mov r7, r1
@@ -13643,8 +13643,8 @@ func_ov09_0211a69c: ; 0x0211a69c
mov r6, r2
mov r5, r3
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr sb, _0211a748 ; =data_ov03_0210041c
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r9, _0211a748 ; =data_ov03_0210041c
mov r4, #0
mvn r10, #0
_0211a6cc:
@@ -13662,7 +13662,7 @@ _0211a6cc:
moveq r0, r10
cmp r0, #0
blt _0211a734
ldr r0, [sb, r0, lsl #2]
ldr r0, [r9, r0, lsl #2]
mov r1, r7
bl strcmp
cmp r0, #0
@@ -13673,13 +13673,13 @@ _0211a6cc:
ldrne r0, [r0, #0x8b0]
strne r0, [r1]
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0211a734:
add r4, r4, #1
cmp r4, #3
blo _0211a6cc
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov09_0211a69c
_0211a748: .word data_ov03_0210041c
@@ -13687,18 +13687,18 @@ _0211a748: .word data_ov03_0210041c
.global func_ov09_0211a74c
arm_func_start func_ov09_0211a74c
func_ov09_0211a74c: ; 0x0211a74c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov r10, r0
ldr r0, [r10, #0x8a4]
ldr r11, [sp, #0x30]
cmp r0, #0
str r3, [sp]
mov sb, r1
mov r9, r1
mov r8, r2
addeq sp, sp, #8
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mvn r0, #0
mov r6, #0
str r0, [sp, #4]
@@ -13724,7 +13724,7 @@ _0211a788:
ldr r0, _0211a834 ; =data_ov03_0210041c
ldr r5, [r0, r7, lsl #2]
_0211a7d8:
ldr r1, [sb, r4, lsl #2]
ldr r1, [r9, r4, lsl #2]
mov r0, r5
bl strcmp
cmp r0, #0
@@ -13737,7 +13737,7 @@ _0211a7d8:
strne r0, [r1]
ldr r0, _0211a834 ; =data_ov03_0210041c
ldr r0, [r0, r7, lsl #2]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0211a810:
add r4, r4, #1
cmp r4, r8
@@ -13748,7 +13748,7 @@ _0211a81c:
blo _0211a788
mov r0, #0
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov09_0211a74c
_0211a834: .word data_ov03_0210041c
@@ -18365,7 +18365,7 @@ func_ov09_0211d174: ; 0x0211d174
.global func_ov09_0211d180
arm_func_start func_ov09_0211d180
func_ov09_0211d180: ; 0x0211d180
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x9c
mov r4, r1
ldrsh r7, [r4, #0x1e]
@@ -18377,14 +18377,14 @@ func_ov09_0211d180: ; 0x0211d180
ldr r1, _0211d654 ; =0xfffffccd
str r2, [sp, #0x94]
add r3, r2, r1
ldr sb, [r4, #8]
ldr r9, [r4, #8]
ldr r1, _0211d658 ; =data_027e0e60
mov r5, r0
ldr r0, [r1]
add r1, sp, #0x90
mov r2, r6
str r3, [sp, #0x94]
str sb, [sp, #0x98]
str r9, [sp, #0x98]
bl func_ov00_02083ee0
ldr r1, [sp, #0x94]
cmp r1, r0
@@ -18397,10 +18397,10 @@ func_ov09_0211d180: ; 0x0211d180
ldr r2, [r5, #0x30]
mov r1, #0
sub r2, r2, r0
smull sb, r3, r2, r8
adds sb, sb, #0x800
smull r9, r3, r2, r8
adds r9, r9, #0x800
adc r2, r3, #0
mov r3, sb, lsr #0xc
mov r3, r9, lsr #0xc
orr r3, r3, r2, lsl #20
add r0, r0, r3
str r0, [sp, #0x80]
@@ -18439,22 +18439,22 @@ _0211d28c:
cmp r0, #0
beq _0211d2e0
ldr r3, [r0, #0x20]
ldr sb, [sp, #0x84]
ldr r9, [sp, #0x84]
ldr r3, [r3]
ldr r3, [r3, #4]
add r3, sb, r3
add r3, r9, r3
str r3, [r0, #0x28]
ldr r3, [r0, #0x20]
ldr sb, [sp, #0x88]
ldr r9, [sp, #0x88]
ldr r3, [r3]
ldr r3, [r3, #8]
add r3, sb, r3
add r3, r9, r3
str r3, [r0, #0x2c]
ldr r3, [r0, #0x20]
ldr sb, [sp, #0x8c]
ldr r9, [sp, #0x8c]
ldr r3, [r3]
ldr r3, [r3, #0xc]
add r3, sb, r3
add r3, r9, r3
str r3, [r0, #0x30]
_0211d2e0:
add r1, r1, #4
@@ -18624,7 +18624,7 @@ _0211d420:
add r5, r5, #0x10
mov r4, #0
add r10, sp, #0x3c
add sb, sp, #0x18
add r9, sp, #0x18
mov r7, r8
_0211d574:
ldr r1, [r5]
@@ -18662,7 +18662,7 @@ _0211d574:
str r0, [r1, #0x30]
_0211d5f8:
and r0, r4, #1
mla r1, r0, r7, sb
mla r1, r0, r7, r9
mov r0, r5
bl func_ov00_020b7ea4
_0211d608:
@@ -18671,7 +18671,7 @@ _0211d608:
add r5, r5, #4
blo _0211d574
add sp, sp, #0x9c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_0211d620:
add r3, r5, #0x10
mov r2, #0
@@ -18686,7 +18686,7 @@ _0211d628:
cmp r2, #4
blo _0211d628
add sp, sp, #0x9c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov09_0211d180
_0211d654: .word 0xfffffccd
+363 -363
View File
File diff suppressed because it is too large Load Diff
+326 -326
View File
File diff suppressed because it is too large Load Diff
+26 -26
View File
@@ -1389,7 +1389,7 @@ _02113d44: .word func_ov13_02113c54
.global func_ov13_02113d48
arm_func_start func_ov13_02113d48
func_ov13_02113d48: ; 0x02113d48
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r1, _02113fb8 ; =data_ov13_02116204
movs r4, r0
ldr r6, [r1, #4]
@@ -1398,7 +1398,7 @@ func_ov13_02113d48: ; 0x02113d48
mov r1, r4
bl func_ov13_021130b0
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113d70:
cmp r4, #0
mov r10, #0
@@ -1448,7 +1448,7 @@ _02113d70:
mov r0, r6
mov r1, #0x26
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113e34:
ldrh r0, [r4]
cmp r0, #0x26
@@ -1470,10 +1470,10 @@ _02113e68:
mov r0, r6
mov r1, #0xb
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113e84:
cmp r0, #0xb
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r4, r6, #0x5000
ldr r0, [r4, #0xf4]
cmp r0, #5
@@ -1486,8 +1486,8 @@ _02113e84:
b _02113f14
_02113eb4:
ldrh r0, [r8]
mov sb, r0, lsl #0x1
cmp sb, #0x48
mov r9, r0, lsl #0x1
cmp r9, #0x48
blt _02113f04
ldr r2, [r4, #0xf8]
mov r10, r5
@@ -1507,7 +1507,7 @@ _02113ee4:
bl func_02007ad8
b _02113f20
_02113f04:
add r0, sb, #3
add r0, r9, #3
bic r0, r0, #3
add r8, r8, r0
add r7, r7, #1
@@ -1538,13 +1538,13 @@ _02113f20:
mov r0, r6
mov r1, #0x26
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113f7c:
cmp r10, #0
beq _02113f90
mov r0, #0
bl func_ov13_02113b2c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113f90:
add r0, r6, #0x5000
ldr r1, [r0, #0xf4]
@@ -1555,7 +1555,7 @@ _02113f90:
mov r0, r6
mov r1, #3
bl func_ov13_021131ac
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov13_02113d48
_02113fb8: .word data_ov13_02116204
@@ -1734,7 +1734,7 @@ _021141d4: .word data_ov13_0211620c
.global func_ov13_021141d8
arm_func_start func_ov13_021141d8
func_ov13_021141d8: ; 0x021141d8
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
mov r4, r1
cmp r0, #0xa
@@ -1988,7 +1988,7 @@ _02114554:
add r0, r2, #0x58
mov r11, r10
cmp r1, #0
add sb, r0, r8, lsl #3
add r9, r0, r8, lsl #3
bne _02114598
bl func_ov13_021149ac
cmp r0, #3
@@ -1997,13 +1997,13 @@ _02114598:
cmp r11, #0
cmpne r6, #0
movne r10, #1
strh r8, [sb]
strh r8, [r9]
cmp r7, #0
beq _021145c8
ldrh r0, [r4, #0xa]
strh r0, [sb, #2]
strh r0, [r9, #2]
ldrh r0, [r4, #0xc]
strh r0, [sb, #4]
strh r0, [r9, #4]
ldrh r0, [r4, #0xe]
b _021145ec
_021145c8:
@@ -2012,12 +2012,12 @@ _021145c8:
add r0, r0, #0x240
add r1, r0, #0x5000
ldrh r0, [r1, #4]
strh r0, [sb, #2]
strh r0, [r9, #2]
ldrh r0, [r1, #6]
strh r0, [sb, #4]
strh r0, [r9, #4]
ldrh r0, [r1, #8]
_021145ec:
strh r0, [sb, #6]
strh r0, [r9, #6]
ldr r0, _02114794 ; =data_ov13_0211620c
ldr r1, [sp, #8]
ldr r0, [r0]
@@ -2054,7 +2054,7 @@ _0211464c:
cmp r10, #0
beq _02114788
ldr r0, _02114794 ; =data_ov13_0211620c
mov r1, sb
mov r1, r9
ldr r2, [r0]
mov r0, #4
ldr r2, [r2, #4]
@@ -2129,7 +2129,7 @@ _02114784:
_02114788:
mov r0, r5
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov13_021141d8
_02114794: .word data_ov13_0211620c
@@ -2355,7 +2355,7 @@ _02114a30: .word func_ov13_021140d0
.global func_ov13_02114a34
arm_func_start func_ov13_02114a34
func_ov13_02114a34: ; 0x02114a34
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
mov r8, r0
mov r7, r1
@@ -2381,7 +2381,7 @@ func_ov13_02114a34: ; 0x02114a34
add r0, r0, #0x5000
mov r3, #1
bl func_ov13_02112df4
movs sb, r0
movs r9, r0
bne _02114aac
bl func_0200f248
b _02114af0
@@ -2392,14 +2392,14 @@ _02114aac:
bne _02114ac0
bl func_0200f248
_02114ac0:
mov r0, sb
mov r0, r9
mov r1, r8
mov r2, r7
mov r3, r10
bl func_ov13_02112f24
ldr r7, [sp, #0x2c]
ldr r3, [sp, #0x28]
mov r0, sb
mov r0, r9
mov r1, r6
mov r2, r5
str r7, [sp]
@@ -2408,7 +2408,7 @@ _02114af0:
mov r0, r4
bl func_0200ee60
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov13_02114a34
_02114b00: .word data_ov13_0211620c
+14 -14
View File
@@ -42,7 +42,7 @@ _0213aec8: .word _ZTV10ActorRupee
.global _ZN10ActorRupee8vfunc_08Ev
arm_func_start _ZN10ActorRupee8vfunc_08Ev
_ZN10ActorRupee8vfunc_08Ev: ; 0x0213aecc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r4, r0
ldrh r0, [r4, #0x20]
@@ -108,29 +108,29 @@ _0213afb4:
mvn ip, #0x110
ldr r5, [r0]
ldmib r0, {r3, r7}
umull sb, r0, r7, r5
umull r9, r0, r7, r5
mla r0, r7, r3, r0
ldr r3, _0213b108 ; =data_027e0764
ldr r8, [r3, #0x10]
ldr r6, [r3, #0xc]
adds r10, r8, sb
adds r10, r8, r9
ldr r11, [r3, #0x14]
mla r0, r6, r5, r0
umull r3, lr, r7, r10
adc sb, r11, r0
adc r9, r11, r0
adds r0, r8, r3
str r0, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
mla lr, r7, sb, lr
mla lr, r7, r9, lr
str r10, [r0]
ldr r3, [sp, #0x14]
str sb, [r0, #4]
str r9, [r0, #4]
str r3, [r0]
rsb r0, r1, #0x224
str r0, [sp, #0x10]
umull r0, r5, sb, r0
umull r0, r5, r9, r0
str r0, [sp, #4]
mla r5, sb, r2, r5
mla r5, r9, r2, r5
mla lr, r6, r10, lr
ldr r0, [sp, #0x10]
mov r3, r2
@@ -139,19 +139,19 @@ _0213afb4:
str r0, [sp]
ldr r5, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
adc sb, r11, lr
adc r9, r11, lr
umull r10, r5, r7, r5
mla r5, r7, sb, r5
mla r5, r7, r9, r5
ldr r7, [sp, #0x14]
rsb r1, r1, #0x334
str sb, [r0, #4]
umull r0, r3, sb, r1
str r9, [r0, #4]
umull r0, r3, r9, r1
mla r5, r6, r7, r5
mov r6, r10
adds r6, r8, r6
adc r7, r11, r5
ldr r5, _0213b108 ; =data_027e0764
mla r3, sb, r2, r3
mla r3, r9, r2, r3
mov r0, r2
mla r3, r0, r1, r3
add r0, r3, #0x55
@@ -189,7 +189,7 @@ _0213b0e8:
_0213b0f4:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN10ActorRupee8vfunc_08Ev
_0213b100: .word data_ov14_021589b4
+144 -144
View File
@@ -308,7 +308,7 @@ _0211f97c: .word 0x424d5459
.global func_ov14_0211f980
arm_func_start func_ov14_0211f980
func_ov14_0211f980: ; 0x0211f980
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x20
mov r4, r0
bl func_ov00_02079b78
@@ -318,7 +318,7 @@ func_ov14_0211f980: ; 0x0211f980
bl func_ov14_0211f8d0
cmp r0, #0
addeq sp, sp, #0x20
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0211faa4 ; =gItemManager
mvn r5, #0
ldr r3, _0211faa8 ; =data_027e0d3c
@@ -328,14 +328,14 @@ func_ov14_0211f980: ; 0x0211f980
str r5, [sp, #4]
str r5, [sp, #8]
ldr r8, [r3]
ldr sb, [r2]
ldr r9, [r2]
bl _ZN11ItemManager12GetEquipItemEi
ldr r1, [sp, #0xc]
mov r10, r0
cmp r1, #0
mov r7, #0
addle sp, sp, #0x20
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r11, #3
add r5, sp, #4
_0211f9f8:
@@ -344,11 +344,11 @@ _0211f9f8:
bl func_ov14_0213ed94
ldrb r6, [r0]
ldrb r1, [r0, #1]
mov r0, sb
mov r0, r9
bl func_ov00_02083c50
mov r1, r6
mov r6, r0
mov r0, sb
mov r0, r9
bl func_ov00_02083c24
str r0, [sp, #0x14]
mov r0, #0
@@ -384,7 +384,7 @@ _0211fa8c:
cmp r7, r0
blt _0211f9f8
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_0211f980
_0211faa4: .word gItemManager
@@ -1406,7 +1406,7 @@ func_ov14_021207a0: ; 0x021207a0
.global func_ov14_021207b8
arm_func_start func_ov14_021207b8
func_ov14_021207b8: ; 0x021207b8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x28
mov r5, r0
ldr r7, [r5, #0x130]
@@ -1414,7 +1414,7 @@ func_ov14_021207b8: ; 0x021207b8
cmp r7, #1
mov r6, r3
addeq sp, sp, #0x28
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r2, [r1]
str r2, [r5, #0x164]
ldr r2, [r1, #4]
@@ -1452,7 +1452,7 @@ func_ov14_021207b8: ; 0x021207b8
add r3, r3, r2
add r1, sp, #0x18
mov r2, r0
add sb, r6, r3
add r9, r6, r3
bl func_01ff9bf8
add r0, sp, #0
mov r1, r0
@@ -1465,10 +1465,10 @@ func_ov14_021207b8: ; 0x021207b8
add r0, sp, #0xc
mov r1, r0
bl func_01ff9c2c
smull r3, r2, sb, sb
smull sb, r1, r6, r6
adds ip, sb, #0x800
adc sb, r1, #0
smull r3, r2, r9, r9
smull r9, r1, r6, r6
adds ip, r9, #0x800
adc r9, r1, #0
adds r3, r3, #0x800
mov r1, ip, lsr #0xc
adc r2, r2, #0
@@ -1479,7 +1479,7 @@ func_ov14_021207b8: ; 0x021207b8
adds r2, r2, #0x800
adc r0, r0, #0
mov r2, r2, lsr #0xc
orr r1, r1, sb, lsl #20
orr r1, r1, r9, lsl #20
orr r2, r2, r0, lsl #20
subs r0, r1, r2
bmi _02120914
@@ -1525,7 +1525,7 @@ _0212094c:
ldr r0, [r0, #8]
str r0, [r5, #0x68]
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov14_021207b8
_0212098c: .word data_027e0fe4
@@ -2879,7 +2879,7 @@ _02121bd4:
.global func_ov14_02121be4
arm_func_start func_ov14_02121be4
func_ov14_02121be4: ; 0x02121be4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
bl _ZN5ActorC2Ev
ldr r1, _02121cc0 ; =data_ov14_02155bf0
@@ -2902,14 +2902,14 @@ func_ov14_02121be4: ; 0x02121be4
ldr r7, _02121cd0 ; =0x0000059a
str r3, [r4, #0x244]
ldr r0, _02121cd4 ; =data_027e0d0c
add sb, r4, #0x254
add r9, r4, #0x254
mov r8, #0x1000
add r6, r7, #0x1000
mov r5, #0x22c
mov lr, #2
add ip, r5, #1
ldmia r0, {r0, r1, r2}
stmia sb, {r0, r1, r2}
stmia r9, {r0, r1, r2}
str r8, [r4, #0x260]
strb r3, [r4, #0x26a]
str r3, [r4, #0x7c]
@@ -2933,7 +2933,7 @@ func_ov14_02121be4: ; 0x02121be4
str lr, [r4, #0x234]
str ip, [r4, #0x23c]
str lr, [r4, #0x240]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov14_02121be4
_02121cc0: .word data_ov14_02155bf0
@@ -3099,7 +3099,7 @@ _02121eb0: .word data_ov14_02153bc4
.global func_ov14_02121eb4
arm_func_start func_ov14_02121eb4
func_ov14_02121eb4: ; 0x02121eb4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x104
mov r5, r0
mov r11, r1
@@ -3221,32 +3221,32 @@ _0212204c:
str r3, [r5, #0x68]
add r7, r5, #0x200
ldrh r0, [r7, #0x68]
ldr sb, _02122ac4 ; =data_02050f54
ldr r9, _02122ac4 ; =data_02050f54
ldr r6, _02122ac8 ; =0x000004cd
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
mov r0, r1, lsl #0x1
ldrsh r0, [sb, r0]
ldrsh r0, [r9, r0]
add r1, r1, #1
mov r8, r1, lsl #0x1
umull r2, r1, r0, r6
ldrsh r8, [sb, r8]
ldrsh r8, [r9, r8]
mla r1, r0, r3, r1
umull r10, sb, r8, r6
umull r10, r9, r8, r6
mov r0, r0, asr #0x1f
adds ip, r2, #0x800
mla r1, r0, r6, r1
adc r2, r1, #0
mov ip, ip, lsr #0xc
adds r1, r10, #0x800
mla sb, r8, r3, sb
mla r9, r8, r3, r9
mov r0, r8, asr #0x1f
mla sb, r0, r6, sb
mla r9, r0, r6, r9
ldr r0, [r5, #0x60]
orr ip, ip, r2, lsl #20
add r0, r0, ip
str r0, [r5, #0x60]
adc r0, sb, #0
adc r0, r9, #0
mov r1, r1, lsr #0xc
ldr r2, [r5, #0x68]
orr r1, r1, r0, lsl #20
@@ -3396,9 +3396,9 @@ _021222b4:
mla r7, r6, r3, r7
ldr r10, [r1, #0x10]
mla r7, lr, ip, r7
ldr sb, [r1, #0x14]
ldr r9, [r1, #0x14]
adds r3, r10, r8
adc r6, sb, r7
adc r6, r9, r7
stmia r1, {r3, r6}
umull r1, r3, r6, r0
mla r3, r6, r2, r3
@@ -3898,7 +3898,7 @@ _02122a84:
add r2, r5, #0x48
bl func_ov00_0207a1c8
add sp, sp, #0x104
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_02121eb4
_02122a9c: .word data_027e0ffc
@@ -4240,7 +4240,7 @@ func_ov14_02122eb8: ; 0x02122eb8
.global func_ov14_02122ed4
arm_func_start func_ov14_02122ed4
func_ov14_02122ed4: ; 0x02122ed4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x54
mov r10, r0
ldr r4, [r10, #0x98]
@@ -4265,7 +4265,7 @@ func_ov14_02122ed4: ; 0x02122ed4
add r0, sp, #0x30
bl func_01ff9cec
add r1, sp, #0x3c
mov sb, r0
mov r9, r0
add r11, sp, #0
ldmia r1, {r0, r1, r2}
stmia r11, {r0, r1, r2}
@@ -4282,28 +4282,28 @@ func_ov14_02122ed4: ; 0x02122ed4
mov r0, r3
bl func_01fffb4c
cmp r0, #0
cmpne sb, #0
cmpne r9, #0
beq _02123038
add r6, sp, #0xc
mov r4, r7
mov r11, r7
_02122f90:
cmp sb, r8
cmp r9, r8
ble _02122fb4
mov r0, r8
mov r1, r6
mov r2, r5
mov r3, r5
bl func_01ff9e64
sub sb, sb, r8
sub r9, r9, r8
b _02122fcc
_02122fb4:
mov r0, sb
mov r0, r9
mov r1, r6
mov r2, r5
mov r3, r5
bl func_01ff9e64
mov sb, r4
mov r9, r4
_02122fcc:
ldr r1, [sp, #0x18]
mov r0, r10
@@ -4330,7 +4330,7 @@ _02122fcc:
str r2, [sp, #0x24]
str r1, [sp, #0x28]
str r0, [sp, #0x2c]
cmp sb, #0
cmp r9, #0
bne _02122f90
_02123038:
ldr r1, [r10, #0x48]
@@ -4341,7 +4341,7 @@ _02123038:
ldr r1, [r10, #0x50]
str r1, [r10, #0x5c]
add sp, sp, #0x54
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov14_02122ed4
.global func_ov14_0212305c
@@ -10227,7 +10227,7 @@ _02127b58:
.global func_ov14_02127bb0
arm_func_start func_ov14_02127bb0
func_ov14_02127bb0: ; 0x02127bb0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov r10, r0
cmp r2, #0
@@ -10238,12 +10238,12 @@ func_ov14_02127bb0: ; 0x02127bb0
streq r0, [sp]
ldrb r11, [r10, #0x14]
ldr r0, [sp]
mov sb, r1
mov r9, r1
add r0, r11, r0
moveq r8, r3
cmp r11, r0
addge sp, sp, #8
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r4, _02127c5c ; =data_027e0e60
add r5, sp, #4
_02127bfc:
@@ -10255,7 +10255,7 @@ _02127bfc:
_02127c10:
ldr r0, [r4]
mov r1, r5
mov r2, sb
mov r2, r9
strb r6, [sp, #4]
strb r7, [sp, #5]
bl func_ov00_02082680
@@ -10272,7 +10272,7 @@ _02127c3c:
cmp r11, r0
blt _02127bfc
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_02127bb0
_02127c5c: .word data_027e0e60
@@ -11313,7 +11313,7 @@ _021289a0: .word data_027e0f90
.global func_ov14_021289a4
arm_func_start func_ov14_021289a4
func_ov14_021289a4: ; 0x021289a4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x118
mov r4, r0
bl func_ov14_02127188
@@ -11415,7 +11415,7 @@ _02128a84:
ldr r7, [sp]
ldr r6, [sp, #4]
ldr r5, [sp, #8]
ldr sb, [sp, #0x24]
ldr r9, [sp, #0x24]
ldr r8, [sp, #0x28]
str r7, [sp, #0x94]
ldr r7, [sp, #0x2c]
@@ -11423,8 +11423,8 @@ _02128a84:
ldr r6, [sp, #0x30]
str r5, [sp, #0x9c]
ldr r5, [sp, #0x34]
str sb, [sp, #0xb8]
ldr sb, [sp, #0x38]
str r9, [sp, #0xb8]
ldr r9, [sp, #0x38]
str r8, [sp, #0xbc]
ldr r8, [sp, #0x3c]
str r7, [sp, #0xc0]
@@ -11433,8 +11433,8 @@ _02128a84:
ldr r6, [sp, #0x44]
str r5, [sp, #0xc8]
ldr r5, [sp, #0x48]
str sb, [sp, #0xcc]
ldr sb, [sp, #0x4c]
str r9, [sp, #0xcc]
ldr r9, [sp, #0x4c]
str r8, [sp, #0xd0]
ldr r8, [sp, #0x50]
str r7, [sp, #0xd4]
@@ -11443,7 +11443,7 @@ _02128a84:
ldr r6, [sp, #0x58]
str r5, [sp, #0xdc]
ldr r5, [sp, #0x5c]
str sb, [sp, #0xe0]
str r9, [sp, #0xe0]
str lr, [sp, #0xc]
str ip, [sp, #0x10]
str r3, [sp, #0x14]
@@ -11571,7 +11571,7 @@ _02128d40:
_02128d64:
mov r0, #1
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov14_021289a4
_02128d70: .word data_027e0f90
@@ -12321,7 +12321,7 @@ _02129800: .word 0x00000547
.global func_ov14_02129804
arm_func_start func_ov14_02129804
func_ov14_02129804: ; 0x02129804
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov r8, #0
mov r10, r0
@@ -12330,7 +12330,7 @@ func_ov14_02129804: ; 0x02129804
ldr r7, _02129908 ; =data_ov14_02153c4c
str r8, [sp, #4]
ldr r0, [r7, r2, lsl #2]
mov sb, r8
mov r9, r8
cmp r0, #0
bls _021298bc
ldr r11, _0212990c ; =data_ov14_02153c64
@@ -12340,7 +12340,7 @@ func_ov14_02129804: ; 0x02129804
_02129844:
add r0, r5, r2, lsl #2
str r6, [sp]
ldr r1, [r0, sb, lsl #2]
ldr r1, [r0, r9, lsl #2]
ldr r0, _02129918 ; =data_027e104c
ldr r2, [r4, r2, lsl #2]
ldr r0, [r0]
@@ -12366,15 +12366,15 @@ _021298a4:
mov r8, #1
_021298a8:
ldr r2, [r10, #0xb0]
add sb, sb, #1
add r9, r9, #1
ldr r0, [r7, r2, lsl #2]
cmp sb, r0
cmp r9, r0
blo _02129844
_021298bc:
ldr r0, [sp, #4]
cmp r0, #0
addne sp, sp, #0xc
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r10
cmp r8, #0
mov r2, #0
@@ -12384,13 +12384,13 @@ _021298bc:
mov r1, #0x14
blx r3
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021298f4:
ldr r3, [r3, #0x80]
mov r1, #0x13
blx r3
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_02129804
_02129908: .word data_ov14_02153c4c
@@ -12402,11 +12402,11 @@ _02129918: .word data_027e104c
.global func_ov14_0212991c
arm_func_start func_ov14_0212991c
func_ov14_0212991c: ; 0x0212991c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
movs r10, r2
mov sb, r3
mov r9, r3
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _021299a4 ; =data_ov14_02153c4c
mov r11, #0
ldr r7, [r0, r1, lsl #2]
@@ -12425,10 +12425,10 @@ _02129960:
bl strcmp
cmp r0, #0
bne _02129988
cmp sb, r5
cmp r9, r5
movge r0, #2
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
cmp sb, r4
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
cmp r9, r4
movge r11, #1
_02129988:
add r8, r8, #1
@@ -12438,7 +12438,7 @@ _02129994:
cmp r11, #0
movne r0, #1
moveq r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_0212991c
_021299a4: .word data_ov14_02153c4c
@@ -14811,7 +14811,7 @@ func_ov14_0212b7ec: ; 0x0212b7ec
.global func_ov14_0212b81c
arm_func_start func_ov14_0212b81c
func_ov14_0212b81c: ; 0x0212b81c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x60
mov r7, r0
ldr r1, [r7, #4]
@@ -14896,7 +14896,7 @@ func_ov14_0212b81c: ; 0x0212b81c
ldr r8, _0212b9c8 ; =data_027e0e60
strb r0, [r7, #0x3c]
add r10, sp, #4
mov sb, r0
mov r9, r0
mov r4, r5
_0212b978:
mov r6, r4
@@ -14907,7 +14907,7 @@ _0212b97c:
sub ip, r2, r6
add r3, r1, r5
mov r1, r10
mov r2, sb
mov r2, r9
strb r3, [sp, #4]
strb ip, [sp, #5]
bl func_ov00_02082680
@@ -14918,7 +14918,7 @@ _0212b97c:
cmp r5, #2
blt _0212b978
add sp, sp, #0x60
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov14_0212b81c
_0212b9c4: .word 0x00000b34
@@ -15074,7 +15074,7 @@ func_ov14_0212bb50: ; 0x0212bb50
.global func_ov14_0212bb6c
arm_func_start func_ov14_0212bb6c
func_ov14_0212bb6c: ; 0x0212bb6c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1c
ldr r2, _0212bc94 ; =data_027e0764
mov r3, #0
@@ -15112,9 +15112,9 @@ func_ov14_0212bb6c: ; 0x0212bb6c
ldr r5, [r2, #0xc]
ldr r10, [r2, #0x10]
mla r7, r5, lr, r7
ldr sb, [r2, #0x14]
ldr r9, [r2, #0x14]
adds r5, r10, r8
adc r7, sb, r7
adc r7, r9, r7
stmia r2, {r5, r7}
umull r2, r5, r7, r1
mla r5, r7, r3, r5
@@ -15147,7 +15147,7 @@ func_ov14_0212bb6c: ; 0x0212bb6c
mov r0, r4
bl func_ov14_02146d48
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_0212bb6c
_0212bc94: .word data_027e0764
@@ -19799,7 +19799,7 @@ _0212f7ac: .word func_ov14_02121cd8 - 1
.global func_ov14_0212f7b0
arm_func_start func_ov14_0212f7b0
func_ov14_0212f7b0: ; 0x0212f7b0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x68
mov r4, r0
ldr r1, [r4, #4]
@@ -19957,7 +19957,7 @@ _0212f964:
ble _0212fac8
_0212f9fc:
ldrh r0, [r4, #0x26]
mov sb, #0
mov r9, #0
add r0, r0, #1
cmp r0, #0
ble _0212fab4
@@ -19967,7 +19967,7 @@ _0212f9fc:
add r7, sp, #0x24
_0212fa20:
cmp r8, #0
cmpeq sb, #0
cmpeq r9, #0
beq _0212faa0
ldrb r1, [r4, #0x14]
mov r0, r4
@@ -19975,7 +19975,7 @@ _0212fa20:
add r1, r8, r1
strb r1, [sp, #4]
ldrb r1, [r4, #0x15]
add r1, sb, r1
add r1, r9, r1
strb r1, [sp, #5]
ldr r1, [r0]
ldr r1, [r1, #0x1c]
@@ -19991,7 +19991,7 @@ _0212fa20:
ldrh r0, [r4, #0x24]
cmp r8, r0
ldreqh r0, [r4, #0x26]
cmpeq sb, r0
cmpeq r9, r0
bne _0212faa0
ldr r0, [r5]
mov r1, r6
@@ -20000,9 +20000,9 @@ _0212fa20:
strneb r11, [r0, #0xa9]
_0212faa0:
ldrh r0, [r4, #0x26]
add sb, sb, #1
add r9, r9, #1
add r0, r0, #1
cmp sb, r0
cmp r9, r0
blt _0212fa20
_0212fab4:
ldrh r0, [r4, #0x24]
@@ -20032,7 +20032,7 @@ _0212fb04:
strh r0, [r4, #0x66]
strh r0, [r4, #0x68]
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_0212f7b0
_0212fb18: .word 0x00001333
@@ -21169,7 +21169,7 @@ _021309b8: .word 0x00001334
.global func_ov14_021309bc
arm_func_start func_ov14_021309bc
func_ov14_021309bc: ; 0x021309bc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov r10, r0
ldrb r0, [r10, #0x79]
@@ -21190,7 +21190,7 @@ func_ov14_021309bc: ; 0x021309bc
ldr r4, _02130be0 ; =data_027e0e60
add r6, sp, #6
_02130a0c:
mov sb, #0
mov r9, #0
cmp r8, #0
ble _02130a60
and r7, r11, #0xff
@@ -21198,7 +21198,7 @@ _02130a1c:
ldr r0, [r4]
mov r1, r6
strb r7, [sp, #6]
strb sb, [sp, #7]
strb r9, [sp, #7]
bl func_ov00_020840c4
movs r5, r0
beq _02130a54
@@ -21210,8 +21210,8 @@ _02130a1c:
mov r0, r5
bl func_ov14_021314b8
_02130a54:
add sb, sb, #1
cmp sb, r8
add r9, r9, #1
cmp r9, r8
blt _02130a1c
_02130a60:
ldr r0, [sp]
@@ -21255,11 +21255,11 @@ _02130ae8:
add r0, r8, r0
cmp r8, r0
bgt _02130b7c
ldr sb, _02130be0 ; =data_027e0e60
ldr r9, _02130be0 ; =data_027e0e60
and r6, r7, #0xff
add r5, sp, #4
_02130b08:
ldr r0, [sb]
ldr r0, [r9]
mov r1, r5
strb r6, [sp, #4]
strb r8, [sp, #5]
@@ -21309,14 +21309,14 @@ _02130b94:
mov r2, #1
blx r3
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02130bc8:
mov r1, #1
ldr r3, [r3, #0x80]
mov r2, r1
blx r3
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_021309bc
_02130be0: .word data_027e0e60
@@ -21577,7 +21577,7 @@ _02130f84: .word data_027e0f74
.global func_ov14_02130f88
arm_func_start func_ov14_02130f88
func_ov14_02130f88: ; 0x02130f88
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xe4
mov r4, r0
str r1, [r4, #8]
@@ -21632,10 +21632,10 @@ _02130ff8:
umull r8, r7, r3, r2
mla r7, r3, r0, r7
ldr r0, [r6, #0xc]
ldr sb, [r6, #0x10]
ldr r9, [r6, #0x10]
mla r7, r0, r2, r7
ldr r3, [r6, #0x14]
adds r8, sb, r8
adds r8, r9, r8
mov r1, #0
adc r3, r3, r7
mov r0, #3
@@ -21724,7 +21724,7 @@ _02131100:
ble _02131240
add r6, sp, #0x12
_021311bc:
mov sb, #0
mov r9, #0
cmp r10, #0
ble _02131230
ldr r11, _02131410 ; =data_027e0e60
@@ -21733,12 +21733,12 @@ _021311d0:
ldrb r0, [r4, #0x14]
cmp r8, r0
ldreqb r0, [r4, #0x15]
cmpeq sb, r0
cmpeq r9, r0
beq _02131224
ldr r0, [r11]
mov r1, r6
strb r7, [sp, #0x12]
strb sb, [sp, #0x13]
strb r9, [sp, #0x13]
bl func_ov00_020840c4
movs r5, r0
beq _02131224
@@ -21752,8 +21752,8 @@ _021311d0:
ldreq r0, [r4, #0x70]
streq r0, [r5, #0x70]
_02131224:
add sb, sb, #1
cmp sb, r10
add r9, r9, #1
cmp r9, r10
blt _021311d0
_02131230:
ldr r0, [sp, #0xc]
@@ -21789,7 +21789,7 @@ _02131298:
cmp r0, #0
bne _02131374
ldrh r0, [r4, #0x24]
mov sb, #1
mov r9, #1
cmp r0, #0
bne _02131360
ldrb r0, [r4, #0x7a]
@@ -21824,7 +21824,7 @@ _021312f4:
cmp r0, #0x45
ldreqh r0, [r6, #0x28]
cmpeq r0, #1
moveq sb, r5
moveq r9, r5
_02131330:
ldrb r1, [r4, #0x15]
ldrb r0, [r4, #0x7d]
@@ -21840,7 +21840,7 @@ _02131348:
cmp r11, r0
ble _021312dc
_02131360:
cmp sb, #0
cmp r9, #0
beq _02131374
mov r0, r4
mov r1, #1
@@ -21880,7 +21880,7 @@ _021313e4:
mov r0, #1
str r1, [r4, #0x44]
add sp, sp, #0xe4
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_02130f88
_021313f8: .word data_027e0f64
@@ -21961,13 +21961,13 @@ _0213149c:
.global func_ov14_021314b8
arm_func_start func_ov14_021314b8
func_ov14_021314b8: ; 0x021314b8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov r10, r0
ldrb r0, [r10, #0x79]
cmp r0, #0
addne sp, sp, #0x10
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r0, [r10, #0x14]
ldr r1, _021316c0 ; =data_027e0e60
str r0, [sp, #4]
@@ -22002,12 +22002,12 @@ _02131544:
mov r0, r8
cmp r0, r7
bge _021315cc
ldr sb, _021316c0 ; =data_027e0e60
ldr r9, _021316c0 ; =data_027e0e60
mov r4, #0
add r6, sp, #0xe
_02131560:
ldrb r2, [r10, #0x14]
ldr r0, [sb]
ldr r0, [r9]
mov r1, r6
strb r2, [sp, #0xe]
strb r8, [sp, #0xf]
@@ -22050,9 +22050,9 @@ _021315f4:
ldr r0, [sp, #4]
cmp r0, r1
beq _02131698
ldr sb, [sp]
ldr r9, [sp]
mov r7, #0
mov r0, sb
mov r0, r9
cmp r0, r8
bge _02131684
ldr r0, [sp, #4]
@@ -22062,7 +22062,7 @@ _02131620:
mov r1, r11
ldr r0, [r0]
strb r6, [sp, #0xc]
strb sb, [sp, #0xd]
strb r9, [sp, #0xd]
bl func_ov00_020840c4
mov r5, r0
cmp r5, r10
@@ -22081,8 +22081,8 @@ _02131620:
mov r7, #1
strb r4, [r5, #0x79]
_02131678:
add sb, sb, #1
cmp sb, r8
add r9, r9, #1
cmp r9, r8
blt _02131620
_02131684:
cmp r7, #0
@@ -22101,7 +22101,7 @@ _021316b0:
mov r0, #1
strb r0, [r10, #0x79]
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_021314b8
_021316c0: .word data_027e0e60
@@ -26004,7 +26004,7 @@ func_ov14_02134954: ; 0x02134954
.global func_ov14_0213497c
arm_func_start func_ov14_0213497c
func_ov14_0213497c: ; 0x0213497c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
mov r10, r0
ldr r0, _02134be4 ; =data_027e0e60
@@ -26109,10 +26109,10 @@ _02134ad4:
add r5, sp, #4
mov r11, r6
_02134b00:
ldrb sb, [r10, #0x15]
ldrb r9, [r10, #0x15]
ldrb r0, [r10, #0x3a]
add r0, sb, r0
cmp sb, r0
add r0, r9, r0
cmp r9, r0
bge _02134b64
ldr r0, [sp]
and r8, r0, #0xff
@@ -26121,19 +26121,19 @@ _02134b1c:
mov r1, r7
mov r2, r6
strb r8, [sp, #6]
strb sb, [sp, #7]
strb r9, [sp, #7]
bl func_ov00_02082680
ldr r0, [r4]
mov r1, r5
strb r8, [sp, #4]
strb sb, [sp, #5]
strb r9, [sp, #5]
mov r2, r11
bl func_ov00_020826a0
ldrb r1, [r10, #0x15]
ldrb r0, [r10, #0x3a]
add sb, sb, #1
add r9, r9, #1
add r0, r1, r0
cmp sb, r0
cmp r9, r0
blt _02134b1c
_02134b64:
ldrb r8, [r10, #0x39]
@@ -26168,7 +26168,7 @@ _02134b84:
str r0, [r10, #0x68]
str r5, [r10, #0x6c]
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_0213497c
_02134be4: .word data_027e0e60
@@ -26203,7 +26203,7 @@ func_ov14_02134c0c: ; 0x02134c0c
.global func_ov14_02134c14
arm_func_start func_ov14_02134c14
func_ov14_02134c14: ; 0x02134c14
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
ldr r2, [r0]
mov r10, r0
@@ -26211,7 +26211,7 @@ func_ov14_02134c14: ; 0x02134c14
blx r2
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _02134e04 ; =data_02050f54
add r0, sp, #0x24
@@ -26246,12 +26246,12 @@ _02134c9c:
ldrb r0, [r10, #0x3a]
cmp r0, #0
ble _02134d14
mov sb, r8
mov r9, r8
_02134cc0:
ldr r0, [r10, #0x4c]
cmp r8, #0
streq r0, [sp, #0x20]
addne r0, r0, sb
addne r0, r0, r9
strne r0, [sp, #0x20]
cmp r7, #0
cmpeq r8, #0
@@ -26266,7 +26266,7 @@ _02134cc0:
blx ip
ldrb r0, [r10, #0x3a]
add r8, r8, #1
add sb, sb, #0x1000
add r9, r9, #0x1000
cmp r8, r0
blt _02134cc0
_02134d14:
@@ -26278,7 +26278,7 @@ _02134d24:
ldrb r0, [r10, #0x38]
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrsh r0, [r10, #0xc]
cmp r0, #0x4000
bne _02134d64
@@ -26332,7 +26332,7 @@ _02134d7c:
orr r3, r3, r4, lsl #20
bl func_ov05_02102c2c
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_02134c14
_02134e04: .word data_02050f54
@@ -28194,7 +28194,7 @@ _02136508: .word data_ov00_020e9370
.global func_ov14_0213650c
arm_func_start func_ov14_0213650c
func_ov14_0213650c: ; 0x0213650c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r10, r0
ldr r0, [r10, #0x48]
@@ -28221,7 +28221,7 @@ func_ov14_0213650c: ; 0x0213650c
cmpne r0, #3
moveq r1, #0x4000
mov r0, r1, lsl #0x10
mov sb, r0, lsr #0x10
mov r9, r0, lsr #0x10
_0213657c:
ldr r1, [r10, #0x1a0]
mov r0, r6
@@ -28254,14 +28254,14 @@ _021365e8:
ldr r0, [r8]
add r5, r5, #1
cmp r0, #0
strneh sb, [r0, #0xa4]
strneh r9, [r0, #0xa4]
cmp r5, #2
add r6, r6, #0xc
add r7, r7, #0xc
add r8, r8, #4
blo _0213657c
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_0213650c
_02136614: .word data_ov14_02157d70
@@ -28860,7 +28860,7 @@ _02136e2c: .word data_027e0ffc
.global func_ov14_02136e30
arm_func_start func_ov14_02136e30
func_ov14_02136e30: ; 0x02136e30
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xe4
mov r4, r0
ldr r0, [r4, #0x4c]
@@ -29101,7 +29101,7 @@ _0213716c:
bge _021371b8
cmp r3, r2
addeq sp, sp, #0xe4
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02137190:
ldr r1, [r3]
add r3, r3, #0xc
@@ -29112,7 +29112,7 @@ _02137190:
cmp r3, r2
bne _02137190
add sp, sp, #0xe4
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021371b8:
cmp r3, r2
beq _021371e0
@@ -29186,7 +29186,7 @@ _021372a4:
bl Divide
ldr r7, _021373d0 ; =data_ov14_02157ecc
ldr r8, _021373d4 ; =data_ov14_02157eb4
add sb, r4, #0x210
add r9, r4, #0x210
mov r10, r0, asr #0x1f
mov r6, #0
_021372c8:
@@ -29230,17 +29230,17 @@ _021372c8:
mla r3, r10, r2, r3
adds r5, r5, #0x800
adc r2, r3, #0
ldr r1, [sb]
ldr r1, [r9]
mov r3, r5, lsr #0xc
orr r3, r3, r2, lsl #20
ldr r2, [sp, #0x1c]
cmp r1, #0
strne r4, [r1, #0x58]
ldr r1, [sb]
ldr r1, [r9]
add r3, r2, r3
cmp r1, #0
strneh r11, [r1, #0x74]
ldr r2, [sb]
ldr r2, [r9]
mov r1, r3, lsl #0x10
mov r1, r1, asr #0x10
cmp r2, #0
@@ -29249,10 +29249,10 @@ _021372c8:
cmp r6, #2
add r7, r7, #0xc
add r8, r8, #0xc
add sb, sb, #0xc
add r9, r9, #0xc
blo _021372c8
add sp, sp, #0xe4
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov14_02136e30
_021373c4: .word 0x0000ffff
+452 -452
View File
File diff suppressed because it is too large Load Diff
+2271 -2271
View File
File diff suppressed because it is too large Load Diff
+199 -199
View File
File diff suppressed because it is too large Load Diff
+294 -294
View File
File diff suppressed because it is too large Load Diff
+23 -23
View File
@@ -322,7 +322,7 @@ func_ov19_0216daa4: ; 0x0216daa4
.global func_ov19_0216dac8
arm_func_start func_ov19_0216dac8
func_ov19_0216dac8: ; 0x0216dac8
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
movs r4, r1
mov r5, r0
@@ -437,16 +437,16 @@ _0216dc18:
ldrsh lr, [r2, r6]
ldrsh r6, [r2, r0]
ldr r7, [r3, #0x65c]
smull r0, sb, r8, lr
smull r0, r9, r8, lr
adds r0, r0, #0x800
adc r8, sb, #0
adc r8, r9, #0
smull lr, r6, r7, r6
adds r7, lr, #0x800
mov sb, r0, lsr #0xc
mov r9, r0, lsr #0xc
adc r0, r6, #0
mov r6, r7, lsr #0xc
orr sb, sb, r8, lsl #20
add r7, sb, #0x7000
orr r9, r9, r8, lsl #20
add r7, r9, #0x7000
orr r6, r6, r0, lsl #20
add r0, r7, r6
str r0, [sp, #4]
@@ -493,12 +493,12 @@ _0216dc18:
cmpne r4, #1
cmpne r4, #3
addne sp, sp, #0x24
ldmneia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
mov r0, r5
bl _ZN5Actor16XzDistanceToLinkEv
cmp r0, #0x800
addle sp, sp, #0x24
ldmleia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, pc}
mov r0, r5
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
@@ -506,7 +506,7 @@ _0216dc18:
add r0, r5, #0x78
bl func_0202b154
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov19_0216dac8
_0216dd94: .word data_027e0f94
@@ -978,7 +978,7 @@ func_ov19_0216e310: ; 0x0216e310
.global func_ov19_0216e334
arm_func_start func_ov19_0216e334
func_ov19_0216e334: ; 0x0216e334
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x7c
mov r4, r0
add r0, sp, #0x50
@@ -1095,10 +1095,10 @@ _0216e46c:
umull r7, r6, r10, ip
mla r6, r10, r3, r6
ldr lr, [r5, #0xc]
ldr sb, [r5, #0x10]
ldr r9, [r5, #0x10]
mla r6, lr, ip, r6
ldr r8, [r5, #0x14]
adds r3, sb, r7
adds r3, r9, r7
adc ip, r8, r6
ldr r6, _0216e68c ; =0x00004001
ldr r11, [sp, #0x2c]
@@ -1116,7 +1116,7 @@ _0216e46c:
umull r7, r6, r10, r3
mla r6, r10, ip, r6
mla r6, lr, r3, r6
adds r3, sb, r7
adds r3, r9, r7
adc r6, r8, r6
stmia r5, {r3, r6}
ldr r3, _0216e68c ; =0x00004001
@@ -1155,14 +1155,14 @@ _0216e46c:
str r1, [sp, #0x38]
str r0, [sp, #0x40]
ldmib r5, {r1, r7}
umull sb, r8, r7, r3
umull r9, r8, r7, r3
add r0, sp, #0x38
mla r8, r7, r1, r8
ldr r6, [r5, #0xc]
ldr r11, [r5, #0x10]
mla r8, r6, r3, r8
ldr r10, [r5, #0x14]
adds r1, r11, sb
adds r1, r11, r9
adc r3, r10, r8
stmia r5, {r1, r3}
mov r1, #0x7c
@@ -1183,7 +1183,7 @@ _0216e46c:
_0216e64c:
add sp, sp, #0x7c
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e658:
ldr r0, [sp, #4]
add r4, r4, #0x7b
@@ -1197,7 +1197,7 @@ _0216e658:
_0216e67c:
mov r0, #1
add sp, sp, #0x7c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov19_0216e334
_0216e688: .word data_02050f54
@@ -7824,11 +7824,11 @@ _02173d50: .word data_027e0fe4
.global func_ov19_02173d54
arm_func_start func_ov19_02173d54
func_ov19_02173d54: ; 0x02173d54
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov r10, r0
ldrb r7, [r10, #0x14]
mov sb, r1
mov r9, r1
add r0, r7, #2
cmp r7, r0
bge _02173e1c
@@ -7842,7 +7842,7 @@ _02173d80:
bge _02173e08
and r6, r7, #0xff
_02173d94:
cmp sb, #0
cmp r9, #0
ldr r0, [r4]
beq _02173dcc
mov r1, r5
@@ -7892,7 +7892,7 @@ _02173e1c:
ldr r1, [r1]
mov r2, r5
bl func_ov00_02093a4c
cmp sb, #0
cmp r9, #0
add r2, sp, #8
beq _02173ea0
ldr r1, [sp, #8]
@@ -7912,7 +7912,7 @@ _02173e1c:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02173ea0:
ldr r0, _02173eec ; =data_027e0f6c
ldr r1, [sp, #8]
@@ -7931,7 +7931,7 @@ _02173ea0:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov19_02173d54
_02173ee8: .word data_027e0e60
+116 -116
View File
@@ -130,7 +130,7 @@ _0216d844: .word func_ov20_0216da18
.global func_ov20_0216d848
arm_func_start func_ov20_0216d848
func_ov20_0216d848: ; 0x0216d848
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
ldr r1, _0216d9fc ; =data_027e0f74
mov r10, r0
@@ -140,7 +140,7 @@ func_ov20_0216d848: ; 0x0216d848
cmp r0, #0
addne sp, sp, #0x44
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, _0216da00 ; =data_ov20_02178320
mov r0, r10
bl func_ov00_020ca8a4
@@ -160,7 +160,7 @@ func_ov20_0216d848: ; 0x0216d848
ldr r11, _0216da04 ; =0x46425331
ldr r5, _0216da08 ; =data_027e0fe8
ldr r4, _0216da0c ; =data_027e0fe4
mov sb, #0
mov r9, #0
add r8, sp, #0x18
mvn r7, #0
add r6, sp, #4
@@ -186,21 +186,21 @@ _0216d8d0:
ldr r0, [r4]
mov r1, r6
bl _ZN12ActorManager8GetActorEP8ActorRef
add r1, r10, sb, lsl #2
add r1, r10, r9, lsl #2
str r0, [r1, #0xa40]
mov r1, sb
mov r1, r9
bl func_ov20_021702b4
add r0, sb, #1
add r0, r9, #1
mov r0, r0, lsl #0x10
mov sb, r0, asr #0x10
cmp sb, #3
mov r9, r0, asr #0x10
cmp r9, #3
blt _0216d8d0
mov r7, #0
add r0, r10, #0x24c
ldr r6, _0216da10 ; =data_02050f54
ldr r4, _0216da14 ; =0x55555556
mov r8, r7
add sb, r0, #0x800
add r9, r0, #0x800
mov r5, r7
mov r11, #0x2000
_0216d968:
@@ -220,7 +220,7 @@ _0216d968:
mov r0, r11
str r2, [sp, #0x14]
add r1, sp, #0xc
mov r3, sb
mov r3, r9
add r2, r10, #0x48
str r5, [sp, #0x10]
bl func_01ff9e64
@@ -230,7 +230,7 @@ _0216d968:
mov r7, r1, asr #0x10
cmp r7, #3
add r8, r0, #0xff00
add sb, sb, #0xc
add r9, r9, #0xc
blt _0216d968
add r2, r10, #0xa00
mov r1, #0
@@ -240,7 +240,7 @@ _0216d968:
bl func_ov20_0216dae8
mov r0, #1
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216d848
_0216d9fc: .word data_027e0f74
@@ -334,7 +334,7 @@ _0216dae0:
.global func_ov20_0216dae8
arm_func_start func_ov20_0216dae8
func_ov20_0216dae8: ; 0x0216dae8
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x124
mov r7, r0
mov r4, #0
@@ -382,7 +382,7 @@ _0216db78:
str r4, [r7, #0x12c]
strb r4, [r7, #0x11a]
str r0, [r7, #0x20c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216dba4:
mov r1, #1
ldr r0, _0216e520 ; =data_027e0fc8
@@ -415,7 +415,7 @@ _0216dba4:
mov r1, #0x1000
str r1, [r0, #0x10]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216dc24:
add r0, r7, #0x21c
mov r1, #5
@@ -424,7 +424,7 @@ _0216dc24:
mov r1, #0x1000
str r1, [r0, #0x10]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216dc44:
add r0, sp, #0xb0
mov r1, #3
@@ -456,29 +456,29 @@ _0216dc60:
ldr r2, [r7, #0xa78]
ldr r1, [sp, #0xa8]
str r2, [sp, #0x98]
ldr sb, [r7, #0xa7c]
ldr r9, [r7, #0xa7c]
ldr r0, [sp, #0xac]
add r1, sb, r1
str sb, [sp, #0x9c]
smull r10, sb, r0, r3
add r1, r9, r1
str r9, [sp, #0x9c]
smull r10, r9, r0, r3
adds r10, r10, #0x800
rsb lr, r3, #0
adc r3, sb, #0
mov sb, r10, lsr #0xc
orr sb, sb, r3, lsl #20
add r3, r2, sb
smull sb, r2, r0, r8
adc r3, r9, #0
mov r9, r10, lsr #0xc
orr r9, r9, r3, lsl #20
add r3, r2, r9
smull r9, r2, r0, r8
mov r0, #0x800
adds r0, sb, r0
mov sb, r0, lsr #0xc
adds r0, r9, r0
mov r9, r0, lsr #0xc
adc r2, r2, #0
orr sb, sb, r2, lsl #20
orr r9, r9, r2, lsl #20
ldr r2, [r7, #0xa80]
ldr r0, [sp, #0xa4]
str r1, [sp, #0x9c]
add r2, r2, sb
add r2, r2, r9
smull r8, r1, r0, r8
smull r10, sb, r0, lr
smull r10, r9, r0, lr
mov r0, #0x800
adds r0, r8, r0
adc r1, r1, #0
@@ -490,7 +490,7 @@ _0216dc60:
adds r1, r10, r0
mov r8, #0
mov r0, r8
adc r0, sb, r0
adc r0, r9, r0
mov r1, r1, lsr #0xc
orr r1, r1, r0, lsl #20
add r0, r2, r1
@@ -511,15 +511,15 @@ _0216dc60:
strb r1, [r7, #0x11a]
add sp, sp, #0x124
str r0, [r7, #0x20c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216dd98:
bl func_ov20_0216f7d0
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216dda4:
bl func_ov20_0216f898
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216ddb0:
str r4, [r7, #0xa78]
str r4, [r7, #0xa7c]
@@ -566,7 +566,7 @@ _0216de34:
mov r0, r7
bl func_ov20_0216fa20
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216de60:
add r0, sp, #0x8c
mov r1, #3
@@ -597,7 +597,7 @@ _0216de88:
mov r0, r1, lsl #0x1
ldrsh r11, [r4, r0]
add r0, r4, r1, lsl #1
ldrsh sb, [r0, #2]
ldrsh r9, [r0, #2]
ldr r0, _0216e53c ; =data_ov20_02177878
rsb r8, r11, #0
ldmia r0, {r0, r1, r2}
@@ -615,7 +615,7 @@ _0216de88:
mov r1, r1, lsr #0xc
orr r1, r1, r0, lsl #20
add r2, r2, r1
smull r11, r1, ip, sb
smull r11, r1, ip, r9
mov r0, #0x800
adds r11, r11, r0
mov r0, #0
@@ -626,8 +626,8 @@ _0216de88:
ldr r0, [sp, #0x80]
add r1, r11, r1
str r10, [sp, #0x78]
smull r11, r10, r0, sb
smull sb, r8, r0, r8
smull r11, r10, r0, r9
smull r9, r8, r0, r8
mov r0, #0x800
adds r11, r11, r0
mov r0, #0
@@ -637,7 +637,7 @@ _0216de88:
add r0, r2, r10
str r0, [sp, #0x74]
mov r0, #0x800
adds r2, sb, r0
adds r2, r9, r0
mov r0, #0
adc r0, r8, r0
mov r2, r2, lsr #0xc
@@ -663,7 +663,7 @@ _0216de88:
str r1, [r7, #0x12c]
bl func_ov20_0216fc48
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216dfdc:
add r0, r7, r4, lsl #2
ldr r0, [r0, #0xa40]
@@ -702,25 +702,25 @@ _0216dfdc:
cmp r0, #2
beq _0216e09c
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e074:
add r0, r7, #0xa00
mov r1, #0x190
strh r1, [r0, #0x9c]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e088:
add r0, r7, #0xa00
mov r1, #0x12c
strh r1, [r0, #0x9c]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e09c:
add r0, r7, #0xa00
mov r1, #0xc8
strh r1, [r0, #0x9c]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e0b0:
mov r1, r4
add r0, r7, #0x21c
@@ -733,7 +733,7 @@ _0216e0b0:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e0e0:
str r4, [r7, #0x12c]
add r0, r7, #0x21c
@@ -750,7 +750,7 @@ _0216e0e0:
str r4, [r7, #0x20c]
bl func_ov00_020ceacc
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e120:
ldr r0, _0216e544 ; =data_027e0f94
add r3, sp, #0x68
@@ -768,7 +768,7 @@ _0216e120:
ldr r0, _0216e548 ; =data_027e0764
add r3, r7, #0x28c
ldr r10, [r0, #0x10]
ldr sb, [r0, #0x14]
ldr r9, [r0, #0x14]
ldr r8, [r0, #8]
ldr r4, [r0]
ldr r6, [r0, #0xc]
@@ -778,7 +778,7 @@ _0216e120:
mla r11, r8, r0, r11
mla r11, r6, r4, r11
ldr r0, _0216e548 ; =data_027e0764
adc r11, sb, r11
adc r11, r9, r11
str ip, [r0]
str r11, [r0, #4]
ldr r0, _0216e54c ; =0x00008001
@@ -818,7 +818,7 @@ _0216e120:
mla r0, r8, r11, r0
mla r0, r6, ip, r0
adds r8, r10, lr
adc r6, sb, r0
adc r6, r9, r0
ldr r0, _0216e548 ; =data_027e0764
str r4, [sp, #0x64]
str r8, [r0]
@@ -845,7 +845,7 @@ _0216e120:
movne r0, #0
cmp r0, #0
addeq sp, sp, #0x124
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216e550 ; =data_027e0e60
add r2, sp, #0x44
ldr r0, [r0]
@@ -868,7 +868,7 @@ _0216e120:
add sp, sp, #0x124
cmp r0, r1
strgt r1, [r7, #0xa94]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e2f4:
add r0, r7, #0x21c
mov r1, #1
@@ -881,7 +881,7 @@ _0216e2f4:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e324:
add r0, r7, #0x21c
mov r1, #2
@@ -894,7 +894,7 @@ _0216e324:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e354:
add r0, r7, #0x21c
mov r1, #6
@@ -909,7 +909,7 @@ _0216e354:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e38c:
mov r0, #2
str r0, [r7, #0x12c]
@@ -920,7 +920,7 @@ _0216e38c:
mov r1, #0x1000
str r1, [r0, #0x10]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e3b4:
add r0, r7, #0x21c
mov r1, #3
@@ -931,7 +931,7 @@ _0216e3b4:
str r2, [r1, #0x10]
bl func_ov20_0216fc48
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e3dc:
ldr r0, _0216e554 ; =data_027e0f90
mov r1, r4
@@ -992,7 +992,7 @@ _0216e3dc:
add r2, sp, #0x14
bl func_ov00_020888e8
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e4cc:
add r0, r7, #0x48
add r4, sp, #0x2c
@@ -1014,7 +1014,7 @@ _0216e4cc:
bl func_ov00_0207c31c
_0216e514:
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216dae8
_0216e51c: .word 0x0000ffff
@@ -1087,7 +1087,7 @@ _0216e600: .word data_ov00_020eec68
.global func_ov20_0216e604
arm_func_start func_ov20_0216e604
func_ov20_0216e604: ; 0x0216e604
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1e4
mov r4, r0
ldr r0, [r4, #0x130]
@@ -1294,7 +1294,7 @@ _0216e858:
str r1, [sp, #0x3c]
str r10, [sp, #0x24]
ldr r10, [r0, #0x5c]
ldr sb, [r0, #4]
ldr r9, [r0, #4]
ldr r8, [r0, #8]
ldr r7, [r0, #0xc]
ldr r6, [r0, #0x14]
@@ -1318,7 +1318,7 @@ _0216e858:
mov r1, #1
str r0, [sp, #0x19c]
ldr r0, [sp, #0xc]
str sb, [sp, #0x164]
str r9, [sp, #0x164]
str r0, [sp, #0x1a0]
ldr r0, [sp, #0x10]
str r8, [sp, #0x168]
@@ -2069,7 +2069,7 @@ _0216f42c:
_0216f460:
mov r0, #1
add sp, sp, #0x1e4
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216e604
_0216f46c: .word data_027e0fc8
@@ -2189,15 +2189,15 @@ _0216f5ac: .word 0x0000071c
.global func_ov20_0216f5b0
arm_func_start func_ov20_0216f5b0
func_ov20_0216f5b0: ; 0x0216f5b0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mov sb, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r9, r0
mov r8, r1
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
ldr r2, _0216f70c ; =0x0000071c
add r0, sb, #0x78
add r0, r9, #0x78
bl func_0202b154
mov r0, sb
mov r0, r9
mov r1, r8
bl _ZN5Actor10GetAngleToEP5Vec3p
mov r0, r0, lsl #0x10
@@ -2208,16 +2208,16 @@ func_ov20_0216f5b0: ; 0x0216f5b0
ldr r2, _0216f710 ; =data_02050f54
mov r3, r1, lsl #0x1
mov r1, r0, lsl #0x1
add r0, sb, #0x60
add r0, r9, #0x60
ldrsh r6, [r2, r3]
ldrsh r7, [r2, r1]
bl func_01ff9cec
mov r4, r0
add r0, sb, #0x48
add r0, r9, #0x48
mov r1, r8
bl func_ov00_020ce2f0
mov r5, r0
mov r0, sb
mov r0, r9
mov r1, r8
bl _ZN5Actor12XzDistanceToEP5Vec3p
cmp r0, #0x2000
@@ -2256,30 +2256,30 @@ _0216f694:
adds r1, r1, #0x800
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
str r3, [sb, #0x60]
str r3, [r9, #0x60]
mov r2, #0
adc r0, r0, #0
mov r1, r1, lsr #0xc
str r2, [sb, #0x64]
str r2, [r9, #0x64]
orr r1, r1, r0, lsl #20
str r1, [sb, #0x68]
str r1, [r9, #0x68]
ldr r2, [r8, #4]
ldr r0, [sb, #0x4c]
ldr r0, [r9, #0x4c]
ldr r1, _0216f714 ; =0x0000019a
sub r2, r2, r0
str r2, [sb, #0x64]
str r2, [r9, #0x64]
cmp r2, r1
strgt r1, [sb, #0x64]
strgt r1, [r9, #0x64]
bgt _0216f6f8
sub r0, r1, #0x334
cmp r2, r0
strlt r0, [sb, #0x64]
strlt r0, [r9, #0x64]
_0216f6f8:
mov r0, sb
mov r0, r9
ldr r1, [r0]
ldr r1, [r1, #0x104]
blx r1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov20_0216f5b0
_0216f70c: .word 0x0000071c
@@ -2577,7 +2577,7 @@ _0216fa68: .word 0x00001003
.global func_ov20_0216fa6c
arm_func_start func_ov20_0216fa6c
func_ov20_0216fa6c: ; 0x0216fa6c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x3c
mov r4, r0
add r0, sp, #0x10
@@ -2597,19 +2597,19 @@ func_ov20_0216fa6c: ; 0x0216fa6c
ldr r0, _0216fb88 ; =data_027e0764
str r4, [sp, #0x30]
ldr r5, [r0, #8]
ldr sb, [r0]
ldr r9, [r0]
ldr r8, [r0, #4]
umull ip, r10, r5, sb
umull ip, r10, r5, r9
mla r10, r5, r8, r10
ldr r4, [r0, #0xc]
ldr r7, [r0, #0x10]
mla r10, r4, sb, r10
mla r10, r4, r9, r10
ldr r6, [r0, #0x14]
adds sb, r7, ip
adds r9, r7, ip
adc r8, r6, r10
ldr r10, _0216fb88 ; =data_027e0764
ldr r11, _0216fb8c ; =0x00004001
str sb, [r10]
str r9, [r10]
str r8, [r10, #4]
umull r10, ip, r8, r11
mov r10, #0
@@ -2619,9 +2619,9 @@ func_ov20_0216fa6c: ; 0x0216fa6c
sub r10, ip, #0x2000
add r10, lr, r10
str r10, [sp, #4]
umull ip, r10, r5, sb
umull ip, r10, r5, r9
mla r10, r5, r8, r10
mla r10, r4, sb, r10
mla r10, r4, r9, r10
adds r5, r7, ip
mov r2, r3
ldr r4, _0216fb88 ; =data_027e0764
@@ -2646,7 +2646,7 @@ func_ov20_0216fa6c: ; 0x0216fa6c
movge r0, #1
movlt r0, #0
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216fa6c
_0216fb84: .word data_027e0f94
@@ -6124,7 +6124,7 @@ _02172958: .word data_027e0764
.global func_ov20_0217295c
arm_func_start func_ov20_0217295c
func_ov20_0217295c: ; 0x0217295c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x3c
mov r4, r0
add r0, sp, #0x10
@@ -6145,19 +6145,19 @@ func_ov20_0217295c: ; 0x0217295c
ldr r0, _02172a74 ; =data_027e0764
mov r2, r3
ldr r5, [r0, #8]
ldr sb, [r0]
ldr r9, [r0]
ldr r8, [r0, #4]
umull ip, r10, r5, sb
umull ip, r10, r5, r9
mla r10, r5, r8, r10
ldr r4, [r0, #0xc]
ldr r7, [r0, #0x10]
mla r10, r4, sb, r10
mla r10, r4, r9, r10
ldr r6, [r0, #0x14]
adds sb, r7, ip
adds r9, r7, ip
adc r8, r6, r10
ldr r10, _02172a74 ; =data_027e0764
ldr r11, _02172a78 ; =0x00006001
str sb, [r10]
str r9, [r10]
str r8, [r10, #4]
umull r10, ip, r8, r11
mov r10, #0
@@ -6167,9 +6167,9 @@ func_ov20_0217295c: ; 0x0217295c
sub r10, ip, #0x3000
add r10, lr, r10
str r10, [sp, #4]
umull ip, r10, r5, sb
umull ip, r10, r5, r9
mla r10, r5, r8, r10
mla r10, r4, sb, r10
mla r10, r4, r9, r10
adds r5, r7, ip
ldr r4, _02172a74 ; =data_027e0764
adc r6, r6, r10
@@ -6193,7 +6193,7 @@ func_ov20_0217295c: ; 0x0217295c
movge r0, #1
movlt r0, #0
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0217295c
_02172a74: .word data_027e0764
@@ -6720,7 +6720,7 @@ _0217315c: .word data_027e0d44
.global func_ov20_02173160
arm_func_start func_ov20_02173160
func_ov20_02173160: ; 0x02173160
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r3, _0217324c ; =0x0000ffff
ldr r2, _02173250 ; =0x040004c0
@@ -6729,10 +6729,10 @@ func_ov20_02173160: ; 0x02173160
mov r10, r0
str r1, [r2, #-0x1c]
ldrh r0, [r10, #0x64]
mov sb, #0
mov r9, #0
cmp r0, #0
addle sp, sp, #0x14
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r5, _02173258 ; =data_027e0d44
ldr r4, _0217325c ; =0x35200000
sub r8, r2, #0x18
@@ -6740,9 +6740,9 @@ func_ov20_02173160: ; 0x02173160
mov r11, #0x31
mov r6, #0x20
_021731ac:
add r0, r10, sb, lsl #2
add r0, r10, r9, lsl #2
ldr r0, [r0, #0x88]
add ip, r10, sb, lsl #3
add ip, r10, r9, lsl #3
cmp r0, #0
movge r2, r11
ldr r0, [r5]
@@ -6775,11 +6775,11 @@ _021731ac:
str r3, [sp]
bl func_ov05_0210e344
ldrh r0, [r10, #0x64]
add sb, sb, #1
cmp sb, r0
add r9, r9, #1
cmp r9, r0
blt _021731ac
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_02173160
_0217324c: .word 0x0000ffff
@@ -6791,7 +6791,7 @@ _0217325c: .word 0x35200000
.global func_ov20_02173260
arm_func_start func_ov20_02173260
func_ov20_02173260: ; 0x02173260
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x118
mov r4, r0
str r1, [r4, #8]
@@ -6852,7 +6852,7 @@ _021732a8:
ldr r6, [sp, #4]
ldr r5, [sp, #8]
ldr r10, [sp]
ldr sb, [sp, #0x24]
ldr r9, [sp, #0x24]
ldr r8, [sp, #0x28]
ldr r7, [sp, #0x2c]
ldr lr, [sp, #0x30]
@@ -6863,8 +6863,8 @@ _021732a8:
str r10, [sp, #0x94]
ldr r10, [sp, #0x34]
str ip, [sp, #0xa0]
str sb, [sp, #0xb8]
ldr sb, [sp, #0x40]
str r9, [sp, #0xb8]
ldr r9, [sp, #0x40]
str r8, [sp, #0xbc]
ldr r8, [sp, #0x44]
str r7, [sp, #0xc0]
@@ -6877,7 +6877,7 @@ _021732a8:
str r5, [sp, #0xd0]
ldr r5, [sp, #0x58]
str r10, [sp, #0xc8]
str sb, [sp, #0xd4]
str r9, [sp, #0xd4]
str r2, [sp, #0x14]
str r1, [sp, #0x18]
str r0, [sp, #0x20]
@@ -6993,7 +6993,7 @@ _02173534:
_0217354c:
mov r0, #1
add sp, sp, #0x118
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov20_02173260
_02173558: .word data_027e0f64
@@ -12022,7 +12022,7 @@ _021774e4: .word data_ov20_021793bc
arm_func_start func_ov20_021774e8
func_ov20_021774e8: ; 0x021774e8
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
ldr r0, _021775cc ; =data_027e0e60
ldrb r1, [sp, #0x4c]
@@ -12036,13 +12036,13 @@ func_ov20_021774e8: ; 0x021774e8
bl func_ov00_02083c7c
mov r8, #0
ldr r4, _021775cc ; =data_027e0e60
mov sb, r8
mov r9, r8
add r5, sp, #0xc
mov r7, r8
mov r11, #0x400
add r6, sp, #0
_02177538:
mov r1, sb, lsl #0x10
mov r1, r9, lsl #0x10
mov r0, r6
mov r1, r1, asr #0x10
str r7, [sp]
@@ -12074,11 +12074,11 @@ _0217759c:
_021775a8:
add r8, r8, #1
cmp r8, #4
add sb, sb, #0x4000
add r9, r9, #0x4000
blt _02177538
mov r0, r10
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
add sp, sp, #0x10
bx lr
.align 2, 0
+39 -39
View File
@@ -2313,14 +2313,14 @@ func_ov21_0216f234: ; 0x0216f234
.global func_ov21_0216f25c
arm_func_start func_ov21_0216f25c
func_ov21_0216f25c: ; 0x0216f25c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x50
mov r4, r0
bl func_ov21_02170334
cmp r0, #0
addeq sp, sp, #0x50
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r1, #0
str r1, [r4, #0x16c]
ldr r2, [r4, #0x48]
@@ -2364,12 +2364,12 @@ func_ov21_0216f25c: ; 0x0216f25c
orr r1, r1, #0xd
strh r1, [r4, #0x9c]
ldr ip, [r4, #0x4c]
ldr sb, [r4, #0x50]
ldr r9, [r4, #0x50]
ldr r8, [r4, #0x48]
sub r10, sb, #0x1000
sub r10, r9, #0x1000
sub r1, r8, #0x1000
sub r2, ip, #0x800
add sb, sb, #0x1000
add r9, r9, #0x1000
add r8, r8, #0x1000
str r10, [sp, #0x4c]
str r1, [sp, #0x44]
@@ -2378,7 +2378,7 @@ func_ov21_0216f25c: ; 0x0216f25c
stmia r7, {r0, r1, r2}
str r8, [sp, #0x38]
str ip, [sp, #0x3c]
str sb, [sp, #0x40]
str r9, [sp, #0x40]
ldmia r6, {r0, r1, r2}
stmia r5, {r0, r1, r2}
str lr, [sp]
@@ -2391,7 +2391,7 @@ func_ov21_0216f25c: ; 0x0216f25c
mov r0, r4
bl func_ov14_02137970
add sp, sp, #0x50
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov21_0216f25c
.global func_ov21_0216f398
@@ -2724,7 +2724,7 @@ _0216f7c4: .word 0x00000477
.global func_ov21_0216f7c8
arm_func_start func_ov21_0216f7c8
func_ov21_0216f7c8: ; 0x0216f7c8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
mov r10, r0
ldr r0, [r10, #0x224]
@@ -2733,14 +2733,14 @@ func_ov21_0216f7c8: ; 0x0216f7c8
cmpeq r0, #0
addeq sp, sp, #0x118
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r10
mov r1, #0
bl func_01fffd04
cmp r0, #0
addeq sp, sp, #0x118
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r10, #0x48
add r1, r10, #0x54
add r2, r10, #0x60
@@ -2749,7 +2749,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
cmp r0, #0x1e
addlt sp, sp, #0x118
movlt r0, #0
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216fb80 ; =0x0000ffff
mov r5, #0
add r4, sp, #0x48
@@ -2804,7 +2804,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
cmp r0, #0
addne sp, sp, #0x118
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216fb88 ; =data_ov21_02171bb4
ldr r0, [r0, #0x20]
tst r0, #1
@@ -2873,7 +2873,7 @@ _0216f9c0:
ldr r1, [r10, #0x48]
add r0, r0, #0x9a
add r0, r0, #0x900
ldr sb, _0216fb90 ; =data_ov21_02171750
ldr r9, _0216fb90 ; =data_ov21_02171750
ldr r4, _0216fb84 ; =data_027e0e60
str r1, [sp, #0x3c]
str r0, [sp, #0x40]
@@ -2890,7 +2890,7 @@ _0216fa3c:
str r0, [sp, #0x34]
str r1, [sp, #0x38]
mov r0, r7
mov r1, sb
mov r1, r9
mov r2, r7
bl func_01ff9bc4
ldr r1, [r4]
@@ -2916,11 +2916,11 @@ _0216fa3c:
cmp r0, #0
addeq sp, sp, #0x118
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fac4:
add r8, r8, #1
cmp r8, #4
add sb, sb, #0xc
add r9, r9, #0xc
blt _0216fa3c
ldr r0, [r10, #0x224]
ldr r1, [r10, #0x228]
@@ -2967,7 +2967,7 @@ _0216fb60:
_0216fb74:
mov r0, #0
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_0216f7c8
_0216fb80: .word 0x0000ffff
@@ -3037,7 +3037,7 @@ _0216fc58: .word data_027e0fc8
.global func_ov21_0216fc5c
arm_func_start func_ov21_0216fc5c
func_ov21_0216fc5c: ; 0x0216fc5c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r2
ldr r2, [r4]
@@ -3051,7 +3051,7 @@ func_ov21_0216fc5c: ; 0x0216fc5c
mov r2, r3
bl func_ov21_02170050
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fc98:
ldrb r0, [sp, #0x68]
cmp r0, #0
@@ -3062,7 +3062,7 @@ _0216fc98:
mov r2, r4
bl func_ov21_021701b0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fcc0:
ldr r0, _0216fffc ; =data_ov21_02171bb4
ldr r0, [r0, #0x54]
@@ -3194,7 +3194,7 @@ _0216fe2c:
ldr r2, [sp, #0x28]
add sp, sp, #0x44
str r2, [r1, #4]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fec4:
rsb r0, r0, #0
str r0, [sp, #8]
@@ -3226,7 +3226,7 @@ _0216ff0c:
ldr r0, [sp]
ldr r1, [r0, #4]
ldr r3, [r0]
add sb, r2, r1
add r9, r2, r1
add r0, r6, r3
str r0, [sp, #0x10]
sub r8, r0, #1
@@ -3234,7 +3234,7 @@ _0216ff44:
ldr r6, [sp, #0x20]
_0216ff48:
str r8, [sp, #0x24]
add r7, r6, sb
add r7, r6, r9
str r7, [sp, #0x28]
ldr r0, [r4]
bl func_ov00_020cf05c
@@ -3251,9 +3251,9 @@ _0216ff48:
ldr r1, [sp, #0x10]
ldr r0, [sp, #4]
add sp, sp, #0x44
stmia r0, {r1, sb}
stmia r0, {r1, r9}
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216ff9c:
add r6, r6, #1
cmp r6, #1
@@ -3280,7 +3280,7 @@ _0216ffdc:
ble _0216fe2c
mov r0, #0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_0216fc5c
_0216fffc: .word data_ov21_02171bb4
@@ -3313,7 +3313,7 @@ func_ov21_0217004c: ; 0x0217004c
.global func_ov21_02170050
arm_func_start func_ov21_02170050
func_ov21_02170050: ; 0x02170050
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x28
mov r10, r1
ldr r1, [r10]
@@ -3350,11 +3350,11 @@ _021700cc:
mov r0, r5
cmp r0, r6
bgt _02170180
rsb sb, r4, #0
rsb r9, r4, #0
_021700e0:
cmp r4, #0
movge r0, r4
movlt r0, sb
movlt r0, r9
cmp r0, r6
bge _02170108
cmp r5, #0
@@ -3389,7 +3389,7 @@ _02170108:
ldr r2, [sp, #0xc]
add sp, sp, #0x28
str r2, [r1, #4]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02170174:
add r5, r5, #1
cmp r5, r6
@@ -3404,7 +3404,7 @@ _0217018c:
bgt _021700b8
mov r0, #0
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_02170050
_021701a4: .word data_027e0d3c
@@ -3414,13 +3414,13 @@ _021701ac: .word data_027e103c
.global func_ov21_021701b0
arm_func_start func_ov21_021701b0
func_ov21_021701b0: ; 0x021701b0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x28
mov sb, r1
ldr r2, [sb]
mov r9, r1
ldr r2, [r9]
ldr r1, _02170328 ; =data_027e0d3c
str r2, [sp, #8]
ldr r4, [sb, #4]
ldr r4, [r9, #4]
mov r10, r0
ldr r0, [r1]
add r1, sp, #8
@@ -3464,11 +3464,11 @@ _02170240:
cmp r0, r6
blt _021702f8
_02170268:
ldr r0, [sb]
ldr r0, [r9]
mov r2, #0
add r8, r4, r0
str r8, [sp, #8]
ldr r0, [sb, #4]
ldr r0, [r9, #4]
add r1, r5, r0
str r1, [sp, #0xc]
ldr r0, [r10, #0x21c]
@@ -3499,7 +3499,7 @@ _02170268:
ldr r2, [sp, #0xc]
add sp, sp, #0x28
str r2, [r1, #4]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021702f8:
add r5, r5, #1
cmp r5, r6
@@ -3514,7 +3514,7 @@ _02170310:
bgt _02170218
mov r0, #0
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_021701b0
_02170328: .word data_027e0d3c
+105 -105
View File
@@ -927,7 +927,7 @@ func_ov22_0216e278: ; 0x0216e278
.global func_ov22_0216e2a8
arm_func_start func_ov22_0216e2a8
func_ov22_0216e2a8: ; 0x0216e2a8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x68
mov r10, r0
ldr r1, [r10, #4]
@@ -1020,13 +1020,13 @@ _0216e404:
beq _0216e53c
ldrh r2, [r10, #0x24]
ldrh r1, [r10, #0x26]
mov sb, #0
mov r9, #0
mov r0, #1
strh r2, [sp, #0x24]
strh r1, [sp, #0x26]
ldrh r2, [r10, #0x28]
ldrh r1, [r10, #0x2a]
mov r6, sb
mov r6, r9
add r11, sp, #0x24
strh r2, [sp, #0x28]
strh r1, [sp, #0x2a]
@@ -1044,8 +1044,8 @@ _0216e404:
strh r1, [sp, #0x34]
ldrb r1, [r10, #0x36]
strb r1, [sp, #0x36]
strb sb, [sp, #4]
strb sb, [sp, #5]
strb r9, [sp, #4]
strb r9, [sp, #5]
strh r0, [sp, #0x2a]
ldrb r0, [r10, #0x66]
cmp r0, #0
@@ -1083,10 +1083,10 @@ _0216e4a8:
bl func_ov00_020840c4
cmp r0, #0
beq _0216e51c
strb sb, [r0, #0x65]
cmp sb, #0
moveq sb, #1
movne sb, #0
strb r9, [r0, #0x65]
cmp r9, #0
moveq r9, #1
movne r9, #0
_0216e51c:
ldrb r0, [r10, #0x67]
add r7, r7, #1
@@ -1109,13 +1109,13 @@ _0216e53c:
mov r1, #3
blx r3
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e56c:
ldr r3, [r3, #0x80]
mov r1, #0
blx r3
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216e2a8
_0216e580: .word 0x00001334
@@ -1272,7 +1272,7 @@ _0216e774: .word 0xffffe4cd
.global func_ov22_0216e778
arm_func_start func_ov22_0216e778
func_ov22_0216e778: ; 0x0216e778
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x188
mov r4, r0
str r1, [r4, #8]
@@ -1344,14 +1344,14 @@ _0216e87c:
ldrb r0, [r4, #0x64]
cmp r0, #0
beq _0216e9d8
mov sb, #0
strb sb, [sp, #0xa]
strb sb, [sp, #0xb]
mov r9, #0
strb r9, [sp, #0xa]
strb r9, [sp, #0xb]
ldrb r0, [r4, #0x66]
cmp r0, #0
ble _0216e958
mov r5, #2
mov r11, sb
mov r11, r9
add r8, sp, #0xa
_0216e8ac:
ldrb r0, [r4, #0x67]
@@ -1359,13 +1359,13 @@ _0216e8ac:
cmp r0, #0
ble _0216e948
_0216e8bc:
cmp sb, #0
cmp r9, #0
cmpeq r10, #0
beq _0216e938
ldrb r2, [r4, #0x14]
ldr r0, _0216ec8c ; =data_027e0e60
mov r1, r8
add r2, sb, r2
add r2, r9, r2
strb r2, [sp, #0xa]
ldrb r2, [r4, #0x15]
ldr r0, [r0]
@@ -1397,8 +1397,8 @@ _0216e938:
blt _0216e8bc
_0216e948:
ldrb r0, [r4, #0x66]
add sb, sb, #1
cmp sb, r0
add r9, r9, #1
cmp r9, r0
blt _0216e8ac
_0216e958:
ldrb r1, [r4, #0x67]
@@ -1509,14 +1509,14 @@ _0216eae8:
ldrb r0, [r4, #0x64]
cmp r0, #0
beq _0216ec44
mov sb, #0
strb sb, [sp, #8]
strb sb, [sp, #9]
mov r9, #0
strb r9, [sp, #8]
strb r9, [sp, #9]
ldrb r0, [r4, #0x66]
cmp r0, #0
ble _0216ebc4
mov r5, #5
mov r11, sb
mov r11, r9
add r8, sp, #8
_0216eb18:
ldrb r0, [r4, #0x67]
@@ -1524,13 +1524,13 @@ _0216eb18:
cmp r0, #0
ble _0216ebb4
_0216eb28:
cmp sb, #0
cmp r9, #0
cmpeq r10, #0
beq _0216eba4
ldrb r2, [r4, #0x14]
ldr r0, _0216ec8c ; =data_027e0e60
mov r1, r8
add r2, sb, r2
add r2, r9, r2
strb r2, [sp, #8]
ldrb r2, [r4, #0x15]
ldr r0, [r0]
@@ -1562,8 +1562,8 @@ _0216eba4:
blt _0216eb28
_0216ebb4:
ldrb r0, [r4, #0x66]
add sb, sb, #1
cmp sb, r0
add r9, r9, #1
cmp r9, r0
blt _0216eb18
_0216ebc4:
ldrb r1, [r4, #0x67]
@@ -1617,7 +1617,7 @@ _0216ec74:
mov r0, #1
str r1, [r4, #0x44]
add sp, sp, #0x188
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216e778
_0216ec88: .word data_027e0f74
@@ -1800,7 +1800,7 @@ func_ov22_0216ee60: ; 0x0216ee60
.global func_ov22_0216ee88
arm_func_start func_ov22_0216ee88
func_ov22_0216ee88: ; 0x0216ee88
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x20
mov r4, r0
ldr r0, [r4, #0x18]
@@ -1877,9 +1877,9 @@ _0216ef5c:
str r1, [r4, #0x40]
_0216efa0:
ldrb r0, [r4, #0x14]
ldrb sb, [r4, #0x38]
ldrb r9, [r4, #0x38]
str r0, [sp]
add r1, r0, sb
add r1, r0, r9
cmp r0, r1
bge _0216f050
mov r7, #1
@@ -1894,17 +1894,17 @@ _0216efcc:
cmp r10, r0
bge _0216f030
ldr r0, [sp]
and sb, r0, #0xff
and r9, r0, #0xff
_0216efe8:
ldr r0, [r5]
mov r1, r8
mov r2, r7
strb sb, [sp, #6]
strb r9, [sp, #6]
strb r10, [sp, #7]
bl func_ov00_02082680
ldr r0, [r5]
mov r1, r6
strb sb, [sp, #4]
strb r9, [sp, #4]
strb r10, [sp, #5]
mov r2, r11
bl func_ov00_020826a0
@@ -1915,17 +1915,17 @@ _0216efe8:
cmp r10, r0
blt _0216efe8
_0216f030:
ldrb sb, [r4, #0x38]
ldrb r9, [r4, #0x38]
ldrb r1, [r4, #0x14]
ldr r0, [sp]
add r0, r0, #1
add r1, r1, sb
add r1, r1, r9
str r0, [sp]
cmp r0, r1
blt _0216efcc
_0216f050:
ldrb r0, [r4, #0x39]
mov r6, sb, lsl #0xc
mov r6, r9, lsl #0xc
mov r1, r6, asr #0x1
mov r5, r0, lsl #0xc
mov r0, r5, asr #0x1
@@ -1942,12 +1942,12 @@ _0216f050:
mov r0, #0
str r0, [r4, #0x60]
str r0, [r4, #0x64]
cmp r5, sb, lsl #12
cmp r5, r9, lsl #12
movgt r6, r5
str r0, [r4, #0x68]
str r6, [r4, #0x6c]
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216ee88
_0216f0b0: .word data_027e0e60
@@ -1982,7 +1982,7 @@ func_ov22_0216f0d8: ; 0x0216f0d8
.global func_ov22_0216f0e0
arm_func_start func_ov22_0216f0e0
func_ov22_0216f0e0: ; 0x0216f0e0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
ldr r2, [r0]
mov r10, r0
@@ -1990,7 +1990,7 @@ func_ov22_0216f0e0: ; 0x0216f0e0
blx r2
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _0216f2b8 ; =data_02050f54
add r0, sp, #0x24
@@ -2025,12 +2025,12 @@ _0216f168:
ldrb r0, [r10, #0x39]
cmp r0, #0
ble _0216f1dc
mov sb, r8
mov r9, r8
_0216f18c:
ldr r0, [r10, #0x4c]
cmp r8, #0
streq r0, [sp, #0x20]
addne r0, r0, sb
addne r0, r0, r9
strne r0, [sp, #0x20]
cmp r7, #0
cmpeq r8, #0
@@ -2044,7 +2044,7 @@ _0216f18c:
blx r3
ldrb r0, [r10, #0x39]
add r8, r8, #1
add sb, sb, #0x1000
add r9, r9, #0x1000
cmp r8, r0
blt _0216f18c
_0216f1dc:
@@ -2105,7 +2105,7 @@ _0216f22c:
orr r3, r3, r4, lsl #20
bl func_ov05_02102c2c
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216f0e0
_0216f2b8: .word data_02050f54
@@ -2952,7 +2952,7 @@ _0216fd98: .word func_ov22_0216f41c
.global func_ov22_0216fd9c
arm_func_start func_ov22_0216fd9c
func_ov22_0216fd9c: ; 0x0216fd9c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
mov r6, r0
cmp r1, #8
@@ -3089,11 +3089,11 @@ _0216ff6c:
mov r8, #0
ldr r0, [r0]
sub r7, r8, #2
mov sb, #0x47
mov r9, #0x47
mov r3, #0xff
add r2, sp, #0x24
mov r1, #2
str sb, [sp, #0x24]
str r9, [sp, #0x24]
str r8, [sp, #0x28]
str r8, [sp, #0x2c]
str r7, [sp, #0x30]
@@ -3136,12 +3136,12 @@ _0216ffdc:
add r8, sp, #8
str r1, [sp, #8]
str r0, [sp, #0xc]
mov sb, #0
mov r9, #0
add r6, sp, #0x18
mov r5, #2
add r7, sp, #0x10
_02170058:
ldr r10, [r7, sb, lsl #2]
ldr r10, [r7, r9, lsl #2]
ldr r0, [r10]
cmp r0, #0
beq _021700c4
@@ -3172,7 +3172,7 @@ _021700b4:
_021700c4:
str r5, [sp]
ldr r0, [r11]
ldr r2, [r8, sb, lsl #2]
ldr r2, [r8, r9, lsl #2]
mov r1, r10
add r3, r4, #0x400
bl func_ov00_0207c1f8
@@ -3183,8 +3183,8 @@ _021700c4:
mov r1, r6
bl func_ov00_020b7ea4
_021700f4:
add sb, sb, #1
cmp sb, #2
add r9, r9, #1
cmp r9, #2
blt _02170058
b _0217012c
_02170104:
@@ -3203,7 +3203,7 @@ _02170120:
_0217012c:
add sp, sp, #0x48
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02170138:
add r0, r6, #0x1d8
mov r1, #5
@@ -3244,11 +3244,11 @@ _021701b0:
mov r2, r2, asr #0x10
bl func_0202b154
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021701c8:
mov r0, #1
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216fd9c
_021701d4: .word data_027e0e58
@@ -4258,7 +4258,7 @@ _02170ef4: .word data_ov22_021793cc
.global func_ov22_02170ef8
arm_func_start func_ov22_02170ef8
func_ov22_02170ef8: ; 0x02170ef8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x38
mov r4, r0
ldr r1, [r4, #0x14]
@@ -4432,12 +4432,12 @@ _021710fc:
add r8, sp, #0x10
str r1, [sp, #0x10]
str r0, [sp, #0x14]
mov sb, #0
mov r9, #0
add r6, sp, #0x20
mov r5, #2
add r7, sp, #0x18
_02171180:
ldr r10, [r7, sb, lsl #2]
ldr r10, [r7, r9, lsl #2]
ldr r0, [r10]
cmp r0, #0
beq _021711ec
@@ -4468,7 +4468,7 @@ _021711dc:
_021711ec:
str r5, [sp]
ldr r0, [r11]
ldr r2, [r8, sb, lsl #2]
ldr r2, [r8, r9, lsl #2]
mov r1, r10
add r3, r4, #0x7c
bl func_ov00_0207c1f8
@@ -4479,8 +4479,8 @@ _021711ec:
mov r1, r6
bl func_ov00_020b7ea4
_0217121c:
add sb, sb, #1
cmp sb, #2
add r9, r9, #1
cmp r9, #2
blt _02171180
b _02171280
_0217122c:
@@ -4521,7 +4521,7 @@ _02171280:
add r0, r4, #0x360
bl func_ov00_020c5e20
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_02170ef8
_021712ac: .word data_027e0ffc
@@ -9155,14 +9155,14 @@ func_ov22_02174ea0: ; 0x02174ea0
.global func_ov22_02174f00
arm_func_start func_ov22_02174f00
func_ov22_02174f00: ; 0x02174f00
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r5, r0
mov r4, r1
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02175058 ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -9183,7 +9183,7 @@ func_ov22_02174f00: ; 0x02174f00
str r0, [sp]
cmp r0, r1
addge sp, sp, #0x18
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02174f74:
ldrb r4, [sp, #4]
ldrb r1, [sp, #5]
@@ -9209,9 +9209,9 @@ _02174f9c:
ldr r2, [r6, #0xc]
ldr r10, [r6, #0x10]
mla ip, r2, r1, ip
ldr sb, [r6, #0x14]
ldr r9, [r6, #0x14]
adds r0, r10, lr
adc r2, sb, ip
adc r2, r9, ip
stmia r6, {r0, r2}
umull r0, r1, r2, r11
mov r0, #0
@@ -9244,7 +9244,7 @@ _02175038:
cmp r0, r1
blt _02174f74
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_02174f00
_02175058: .word data_027e0f64
@@ -9969,7 +9969,7 @@ _02175954: .word data_ov22_0217a568
.global func_ov22_02175958
arm_func_start func_ov22_02175958
func_ov22_02175958: ; 0x02175958
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
bl _ZN13LinkStateBase10GetStateIdEv
cmp r0, #6
@@ -10000,10 +10000,10 @@ func_ov22_02175958: ; 0x02175958
ldrsh r5, [r6, r5]
mov r6, r7, asr #0x1f
mov lr, r5, asr #0x1f
umull sb, r8, r7, r2
umull r9, r8, r7, r2
mla r8, r7, ip, r8
mla r8, r6, r2, r8
adds r6, sb, #0x800
adds r6, r9, #0x800
adc r2, r8, #0
mov r6, r6, lsr #0xc
orr r6, r6, r2, lsl #20
@@ -10036,7 +10036,7 @@ func_ov22_02175958: ; 0x02175958
bl _ZN13LinkStateBase15ChangeLinkStateEi
_02175a5c:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov22_02175958
_02175a64: .word data_ov22_0217a568
@@ -10214,31 +10214,31 @@ _02175c40: .word data_027e0e58
.global func_ov22_02175c44
arm_func_start func_ov22_02175c44
func_ov22_02175c44: ; 0x02175c44
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
mov sb, r0
ldr r0, [sb, #0x18]
ldr r2, [sb, #0x20]
ldr r1, [sb, #0x1c]
mov r9, r0
ldr r0, [r9, #0x18]
ldr r2, [r9, #0x20]
ldr r1, [r9, #0x1c]
add r0, r0, #0x800
str r0, [sb, #0x40]
str r1, [sb, #0x44]
str r0, [r9, #0x40]
str r1, [r9, #0x44]
add r1, r2, #0x7800
str r1, [sb, #0x48]
str r1, [r9, #0x48]
ldr r0, _02175cfc ; =data_027e0e60
add r1, sb, #0x18
add r1, r9, #0x18
ldr r0, [r0]
bl func_ov00_0208344c
ldrb r7, [sb, #0x14]
ldrb r7, [r9, #0x14]
add r0, r7, #2
cmp r7, r0
addge sp, sp, #4
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldr r10, _02175cfc ; =data_027e0e60
add r5, sp, #0
mov r4, #1
_02175ca0:
ldrb r8, [sb, #0x15]
ldrb r8, [r9, #0x15]
add r0, r8, #0x10
cmp r8, r0
bge _02175ce0
@@ -10250,19 +10250,19 @@ _02175cb4:
strb r6, [sp]
strb r8, [sp, #1]
bl func_ov00_02082680
ldrb r0, [sb, #0x15]
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #0x10
cmp r8, r0
blt _02175cb4
_02175ce0:
ldrb r0, [sb, #0x14]
ldrb r0, [r9, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _02175ca0
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov22_02175c44
_02175cfc: .word data_027e0e60
@@ -12102,7 +12102,7 @@ _021774c0:
.global func_ov22_021774c8
arm_func_start func_ov22_021774c8
func_ov22_021774c8: ; 0x021774c8
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x54
mov r4, r0
add r0, r4, #0x48
@@ -12169,23 +12169,23 @@ _02177548:
ldr r2, [r7, #0x14]
ldr r6, _021776fc ; =0x00001001
adc ip, r2, r8
umull sb, r8, r1, lr
umull r9, r8, r1, lr
mla r8, r1, ip, r8
mla r8, r0, lr, r8
adds r3, r3, sb
adds r3, r3, r9
adc r8, r2, r8
str lr, [r7]
str ip, [r7, #4]
umull r2, sb, ip, r6
umull r2, r9, ip, r6
mov r1, #0
mla sb, ip, r1, sb
mla r9, ip, r1, r9
sub r0, r6, #0x800
stmia r7, {r3, r8}
umull r2, r3, r8, r0
mla r3, r8, r1, r3
mla sb, r1, r6, sb
mla r9, r1, r6, r9
mla r3, r1, r0, r3
sub r0, sb, #0x800
sub r0, r9, #0x800
add r2, r5, r0
ldr r1, [sp, #0x50]
sub r0, r3, #0x3000
@@ -12241,11 +12241,11 @@ _02177684:
mov r0, #1
add r1, r1, #1
str r1, [r4, #0x328]
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_021776d4:
mov r0, #0
add sp, sp, #0x54
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov22_021774c8
_021776e0: .word data_ov22_02178880
@@ -12878,7 +12878,7 @@ func_ov22_02177ddc: ; 0x02177ddc
.global func_ov22_02177e04
arm_func_start func_ov22_02177e04
func_ov22_02177e04: ; 0x02177e04
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x20
mov r4, r1
mov r8, r0
@@ -12901,15 +12901,15 @@ func_ov22_02177e04: ; 0x02177e04
str r0, [sp, #0x14]
str r1, [sp, #0x18]
str r2, [sp, #0x1c]
mov sb, r10
mov r9, r10
mov r8, #0xf7
add r7, sp, #0x14
mov r6, #4
mov r5, r10
mov r11, #0xf8
_02177e78:
str sb, [sp]
str sb, [sp, #4]
str r9, [sp]
str r9, [sp, #4]
ldr r0, [r4]
mov r1, r8
mov r2, r7
@@ -12940,7 +12940,7 @@ _02177ecc:
ldr r1, [r8, #0x1c]
sub r0, r0, #0x800
mov r7, #0
ldr sb, _02177f58 ; =data_027e0e58
ldr r9, _02177f58 ; =data_027e0e58
str r0, [sp, #8]
str r1, [sp, #0xc]
str r2, [sp, #0x10]
@@ -12950,7 +12950,7 @@ _02177ecc:
_02177f10:
str r6, [sp]
str r6, [sp, #4]
ldr r0, [sb]
ldr r0, [r9]
mov r1, r5
mov r3, r4
add r2, r8, #0x18
@@ -12964,7 +12964,7 @@ _02177f10:
_02177f44:
mov r0, #1
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_02177e04
_02177f50: .word data_027e0ffc
+82 -82
View File
@@ -2368,7 +2368,7 @@ _0216f424: .word func_ov00_020cd028
.global func_ov23_0216f428
arm_func_start func_ov23_0216f428
func_ov23_0216f428: ; 0x0216f428
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x1fc
mov r6, r1
mov r5, r0
@@ -2404,8 +2404,8 @@ func_ov23_0216f428: ; 0x0216f428
cmp r4, r0
addne sp, sp, #0x1fc
mov r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldr sb, _0216f87c ; =0x0000ffff
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldr r9, _0216f87c ; =0x0000ffff
ldr lr, [sp, #0xc8]
ldr ip, [sp, #0xd0]
ldr r7, [sp, #0xbc]
@@ -2413,10 +2413,10 @@ func_ov23_0216f428: ; 0x0216f428
str r4, [sp, #0xc0]
str r4, [sp, #0xcc]
add r1, sp, #0x114
strh sb, [r1, #0xac]
strh sb, [r1, #0xae]
strh sb, [r1, #0xb0]
strh sb, [r1, #0xb2]
strh r9, [r1, #0xac]
strh r9, [r1, #0xae]
strh r9, [r1, #0xb0]
strh r9, [r1, #0xb2]
strh r0, [r1, #0xb4]
ldr r8, _0216f880 ; =0x00000733
add r2, sp, #0xac
@@ -2460,7 +2460,7 @@ func_ov23_0216f428: ; 0x0216f428
cmp r0, #0
addne sp, sp, #0x1fc
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
ldr r1, _0216f884 ; =data_027e0fe4
ldr r2, _0216f888 ; =0x4e545250
ldr r1, [r1]
@@ -2497,7 +2497,7 @@ func_ov23_0216f428: ; 0x0216f428
cmp r0, #0
addne sp, sp, #0x1fc
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0216f630:
ldr r1, _0216f884 ; =data_027e0fe4
ldr r2, _0216f88c ; =0x50534241
@@ -2533,7 +2533,7 @@ _0216f630:
strb r2, [sp, #0x1f]
addeq sp, sp, #0x1fc
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0216f6bc:
ldr r0, _0216f878 ; =data_027e0e60
mov r1, r6
@@ -2548,7 +2548,7 @@ _0216f6bc:
bne _0216f6f4
add sp, sp, #0x1fc
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0216f6f4:
ldr r4, _0216f890 ; =_ZTV11FilterActor
mov r1, #0
@@ -2641,7 +2641,7 @@ _0216f7b4:
_0216f84c:
add sp, sp, #0x1fc
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0216f858:
ldr r0, [sp, #0x98]
add r4, r4, #1
@@ -2651,7 +2651,7 @@ _0216f858:
_0216f86c:
mov r0, #1
add sp, sp, #0x1fc
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov23_0216f428
_0216f878: .word data_027e0e60
@@ -3814,14 +3814,14 @@ func_ov23_021707dc: ; 0x021707dc
.global func_ov23_021707e0
arm_func_start func_ov23_021707e0
func_ov23_021707e0: ; 0x021707e0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x18
mov r5, r0
ldr r0, [r5, #0x1bc]
mov r4, r1
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r1, [r4]
mov r0, #0
str r1, [sp, #0xc]
@@ -3844,16 +3844,16 @@ func_ov23_021707e0: ; 0x021707e0
add r1, sp, #0
mov r0, r4
bl func_01ff9d4c
ldr sb, [sp]
ldr r9, [sp]
mov r1, #0x2800
umull r0, r10, sb, r1
umull r0, r10, r9, r1
mov r2, #0
ldr lr, [sp, #4]
adds r0, r0, #0x800
umull r7, r6, lr, r1
ldr r3, [sp, #8]
mla r10, sb, r2, r10
mov r8, sb, asr #0x1f
mla r10, r9, r2, r10
mov r8, r9, asr #0x1f
mla r10, r8, r1, r10
umull ip, r4, r3, r1
mla r6, lr, r2, r6
@@ -3918,7 +3918,7 @@ _0217093c:
str r2, [sp, #0x14]
bl func_ov00_020b7ea4
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_02170980:
ldr r1, [r5, #0x1bc]
cmp r1, #0
@@ -3926,7 +3926,7 @@ _02170980:
orrne r0, r0, #2
strne r0, [r1, #0x24]
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov23_021707e0
_0217099c: .word 0x0000059a
@@ -6401,7 +6401,7 @@ _02172994: .word 0x0000099a
.global func_ov23_02172998
arm_func_start func_ov23_02172998
func_ov23_02172998: ; 0x02172998
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x2c
mov r4, r0
bl func_ov23_02173014
@@ -6443,7 +6443,7 @@ func_ov23_02172998: ; 0x02172998
cmp r0, #0
moveq r0, #2
movne r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02172a44:
add r0, r4, #0x184
mov r2, #0
@@ -6453,7 +6453,7 @@ _02172a44:
strb r2, [sp, #3]
bl func_ov00_020c5374
mvn r7, #0
ldr sb, _02172b14 ; =data_027e0e60
ldr r9, _02172b14 ; =data_027e0e60
mov r6, r7
add r10, sp, #0x1c
add r5, sp, #0
@@ -6462,7 +6462,7 @@ _02172a74:
_02172a78:
ldrb r2, [sp, #2]
ldrb r1, [sp, #3]
ldr r0, [sb]
ldr r0, [r9]
add r3, r2, r7
add r2, r1, r8
mov r1, r5
@@ -6486,7 +6486,7 @@ _02172a78:
cmp r0, #0
addne sp, sp, #0x2c
movne r0, #2
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02172ae4:
add r8, r8, #1
cmp r8, #1
@@ -6496,7 +6496,7 @@ _02172ae4:
ble _02172a74
mov r0, #0
add sp, sp, #0x2c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov23_02172998
_02172b08: .word data_027e0fe4
@@ -6957,7 +6957,7 @@ _02173120: .word data_02050f54
.global func_ov23_02173124
arm_func_start func_ov23_02173124
func_ov23_02173124: ; 0x02173124
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10c
mov r6, r0
bl func_ov23_02173014
@@ -7037,7 +7037,7 @@ _021731ec:
str r0, [sp, #4]
ldr r0, _021734dc ; =0x00000733
sub r8, r0, #0x400
mov sb, r8
mov r9, r8
_02173260:
ldr r0, _021734d8 ; =data_027e0fe4
ldr r1, [sp, #0x2c]
@@ -7076,10 +7076,10 @@ _02173260:
str r2, [r4, #0x64]
ldrsh r3, [r1, #2]
mov r1, #0
umull r11, r10, r3, sb
umull r11, r10, r3, r9
mla r10, r3, r1, r10
mov r2, r3, asr #0x1f
mla r10, r2, sb, r10
mla r10, r2, r9, r10
adds r2, r11, #0x800
adc r1, r10, #0
mov r2, r2, lsr #0xc
@@ -7114,7 +7114,7 @@ _02173364:
ldr r0, _021734dc ; =0x00000733
mov r11, r5
sub r7, r0, #0x400
add sb, r6, #0x184
add r9, r6, #0x184
mov r8, r7
_02173388:
ldrb r1, [sp, #0x13]
@@ -7135,7 +7135,7 @@ _02173388:
cmp r0, #0x24
bne _021734a8
mov r0, r10
add r1, sb, #0x400
add r1, r9, #0x400
bl func_ov00_0208b7d0
cmp r0, #0
beq _021734a8
@@ -7197,7 +7197,7 @@ _021734a8:
cmp r4, #1
ble _02173364
add sp, sp, #0x10c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov23_02173124
_021734c8: .word data_02050f54
@@ -7211,7 +7211,7 @@ _021734e0: .word data_027e0e60
.global func_ov23_021734e4
arm_func_start func_ov23_021734e4
func_ov23_021734e4: ; 0x021734e4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x18
ldr r2, _0217389c ; =0x00000333
mov r4, r0
@@ -7232,7 +7232,7 @@ func_ov23_021734e4: ; 0x021734e4
bl func_ov00_020cadb0
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217353c:
add r3, r4, #0x100
ldrh r6, [r3, #0xb0]
@@ -7256,13 +7256,13 @@ _0217356c:
cmpne r0, #0xd
addeq sp, sp, #0x18
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r0, r4
mov r1, #0xb
bl func_ov23_02172cac
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_021735ac:
ldr r0, [r5, #4]
ldr r1, [r5, #0xc]
@@ -7322,20 +7322,20 @@ _0217362c:
smull r2, r7, lr, r5
orr ip, ip, r6, lsl #20
str r1, [sp, #0xc]
ldr sb, [r4, #0x4c]
ldr r9, [r4, #0x4c]
ldr r0, [sp, #4]
smull r5, r6, r8, r5
adds lr, r2, #0x800
add r1, r1, ip
adc ip, r7, #0
adds r7, r5, #0x800
str sb, [sp, #0x10]
str r9, [sp, #0x10]
smull r5, r3, r8, r3
adc r6, r6, #0
mov r7, r7, lsr #0xc
orr r7, r7, r6, lsl #20
ldr r2, [r4, #0x50]
add r0, sb, r0
add r0, r9, r0
str r0, [sp, #0x10]
mov r0, lr, lsr #0xc
orr r0, r0, ip, lsl #20
@@ -7360,7 +7360,7 @@ _0217362c:
bl func_ov23_02172cac
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02173728:
mov r2, #4
mov r0, r4
@@ -7374,7 +7374,7 @@ _02173728:
bl func_ov00_020cadb0
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217375c:
ldr r1, [r5, #0x14]
cmp r1, #0
@@ -7432,7 +7432,7 @@ _0217375c:
bl func_ov23_02172cac
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02173840:
mov r0, r4
mov r1, r5
@@ -7444,7 +7444,7 @@ _02173840:
bl func_ov00_020cadb0
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217386c:
bl func_ov00_020cb60c
cmp r0, #0
@@ -7454,11 +7454,11 @@ _0217386c:
bl func_ov00_020cadb0
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02173890:
mov r0, #0
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov23_021734e4
_0217389c: .word 0x00000333
@@ -11638,35 +11638,35 @@ _0217701c: .word data_027e0e58
.global func_ov23_02177020
arm_func_start func_ov23_02177020
func_ov23_02177020: ; 0x02177020
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
mov sb, r0
ldr r1, [sb, #0x18]
mov r9, r0
ldr r1, [r9, #0x18]
ldr r0, _021770e8 ; =data_027e0e60
str r1, [sb, #0x38]
ldr r2, [sb, #0x1c]
add r1, sb, #0x18
str r2, [sb, #0x3c]
ldr r2, [sb, #0x20]
str r2, [sb, #0x40]
ldr r2, [sb, #0x38]
str r1, [r9, #0x38]
ldr r2, [r9, #0x1c]
add r1, r9, #0x18
str r2, [r9, #0x3c]
ldr r2, [r9, #0x20]
str r2, [r9, #0x40]
ldr r2, [r9, #0x38]
add r2, r2, #0x800
str r2, [sb, #0x38]
ldr r2, [sb, #0x40]
str r2, [r9, #0x38]
ldr r2, [r9, #0x40]
add r2, r2, #0x1800
str r2, [sb, #0x40]
str r2, [r9, #0x40]
ldr r0, [r0]
bl func_ov00_0208344c
ldrb r7, [sb, #0x14]
ldrb r7, [r9, #0x14]
add r0, r7, #2
cmp r7, r0
addge sp, sp, #4
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldr r10, _021770e8 ; =data_027e0e60
add r5, sp, #0
mov r4, #1
_0217708c:
ldrb r8, [sb, #0x15]
ldrb r8, [r9, #0x15]
add r0, r8, #4
cmp r8, r0
bge _021770cc
@@ -11678,19 +11678,19 @@ _021770a0:
strb r6, [sp]
strb r8, [sp, #1]
bl func_ov00_02082680
ldrb r0, [sb, #0x15]
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #4
cmp r8, r0
blt _021770a0
_021770cc:
ldrb r0, [sb, #0x14]
ldrb r0, [r9, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _0217708c
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov23_02177020
_021770e8: .word data_027e0e60
@@ -12786,9 +12786,9 @@ _02177e8c: .word 0x000004cd
.global func_ov23_02177e90
arm_func_start func_ov23_02177e90
func_ov23_02177e90: ; 0x02177e90
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r1, _0217803c ; =data_027e0d38
mov sb, r0
mov r9, r0
ldr r0, [r1]
add r0, r0, #0xc
bl func_ov00_020a5e9c
@@ -12874,7 +12874,7 @@ _02177fc8:
_02177fcc:
cmp r7, #0
beq _02178010
ldrb r0, [sb, #0x80]
ldrb r0, [r9, #0x80]
cmp r0, #0
bne _02178018
mov r4, #1
@@ -12882,7 +12882,7 @@ _02177fcc:
ldr r2, _02178044 ; =data_027e0f94
rsb r1, r4, #0x400
mov r3, #0
strb r4, [sb, #0x80]
strb r4, [r9, #0x80]
bl func_ov00_020ceacc
ldr r0, _02178050 ; =data_027e0fd4
mov r1, #0xf
@@ -12891,18 +12891,18 @@ _02177fcc:
b _02178018
_02178010:
mov r0, #0
strb r0, [sb, #0x80]
strb r0, [r9, #0x80]
_02178018:
ldr r0, _02178054 ; =data_027e0fcc
ldr r1, _02178048 ; =data_027e0fa0
ldr r0, [r0]
mov r2, r7
bl func_ov23_021707e0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02178030:
mov r0, #0
strb r0, [sb, #0x80]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
strb r0, [r9, #0x80]
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov23_02177e90
_0217803c: .word data_027e0d38
@@ -13670,7 +13670,7 @@ _02178aac: .word data_027e0ffc
.global func_ov23_02178ab0
arm_func_start func_ov23_02178ab0
func_ov23_02178ab0: ; 0x02178ab0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x50
mov r10, r0
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
@@ -13744,11 +13744,11 @@ _02178b10:
bl func_01ff9bc4
ldr r0, _02179014 ; =data_027e0e60
mov r2, r4
ldr sb, [r0]
ldr r9, [r0]
add r0, sp, #6
mov r1, sb
mov r1, r9
bl func_ov00_02083a1c
mov r0, sb
mov r0, r9
add r1, sp, #6
bl func_ov00_02083e58
ldr r1, _02179014 ; =data_027e0e60
@@ -14000,14 +14000,14 @@ _02178f80:
ldrb r0, [r10, #0x31]
cmp r0, #0
addeq sp, sp, #0x50
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02179020 ; =data_027e0d38
ldr r0, [r0]
add r0, r0, #0xc
bl func_ov00_020a5e9c
cmp r0, #0x2e
addne sp, sp, #0x50
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r0, [r0]
@@ -14018,7 +14018,7 @@ _02178f80:
ldr r0, [r0, #8]
cmp r0, #0
addeq sp, sp, #0x50
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02178fd8:
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
@@ -14034,7 +14034,7 @@ _02178fd8:
mov r2, #0x3e8
bl func_0202b154
add sp, sp, #0x50
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov23_02178ab0
_02179014: .word data_027e0e60
+51 -51
View File
@@ -127,7 +127,7 @@ _0216d820: .word data_027e0f6c
.global func_ov24_0216d824
arm_func_start func_ov24_0216d824
func_ov24_0216d824: ; 0x0216d824
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x54
mov r5, r0
ldr r0, [r5, #0x18]
@@ -159,10 +159,10 @@ _0216d878:
ldrh r0, [r5, #0x26]
cmp r0, #0
strneb r0, [r5, #0x65]
ldrb sb, [r5, #0x14]
ldrb r9, [r5, #0x14]
ldrb r4, [r5, #0x64]
add r0, sb, r4
cmp sb, r0
add r0, r9, r4
cmp r9, r0
bge _0216d914
ldr r6, _0216da24 ; =data_027e0e60
add r8, sp, #4
@@ -173,7 +173,7 @@ _0216d8b4:
add r0, r10, r0
cmp r10, r0
bge _0216d8fc
and r4, sb, #0xff
and r4, r9, #0xff
_0216d8cc:
ldr r0, [r6]
mov r1, r8
@@ -190,9 +190,9 @@ _0216d8cc:
_0216d8fc:
ldrb r4, [r5, #0x64]
ldrb r0, [r5, #0x14]
add sb, sb, #1
add r9, r9, #1
add r0, r0, r4
cmp sb, r0
cmp r9, r0
blt _0216d8b4
_0216d914:
ldrb r0, [r5, #0x65]
@@ -214,7 +214,7 @@ _0216d914:
ldr r8, [r5, #0x1c]
ldr r3, [r5, #0x20]
sub r2, r1, r7, asr #1
add sb, r1, r7, asr #1
add r9, r1, r7, asr #1
sub r0, r3, r6, asr #1
mov r1, #0
sub ip, r8, #0x400
@@ -231,7 +231,7 @@ _0216d914:
str r0, [sp, #0x50]
ldmia r1, {r0, r1, r2}
stmia r8, {r0, r1, r2}
str sb, [sp, #0x3c]
str r9, [sp, #0x3c]
str r10, [sp, #0x40]
add r0, sp, #0x3c
add r3, sp, #0x30
@@ -262,7 +262,7 @@ _0216d914:
str r0, [r5, #0x90]
str r7, [r5, #0x94]
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov24_0216d824
_0216da24: .word data_027e0e60
@@ -401,7 +401,7 @@ func_ov24_0216db88: ; 0x0216db88
.global func_ov24_0216db90
arm_func_start func_ov24_0216db90
func_ov24_0216db90: ; 0x0216db90
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
ldr r2, [r0]
mov r10, r0
@@ -409,7 +409,7 @@ func_ov24_0216db90: ; 0x0216db90
blx r2
cmp r0, #0
addeq sp, sp, #0x30
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _0216dca8 ; =data_02050f54
add r0, sp, #0xc
@@ -431,7 +431,7 @@ func_ov24_0216db90: ; 0x0216db90
ldrb r0, [r10, #0x64]
cmp r0, #0
addle sp, sp, #0x30
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mvn r5, #0
mov r6, r7
add r4, sp, #0xc
@@ -445,12 +445,12 @@ _0216dc1c:
ldrb r0, [r10, #0x65]
cmp r0, #0
ble _0216dc90
mov sb, r8
mov r9, r8
_0216dc40:
ldr r0, [r10, #0x70]
cmp r8, #0
streq r0, [sp, #8]
addne r0, r0, sb
addne r0, r0, r9
strne r0, [sp, #8]
cmp r7, #0
cmpeq r8, #0
@@ -464,7 +464,7 @@ _0216dc40:
blx r3
ldrb r0, [r10, #0x65]
add r8, r8, #1
add sb, sb, #0x1000
add r9, r9, #0x1000
cmp r8, r0
blt _0216dc40
_0216dc90:
@@ -473,7 +473,7 @@ _0216dc90:
cmp r7, r0
blt _0216dc1c
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov24_0216db90
_0216dca8: .word data_02050f54
@@ -851,11 +851,11 @@ _0216e178: .word data_027e0f74
.global func_ov24_0216e17c
arm_func_start func_ov24_0216e17c
func_ov24_0216e17c: ; 0x0216e17c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, [r4, #0x130]
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -1009,12 +1009,12 @@ _0216e3a0:
mov r8, #0
add r0, r4, #0x5a
ldr r6, _0216e4b8 ; =data_ov24_021791fc
add sb, r0, #0x100
add r9, r0, #0x100
mov r5, r8
mov r7, r8
_0216e3d0:
ldr r1, [r4, #0x174]
mov r0, sb
mov r0, r9
ldr r2, [r6, r1, lsl #2]
mov r1, r7
bl func_0202b3bc
@@ -1024,7 +1024,7 @@ _0216e3d0:
add r8, r8, #1
strneh r5, [r0, #0x5a]
cmp r8, #2
add sb, sb, #2
add r9, r9, #2
blo _0216e3d0
_0216e404:
ldr r0, _0216e49c ; =data_027e0f74
@@ -1066,7 +1066,7 @@ _0216e438:
add r5, r5, #1
cmp r5, #2
blo _0216e438
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov24_0216e17c
_0216e49c: .word data_027e0f74
@@ -7693,7 +7693,7 @@ _02173b14: .word data_027e0fe4
.global func_ov24_02173b18
arm_func_start func_ov24_02173b18
func_ov24_02173b18: ; 0x02173b18
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x5c
mov r4, r0
add r0, sp, #0x30
@@ -7748,14 +7748,14 @@ _02173bd8:
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r0, [r4, #0x78]
ldr sb, [r4, #0x48]
ldr r9, [r4, #0x48]
ldr r2, _02173cf0 ; =data_02050f54
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
str sb, [sp, #0xc]
str r9, [sp, #0xc]
ldr r7, [r4, #0x4c]
ldrsh r1, [r2, r1]
ldrsh ip, [r2, r0]
@@ -7776,12 +7776,12 @@ _02173bd8:
str r7, [sp, #0x10]
rsb r1, r1, #0
adds r4, r4, #0x800
add r5, sb, r5
adc sb, r3, #0
add r5, r9, r5
adc r9, r3, #0
mov r3, r4, lsr #0xc
smull r7, r6, r2, ip
adds r7, r7, #0x800
orr r3, r3, sb, lsl #20
orr r3, r3, r9, lsl #20
smull r4, r1, r2, r1
adc r6, r6, #0
adds r2, r4, #0x800
@@ -7809,7 +7809,7 @@ _02173bd8:
movge r0, #1
movlt r0, #0
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov24_02173b18
_02173ce4: .word data_027e0f94
@@ -11334,8 +11334,8 @@ func_ov24_02176a80: ; 0x02176a80
.global func_ov24_02176a94
arm_func_start func_ov24_02176a94
func_ov24_02176a94: ; 0x02176a94
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mov sb, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r9, r0
mov r8, r1
bl _ZN5Actor10GetAngleToEP5Vec3p
mov r0, r0, lsl #0x10
@@ -11346,16 +11346,16 @@ func_ov24_02176a94: ; 0x02176a94
ldr r2, _02176bd4 ; =data_02050f54
mov r3, r1, lsl #0x1
mov r1, r0, lsl #0x1
add r0, sb, #0x60
add r0, r9, #0x60
ldrsh r6, [r2, r3]
ldrsh r7, [r2, r1]
bl func_01ff9cec
mov r4, r0
mov r1, r8
add r0, sb, #0x48
add r0, r9, #0x48
bl func_ov00_020ce2f0
mov r5, r0
mov r0, sb
mov r0, r9
mov r1, r8
bl _ZN5Actor12XzDistanceToEP5Vec3p
cmp r0, #0x2000
@@ -11394,30 +11394,30 @@ _02176b5c:
adds r1, r1, #0x800
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
str r3, [sb, #0x60]
str r3, [r9, #0x60]
mov r2, #0
adc r0, r0, #0
mov r1, r1, lsr #0xc
str r2, [sb, #0x64]
str r2, [r9, #0x64]
orr r1, r1, r0, lsl #20
str r1, [sb, #0x68]
str r1, [r9, #0x68]
ldr r2, [r8, #4]
ldr r0, [sb, #0x4c]
ldr r0, [r9, #0x4c]
ldr r1, _02176bd8 ; =0x0000019a
sub r2, r2, r0
str r2, [sb, #0x64]
str r2, [r9, #0x64]
cmp r2, r1
strgt r1, [sb, #0x64]
strgt r1, [r9, #0x64]
bgt _02176bc0
sub r0, r1, #0x334
cmp r2, r0
strlt r0, [sb, #0x64]
strlt r0, [r9, #0x64]
_02176bc0:
add r0, sb, #0x48
add r1, sb, #0x60
add r0, r9, #0x48
add r1, r9, #0x60
mov r2, r0
bl func_01ff9bc4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov24_02176a94
_02176bd4: .word data_02050f54
@@ -14054,11 +14054,11 @@ _02178e1c: .word func_ov00_0208b9e4
.global func_ov24_02178e20
arm_func_start func_ov24_02178e20
func_ov24_02178e20: ; 0x02178e20
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov r10, r0
ldrb r7, [r10, #0x14]
mov sb, r1
mov r9, r1
add r0, r7, #2
cmp r7, r0
bge _02178ee8
@@ -14072,7 +14072,7 @@ _02178e4c:
bge _02178ed4
and r6, r7, #0xff
_02178e60:
cmp sb, #0
cmp r9, #0
ldr r0, [r4]
beq _02178e98
mov r1, r5
@@ -14128,7 +14128,7 @@ _02178ee8:
ldr r1, [r1]
mov r2, r6
bl func_ov00_02093a4c
cmp sb, #0
cmp r9, #0
add r2, sp, #0xc
beq _02178fa4
ldr r1, [sp, #0xc]
@@ -14156,7 +14156,7 @@ _02178ee8:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02178fa4:
ldr r0, _02179014 ; =data_027e0f6c
ldr r1, [sp, #0xc]
@@ -14184,7 +14184,7 @@ _02178fa4:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov24_02178e20
_02179010: .word data_027e0e60
+171 -171
View File
File diff suppressed because it is too large Load Diff
+140 -140
View File
@@ -1019,29 +1019,29 @@ _0216e118: .word data_027e0f6c
.global func_ov26_0216e11c
arm_func_start func_ov26_0216e11c
func_ov26_0216e11c: ; 0x0216e11c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x6c
mov sb, r0
mov r9, r0
mov r0, #0x800
mov r3, #0x2000
mov r2, #0
str r0, [sp, #0x38]
add r0, sb, #0x18
add r0, r9, #0x18
str r2, [sp, #0x34]
add r1, sp, #0x30
str r3, [sp, #0x30]
mov r2, r0
bl func_01ff9bc4
ldrb r0, [sb, #0x14]
ldrb r2, [sb, #0x15]
ldrb r0, [r9, #0x14]
ldrb r2, [r9, #0x15]
cmp r0, #0
sub r1, r0, #1
ldr r0, _0216e320 ; =data_027e0e60
moveq r1, #5
ldr r0, [r0]
bl func_ov00_02083e34
str r0, [sb, #0x1c]
ldrb r7, [sb, #0x14]
str r0, [r9, #0x1c]
ldrb r7, [r9, #0x14]
add r0, r7, #5
cmp r7, r0
bge _0216e1e4
@@ -1049,7 +1049,7 @@ func_ov26_0216e11c: ; 0x0216e11c
add r5, sp, #4
mov r4, #1
_0216e190:
ldrb r8, [sb, #0x15]
ldrb r8, [r9, #0x15]
add r0, r8, #2
cmp r8, r0
bge _0216e1d0
@@ -1061,19 +1061,19 @@ _0216e1a4:
strb r6, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_02082680
ldrb r0, [sb, #0x15]
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #2
cmp r8, r0
blt _0216e1a4
_0216e1d0:
ldrb r0, [sb, #0x14]
ldrb r0, [r9, #0x14]
add r7, r7, #1
add r0, r0, #5
cmp r7, r0
blt _0216e190
_0216e1e4:
add r4, sb, #0x18
add r4, r9, #0x18
ldmia r4, {r0, r1, r2}
add r6, sp, #0x60
stmia r6, {r0, r1, r2}
@@ -1113,31 +1113,31 @@ _0216e1e4:
add r3, sp, #0x48
ldmia r4, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, sb
mov r0, r9
bl func_ov00_0208b9cc
mov r2, r0
mov r0, #0
str r0, [sp]
add r0, sb, #0x58
add r0, r9, #0x58
ldr r4, [r0]
ldr r3, [sp, #8]
ldr r4, [r4, #0x14]
mov r1, r5
blx r4
ldr r0, _0216e324 ; =data_027e0f6c
add r1, sb, #0x58
add r1, r9, #0x58
ldr r0, [r0]
bl func_ov00_02093a5c
mov r0, #0
str r0, [sb, #0x48]
str r0, [sb, #0x4c]
str r0, [sb, #0x50]
str r0, [r9, #0x48]
str r0, [r9, #0x4c]
str r0, [r9, #0x50]
mov r0, #0x4000
str r0, [sb, #0x54]
mov r0, sb
str r0, [r9, #0x54]
mov r0, r9
bl func_ov26_0216e4d0
cmp r0, #0
mov r0, sb
mov r0, r9
ldr r3, [r0]
beq _0216e308
mov r1, #1
@@ -1145,14 +1145,14 @@ _0216e1e4:
mov r2, r1
blx r3
add sp, sp, #0x6c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_0216e308:
ldr r3, [r3, #0x80]
mov r1, #0
mov r2, #1
blx r3
add sp, sp, #0x6c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov26_0216e11c
_0216e320: .word data_027e0e60
@@ -2233,7 +2233,7 @@ _0216efb0: .word data_ov00_020eec9c
.global func_ov26_0216efb4
arm_func_start func_ov26_0216efb4
func_ov26_0216efb4: ; 0x0216efb4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r2
mov r10, r0
@@ -2249,7 +2249,7 @@ func_ov26_0216efb4: ; 0x0216efb4
ldr r2, [r0, #0x14]
sub r3, r5, r3
add r0, sp, #0x24
sub sb, r3, r2
sub r9, r3, r2
sub r8, r4, r1
bl func_01ffbe34
ldr r0, _0216f1fc ; =data_027e0618
@@ -2310,7 +2310,7 @@ _0216f0cc:
_0216f0d4:
cmp r6, #0
addeq sp, sp, #0x44
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r4
mov r1, #0x3c
bl func_01ff9b4c
@@ -2325,14 +2325,14 @@ _0216f0d4:
mov r0, r10
mov r1, #0xc5
mov r2, #0
mov r3, sb
mov r3, r9
bl func_02034b0c
cmp r5, #0
movne r1, #7
moveq r1, #5
add r7, sp, #0x24
str r8, [sp]
mov r3, sb
mov r3, r9
mov r0, #0xc5
mov r2, #5
str r7, [sp, #4]
@@ -2342,13 +2342,13 @@ _0216f0d4:
moveq r1, #6
add r7, sp, #0x24
str r8, [sp]
mov r3, sb
mov r3, r9
mov r0, #0xc5
mov r2, #6
str r7, [sp, #4]
bl func_020349cc
ldr r0, _0216f208 ; =data_ov26_0217933c
str sb, [sp]
str r9, [sp]
ldrb r5, [r0, r5]
str r8, [sp, #4]
mov r0, #0xc4
@@ -2364,7 +2364,7 @@ _0216f0d4:
mov r2, #0xc5
mov r3, #4
bl func_02034bc8
str sb, [sp]
str r9, [sp]
mov r1, #2
str r8, [sp, #4]
mov r0, #0xc4
@@ -2380,7 +2380,7 @@ _0216f0d4:
str r4, [sp, #0x18]
bl func_02034bc8
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_0216efb4
_0216f1f8: .word data_027e0c38
@@ -2541,7 +2541,7 @@ _0216f404: .word data_ov26_02179344
.global func_ov26_0216f408
arm_func_start func_ov26_0216f408
func_ov26_0216f408: ; 0x0216f408
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x10
mov r7, r0
ldr r0, _0216f504 ; =data_ov26_0217a574
@@ -2584,7 +2584,7 @@ _0216f484:
_0216f490:
ldr r1, _0216f534 ; =data_027e0fec
ldr r1, [r1]
ldr sb, [r1, #0x580]
ldr r9, [r1, #0x580]
blx func_02016fe8
mov r8, r0
add r0, sp, #0
@@ -2595,7 +2595,7 @@ _0216f490:
mov r0, r8
bl func_0201e544
mov r1, r0
mov r2, sb
mov r2, r9
mov r3, r5
add r0, r7, #0xfc
bl func_ov00_020c0cc8
@@ -2610,7 +2610,7 @@ _0216f490:
ldr r2, [r2, #0x24]
blx r2
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov26_0216f408
_0216f504: .word data_ov26_0217a574
@@ -3740,7 +3740,7 @@ _0217031c: .word data_027e0764
.global func_ov26_02170320
arm_func_start func_ov26_02170320
func_ov26_02170320: ; 0x02170320
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
mov r4, r0
add r6, r4, #0x400
@@ -3767,7 +3767,7 @@ func_ov26_02170320: ; 0x02170320
ldrsh r8, [r3, r1]
add r1, r2, #1
mov r1, r1, lsl #0x1
umull r2, sb, r8, r11
umull r2, r9, r8, r11
ldrsh r1, [r3, r1]
str r1, [sp]
umull r7, r5, r1, r11
@@ -3776,10 +3776,10 @@ func_ov26_02170320: ; 0x02170320
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
mov r1, #0
mla sb, r8, r1, sb
mla r9, r8, r1, r9
mov r2, r8, asr #0x1f
mla sb, r2, r11, sb
adc r1, sb, #0
mla r9, r2, r11, r9
adc r1, r9, #0
orr r10, r10, r1, lsl #20
ldr r0, [sp, #8]
ldr r2, [sp]
@@ -3808,11 +3808,11 @@ func_ov26_02170320: ; 0x02170320
ldr r1, _02170588 ; =data_027e0fa0
mov r2, r0
mov r5, r8, asr #0x1f
mov sb, r5, lsl #0xa
mov r9, r5, lsl #0xa
mov r5, #0x800
adds r5, r5, r8, lsl #10
orr sb, sb, r8, lsr #22
adc r8, sb, #0
orr r9, r9, r8, lsr #22
adc r8, r9, #0
mov r5, r5, lsr #0xc
orr r5, r5, r8, lsl #20
add r5, ip, r5
@@ -3825,12 +3825,12 @@ func_ov26_02170320: ; 0x02170320
mov r5, r5, lsl #0x1
add r5, r5, #1
mov r5, r5, lsl #0x1
ldrsh sb, [r3, r5]
ldrsh r9, [r3, r5]
mov r5, #0x800
mov r8, sb, asr #0x1f
mov r8, r9, asr #0x1f
mov r8, r8, lsl #0xa
adds r5, r5, sb, lsl #10
orr r8, r8, sb, lsr #22
adds r5, r5, r9, lsl #10
orr r8, r8, r9, lsr #22
mov r5, r5, lsr #0xc
adc r8, r8, #0
orr r5, r5, r8, lsl #20
@@ -3841,11 +3841,11 @@ func_ov26_02170320: ; 0x02170320
mov r5, r5, lsl #0x2
ldrsh r6, [r3, r5]
mov r3, #0
umull sb, r8, r6, r11
umull r9, r8, r6, r11
mla r8, r6, r3, r8
mov r5, r6, asr #0x1f
mla r8, r5, r11, r8
adds r5, sb, #0x800
adds r5, r9, #0x800
adc r3, r8, #0
mov r5, r5, lsr #0xc
orr r5, r5, r3, lsl #20
@@ -3875,12 +3875,12 @@ func_ov26_02170320: ; 0x02170320
bl func_ov00_02084164
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r4, #0x48
bl func_ov00_020c5288
cmp r0, #0
addne sp, sp, #0x14
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r4, #0x48]
str r0, [r4, #0x4d0]
ldr r0, [r4, #0x4c]
@@ -3888,7 +3888,7 @@ func_ov26_02170320: ; 0x02170320
ldr r0, [r4, #0x50]
str r0, [r4, #0x4d8]
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02170320
_02170574: .word 0x0000071c
@@ -10854,13 +10854,13 @@ _02175b7c:
.global func_ov26_02175bb4
arm_func_start func_ov26_02175bb4
func_ov26_02175bb4: ; 0x02175bb4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r10, r0
ldr r0, [r10, #4]
cmp r0, #1
addls sp, sp, #0x18
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r3, _02175e78 ; =0x04000444
mov r1, #0
ldr r0, _02175e7c ; =0x21230000
@@ -10884,12 +10884,12 @@ func_ov26_02175bb4: ; 0x02175bb4
str r0, [r3, #0x28]
str r0, [r3, #0x28]
ldr r0, [r10, #4]
ldrh sb, [r10, #8]
ldrh r9, [r10, #8]
sub r0, r0, #1
cmp sb, r0
cmp r9, r0
bhs _02175e64
mov r0, #0x14
mla r7, sb, r0, r10
mla r7, r9, r0, r10
ldr r0, _02175e84 ; =data_ov03_02100648
ldr r8, [r0]
_02175c4c:
@@ -11016,8 +11016,8 @@ _02175d78:
mov r0, r1, lsr #0x10
str r0, [r5]
ldr r0, [r10, #4]
add sb, sb, #1
cmp sb, r0
add r9, r9, #1
cmp r9, r0
add r7, r7, #0x14
bhs _02175e48
ldr r0, [r7, #4]
@@ -11031,14 +11031,14 @@ _02175e48:
str r1, [r0]
ldr r0, [r10, #4]
sub r0, r0, #1
cmp sb, r0
cmp r9, r0
blo _02175c4c
_02175e64:
ldr r0, _02175e90 ; =0x04000448
mov r1, #1
str r1, [r0]
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02175bb4
_02175e78: .word 0x04000444
@@ -11551,7 +11551,7 @@ func_ov26_02176330: ; 0x02176330
.global func_ov26_02176354
arm_func_start func_ov26_02176354
func_ov26_02176354: ; 0x02176354
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r7, r1
ldr r1, [r7, #0xc]
ldr r2, [r7, #8]
@@ -11559,12 +11559,12 @@ func_ov26_02176354: ; 0x02176354
add r4, r5, r1
mov r8, r0
cmp r5, r4
add sb, r3, r2
add r9, r3, r2
mov r6, #0
bge _021763bc
_02176380:
ldr r10, [r7]
cmp r10, sb
cmp r10, r9
bge _021763b0
_0217638c:
mov r0, r8
@@ -11574,7 +11574,7 @@ _0217638c:
cmp r0, #0
add r10, r10, #1
addne r6, r6, #1
cmp r10, sb
cmp r10, r9
blt _0217638c
_021763b0:
add r5, r5, #1
@@ -11586,7 +11586,7 @@ _021763bc:
mov r0, r6, lsl #0xc
mul r1, r2, r1
bl func_01ff9b4c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov26_02176354
.global func_ov26_021763d4
@@ -11957,7 +11957,7 @@ func_ov26_021767ec: ; 0x021767ec
.global func_ov26_02176814
arm_func_start func_ov26_02176814
func_ov26_02176814: ; 0x02176814
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
ldr r2, _021768ac ; =data_ov26_02179554
mov r8, #0
@@ -11966,14 +11966,14 @@ func_ov26_02176814: ; 0x02176814
mov r2, #1
strb r2, [r10, #0x1a1]
strb r1, [r10, #0x1a0]
add sb, r0, #2
add r9, r0, #2
mov r7, r8
mov r6, #0xa
mov r11, r8
mov r5, r2
mov r4, r8
_02176850:
sub r2, sb, r8
sub r2, r9, r8
str r7, [sp]
mov r0, r10
mov r1, r6
@@ -11995,7 +11995,7 @@ _02176850:
add r10, r10, #0x88
blt _02176850
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02176814
_021768ac: .word data_ov26_02179554
@@ -12049,16 +12049,16 @@ _02176930:
.global func_ov26_02176948
arm_func_start func_ov26_02176948
func_ov26_02176948: ; 0x02176948
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov r10, r0
ldrb r0, [r10, #0x1a1]
cmp r0, #0
addeq sp, sp, #8
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r7, _021769e0 ; =data_ov26_02179558
ldr r4, _021769e4 ; =data_027e0d3c
mov sb, r10
mov r9, r10
mov r8, #0
mov r11, #0xde
add r6, sp, #4
@@ -12079,15 +12079,15 @@ _02176980:
bl func_ov00_02079680
ldr r1, [sp, #4]
ldr r2, [sp]
mov r0, sb
mov r0, r9
mov r3, #0
bl func_02034a1c
add r8, r8, #1
add sb, sb, #0x88
add r9, r9, #0x88
cmp r8, #3
blt _02176980
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02176948
_021769e0: .word data_ov26_02179558
@@ -12791,10 +12791,10 @@ _0217731c:
.global func_ov26_02177324
arm_func_start func_ov26_02177324
func_ov26_02177324: ; 0x02177324
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mov sb, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r9, r0
mov r0, #0xd0
strb r1, [sb]
strb r1, [r9]
bl func_02034670
mov r7, #0
ldr r4, _02177380 ; =data_ov26_021795b4
@@ -12809,12 +12809,12 @@ _0217734c:
ldrb r1, [r1, #1]
cmp r6, r0
add r7, r7, r1
streqb r7, [sb, #1]
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
streqb r7, [r9, #1]
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r8, r8, #1
cmp r8, #5
blo _0217734c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov26_02177324
_02177380: .word data_ov26_021795b4
@@ -12871,7 +12871,7 @@ _02177424: .word data_027e0d3c
.global func_ov26_02177428
arm_func_start func_ov26_02177428
func_ov26_02177428: ; 0x02177428
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #8
mov r5, r0
ldrsb r0, [r5, #1]
@@ -12879,7 +12879,7 @@ func_ov26_02177428: ; 0x02177428
cmp r0, #0
addle sp, sp, #8
movle r0, #0
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldrb r1, [r5]
add r2, sp, #4
add r3, sp, #0
@@ -12889,24 +12889,24 @@ func_ov26_02177428: ; 0x02177428
mov r7, #0
ldr r8, [r6]
ldmib r6, {r0, r1}
umull r2, sb, r1, r8
mla sb, r1, r0, sb
umull r2, r9, r1, r8
mla r9, r1, r0, r9
ldr r0, [r6, #0xc]
ldr r3, [r6, #0x10]
mla sb, r0, r8, sb
mla r9, r0, r8, r9
adds lr, r3, r2
ldr r2, [r6, #0x14]
adc ip, r2, sb
umull sb, r8, r1, lr
adc ip, r2, r9
umull r9, r8, r1, lr
mla r8, r1, ip, r8
mla r8, r0, lr, r8
adds sb, r3, sb
adds r9, r3, r9
str lr, [r6]
mov r0, #0x14
adc r3, r2, r8
umull r1, r8, ip, r0
umull r1, r2, r3, r0
stmia r6, {sb, ip}
stmia r6, {r9, ip}
mla r8, ip, r7, r8
mov r1, r7
mla r2, r3, r7, r2
@@ -12934,7 +12934,7 @@ func_ov26_02177428: ; 0x02177428
sub r1, r1, #1
strb r1, [r5, #1]
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov26_02177428
_02177528: .word data_027e0764
@@ -13027,7 +13027,7 @@ _021775c4: .word func_ov26_02177584 + 1
.global func_ov26_021775c8
arm_func_start func_ov26_021775c8
func_ov26_021775c8: ; 0x021775c8
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov r10, r0
mov r3, #0x80000
@@ -13058,12 +13058,12 @@ _02177610:
_02177634:
mov r8, #0
ldr r4, _02177798 ; =data_027e0764
add sb, r10, #4
add r9, r10, #4
add r5, r10, #0x234
mov r11, r8
mov r6, r8
_0217764c:
mov r0, sb
mov r0, r9
bl func_ov26_021772dc
cmp r0, #0
beq _021776e0
@@ -13099,13 +13099,13 @@ _021776a0:
str r1, [r4, #4]
add r2, r0, #9
_021776d4:
mov r1, sb
mov r1, r9
add r0, r5, r2, lsl #1
bl func_ov26_02177428
_021776e0:
add r8, r8, #1
cmp r8, #0x14
add sb, sb, #0x1c
add r9, r9, #0x1c
blt _0217764c
_021776f0:
add r6, r10, #4
@@ -13123,7 +13123,7 @@ _021776fc:
ldrb r0, [r10]
cmp r0, #0
addne sp, sp, #0xc
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, #0
mov r3, r0
mov r1, r0
@@ -13152,7 +13152,7 @@ _02177778:
moveq r0, #1
streqb r0, [r10]
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_021775c8
_0217778c: .word data_ov00_020eec60
@@ -13406,7 +13406,7 @@ func_ov26_02177a70: ; 0x02177a70
.global func_ov26_02177a98
arm_func_start func_ov26_02177a98
func_ov26_02177a98: ; 0x02177a98
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r1, _02177b84 ; =data_027e0f74
mov r5, r0
ldr r0, [r1]
@@ -13414,7 +13414,7 @@ func_ov26_02177a98: ; 0x02177a98
bl func_ov00_02097c18
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r6, #0
str r6, [r5, #0x7c]
mov r4, #0x800
@@ -13447,7 +13447,7 @@ func_ov26_02177a98: ; 0x02177a98
ldr r1, [r0, #8]
ldr r4, _02177b8c ; =data_ov26_021795c8
add r8, r0, r1
mov sb, r6
mov r9, r6
_02177b40:
mov r1, r4
add r0, r8, #4
@@ -13460,12 +13460,12 @@ _02177b40:
mov r1, r7
mov r2, r6
bl func_02019570
add sb, sb, #1
cmp sb, #6
add r9, r9, #1
cmp r9, #6
add r4, r4, #0x10
blo _02177b40
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov26_02177a98
_02177b84: .word data_027e0f74
@@ -13671,7 +13671,7 @@ func_ov26_02177ddc: ; 0x02177ddc
.global func_ov26_02177e14
arm_func_start func_ov26_02177e14
func_ov26_02177e14: ; 0x02177e14
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #8
mov r7, r0
mov r5, #0
@@ -13700,7 +13700,7 @@ func_ov26_02177e14: ; 0x02177e14
bl func_ov00_02083a1c
ldr r4, _02177f64 ; =data_ov26_0217af64
ldr r6, _02177f60 ; =data_027e0e60
add sb, sp, #2
add r9, sp, #2
mov r8, #1
_02177e90:
add r0, r4, r5, lsl #1
@@ -13711,7 +13711,7 @@ _02177e90:
add r10, r3, r1
add r3, r2, r0
ldr r0, [r6]
mov r1, sb
mov r1, r9
mov r2, r8
strb r10, [sp, #2]
strb r3, [sp, #3]
@@ -13725,7 +13725,7 @@ _02177e90:
strb r0, [sp, #1]
mov r6, #6
add r10, sp, #0
mov sb, #1
mov r9, #1
mov r4, #3
_02177ef0:
mov r5, r4
@@ -13736,7 +13736,7 @@ _02177ef4:
add ip, r2, r5
add r3, r1, r6
mov r1, r10
mov r2, sb
mov r2, r9
strb ip, [sp]
strb r3, [sp, #1]
bl func_ov00_020826a0
@@ -13756,7 +13756,7 @@ _02177ef4:
str r2, [r7, #0x50]
str r1, [r7, #0x4c]
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov26_02177e14
_02177f60: .word data_027e0e60
@@ -14303,7 +14303,7 @@ func_ov26_02178534: ; 0x02178534
.global func_ov26_0217855c
arm_func_start func_ov26_0217855c
func_ov26_0217855c: ; 0x0217855c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x20
mov r10, r0
ldrb r2, [r10, #0x15]
@@ -14361,14 +14361,14 @@ _02178620:
add r0, r11, #2
str r0, [sp]
cmp r11, r0
add sb, r1, #0xc
add r9, r1, #0xc
bge _0217868c
ldr r4, _021786d4 ; =data_027e0e60
add r6, sp, #4
mov r5, #1
_02178648:
ldrb r8, [r10, #0x15]
cmp r8, sb
cmp r8, r9
bge _0217867c
and r7, r11, #0xff
_02178658:
@@ -14379,7 +14379,7 @@ _02178658:
strb r8, [sp, #5]
bl func_ov00_02082680
add r8, r8, #1
cmp r8, sb
cmp r8, r9
blt _02178658
_0217867c:
ldr r0, [sp]
@@ -14404,7 +14404,7 @@ _0217868c:
mov r0, #0xc000
str r0, [r10, #0x84]
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_0217855c
_021786d4: .word data_027e0e60
@@ -14996,15 +14996,15 @@ _02178e78:
.global func_ov26_02178e8c
arm_func_start func_ov26_02178e8c
func_ov26_02178e8c: ; 0x02178e8c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mov sb, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r9, r0
mov r4, #0
mov r8, r1
mov r6, r4
add r7, sb, #0x450
add r7, r9, #0x450
mov r5, #0x2d
_02178ea8:
add r0, sb, r6, lsl #2
add r0, r9, r6, lsl #2
ldr r0, [r0, #0x480]
cmp r0, #0
ble _02178ecc
@@ -15012,7 +15012,7 @@ _02178ea8:
mov r1, r8
bl func_01ff9ec0
cmp r0, #0x1200
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02178ecc:
add r6, r6, #1
cmp r6, #4
@@ -15023,29 +15023,29 @@ _02178ecc:
bl func_ov00_020d77e4
mov r3, #0
_02178eec:
add r0, sb, r3, lsl #2
add r0, r9, r3, lsl #2
ldr r1, [r0, #0x480]
cmp r1, #0
bgt _02178f48
mov r1, #0xc
mla r5, r3, r1, sb
mla r5, r3, r1, r9
ldr r2, [r8]
mov r1, #0x88
str r2, [r5, #0x450]
mul r4, r3, r1
ldr r2, [r8, #4]
add r1, sb, #0x230
add r1, r9, #0x230
str r2, [r5, #0x454]
ldr r3, [r8, #8]
mov r2, #0x2d
str r3, [r5, #0x458]
str r2, [r0, #0x480]
add r2, sb, r4
add r2, r9, r4
mov r3, #0
add r0, r1, r4
str r3, [r2, #0x294]
bl func_020352d8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02178f48:
cmp r1, r5
movlt r4, r3
@@ -15054,25 +15054,25 @@ _02178f48:
cmp r3, #4
blt _02178eec
mov r0, #0xc
mla r5, r4, r0, sb
mla r5, r4, r0, r9
ldr r1, [r8]
mov r0, #0x88
str r1, [r5, #0x450]
mul r3, r4, r0
ldr r1, [r8, #4]
add r0, sb, #0x230
add r0, r9, #0x230
str r1, [r5, #0x454]
ldr r2, [r8, #8]
add r1, sb, r4, lsl #2
add r1, r9, r4, lsl #2
str r2, [r5, #0x458]
mov r2, #0x2d
str r2, [r1, #0x480]
add r1, sb, r3
add r1, r9, r3
mov r2, #0
add r0, r0, r3
str r2, [r1, #0x294]
bl func_020352d8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov26_02178e8c
_02178fb0: .word data_ov00_020eec9c
@@ -16664,7 +16664,7 @@ _02179de0: .word data_ov26_0217aea4
.global func_ov26_02179de4
arm_func_start func_ov26_02179de4
func_ov26_02179de4: ; 0x02179de4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r0, _02179f14 ; =data_ov26_0217b554
ldr r1, _02179f18 ; =0x42454143
ldr r2, _02179f1c ; =func_ov26_02177c08
@@ -16675,8 +16675,8 @@ func_ov26_02179de4: ; 0x02179de4
ldr r2, _02179f24 ; =data_ov26_0217b548
bl func_0204f8d4
ldr r1, _02179f28 ; =data_ov26_0217af64
mov sb, #0
strb sb, [r1]
mov r9, #0
strb r9, [r1]
mov r0, #3
ldr r8, _02179f2c ; =data_ov26_0217af66
strb r0, [r1, #1]
@@ -16688,8 +16688,8 @@ func_ov26_02179de4: ; 0x02179de4
ldr r4, _02179f40 ; =data_ov26_0217af76
ldr ip, _02179f44 ; =data_ov26_0217af7a
mov r7, #0x1b
strb sb, [r8]
strb sb, [r2]
strb r9, [r8]
strb r9, [r2]
ldr lr, _02179f48 ; =data_ov26_0217af78
strb r1, [r2, #1]
mov r2, #4
@@ -16702,7 +16702,7 @@ func_ov26_02179de4: ; 0x02179de4
strb r1, [r3, #1]
mov r3, #1
strb r3, [r8]
ldr sb, _02179f50 ; =data_ov26_0217af6e
ldr r9, _02179f50 ; =data_ov26_0217af6e
strb r3, [r6]
mov r6, #2
ldr r8, _02179f54 ; =data_ov26_0217af72
@@ -16712,8 +16712,8 @@ func_ov26_02179de4: ; 0x02179de4
ldr r3, _02179f5c ; =data_ov26_0217af7e
strb r7, [r4]
mov r4, #0x1a
strb r6, [sb]
strb r2, [sb, #1]
strb r6, [r9]
strb r2, [r9, #1]
mov r0, #6
strb r6, [r8]
ldr r6, _02179f60 ; =data_ov26_0217af80
@@ -16739,7 +16739,7 @@ func_ov26_02179de4: ; 0x02179de4
strb r0, [lr, #1]
strb r3, [ip]
strb r1, [ip, #1]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov26_02179de4
_02179f14: .word data_ov26_0217b554
+102 -102
View File
@@ -273,7 +273,7 @@ _0216da34: .word data_027e0fe4
.global func_ov27_0216da38
arm_func_start func_ov27_0216da38
func_ov27_0216da38: ; 0x0216da38
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #4
sub sp, sp, #0x400
mov r5, r0
@@ -462,10 +462,10 @@ _0216dce4:
umull r8, r7, r6, r3
mla r7, r6, r0, r7
ldr r0, [r2, #0xc]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r7, r0, r3, r7
ldr r6, [r2, #0x14]
adds r8, sb, r8
adds r8, r9, r8
adc r7, r6, r7
mov r0, #0x1f
umull r3, r6, r7, r0
@@ -488,10 +488,10 @@ _0216dd48:
umull r8, r7, r6, r3
mla r7, r6, r0, r7
ldr r0, [r2, #0xc]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r7, r0, r3, r7
ldr r6, [r2, #0x14]
adds r8, sb, r8
adds r8, r9, r8
adc r7, r6, r7
mov r0, #0x1f
umull r3, r6, r7, r0
@@ -514,10 +514,10 @@ _0216ddac:
umull r8, r7, r6, r3
mla r7, r6, r0, r7
ldr r0, [r2, #0xc]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r7, r0, r3, r7
ldr r6, [r2, #0x14]
adds r8, sb, r8
adds r8, r9, r8
adc r7, r6, r7
mov r0, #0x15
umull r3, r6, r7, r0
@@ -553,7 +553,7 @@ _0216de58:
cmpne r0, #9
addeq sp, sp, #4
addeq sp, sp, #0x400
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216e92c ; =data_027e0764
ldr r2, [r0]
ldmib r0, {r1, r3}
@@ -717,7 +717,7 @@ _0216e084:
bl func_ov27_0216da38
add sp, sp, #4
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216e0d8:
mov r1, #0xc
mov r2, #0
@@ -752,9 +752,9 @@ _0216e0d8:
mov r8, r1, lsl #0xb
mov r1, #0x800
orr r8, r8, r7, lsr #21
adds sb, r1, r7, lsl #11
adds r9, r1, r7, lsl #11
adc r7, r8, #0
mov r8, sb, lsr #0xc
mov r8, r9, lsr #0xc
orr r8, r8, r7, lsl #20
ldr r0, [sp, #0x5c]
ldr r7, [sp, #0x64]
@@ -944,7 +944,7 @@ _0216e2b8:
ldr r0, _0216e928 ; =data_027e0f74
ldr r1, [sp, #0x1d4]
ldr r10, [sp, #0x1dc]
ldr sb, [sp, #0x1e0]
ldr r9, [sp, #0x1e0]
ldr r8, [sp, #0x1e4]
str r7, [sp, #0x264]
ldr r7, [sp, #0x1e8]
@@ -953,7 +953,7 @@ _0216e2b8:
ldr r0, [r0]
add r1, sp, #0x1f4
str r10, [sp, #0x270]
str sb, [sp, #0x274]
str r9, [sp, #0x274]
str r8, [sp, #0x278]
str r7, [sp, #0x27c]
strb r6, [sp, #0x280]
@@ -1084,7 +1084,7 @@ _0216e4f4:
ldr ip, [sp, #0xc4]
ldr r11, [sp, #0xc8]
ldr r10, [sp, #0xcc]
ldr sb, [sp, #0xd0]
ldr r9, [sp, #0xd0]
mov lr, #1
str r1, [sp, #0x150]
ldr r0, [r0]
@@ -1092,7 +1092,7 @@ _0216e4f4:
str ip, [sp, #0x158]
str r11, [sp, #0x15c]
str r10, [sp, #0x160]
str sb, [sp, #0x164]
str r9, [sp, #0x164]
strb r8, [sp, #0x168]
strb r7, [sp, #0x169]
strb r6, [sp, #0x16a]
@@ -1257,7 +1257,7 @@ _0216e8fc:
str r4, [r5, #0x130]
add sp, sp, #4
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov27_0216da38
_0216e914: .word 0x00000ccd
@@ -2660,7 +2660,7 @@ _0216fbfc: .word data_027e0764
.global func_ov27_0216fc00
arm_func_start func_ov27_0216fc00
func_ov27_0216fc00: ; 0x0216fc00
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r10, r0
ldr r2, [r10, #0x1e8]
@@ -2687,7 +2687,7 @@ _0216fc4c:
bgt _0216fce8
ldr r8, _0216fe2c ; =data_ov27_02178ee0
ldr r4, _0216fe30 ; =data_027e0e58
mov sb, r10
mov r9, r10
add r7, r10, #0x470
mov r5, #0
add r11, sp, #0xc
@@ -2705,7 +2705,7 @@ _0216fc74:
str r2, [sp, #0x14]
ldrsh r1, [r10, #0x78]
bl func_ov00_020a61ac
ldr r1, [sb, #0x470]
ldr r1, [r9, #0x470]
add r5, r5, #1
ldr r3, [sp, #0x10]
ldr r2, [sp, #0x14]
@@ -2715,7 +2715,7 @@ _0216fc74:
strh r0, [r1, #0x50]
strh r3, [r1, #0x52]
strh r2, [r1, #0x54]
add sb, sb, #0xc
add r9, r9, #0xc
blt _0216fc74
ldr r1, _0216fe34 ; =0x0000099a
mov r0, r10
@@ -2776,7 +2776,7 @@ _0216fd9c:
bl func_0202e58c
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r2, _0216fe40 ; =data_027e0764
mov r1, #0
ldr r3, [r2]
@@ -2801,12 +2801,12 @@ _0216fd9c:
mov r1, #0xe
bl func_ov27_0216da38
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fe18:
mov r1, #4
bl func_ov27_0216da38
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov27_0216fc00
_0216fe28: .word 0x00000bb8
@@ -2893,7 +2893,7 @@ _0216ff34: .word data_027e0764
.global func_ov27_0216ff38
arm_func_start func_ov27_0216ff38
func_ov27_0216ff38: ; 0x0216ff38
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r10, r0
ldr r2, [r10, #0x1e8]
@@ -2920,7 +2920,7 @@ _0216ff84:
bgt _02170020
ldr r8, _0217017c ; =data_ov27_02178ee0
ldr r4, _02170180 ; =data_027e0e58
mov sb, r10
mov r9, r10
add r7, r10, #0x470
mov r5, #0
add r11, sp, #0xc
@@ -2938,7 +2938,7 @@ _0216ffac:
str r2, [sp, #0x14]
ldrsh r1, [r10, #0x78]
bl func_ov00_020a61ac
ldr r1, [sb, #0x470]
ldr r1, [r9, #0x470]
add r5, r5, #1
ldr r3, [sp, #0x10]
ldr r2, [sp, #0x14]
@@ -2948,7 +2948,7 @@ _0216ffac:
strh r0, [r1, #0x50]
strh r3, [r1, #0x52]
strh r2, [r1, #0x54]
add sb, sb, #0xc
add r9, r9, #0xc
blt _0216ffac
ldr r1, _02170184 ; =0x0000099a
mov r0, r10
@@ -3016,7 +3016,7 @@ _021700ec:
bl func_0202e58c
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r2, _02170190 ; =data_027e0764
mov r1, #0
ldr r3, [r2]
@@ -3041,12 +3041,12 @@ _021700ec:
mov r1, #0xe
bl func_ov27_0216da38
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02170168:
mov r1, #4
bl func_ov27_0216da38
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov27_0216ff38
_02170178: .word 0x00000bb8
@@ -3269,7 +3269,7 @@ _0217047c: .word data_027e0764
.global func_ov27_02170480
arm_func_start func_ov27_02170480
func_ov27_02170480: ; 0x02170480
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x38
ldr r1, _021708a4 ; =data_027e0fac
ldr r3, _021708a8 ; =data_02050f54
@@ -3351,7 +3351,7 @@ func_ov27_02170480: ; 0x02170480
umull ip, r3, r2, r6
mla r3, r2, r7, r3
mov r2, r2, asr #0x1f
umull r10, sb, r8, r6
umull r10, r9, r8, r6
mla r3, r2, r6, r3
adds ip, ip, #0x800
adc r2, r3, #0
@@ -3360,10 +3360,10 @@ func_ov27_02170480: ; 0x02170480
add r2, r5, r3
str r2, [sp, #0x2c]
adds r3, r10, #0x800
mla sb, r8, r7, sb
mla r9, r8, r7, r9
mov r2, r8, asr #0x1f
mla sb, r2, r6, sb
adc r2, sb, #0
mla r9, r2, r6, r9
adc r2, r9, #0
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
add r3, lr, r3
@@ -3473,7 +3473,7 @@ _0217078c:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x38
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _021708b8 ; =data_027e0fc8
mov r1, #0
ldr r0, [r0]
@@ -3492,12 +3492,12 @@ _0217078c:
add r0, r0, #0x400
bl func_ov00_020b7e6c
add sp, sp, #0x38
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_021707f8:
ldr r0, [r4, #0x138]
cmp r0, #0x78
addle sp, sp, #0x38
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldrh r2, [r4, #0x78]
ldr r0, _021708b8 ; =data_027e0fc8
mov r1, #0
@@ -3536,7 +3536,7 @@ _021707f8:
add r0, r0, #0x400
bl func_ov00_020b7e6c
add sp, sp, #0x38
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov27_02170480
_021708a4: .word data_027e0fac
@@ -4039,11 +4039,11 @@ _02170f84: .word data_027e0e60
.global func_ov27_02170f88
arm_func_start func_ov27_02170f88
func_ov27_02170f88: ; 0x02170f88
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r10, r0
ldr r0, _02171374 ; =data_027e0f94
mov sb, r1
mov r9, r1
add r5, sp, #0x38
ldmia r0, {r0, r1, r2}
add r3, sp, #0x14
@@ -4114,11 +4114,11 @@ _02171094:
bl func_01ffa0f4
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
cmp sb, #0
cmp r9, #0
beq _021710d8
cmp sb, #1
cmp r9, #1
beq _021710cc
cmp sb, #2
cmp r9, #2
subeq r0, r0, r7
moveq r0, r0, lsl #0x10
moveq r0, r0, asr #0x10
@@ -4181,7 +4181,7 @@ _02171154:
bl func_ov14_02145258
mov r0, r10
bl func_ov27_02171b14
cmp sb, #0
cmp r9, #0
beq _02171288
cmp r6, #0
bne _02171288
@@ -4203,7 +4203,7 @@ _02171154:
mov r1, r5
mov r2, r4
bl func_01ff9bf8
cmp sb, #1
cmp r9, #1
ldr r0, [r10, #0xc4]
str r0, [sp, #8]
ldr r0, [r10, #0xc8]
@@ -4211,7 +4211,7 @@ _02171154:
ldr r0, [r10, #0xcc]
str r0, [sp, #0x10]
beq _02171228
cmp sb, #2
cmp r9, #2
beq _02171238
b _02171244
_02171228:
@@ -4267,13 +4267,13 @@ _02171288:
ldr r0, [r0, #0x420]
cmp r0, #4
addne sp, sp, #0x44
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r10
mov r1, #3
mov r2, #1
bl func_ov27_0217164c
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02171308:
ldr r0, [r0, #0x420]
cmp r0, #3
@@ -4302,7 +4302,7 @@ _02171324:
ldr r1, [r10, #0x1e8]
str r0, [r1, #0x10]
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov27_02170f88
_02171374: .word data_027e0f94
@@ -4682,7 +4682,7 @@ _02171848: .word 0x0000023a
.global func_ov27_0217184c
arm_func_start func_ov27_0217184c
func_ov27_0217184c: ; 0x0217184c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x130
mov r4, r0
add r0, sp, #0x80
@@ -4718,7 +4718,7 @@ func_ov27_0217184c: ; 0x0217184c
add r0, sp, #0x80
bl func_ov00_0209a508
add sp, sp, #0x130
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_021718e0:
ldr r0, [r4, #0x488]
mvn r7, #0
@@ -4820,13 +4820,13 @@ _021718e0:
ldrb lr, [sp, #0x7a]
ldrb ip, [sp, #0x7b]
ldrb r3, [sp, #0x7c]
ldr sb, [sp, #0x6c]
ldr r9, [sp, #0x6c]
ldr r8, [sp, #0x70]
ldr r7, [sp, #0x74]
mov r2, #1
ldr r0, [r0]
add r1, sp, #0x80
str sb, [sp, #0x100]
str r9, [sp, #0x100]
str r8, [sp, #0x104]
str r7, [sp, #0x108]
strb r6, [sp, #0x10c]
@@ -4843,12 +4843,12 @@ _021718e0:
add r0, sp, #0x80
bl func_ov00_0209a508
add sp, sp, #0x130
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02171ad0:
add r0, sp, #0x80
bl func_ov00_0209a508
add sp, sp, #0x130
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov27_0217184c
_02171ae0: .word data_027e0f74
@@ -5641,7 +5641,7 @@ _02172594: .word data_027e0ffc
.global func_ov27_02172598
arm_func_start func_ov27_02172598
func_ov27_02172598: ; 0x02172598
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0xa8
mov r5, r0
cmp r1, #0
@@ -5649,7 +5649,7 @@ func_ov27_02172598: ; 0x02172598
ldreqb r0, [r5, #0xa4]
cmp r0, #0
addeq sp, sp, #0xa8
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, [r5, #0x35c]
str r0, [r5, #0x374]
ldr r0, [r5, #0x360]
@@ -5665,7 +5665,7 @@ func_ov27_02172598: ; 0x02172598
ldr r0, [r5, #0x38c]
cmp r0, #0
addne sp, sp, #0xa8
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r0, #0x1000
str r0, [sp, #0x9c]
str r0, [sp, #0xa0]
@@ -5785,11 +5785,11 @@ func_ov27_02172598: ; 0x02172598
ldr ip, _0217283c ; =0x00000a8f
str r0, [sp, #0x28]
mov r1, #0
umull sb, r8, r4, ip
umull r9, r8, r4, ip
mla r8, r4, r1, r8
mov r7, r4, asr #0x1f
mla r8, r7, ip, r8
adds r7, sb, #0x800
adds r7, r9, #0x800
adc r4, r8, #0
mov r7, r7, lsr #0xc
orr r7, r7, r4, lsl #20
@@ -5805,7 +5805,7 @@ func_ov27_02172598: ; 0x02172598
str lr, [sp, #0x14]
bl func_ov05_02102c2c
add sp, sp, #0xa8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov27_02172598
_0217282c: .word data_02050f54
@@ -7983,7 +7983,7 @@ _02174450: .word data_027e0e60
.global func_ov27_02174454
arm_func_start func_ov27_02174454
func_ov27_02174454: ; 0x02174454
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x124
ldr r1, _021746e4 ; =data_027e0f94
mov r4, r0
@@ -8090,7 +8090,7 @@ func_ov27_02174454: ; 0x02174454
str r6, [sp, #0xc0]
ldr r6, [sp, #0x38]
mov r10, #5
mov sb, #0x1c000
mov r9, #0x1c000
mov r8, #0xfa0
str r0, [sp, #0xd4]
ldr r0, [sp, #0x4c]
@@ -8127,13 +8127,13 @@ func_ov27_02174454: ; 0x02174454
add r1, sp, #0x74
str r6, [sp, #0xfc]
str r10, [sp, #0x10]
str sb, [sp, #0x24]
str r9, [sp, #0x24]
str r8, [sp, #0x1c]
str r7, [sp, #0x20]
str r10, [sp, #0xa4]
str r8, [sp, #0xb0]
str r7, [sp, #0xb4]
str sb, [sp, #0xb8]
str r9, [sp, #0xb8]
strb r5, [sp, #0x100]
strb lr, [sp, #0x101]
strb ip, [sp, #0x102]
@@ -8146,7 +8146,7 @@ func_ov27_02174454: ; 0x02174454
add r0, sp, #0x74
bl func_ov00_0209a508
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov27_02174454
_021746e4: .word data_027e0f94
@@ -10852,11 +10852,11 @@ _02176aa8: .word data_027e0dbc
.global func_ov27_02176aac
arm_func_start func_ov27_02176aac
func_ov27_02176aac: ; 0x02176aac
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r10, r0
ldr r0, _02176e74 ; =data_027e0f94
mov sb, r1
mov r9, r1
add r5, sp, #0x38
ldmia r0, {r0, r1, r2}
add r3, sp, #0x14
@@ -10924,11 +10924,11 @@ _02176ba8:
bl func_01ffa0f4
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
cmp sb, #0
cmp r9, #0
beq _02176bec
cmp sb, #1
cmp r9, #1
beq _02176be0
cmp sb, #2
cmp r9, #2
subeq r0, r0, r7
moveq r0, r0, lsl #0x10
moveq r0, r0, asr #0x10
@@ -10992,7 +10992,7 @@ _02176c68:
mov r0, r10
mov r1, #0
bl func_01fffd04
cmp sb, #0
cmp r9, #0
beq _02176da0
cmp r6, #0
bne _02176da0
@@ -11014,7 +11014,7 @@ _02176c68:
mov r1, r5
mov r2, r4
bl func_01ff9bf8
cmp sb, #1
cmp r9, #1
ldr r0, [r10, #0xc4]
str r0, [sp, #8]
ldr r0, [r10, #0xc8]
@@ -11022,7 +11022,7 @@ _02176c68:
ldr r0, [r10, #0xcc]
str r0, [sp, #0x10]
beq _02176d40
cmp sb, #2
cmp r9, #2
beq _02176d50
b _02176d5c
_02176d40:
@@ -11078,7 +11078,7 @@ _02176da0:
ldr r0, [r0, #0x420]
cmp r0, #0
addeq sp, sp, #0x44
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r10, #0x1d8
mov r1, #0
bl func_ov14_02145f0c
@@ -11086,7 +11086,7 @@ _02176da0:
mov r1, #0
str r1, [r0, #0x20]
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02176e28:
ldr r0, [r0, #0x420]
cmp r0, #3
@@ -11107,7 +11107,7 @@ _02176e54:
subeq r1, r1, #0x2000
str r1, [r0, #0x10]
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov27_02176aac
_02176e74: .word data_027e0f94
@@ -11900,7 +11900,7 @@ _02177938:
.global func_ov27_02177940
arm_func_start func_ov27_02177940
func_ov27_02177940: ; 0x02177940
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x28
mov r10, r0
mov r4, r1
@@ -11909,22 +11909,22 @@ func_ov27_02177940: ; 0x02177940
bl func_0203d7e0
cmp r0, #0
addeq sp, sp, #0x28
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02177bb0 ; =data_027e0618
ldrb r0, [r0, #0x101]
cmp r0, #0
addne sp, sp, #0x28
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r0, [r4]
tst r0, #2
addeq sp, sp, #0x28
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02177bb4 ; =data_027e0f90
ldr r0, [r0]
ldrb r0, [r0, #0x12]
cmp r0, #0
addeq sp, sp, #0x28
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, sp, #8
bl func_01ffbe34
ldr r0, _02177bb8 ; =data_027e0c38
@@ -11935,16 +11935,16 @@ func_ov27_02177940: ; 0x02177940
moveq r8, #0x6f
cmp r0, #4
bne _02177a9c
mov sb, #0
mov r9, #0
add r5, r10, #0xec
add r4, r10, #0x500
mov r11, sb
mov r11, r9
mov r7, #1
add r6, sp, #8
_021779e4:
ldrb r0, [r10, #0x4e2]
rsb r1, r0, #3
cmp sb, r1
cmp r9, r1
bne _02177a54
ldrh r1, [r4, #0x48]
mov r3, #0
@@ -11961,14 +11961,14 @@ _021779e4:
stmia sp, {r0, r6}
mov r0, r8
mov r1, #0x12
mov r2, sb
mov r2, r9
bl func_020349cc
b _02177a90
_02177a3c:
stmia sp, {r0, r6}
add r0, r5, #0x400
mov r1, r8
mov r2, sb
mov r2, r9
bl func_02034b0c
b _02177a90
_02177a54:
@@ -11977,20 +11977,20 @@ _02177a54:
stmia sp, {r0, r6}
mov r0, r8
mov r1, #0x12
mov r2, sb
mov r2, r9
mov r3, #0
bl func_020349cc
b _02177a90
_02177a78:
mov r2, #0
mov r0, r8
mov r1, sb
mov r1, r9
mov r3, r2
str r6, [sp]
bl func_0203493c
_02177a90:
add sb, sb, #1
cmp sb, #3
add r9, r9, #1
cmp r9, #3
blt _021779e4
_02177a9c:
mov r2, #0
@@ -12060,7 +12060,7 @@ _02177a9c:
mov r2, #7
bl func_020349cc
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov27_02177940
_02177bac: .word data_027e0cbc
@@ -12919,7 +12919,7 @@ func_ov27_0217867c: ; 0x0217867c
.global func_ov27_021786ac
arm_func_start func_ov27_021786ac
func_ov27_021786ac: ; 0x021786ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
mov r6, r0
cmp r1, #1
@@ -12958,7 +12958,7 @@ _02178718:
cmp r0, #0
addeq sp, sp, #4
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldrb r0, [r6, #0x489]
cmp r0, #0
beq _02178760
@@ -12966,7 +12966,7 @@ _02178718:
strb r0, [r6, #0x489]
add sp, sp, #4
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02178760:
mov r5, #0
ldr r7, _02178868 ; =gItemManager
@@ -12977,10 +12977,10 @@ _02178774:
ldr r10, [r7]
mov r0, r10
blx _ZNK11ItemManager16GetTreasureCountEj
mov sb, r0
mov r9, r0
mov r0, r10
blx _ZNK11ItemManager19GetMaxTreasureCountEv
cmp sb, r0
cmp r9, r0
ldrge r0, [sp]
orrge r0, r5, r8, lsl r0
andge r5, r0, #0xff
@@ -13016,7 +13016,7 @@ _021787f0:
strb r0, [r6, #0x489]
add sp, sp, #4
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02178814:
add r0, r6, #0x1d8
bl func_ov14_0214610c
@@ -13028,15 +13028,15 @@ _02178814:
cmp r0, #0
addne sp, sp, #4
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02178840:
add sp, sp, #4
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_0217884c:
mov r0, #1
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov27_021786ac
_02178858: .word 0x00001001
+53 -53
View File
@@ -5435,28 +5435,28 @@ _02171d0c: .word data_027e0f6c
.global func_ov28_02171d10
arm_func_start func_ov28_02171d10
func_ov28_02171d10: ; 0x02171d10
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x70
mov sb, r0
ldr r1, [sb, #0x18]
mov r9, r0
ldr r1, [r9, #0x18]
add r0, sp, #0x64
add r1, r1, #0x3fc
add r1, r1, #0x400
str r1, [sb, #0x18]
str r1, [r9, #0x18]
str r1, [sp, #0x64]
ldr r2, [sb, #0x1c]
ldr r2, [r9, #0x1c]
add r1, sp, #0x4c
str r2, [sp, #0x68]
ldr r3, [sb, #0x20]
ldr r3, [r9, #0x20]
mov r2, r0
str r3, [sp, #0x6c]
ldr r3, [sb, #0x18]
ldr r3, [r9, #0x18]
mov r5, #0x800
str r3, [sp, #0x58]
ldr r3, [sb, #0x1c]
ldr r3, [r9, #0x1c]
mov r4, #0
str r3, [sp, #0x5c]
ldr r6, [sb, #0x20]
ldr r6, [r9, #0x20]
mov r3, #0x400
str r6, [sp, #0x60]
str r5, [sp, #0x4c]
@@ -5473,16 +5473,16 @@ func_ov28_02171d10: ; 0x02171d10
str r3, [sp, #0x48]
bl func_01ff9bc4
mov r1, #0
ldr r2, [sb, #4]
ldr r2, [r9, #4]
bic r0, r1, #0x1f
orr r2, r2, #4
orr r0, r0, #6
bic r0, r0, #0x80000000
orr r4, r0, #0x80000000
str r2, [sb, #4]
str r2, [r9, #4]
mov r2, #1
add r0, sp, #0x64
strb r2, [sb, #0x12]
strb r2, [r9, #0x12]
str r1, [sp, #8]
add r3, sp, #0x28
ldmia r0, {r0, r1, r2}
@@ -5491,20 +5491,20 @@ func_ov28_02171d10: ; 0x02171d10
add r3, sp, #0x34
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, sb
mov r0, r9
str r4, [sp, #0xc]
bl func_ov00_0208b9cc
mov r2, r0
mov r0, #0
str r0, [sp]
add r0, sb, #0x38
add r0, r9, #0x38
mov r3, r4
ldr r4, [r0]
add r1, sp, #0x28
ldr r4, [r4, #0x14]
blx r4
ldr r0, [sp, #8]
ldrh r1, [sb, #0x24]
ldrh r1, [r9, #0x24]
bic r0, r0, #0x1f
orr r0, r0, #7
bic r0, r0, #0x6000
@@ -5522,7 +5522,7 @@ func_ov28_02171d10: ; 0x02171d10
stmia r4, {r0, r1, r2}
mov r0, #0
str r0, [sp]
add r0, sb, #0x70
add r0, r9, #0x70
ldr r4, [r0]
orr r1, r6, #0x13800000
ldr r2, [sp, #0xc]
@@ -5536,12 +5536,12 @@ func_ov28_02171d10: ; 0x02171d10
str r3, [sp, #8]
blx r4
mov r1, #0
strb r1, [sb, #0x74]
strb r1, [r9, #0x74]
ldr r0, _02171f70 ; =data_027e0f6c
add r1, sb, #0x70
add r1, r9, #0x70
ldr r0, [r0]
bl func_ov00_02093a5c
ldrb r7, [sb, #0x14]
ldrb r7, [r9, #0x14]
add r0, r7, #2
cmp r7, r0
bge _02171f28
@@ -5549,7 +5549,7 @@ func_ov28_02171d10: ; 0x02171d10
add r5, sp, #4
mov r4, #1
_02171ed4:
ldrb r8, [sb, #0x15]
ldrb r8, [r9, #0x15]
add r0, r8, #1
cmp r8, r0
bge _02171f14
@@ -5561,22 +5561,22 @@ _02171ee8:
strb r6, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_02082680
ldrb r0, [sb, #0x15]
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #1
cmp r8, r0
blt _02171ee8
_02171f14:
ldrb r0, [sb, #0x14]
ldrb r0, [r9, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _02171ed4
_02171f28:
mov r0, sb
mov r0, r9
bl func_ov28_02172144
cmp r0, #0
mov r0, sb
mov r0, r9
ldr r3, [r0]
beq _02171f58
ldr r3, [r3, #0x80]
@@ -5584,14 +5584,14 @@ _02171f28:
mov r2, #0
blx r3
add sp, sp, #0x70
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_02171f58:
mov r1, #0
ldr r3, [r3, #0x80]
mov r2, r1
blx r3
add sp, sp, #0x70
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov28_02171d10
_02171f70: .word data_027e0f6c
@@ -5854,28 +5854,28 @@ func_ov28_02172250: ; 0x02172250
.global func_ov28_02172280
arm_func_start func_ov28_02172280
func_ov28_02172280: ; 0x02172280
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x54
mov sb, r0
ldr r1, [sb, #0x18]
mov r9, r0
ldr r1, [r9, #0x18]
add r0, sp, #0x48
add r1, r1, #0x3fc
add r1, r1, #0x400
str r1, [sb, #0x18]
str r1, [r9, #0x18]
str r1, [sp, #0x48]
ldr r1, [sb, #0x1c]
ldr r1, [r9, #0x1c]
ldr r3, _0217244c ; =0x0000059a
str r1, [sp, #0x4c]
ldr r2, [sb, #0x20]
ldr r2, [r9, #0x20]
add r1, sp, #0x30
str r2, [sp, #0x50]
ldr r4, [sb, #0x18]
ldr r4, [r9, #0x18]
mov r2, r0
str r4, [sp, #0x3c]
ldr r4, [sb, #0x1c]
ldr r4, [r9, #0x1c]
mov r5, #0x1000
str r4, [sp, #0x40]
ldr r6, [sb, #0x20]
ldr r6, [r9, #0x20]
mov r4, #0
str r6, [sp, #0x44]
str r5, [sp, #0x30]
@@ -5891,13 +5891,13 @@ func_ov28_02172280: ; 0x02172280
str r4, [sp, #0x28]
str r3, [sp, #0x2c]
bl func_01ff9bc4
ldr r1, [sb, #4]
mov r0, sb
ldr r1, [r9, #4]
mov r0, r9
orr r1, r1, #0x14
str r1, [sb, #4]
str r1, [r9, #4]
bl func_ov00_0208c214
mov r0, #7
strb r0, [sb, #0x12]
strb r0, [r9, #0x12]
mov r0, #0
bic r0, r0, #0x1f
orr r0, r0, #6
@@ -5912,18 +5912,18 @@ func_ov28_02172280: ; 0x02172280
add r3, sp, #0x18
ldmia r4, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, sb
mov r0, r9
bl func_ov00_0208b9cc
mov r2, r0
mov r0, #0
str r0, [sp]
add r0, sb, #0x38
add r0, r9, #0x38
ldr r4, [r0]
ldr r3, [sp, #8]
ldr r4, [r4, #0x14]
mov r1, r5
blx r4
ldrb r7, [sb, #0x14]
ldrb r7, [r9, #0x14]
add r0, r7, #2
cmp r7, r0
bge _02172404
@@ -5931,7 +5931,7 @@ func_ov28_02172280: ; 0x02172280
add r5, sp, #4
mov r4, #1
_021723b0:
ldrb r8, [sb, #0x15]
ldrb r8, [r9, #0x15]
add r0, r8, #1
cmp r8, r0
bge _021723f0
@@ -5943,22 +5943,22 @@ _021723c4:
strb r6, [sp, #4]
strb r8, [sp, #5]
bl func_ov00_02082680
ldrb r0, [sb, #0x15]
ldrb r0, [r9, #0x15]
add r8, r8, #1
add r0, r0, #1
cmp r8, r0
blt _021723c4
_021723f0:
ldrb r0, [sb, #0x14]
ldrb r0, [r9, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _021723b0
_02172404:
mov r0, sb
mov r0, r9
bl func_ov28_02172658
cmp r0, #0
mov r0, sb
mov r0, r9
ldr r3, [r0]
beq _02172434
ldr r3, [r3, #0x80]
@@ -5966,14 +5966,14 @@ _02172404:
mov r2, #0
blx r3
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02172434:
mov r1, #0
ldr r3, [r3, #0x80]
mov r2, r1
blx r3
add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov28_02172280
_0217244c: .word 0x0000059a
@@ -6291,9 +6291,9 @@ _02172808: .word 0x000001ad
.global func_ov28_0217280c
arm_func_start func_ov28_0217280c
func_ov28_0217280c: ; 0x0217280c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
ldr r3, _021728fc ; =gItemManager
mov sb, r1
mov r9, r1
ldr r7, [r3]
mov r10, r0
ldrb r4, [r7, #0x25]
@@ -6348,7 +6348,7 @@ _021728c8:
_021728d0:
add r3, r10, #0x1f8
mov r0, r10
mov r1, sb
mov r1, r9
mov r2, r8
str r3, [r8, #0x38]
mov r3, #6
@@ -6356,7 +6356,7 @@ _021728d0:
bl func_ov14_02144d70
mov r0, r10
bl func_ov28_02172b40
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov28_0217280c
_021728fc: .word gItemManager
+162 -162
View File
@@ -280,39 +280,39 @@ _0216d9ac: .word func_02017d30
.global func_ov29_0216d9b0
arm_func_start func_ov29_0216d9b0
func_ov29_0216d9b0: ; 0x0216d9b0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r3, [r1, #0x2c]
ldr r4, [r1, #0x38]
mov r3, r3, lsl #0x10
mov sb, r0
mov r9, r0
mov r0, r3, lsr #0xd
str r0, [sb, #8]
str r0, [r9, #8]
ldrh r0, [r1, #0x30]
mov r5, r2
add r4, r1, r4
mov r0, r0, lsl #0x3
mov r1, r5
str r0, [sb, #0xc]
str r0, [r9, #0xc]
mov r2, #4
bl func_0202e9f4
str r0, [sb]
ldr r0, [sb, #0xc]
str r0, [r9]
ldr r0, [r9, #0xc]
mov r1, r5
mov r2, #4
bl func_0202e9f4
str r0, [sb, #4]
ldr r1, [sb]
ldr r2, [sb, #0xc]
str r0, [r9, #4]
ldr r1, [r9]
ldr r2, [r9, #0xc]
mov r0, r4
bl func_02007984
ldr r0, [sb]
ldr r1, [sb, #0xc]
ldr r0, [r9]
ldr r1, [r9, #0xc]
bl func_0200e2a4
ldr r1, [sb, #0xc]
ldr r1, [r9, #0xc]
mov r0, #0x1f000
mov r6, r1, lsr #0x1
mov r1, #0x22000
ldr r5, [sb, #4]
ldr r5, [r9, #4]
bl Divide
ldr r2, _0216db1c ; =0x00000554
mov r1, #0x22000
@@ -369,10 +369,10 @@ _0216da94:
strh r0, [r5], #2
blt _0216da94
_0216db0c:
ldr r0, [sb, #4]
ldr r1, [sb, #0xc]
ldr r0, [r9, #4]
ldr r1, [r9, #0xc]
bl func_0200e2a4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_0216d9b0
_0216db1c: .word 0x00000554
@@ -1764,7 +1764,7 @@ _0216ed7c: .word 0x000004cd
.global func_ov29_0216ed80
arm_func_start func_ov29_0216ed80
func_ov29_0216ed80: ; 0x0216ed80
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x38
ldr r6, _0216f124 ; =data_027e0764
mov r7, #0
@@ -1775,16 +1775,16 @@ func_ov29_0216ed80: ; 0x0216ed80
ldr r4, [r6, #0xc]
ldr r2, [r6, #0x10]
mla r8, r4, r3, r8
adds sb, r2, r5
adds r9, r2, r5
ldr r5, [r6, #0x14]
umull r3, r10, r11, sb
umull r3, r10, r11, r9
adc r8, r5, r8
mla r10, r11, r8, r10
mov r1, #0xb5
adds r2, r2, r3
umull r11, r3, r8, r1
mla r10, r4, sb, r10
str sb, [r6]
mla r10, r4, r9, r10
str r9, [r6]
stmia r6, {r2, r8}
adc r10, r5, r10
umull r4, r5, r10, r1
@@ -1803,7 +1803,7 @@ func_ov29_0216ed80: ; 0x0216ed80
ldr r1, [r1, #0x14]
cmp r1, #1
addeq sp, sp, #0x38
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, _0216f12c ; =data_ov29_021798e8
ldr r8, [r0, #0x50]
ldr r2, [r1]
@@ -1817,14 +1817,14 @@ func_ov29_0216ed80: ; 0x0216ed80
ble _0216ee98
ldr r11, [r6]
ldmib r6, {r7, r8}
umull r10, sb, r8, r11
mla sb, r8, r7, sb
umull r10, r9, r8, r11
mla r9, r8, r7, r9
ldr r7, [r6, #0x10]
ldr r8, [r6, #0x14]
adds r10, r7, r10
ldr r7, [r6, #0xc]
mla sb, r7, r11, sb
adc r7, r8, sb
mla r9, r7, r11, r9
adc r7, r8, r9
str r10, [r6]
str r7, [r6, #4]
cmp lr, #0
@@ -1848,16 +1848,16 @@ _0216ee98:
movle r1, #0
ble _0216ef18
ldr r8, _0216f124 ; =data_027e0764
ldr sb, [r8]
ldr r9, [r8]
ldmib r8, {r4, r10}
umull r2, r1, r10, sb
umull r2, r1, r10, r9
mla r1, r10, r4, r1
ldr r10, [r8, #0xc]
ldr r4, [r8, #0x10]
mla r1, r10, sb, r1
ldr sb, [r8, #0x14]
mla r1, r10, r9, r1
ldr r9, [r8, #0x14]
adds r2, r4, r2
adc r1, sb, r1
adc r1, r9, r1
str r2, [r8]
str r1, [r8, #4]
cmp lr, #0
@@ -1885,13 +1885,13 @@ _0216ef18:
ldr r2, _0216f124 ; =data_027e0764
ldr r6, [r2]
ldmib r2, {r5, r7}
umull sb, r8, r7, r6
umull r9, r8, r7, r6
mla r8, r7, r5, r8
ldr r5, [r2, #0xc]
ldr r7, [r2, #0x10]
mla r8, r5, r6, r8
ldr r5, [r2, #0x14]
adds r6, r7, sb
adds r6, r7, r9
adc r5, r5, r8
str r6, [r2]
str r5, [r2, #4]
@@ -1920,14 +1920,14 @@ _0216efa0:
ldr r6, _0216f124 ; =data_027e0764
ldr r7, [r6]
ldmib r6, {r5, r8}
umull r10, sb, r8, r7
mla sb, r8, r5, sb
umull r10, r9, r8, r7
mla r9, r8, r5, r9
ldr r5, [r6, #0xc]
ldr r8, [r6, #0x10]
mla sb, r5, r7, sb
mla r9, r5, r7, r9
ldr r5, [r6, #0x14]
adds r7, r8, r10
adc r5, r5, sb
adc r5, r5, r9
str r7, [r6]
str r5, [r6, #4]
cmp r4, #0
@@ -1977,7 +1977,7 @@ _0216f074:
mov r3, #2
bl func_ov00_0207c1b0
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216f0c4:
cmp ip, #0
strgt r2, [sp, #0x14]
@@ -2002,7 +2002,7 @@ _0216f0c4:
mov r3, #2
bl func_ov00_0207c1b0
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_0216ed80
_0216f124: .word data_027e0764
@@ -2990,7 +2990,7 @@ func_ov29_0216fe04: ; 0x0216fe04
.global func_ov29_0216fe28
arm_func_start func_ov29_0216fe28
func_ov29_0216fe28: ; 0x0216fe28
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x38
mov r5, r0
ldr r1, [r5, #0x50]
@@ -2999,7 +2999,7 @@ func_ov29_0216fe28: ; 0x0216fe28
sub r4, r1, #0xd000
sub ip, r0, #0x2000
add r7, r0, #0x2000
sub sb, r1, #0xc000
sub r9, r1, #0xc000
add r8, lr, #0x2000
mov r0, #0
bic r1, r0, #0x1f
@@ -3013,7 +3013,7 @@ func_ov29_0216fe28: ; 0x0216fe28
str r4, [sp, #0x10]
str r7, [sp, #0x14]
str r8, [sp, #0x18]
str sb, [sp, #0x1c]
str r9, [sp, #0x1c]
str r0, [sp]
add r0, r5, #0x344
ldr r6, [r0]
@@ -3026,7 +3026,7 @@ func_ov29_0216fe28: ; 0x0216fe28
str r4, [sp, #0x34]
str r7, [sp, #0x20]
str r8, [sp, #0x24]
str sb, [sp, #0x28]
str r9, [sp, #0x28]
blx r6
ldr r3, [r5, #0x50]
ldr r2, [r5, #0x4c]
@@ -3066,7 +3066,7 @@ func_ov29_0216fe28: ; 0x0216fe28
ldr r0, [r0]
bl func_ov00_02093a5c
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov29_0216fe28
_0216ff5c: .word data_027e0f6c
@@ -3127,7 +3127,7 @@ _0216ffe4: .word 0x474f3154
.global func_ov29_0216ffe8
arm_func_start func_ov29_0216ffe8
func_ov29_0216ffe8: ; 0x0216ffe8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xb8
ldr r0, _02170130 ; =data_027e0fec
ldr r0, [r0]
@@ -3161,7 +3161,7 @@ _02170040:
ldr r0, [r1, r0, lsl #2]
str r0, [sp]
ble _02170104
mov sb, r8
mov r9, r8
_02170070:
ldr r0, _02170130 ; =data_027e0fec
mov r2, #0x10
@@ -3184,7 +3184,7 @@ _02170070:
bl func_ov00_020c0cc8
mov r0, r6
bl func_ov00_020c0d4c
str sb, [r0]
str r9, [r0]
mov r0, r5
bl func_ov00_020a9864
mov r0, r5
@@ -3196,7 +3196,7 @@ _02170070:
mov r0, r5
bl func_ov00_020a9968
add r8, r8, #1
add sb, sb, #0x1000
add r9, r9, #0x1000
add r10, r10, #0x58
cmp r8, r11
blt _02170070
@@ -3211,7 +3211,7 @@ _02170104:
add r0, sp, #0x5c
blx func_ov00_020a95a4
add sp, sp, #0xb8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_0216ffe8
_02170130: .word data_027e0fec
@@ -3395,7 +3395,7 @@ _02170368: .word data_ov29_021793a0
.global func_ov29_0217036c
arm_func_start func_ov29_0217036c
func_ov29_0217036c: ; 0x0217036c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r3, #0
str r3, [r0, #0x130]
ldr r2, [r1]
@@ -3419,19 +3419,19 @@ func_ov29_0217036c: ; 0x0217036c
str r3, [r0, #0x24c]
ldr r2, [r6]
ldmib r6, {r1, r7}
umull r10, sb, r7, r2
mla sb, r7, r1, sb
umull r10, r9, r7, r2
mla r9, r7, r1, r9
ldr r1, [r6, #0xc]
ldr r7, [r6, #0x10]
mla sb, r1, r2, sb
mla r9, r1, r2, r9
ldr r1, [r6, #0x14]
adds r2, r7, r10
adc sb, r1, sb
umull r7, r1, sb, ip
mla r1, sb, r3, r1
adc r9, r1, r9
umull r7, r1, r9, ip
mla r1, r9, r3, r1
mla r1, r8, ip, r1
umull r7, ip, r1, lr
stmia r6, {r2, sb}
stmia r6, {r2, r9}
adds r6, r7, #0x800
mla ip, r1, r3, ip
mov r8, r1, asr #0x1f
@@ -3454,7 +3454,7 @@ func_ov29_0217036c: ; 0x0217036c
ldr r1, [r5, #0x14]
str r2, [r0, #0x158]
str r1, [r0, #0x15c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov29_0217036c
_0217045c: .word data_027e0764
@@ -3738,7 +3738,7 @@ _0217084c: .word 0x00000433
.global func_ov29_02170850
arm_func_start func_ov29_02170850
func_ov29_02170850: ; 0x02170850
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r4, #2
str r4, [r0, #0x130]
add r8, r0, #0x200
@@ -3768,12 +3768,12 @@ func_ov29_02170850: ; 0x02170850
add r4, r4, #0x800
mov r4, r4, asr #0xc
str r4, [r0, #0x230]
ldrsh sb, [r2]
ldrsh r9, [r2]
mov r6, #0x78
ldr r4, _021709bc ; =data_ov29_02179ac8
strh sb, [r8, #0x18]
ldrsh sb, [r2, #2]
strh sb, [r8, #0x1a]
strh r9, [r8, #0x18]
ldrsh r9, [r2, #2]
strh r9, [r8, #0x1a]
ldr r8, [r2, #4]
str r8, [r0, #0x21c]
ldr r8, [r2, #8]
@@ -3788,16 +3788,16 @@ func_ov29_02170850: ; 0x02170850
str r2, [r0, #0x23c]
str r3, [r0, #0x24c]
ldr r10, [r5]
ldmib r5, {sb, r11}
ldmib r5, {r9, r11}
umull r8, r2, r11, r10
mla r2, r11, sb, r2
ldr sb, [r5, #0xc]
mla r2, r11, r9, r2
ldr r9, [r5, #0xc]
ldr r11, [r5, #0x10]
mla r2, sb, r10, r2
ldr sb, [r5, #0x14]
mla r2, r9, r10, r2
ldr r9, [r5, #0x14]
adds r8, r11, r8
adc r10, sb, r2
umull sb, r2, r10, r1
adc r10, r9, r2
umull r9, r2, r10, r1
mla r2, r10, r3, r2
mla r2, r7, r1, r2
stmia r5, {r8, r10}
@@ -3826,7 +3826,7 @@ func_ov29_02170850: ; 0x02170850
ldr r1, [r4, #0x24]
str r2, [r0, #0x158]
str r1, [r0, #0x15c]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_02170850
_021709b4: .word data_027e0764
@@ -6632,7 +6632,7 @@ func_ov29_02172f0c: ; 0x02172f0c
.global func_ov29_02172f10
arm_func_start func_ov29_02172f10
func_ov29_02172f10: ; 0x02172f10
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
ldr r0, [r4, #0x160]
mov r5, r1
@@ -6677,35 +6677,35 @@ _02172f4c:
mov r7, #0
adc lr, r3, r6
mov r6, #0x64
umull r0, sb, lr, r6
mla sb, lr, r7, sb
umull r0, r9, lr, r6
mla r9, lr, r7, r9
mov r0, r7
mla sb, r0, r6, sb
cmp sb, #0x32
umull sb, r6, r2, r5
mla r9, r0, r6, r9
cmp r9, #0x32
umull r9, r6, r2, r5
mla r6, r2, lr, r6
stmia r8, {r5, lr}
ble _0217300c
mla r6, r1, r5, r6
adds sb, ip, sb
adds r9, ip, r9
adc r5, r3, r6
mov r1, #0xb
umull r2, r3, r5, r1
mla r3, r5, r7, r3
mla r3, r0, r1, r3
str sb, [r8]
str r9, [r8]
str r5, [r8, #4]
add r0, r3, #0xa
b _02173034
_0217300c:
mla r6, r1, r5, r6
adds sb, ip, sb
adds r9, ip, r9
adc r5, r3, r6
mov r1, #0xb
umull r2, r3, r5, r1
mla r3, r5, r7, r3
mla r3, r0, r1, r3
str sb, [r8]
str r9, [r8]
str r5, [r8, #4]
add r0, r3, #0x1e
_02173034:
@@ -6729,7 +6729,7 @@ _02173034:
ldr r0, [r0, #4]
str r1, [r4, #0x160]
str r0, [r4, #0x164]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov29_02172f10
_02173088: .word data_027e0764
@@ -7393,7 +7393,7 @@ _021739d0: .word data_ov29_02179db0
.global func_ov29_021739d4
arm_func_start func_ov29_021739d4
func_ov29_021739d4: ; 0x021739d4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x2c
mov r4, r0
ldr r0, [r4, #0x288]
@@ -7723,7 +7723,7 @@ _02173e68:
ldrsh r2, [r6, r1]
ldrsh r1, [r6, #2]
add r5, r5, r5, lsr #31
smull r7, sb, r0, r3
smull r7, r9, r0, r3
adds r10, r7, #0x800
mov r5, r5, lsl #0xf
mov r5, r5, lsr #0x10
@@ -7733,18 +7733,18 @@ _02173e68:
mov r5, r5, lsl #0x1
mov r8, r7, lsl #0x1
smull r11, r7, r1, r2
adc ip, sb, #0
adc ip, r9, #0
adds r11, r11, #0x800
mov sb, r10, lsr #0xc
mov r9, r10, lsr #0xc
ldrsh r10, [r6, r5]
orr sb, sb, ip, lsl #20
orr r9, r9, ip, lsl #20
ldrsh r8, [r6, r8]
adc r5, r7, #0
mov r7, r11, lsr #0xc
orr r7, r7, r5, lsl #20
smull r6, r5, r7, r8
adds r6, r6, #0x800
smull lr, ip, sb, r10
smull lr, ip, r9, r10
smull r3, r11, r1, r3
smull r2, r1, r0, r2
adc r0, r5, #0
@@ -7773,16 +7773,16 @@ _02173e68:
smull r3, r1, r7, r10
smull r10, r7, r2, r10
smull ip, r11, r2, r8
smull r8, r2, sb, r8
smull r8, r2, r9, r8
adds ip, ip, #0x800
adc sb, r11, #0
adc r9, r11, #0
mov r11, ip, lsr #0xc
orr r11, r11, sb, lsl #20
orr r11, r11, r9, lsl #20
add r0, r0, r11
str r0, [r4, #0x214]
adds sb, r10, #0x800
adds r9, r10, #0x800
adc r0, r7, #0
mov r7, sb, lsr #0xc
mov r7, r9, lsr #0xc
orr r7, r7, r0, lsl #20
adds r6, r6, #0x800
adc r0, r5, #0
@@ -7804,7 +7804,7 @@ _02173e68:
add r1, r4, #0x244
bl func_ov38_021854e4
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021739d4
_02173ffc: .word 0xfffff555
@@ -8015,7 +8015,7 @@ _021742dc: .word 0x00000e39
.global func_ov29_021742e0
arm_func_start func_ov29_021742e0
func_ov29_021742e0: ; 0x021742e0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
mov r4, r0
ldr r0, [r4, #0x288]
@@ -8208,7 +8208,7 @@ _02174578:
ldrsh r2, [r6, r1]
ldrsh r1, [r6, #2]
add r5, r5, r5, lsr #31
smull r7, sb, r0, r3
smull r7, r9, r0, r3
adds r10, r7, #0x800
mov r5, r5, lsl #0xf
mov r5, r5, lsr #0x10
@@ -8218,18 +8218,18 @@ _02174578:
mov r5, r5, lsl #0x1
mov r8, r7, lsl #0x1
smull r11, r7, r1, r2
adc ip, sb, #0
adc ip, r9, #0
adds r11, r11, #0x800
mov sb, r10, lsr #0xc
mov r9, r10, lsr #0xc
ldrsh r10, [r6, r5]
orr sb, sb, ip, lsl #20
orr r9, r9, ip, lsl #20
ldrsh r8, [r6, r8]
adc r5, r7, #0
mov r7, r11, lsr #0xc
orr r7, r7, r5, lsl #20
smull r6, r5, r7, r8
adds r6, r6, #0x800
smull lr, ip, sb, r10
smull lr, ip, r9, r10
smull r3, r11, r1, r3
smull r2, r1, r0, r2
adc r0, r5, #0
@@ -8258,16 +8258,16 @@ _02174578:
smull r3, r1, r7, r10
smull r10, r7, r2, r10
smull ip, r11, r2, r8
smull r8, r2, sb, r8
smull r8, r2, r9, r8
adds ip, ip, #0x800
adc sb, r11, #0
adc r9, r11, #0
mov r11, ip, lsr #0xc
orr r11, r11, sb, lsl #20
orr r11, r11, r9, lsl #20
add r0, r0, r11
str r0, [sp, #0xc]
adds sb, r10, #0x800
adds r9, r10, #0x800
adc r0, r7, #0
mov r7, sb, lsr #0xc
mov r7, r9, lsr #0xc
orr r7, r7, r0, lsl #20
adds r6, r6, #0x800
adc r0, r5, #0
@@ -8295,7 +8295,7 @@ _02174578:
add r1, r4, #0x244
bl func_ov38_021854e4
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021742e0
_0217471c: .word 0x000038e4
@@ -8463,7 +8463,7 @@ _0217494c: .word data_02050f54
.global func_ov29_02174950
arm_func_start func_ov29_02174950
func_ov29_02174950: ; 0x02174950
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov r4, r0
add r0, r4, #0x244
@@ -8511,13 +8511,13 @@ func_ov29_02174950: ; 0x02174950
ldrsh r2, [r6, #2]
ldrsh r1, [r6, r1]
smull r6, r8, r0, r3
adds sb, r6, #0x800
adds r9, r6, #0x800
ldr r5, _02174cbc ; =data_02054b54
smull r7, r6, r1, r2
adc r8, r8, #0
mov sb, sb, lsr #0xc
mov r9, r9, lsr #0xc
adds r7, r7, #0x800
orr sb, sb, r8, lsl #20
orr r9, r9, r8, lsl #20
ldrsh r10, [r5, #2]
ldrsh r8, [r5]
smull r3, r11, r1, r3
@@ -8525,7 +8525,7 @@ func_ov29_02174950: ; 0x02174950
mov r7, r7, lsr #0xc
orr r7, r7, r5, lsl #20
smull r6, r5, r7, r8
smull lr, ip, sb, r10
smull lr, ip, r9, r10
smull r2, r1, r0, r2
adds r6, r6, #0x800
adc r0, r5, #0
@@ -8555,15 +8555,15 @@ func_ov29_02174950: ; 0x02174950
smull r3, r1, r7, r10
smull r10, r7, r2, r10
adds ip, ip, #0x800
smull r8, r2, sb, r8
adc sb, r11, #0
smull r8, r2, r9, r8
adc r9, r11, #0
mov r11, ip, lsr #0xc
orr r11, r11, sb, lsl #20
orr r11, r11, r9, lsl #20
add r0, r0, r11
adds sb, r10, #0x800
adds r9, r10, #0x800
str r0, [sp, #4]
adc r0, r7, #0
mov r7, sb, lsr #0xc
mov r7, r9, lsr #0xc
adds r6, r6, #0x800
orr r7, r7, r0, lsl #20
adc r0, r5, #0
@@ -8600,19 +8600,19 @@ _02174b2c:
ldrsh r2, [r6, #2]
ldrsh r1, [r6, r1]
smull r6, r8, r0, r3
adds sb, r6, #0x800
adds r9, r6, #0x800
ldr r5, _02174cc4 ; =data_02054e54
smull r7, r6, r1, r2
adc r8, r8, #0
mov r11, sb, lsr #0xc
mov r11, r9, lsr #0xc
adds r7, r7, #0x800
ldrsh r10, [r5, #0x1c]
ldrsh ip, [r5, #0x1e]
smull r3, lr, r1, r3
adc r5, r6, #0
mov sb, r7, lsr #0xc
orr sb, sb, r5, lsl #20
smull r5, r7, sb, r10
mov r9, r7, lsr #0xc
orr r9, r9, r5, lsl #20
smull r5, r7, r9, r10
orr r11, r11, r8, lsl #20
adds r8, r5, #0x800
smull r2, r1, r0, r2
@@ -8640,14 +8640,14 @@ _02174b2c:
mov r0, r5, lsr #0xc
orr r0, r0, r3, lsl #20
smull r6, r5, r1, r10
smull r3, r1, sb, ip
smull r3, r1, r9, ip
smull r8, r7, r2, ip
smull ip, sb, r2, r10
smull ip, r9, r2, r10
smull r10, r2, r11, r10
adds r11, ip, #0x800
adc sb, sb, #0
adc r9, r9, #0
mov r11, r11, lsr #0xc
orr r11, r11, sb, lsl #20
orr r11, r11, r9, lsl #20
add r0, r0, r11
adds r8, r8, #0x800
str r0, [sp, #4]
@@ -8681,7 +8681,7 @@ _02174c88:
add r1, r4, #0x244
bl func_ov38_021854e4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_02174950
_02174cb4: .word data_02050f54
@@ -9249,7 +9249,7 @@ _021753a8: .word data_ov29_02179f4c
.global func_ov29_021753ac
arm_func_start func_ov29_021753ac
func_ov29_021753ac: ; 0x021753ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x68
ldr r3, _0217558c ; =data_027e0d0c
mov r4, r0
@@ -9319,11 +9319,11 @@ func_ov29_021753ac: ; 0x021753ac
umull r7, r6, r5, ip
mla r6, r5, r3, r6
ldr r0, [r0]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
ldrsh r10, [r0, #0x78]
mla r6, lr, ip, r6
ldr r8, [r2, #0x14]
adds r3, sb, r7
adds r3, r9, r7
adc r5, r8, r6
ldr r0, _021755a4 ; =0x0000071d
stmia r2, {r3, r5}
@@ -9368,7 +9368,7 @@ func_ov29_021753ac: ; 0x021753ac
bl func_ov29_02175724
mov r0, #1
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021753ac
_0217558c: .word data_027e0d0c
@@ -10590,11 +10590,11 @@ _021765ec: .word data_027e0fe4
.global func_ov29_021765f0
arm_func_start func_ov29_021765f0
func_ov29_021765f0: ; 0x021765f0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov r10, r0
ldrb r7, [r10, #0x14]
mov sb, r1
mov r9, r1
add r0, r7, #2
cmp r7, r0
bge _021766b8
@@ -10608,7 +10608,7 @@ _0217661c:
bge _021766a4
and r6, r7, #0xff
_02176630:
cmp sb, #0
cmp r9, #0
ldr r0, [r4]
beq _02176668
mov r1, r5
@@ -10658,7 +10658,7 @@ _021766b8:
ldr r1, [r1]
mov r2, r5
bl func_ov00_02093a4c
cmp sb, #0
cmp r9, #0
add r2, sp, #8
beq _0217673c
ldr r1, [sp, #8]
@@ -10678,7 +10678,7 @@ _021766b8:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217673c:
ldr r0, _02176788 ; =data_027e0f6c
ldr r1, [sp, #8]
@@ -10697,7 +10697,7 @@ _0217673c:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021765f0
_02176784: .word data_027e0e60
@@ -13773,14 +13773,14 @@ _02179000: .word data_ov29_0217bd70
.global func_ov29_02179004
arm_func_start func_ov29_02179004
func_ov29_02179004: ; 0x02179004
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x24
ldr r1, _021791f4 ; =data_ov29_0217bd50
mov r4, r0
ldr r0, [r1, #0xc]
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldrsh r0, [r4, #0x56]
mov r1, #0x100
mov r0, r0, lsl #0xd
@@ -13807,7 +13807,7 @@ func_ov29_02179004: ; 0x02179004
str r1, [sp, #4]
movs r0, #0x14
addeq sp, sp, #0x24
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, [sp, #0x18]
str r6, [sp, #0x20]
mov r0, r0, asr #0x1f
@@ -13832,10 +13832,10 @@ _021790ac:
bl func_01ff9bc4
ldr r1, [r4, #0xc]
ldr r0, [r5, #0xac]
rsb sb, r1, #0
rsb r9, r1, #0
smull r2, r1, r0, r1
ldr r0, [sp, #0x20]
mov r3, sb, asr #0x1f
mov r3, r9, asr #0x1f
sub r10, r6, r0
mov r0, r10, asr #0x1
add r0, r10, r0, lsr #30
@@ -13843,53 +13843,53 @@ _021790ac:
ldr r0, _02179200 ; =data_ov29_0217949c
ldr r0, [r0, r10, lsl #2]
ldr r10, [sp, #0x18]
umull lr, ip, r10, sb
umull lr, ip, r10, r9
mla ip, r10, r3, ip
ldr r3, [sp, #0x1c]
adds r10, lr, #0x800
mla ip, r3, sb, ip
adc sb, ip, #0
mla ip, r3, r9, ip
adc r9, ip, #0
mov r3, r10, lsr #0xc
orr r3, r3, sb, lsl #20
adds sb, r2, #0x800
orr r3, r3, r9, lsl #20
adds r9, r2, #0x800
adc r1, r1, #0
mov r2, sb, lsr #0xc
mov r2, r9, lsr #0xc
orr r2, r2, r1, lsl #20
sub r3, r3, r2
umull r10, sb, r7, r3
umull r10, r9, r7, r3
adds r1, r10, #0x80000000
mov r2, r3, asr #0x1f
mla sb, r7, r2, sb
mla r9, r7, r2, r9
ldr r1, [sp, #0xc]
ldr r10, [sp, #0x10]
mla sb, r1, r3, sb
adc r1, sb, #0
mla r9, r1, r3, r9
adc r1, r9, #0
str r1, [r4, #4]
ldr r1, [r4, #0xc]
ldr r3, [r5, #0xb0]
rsb ip, r1, #0
smull r2, r1, r3, r1
mov r3, ip, asr #0x1f
umull sb, lr, r10, ip
umull r9, lr, r10, ip
mla lr, r10, r3, lr
ldr r3, [sp, #0x14]
adds r10, sb, #0x800
adds r10, r9, #0x800
mla lr, r3, ip, lr
adc sb, lr, #0
adc r9, lr, #0
mov r3, r10, lsr #0xc
orr r3, r3, sb, lsl #20
adds sb, r2, #0x800
orr r3, r3, r9, lsl #20
adds r9, r2, #0x800
adc r1, r1, #0
mov r2, sb, lsr #0xc
mov r2, r9, lsr #0xc
orr r2, r2, r1, lsl #20
sub r3, r3, r2
umull r10, sb, r8, r3
umull r10, r9, r8, r3
mov r2, r3, asr #0x1f
adds r1, r10, #0x80000000
mla sb, r8, r2, sb
mla r9, r8, r2, r9
ldr r1, [sp, #4]
mla sb, r1, r3, sb
adc r1, sb, #0
mla r9, r1, r3, r9
adc r1, r9, #0
add r0, r1, r0
str r0, [r4, #8]
_021791dc:
@@ -13898,7 +13898,7 @@ _021791dc:
cmp r6, r0
bne _021790ac
add sp, sp, #0x24
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov29_02179004
_021791f4: .word data_ov29_0217bd50
+205 -205
View File
File diff suppressed because it is too large Load Diff
+36 -36
View File
@@ -57,7 +57,7 @@ _0217bdc4: .word data_ov31_02183e80
.global func_ov31_0217bdc8
arm_func_start func_ov31_0217bdc8
func_ov31_0217bdc8: ; 0x0217bdc8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r7, r0
mov r2, #0
str r2, [r7]
@@ -140,9 +140,9 @@ _0217becc:
add r0, r7, r6, lsl #2
ldr r0, [r0, #0x2c]
mov r1, r4
and sb, r2, #0xf
and r9, r2, #0xf
blx func_ov09_0211c9a0
add r1, sb, #3
add r1, r9, #3
mul r2, r1, r0
add r1, r7, r6, lsl #2
add r6, r6, #1
@@ -155,7 +155,7 @@ _0217becc:
mov r0, r7
bl func_ov31_0217bdb4
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov31_0217bdc8
_0217bf48: .word 0x0000ffff
@@ -1464,7 +1464,7 @@ _0217cfd0: .word data_ov31_02183e84
.global func_ov31_0217cfd4
arm_func_start func_ov31_0217cfd4
func_ov31_0217cfd4: ; 0x0217cfd4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x5c
mov r10, r0
add r0, r10, #0x1d8
@@ -1527,7 +1527,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
sub r0, r0, #0x100
str r0, [sp, #0x10]
ldr r0, _0217d3ec ; =0x49544150
mov sb, r5
mov r9, r5
add r0, r0, #0x1200
str r0, [sp, #0x14]
ldr r0, _0217d3f8 ; =0x49545452
@@ -1641,7 +1641,7 @@ _0217d250:
_0217d25c:
bl func_ov31_0217bdb8
add r0, r0, #0x70
add r0, r0, sb
add r0, r0, r9
str r0, [sp]
ldr r0, _0217d404 ; =data_027e0fe8
mov r1, r8
@@ -1668,7 +1668,7 @@ _0217d2b8:
sub r0, r0, #0xc00
str r0, [sp, #0x2c]
_0217d2c8:
add sb, sb, #8
add r9, r9, #8
add r7, r7, #1
cmp r7, #5
blt _0217d0f8
@@ -1739,7 +1739,7 @@ _0217d2c8:
strb r1, [r10, #0x480]
bl func_ov14_021450f0
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov31_0217cfd4
_0217d3e8: .word 0x00005555
@@ -2843,7 +2843,7 @@ _0217e03c: .word data_027e0ce0
.global func_ov31_0217e040
arm_func_start func_ov31_0217e040
func_ov31_0217e040: ; 0x0217e040
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r7, _0217e278 ; =data_02057878
ldr r6, _0217e27c ; =data_0205785c
ldr r5, _0217e280 ; =gItemManager
@@ -2856,26 +2856,26 @@ _0217e05c:
ldreqh r0, [r0, #0xb6]
cmpeq r0, #1
ldreq r8, [r4, #0xb0]
ldreq sb, [r4, #0x104]
ldreq r9, [r4, #0x104]
beq _0217e0c0
cmp r10, #7
ldreq r0, [r5]
ldreqh r0, [r0, #0xb4]
cmpeq r0, #1
ldreq r8, [r4, #0xb4]
ldreq sb, [r4, #0x108]
ldreq r9, [r4, #0x108]
beq _0217e0c0
cmp r10, #8
ldreq r0, [r5]
ldreqh r0, [r0, #0xb8]
cmpeq r0, #1
ldreq r8, [r4, #0xb8]
ldreq sb, [r4, #0x10c]
ldreq r9, [r4, #0x10c]
beq _0217e0c0
ldr r0, _0217e28c ; =data_ov31_02182318
ldr r8, [r0, r10, lsl #2]
ldr r0, _0217e290 ; =data_ov31_0218236c
ldr sb, [r0, r10, lsl #2]
ldr r9, [r0, r10, lsl #2]
_0217e0c0:
ldr r1, [r11, #4]
mov r0, #0x14
@@ -2898,7 +2898,7 @@ _0217e0f0:
bl _ZN9SysObjectnwEmPjj
cmp r0, #0
beq _0217e128
stmia r0, {r7, sb}
stmia r0, {r7, r9}
mov r1, #0
str r1, [r0, #8]
str r1, [r0, #0xc]
@@ -2992,7 +2992,7 @@ _0217e254:
bl func_ov31_0217dfec
ldr r1, _0217e2a0 ; =data_ov31_02183e88
str r0, [r1, #0x2c0]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov31_0217e040
_0217e278: .word data_02057878
@@ -4059,7 +4059,7 @@ _0217ee70: .word data_027e0d78
.global func_ov31_0217ee74
arm_func_start func_ov31_0217ee74
func_ov31_0217ee74: ; 0x0217ee74
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x30
mov r5, r0
mov r4, r1
@@ -4083,14 +4083,14 @@ func_ov31_0217ee74: ; 0x0217ee74
ldr ip, [r3, #0x270]
ldr r3, [r3, #0x274]
add r1, r6, r1
add sb, sp, #0
add r9, sp, #0
str r8, [sp, #0x24]
str r0, [sp, #0x28]
str r1, [sp, #0x2c]
ldmia r2, {r0, r1, r2}
stmia sb, {r0, r1, r2}
mov r0, sb
mov r2, sb
stmia r9, {r0, r1, r2}
mov r0, r9
mov r2, r9
add r1, r5, #0x14
str r8, [sp, #0x18]
str r7, [sp, #0x1c]
@@ -4099,17 +4099,17 @@ func_ov31_0217ee74: ; 0x0217ee74
str ip, [sp, #0x10]
str r3, [sp, #0x14]
bl func_01ff9bf8
mov r0, sb
mov r0, r9
mov r1, r0
bl func_01ff9d4c
ldrb r0, [r5, #0x174]
mov r1, #0x400
cmp r0, #1
mov r0, sb
mov r0, r9
bne _0217ef70
bl func_01fffbec
add r0, r5, #0x48
mov r1, sb
mov r1, r9
mov r2, r0
bl func_01ff9bc4
ldr r2, [sp, #0x28]
@@ -4126,7 +4126,7 @@ _0217ef70:
rsb r1, r1, #0
bl func_01fffbec
add r0, r5, #0x48
mov r1, sb
mov r1, r9
mov r2, r0
bl func_01ff9bc4
ldr r2, [r5, #0x18]
@@ -4143,7 +4143,7 @@ _0217efac:
mov r1, r4
bl func_ov31_0217eddc
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov31_0217ee74
_0217efc0: .word data_027e0f64
@@ -7584,7 +7584,7 @@ func_ov31_021815e0: ; 0x021815e0
.global func_ov31_02181610
arm_func_start func_ov31_02181610
func_ov31_02181610: ; 0x02181610
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r4, [r1, #0x38]
str r0, [sp]
@@ -7614,7 +7614,7 @@ func_ov31_02181610: ; 0x02181610
ldr r1, [sp, #8]
mov r5, r2, asr #0xa
ldr r2, [sp]
mov sb, r1, lsr #0x1
mov r9, r1, lsr #0x1
and r1, r10, #0x1f
add r1, r1, #0x1f
mov r0, #0x1f000
@@ -7642,7 +7642,7 @@ func_ov31_02181610: ; 0x02181610
mov r1, r10, lsl #0x1b
mul r0, r3, r0
add r0, r0, #0x800
cmp sb, #0
cmp r9, #0
mov r2, #0
mov lr, r0, asr #0xc
ble _02181780
@@ -7675,7 +7675,7 @@ _02181708:
orr r3, r3, ip, lsl #5
orr r0, r3, r0, lsl #10
strh r0, [r8], #2
cmp r2, sb
cmp r2, r9
blt _02181708
_02181780:
ldr r0, [sp]
@@ -7683,18 +7683,18 @@ _02181780:
ldr r0, [r0, #0xc]
bl func_0200e2a4
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov31_02181610
.global func_ov31_02181798
arm_func_start func_ov31_02181798
func_ov31_02181798: ; 0x02181798
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r4, r0
ldr r1, [r4]
ldr r0, [r4, #4]
cmp r1, r0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
str r1, [r4, #4]
ldr r0, [r4, #0x14]
ldr ip, [r4, #8]
@@ -7712,7 +7712,7 @@ _021817d4:
mov r0, r0, asr #0x5
and r1, r7, #0x7c00
mov r1, r1, asr #0xa
and sb, r7, #0x1f
and r9, r7, #0x1f
mul r7, r0, r2
and r8, r3, #0x3e0
and r10, r3, #0x7c00
@@ -7720,7 +7720,7 @@ _021817d4:
add r6, r6, #1
mov r1, r10, asr #0xa
and r10, r3, #0x1f
mul r3, sb, r2
mul r3, r9, r2
rsb r2, r2, #0x1000
mla r0, r1, r2, r0
mov r1, r8, asr #0x5
@@ -7743,7 +7743,7 @@ _02181848:
ldr r3, [r4, #0x14]
mov r0, #1
bl func_02017d30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov31_02181798
.global func_ov31_0218186c
+86 -86
View File
@@ -3311,7 +3311,7 @@ func_ov32_0217e700: ; 0x0217e700
.global func_ov32_0217e730
arm_func_start func_ov32_0217e730
func_ov32_0217e730: ; 0x0217e730
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x78
mov r4, r1
ldrb r2, [r4]
@@ -3339,7 +3339,7 @@ func_ov32_0217e730: ; 0x0217e730
ldr r1, [r5, #0x4f4]
cmp r1, #0
addne sp, sp, #0x78
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e7a4:
add r0, r5, #0x21c
mov r1, #1
@@ -3348,7 +3348,7 @@ _0217e7a4:
_0217e7b4:
add sp, sp, #0x78
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e7c0:
ldr r2, [r5, #0x4f4]
cmp r2, #0
@@ -3372,7 +3372,7 @@ _0217e7dc: ; jump table
_0217e808:
cmp r2, #0
addne sp, sp, #0x78
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e814:
ldrsh r1, [r5, #0x78]
ldr r0, [r4, #0x14]
@@ -3380,7 +3380,7 @@ _0217e814:
bl func_ov14_02120ac4
add sp, sp, #0x78
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e830:
cmp r1, #9
bne _0217e85c
@@ -3448,7 +3448,7 @@ _0217e85c:
_0217e928:
add sp, sp, #0x78
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e934:
add r0, r5, #0x100
ldrsb r1, [r0, #0xa0]
@@ -3476,7 +3476,7 @@ _0217e934:
ldrsb r6, [r0, #0xaa]
ldrsb r7, [r0, #0xab]
ldrsb r8, [r0, #0xac]
ldrsh sb, [r0, #0xae]
ldrsh r9, [r0, #0xae]
ldrh r10, [r0, #0xb0]
ldmia r1, {r0, r1, r2}
stmia ip, {r0, r1, r2}
@@ -3537,12 +3537,12 @@ _0217ea20:
strb r7, [r5, #0x1ab]
strb r8, [r5, #0x1ac]
add r0, r5, #0x100
strh sb, [r0, #0xae]
strh r9, [r0, #0xae]
strh r10, [r0, #0xb0]
ldmia r1, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217eaa0:
mov r2, #1
mov r0, r5
@@ -3599,11 +3599,11 @@ _0217eb64:
bl func_ov00_020cadb0
add sp, sp, #0x78
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217eb7c:
mov r0, #0
add sp, sp, #0x78
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_0217e730
_0217eb88: .word data_027e0e58
@@ -3792,14 +3792,14 @@ _0217edd8: .word func_01fffcec
.global func_ov32_0217eddc
arm_func_start func_ov32_0217eddc
func_ov32_0217eddc: ; 0x0217eddc
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x2c
mov r7, r0
add r0, r7, #0x500
ldrsb r1, [r0, #2]
cmp r1, #0
addle sp, sp, #0x2c
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r2, #0x2b8
str r2, [sp, #0x28]
ldrsb r1, [r0, #2]
@@ -3836,7 +3836,7 @@ _0217ee34:
adc r11, ip, #0
str r0, [sp, #0x20]
mov r3, r3, lsr #0xc
ldr sb, [r7, #0x50]
ldr r9, [r7, #0x50]
mov r0, r2, asr #0x1f
orr r3, r3, r11, lsl #20
str r0, [sp, #8]
@@ -3854,8 +3854,8 @@ _0217ee34:
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
ldr r0, [r0]
str sb, [sp, #0x24]
add r3, sb, r3
str r9, [sp, #0x24]
add r3, r9, r3
mov r2, r1
str r3, [r2, #8]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
@@ -3896,10 +3896,10 @@ _0217ef50:
mov r2, #0
str r2, [sp, #0x14]
mov r2, r3, lsl #0x1
ldrsh sb, [r8, r2]
ldrsh r9, [r8, r2]
add r2, r8, r3, lsl #1
ldrsh r3, [r2, #2]
str sb, [sp, #0x10]
str r9, [sp, #0x10]
add r2, sp, #0x10
str r3, [sp, #0x18]
mov r3, #1
@@ -3917,7 +3917,7 @@ _0217ef94:
sub r0, r0, #1
strb r0, [r7, #0x502]
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_0217eddc
_0217efc4: .word 0x00007fff
@@ -5331,7 +5331,7 @@ _021800dc: .word 0x0000071c
.global func_ov32_021800e0
arm_func_start func_ov32_021800e0
func_ov32_021800e0: ; 0x021800e0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r1, _0218027c ; =0x000005ed
mov r7, r0
@@ -5356,20 +5356,20 @@ _02180108:
ldrsh lr, [r4, r1]
ldr r3, [sp, #8]
mov r0, r7
umull sb, r8, lr, r2
umull r9, r8, lr, r2
mov r2, #0
mla r8, lr, r2, r8
mov ip, lr, asr #0x1f
mov r2, #0x1800
mla r8, ip, r2, r8
adds sb, sb, #0x800
adds r9, r9, #0x800
adc r2, r8, #0
mov r8, sb, lsr #0xc
mov r8, r9, lsr #0xc
orr r8, r8, r2, lsl #20
add r2, r10, r8
str r2, [sp]
ldrsh r2, [r7, #0x78]
mov sb, #0
mov r9, #0
add r1, sp, #0
sub r2, r2, #0x8000
mov r2, r2, lsl #0x10
@@ -5378,12 +5378,12 @@ _02180108:
add r2, r4, r2, lsl #2
ldrsh ip, [r2, #2]
umull r8, r2, ip, r11
mla r2, ip, sb, r2
mla r2, ip, r9, r2
mov r10, ip, asr #0x1f
adds sb, r8, #0x800
adds r9, r8, #0x800
mla r2, r10, r11, r2
adc r2, r2, #0
mov r8, sb, lsr #0xc
mov r8, r9, lsr #0xc
orr r8, r8, r2, lsl #20
add r2, r3, r8
str r2, [sp, #8]
@@ -5435,7 +5435,7 @@ _021801e0:
orr r1, r1, r0, lsl #20
str r1, [r7, #0x68]
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_021800e0
_0218027c: .word 0x000005ed
@@ -5597,7 +5597,7 @@ _021804a0: .word data_027e0764
.global func_ov32_021804a4
arm_func_start func_ov32_021804a4
func_ov32_021804a4: ; 0x021804a4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
mov r10, r0
add r0, r10, #0x300
@@ -5657,8 +5657,8 @@ func_ov32_021804a4: ; 0x021804a4
mov r2, r2, lsr #0xc
adc r3, r3, #0
orr r2, r2, r3, lsl #20
add sb, r7, r2
str sb, [sp, #0x20]
add r9, r7, r2
str r9, [sp, #0x20]
add r1, r10, #0x400
ldrsh r2, [r1, #2]
mov r1, r6, asr #0x1f
@@ -5719,7 +5719,7 @@ func_ov32_021804a4: ; 0x021804a4
adc r3, r6, #0
mov r4, r4, lsr #0xc
orr r4, r4, r3, lsl #20
add r3, sb, r4
add r3, r9, r4
str r3, [sp, #0x20]
bl func_01ff9bc4
add r0, sp, #0x18
@@ -5748,14 +5748,14 @@ _021806d4:
cmp r7, #0
ble _021807b4
cmp r7, #0
add sb, r10, #0xb8
add r9, r10, #0xb8
ble _021807b4
ldr r6, _02180864 ; =data_027e0f6c
ldr r5, _02180854 ; =data_027e0f94
ldr r4, _02180868 ; =0x0000ffff
add r11, sp, #0x14
_02180710:
add r0, sb, r8, lsl #1
add r0, r9, r8, lsl #1
ldrh r2, [r0, #0x2e]
cmp r2, r4
beq _021807a0
@@ -5838,7 +5838,7 @@ _0218081c:
_02180840:
mov r0, #1
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_021804a4
_0218084c: .word 0x0000071c
@@ -5854,7 +5854,7 @@ _0218086c: .word 0x00000a66
.global func_ov32_02180870
arm_func_start func_ov32_02180870
func_ov32_02180870: ; 0x02180870
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1c
mov r7, r0
mov r2, #2
@@ -5894,31 +5894,31 @@ _021808dc:
ldrsh lr, [r1, #2]
ldr r3, [sp, #0x18]
mov r0, r7
umull sb, r8, lr, r2
umull r9, r8, lr, r2
mov r2, #0
mla r8, lr, r2, r8
mov ip, lr, asr #0x1f
mov r2, #0x1800
mla r8, ip, r2, r8
adds sb, sb, #0x800
adds r9, r9, #0x800
adc r2, r8, #0
mov r8, sb, lsr #0xc
mov r8, r9, lsr #0xc
orr r8, r8, r2, lsl #20
add r2, r10, r8
str r2, [sp, #0x10]
ldrh r2, [r7, #0x78]
mov sb, #0
mov r9, #0
add r1, sp, #0x10
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x2
ldrsh ip, [r4, r2]
umull r8, r2, ip, r11
mla r2, ip, sb, r2
mla r2, ip, r9, r2
mov r10, ip, asr #0x1f
adds sb, r8, #0x800
adds r9, r8, #0x800
mla r2, r10, r11, r2
adc r2, r2, #0
mov r8, sb, lsr #0xc
mov r8, r9, lsr #0xc
orr r8, r8, r2, lsl #20
add r2, r3, r8
str r2, [sp, #0x18]
@@ -5969,7 +5969,7 @@ _0218099c:
ldr r0, [sp, #8]
str r0, [r7, #0x64]
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_02180870
_02180a34: .word data_027e0f94
@@ -8075,18 +8075,18 @@ _021826ec: .word data_027e0e60
.global func_ov32_021826f0
arm_func_start func_ov32_021826f0
func_ov32_021826f0: ; 0x021826f0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1c
mov r10, r0
ldr r2, [r10, #4]
mov sb, r1
mov r9, r1
tst r2, #0x10
addeq sp, sp, #0x1c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r1, [r10, #0x68]
cmp r1, #0
beq _021827ec
str sb, [sp]
str r9, [sp]
mvn r1, #0
str r1, [sp, #4]
mov r2, #1
@@ -8129,7 +8129,7 @@ _02182790:
mov r2, r11
rsb r1, r1, #0x4000
mov r1, r1, lsl #0x10
mov r3, sb
mov r3, r9
mov r1, r1, asr #0x10
bl func_ov00_0208c0dc
ldr r1, [sp, #0x10]
@@ -8140,26 +8140,26 @@ _02182790:
add r7, r7, r0
blt _02182790
_021827ec:
ldrh r0, [sb]
ldrh r0, [r9]
tst r0, #1
bne _02182804
tst r0, #2
addeq sp, sp, #0x1c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02182804:
ldr r0, [r10, #8]
cmp r0, #0xc
addne sp, sp, #0x1c
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _02182864 ; =data_027e0618
ldrb r0, [r0, #0x101]
cmp r0, #0
addne sp, sp, #0x1c
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r0, [r10, #0x6a]
cmp r0, #0
addeq sp, sp, #0x1c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r2, #0
str r2, [sp]
ldrsh r1, [r10, #0x6c]
@@ -8169,7 +8169,7 @@ _02182804:
mov r0, #0x44
bl func_0203493c
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_021826f0
_02182860: .word data_027e080c
@@ -8925,7 +8925,7 @@ _02183188: .word 0x0000ffff
.global func_ov32_0218318c
arm_func_start func_ov32_0218318c
func_ov32_0218318c: ; 0x0218318c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr ip, _02183330 ; =data_027e0764
mov r8, #0x800
@@ -8938,17 +8938,17 @@ func_ov32_0218318c: ; 0x0218318c
mla r4, r7, r2, r4
adds r5, r3, r5
ldr r2, [ip, #0x14]
umull r6, sb, r10, r5
umull r6, r9, r10, r5
adc r4, r2, r4
mla sb, r10, r4, sb
mla r9, r10, r4, r9
str r5, [ip]
ldr r1, _02183334 ; =0x00000e39
adds r6, r3, r6
mla sb, r7, r5, sb
mla r9, r7, r5, r9
umull r3, r7, r4, r1
add r3, r8, #1
mov r8, #0
adc r5, r2, sb
adc r5, r2, r9
mla r7, r4, r8, r7
str r4, [ip, #4]
mov r4, r0
@@ -8978,11 +8978,11 @@ func_ov32_0218318c: ; 0x0218318c
ldrsh r7, [r6, r7]
mov r1, r1, lsl #0x1
ldrsh r6, [r6, r1]
smull sb, r8, r2, r7
smull r9, r8, r2, r7
smull r7, r6, r2, r6
adds sb, sb, #0x800
adds r9, r9, #0x800
adc r2, r8, #0
mov r8, sb, lsr #0xc
mov r8, r9, lsr #0xc
orr r8, r8, r2, lsl #20
ldr r0, [r4, #0x48]
adds r2, r7, #0x800
@@ -9011,9 +9011,9 @@ func_ov32_0218318c: ; 0x0218318c
mla r7, r6, r11, r7
mla r7, r5, lr, r7
ldr r10, [ip, #0x10]
ldr sb, [ip, #0x14]
ldr r9, [ip, #0x14]
adds r5, r10, r8
adc r7, sb, r7
adc r7, r9, r7
stmia ip, {r5, r7}
umull r5, r6, r7, r3
mov r5, #0
@@ -9029,7 +9029,7 @@ func_ov32_0218318c: ; 0x0218318c
str r0, [r4, #0x64]
str r0, [r4, #0x68]
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_0218318c
_02183330: .word data_027e0764
@@ -9042,7 +9042,7 @@ _02183344: .word data_027e0e60
.global func_ov32_02183348
arm_func_start func_ov32_02183348
func_ov32_02183348: ; 0x02183348
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x18
ldr lr, _02183534 ; =data_027e0764
ldr r2, _02183538 ; =0x00002001
@@ -9105,12 +9105,12 @@ _02183414:
str r6, [sp, #0x14]
ldr r7, [lr, #8]
ldr r6, [lr, #0xc]
umull sb, r8, r7, r5
umull r9, r8, r7, r5
mla r8, r7, r0, r8
ldr r7, [lr, #0x10]
mla r8, r6, r5, r8
ldr r0, [lr, #0x14]
adds r7, r7, sb
adds r7, r7, r9
adc r6, r0, r8
sub r0, r2, #0x1800
umull r2, r5, r6, r0
@@ -9139,12 +9139,12 @@ _02183498:
str r6, [sp, #8]
ldr r7, [lr, #8]
ldr r6, [lr, #0xc]
umull sb, r8, r7, r5
umull r9, r8, r7, r5
mla r8, r7, r0, r8
ldr r7, [lr, #0x10]
mla r8, r6, r5, r8
ldr r0, [lr, #0x14]
adds r7, r7, sb
adds r7, r7, r9
adc r6, r0, r8
sub r0, r2, #0x1800
umull r2, r5, r6, r0
@@ -9167,7 +9167,7 @@ _02183518:
mov r1, #0x3000
bl func_ov00_020ce340
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov32_02183348
_02183534: .word data_027e0764
@@ -9207,7 +9207,7 @@ _0218359c: .word 0x00000333
.global func_ov32_021835a0
arm_func_start func_ov32_021835a0
func_ov32_021835a0: ; 0x021835a0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
ldr lr, _021836ec ; =data_027e0764
mov r3, #0
ldr r2, [lr]
@@ -9280,16 +9280,16 @@ func_ov32_021835a0: ; 0x021835a0
ldr r5, [lr, #0xc]
ldr r10, [lr, #0x10]
mla r7, r5, r4, r7
ldr sb, [lr, #0x14]
ldr r9, [lr, #0x14]
adds r1, r10, r8
adc r4, sb, r7
adc r4, r9, r7
stmia lr, {r1, r4}
umull r1, lr, r4, ip
mla lr, r4, r2, lr
mla lr, r3, ip, lr
add r1, lr, #0x800
str r1, [r0, #0x234]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov32_021835a0
_021836ec: .word data_027e0764
@@ -9299,7 +9299,7 @@ _021836f4: .word 0x00000b34
.global func_ov32_021836f8
arm_func_start func_ov32_021836f8
func_ov32_021836f8: ; 0x021836f8
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r4, r0
bl _ZN5Actor14GetAngleToLinkEv
mov r0, r0, lsl #0x10
@@ -9358,16 +9358,16 @@ func_ov32_021836f8: ; 0x021836f8
ldr r5, [ip, #0xc]
ldr r10, [ip, #0x10]
mla r7, r5, lr, r7
ldr sb, [ip, #0x14]
ldr r9, [ip, #0x14]
adds r1, r10, r8
adc r5, sb, r7
adc r5, r9, r7
stmia ip, {r1, r5}
umull r1, ip, r5, r3
mla ip, r5, r2, ip
mla ip, r0, r3, ip
add r0, ip, #0x800
str r0, [r4, #0x234]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov32_021836f8
_0218380c: .word data_02050f54
@@ -10248,7 +10248,7 @@ _02184398: .word data_ov00_020e9370
.global func_ov32_0218439c
arm_func_start func_ov32_0218439c
func_ov32_0218439c: ; 0x0218439c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x84
ldr r1, _0218453c ; =data_027e0fe4
mov r2, #0
@@ -10274,7 +10274,7 @@ func_ov32_0218439c: ; 0x0218439c
cmp r0, #0x18
addgt sp, sp, #0x84
movgt r0, #0
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r4, #8]
ldr r0, _0218453c ; =data_027e0fe4
str r1, [sp, #0x44]
@@ -10287,7 +10287,7 @@ func_ov32_0218439c: ; 0x0218439c
cmp r0, #8
addgt sp, sp, #0x84
movgt r0, #0
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, sp, #0x10
bl func_ov00_020c1500
mov r1, r5
@@ -10320,9 +10320,9 @@ func_ov32_0218439c: ; 0x0218439c
ldrsh r4, [r3, r0]
ldr r0, _0218454c ; =0x0000019a
mov r6, r7, asr #0x1f
umull sb, r8, r7, r0
umull r9, r8, r7, r0
mla r8, r7, ip, r8
adds r7, sb, #0x800
adds r7, r9, #0x800
mla r8, r6, r0, r8
ldr r10, [sp, #4]
adc r6, r8, #0
@@ -10351,7 +10351,7 @@ func_ov32_0218439c: ; 0x0218439c
movge r0, #1
movlt r0, #0
add sp, sp, #0x84
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_0218439c
_0218453c: .word data_027e0fe4
+36 -36
View File
@@ -733,7 +733,7 @@ func_ov33_0217c658: ; 0x0217c658
.global func_ov33_0217c66c
arm_func_start func_ov33_0217c66c
func_ov33_0217c66c: ; 0x0217c66c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r4, r0
ldr r0, [r4, #0x138]
mov r1, #0x1e
@@ -754,11 +754,11 @@ func_ov33_0217c66c: ; 0x0217c66c
mla r6, r2, r3, r6
ldr r2, [r7, #0x14]
adds r5, r5, r8
adc sb, r2, r6
stmia r7, {r5, sb}
adc r9, r2, r6
stmia r7, {r5, r9}
mov r6, #0xc9
umull r5, r8, sb, r6
mla r8, sb, r1, r8
umull r5, r8, r9, r6
mla r8, r9, r1, r8
mov r3, r1
mla r8, r3, r6, r8
sub r5, r8, #0x64
@@ -767,8 +767,8 @@ func_ov33_0217c66c: ; 0x0217c66c
mov lr, r5, lsr #0x1f
smull r5, r8, ip, r5
add r8, lr, r8, asr #5
smull sb, r5, r8, r0
adds r8, sb, #0x800
smull r9, r5, r8, r0
adds r8, r9, #0x800
ldr r2, [r4, #0x48]
adc r5, r5, #0
mov r8, r8, lsr #0xc
@@ -776,26 +776,26 @@ func_ov33_0217c66c: ; 0x0217c66c
add r2, r2, r8
str r2, [r4, #0x48]
ldr r5, [r7]
ldmib r7, {r2, sb}
umull r11, r10, sb, r5
mla r10, sb, r2, r10
ldmib r7, {r2, r9}
umull r11, r10, r9, r5
mla r10, r9, r2, r10
ldr r8, [r7, #0xc]
ldr lr, [r7, #0x10]
mla r10, r8, r5, r10
ldr ip, [r7, #0x14]
adds r2, lr, r11
adc sb, ip, r10
umull r5, r8, sb, r6
mla r8, sb, r1, r8
adc r9, ip, r10
umull r5, r8, r9, r6
mla r8, r9, r1, r8
mla r8, r3, r6, r8
sub r5, r8, #0x64
stmia r7, {r2, sb}
stmia r7, {r2, r9}
ldr ip, _0217c804 ; =0x51eb851f
mov r8, r5, lsl #0xc
smull r5, sb, ip, r8
smull r5, r9, ip, r8
mov r5, r8, lsr #0x1f
add sb, r5, sb, asr #5
smull r8, r5, sb, r0
add r9, r5, r9, asr #5
smull r8, r5, r9, r0
adds r8, r8, #0x800
ldr r2, [r4, #0x4c]
adc r5, r5, #0
@@ -805,13 +805,13 @@ func_ov33_0217c66c: ; 0x0217c66c
str r2, [r4, #0x4c]
ldr r5, [r7]
ldmib r7, {r2, lr}
umull sb, r8, lr, r5
umull r9, r8, lr, r5
mla r8, lr, r2, r8
ldr ip, [r7, #0xc]
ldr r11, [r7, #0x10]
mla r8, ip, r5, r8
ldr r10, [r7, #0x14]
adds r2, r11, sb
adds r2, r11, r9
adc r8, r10, r8
stmia r7, {r2, r8}
umull r5, r7, r8, r6
@@ -832,7 +832,7 @@ func_ov33_0217c66c: ; 0x0217c66c
add r0, r2, r3
str r0, [r4, #0x50]
mov r0, r1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov33_0217c66c
_0217c7fc: .word 0x000002aa
@@ -2203,18 +2203,18 @@ _0217d984: .word func_ov33_0217d988
.global func_ov33_0217d988
arm_func_start func_ov33_0217d988
func_ov33_0217d988: ; 0x0217d988
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
ldr r0, [r4, #4]
cmp r0, #2
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r6, #0
mov r8, r4
add sb, r4, #8
add r9, r4, #8
mov r5, r6
_0217d9b0:
mov r0, sb
mov r0, r9
ldr ip, [r0]
ldrh r7, [r8, #0x12]
ldr ip, [ip]
@@ -2228,14 +2228,14 @@ _0217d9b0:
bl func_ov33_0217da08
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r6, r6, #1
cmp r6, #3
add r8, r8, #0x18
add sb, sb, #0x18
add r9, r9, #0x18
blt _0217d9b0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov33_0217d988
.global func_ov33_0217da08
@@ -3671,7 +3671,7 @@ _0217ecb0: .word 0x0000023d
.global func_ov33_0217ecb4
arm_func_start func_ov33_0217ecb4
func_ov33_0217ecb4: ; 0x0217ecb4
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x1c
mov r4, r0
ldrb r0, [r4, #0x16c]
@@ -3697,7 +3697,7 @@ _0217ed04:
mov r0, #0
strh r0, [r1, #0x82]
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_0217ed18:
mov r0, r4
add r1, r4, #0x100
@@ -4046,7 +4046,7 @@ _0217f1b8:
ldr r1, [sp, #0xc]
mov r0, r0, lsl #0x1
smull r6, r5, r1, r7
adds sb, r6, #0x800
adds r9, r6, #0x800
ldrsh r3, [r3, r0]
str r2, [sp, #0x10]
ldr lr, [r4, #0x4c]
@@ -4055,7 +4055,7 @@ _0217f1b8:
adc ip, r5, #0
add lr, lr, r8
smull r5, r8, r1, r3
mov r1, sb, lsr #0xc
mov r1, r9, lsr #0xc
orr r1, r1, ip, lsl #20
add ip, r2, r1
adds r2, r5, #0x800
@@ -4164,7 +4164,7 @@ _0217f3ac:
_0217f3c0:
mov r0, #1
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov33_0217ecb4
_0217f3cc: .word data_027e0ffc
@@ -4468,7 +4468,7 @@ func_ov33_0217f70c: ; 0x0217f70c
.global func_ov33_0217f744
arm_func_start func_ov33_0217f744
func_ov33_0217f744: ; 0x0217f744
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r3, _0217f88c ; =0x00000666
mov r4, r0
@@ -4505,13 +4505,13 @@ func_ov33_0217f744: ; 0x0217f744
ldr r10, [r0, #0x10]
mla r7, r6, ip, r7
ldr r5, [r0, #0xc]
ldr sb, [r0, #0x14]
ldr r9, [r0, #0x14]
mla r7, r5, lr, r7
adds r8, r10, r8
ldr r5, _0217f890 ; =data_027e0764
mov r0, #0
str r0, [sp, #4]
adc r6, sb, r7
adc r6, r9, r7
str r8, [r5]
str r6, [r5, #4]
mov r5, r6, lsr #0x10
@@ -4549,7 +4549,7 @@ func_ov33_0217f744: ; 0x0217f744
bl func_ov33_0217f954
mov r0, #1
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov33_0217f744
_0217f88c: .word 0x00000666
+63 -63
View File
@@ -1621,7 +1621,7 @@ _0217d350: .word data_027e0d0c
.global func_ov34_0217d354
arm_func_start func_ov34_0217d354
func_ov34_0217d354: ; 0x0217d354
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
ldr r2, _0217d494 ; =data_ov34_021861a0
ldr r0, [r2, #0x190]
@@ -1634,14 +1634,14 @@ func_ov34_0217d354: ; 0x0217d354
ldr r0, _0217d49c ; =0x00000335
ldr r6, [r1]
ldmib r1, {r3, r5}
umull sb, r8, r5, r6
umull r9, r8, r5, r6
ldr r7, [r1, #0x10]
mla r8, r5, r3, r8
ldr r4, [r1, #0xc]
adds sb, r7, sb
adds r9, r7, r9
mla r8, r4, r6, r8
ldr r6, [r1, #0x14]
umull r11, r3, r5, sb
umull r11, r3, r5, r9
adc r8, r6, r8
adds ip, r7, r11
sub r11, r10, #1
@@ -1649,30 +1649,30 @@ func_ov34_0217d354: ; 0x0217d354
mla r3, r5, r8, r3
str r10, [sp, #4]
mov r10, #0
str sb, [r1]
mla r3, r4, sb, r3
str r9, [r1]
mla r3, r4, r9, r3
mla lr, r8, r10, lr
str r8, [r1, #4]
adc r8, r6, r3
mov r3, r10
mla lr, r3, r0, lr
umull sb, r3, r8, r0
ldr sb, _0217d4a0 ; =0xfffffe66
add sb, lr, sb
str sb, [r2, #0x180]
mov sb, r10
mla r3, r8, sb, r3
mla r3, sb, r0, r3
ldr sb, _0217d4a0 ; =0xfffffe66
umull r9, r3, r8, r0
ldr r9, _0217d4a0 ; =0xfffffe66
add r9, lr, r9
str r9, [r2, #0x180]
mov r9, r10
mla r3, r8, r9, r3
mla r3, r9, r0, r3
ldr r9, _0217d4a0 ; =0xfffffe66
str ip, [r1]
add r3, r3, sb
umull r10, sb, r5, ip
mla sb, r5, r8, sb
mla sb, r4, ip, sb
add r3, r3, r9
umull r10, r9, r5, ip
mla r9, r5, r8, r9
mla r9, r4, ip, r9
str r8, [r1, #4]
str r3, [r2, #0x184]
adds r4, r7, r10
adc r5, r6, sb
adc r5, r6, r9
stmia r1, {r4, r5}
umull r1, r4, r5, r0
mov r1, #0
@@ -1702,7 +1702,7 @@ _0217d470:
str r4, [sp]
bl func_ov34_0217ceb0
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_0217d354
_0217d494: .word data_ov34_021861a0
@@ -2937,7 +2937,7 @@ _0217e670: .word data_ov34_021861e0
.global func_ov34_0217e674
arm_func_start func_ov34_0217e674
func_ov34_0217e674: ; 0x0217e674
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r2, _0217e8b4 ; =data_027e0764
mov ip, #0xa5
ldr r3, [r2]
@@ -2945,16 +2945,16 @@ func_ov34_0217e674: ; 0x0217e674
umull r4, r5, r7, r3
mla r5, r7, r1, r5
ldr r6, [r2, #0xc]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r5, r6, r3, r5
adds r10, sb, r4
adds r10, r9, r4
ldr r8, [r2, #0x14]
umull r4, r1, r7, r10
adc r3, r8, r5
mla r1, r7, r3, r1
str r10, [r2]
mla r1, r6, r10, r1
adds r5, sb, r4
adds r5, r9, r4
adc r4, r8, r1
str r3, [r2, #4]
umull r10, r1, r3, ip
@@ -2974,7 +2974,7 @@ func_ov34_0217e674: ; 0x0217e674
mla r3, r6, r5, r3
add lr, r1, #0x1800
str r4, [r2, #4]
adds r5, sb, ip
adds r5, r9, ip
adc r4, r8, r3
str r5, [r2]
str r4, [r2, #4]
@@ -3082,7 +3082,7 @@ _0217e820:
mov r1, #1
strh r2, [r4, #0x82]
bl func_ov34_02183d14
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_0217e674
_0217e8b4: .word data_027e0764
@@ -3301,7 +3301,7 @@ _0217eb90: .word data_ov34_021861a0
.global func_ov34_0217eb94
arm_func_start func_ov34_0217eb94
func_ov34_0217eb94: ; 0x0217eb94
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
mov r4, r0
add r0, r4, #0x1000
@@ -3386,7 +3386,7 @@ _0217eccc:
mov r1, #3
bl func_ov34_0217be60
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217ece0:
add r0, r4, #0x1000
ldr r0, [r0, #0xaa0]
@@ -3397,7 +3397,7 @@ _0217ece0:
bl func_0202e310
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r1, r4, #0x1000
ldr r2, [r1, #0xa78]
add r0, sp, #0x10
@@ -3440,7 +3440,7 @@ _0217ece0:
ldrsh r4, [r3, r1]
str r5, [sp, #8]
add r1, r5, #0x9a
ldr sb, [r2, #0xd0c]
ldr r9, [r2, #0xd0c]
mla r7, r6, ip, r7
mov r5, r6, asr #0x1f
adds r6, r8, #0x800
@@ -3460,7 +3460,7 @@ _0217ece0:
adc r0, r5, #0
mov r4, r4, lsr #0xc
orr r4, r4, r0, lsl #20
add r0, sb, r4
add r0, r9, r4
str r0, [sp, #0xc]
str ip, [sp]
ldr r1, _0217ee50 ; =0x47524f42
@@ -3474,7 +3474,7 @@ _0217ece0:
mov r3, #0
bl func_ov00_020ceacc
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_0217eb94
_0217ee3c: .word data_027e0f94
@@ -3488,14 +3488,14 @@ _0217ee54: .word data_027e0ffc
.global func_ov34_0217ee58
arm_func_start func_ov34_0217ee58
func_ov34_0217ee58: ; 0x0217ee58
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0xc
mov r7, r0
mvn r5, #0x80000000
sub r0, r5, #0x80000000
add sb, r7, #0x1000
add r9, r7, #0x1000
ldr r10, _0217ef80 ; =data_ov34_021861a0
str r0, [sb, #0xd74]
str r0, [r9, #0xd74]
ldr r0, [r10, #0x78]
mov r6, #0
cmp r0, #0
@@ -3517,7 +3517,7 @@ _0217ee90:
bl func_01ff9ec0
cmp r0, r5
movlt r5, r0
strlt r6, [sb, #0xd74]
strlt r6, [r9, #0xd74]
_0217eecc:
ldr r0, [r10, #0x78]
add r6, r6, #1
@@ -3554,7 +3554,7 @@ _0217eedc:
ldr r0, [r1, #0x54]
cmp r0, r2
addne sp, sp, #0xc
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
cmp r2, #0
moveq r2, #1
ldr r0, _0217ef84 ; =data_ov34_021861e0
@@ -3564,7 +3564,7 @@ _0217eedc:
add r0, r0, #0x21c
bl func_ov34_0217be60
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov34_0217ee58
_0217ef80: .word data_ov34_021861a0
@@ -8450,7 +8450,7 @@ _02183470: .word data_027e0194
.global func_ov34_02183474
arm_func_start func_ov34_02183474
func_ov34_02183474: ; 0x02183474
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xa8
mov r10, r0
add r0, r10, #0x1d00
@@ -8474,7 +8474,7 @@ func_ov34_02183474: ; 0x02183474
ldrb r0, [r4, #0xd88]
cmp r0, #0
addeq sp, sp, #0xa8
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r10, #0x304
add r2, r0, #0x1800
add r0, r10, #0x1b40
@@ -8485,7 +8485,7 @@ func_ov34_02183474: ; 0x02183474
add r0, r10, #0xb90
ldr r11, _02183cfc ; =0x000002cb
add r6, r2, #0x30
add sb, r1, #0x90
add r9, r1, #0x90
mov r5, #4
mov r8, #0x84
str r0, [sp, #0x2c]
@@ -8602,14 +8602,14 @@ _02183690:
mov r0, r7
bl func_ov00_020d5c54
mov r0, r7
mov r1, sb
mov r1, r9
bl func_ov00_020d5cd8
sub r5, r5, #1
sub r6, r6, #0xc
sub r11, r11, #0x66
sub r7, r7, #0x10
sub r8, r8, #0x21
sub sb, sb, #0x24
sub r9, r9, #0x24
cmp r5, #0
bgt _02183510
add r0, r10, #0x1000
@@ -8662,8 +8662,8 @@ _02183710:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
mov sb, r6, lsl #0x1
add r6, sb, #1
mov r9, r6, lsl #0x1
add r6, r9, #1
mov r8, r6, lsl #0x1
add r0, r1, #1
mov r2, r1, lsl #0x1
@@ -8673,18 +8673,18 @@ _02183710:
ldrsh r2, [r4, #2]
ldrsh r1, [r4, r1]
smull r7, r5, r0, r3
mov r6, sb, lsl #0x1
mov r6, r9, lsl #0x1
ldrsh r11, [r4, r8]
ldrsh r8, [r4, r6]
adds r7, r7, #0x800
smull sb, r4, r1, r2
smull r9, r4, r1, r2
adc r6, r5, #0
adds r5, sb, #0x800
mov sb, r7, lsr #0xc
adds r5, r9, #0x800
mov r9, r7, lsr #0xc
adc r4, r4, #0
mov r7, r5, lsr #0xc
orr r7, r7, r4, lsl #20
orr sb, sb, r6, lsl #20
orr r9, r9, r6, lsl #20
smull r6, r5, r7, r8
smull r4, r3, r1, r3
adds r6, r6, #0x800
@@ -8694,13 +8694,13 @@ _02183710:
orr r5, r5, r0, lsl #20
mov r0, r11, asr #0x1f
str r0, [sp, #0x18]
mov r0, sb, asr #0x1f
mov r0, r9, asr #0x1f
str r0, [sp, #0x1c]
mov r0, r8, asr #0x1f
str r0, [sp, #0x20]
mov r0, r7, asr #0x1f
str r0, [sp, #0x24]
smull r0, r6, sb, r11
smull r0, r6, r9, r11
adds r0, r0, #0x800
adc r6, r6, #0
mov r0, r0, lsr #0xc
@@ -8763,10 +8763,10 @@ _02183710:
adc r4, r3, ip
mov r3, r5, lsr #0xc
orr r3, r3, r4, lsl #20
umull r6, r5, sb, r8
umull r6, r5, r9, r8
ldr r4, [sp, #0x20]
adds r6, r6, #0x800
mla r5, sb, r4, r5
mla r5, r9, r4, r5
ldr r4, [sp, #0x1c]
mla r5, r4, r8, r5
adc r4, r5, ip
@@ -8808,16 +8808,16 @@ _0218398c:
mov r4, r4, lsl #0x1
mov r8, r6, lsl #0x1
smull ip, r6, r1, r2
adc sb, r7, #0
adc r9, r7, #0
adds r7, ip, #0x800
mov r11, r11, lsr #0xc
ldrsh ip, [r5, r4]
orr r11, r11, sb, lsl #20
ldrsh sb, [r5, r8]
orr r11, r11, r9, lsl #20
ldrsh r9, [r5, r8]
adc r4, r6, #0
mov r8, r7, lsr #0xc
orr r8, r8, r4, lsl #20
smull r4, r6, r8, sb
smull r4, r6, r8, r9
adds r7, r4, #0x800
smull r5, r4, r11, ip
smull r3, lr, r1, r3
@@ -8844,11 +8844,11 @@ _0218398c:
adc r3, r0, #0
mov r0, r4, lsr #0xc
orr r0, r0, r3, lsl #20
smull r5, r4, r1, sb
smull r5, r4, r1, r9
smull r3, r1, r8, ip
smull r7, r6, r2, ip
smull ip, r8, r2, sb
smull sb, r2, r11, sb
smull ip, r8, r2, r9
smull r9, r2, r11, r9
adds r11, ip, #0x800
adc r8, r8, #0
mov r11, r11, lsr #0xc
@@ -8869,7 +8869,7 @@ _0218398c:
adc r0, r1, #0
mov r3, r3, lsr #0xc
orr r3, r3, r0, lsl #20
adds r1, sb, #0x800
adds r1, r9, #0x800
adc r0, r2, #0
mov r1, r1, lsr #0xc
orr r1, r1, r0, lsl #20
@@ -9002,7 +9002,7 @@ _02183ca4:
add r1, r1, #0x1c00
bl func_ov00_020d5cd8
add sp, sp, #0xa8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_02183474
_02183cf8: .word data_ov34_0218577c
+143 -143
View File
@@ -170,14 +170,14 @@ func_ov35_0217bf68: ; 0x0217bf68
.global func_ov35_0217bf7c
arm_func_start func_ov35_0217bf7c
func_ov35_0217bf7c: ; 0x0217bf7c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r1, _0217c090 ; =data_ov35_0218598c
mov r6, r0
mov r4, #0
ldr r8, _0217c094 ; =data_027e0fe4
str r1, [r6]
add r5, r6, #0x238
mov sb, r4
mov r9, r4
mvn r7, #0
_0217bfa0:
add r0, r6, r4, lsl #3
@@ -188,7 +188,7 @@ _0217bfa0:
mov r1, r5
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
strneb sb, [r0, #0x118]
strneb r9, [r0, #0x118]
_0217bfc4:
add r4, r4, #1
cmp r4, #9
@@ -241,7 +241,7 @@ _0217bfdc:
mov r0, r6
bl _ZN5ActorD2Ev
mov r0, r6
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov35_0217bf7c
_0217c090: .word data_ov35_0218598c
@@ -253,14 +253,14 @@ _0217c0a0: .word func_ov35_0217bf4c
.global func_ov35_0217c0a4
arm_func_start func_ov35_0217c0a4
func_ov35_0217c0a4: ; 0x0217c0a4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r1, _0217c1c0 ; =data_ov35_0218598c
mov r6, r0
mov r4, #0
ldr r8, _0217c1c4 ; =data_027e0fe4
str r1, [r6]
add r5, r6, #0x238
mov sb, r4
mov r9, r4
mvn r7, #0
_0217c0c8:
add r0, r6, r4, lsl #3
@@ -271,7 +271,7 @@ _0217c0c8:
mov r1, r5
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
strneb sb, [r0, #0x118]
strneb r9, [r0, #0x118]
_0217c0ec:
add r4, r4, #1
cmp r4, #9
@@ -326,7 +326,7 @@ _0217c104:
mov r0, r6
bl _ZN9SysObjectdlEPv
mov r0, r6
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov35_0217c0a4
_0217c1c0: .word data_ov35_0218598c
@@ -338,7 +338,7 @@ _0217c1d0: .word func_ov35_0217bf4c
.global func_ov35_0217c1d4
arm_func_start func_ov35_0217c1d4
func_ov35_0217c1d4: ; 0x0217c1d4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
ldr r1, _0217c498 ; =data_027e0fe4
mov r10, r0
@@ -349,7 +349,7 @@ func_ov35_0217c1d4: ; 0x0217c1d4
str r0, [r10, #0x234]
addeq sp, sp, #0x48
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, _0217c49c ; =0xfffffe66
ldr r0, _0217c4a0 ; =0x000004cd
str r1, [r10, #0x7c]
@@ -383,7 +383,7 @@ func_ov35_0217c1d4: ; 0x0217c1d4
ldr r11, _0217c4a8 ; =data_027e0fec
mov r8, r10
add r7, r10, #0x2f0
add sb, r0, #0x400
add r9, r0, #0x400
mov r5, #0
_0217c290:
add r1, r10, r5
@@ -423,18 +423,18 @@ _0217c290:
bl func_0201e544
mov r1, r0
mov r2, r6
mov r0, sb
mov r0, r9
mov r3, #0
bl func_ov00_020c0cc8
mov r0, #0
str r0, [sb, #0x10]
mov r0, sb
str r0, [r9, #0x10]
mov r0, r9
add r1, r7, #4
bl func_ov00_020c0d70
add r5, r5, #1
add r7, r7, #0x5c
add r8, r8, #0x44
add sb, sb, #0x44
add r9, r9, #0x44
cmp r5, #3
blt _0217c290
mov r2, #0
@@ -457,7 +457,7 @@ _0217c290:
ldr r1, [r10, #0xc]
ldr r5, _0217c4b8 ; =0x52594448
ldr r8, _0217c498 ; =data_027e0fe4
ldr sb, _0217c4bc ; =data_027e0fe8
ldr r9, _0217c4bc ; =data_027e0fe8
mov r7, #0
str r1, [sp, #0x2c]
str r0, [sp, #4]
@@ -467,7 +467,7 @@ _0217c290:
_0217c3c8:
strh r7, [sp, #0xc]
str r6, [sp]
ldr r0, [sb]
ldr r0, [r9]
mov r1, r5
mov r3, r4
add r2, r10, #0x48
@@ -475,7 +475,7 @@ _0217c3c8:
cmp r0, #0
addeq sp, sp, #0x48
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r8]
mov r1, r6
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -485,24 +485,24 @@ _0217c3c8:
str r0, [r2, #0x280]
cmp r7, #5
blo _0217c3c8
mov sb, #0
str sb, [r10, #0x218]
strb sb, [r10, #0x22f]
mov r9, #0
str r9, [r10, #0x218]
strb r9, [r10, #0x22f]
mov r0, #2
str sb, [r10, #0x228]
str r9, [r10, #0x228]
ldr r8, _0217c4c0 ; =data_ov35_02185154
ldr r5, _0217c4c4 ; =0x0000017b
mov r11, r10
str r0, [r10, #0x230]
mov r6, r0
mov r4, #0x17c
mov r3, sb
mov r3, r9
mov r1, #0xff
_0217c44c:
mov r0, sb, lsl #0x1
mov r0, r9, lsl #0x1
ldrsh r7, [r8, r0]
add r2, r10, sb, lsl #2
add r0, r10, sb
add r2, r10, r9, lsl #2
add r0, r10, r9
str r7, [r11, #0x1f8]
str r6, [r11, #0x1fc]
str r5, [r11, #0x15c]
@@ -510,14 +510,14 @@ _0217c44c:
str r4, [r11, #0x180]
str r6, [r11, #0x184]
str r3, [r2, #0x21c]
add sb, sb, #1
add r9, r9, #1
strb r1, [r0, #0x22c]
cmp sb, #3
cmp r9, #3
add r11, r11, #0xc
blt _0217c44c
mov r0, #1
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov35_0217c1d4
_0217c498: .word data_027e0fe4
@@ -1528,7 +1528,7 @@ _0217d20c: .word data_ov35_02185146
.global func_ov35_0217d210
arm_func_start func_ov35_0217d210
func_ov35_0217d210: ; 0x0217d210
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x64
mov r10, r0
ldr r0, [r10, #0x218]
@@ -1550,7 +1550,7 @@ func_ov35_0217d210: ; 0x0217d210
moveq r11, #1
add r0, r10, #0x48
ldr r7, _0217d39c ; =data_ov35_02185184
ldr sb, _0217d3a0 ; =data_ov35_021851ae
ldr r9, _0217d3a0 ; =data_ov35_021851ae
movne r11, #0
add r8, r10, #0x1a0
str r0, [sp]
@@ -1586,9 +1586,9 @@ _0217d2b8:
ldr r0, [r0]
mov r2, r4
bl func_ov00_0207c474
ldrsh r2, [sb]
ldrsh r1, [sb, #2]
ldrsh r0, [sb, #4]
ldrsh r2, [r9]
ldrsh r1, [r9, #2]
ldrsh r0, [r9, #4]
str r2, [sp, #0x58]
str r1, [sp, #0x5c]
str r0, [sp, #0x60]
@@ -1615,11 +1615,11 @@ _0217d2b8:
add r6, r6, #6
add r7, r7, #6
add r8, r8, #0xc
add sb, sb, #6
add r9, r9, #6
add r10, r10, #0xc
blt _0217d27c
add sp, sp, #0x64
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217d374:
add r4, r10, #0x1a0
_0217d378:
@@ -1630,7 +1630,7 @@ _0217d378:
add r4, r4, #0xc
blt _0217d378
add sp, sp, #0x64
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov35_0217d210
_0217d398: .word data_ov35_0218515a
@@ -1641,7 +1641,7 @@ _0217d3a4: .word data_027e0e58
.global func_ov35_0217d3a8
arm_func_start func_ov35_0217d3a8
func_ov35_0217d3a8: ; 0x0217d3a8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x78
mov r6, r0
ldrb r0, [r6, #0x22f]
@@ -1649,14 +1649,14 @@ func_ov35_0217d3a8: ; 0x0217d3a8
bne _0217d424
mov r7, #0
add r8, r6, #0x1f4
add sb, r6, #0x158
add r9, r6, #0x158
add r10, r6, #0x17c
mov r5, r7
mov r4, #0xff
_0217d3d8:
mov r0, r8
bl func_ov00_020b7e6c
mov r0, sb
mov r0, r9
bl func_ov00_020b7e6c
mov r0, r10
bl func_ov00_020b7e6c
@@ -1667,12 +1667,12 @@ _0217d3d8:
strb r4, [r0, #0x22c]
cmp r7, #3
add r8, r8, #0xc
add sb, sb, #0xc
add r9, r9, #0xc
add r10, r10, #0xc
blt _0217d3d8
add sp, sp, #0x78
str r5, [r6, #0x228]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217d424:
add r2, sp, #0x18
add r0, r6, #0x4d0
@@ -1789,10 +1789,10 @@ _0217d5d0:
umull r7, lr, ip, r2
mla lr, ip, r1, lr
ldr r3, [r0, #0xc]
ldr sb, [r0, #0x10]
ldr r9, [r0, #0x10]
mla lr, r3, r2, lr
ldr r8, [r0, #0x14]
adds r1, sb, r7
adds r1, r9, r7
adc r3, r8, lr
stmia r0, {r1, r3}
umull r1, r2, r3, r11
@@ -1881,7 +1881,7 @@ _0217d680:
subne r0, r0, #1
strne r0, [r6, #0x228]
add sp, sp, #0x78
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov35_0217d3a8
_0217d74c: .word data_ov35_021851d8
@@ -3906,7 +3906,7 @@ func_ov35_0217f210: ; 0x0217f210
.global func_ov35_0217f234
arm_func_start func_ov35_0217f234
func_ov35_0217f234: ; 0x0217f234
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x520
mov r4, r0
ldr r2, [r4, #0x168]
@@ -3961,7 +3961,7 @@ _0217f2f8:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r4, #0x168]
mov r2, #0x1000
add r0, sp, #0x470
@@ -4063,7 +4063,7 @@ _0217f2f8:
ldr ip, [sp, #0x424]
ldr r11, [sp, #0x428]
ldr r10, [sp, #0x42c]
ldr sb, [sp, #0x430]
ldr r9, [sp, #0x430]
ldr r8, [sp, #0x434]
str r1, [sp, #0x4b4]
ldr r1, [sp, #0x438]
@@ -4074,8 +4074,8 @@ _0217f2f8:
ldr r11, [sp, #0x440]
str r10, [sp, #0x4c0]
ldr r10, [sp, #0x444]
str sb, [sp, #0x4c4]
ldr sb, [sp, #0x448]
str r9, [sp, #0x4c4]
ldr r9, [sp, #0x448]
str r8, [sp, #0x4c8]
ldr r8, [sp, #0x44c]
ldrb r7, [sp, #0x468]
@@ -4091,8 +4091,8 @@ _0217f2f8:
ldr r11, [sp, #0x458]
str r10, [sp, #0x4d8]
ldr r10, [sp, #0x45c]
str sb, [sp, #0x4dc]
ldr sb, [sp, #0x460]
str r9, [sp, #0x4dc]
ldr r9, [sp, #0x460]
str r8, [sp, #0x4e0]
ldr r8, [sp, #0x464]
str r1, [sp, #0x4e4]
@@ -4101,7 +4101,7 @@ _0217f2f8:
str ip, [sp, #0x4e8]
str r11, [sp, #0x4ec]
str r10, [sp, #0x4f0]
str sb, [sp, #0x4f4]
str r9, [sp, #0x4f4]
str r8, [sp, #0x4f8]
strb r7, [sp, #0x4fc]
strb r6, [sp, #0x4fd]
@@ -4116,7 +4116,7 @@ _0217f2f8:
add r0, sp, #0x470
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217f574:
mov r1, #6
add r0, r4, #0xe8
@@ -4220,7 +4220,7 @@ _0217f688:
blx func_02036140
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217f6f8:
ldr r0, [r4, #0x4e4]
mov r1, #1
@@ -4441,7 +4441,7 @@ _0217fa0c:
bl func_ov00_020bd3b0
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r2, _021800b8 ; =data_027e0d0c
add r0, r4, #0x158
ldr r3, [r2]
@@ -4482,21 +4482,21 @@ _0217fa0c:
ldrsh r8, [r5, r1]
umull ip, r11, r10, r2
mla r11, r10, r3, r11
mov sb, r10, asr #0x1f
mov r9, r10, asr #0x1f
adds r10, ip, #0x800
mla r11, sb, r2, r11
adc sb, r11, #0
mla r11, r9, r2, r11
adc r9, r11, #0
mov r10, r10, lsr #0xc
orr r10, r10, sb, lsl #20
orr r10, r10, r9, lsl #20
add r0, r0, r10
umull r10, sb, r8, r2
mla sb, r8, r3, sb
umull r10, r9, r8, r2
mla r9, r8, r3, r9
mov r7, r8, asr #0x1f
adds r3, r10, #0x800
mla sb, r7, r2, sb
mla r9, r7, r2, r9
str r0, [r4, #0x48]
ldr r0, [r4, #0x50]
adc r2, sb, #0
adc r2, r9, #0
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
add r0, r0, r3
@@ -4563,16 +4563,16 @@ _0217fc10:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _021800c0 ; =data_027e0c54
ldrb r1, [r0]
cmp r1, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
bl func_0203608c
cmp r0, #0
addne sp, sp, #0x520
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, #0x1f000
mov r1, #0x1000
bl Divide
@@ -4592,7 +4592,7 @@ _0217fc10:
blx func_02036140
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, sp, #0x358
bl func_ov00_0209a4f4
add r0, r4, #0x48
@@ -4638,7 +4638,7 @@ _0217fd30:
ldr ip, [sp, #0x2f8]
ldr r11, [sp, #0x2fc]
ldr r10, [sp, #0x300]
ldr sb, [sp, #0x304]
ldr r9, [sp, #0x304]
str r2, [sp, #0x384]
ldr r2, [sp, #0x308]
str r1, [sp, #0x388]
@@ -4649,8 +4649,8 @@ _0217fd30:
ldr r11, [sp, #0x314]
str r10, [sp, #0x394]
ldr r10, [sp, #0x318]
str sb, [sp, #0x398]
ldr sb, [sp, #0x31c]
str r9, [sp, #0x398]
ldr r9, [sp, #0x31c]
str r2, [sp, #0x39c]
ldr r2, [sp, #0x320]
str r1, [sp, #0x3a0]
@@ -4662,8 +4662,8 @@ _0217fd30:
ldr r11, [sp, #0x32c]
str r10, [sp, #0x3ac]
ldr r10, [sp, #0x330]
str sb, [sp, #0x3b0]
ldr sb, [sp, #0x334]
str r9, [sp, #0x3b0]
ldr r9, [sp, #0x334]
ldrb r8, [sp, #0x350]
ldrb r7, [sp, #0x351]
ldrb r6, [sp, #0x352]
@@ -4679,8 +4679,8 @@ _0217fd30:
ldr r11, [sp, #0x344]
str r10, [sp, #0x3c4]
ldr r10, [sp, #0x348]
str sb, [sp, #0x3c8]
ldr sb, [sp, #0x34c]
str r9, [sp, #0x3c8]
ldr r9, [sp, #0x34c]
str r2, [sp, #0x3cc]
mov r2, #0x5c
str r1, [sp, #0x3d0]
@@ -4689,7 +4689,7 @@ _0217fd30:
str ip, [sp, #0x3d4]
str r11, [sp, #0x3d8]
str r10, [sp, #0x3dc]
str sb, [sp, #0x3e0]
str r9, [sp, #0x3e0]
strb r8, [sp, #0x3e4]
strb r7, [sp, #0x3e5]
strb r6, [sp, #0x3e6]
@@ -4704,7 +4704,7 @@ _0217fd30:
add r0, sp, #0x358
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217fe50:
ldr r2, _021800b8 ; =data_027e0d0c
add r0, r4, #0x158
@@ -4746,7 +4746,7 @@ _0217fee0:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r4, #0x48
add r3, sp, #0x48
ldmia r0, {r0, r1, r2}
@@ -4810,7 +4810,7 @@ _0217fee0:
add r0, sp, #0x240
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217fff0:
ldr r1, [sp, #0x48]
add r0, r4, #0x158
@@ -4891,7 +4891,7 @@ _0218010c:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r4, #0x4e4]
mov r2, #0
add r0, sp, #0x190
@@ -4916,8 +4916,8 @@ _0218010c:
umull r3, r2, r8, r5
adds r6, r6, #0x800
mla r0, r10, lr, r0
mov sb, r10, asr #0x1f
mla r0, sb, r5, r0
mov r9, r10, asr #0x1f
mla r0, r9, r5, r0
adc r0, r0, #0
mov r6, r6, lsr #0xc
adds r3, r3, #0x800
@@ -4948,7 +4948,7 @@ _0218010c:
sub r11, lr, #1
mla r5, r10, r11, r5
ldr r2, [sp, #0x44]
mla r5, sb, r0, r5
mla r5, r9, r0, r5
adds r6, r6, #0x800
adc r0, r5, #0
mov r5, r6, lsr #0xc
@@ -4987,7 +4987,7 @@ _0218010c:
umull r3, r1, r10, ip
mla r1, r10, lr, r1
adds r3, r3, #0x800
mla r1, sb, ip, r1
mla r1, r9, ip, r1
strb r2, [sp, #0x19a]
strb r2, [sp, #0x19b]
str r6, [sp, #0x3c]
@@ -5027,7 +5027,7 @@ _0218010c:
add r0, sp, #0x190
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218033c:
add r0, r4, #0x158
mov r1, #5
@@ -5054,10 +5054,10 @@ _02180370:
umull r8, r7, r6, r5
mla r7, r6, r3, r7
ldr r3, [r2, #0xc]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r7, r3, r5, r7
ldr r6, [r2, #0x14]
adds r8, sb, r8
adds r8, r9, r8
mov r1, #0x1f
adc r6, r6, r7
umull r3, r5, r6, r1
@@ -5107,7 +5107,7 @@ _02180424:
mov r1, #0x19
bl func_ov35_0217f234
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218046c:
add r0, r4, #0x158
mov r1, #0xb
@@ -5198,7 +5198,7 @@ _021805ac:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _021800ac ; =data_027e0fc8
ldr r0, [r0]
ldr r1, [r0]
@@ -5286,15 +5286,15 @@ _021805ac:
ldr r0, [sp, #0xa0]
str r1, [sp, #0x12c]
str r0, [sp, #0x134]
ldr sb, [sp, #0xa4]
ldr r9, [sp, #0xa4]
ldr r2, [sp, #0xa8]
ldr r1, [sp, #0xac]
ldr r0, _021800a4 ; =data_027e0f74
ldr ip, [sp, #0xb0]
ldr r11, [sp, #0xb4]
ldr r10, [sp, #0xb8]
str sb, [sp, #0x138]
ldr sb, [sp, #0xbc]
str r9, [sp, #0x138]
ldr r9, [sp, #0xbc]
ldrb r8, [sp, #0xd8]
ldrb r7, [sp, #0xd9]
ldrb r6, [sp, #0xda]
@@ -5310,8 +5310,8 @@ _021805ac:
ldr r11, [sp, #0xcc]
str r10, [sp, #0x14c]
ldr r10, [sp, #0xd0]
str sb, [sp, #0x150]
ldr sb, [sp, #0xd4]
str r9, [sp, #0x150]
ldr r9, [sp, #0xd4]
str r2, [sp, #0x154]
mov r2, #0x5c
str r1, [sp, #0x158]
@@ -5320,7 +5320,7 @@ _021805ac:
str ip, [sp, #0x15c]
str r11, [sp, #0x160]
str r10, [sp, #0x164]
str sb, [sp, #0x168]
str r9, [sp, #0x168]
strb r8, [sp, #0x16c]
strb r7, [sp, #0x16d]
strb r6, [sp, #0x16e]
@@ -5335,7 +5335,7 @@ _021805ac:
add r0, sp, #0xe0
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021807e0:
ldr r0, _021800d8 ; =data_ov00_020eec68
mov r2, #0
@@ -5446,7 +5446,7 @@ _02180974:
ldr r0, [sp, #8]
str r0, [r4, #0x130]
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_0218098c: .word data_027e0764
_02180990: .word 0x00000223
@@ -7918,7 +7918,7 @@ _02182b18: .word 0x00001ccd
.global func_ov35_02182b1c
arm_func_start func_ov35_02182b1c
func_ov35_02182b1c: ; 0x02182b1c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x118
mov r4, r0
ldr r0, [r4, #0x550]
@@ -7926,11 +7926,11 @@ func_ov35_02182b1c: ; 0x02182b1c
subgt r0, r0, #1
addgt sp, sp, #0x118
strgt r0, [r4, #0x550]
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldrb r0, [r4, #0x563]
cmp r0, #3
addhs sp, sp, #0x118
ldmhsia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmhsia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _02182f88 ; =data_027e0f64
ldr r3, _02182f8c ; =data_027e0f94
ldr r0, [r0]
@@ -7971,22 +7971,22 @@ _02182bd8: ; jump table
b _02182cb8 ; case 2
b _02182d20 ; case 3
_02182be8:
ldr sb, [sp, #0xb4]
ldr r9, [sp, #0xb4]
ldr r7, [sp, #0xac]
sub r8, sb, #0x7000
add sb, sb, #0x6000
sub r8, r9, #0x7000
add r9, r9, #0x6000
add r10, r7, #0x8000
sub sb, sb, r8
add r7, sb, #1
sub r9, r9, r8
add r7, r9, #1
cmp r7, #0
str r10, [sp, #0xac]
movle r3, r0
ble _02182c44
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
umull r10, r9, r2, r5
mla r9, r2, lr, r9
mla r9, r1, r5, r9
adds r2, ip, r10
adc r3, r3, sb
adc r3, r3, r9
stmia r6, {r2, r3}
cmp r7, #0
beq _02182c44
@@ -7999,22 +7999,22 @@ _02182c44:
str r0, [sp, #0xb4]
b _02182d84
_02182c50:
ldr sb, [sp, #0xb4]
ldr r9, [sp, #0xb4]
ldr r7, [sp, #0xac]
sub r8, sb, #0x7000
add sb, sb, #0x6000
sub r8, r9, #0x7000
add r9, r9, #0x6000
sub r10, r7, #0x8000
sub sb, sb, r8
add r7, sb, #1
sub r9, r9, r8
add r7, r9, #1
cmp r7, #0
str r10, [sp, #0xac]
movle r3, r0
ble _02182cac
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
umull r10, r9, r2, r5
mla r9, r2, lr, r9
mla r9, r1, r5, r9
adds r2, ip, r10
adc r3, r3, sb
adc r3, r3, r9
stmia r6, {r2, r3}
cmp r7, #0
beq _02182cac
@@ -8035,11 +8035,11 @@ _02182cb8:
cmp r7, #0
movle r3, r0
ble _02182d08
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
umull r10, r9, r2, r5
mla r9, r2, lr, r9
mla r9, r1, r5, r9
adds r2, ip, r10
adc r3, r3, sb
adc r3, r3, r9
stmia r6, {r2, r3}
cmp r7, #0
beq _02182d08
@@ -8063,11 +8063,11 @@ _02182d20:
cmp r7, #0
movle r3, r0
ble _02182d70
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
umull r10, r9, r2, r5
mla r9, r2, lr, r9
mla r9, r1, r5, r9
adds r2, ip, r10
adc r3, r3, sb
adc r3, r3, r9
stmia r6, {r2, r3}
cmp r7, #0
beq _02182d70
@@ -8101,7 +8101,7 @@ _02182d84:
movne r0, #0
cmp r0, #0
addne sp, sp, #0x118
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _02182f88 ; =data_027e0f64
ldr r3, [sp, #0xac]
ldr r2, [sp, #0xb0]
@@ -8132,7 +8132,7 @@ _02182d84:
_02182e40:
cmp r5, #0
addne sp, sp, #0x118
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _02182f8c ; =data_027e0f94
mov r8, #0
ldr ip, _02182f98 ; =0x0000ffff
@@ -8185,7 +8185,7 @@ _02182e40:
bl func_01ffbe78
cmp r0, #0
addne sp, sp, #0x118
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
add r0, sp, #0x58
bl func_ov00_020c1500
mvn r1, #0
@@ -8211,7 +8211,7 @@ _02182e40:
mov r0, #0x1e
str r0, [r4, #0x550]
add sp, sp, #0x118
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov35_02182b1c
_02182f88: .word data_027e0f64
@@ -8867,7 +8867,7 @@ _02183844: .word data_ov35_02185c70
.global func_ov35_02183848
arm_func_start func_ov35_02183848
func_ov35_02183848: ; 0x02183848
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x30
mov r7, r0
movs r4, r1
@@ -8877,12 +8877,12 @@ func_ov35_02183848: ; 0x02183848
bne _02183874
cmp r4, #0
addne sp, sp, #0x30
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02183874:
ldr r0, [r7, #0x130]
cmp r0, #0x1f
addeq sp, sp, #0x30
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r0, r7, #0x168
add r0, r0, #0x400
bl func_ov17_021687f0
@@ -8908,7 +8908,7 @@ _02183874:
mov r0, r7
bl func_ov35_02183f0c
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_021838ec:
ldr r0, [r7, #0x15c]
mov r1, r6
@@ -9119,7 +9119,7 @@ _02183ba4:
umull r8, r5, r0, r1
ldr r2, _02183e78 ; =0x00000d99
adds ip, r8, #0x800
umull sb, r8, r0, r2
umull r9, r8, r0, r2
mov ip, ip, lsr #0xc
mov lr, r0, asr #0x1f
mla r5, r0, r3, r5
@@ -9129,7 +9129,7 @@ _02183ba4:
adc r0, r5, #0
orr ip, ip, r0, lsl #20
add r5, ip, #0x1800
adds r1, sb, #0x800
adds r1, r9, #0x800
adc r0, r8, #0
mov r1, r1, lsr #0xc
orr r1, r1, r0, lsl #20
@@ -9157,14 +9157,14 @@ _02183c74:
mov ip, #0
umull r0, lr, r2, r3
add r5, r3, #0xcc
umull sb, r8, r2, r5
umull r9, r8, r2, r5
adds r0, r0, #0x800
mla lr, r2, ip, lr
mov r1, r2, asr #0x1f
mla r8, r2, ip, r8
mla lr, r1, r3, lr
adc ip, lr, #0
adds r2, sb, #0x800
adds r2, r9, #0x800
mla r8, r1, r5, r8
mov r5, r0, lsr #0xc
orr r5, r5, ip, lsl #20
@@ -9236,9 +9236,9 @@ _02183d8c:
ldrsh r1, [r2, r1]
mov r0, r0, lsl #0x1
ldrsh r8, [r2, r0]
smull sb, r0, r1, ip
adds r1, sb, #0x800
smull ip, sb, r8, ip
smull r9, r0, r1, ip
adds r1, r9, #0x800
smull ip, r9, r8, ip
adc r0, r0, #0
mov r1, r1, lsr #0xc
ldr r2, [sp, #0x24]
@@ -9246,7 +9246,7 @@ _02183d8c:
adds r8, ip, #0x800
orr r1, r1, r0, lsl #20
add ip, r2, r1
adc r0, sb, #0
adc r0, r9, #0
mov r1, r8, lsr #0xc
orr r1, r1, r0, lsl #20
ldr r2, [sp, #0x2c]
@@ -9276,7 +9276,7 @@ _02183d8c:
mov r0, r7
bl func_ov35_02183f0c
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov35_02183848
_02183e58: .word data_ov00_020e9c88
+117 -117
View File
@@ -2145,7 +2145,7 @@ _0217da68: .word data_027e0f74
.global func_ov36_0217da6c
arm_func_start func_ov36_0217da6c
func_ov36_0217da6c: ; 0x0217da6c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x60
mov r4, r0
bl func_ov36_02184e10
@@ -2263,31 +2263,31 @@ _0217dbac:
mov r0, r0, lsl #0x1
ldrsh r7, [r1, r0]
mov r0, #4
add sb, sp, #0x3c
add r9, sp, #0x3c
ldrsh r8, [r1, r2]
sub lr, r0, #5
ldmia r10, {r0, r1, r2}
stmia sb, {r0, r1, r2}
mov r2, sb
ldr sb, [r4, #0x864]
stmia r9, {r0, r1, r2}
mov r2, r9
ldr r9, [r4, #0x864]
ldr r1, [r4, #0x860]
mov r6, #0
mov r5, #0x5000
str r1, [sp, #0x34]
ldr ip, _0217dd74 ; =0x0000099a
str r5, [sp, #0x38]
umull r10, r5, sb, ip
mla r5, sb, r6, r5
mov r0, sb, asr #0x1f
umull r10, r5, r9, ip
mla r5, r9, r6, r5
mov r0, r9, asr #0x1f
str r6, [sp, #0x2c]
mla r5, r0, ip, r5
adds r6, r10, #0x800
adc r0, r5, #0
mov r5, r6, lsr #0xc
orr r5, r5, r0, lsl #20
smull sb, r6, r8, r5
smull r9, r6, r8, r5
smull r5, r0, r7, r5
adds r8, sb, #0x800
adds r8, r9, #0x800
adc r7, r6, #0
adds r5, r5, #0x800
mov r6, r8, lsr #0xc
@@ -2329,16 +2329,16 @@ _0217dbac:
ldr r0, [r4, #0x130]
cmp r0, #1
addlt sp, sp, #0x60
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
cmp r0, #0x16
addge sp, sp, #0x60
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0217dd64 ; =data_027e0fc8
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
add sp, sp, #0x60
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_0217da6c
_0217dd64: .word data_027e0fc8
@@ -5306,7 +5306,7 @@ func_ov36_02180660: ; 0x02180660
.global func_ov36_02180664
arm_func_start func_ov36_02180664
func_ov36_02180664: ; 0x02180664
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xd4
mov r7, r0
ldr r0, [r7, #0x878]
@@ -5362,7 +5362,7 @@ _021806cc:
_02180730:
ldrsh r1, [r7, #0x78]
ldr r10, _0218098c ; =data_02050f54
mov sb, #5
mov r9, #5
strh r1, [r0, #0x9c]
add r0, r1, #0x2000
and r0, r0, #0xc000
@@ -5421,7 +5421,7 @@ _02180774:
add r2, sp, #0xc
str r0, [sp, #0x14]
ldr r0, [r7, #8]
stmia sp, {r0, sb, r11}
stmia sp, {r0, r9, r11}
ldr r0, _02180994 ; =data_027e0e60
ldr r0, [r0]
bl func_01ffe1cc
@@ -5510,7 +5510,7 @@ _0218091c:
strb r0, [r7, #0x8a6]
mov r0, #1
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02180664
_02180980: .word data_027e0d0c
@@ -6008,7 +6008,7 @@ _02181068:
.global func_ov36_0218108c
arm_func_start func_ov36_0218108c
func_ov36_0218108c: ; 0x0218108c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
mov r4, r0
ldr r2, [r4, #0x878]
@@ -6049,17 +6049,17 @@ _0218110c:
str r2, [r4, #0x66c]
bl func_ov36_0217d6bc
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02181128:
mov r0, #0
add sp, sp, #0x118
str r0, [r4, #0x138]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02181138:
ldr r1, [r4, #0x138]
cmp r1, #0x1e
addlt sp, sp, #0x118
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
beq _0218116c
@@ -6084,7 +6084,7 @@ _02181194:
mvn r0, #0
add sp, sp, #0x118
str r0, [r4, #0x66c]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021811a4:
ldr r1, [r4, #0x66c]
mvn r0, #0
@@ -6198,7 +6198,7 @@ _021811a4:
str r0, [sp, #0xb0]
ldr r0, [sp, #0x34]
ldr r1, [sp, #0x18]
ldr sb, [sp, #0x20]
ldr r9, [sp, #0x20]
str r8, [sp, #0xa0]
ldr r8, [sp, #0x24]
str r7, [sp, #0xa4]
@@ -6209,8 +6209,8 @@ _021811a4:
ldr r0, [sp, #0x4c]
str r1, [sp, #0xac]
ldr r1, [sp, #0x30]
str sb, [sp, #0xb4]
ldr sb, [sp, #0x38]
str r9, [sp, #0xb4]
ldr r9, [sp, #0x38]
str r8, [sp, #0xb8]
ldr r8, [sp, #0x3c]
str r7, [sp, #0xbc]
@@ -6226,8 +6226,8 @@ _021811a4:
ldr r0, _02181540 ; =data_027e0f74
str r1, [sp, #0xc4]
ldr r1, [sp, #0x48]
str sb, [sp, #0xcc]
ldr sb, [sp, #0x50]
str r9, [sp, #0xcc]
ldr r9, [sp, #0x50]
str r8, [sp, #0xd0]
ldr r8, [sp, #0x54]
str r7, [sp, #0xd4]
@@ -6238,7 +6238,7 @@ _021811a4:
str r1, [sp, #0xdc]
ldr r0, [r0]
add r1, sp, #0x68
str sb, [sp, #0xe4]
str r9, [sp, #0xe4]
str r8, [sp, #0xe8]
str r7, [sp, #0xec]
str r6, [sp, #0xf0]
@@ -6256,7 +6256,7 @@ _021811a4:
bge _02181450
bl func_ov00_0209a508
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02181450:
bl func_ov00_0209a508
_02181454:
@@ -6300,7 +6300,7 @@ _021814c8:
mov r1, #0x16
bl func_ov36_0217d6bc
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021814ec:
ldr r0, _0218155c ; =data_027e0ffc
ldr r1, _02181560 ; =0x000002cb
@@ -6322,7 +6322,7 @@ _021814ec:
ldr r0, [r0, #4]
bl func_ov00_02088000
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_0218108c
_02181540: .word data_027e0f74
@@ -6340,14 +6340,14 @@ _02181568: .word data_027e1038
.global func_ov36_0218156c
arm_func_start func_ov36_0218156c
func_ov36_0218156c: ; 0x0218156c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
mov r4, r0
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x118
mov r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
str r0, [r4, #0x12c]
strb r0, [r4, #0x8a7]
ldr r0, [r4, #0x878]
@@ -6416,7 +6416,7 @@ _0218166c:
ldr r0, [sp, #0x2c]
ldr r1, [sp, #0xc]
ldr r10, [sp, #0x14]
ldr sb, [sp, #0x18]
ldr r9, [sp, #0x18]
str r8, [sp, #0x94]
ldr r8, [sp, #0x1c]
str r7, [sp, #0x98]
@@ -6429,8 +6429,8 @@ _0218166c:
ldr r1, [sp, #0x28]
str r10, [sp, #0xa8]
ldr r10, [sp, #0x30]
str sb, [sp, #0xac]
ldr sb, [sp, #0x34]
str r9, [sp, #0xac]
ldr r9, [sp, #0x34]
str r8, [sp, #0xb0]
ldr r8, [sp, #0x38]
str r7, [sp, #0xb4]
@@ -6448,8 +6448,8 @@ _0218166c:
ldr r1, [sp, #0x44]
str r10, [sp, #0xc4]
ldr r10, [sp, #0x4c]
str sb, [sp, #0xc8]
ldr sb, [sp, #0x50]
str r9, [sp, #0xc8]
ldr r9, [sp, #0x50]
str r8, [sp, #0xcc]
ldr r8, [sp, #0x54]
str r7, [sp, #0xd0]
@@ -6461,7 +6461,7 @@ _0218166c:
ldr r0, [r0]
add r1, sp, #0x68
str r10, [sp, #0xe0]
str sb, [sp, #0xe4]
str r9, [sp, #0xe4]
str r8, [sp, #0xe8]
str r7, [sp, #0xec]
str r6, [sp, #0xf0]
@@ -6477,7 +6477,7 @@ _0218166c:
bl func_ov00_0209a508
mov r0, r11
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_0218156c
_02181784: .word data_ov36_02186cdc
@@ -6570,7 +6570,7 @@ _021818b0: .word data_027e0f64
.global func_ov36_021818b4
arm_func_start func_ov36_021818b4
func_ov36_021818b4: ; 0x021818b4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
ldr r1, _02181b80 ; =data_027e103c
mov r4, r0
@@ -6698,7 +6698,7 @@ _021818fc:
ldr r0, _02181b88 ; =data_027e0f74
ldr r1, [sp, #0x44]
ldr r10, [sp, #0x4c]
ldr sb, [sp, #0x50]
ldr r9, [sp, #0x50]
ldr r8, [sp, #0x54]
ldr r7, [sp, #0x58]
str r6, [sp, #0xd4]
@@ -6708,7 +6708,7 @@ _021818fc:
ldr r0, [r0]
add r1, sp, #0x68
str r10, [sp, #0xe0]
str sb, [sp, #0xe4]
str r9, [sp, #0xe4]
str r8, [sp, #0xe8]
str r7, [sp, #0xec]
str r6, [sp, #0xf0]
@@ -6751,7 +6751,7 @@ _02181b40:
bl func_ov00_0209a508
mov r0, #1
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_021818b4
_02181b80: .word data_027e103c
@@ -7053,7 +7053,7 @@ _02181fcc: .word data_027e0f64
.global func_ov36_02181fd0
arm_func_start func_ov36_02181fd0
func_ov36_02181fd0: ; 0x02181fd0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x228
mov r4, r0
ldrb r0, [r4, #0x8aa]
@@ -7230,7 +7230,7 @@ _02182270:
bl func_ov00_02097b9c
cmp r0, #0
addeq sp, sp, #0x228
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, _0218294c ; =data_027e0f90
mov r1, #0
ldr r0, [r0]
@@ -7240,7 +7240,7 @@ _02182270:
mov r0, #0
add sp, sp, #0x228
str r0, [r4, #0x138]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_021822b4:
ldr r0, [r4, #0x138]
ldr r1, [r4, #0x50]
@@ -7310,13 +7310,13 @@ _02182364:
ldr r0, [r4, #0x138]
cmp r0, #0x3c
addlt sp, sp, #0x228
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r0, #2
strb r0, [r4, #0x8aa]
mov r0, #0
add sp, sp, #0x228
str r0, [r4, #0x138]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_021823d4:
ldr r0, [r4, #0x138]
cmp r0, #0xf
@@ -7328,7 +7328,7 @@ _021823ec:
ldr r0, [r4, #0x138]
cmp r0, #0x1e
addlt sp, sp, #0x228
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, _0218295c ; =data_ov00_020eec68
mov r1, #0xca
mov r2, #0
@@ -7412,7 +7412,7 @@ _0218248c:
ldr r5, [sp, #0xb0]
str r1, [sp, #0x140]
ldr r1, [sp, #0xb4]
ldrb sb, [sp, #0xc1]
ldrb r9, [sp, #0xc1]
ldrb r8, [sp, #0xc2]
ldrb r7, [sp, #0xc3]
ldrb r6, [sp, #0xc4]
@@ -7426,7 +7426,7 @@ _0218248c:
str r1, [sp, #0x150]
ldr r0, [r0]
add r1, sp, #0xc8
strb sb, [sp, #0x155]
strb r9, [sp, #0x155]
str lr, [sp, #0x6c]
str ip, [sp, #0x70]
str r3, [sp, #0x74]
@@ -7458,7 +7458,7 @@ _021825dc:
str r1, [r4, #0x878]
bl func_ov00_0209a508
add sp, sp, #0x228
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_021825f8:
ldr r0, [r4, #0x878]
tst r0, #0x200000
@@ -7468,7 +7468,7 @@ _021825f8:
bl func_0202e58c
cmp r0, #0
addeq sp, sp, #0x228
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r0, r4, #0x158
mov r1, #0x1f
bl func_ov36_0217c958
@@ -7482,7 +7482,7 @@ _021825f8:
mov r1, #5
strh r1, [r0, #0x7c]
add sp, sp, #0x228
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_02182654:
mov r1, #0x6f000
add r0, r0, #0xc
@@ -7633,7 +7633,7 @@ _0218287c:
bl func_0202e58c
cmp r0, #0
addeq sp, sp, #0x228
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
ldr r0, _02182948 ; =data_027e0f74
ldr r1, [r4, #0x66c]
ldr r0, [r0]
@@ -7681,7 +7681,7 @@ _02182934:
bl func_ov36_0217d6bc
_02182940:
add sp, sp, #0x228
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov36_02181fd0
_02182948: .word data_027e0f74
@@ -7706,7 +7706,7 @@ _0218298c: .word data_027e0e60
.global func_ov36_02182990
arm_func_start func_ov36_02182990
func_ov36_02182990: ; 0x02182990
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x124
ldr r1, _02182c64 ; =data_027e0e60
mov r4, r0
@@ -7860,14 +7860,14 @@ _02182a7c:
ldrb r3, [sp, #0x70]
ldr r0, _02182c7c ; =data_027e0f74
ldr r10, [sp, #0x5c]
ldr sb, [sp, #0x60]
ldr r9, [sp, #0x60]
ldr r8, [sp, #0x64]
ldr r7, [sp, #0x68]
mov r2, #1
ldr r0, [r0]
add r1, sp, #0x74
str r10, [sp, #0xf0]
str sb, [sp, #0xf4]
str r9, [sp, #0xf4]
str r8, [sp, #0xf8]
str r7, [sp, #0xfc]
strb r6, [sp, #0x100]
@@ -7889,7 +7889,7 @@ _02182a7c:
bl func_ov00_0209a508
mov r0, #1
add sp, sp, #0x124
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov36_02182990
_02182c64: .word data_027e0e60
@@ -8509,7 +8509,7 @@ _02183500: .word 0x00002aab
.global func_ov36_02183504
arm_func_start func_ov36_02183504
func_ov36_02183504: ; 0x02183504
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14c
mov r5, r0
ldr r1, [r5, #0x810]
@@ -8526,7 +8526,7 @@ func_ov36_02183504: ; 0x02183504
ldr r0, [sp, #0xc]
add sp, sp, #0x14c
str r0, [r5, #0x814]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218354c:
ldr r0, _02183a08 ; =data_027e0fe4
add r1, r5, #0x810
@@ -8577,24 +8577,24 @@ _0218354c:
cmp r0, #2
beq _0218397c
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02183614:
mov r0, r4
bl func_ov14_02125038
cmp r0, #0
addeq sp, sp, #0x14c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, sp, #0x28
add r1, r4, #0x48
bl func_ov00_020ce2f0
cmp r0, #0x1000
addge sp, sp, #0x14c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r5
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x14c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, sp, #0x9c
bl func_ov00_0209a4f4
mvn r6, #0
@@ -8696,7 +8696,7 @@ _02183614:
str r0, [sp, #0xdc]
ldr r0, [sp, #0x5c]
ldr r1, [sp, #0x44]
ldr sb, [sp, #0x4c]
ldr r9, [sp, #0x4c]
str r8, [sp, #0xd0]
ldr r8, [sp, #0x50]
str r7, [sp, #0xd4]
@@ -8705,8 +8705,8 @@ _02183614:
ldr r0, [sp, #0x70]
str r1, [sp, #0xd8]
ldr r1, [sp, #0x58]
str sb, [sp, #0xe0]
ldr sb, [sp, #0x60]
str r9, [sp, #0xe0]
ldr r9, [sp, #0x60]
str r8, [sp, #0xe4]
ldr r8, [sp, #0x64]
str r7, [sp, #0xe8]
@@ -8715,8 +8715,8 @@ _02183614:
ldr r0, [sp, #0x84]
str r1, [sp, #0xec]
ldr r1, [sp, #0x6c]
str sb, [sp, #0xf4]
ldr sb, [sp, #0x74]
str r9, [sp, #0xf4]
ldr r9, [sp, #0x74]
str r8, [sp, #0xf8]
ldr r8, [sp, #0x78]
str r7, [sp, #0xfc]
@@ -8730,8 +8730,8 @@ _02183614:
ldr r0, _02183a24 ; =data_027e0f74
str r1, [sp, #0x100]
ldr r1, [sp, #0x80]
str sb, [sp, #0x108]
ldr sb, [sp, #0x88]
str r9, [sp, #0x108]
ldr r9, [sp, #0x88]
str r8, [sp, #0x10c]
ldr r8, [sp, #0x8c]
str r7, [sp, #0x110]
@@ -8740,7 +8740,7 @@ _02183614:
str r1, [sp, #0x114]
ldr r0, [r0]
add r1, sp, #0x9c
str sb, [sp, #0x11c]
str r9, [sp, #0x11c]
str r8, [sp, #0x120]
str r7, [sp, #0x124]
strb r6, [sp, #0x128]
@@ -8765,7 +8765,7 @@ _021838ec:
add r0, sp, #0x9c
bl func_ov00_0209a508
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021838fc:
ldr r1, [r4, #0x48]
ldr r2, _02183a14 ; =data_027e0f64
@@ -8789,7 +8789,7 @@ _021838fc:
ldr r1, _02183a28 ; =0x00000333
cmp r0, r1
addge sp, sp, #0x14c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r2, r5, #0x26c
mov r0, r4
add r1, r5, #0x48
@@ -8798,7 +8798,7 @@ _021838fc:
mov r0, #2
add sp, sp, #0x14c
strb r0, [r5, #0x8a6]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218397c:
ldr r1, [r4, #0x48]
ldr r2, _02183a14 ; =data_027e0f64
@@ -8821,7 +8821,7 @@ _0218397c:
bl func_ov00_020ce2f0
cmp r0, #0x1000
addge sp, sp, #0x14c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r2, r6
strb r2, [r4, #0x118]
mov r0, r5
@@ -8829,13 +8829,13 @@ _0218397c:
strb r2, [r5, #0x8a6]
bl func_ov36_0217d6bc
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_021839f4:
mvn r0, #0
str r0, [r5, #0x810]
str r0, [r5, #0x814]
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02183504
_02183a08: .word data_027e0fe4
@@ -8956,7 +8956,7 @@ _02183b78: .word data_027e0764
.global func_ov36_02183b7c
arm_func_start func_ov36_02183b7c
func_ov36_02183b7c: ; 0x02183b7c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x58
mov r6, r0
ldrb r2, [r6, #0x8ad]
@@ -8965,7 +8965,7 @@ func_ov36_02183b7c: ; 0x02183b7c
beq _02183ba4
bl func_ov36_021840c4
add sp, sp, #0x58
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02183ba4:
ldrb r0, [r6, #0x8a6]
cmp r0, #0
@@ -8977,13 +8977,13 @@ _02183ba4:
cmp r1, r0
addeq sp, sp, #0x58
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02183bd0:
ldr r0, [r6, #0x870]
cmp r0, #0
addne sp, sp, #0x58
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r5, #0x14]
cmp r0, #0
beq _02183c18
@@ -9094,10 +9094,10 @@ _02183ce8:
adds r2, r2, #0x800
rsb lr, r0, #0x3800
mla r1, ip, r11, r1
mov sb, ip, asr #0x1f
mov r9, ip, asr #0x1f
ldr ip, _021840a0 ; =0x0000219a
mov r2, r2, lsr #0xc
mla r1, sb, ip, r1
mla r1, r9, ip, r1
adc r1, r1, #0
orr r2, r2, r1, lsl #20
smull r2, r1, r3, r2
@@ -9123,7 +9123,7 @@ _02183ce8:
cmp r0, r10
addlt sp, sp, #0x58
movlt r0, r11
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r5, #0x14]
cmp r0, #0
beq _02183f44
@@ -9214,7 +9214,7 @@ _02183f2c:
_02183f38:
add sp, sp, #0x58
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02183f44:
ldr r0, [r5, #0x10]
cmp r0, #8
@@ -9305,7 +9305,7 @@ _02184078:
str r0, [r6, #0x870]
mov r0, #1
add sp, sp, #0x58
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02183b7c
_0218408c: .word 0x424d5459
@@ -9332,7 +9332,7 @@ _021840c0: .word func_01fffcec
.global func_ov36_021840c4
arm_func_start func_ov36_021840c4
func_ov36_021840c4: ; 0x021840c4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
mov r5, r1
ldr r1, [r5, #0x10]
@@ -9352,7 +9352,7 @@ _021840ec:
bl func_ov00_020ceacc
add sp, sp, #0x30
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184114:
ldr r0, [r5, #0x14]
cmp r0, #0
@@ -9369,28 +9369,28 @@ _02184114:
bl func_ov00_020ceacc
add sp, sp, #0x30
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184154:
add sp, sp, #0x30
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184160:
ldr r0, [r6, #0x870]
cmp r0, #0
addne sp, sp, #0x30
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r0, [r5]
cmp r0, #0
addeq sp, sp, #0x30
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r6, #0x130]
cmp r0, #0x13
cmpne r0, #0x11
addne sp, sp, #0x30
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r3, [r5, #0x14]
mov r4, #0
cmp r3, #0
@@ -9402,7 +9402,7 @@ _02184160:
cmp r1, r0
addlt sp, sp, #0x30
movlt r0, r4
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r3, #4]
ldr r0, _02184414 ; =0x41525257
cmp r1, r0
@@ -9433,13 +9433,13 @@ _02184160:
ldrsh r2, [r1, r0]
ldr r0, _0218441c ; =0x00000ccd
mov r11, #0
umull sb, r8, r7, r0
umull r9, r8, r7, r0
mla r8, r7, r11, r8
mov lr, r7, asr #0x1f
mla r8, lr, r0, r8
adds sb, sb, #0x800
adds r9, r9, #0x800
adc r7, r8, #0
mov r8, sb, lsr #0xc
mov r8, r9, lsr #0xc
ldr r10, [r6, #0x50]
orr r8, r8, r7, lsl #20
ldr r3, [r6, #0x4c]
@@ -9487,11 +9487,11 @@ _021842d4:
bge _0218432c
add sp, sp, #0x30
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184320:
add sp, sp, #0x30
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218432c:
ldr r0, [r6, #0x50]
ldr r2, [r6, #0x4c]
@@ -9550,7 +9550,7 @@ _021843e8:
_021843fc:
mov r0, #1
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_021840c4
_02184408: .word data_027e0ffc
@@ -10014,7 +10014,7 @@ _02184a5c:
.global func_ov36_02184a64
arm_func_start func_ov36_02184a64
func_ov36_02184a64: ; 0x02184a64
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
ldr r2, _02184dd8 ; =data_027e0f74
mov r5, r0
@@ -10160,14 +10160,14 @@ _02184c68:
sub r4, r4, #0xa800
_02184c94:
str r0, [sp, #0x88]
ldr sb, [sp]
ldr r9, [sp]
ldr r8, [sp, #4]
ldr r0, [sp, #0x10]
str r1, [sp, #0x8c]
ldr r1, [sp, #0xc]
str r4, [sp, #0x90]
str sb, [sp, #0x94]
ldr sb, [sp, #0x14]
str r9, [sp, #0x94]
ldr r9, [sp, #0x14]
mov r2, #1
str r8, [sp, #0x98]
ldr r8, [sp, #0x18]
@@ -10176,8 +10176,8 @@ _02184c94:
ldr r0, [sp, #0x24]
str r1, [sp, #0xa0]
ldr r1, [sp, #0x20]
str sb, [sp, #0xa8]
ldr sb, [sp, #0x28]
str r9, [sp, #0xa8]
ldr r9, [sp, #0x28]
str r8, [sp, #0xac]
ldr r8, [sp, #0x2c]
str r4, [sp, #0xb0]
@@ -10187,8 +10187,8 @@ _02184c94:
str r1, [sp, #0xb4]
ldr r1, [sp, #0x34]
ldr r10, [sp, #8]
str sb, [sp, #0xbc]
ldr sb, [sp, #0x3c]
str r9, [sp, #0xbc]
ldr r9, [sp, #0x3c]
str r8, [sp, #0xc0]
ldr r8, [sp, #0x40]
str r4, [sp, #0xc4]
@@ -10203,10 +10203,10 @@ _02184c94:
str r1, [sp, #0xc8]
ldr r1, [sp, #0x48]
str r10, [sp, #0x9c]
str sb, [sp, #0xd0]
str r9, [sp, #0xd0]
ldr r10, [sp, #0x50]
str r8, [sp, #0xd4]
ldr sb, [sp, #0x54]
ldr r9, [sp, #0x54]
str r4, [sp, #0xd8]
ldr r8, [sp, #0x58]
ldr r4, [sp, #0x5c]
@@ -10216,7 +10216,7 @@ _02184c94:
ldr r0, [r11]
add r1, sp, #0x68
str r10, [sp, #0xe4]
str sb, [sp, #0xe8]
str r9, [sp, #0xe8]
str r8, [sp, #0xec]
str r4, [sp, #0xf0]
strb r7, [sp, #0xf4]
@@ -10235,12 +10235,12 @@ _02184c94:
bl func_ov00_0209a508
add sp, sp, #0x118
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184dc8:
bl func_ov00_0209a508
mov r0, #1
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02184a64
_02184dd8: .word data_027e0f74
+230 -230
View File
File diff suppressed because it is too large Load Diff
+174 -174
View File
File diff suppressed because it is too large Load Diff
+55 -55
View File
@@ -2320,7 +2320,7 @@ _0217dd18: .word data_027e0f94
.global func_ov39_0217dd1c
arm_func_start func_ov39_0217dd1c
func_ov39_0217dd1c: ; 0x0217dd1c
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x9c
mov r5, r0
add r0, r5, #0x3ec
@@ -2453,12 +2453,12 @@ _0217de6c:
mov r4, #0x5000
ldr r1, [r5, #0x4c]
mov ip, #0
umull sb, r8, r7, r4
umull r9, r8, r7, r4
add lr, r1, #0x1000
mla r8, r7, ip, r8
mov r6, r7, asr #0x1f
mla r8, r6, r4, r8
adds r6, sb, #0x800
adds r6, r9, #0x800
ldr r2, [r5, #0x50]
ldr r0, [r5, #0x48]
adc r4, r8, #0
@@ -2488,7 +2488,7 @@ _0217df70:
str r4, [sp, #0x14]
bl func_ov05_02102c2c
add sp, sp, #0x9c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov39_0217dd1c
_0217dfac: .word data_02050f54
@@ -2945,19 +2945,19 @@ func_ov39_0217e55c: ; 0x0217e55c
.global func_ov39_0217e5b0
arm_func_start func_ov39_0217e5b0
func_ov39_0217e5b0: ; 0x0217e5b0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
mov r4, r0
ldrb r0, [r4, #0xc9c]
cmp r0, #0
addne sp, sp, #0x48
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [r4, #0x158]
tst r0, #0x800
addne sp, sp, #0x48
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
cmp r1, #3
addls pc, pc, r1, lsl #2
b _0217e69c
@@ -2970,7 +2970,7 @@ _0217e600:
cmp r2, #1
addgt sp, sp, #0x48
movgt r0, #0
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, #6
mul r0, r2, r0
ldr r1, _0217e808 ; =data_ov39_02186548
@@ -2981,7 +2981,7 @@ _0217e628:
cmp r2, #1
addgt sp, sp, #0x48
movgt r0, #0
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, #6
mul r0, r2, r0
ldr r1, _0217e810 ; =data_ov39_021865d8
@@ -2992,7 +2992,7 @@ _0217e650:
cmp r2, #1
addgt sp, sp, #0x48
movgt r0, #0
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, #6
mul r0, r2, r0
ldr r1, _0217e814 ; =data_ov39_02186620
@@ -3003,7 +3003,7 @@ _0217e678:
cmp r2, #1
addgt sp, sp, #0x48
movgt r0, #0
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, #6
mul r0, r2, r0
ldr r1, _0217e818 ; =data_ov39_02186590
@@ -3011,7 +3011,7 @@ _0217e678:
add r7, r1, r0, lsl #2
_0217e69c:
ldrh r0, [r4, #0x78]
mov sb, #0
mov r9, #0
ldr r2, _0217e820 ; =data_02050f54
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
@@ -3021,7 +3021,7 @@ _0217e69c:
ldrsh r1, [r2, r1]
ldrsh r0, [r2, r0]
ldr r11, _0217e824 ; =data_027e0f90
str sb, [sp, #0x1c]
str r9, [sp, #0x1c]
str r1, [sp, #0x18]
str r0, [sp, #0x20]
add r6, sp, #0x3c
@@ -3094,15 +3094,15 @@ _0217e6dc:
movne r0, #0
strneb r0, [r1, #0x25c]
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e7ec:
add sb, sb, #1
cmp sb, #2
add r9, r9, #1
cmp r9, #2
add r7, r7, #0xc
blt _0217e6dc
mov r0, #0
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov39_0217e5b0
_0217e808: .word data_ov39_02186548
@@ -3799,7 +3799,7 @@ _0217f108: .word data_ov29_0217bd28
.global func_ov39_0217f10c
arm_func_start func_ov39_0217f10c
func_ov39_0217f10c: ; 0x0217f10c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1c
mov r5, r0
ldr r1, _0217f264 ; =data_027e0fac
@@ -3828,13 +3828,13 @@ func_ov39_0217f10c: ; 0x0217f10c
ldrsh ip, [r3, r2]
ldr r3, _0217f270 ; =0x00002b33
mov r0, r8
umull sb, r8, r7, r3
umull r9, r8, r7, r3
mov r3, #0
mla r8, r7, r3, r8
ldr r3, _0217f270 ; =0x00002b33
mov r6, r7, asr #0x1f
mla r8, r6, r3, r8
adds r6, sb, #0x800
adds r6, r9, #0x800
ldr r10, [sp, #4]
adc r3, r8, #0
mov r6, r6, lsr #0xc
@@ -3885,7 +3885,7 @@ _0217f23c:
ldr r0, [r0]
bl func_ov00_020bd4fc
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov39_0217f10c
_0217f264: .word data_027e0fac
@@ -4320,7 +4320,7 @@ func_ov39_0217f7d8: ; 0x0217f7d8
.global func_ov39_0217f810
arm_func_start func_ov39_0217f810
func_ov39_0217f810: ; 0x0217f810
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x18
mov r4, r0
ldr r0, [r4, #0x284]
@@ -4341,7 +4341,7 @@ func_ov39_0217f810: ; 0x0217f810
str r1, [r0, #0x58]
ldr r1, [r4, #0x50]
str r1, [r0, #0x5c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0217f868:
bl _ZN5Actor16IsFollowedByLinkEv
cmp r0, #0
@@ -4364,18 +4364,18 @@ _0217f868:
ldrsh r8, [r5, r6]
mov ip, #0xcd
add r3, r3, #1
umull r10, sb, r8, ip
umull r10, r9, r8, ip
mov r3, r3, lsl #0x1
ldrsh lr, [r5, r3]
add r3, sp, #0xc
stmia r3, {r0, r1, r2}
umull r6, r5, lr, ip
mla sb, r8, r7, sb
mla r9, r8, r7, r9
mov r0, r8, asr #0x1f
mla sb, r0, ip, sb
mla r9, r0, ip, r9
adds r10, r10, #0x800
mla r5, lr, r7, r5
adc r1, sb, #0
adc r1, r9, #0
mov r0, r10, lsr #0xc
orr r0, r0, r1, lsl #20
adds r1, r6, #0x800
@@ -4411,7 +4411,7 @@ _0217f868:
ldr r0, [sp, #0x14]
add sp, sp, #0x18
str r0, [r1, #0x5c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0217f97c:
ldrsh r0, [r4, #0x78]
ldr r2, _0217fa38 ; =data_02050f54
@@ -4459,7 +4459,7 @@ _0217f97c:
ldr r0, [r4, #0x284]
strh r1, [r0, #0x78]
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov39_0217f810
_0217fa38: .word data_02050f54
@@ -6682,7 +6682,7 @@ _02181998: .word data_02050f54
.global func_ov39_0218199c
arm_func_start func_ov39_0218199c
func_ov39_0218199c: ; 0x0218199c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x40
mov r4, #1
mov r10, r0
@@ -6694,9 +6694,9 @@ func_ov39_0218199c: ; 0x0218199c
mov r7, r0, asr #0x10
add r0, r7, #0xab
mov r3, #0x3800
add sb, r0, #0x2a00
add r9, r0, #0x2a00
ldr r2, _02181cbc ; =data_027e0f94
mov r1, sb, lsl #0x10
mov r1, r9, lsl #0x10
ldr r0, [r2]
str r6, [sp, #0x34]
str r6, [sp, #0x38]
@@ -6849,7 +6849,7 @@ _02181bd4:
_02181c04:
add r0, r0, #0x400
mov r1, #0x13
strh sb, [r2, #0x64]
strh r9, [r2, #0x64]
bl func_ov39_0217ca2c
_02181c14:
ldr r0, [r10, #0x7fc]
@@ -6893,7 +6893,7 @@ _02181c14:
bl func_ov00_020ceacc
mov r0, #1
add sp, sp, #0x40
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov39_0218199c
_02181cbc: .word data_027e0f94
@@ -8918,7 +8918,7 @@ _021838b8:
.global func_ov39_021838c4
arm_func_start func_ov39_021838c4
func_ov39_021838c4: ; 0x021838c4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x124
mov r4, r0
ldr r0, _02183c10 ; =data_027e0ffc
@@ -9041,7 +9041,7 @@ func_ov39_021838c4: ; 0x021838c4
ldr r6, [sp, #0xc]
ldr r5, [sp, #0x10]
ldr r10, [sp, #0x14]
ldr sb, [sp, #0x18]
ldr r9, [sp, #0x18]
ldr r8, [sp, #0x1c]
ldr r7, [sp, #0x24]
str r6, [sp, #0xa0]
@@ -9050,8 +9050,8 @@ func_ov39_021838c4: ; 0x021838c4
ldr r5, [sp, #0x38]
str r10, [sp, #0xa8]
ldr r10, [sp, #0x3c]
str sb, [sp, #0xac]
ldr sb, [sp, #0x40]
str r9, [sp, #0xac]
ldr r9, [sp, #0x40]
str r8, [sp, #0xb0]
ldr r8, [sp, #0x44]
str r7, [sp, #0xb8]
@@ -9067,8 +9067,8 @@ func_ov39_021838c4: ; 0x021838c4
ldrb r1, [sp, #0x70]
str r10, [sp, #0xd0]
ldr r10, [sp, #0x54]
str sb, [sp, #0xd4]
ldr sb, [sp, #0x58]
str r9, [sp, #0xd4]
ldr r9, [sp, #0x58]
str r8, [sp, #0xd8]
ldr r8, [sp, #0x5c]
str r7, [sp, #0xdc]
@@ -9086,7 +9086,7 @@ func_ov39_021838c4: ; 0x021838c4
str r11, [sp, #0xbc]
str r11, [sp, #0xc0]
str r11, [sp, #0xc4]
str sb, [sp, #0xec]
str r9, [sp, #0xec]
str r8, [sp, #0xf0]
str r7, [sp, #0xf4]
str r6, [sp, #0xf8]
@@ -9128,7 +9128,7 @@ func_ov39_021838c4: ; 0x021838c4
bl func_ov00_0209a508
mov r0, #1
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov39_021838c4
_02183c10: .word data_027e0ffc
@@ -10331,23 +10331,23 @@ _02184d3c: .word data_02050f54
.global func_ov39_02184d40
arm_func_start func_ov39_02184d40
func_ov39_02184d40: ; 0x02184d40
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r2, [r0, #0x30]
cmp r1, r2
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
str r1, [r0, #0x30]
cmp r1, #3
addls pc, pc, r1, lsl #2
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184d60: ; jump table
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc} ; case 0
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} ; case 0
b _02184d70 ; case 1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc} ; case 2
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc} ; case 2
b _02184d7c ; case 3
_02184d70:
mov r1, #0xa
str r1, [r0, #0x34]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184d7c:
ldr lr, _02184e64 ; =data_027e0764
mov ip, #0
@@ -10391,13 +10391,13 @@ _02184d7c:
strh r2, [r0, #0x40]
ldr r5, [lr]
ldmib lr, {r4, r7}
umull sb, r8, r7, r5
umull r9, r8, r7, r5
mla r8, r7, r4, r8
ldr r6, [lr, #0xc]
ldr r11, [lr, #0x10]
mla r8, r6, r5, r8
ldr r10, [lr, #0x14]
adds r4, r11, sb
adds r4, r11, r9
adc r5, r10, r8
stmia lr, {r4, r5}
umull lr, r4, r5, r3
@@ -10406,7 +10406,7 @@ _02184d7c:
sub r2, r3, #0x4000
add r1, r4, r2
strh r1, [r0, #0x42]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov39_02184d40
_02184e64: .word data_027e0764
@@ -10415,7 +10415,7 @@ _02184e68: .word 0x00002aab
.global func_ov39_02184e6c
arm_func_start func_ov39_02184e6c
func_ov39_02184e6c: ; 0x02184e6c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
mov r4, r0
ldr r0, [r4, #0x30]
@@ -10558,10 +10558,10 @@ _02184fc8:
ldmib r2, {r3, r5, lr}
umull r7, r6, r5, ip
mla r6, r5, r3, r6
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r6, lr, ip, r6
ldr r8, [r2, #0x14]
adds r3, sb, r7
adds r3, r9, r7
adc r5, r8, r6
stmia r2, {r3, r5}
umull r2, r3, r5, r0
@@ -10582,7 +10582,7 @@ _021850c4:
add r0, r4, #0x3e
bl func_0202b154
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov39_02184e6c
_021850e8: .word 0xffffce39
+171 -171
View File
@@ -1737,7 +1737,7 @@ _0217d4d8: .word data_ov00_020e9370
.global func_ov40_0217d4dc
arm_func_start func_ov40_0217d4dc
func_ov40_0217d4dc: ; 0x0217d4dc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
ldr r2, [r4, #0x1b8]
ldr r1, _0217d6ec ; =0x00000106
@@ -1841,7 +1841,7 @@ _0217d648:
ldr r1, [r1, #8]
blx r1
ldrb r8, [r0, #0x18]
mov sb, #0
mov r9, #0
cmp r8, #0
bls _0217d6d4
ldr r7, _0217d6f0 ; =data_ov00_020e9360
@@ -1855,11 +1855,11 @@ _0217d670:
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
mov r1, sb
mov r1, r9
mov r2, r5
bl func_02019534
add sb, sb, #1
cmp sb, r8
add r9, r9, #1
cmp r9, r8
blo _0217d670
b _0217d6d4
_0217d6ac:
@@ -1879,7 +1879,7 @@ _0217d6d4:
ldr r2, [r0]
ldr r2, [r2, #0x18]
blx r2
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov40_0217d4dc
_0217d6ec: .word 0x00000106
@@ -2292,12 +2292,12 @@ _0217dbd0:
.global func_ov40_0217dbec
arm_func_start func_ov40_0217dbec
func_ov40_0217dbec: ; 0x0217dbec
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r10, r0
ldr r2, [r10, #0x3c]
add r0, r10, #0x10
str r2, [r10, #0x4c]
mov sb, r1
mov r9, r1
bl func_ov40_0217ec84
ldr r7, [r10, #4]
ldr r1, [r10, #8]
@@ -2310,7 +2310,7 @@ func_ov40_0217dbec: ; 0x0217dbec
mov r11, #1
_0217dc2c:
ldr r6, [r7]
mov r1, sb
mov r1, r9
mov r0, r6
bl func_ov40_0217ec84
cmp r0, #0
@@ -2330,7 +2330,7 @@ _0217dc70:
orr r1, r4, r5, lsl #16
mov r0, r8
str r1, [r10, #0x48]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov40_0217dbec
.global func_ov40_0217dc80
@@ -3089,31 +3089,31 @@ func_ov40_0217e59c: ; 0x0217e59c
.global func_ov40_0217e5a4
arm_func_start func_ov40_0217e5a4
func_ov40_0217e5a4: ; 0x0217e5a4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov sb, r1
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r9, r1
mov r10, r0
mov r8, r2
ldr r1, _0217e6f0 ; =data_ov40_02188010
mov r0, sb
mov r0, r9
mov r2, #4
bl func_0204366c
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r1, [sb, #4]
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r9, #4]
ldr r0, _0217e6f4 ; =0x0000feff
cmp r1, r0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r1, [sb, #6]
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrh r1, [r9, #6]
cmp r1, #1
movlo r0, #0
ldmloia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmloia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
cmp r1, #3
movhi r0, #0
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, [sb, #0xc]
add r7, sb, #0x20
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r9, #0xc]
add r7, r9, #0x20
cmp r1, #0
mov r6, #0
bls _0217e6e8
@@ -3145,7 +3145,7 @@ _0217e658:
cmp r0, #0
bne _0217e6d0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e678:
mov r0, r10
mov r1, r7
@@ -3154,7 +3154,7 @@ _0217e678:
cmp r0, #0
bne _0217e6d0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e698:
mov r0, r10
mov r1, r7
@@ -3162,7 +3162,7 @@ _0217e698:
cmp r0, #0
bne _0217e6d0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e6b4:
mov r0, r10
mov r1, r7
@@ -3170,17 +3170,17 @@ _0217e6b4:
bl func_ov40_0217e77c
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e6d0:
ldr r1, [r7]
ldr r0, [sb, #0xc]
ldr r0, [r9, #0xc]
add r6, r6, #1
cmp r6, r0
add r7, r7, r1
blo _0217e620
_0217e6e8:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_0217e5a4
_0217e6f0: .word data_ov40_02188010
@@ -3635,15 +3635,15 @@ func_ov40_0217ec68: ; 0x0217ec68
.global func_ov40_0217ec84
arm_func_start func_ov40_0217ec84
func_ov40_0217ec84: ; 0x0217ec84
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r9, r0
mov r8, r1
mov r7, #0
_0217ec94:
ldrh r0, [sb, #0x18]
ldrh r0, [r9, #0x18]
tst r0, #0x8000
beq _0217ed00
ldr r0, [sb, #0x14]
ldr r0, [r9, #0x14]
cmp r0, #8
addls pc, pc, r0, lsl #2
b _0217ecf8
@@ -3659,125 +3659,125 @@ _0217ecb0: ; jump table
b _0217ecf8 ; case 8
_0217ecd4:
mov r0, #8
str r0, [sb, #0x14]
ldrb r0, [sb, #0x24]
str r0, [r9, #0x14]
ldrb r0, [r9, #0x24]
cmp r0, #0
beq _0217ecf8
mov r0, sb
mov r0, r9
ldr r1, [r0]
ldr r1, [r1, #0x28]
blx r1
_0217ecf8:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0217ed00:
ldr r0, [sb, #0x14]
ldr r0, [r9, #0x14]
cmp r0, #8
bne _0217ed24
mov r0, sb
mov r0, r9
ldr r1, [r0]
ldr r1, [r1, #0x24]
blx r1
mov r0, #2
str r0, [sb, #0x14]
str r0, [r9, #0x14]
_0217ed24:
ldr r0, [sb, #0xc]
ldr r0, [r9, #0xc]
cmp r0, #0
beq _0217ed3c
ldr r0, [r0, #0x4c]
cmp r0, #0
bgt _0217ed48
_0217ed3c:
ldr r0, [sb, #0x2c]
ldr r0, [r9, #0x2c]
cmp r0, #0
ble _0217ed78
_0217ed48:
ldrb r0, [sb, #0x24]
ldrb r0, [r9, #0x24]
cmp r0, #0
beq _0217ed70
mov r1, #4
mov r0, sb
str r1, [sb, #0x14]
mov r0, r9
str r1, [r9, #0x14]
ldr r2, [r0]
mov r1, r8
ldr r2, [r2, #0x30]
blx r2
_0217ed70:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0217ed78:
mov r6, #1
mov r5, #2
mov r10, r6
mov r4, #0
_0217ed88:
ldr r0, [sb, #0x34]
str r0, [sb, #0x30]
ldr r0, [r9, #0x34]
str r0, [r9, #0x30]
cmp r0, #0
bne _0217ede8
ldrb r0, [sb, #0x24]
ldrb r0, [r9, #0x24]
cmp r0, #0
beq _0217ede0
cmp r7, #0
bne _0217edc0
mov r0, sb
mov r0, r9
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x30]
blx r2
_0217edc0:
mov r0, #0
strb r0, [sb, #0x24]
strb r0, [r9, #0x24]
mov r1, #1
mov r0, sb
str r1, [sb, #0x14]
mov r0, r9
str r1, [r9, #0x14]
ldr r1, [r0]
ldr r1, [r1, #0x28]
blx r1
_0217ede0:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0217ede8:
ldrb r0, [sb, #0x24]
ldrb r0, [r9, #0x24]
cmp r0, #0
bne _0217ee08
mov r0, sb
strb r6, [sb, #0x24]
mov r0, r9
strb r6, [r9, #0x24]
ldr r1, [r0]
ldr r1, [r1, #0x24]
blx r1
_0217ee08:
str r5, [sb, #0x14]
ldr r1, [sb, #0x28]
str r5, [r9, #0x14]
ldr r1, [r9, #0x28]
cmp r1, #0
bne _0217ee2c
mov r0, sb
mov r0, r9
bl func_ov40_0217ef24
ldr r1, [sb, #0x28]
ldr r1, [r9, #0x28]
cmp r1, #0
beq _0217ec94
_0217ee2c:
mov r7, r10
cmp r8, r1
blo _0217ee54
mov r0, sb
str r4, [sb, #0x28]
mov r0, r9
str r4, [r9, #0x28]
ldr r2, [r0]
sub r8, r8, r1
ldr r2, [r2, #0x30]
blx r2
b _0217ed88
_0217ee54:
ldr r1, [sb, #0x28]
mov r0, sb
ldr r1, [r9, #0x28]
mov r0, r9
sub r1, r1, r8
str r1, [sb, #0x28]
str r1, [r9, #0x28]
ldr r2, [r0]
mov r1, r8
ldr r2, [r2, #0x30]
blx r2
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov40_0217ec84
.global func_ov40_0217ee7c
@@ -4103,7 +4103,7 @@ _0217f20c:
.global func_ov40_0217f21c
arm_func_start func_ov40_0217f21c
func_ov40_0217f21c: ; 0x0217f21c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r7, r0
mov r6, r1
mov r5, r2
@@ -4113,98 +4113,98 @@ func_ov40_0217f21c: ; 0x0217f21c
cmp r3, #0x10
bge _0217f318
cmp r3, #3
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
cmp r3, #1
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
beq _0217f274
cmp r3, #2
beq _0217f2a8
cmp r3, #3
beq _0217f2e0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217f268:
cmp r3, #0x12
beq _0217f350
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217f274:
mov sb, #0
mov r9, #0
cmp r5, #0
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
mov r8, sb
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r8, r9
_0217f284:
ldr r1, [r6, sb, lsl #2]
ldr r1, [r6, r9, lsl #2]
mov r0, r7
mov r2, r4
mov r3, r8
bl func_ov40_0217f388
add sb, sb, #1
cmp sb, r5
add r9, r9, #1
cmp r9, r5
blo _0217f284
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217f2a8:
mov sb, #0
mov r9, #0
cmp r5, #0
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r8, #4
_0217f2b8:
ldr r1, [r6, sb, lsl #2]
ldr r1, [r6, r9, lsl #2]
mov r0, r7
mov r2, r4
mov r3, r8
bl func_ov40_0217f39c
add sb, sb, #1
cmp sb, r5
add r9, r9, #1
cmp r9, r5
add r4, r4, #4
blo _0217f2b8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217f2e0:
mov sb, #0
mov r9, #0
cmp r5, #0
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r8, #4
_0217f2f0:
ldr r1, [r6, sb, lsl #2]
ldr r1, [r6, r9, lsl #2]
mov r0, r7
mov r2, r4
mov r3, r8
bl func_ov40_0217f3c4
add sb, sb, #1
cmp sb, r5
add r9, r9, #1
cmp r9, r5
add r4, r4, #4
blo _0217f2f0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217f318:
mov sb, #0
mov r9, #0
cmp r5, #0
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r8, #4
_0217f328:
ldr r1, [r6, sb, lsl #2]
ldr r1, [r6, r9, lsl #2]
mov r0, r7
mov r2, r4
mov r3, r8
bl func_ov40_0217f3ec
add sb, sb, #1
cmp sb, r5
add r9, r9, #1
cmp r9, r5
add r4, r4, #4
blo _0217f328
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0217f350:
mov sb, #0
mov r9, #0
cmp r5, #0
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r8, #4
_0217f360:
ldr r1, [r6, sb, lsl #2]
ldr r1, [r6, r9, lsl #2]
mov r0, r7
mov r2, r4
mov r3, r8
bl func_ov40_0217f3f0
add sb, sb, #1
cmp sb, r5
add r9, r9, #1
cmp r9, r5
add r4, r4, #4
blo _0217f360
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov40_0217f21c
.global func_ov40_0217f388
@@ -4276,7 +4276,7 @@ _0217f41c: .word func_ov00_020a0134
.global func_ov40_0217f420
arm_func_start func_ov40_0217f420
func_ov40_0217f420: ; 0x0217f420
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r5, r0
ldr r2, [r5, #0xc]
ldr r0, [r5, #0x1c]
@@ -4284,22 +4284,22 @@ func_ov40_0217f420: ; 0x0217f420
mov r4, r1
mov r7, #0
cmp r0, #0
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
mov sb, r7
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
mov r9, r7
_0217f448:
ldr r6, [r5, #0x20]
mov r1, r4
add r0, r6, sb
add r0, r6, r9
bl func_ov00_020a00c0
mov r1, r8
add r0, r6, sb
add r0, r6, r9
bl func_ov00_020a00e0
ldr r0, [r5, #0x1c]
add r7, r7, #1
cmp r7, r0
add sb, sb, #0x10
add r9, r9, #0x10
blo _0217f448
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov40_0217f420
.global func_ov40_0217f47c
@@ -10360,7 +10360,7 @@ _02183e50: .word data_027e0fe0
.global func_ov40_02183e54
arm_func_start func_ov40_02183e54
func_ov40_02183e54: ; 0x02183e54
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r10, r0
bl func_ov40_0217bf30
ldr r0, _02183f28 ; =data_ov40_021891d4
@@ -10384,15 +10384,15 @@ func_ov40_02183e54: ; 0x02183e54
mov r2, #0x200
str r3, [r10, #0x830]
blx func_0202f194
mov sb, #0
mov r9, #0
ldr r4, _02183f2c ; =data_027e0ce0
mov r8, sb
mov r8, r9
mov r7, #4
mov r6, #1
mov r5, #0xc000
mov r11, #0x200
_02183ed0:
add r0, r10, sb, lsl #2
add r0, r10, r9, lsl #2
str r8, [r0, #0x808]
str r8, [r0, #0x810]
str r7, [r0, #0x818]
@@ -10401,19 +10401,19 @@ _02183ed0:
mov r1, r5
mov r2, r7
blx func_0201739c
add r1, r10, sb, lsl #2
add r1, r10, r9, lsl #2
str r0, [r1, #0x834]
ldr r0, [r4, #4]
mov r1, r11
mov r2, #4
blx func_0201739c
add r1, r10, sb, lsl #2
add sb, sb, #1
add r1, r10, r9, lsl #2
add r9, r9, #1
str r0, [r1, #0x83c]
cmp sb, #2
cmp r9, #2
blo _02183ed0
mov r0, r10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02183e54
_02183f28: .word data_ov40_021891d4
@@ -11284,7 +11284,7 @@ _02184a7c: .word 0x00001b94
.global func_ov40_02184a80
arm_func_start func_ov40_02184a80
func_ov40_02184a80: ; 0x02184a80
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r4, [r1, #0x38]
str r0, [sp]
@@ -11314,7 +11314,7 @@ func_ov40_02184a80: ; 0x02184a80
ldr r1, [sp, #8]
mov r5, r2, asr #0xa
ldr r2, [sp]
mov sb, r1, lsr #0x1
mov r9, r1, lsr #0x1
and r1, r10, #0x1f
add r1, r1, #0x1f
mov r0, #0x1f000
@@ -11342,7 +11342,7 @@ func_ov40_02184a80: ; 0x02184a80
mov r1, r10, lsl #0x1b
mul r0, r3, r0
add r0, r0, #0x800
cmp sb, #0
cmp r9, #0
mov r2, #0
mov lr, r0, asr #0xc
ble _02184bf0
@@ -11375,7 +11375,7 @@ _02184b78:
orr r3, r3, ip, lsl #5
orr r0, r3, r0, lsl #10
strh r0, [r8], #2
cmp r2, sb
cmp r2, r9
blt _02184b78
_02184bf0:
ldr r0, [sp]
@@ -11383,18 +11383,18 @@ _02184bf0:
ldr r0, [r0, #0xc]
bl func_0200e2a4
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov40_02184a80
.global func_ov40_02184c08
arm_func_start func_ov40_02184c08
func_ov40_02184c08: ; 0x02184c08
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r4, r0
ldr r1, [r4]
ldr r0, [r4, #4]
cmp r1, r0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
str r1, [r4, #4]
ldr r0, [r4, #0x14]
ldr ip, [r4, #8]
@@ -11412,7 +11412,7 @@ _02184c44:
mov r0, r0, asr #0x5
and r1, r7, #0x7c00
mov r1, r1, asr #0xa
and sb, r7, #0x1f
and r9, r7, #0x1f
mul r7, r0, r2
and r8, r3, #0x3e0
and r10, r3, #0x7c00
@@ -11420,7 +11420,7 @@ _02184c44:
add r6, r6, #1
mov r1, r10, asr #0xa
and r10, r3, #0x1f
mul r3, sb, r2
mul r3, r9, r2
rsb r2, r2, #0x1000
mla r0, r1, r2, r0
mov r1, r8, asr #0x5
@@ -11443,7 +11443,7 @@ _02184cb8:
ldr r3, [r4, #0x14]
mov r0, #1
bl func_02017d30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov40_02184c08
.global func_ov40_02184cdc
@@ -12932,12 +12932,12 @@ _02185e1c: .word data_02068ebc
.global func_ov40_02185e20
arm_func_start func_ov40_02185e20
func_ov40_02185e20: ; 0x02185e20
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x34
cmp r1, #0
mov r10, r0
addne sp, sp, #0x34
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, _0218613c ; =data_027e0c68
add r0, r10, #0xa000
ldr r2, [r1, #0x14]
@@ -12978,7 +12978,7 @@ _02185ea0:
str r0, [sp, #0xc]
cmp r0, r1
addeq sp, sp, #0x34
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
sub r0, r0, r1
str r0, [sp, #8]
cmp r0, #0
@@ -13031,9 +13031,9 @@ _02185f40:
mov r1, r0
mov r0, r10
bl func_ov40_021861b0
mov sb, r0
mov r9, r0
ldr r0, [sp, #0x1c]
cmp sb, r0
cmp r9, r0
bne _02185fc8
mov r0, r10
mov r1, #0x1b
@@ -13065,12 +13065,12 @@ _02186000:
mov r1, r0
mov r0, r10
bl func_ov40_021861b0
cmp sb, #0x640000
cmp r9, #0x640000
beq _02186040
ldr r1, [sp, #0x20]
cmp sb, r1
cmp r9, r1
beq _02186068
cmp sb, r4
cmp r9, r4
beq _021860bc
b _021860d8
_02186040:
@@ -13146,7 +13146,7 @@ _02186128:
add r1, r10, #0xa000
str r0, [r1, #0xd58]
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02185e20
_0218613c: .word data_027e0c68
@@ -13229,7 +13229,7 @@ _0218622c: .word data_027e0c68
.global func_ov40_02186230
arm_func_start func_ov40_02186230
func_ov40_02186230: ; 0x02186230
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
sub sp, sp, #0x400
mov r11, r3
@@ -13244,7 +13244,7 @@ func_ov40_02186230: ; 0x02186230
mov r1, #0x1c
mov r2, #6
str r3, [sp, #0xc]
ldr sb, [sp, #0x448]
ldr r9, [sp, #0x448]
bl func_02029a5c
mov r4, #0
str r0, [sp, #0x20]
@@ -13252,7 +13252,7 @@ func_ov40_02186230: ; 0x02186230
cmp r0, #0
addle sp, sp, #0x24
addle sp, sp, #0x400
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r7, sp, #0x24
_02186294:
ldr r0, [sp, #0x1c]
@@ -13279,7 +13279,7 @@ _021862dc:
ble _0218632c
_021862e8:
ldr r0, _02186368 ; =data_ov00_020eacd0
str sb, [sp]
str r9, [sp]
stmib sp, {r0, r4}
ldr r3, [r7]
ldr r0, [sp, #0x10]
@@ -13310,7 +13310,7 @@ _0218633c:
blt _02186294
add sp, sp, #0x24
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02186230
_02186364: .word 0xc000c000
@@ -13337,16 +13337,16 @@ func_ov40_0218636c: ; 0x0218636c
.global func_ov40_021863a0
arm_func_start func_ov40_021863a0
func_ov40_021863a0: ; 0x021863a0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r4, [sp, #0x20]
ldr r0, [sp, #0x28]
mla r2, r4, r3, r2
ldr r5, [sp, #0x24]
movs r4, r0, lsl #0x6
ldmmiia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmmiia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add r0, r4, #0x3f
cmp r0, #0x2a00
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
add lr, r1, r2, lsl #5
mov ip, #0
mov r3, #1
@@ -13354,7 +13354,7 @@ func_ov40_021863a0: ; 0x021863a0
mov r1, ip
mov r0, r3
mov r8, ip
mov sb, r2
mov r9, r2
_021863e8:
ldrb r6, [lr]
tst r6, #0xf
@@ -13378,7 +13378,7 @@ _0218641c:
ldr r6, [r5, r6, lsl #2]
and r7, r7, #0x1f
tst r6, r0, lsl r7
movne r6, sb
movne r6, r9
moveq r6, r8
ldrb r7, [lr]
and r6, r6, #0xff
@@ -13390,13 +13390,13 @@ _02186454:
add lr, lr, #1
add r4, r4, #2
blo _021863e8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end func_ov40_021863a0
.global func_ov40_0218646c
arm_func_start func_ov40_0218646c
func_ov40_0218646c: ; 0x0218646c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xa0
mov r5, r0
ldr r0, _021865fc ; =data_027e05f4
@@ -13441,9 +13441,9 @@ _0218650c:
mov ip, r0
add r7, r5, lr, lsl #5
_02186514:
add sb, r7, #0x9000
ldrb sb, [sb, #0x854]
cmp sb, #0
add r9, r7, #0x9000
ldrb r9, [r9, #0x854]
cmp r9, #0
movne r2, r10
bne _02186538
add r7, r7, #1
@@ -13467,8 +13467,8 @@ _02186560:
cmp r1, #0x1c
blt _02186500
add r0, r11, #1
sub sb, r0, r6
rsb r0, sb, #0x20
sub r9, r0, r6
rsb r0, r9, #0x20
add r0, r0, r0, lsr #31
mov r10, r0, asr #0x1
mov r8, #0
@@ -13483,7 +13483,7 @@ _0218658c:
mov r2, r8
mov r3, #0x1c
add r0, r7, #0x9800
str sb, [sp, #0x10]
str r9, [sp, #0x10]
bl func_ov40_0218636c
add r8, r8, #1
cmp r8, #6
@@ -13504,7 +13504,7 @@ _021865cc:
cmp r7, #0x100
blt _021865c8
add sp, sp, #0xa0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_0218646c
_021865fc: .word data_027e05f4
@@ -14628,7 +14628,7 @@ func_ov40_021873f4: ; 0x021873f4
.global func_ov40_02187410
arm_func_start func_ov40_02187410
func_ov40_02187410: ; 0x02187410
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
mov r10, r0
bl func_ov40_0217c2b8
ldr r2, _02187548 ; =gItemManager
@@ -14670,7 +14670,7 @@ _02187464:
mov r7, #0
ldr r1, [r0, #8]
ldr r8, _02187554 ; =data_ov40_02188330
ldr sb, _02187558 ; =data_ov40_02188300
ldr r9, _02187558 ; =data_ov40_02188300
add r6, r0, r1
mov r4, r7
mov r11, r7
@@ -14687,7 +14687,7 @@ _021874c4:
mov r2, r4
bl func_02019570
add r0, r6, #4
mov r1, sb
mov r1, r9
bl func_0201e388
add r1, r10, r7, lsl #2
str r0, [r1, #0x7f4]
@@ -14700,14 +14700,14 @@ _021874c4:
mov r2, r11
bl func_02019570
add r8, r8, #0x10
add sb, sb, #0x10
add r9, r9, #0x10
add r7, r7, #1
cmp r7, #3
blo _021874c4
mov r0, r10
bl func_ov40_021875d8
ldr r0, [sp]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02187410
_02187548: .word gItemManager
@@ -15235,7 +15235,7 @@ _02187bbc: .word data_ov40_02189a24
.global func_ov40_02187bc0
arm_func_start func_ov40_02187bc0
func_ov40_02187bc0: ; 0x02187bc0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x48
ldr r11, [r2]
str r2, [sp, #4]
@@ -15244,7 +15244,7 @@ func_ov40_02187bc0: ; 0x02187bc0
ldr r2, _02187da4 ; =0x00ff0002
mov r10, r0
orr r0, r4, r5, lsl #16
mov sb, r1
mov r9, r1
str r3, [sp, #8]
cmp r0, r2
bne _02187d80
@@ -15311,25 +15311,25 @@ _02187c90:
ldr r1, _02187db0 ; =data_020579f8
sub r0, r5, r0
str r1, [sp, #0x14]
ldr r1, [sb, #4]
ldr r1, [r9, #4]
add r0, r0, r0, lsr #31
str r1, [sp, #0x18]
ldrsh r3, [sb, #8]
ldrsh r3, [r9, #8]
mov r1, #1
cmp r4, #0
strh r3, [sp, #0x1c]
ldrsh r2, [sb, #0xa]
ldrsh r2, [r9, #0xa]
add r0, r3, r0, asr #1
mov r8, #0
strh r2, [sp, #0x1e]
ldrsh r2, [sb, #0xc]
ldrsh r2, [r9, #0xc]
strh r2, [sp, #0x20]
ldrsh r2, [sb, #0xe]
ldrsh r2, [r9, #0xe]
strh r2, [sp, #0x22]
ldr r2, [sb, #0x10]
ldr r2, [r9, #0x10]
str r2, [sp, #0x24]
strh r0, [sp, #0x1c]
ldrsh r0, [sb, #0xa]
ldrsh r0, [r9, #0xa]
sub r0, r0, #9
strh r0, [sp, #0x1e]
strh r1, [sp, #0x22]
@@ -15357,11 +15357,11 @@ _02187d80:
ldr r2, [sp, #4]
ldr r3, [sp, #8]
mov r0, r10
mov r1, sb
mov r1, r9
str r4, [sp]
bl func_0203b814
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02187bc0
_02187da4: .word 0x00ff0002
+10 -10
View File
@@ -3185,11 +3185,11 @@ _0218be1c: .word data_027e0c68
.global func_ov41_0218be20
arm_func_start func_ov41_0218be20
func_ov41_0218be20: ; 0x0218be20
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
mov r10, r0
mov r5, #0
add sb, r10, #0x470
add r9, r10, #0x470
mov r11, r5
add r4, sp, #8
_0218be3c:
@@ -3213,7 +3213,7 @@ _0218be3c:
addeq r6, r6, #0x2800
_0218be84:
ldr r0, _0218bf0c ; =data_027e0fe4
mov r1, sb
mov r1, r9
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
@@ -3243,10 +3243,10 @@ _0218be84:
_0218bef4:
add r5, r5, #1
cmp r5, #4
add sb, sb, #8
add r9, r9, #8
blt _0218be3c
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov41_0218be20
_0218bf0c: .word data_027e0fe4
@@ -3257,14 +3257,14 @@ _0218bf18: .word 0x00000482
.global func_ov41_0218bf1c
arm_func_start func_ov41_0218bf1c
func_ov41_0218bf1c: ; 0x0218bf1c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x4c
mov r10, r0
ldr r0, [r10, #0x48]
mov r8, #0
str r0, [sp, #0x40]
ldr r0, [r10, #0x4c]
add sb, r10, #0x470
add r9, r10, #0x470
str r0, [sp, #0x44]
ldr r0, [r10, #0x50]
add r4, r10, #0x500
@@ -3360,18 +3360,18 @@ _0218c08c:
strh r0, [sp, #8]
_0218c094:
ldr r0, _0218c0d4 ; =data_027e0fe8
str sb, [sp]
str r9, [sp]
ldr r0, [r0]
ldr r1, _0218c0d8 ; =0x4f53574f
add r2, sp, #0x40
mov r3, r5
bl func_ov00_020c4048
add r8, r8, #1
add sb, sb, #8
add r9, r9, #8
cmp r8, #4
blt _0218bf60
add sp, sp, #0x4c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov41_0218bf1c
_0218c0c8: .word data_027e0e58
+56 -56
View File
@@ -262,7 +262,7 @@ _02189830: .word data_ov09_0211f5b4
.global func_ov42_02189834
arm_func_start func_ov42_02189834
func_ov42_02189834: ; 0x02189834
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x80
mov r7, r0
bl func_ov42_021897dc
@@ -369,7 +369,7 @@ _02189918:
ldr r8, _02189b0c ; =data_027e0fe8
mov r5, #0
add r6, r7, #0x10
add sb, sp, #0x10
add r9, sp, #0x10
_021899d4:
ldr r0, [sp, #0xc]
mov r1, r10
@@ -378,7 +378,7 @@ _021899d4:
str r6, [sp]
ldr r0, [r8]
mov r2, r4
mov r3, sb
mov r3, r9
bl func_ov00_020c4048
add r5, r5, #1
cmp r5, #3
@@ -394,7 +394,7 @@ _021899d4:
str r0, [sp, #0xc]
add r5, r7, #0x28
mov r4, #0
add sb, sp, #4
add r9, sp, #4
add r8, sp, #0x10
_02189a38:
ldr r0, [sp, #0xc]
@@ -403,7 +403,7 @@ _02189a38:
str r0, [sp, #0xc]
str r5, [sp]
ldr r0, [r6]
mov r2, sb
mov r2, r9
mov r3, r8
bl func_ov00_020c4048
add r4, r4, #1
@@ -444,7 +444,7 @@ _02189a74:
mov r1, #1
strb r1, [r0, #0x24]
add sp, sp, #0x80
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov42_02189834
_02189af4: .word data_027e0e60
@@ -493,16 +493,16 @@ _02189b80: .word data_027e0ffc
.global func_ov42_02189b84
arm_func_start func_ov42_02189b84
func_ov42_02189b84: ; 0x02189b84
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r4, r0
mov r8, #0
ldr r5, _02189ccc ; =data_027e0fe4
add sb, r4, #0x10
add r9, r4, #0x10
mov r7, r8
mvn r6, #0
_02189ba0:
ldr r0, [r5]
mov r1, sb
mov r1, r9
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
strneb r7, [r0, #0x118]
@@ -511,16 +511,16 @@ _02189ba0:
add r8, r8, #1
str r6, [r0, #0x14]
cmp r8, #3
add sb, sb, #8
add r9, r9, #8
blt _02189ba0
mov r8, #0
ldr r5, _02189ccc ; =data_027e0fe4
add sb, r4, #0x28
add r9, r4, #0x28
mov r7, r8
mvn r6, #0
_02189be4:
ldr r0, [r5]
mov r1, sb
mov r1, r9
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
strneb r7, [r0, #0x118]
@@ -529,7 +529,7 @@ _02189be4:
add r8, r8, #1
str r6, [r0, #0x2c]
cmp r8, #3
add sb, sb, #8
add r9, r9, #8
blt _02189be4
ldr r0, _02189cd0 ; =gItemManager
ldr r0, [r0]
@@ -577,7 +577,7 @@ _02189c88:
str r1, [r0, #0x20]
mov r1, #1
strb r1, [r0, #0x24]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov42_02189b84
_02189ccc: .word data_027e0fe4
@@ -758,18 +758,18 @@ _02189ef8: .word 0x000001c2
.global func_ov42_02189efc
arm_func_start func_ov42_02189efc
func_ov42_02189efc: ; 0x02189efc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov r10, r0
ldr r0, [r10, #0x60]
cmp r0, #0
addle sp, sp, #0x10
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
sub r0, r0, #1
cmp r0, #0
addgt sp, sp, #0x10
str r0, [r10, #0x60]
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r1, #0
add r0, sp, #0
_02189f34:
@@ -805,13 +805,13 @@ _02189f54:
blt _02189f54
mov r7, #0
ldr r4, _0218a058 ; =data_027e0fe4
add sb, r10, #0x28
add r9, r10, #0x28
mov r6, r7
mov r11, #3
add r5, sp, #0
_02189fc0:
ldr r0, [r4]
mov r1, sb
mov r1, r9
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r8, r0
ldr r1, [r8, #0x204]
@@ -828,7 +828,7 @@ _02189fe4:
bl func_ov42_0218c690
add r7, r7, #1
cmp r7, #3
add sb, sb, #8
add r9, r9, #8
blt _02189fc0
ldr r0, _0218a058 ; =data_027e0fe4
add r1, r10, #0x10
@@ -848,7 +848,7 @@ _0218a034:
mov r0, r4
bl func_ov42_0218c690
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov42_02189efc
_0218a054: .word data_027e0764
@@ -1311,21 +1311,21 @@ _0218a624:
.global func_ov42_0218a63c
arm_func_start func_ov42_0218a63c
func_ov42_0218a63c: ; 0x0218a63c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
ldr r0, [sb, #0x60]
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r9, r0
ldr r0, [r9, #0x60]
mov r8, r1
cmp r0, #0
subgt r0, r0, #1
mov r7, r2
mov r6, r3
strgt r0, [sb, #0x60]
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
strgt r0, [r9, #0x60]
ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
cmp r7, #0
mov r4, #0
ble _0218a6c8
ldr r10, _0218a730 ; =data_027e0fe4
add r5, sb, #0x28
add r5, r9, #0x28
_0218a678:
ldr r0, [r10]
mov r1, r5
@@ -1343,8 +1343,8 @@ _0218a6a4:
bl func_ov42_0218c0ec
_0218a6ac:
mov r0, #0xf
str r0, [sb, #0x60]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
str r0, [r9, #0x60]
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0218a6b8:
add r4, r4, #1
cmp r4, r7
@@ -1353,9 +1353,9 @@ _0218a6b8:
_0218a6c8:
mov r5, #0
cmp r8, #0
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r4, _0218a730 ; =data_027e0fe4
add r7, sb, #0x10
add r7, r9, #0x10
_0218a6dc:
ldr r0, [r4]
mov r1, r7
@@ -1373,14 +1373,14 @@ _0218a708:
bl func_ov42_0218c0ec
_0218a710:
mov r0, #0xf
str r0, [sb, #0x60]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
str r0, [r9, #0x60]
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0218a71c:
add r5, r5, #1
cmp r5, r8
add r7, r7, #8
blt _0218a6dc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov42_0218a63c
_0218a730: .word data_027e0fe4
@@ -1798,7 +1798,7 @@ _0218abfc:
.global func_ov42_0218ac10
arm_func_start func_ov42_0218ac10
func_ov42_0218ac10: ; 0x0218ac10
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
mov r1, #4
ldr r2, _0218ad8c ; =data_027e0764
str r1, [r0, #0x474]
@@ -1813,28 +1813,28 @@ func_ov42_0218ac10: ; 0x0218ac10
adds r7, r5, r7
ldr r8, _0218ad90 ; =0x00005557
adc r6, r4, r6
umull r3, sb, r6, r8
umull r3, r9, r6, r8
mov r1, #0
str r7, [r2]
mla sb, r6, r1, sb
mla r9, r6, r1, r9
mov r3, r1
mla sb, r3, r8, sb
mla r9, r3, r8, r9
ldr r8, _0218ad94 ; =0xffffd555
str r6, [r2, #4]
add r8, sb, r8
add r8, r9, r8
mov r8, r8, lsl #0x10
movs r8, r8, asr #0x10
umull sb, r8, lr, r7
umull r9, r8, lr, r7
mla r8, lr, r6, r8
bmi _0218ad08
mla r8, ip, r7, r8
adds sb, r5, sb
adds r9, r5, r9
ldr r5, _0218ad98 ; =0x00001c73
adc r7, r4, r8
umull r4, r6, r7, r5
mla r6, r7, r1, r6
mla r6, r3, r5, r6
str sb, [r2]
str r9, [r2]
add r4, r6, #0x39
add r5, r4, #0xe00
str r7, [r2, #4]
@@ -1845,10 +1845,10 @@ func_ov42_0218ac10: ; 0x0218ac10
umull r8, r7, r6, r5
mla r7, r6, r0, r7
ldr r0, [r2, #0xc]
ldr sb, [r2, #0x10]
ldr r9, [r2, #0x10]
mla r7, r0, r5, r7
ldr r6, [r2, #0x14]
adds r8, sb, r8
adds r8, r9, r8
ldr r0, _0218ad9c ; =0x00001556
adc r7, r6, r7
umull r5, r6, r7, r0
@@ -1859,16 +1859,16 @@ func_ov42_0218ac10: ; 0x0218ac10
str r7, [r2, #4]
add r0, r0, #0xe00
strh r0, [r4, #0x8e]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0218ad08:
mla r8, ip, r7, r8
adds sb, r5, sb
adds r9, r5, r9
ldr r5, _0218ad98 ; =0x00001c73
adc r7, r4, r8
umull r4, r6, r7, r5
mla r6, r7, r1, r6
mla r6, r3, r5, r6
str sb, [r2]
str r9, [r2]
add r4, r6, #0x39
add r5, r4, #0xe00
str r7, [r2, #4]
@@ -1893,7 +1893,7 @@ _0218ad08:
str r7, [r2, #4]
add r0, r6, r0
strh r0, [r4, #0x8e]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov42_0218ac10
_0218ad8c: .word data_027e0764
@@ -2443,15 +2443,15 @@ _0218b43c: .word func_ov42_0218b440
.global func_ov42_0218b440
arm_func_start func_ov42_0218b440
func_ov42_0218b440: ; 0x0218b440
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r9, r0
mov r6, #0
mov r8, #0x1000
bl func_ov42_0218a794
cmp r0, #0
ldrne r8, [r0, #0x4a4]
cmp sb, #4
addls pc, pc, sb, lsl #2
cmp r9, #4
addls pc, pc, r9, lsl #2
b _0218b4f0
_0218b468: ; jump table
b _0218b4dc ; case 0
@@ -2527,9 +2527,9 @@ _0218b4f0:
mov r7, r3, asr #0xc
str r2, [r1, #0x40]
bl func_ov05_0210e288
rsb sb, r7, #0x60
rsb r9, r7, #0x60
mov r5, r0
mov r0, sb
mov r0, r9
bl func_ov05_0210e2a4
mov r0, r0, lsl #0x10
mov r3, r0, lsr #0x10
@@ -2580,7 +2580,7 @@ _0218b4f0:
str r1, [r2, #0xc]
bl func_ov05_0210e288
mov r4, r0
mov r0, sb
mov r0, r9
bl func_ov05_0210e2a4
mov r0, r0, lsl #0x10
mov r1, r0, lsr #0x10
@@ -2592,7 +2592,7 @@ _0218b4f0:
str r0, [r2, #0xc]
mov r0, #0
str r0, [r2, #0x7c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov42_0218b440
_0218b67c: .word 0x0000ffff
+19 -19
View File
@@ -1293,7 +1293,7 @@ _0218a670: .word data_027e0764
.global func_ov43_0218a674
arm_func_start func_ov43_0218a674
func_ov43_0218a674: ; 0x0218a674
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
ldr r1, _0218a84c ; =0x0000099a
mov r4, r0
@@ -1316,7 +1316,7 @@ func_ov43_0218a674: ; 0x0218a674
ldr r1, [r4, #0x4c]
adds r0, r0, #0x800
str r1, [sp, #0x18]
ldr sb, [r4, #0x50]
ldr r9, [r4, #0x50]
ldr r2, _0218a854 ; =data_027e0f90
mov r8, r0, lsr #0xc
ldr r0, [r2]
@@ -1341,8 +1341,8 @@ func_ov43_0218a674: ; 0x0218a674
adc r2, ip, #0
mov r3, r5, lsr #0xc
orr r3, r3, r2, lsl #20
str sb, [sp, #0x1c]
add r2, sb, r3
str r9, [sp, #0x1c]
add r2, r9, r3
str r2, [r1, #8]
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
@@ -1371,7 +1371,7 @@ _0218a784:
mov r3, #0
bl func_ov00_020c070c
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218a7ac:
ldrh r0, [r4, #0x78]
mov r1, #0
@@ -1395,7 +1395,7 @@ _0218a7ac:
bl _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r4, #4]
ldr r0, _0218a864 ; =0x50424c4e
mov r3, #0
@@ -1406,14 +1406,14 @@ _0218a7ac:
mov r1, #0x3b0
bl func_ov00_020ceacc
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218a834:
ldr r0, _0218a868 ; =data_027e0ffc
add r2, r4, #0x48
mov r1, #0x3b8
bl func_ov00_020ceacc
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov43_0218a674
_0218a84c: .word 0x0000099a
@@ -4126,7 +4126,7 @@ _0218cd64:
.global func_ov43_0218cd7c
arm_func_start func_ov43_0218cd7c
func_ov43_0218cd7c: ; 0x0218cd7c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r10, r0
ldrsh r4, [r10, #0x78]
@@ -4134,7 +4134,7 @@ func_ov43_0218cd7c: ; 0x0218cd7c
ldr r0, _0218cf84 ; =data_027e0fc8
strh r4, [r8]
ldr r0, [r0]
mov sb, r1
mov r9, r1
mov r7, r3
ldr r6, [sp, #0x40]
bl func_ov00_020bc46c
@@ -4153,7 +4153,7 @@ func_ov43_0218cd7c: ; 0x0218cd7c
ldmib r0, {r4, r5}
bne _0218cdfc
mvn r0, #0x80000000
str r0, [sb]
str r0, [r9]
mov r1, #0
mov r3, r0
strh r1, [r8]
@@ -4162,7 +4162,7 @@ _0218cdfc:
add r0, r10, #0x48
add r1, r1, #0x48
bl func_ov00_020ce2f0
str r0, [sb]
str r0, [r9]
ldr r1, [r10, #0x3c0]
mov r0, r10
add r1, r1, #0x48
@@ -4200,7 +4200,7 @@ _0218ce58:
_0218ce8c:
mov r0, r10
bl _ZN5Actor16XzDistanceToLinkEv
str r0, [sb]
str r0, [r9]
mov r0, r10
bl _ZN5Actor14GetAngleToLinkEv
ldr r2, _0218cf88 ; =data_027e0f94
@@ -4228,7 +4228,7 @@ _0218ceac:
beq _0218cf40
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218cf04:
ldr r2, _0218cf8c ; =data_027e0e60
str r0, [sp]
@@ -4244,27 +4244,27 @@ _0218cf04:
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218cf40:
ldrb r0, [r10, #0x3e6]
cmp r0, #0
bne _0218cf64
ldr r0, [sb]
ldr r0, [r9]
cmp r0, #0xa800
ble _0218cf78
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218cf64:
ldr r0, [r7]
cmp r0, #0x7000
addgt sp, sp, #0x18
movgt r0, #0
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218cf78:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov43_0218cd7c
_0218cf84: .word data_027e0fc8
+58 -58
View File
@@ -1960,7 +1960,7 @@ _02191948: .word 0x53574f4e
.global func_ov46_0219194c
arm_func_start func_ov46_0219194c
func_ov46_0219194c: ; 0x0219194c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r7, r0
cmp r1, #0
@@ -1968,13 +1968,13 @@ func_ov46_0219194c: ; 0x0219194c
ldreqb r0, [r7, #0xa4]
cmp r0, #0
addeq sp, sp, #0x44
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r7, #0x1d8
bl func_ov00_020c5f1c
ldr r3, [r7, #0x45c]
cmp r3, #0
addle sp, sp, #0x44
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r0, [r7, #0x4d6]
cmp r0, #0
beq _02191b38
@@ -2100,7 +2100,7 @@ _02191b68:
ldrb r0, [r7, #0x4d7]
cmp r0, #0
addeq sp, sp, #0x44
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, _02191e44 ; =data_ov46_02194c2c
add r0, r7, #0x4a0
mov r2, #0xc
@@ -2118,13 +2118,13 @@ _02191b68:
ldr r8, [r0]
ldr r6, [r0, #4]
mov ip, #0
umull r10, sb, r8, r3
mla sb, r8, ip, sb
umull r10, r9, r8, r3
mla r9, r8, ip, r9
mov r7, r8, asr #0x1f
ldr r4, [r0, #8]
adds r8, r10, #0x800
mla sb, r7, r3, sb
adc r7, sb, #0
mla r9, r7, r3, r9
adc r7, r9, #0
mov r8, r8, lsr #0xc
orr r8, r8, r7, lsl #20
ldr r7, _02191e48 ; =data_ov46_02194c14
@@ -2271,7 +2271,7 @@ _02191b68:
ldr r1, _02191e48 ; =data_ov46_02194c14
bl func_ov18_0216941c
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov46_0219194c
_02191e24: .word data_ov46_02194bf8
@@ -3427,7 +3427,7 @@ _02192c8c: .word data_ov46_02194c88
.global func_ov46_02192c90
arm_func_start func_ov46_02192c90
func_ov46_02192c90: ; 0x02192c90
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov r4, r0
ldrh r0, [r4, #0x20]
@@ -3476,15 +3476,15 @@ func_ov46_02192c90: ; 0x02192c90
ldr r7, [r0, #0xc]
ldr r10, [r0, #0x10]
mla r5, r7, r3, r5
ldr sb, [r0, #0x14]
ldr r9, [r0, #0x14]
adds r2, r10, r6
adc r6, sb, r5
adc r6, r9, r5
umull r5, r3, r8, r2
mla r3, r8, r6, r3
adds r5, r10, r5
str r2, [r0]
mla r3, r7, r2, r3
adc r2, sb, r3
adc r2, r9, r3
umull ip, r11, r8, r5
mla r11, r8, r2, r11
mla r11, r7, r5, r11
@@ -3501,7 +3501,7 @@ func_ov46_02192c90: ; 0x02192c90
mov r3, r3, lsl #0x10
str r2, [r0, #4]
adds r7, r10, ip
adc r2, sb, r11
adc r2, r9, r11
mov r5, r2, lsr #0x10
mov r5, r5, lsl #0x10
mov r5, r5, lsr #0x10
@@ -3528,18 +3528,18 @@ func_ov46_02192c90: ; 0x02192c90
add r5, r6, #1
add r3, r7, #1
ldr r0, _02192fbc ; =data_02050f54
mov sb, r6, lsl #0x1
mov r9, r6, lsl #0x1
mov r8, r7, lsl #0x1
mov r7, r5, lsl #0x1
mov r5, r3, lsl #0x1
add r3, r2, #1
mov r6, r3, lsl #0x1
mov r11, r2, lsl #0x1
ldrsh sb, [r0, sb]
ldrsh r9, [r0, r9]
ldrsh r3, [r0, r8]
ldrsh r8, [r0, r7]
ldrsh r7, [r0, r5]
smull r2, ip, r3, sb
smull r2, ip, r3, r9
adds r5, r2, #0x800
smull r10, r2, r7, r8
adc ip, ip, r1
@@ -3552,7 +3552,7 @@ func_ov46_02192c90: ; 0x02192c90
mov r2, r10, lsr #0xc
orr r2, r2, r11, lsl #20
smull ip, r11, r2, r0
smull r10, sb, r7, sb
smull r10, r9, r7, r9
smull r8, r7, r3, r8
adds r3, ip, #0x800
adc r11, r11, r1
@@ -3567,22 +3567,22 @@ func_ov46_02192c90: ; 0x02192c90
sub r2, r3, r2
str r2, [r4, #0x1d0]
adds r3, r10, #0x800
adc r2, sb, r1
adc r2, r9, r1
mov r10, r3, lsr #0xc
orr r10, r10, r2, lsl #20
adds r3, r8, #0x800
adc r2, r7, r1
mov sb, r3, lsr #0xc
orr sb, sb, r2, lsl #20
mov r9, r3, lsr #0xc
orr r9, r9, r2, lsl #20
smull r3, r2, r5, r0
smull r7, r5, sb, r6
smull r7, r5, r9, r6
adds r7, r7, #0x800
adc r5, r5, r1
mov r8, r7, lsr #0xc
orr r8, r8, r5, lsl #20
smull r5, lr, r10, r6
smull r7, r6, r10, r0
smull r10, r0, sb, r0
smull r10, r0, r9, r0
adds r7, r7, #0x800
adc r6, r6, r1
mov r7, r7, lsr #0xc
@@ -3625,7 +3625,7 @@ func_ov46_02192c90: ; 0x02192c90
bl func_ov46_021929b0
mov r0, #1
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov46_02192c90
_02192fac: .word data_ov46_0219448c
@@ -3731,7 +3731,7 @@ func_ov46_021930a8: ; 0x021930a8
.global func_ov46_021930e0
arm_func_start func_ov46_021930e0
func_ov46_021930e0: ; 0x021930e0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x40
ldr r1, _02193494 ; =data_ov46_0219449c
add r3, sp, #0x34
@@ -3763,16 +3763,16 @@ _02193144:
ldmib r3, {r0, r7, r11}
umull r5, r2, r7, r1
mla r2, r7, r0, r2
ldr sb, [r3, #0x10]
ldr r9, [r3, #0x10]
mla r2, r11, r1, r2
adds r5, sb, r5
adds r5, r9, r5
ldr r8, [r3, #0x14]
umull r1, r0, r7, r5
adc r2, r8, r2
mla r0, r7, r2, r0
str r5, [r3]
mla r0, r11, r5, r0
adds r6, sb, r1
adds r6, r9, r1
adc r0, r8, r0
str r0, [sp, #0x2c]
mov r0, r2, lsr #0x10
@@ -3832,7 +3832,7 @@ _02193144:
mla r0, r11, r6, r0
str r0, [sp, #4]
ldr r0, [sp]
adds r6, sb, r0
adds r6, r9, r0
ldr r0, [sp, #4]
str r6, [r3]
adc r0, r8, r0
@@ -3858,7 +3858,7 @@ _02193144:
mov r8, r7, lsr #0xc
orr r8, r8, r3, lsl #20
mov r3, r8, asr #0x1f
mov sb, r10, asr #0x1f
mov r9, r10, asr #0x1f
str r3, [sp, #0x18]
mov r3, r0, lsl #0x1
ldr r0, _0219349c ; =data_02050f54
@@ -3885,7 +3885,7 @@ _02193144:
umull r0, r3, r8, r10
adds r0, r0, r1
mov r11, r0, lsr #0xc
mla r3, r8, sb, r3
mla r3, r8, r9, r3
ldr r0, [sp, #0x18]
mla r3, r0, r10, r3
adc r0, r3, r2
@@ -3916,7 +3916,7 @@ _02193144:
orr r0, r0, r3, lsl #20
umull r3, ip, r0, r10
adds r3, r3, r1
mla ip, r0, sb, ip
mla ip, r0, r9, ip
mov r5, r0, asr #0x1f
mla ip, r5, r10, ip
mov r3, r3, lsr #0xc
@@ -3931,7 +3931,7 @@ _02193144:
add r0, r3, r0
str r0, [r4, #0x1e4]
umull r3, r0, r11, r10
mla r0, r11, sb, r0
mla r0, r11, r9, r0
ldr r11, [sp, #0x28]
mla r0, r11, r10, r0
adds r11, r3, r1
@@ -3945,7 +3945,7 @@ _02193144:
sub r0, r0, r5
umull r5, r3, r6, r10
str r0, [r4, #0x1e8]
mla r3, r6, sb, r3
mla r3, r6, r9, r3
ldr r0, [sp, #0x20]
mla r3, r0, r10, r3
adds r0, r5, r1
@@ -3969,7 +3969,7 @@ _02193144:
mov r0, #2
str r0, [r4, #0x12c]
add sp, sp, #0x40
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov46_021930e0
_02193494: .word data_ov46_0219449c
@@ -4043,7 +4043,7 @@ _02193570: .word data_027e0764
.global func_ov46_02193574
arm_func_start func_ov46_02193574
func_ov46_02193574: ; 0x02193574
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x78
mov r4, r0
ldr r1, _02193b14 ; =0x0000019a
@@ -4204,14 +4204,14 @@ _02193710:
ldrsh r10, [r2, r0]
add r0, r3, #1
mov r0, r0, lsl #0x1
ldrsh sb, [r2, r0]
ldrsh r9, [r2, r0]
mov r0, r10, asr #0x1f
str r0, [sp, #8]
ldrsh r0, [r2]
str r11, [r1]
ldrsh r8, [r2, #2]
str r0, [sp, #0xc]
mov r0, sb, asr #0x1f
mov r0, r9, asr #0x1f
str r0, [sp, #0x14]
ldr r0, [sp, #0xc]
str r7, [r1, #4]
@@ -4259,7 +4259,7 @@ _02193710:
str r0, [sp, #0x20]
mov r0, r5, asr #0x1f
str r0, [sp, #0x3c]
umull r11, r2, r8, sb
umull r11, r2, r8, r9
adds r3, r11, #0x800
mov r3, r3, lsr #0xc
str r3, [sp, #0x24]
@@ -4268,7 +4268,7 @@ _02193710:
mla r2, r8, r3, r2
ldr r3, [sp, #0x18]
add r1, sp, #0x40
mla r2, r3, sb, r2
mla r2, r3, r9, r2
adc r3, r2, ip
ldr r2, [sp, #0x24]
orr r2, r2, r3, lsl #20
@@ -4312,25 +4312,25 @@ _02193710:
ldr r10, [sp, #0xc]
mov r3, r2, asr #0x1f
str r3, [sp, #0x30]
umull r8, r3, r10, sb
umull r8, r3, r10, r9
mov r11, r10
ldr r10, [sp, #0x14]
adds r8, r8, #0x800
mla r3, r11, r10, r3
ldr r10, [sp, #0x10]
mov r11, r8, lsr #0xc
mla r3, r10, sb, r3
mla r3, r10, r9, r3
adc r3, r3, ip
orr r11, r11, r3, lsl #20
umull sb, r8, r11, r7
adds r3, sb, #0x800
umull r9, r8, r11, r7
adds r3, r9, #0x800
mla r8, r11, r6, r8
mov r10, r11, asr #0x1f
mla r8, r10, r7, r8
mov sb, r3, lsr #0xc
mov r9, r3, lsr #0xc
adc r3, r8, ip
umull r8, lr, r2, r5
orr sb, sb, r3, lsl #20
orr r9, r9, r3, lsl #20
adds r3, r8, #0x800
mov r3, r3, lsr #0xc
str r3, [sp, #0x34]
@@ -4342,19 +4342,19 @@ _02193710:
adc r8, lr, ip
orr r3, r3, r8, lsl #20
str r3, [sp, #0x34]
add r3, sb, r3
add r3, r9, r3
str r3, [sp, #0x44]
umull r8, r3, r2, r7
mla r3, r2, r6, r3
ldr r2, [sp, #0x30]
adds r8, r8, #0x800
mla r3, r2, r7, r3
ldr sb, [sp, #0x3c]
ldr r9, [sp, #0x3c]
adc r2, r3, ip
mov r8, r8, lsr #0xc
orr r8, r8, r2, lsl #20
umull r3, r2, r11, r5
mla r2, r11, sb, r2
mla r2, r11, r9, r2
adds r3, r3, #0x800
mla r2, r10, r5, r2
adc r2, r2, ip
@@ -4363,12 +4363,12 @@ _02193710:
sub r2, r8, r3
str r2, [sp, #0x48]
ldr r2, [sp, #0x24]
mov sb, #0x800
mov r9, #0x800
umull r8, r3, r2, r7
mla r3, r2, r6, r3
ldr r2, [sp, #0x28]
mla r3, r2, r7, r3
mov r2, sb
mov r2, r9
adds r2, r8, r2
adc r3, r3, ip
mov r2, r2, lsr #0xc
@@ -4380,7 +4380,7 @@ _02193710:
mla r7, r6, r3, r7
ldr r3, [sp, #0x20]
mla r7, r3, r5, r7
mov r3, sb
mov r3, r9
adds r5, r8, r3
adc r3, r7, ip
mov r5, r5, lsr #0xc
@@ -4401,12 +4401,12 @@ _02193ad4:
add r0, r0, #0x14000
cmp r1, r0
addlt sp, sp, #0x78
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r4, #0x15c
mov r1, #4
bl func_ov46_02192a0c
add sp, sp, #0x78
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov46_02193574
_02193b14: .word 0x0000019a
@@ -4884,7 +4884,7 @@ _021940d8:
.global func_ov46_0219416c
arm_func_start func_ov46_0219416c
func_ov46_0219416c: ; 0x0219416c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x34
ldr r11, _021942ec ; =data_027e0764
mov r6, r0
@@ -4931,10 +4931,10 @@ _02194184:
umull r7, lr, ip, r2
mla lr, ip, r0, lr
ldr r3, [r11, #0xc]
ldr sb, [r11, #0x10]
ldr r9, [r11, #0x10]
mla lr, r3, r2, lr
ldr r8, [r11, #0x14]
adds r0, sb, r7
adds r0, r9, r7
adc r2, r8, lr
stmia r11, {r0, r2}
mov r0, #0x53
@@ -4982,7 +4982,7 @@ _021942d8:
cmp r5, #4
blt _02194184
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov46_0219416c
_021942ec: .word data_027e0764
+22 -22
View File
@@ -697,7 +697,7 @@ _02190910: .word func_ov47_02190914
.global func_ov47_02190914
arm_func_start func_ov47_02190914
func_ov47_02190914: ; 0x02190914
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x90
mov r4, r0
ldrb r1, [r4, #0x17c]
@@ -770,7 +770,7 @@ _02190964:
add r3, r4, #0x100
str r0, [r4, #0x60]
ldr r0, [r8, #0x64]
add sb, r8, #0x100
add r9, r8, #0x100
str r0, [r4, #0x64]
ldr r1, [r8, #0x68]
ldr r0, _02190de0 ; =data_027e0ffc
@@ -783,13 +783,13 @@ _02190964:
mov r1, #0x394
add r10, r10, #1
strh r10, [r3, #0x76]
ldrh r10, [sb, #0x76]
ldrh r10, [r9, #0x76]
mov r3, #0
str r7, [sp, #0x6c]
add r7, r10, #1
str r6, [sp, #0x70]
str r5, [sp, #0x74]
strh r7, [sb, #0x76]
strh r7, [r9, #0x76]
bl func_ov00_020ceacc
_02190a84:
ldrb r0, [r4, #0x17c]
@@ -804,7 +804,7 @@ _02190a84:
bl func_ov47_02190e00
add sp, sp, #0x90
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02190ab8:
ldr r1, [r4, #0x60]
add r0, r4, #0x48
@@ -890,7 +890,7 @@ _02190be4:
bl func_ov47_02190e00
add sp, sp, #0x90
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02190bf8:
cmp r2, #0
beq _02190dc0
@@ -927,7 +927,7 @@ _02190bf8:
bl func_ov47_02190e00
add sp, sp, #0x90
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02190c88:
add r0, sp, #0x54
add r1, sp, #0x60
@@ -964,9 +964,9 @@ _02190c88:
ldr r1, [ip, #0xc]
ldr r10, [ip, #0x10]
mla r7, r1, r6, r7
ldr sb, [ip, #0x14]
ldr r9, [ip, #0x14]
adds r1, r10, r8
adc r2, sb, r7
adc r2, r9, r7
ldr r3, _02190df8 ; =0x00001001
stmia ip, {r1, r2}
mov r11, lr
@@ -1010,11 +1010,11 @@ _02190c88:
_02190dc0:
add sp, sp, #0x90
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02190dcc:
mov r0, #0
add sp, sp, #0x90
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov47_02190914
_02190dd8: .word 0x42494752
@@ -3627,7 +3627,7 @@ _02193058: .word 0x00000ee1
.global func_ov47_0219305c
arm_func_start func_ov47_0219305c
func_ov47_0219305c: ; 0x0219305c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r0
add r0, sp, #0x18
@@ -3646,7 +3646,7 @@ func_ov47_0219305c: ; 0x0219305c
ldrsh r0, [r4, #0x78]
strh r0, [sp, #0x2c]
ldrh r0, [r4, #0x78]
ldr sb, [r4, #0x48]
ldr r9, [r4, #0x48]
mov r0, r0, asr #0x4
mov r2, r0, lsl #0x1
mov r0, r2, lsl #0x1
@@ -3654,7 +3654,7 @@ func_ov47_0219305c: ; 0x0219305c
add r0, r2, #1
mov r0, r0, lsl #0x1
ldrsh r5, [r1, r0]
str sb, [sp, #0xc]
str r9, [sp, #0xc]
ldr r0, [r4, #0x4c]
rsb ip, r10, #0
str r0, [sp, #0x10]
@@ -3676,24 +3676,24 @@ func_ov47_0219305c: ; 0x0219305c
mov r6, r7, lsr #0xc
orr r6, r6, r0, lsl #20
ldr r0, _0219320c ; =0x00000e3d
add r6, sb, r6
umull r0, sb, r5, r0
add r6, r9, r6
umull r0, r9, r5, r0
mov r7, #0
mla sb, r5, r7, sb
mla r9, r5, r7, r9
adds r0, r0, #0x800
ldr r7, _0219320c ; =0x00000e3d
mov lr, r5, asr #0x1f
mla sb, lr, r7, sb
mla r9, lr, r7, r9
mov r0, r0, lsr #0xc
adc r7, sb, #0
adc r7, r9, #0
orr r0, r0, r7, lsl #20
mov r7, #0x69
add r0, r8, r0
umull sb, r8, r5, r7
umull r9, r8, r5, r7
mov r7, #0
mla r8, r5, r7, r8
mov r5, #0x69
adds r7, sb, #0x800
adds r7, r9, #0x800
mla r8, lr, r5, r8
adc r5, r8, #0
mov r7, r7, lsr #0xc
@@ -3733,7 +3733,7 @@ func_ov47_0219305c: ; 0x0219305c
movge r0, #1
movlt r0, #0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov47_0219305c
_02193208: .word data_02050f54
+152 -152
View File
@@ -169,7 +169,7 @@ func_ov48_02190224: ; 0x02190224
.global func_ov48_0219022c
arm_func_start func_ov48_0219022c
func_ov48_0219022c: ; 0x0219022c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x1c
mov r4, r0
ldr r2, [r4, #0x1c]
@@ -222,22 +222,22 @@ _021902c4:
umull r1, r0, r10, r2
mov ip, #0
mla r0, r10, ip, r0
umull sb, r8, r7, r2
umull r9, r8, r7, r2
mov r10, r10, asr #0x1f
ldr r5, [sp, #0x18]
mla r0, r10, r2, r0
adds r1, r1, #0x800
adc r10, r0, #0
mov r0, r1, lsr #0xc
adds r1, sb, #0x800
mov sb, r1, lsr #0xc
adds r1, r9, #0x800
mov r9, r1, lsr #0xc
umull r6, lr, r5, r2
orr r0, r0, r10, lsl #20
mla r8, r7, ip, r8
mov r1, r7, asr #0x1f
mla r8, r1, r2, r8
adc r1, r8, #0
orr sb, sb, r1, lsl #20
orr r9, r9, r1, lsl #20
mla lr, r5, ip, lr
mov r1, r5, asr #0x1f
mla lr, r1, r2, lr
@@ -246,7 +246,7 @@ _021902c4:
mov r2, r2, lsr #0xc
orr r2, r2, r1, lsl #20
str r0, [sp, #0x10]
str sb, [sp, #0x14]
str r9, [sp, #0x14]
str r2, [sp, #0x18]
str r0, [r3, #0x40]
ldr r0, [sp, #0x14]
@@ -263,12 +263,12 @@ _02190378:
add r2, r2, #0x48
bl func_ov00_020cec60
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_021903a0:
add r0, r4, #0x17c
bl func_ov00_020b7e6c
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_021903b0:
cmp r0, #0
beq _02190410
@@ -294,13 +294,13 @@ _021903e8:
add r7, r7, #0xc
blo _021903e8
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02190410:
add r5, r4, #0x188
add r4, r4, #0x1a0
cmp r5, r4
addeq sp, sp, #0x1c
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02190424:
mov r0, r5
bl func_ov00_020b7e6c
@@ -308,7 +308,7 @@ _02190424:
cmp r5, r4
bne _02190424
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov48_0219022c
_02190440: .word data_027e0e58
@@ -3088,7 +3088,7 @@ _02192480: .word data_027e0e5c
.global func_ov48_02192484
arm_func_start func_ov48_02192484
func_ov48_02192484: ; 0x02192484
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x24
mov r4, r0
ldr r0, _021925fc ; =0x000025c3
@@ -3101,7 +3101,7 @@ func_ov48_02192484: ; 0x02192484
cmp r1, r0, asr #12
movlt r6, r1
mov r8, r7
mov sb, r4
mov r9, r4
mov r5, #0xc
_021924c0:
ldr r1, [r4, #0x340]
@@ -3117,15 +3117,15 @@ _021924c0:
ldr r1, [r3, r2]
mov r0, r0, lsl #0x10
mov r7, r0, asr #0x10
str r1, [sb, #0x4ac]
str r1, [r9, #0x4ac]
add r1, r3, r2
ldr r0, [r1, #4]
cmp r7, #5
str r0, [sb, #0x4b0]
str r0, [r9, #0x4b0]
ldr r0, [r1, #8]
add r8, r8, r6
str r0, [sb, #0x4b4]
add sb, sb, #0xc
str r0, [r9, #0x4b4]
add r9, r9, #0xc
blt _021924c0
ldr r5, [r4, #0x52c]
add r0, r4, #0xac
@@ -3182,7 +3182,7 @@ _021924c0:
ldr r0, [sp, #8]
str r0, [r5, #0x68]
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov48_02192484
_021925fc: .word 0x000025c3
@@ -3191,34 +3191,34 @@ _02192600: .word 0x0000013f
.global func_ov48_02192604
arm_func_start func_ov48_02192604
func_ov48_02192604: ; 0x02192604
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x88
mov sb, r0
ldr r0, [sb, #0x130]
mov r9, r0
ldr r0, [r9, #0x130]
cmp r0, #3
cmpne r0, #4
cmpne r0, #5
beq _0219266c
ldr r0, [sb, #0x338]
ldr r0, [r9, #0x338]
add r0, r0, #1
str r0, [sb, #0x338]
ldr r1, [sb, #0x340]
str r0, [r9, #0x338]
ldr r1, [r9, #0x340]
bl func_02002c14
mov r0, #0xc
mul r2, r1, r0
str r1, [sb, #0x338]
ldr r1, [sb, #0x33c]
ldr r0, [sb, #0x48]
str r1, [r9, #0x338]
ldr r1, [r9, #0x33c]
ldr r0, [r9, #0x48]
add r3, r1, r2
str r0, [r1, r2]
ldr r1, [sb, #0x4c]
mov r0, sb
ldr r1, [r9, #0x4c]
mov r0, r9
str r1, [r3, #4]
ldr r1, [sb, #0x50]
ldr r1, [r9, #0x50]
str r1, [r3, #8]
bl func_ov48_02192484
_0219266c:
ldr r0, [sb, #0x130]
ldr r0, [r9, #0x130]
mov r5, #0
cmp r0, #3
cmpne r0, #4
@@ -3233,12 +3233,12 @@ _0219266c:
mov r6, r5
add r4, sp, #0x78
_021926a4:
add r0, sb, r6, lsl #2
add r0, r9, r6, lsl #2
ldr r0, [r0, #0x52c]
mov r1, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r1, [sp, #0x84]
mov r0, sb
mov r0, r9
add r1, r1, #0x9a
add r2, r1, #0x100
mov r1, r4
@@ -3247,14 +3247,14 @@ _021926a4:
cmp r0, #0
beq _02192708
bl func_ov48_02191c50
add r2, sb, #0x48
add r2, r9, #0x48
mov r1, #0xf9
mov r3, #0
bl func_ov00_020c070c
cmp r6, #0
mov r5, #1
bne _02192714
mov r0, sb
mov r0, r9
mov r1, #2
bl func_ov48_021923f8
b _02192714
@@ -3263,7 +3263,7 @@ _02192708:
cmp r6, #3
blt _021926a4
_02192714:
ldr r0, [sb, #0x130]
ldr r0, [r9, #0x130]
cmp r0, #3
cmpne r0, #4
cmpne r0, #5
@@ -3272,10 +3272,10 @@ _02192714:
bne _02192bd0
mov r0, #0
str r0, [sp]
ldr r3, [sb, #8]
ldr r3, [r9, #8]
ldr r0, _02193164 ; =data_027e0ffc
ldr r1, _02193168 ; =0x00000247
add r2, sb, #0x48
add r2, r9, #0x48
bl func_ov00_020cec60
ldr r0, _0219316c ; =data_027e0f94
add r3, sp, #0x6c
@@ -3284,7 +3284,7 @@ _02192714:
mov r5, #0
add r4, sp, #0x54
_02192764:
add r0, sb, r5, lsl #2
add r0, r9, r5, lsl #2
ldr r0, [r0, #0x52c]
bl _ZN5Actor16XzDistanceToLinkEv
str r0, [r4, r5, lsl #2]
@@ -3331,7 +3331,7 @@ _021927dc:
_02192804:
ldr r7, [r5, r6, lsl #2]
mov r1, r11
add r0, sb, r7, lsl #2
add r0, r9, r7, lsl #2
ldr r8, [r0, #0x52c]
mov r0, r8
bl _ZN5Actor18func_ov00_020c1fc8Ej
@@ -3346,7 +3346,7 @@ _02192804:
_0219283c:
cmp r7, #2
bne _021928c0
add r1, sb, #0x100
add r1, r9, #0x100
ldr r0, [r8, #0x168]
ldrb r3, [r8, #0x158]
cmp r0, #7
@@ -3356,16 +3356,16 @@ _0219283c:
sub r2, r2, r3
strh r2, [r1, #0x20]
bl func_ov00_020c71fc
add r0, sb, #0x100
add r0, r9, #0x100
ldrsh r0, [r0, #0x20]
mov r3, #0
cmp r0, #0
bgt _021928a0
ldr r0, _02193164 ; =data_027e0ffc
ldr r1, _02193174 ; =0x00000191
add r2, sb, #0x48
add r2, r9, #0x48
bl func_ov00_020ceacc
mov r0, sb
mov r0, r9
mov r1, #5
bl func_ov48_021923f8
b _02192bd0
@@ -3374,7 +3374,7 @@ _021928a0:
add r2, r8, #0x48
mov r1, #0x190
bl func_ov00_020ceacc
mov r0, sb
mov r0, r9
mov r1, #3
bl func_ov48_021923f8
b _02192bd0
@@ -3406,7 +3406,7 @@ _02192900:
bne _02192a00
ldr r0, _02193164 ; =data_027e0ffc
mov r3, r4
add r2, sb, #0x48
add r2, r9, #0x48
mov r1, #0xf6
bl func_ov00_020ceacc
mov r0, r5
@@ -3424,7 +3424,7 @@ _02192940:
ldr r0, _02193164 ; =data_027e0ffc
ldr r1, _02193180 ; =0x0000019d
mov r3, r4
add r2, sb, #0x48
add r2, r9, #0x48
bl func_ov00_020ceacc
mov r0, r5
bl func_ov14_021231d4
@@ -3438,7 +3438,7 @@ _02192980:
ldr r1, _02193184 ; =0x41525257
cmp r2, r1
bne _02192a00
ldrsh r1, [sb, #0x78]
ldrsh r1, [r9, #0x78]
mov r2, #1
bl func_ov14_02120ac4
mov r4, #1
@@ -3453,7 +3453,7 @@ _021929b0:
bne _02192a00
bl func_ov14_02123904
ldr r0, _02193164 ; =data_027e0ffc
add r2, sb, #0x48
add r2, r9, #0x48
mov r1, #0xf6
mov r3, r4
bl func_ov00_020ceacc
@@ -3462,13 +3462,13 @@ _021929b0:
_021929ec:
ldr r0, _02193164 ; =data_027e0ffc
ldr r1, _0219318c ; =0x00000193
add r2, sb, #0x48
add r2, r9, #0x48
mov r3, #0
bl func_ov00_020ceacc
_02192a00:
cmp r4, #0
beq _02192bd0
mov r0, sb
mov r0, r9
mov r1, #4
bl func_ov48_021923f8
b _02192bd0
@@ -3501,7 +3501,7 @@ _02192a5c:
cmp r1, r0
bne _02192b4c
ldr r0, _02193164 ; =data_027e0ffc
add r2, sb, #0x48
add r2, r9, #0x48
mov r1, #0xf6
mov r3, #0
bl func_ov00_020ceacc
@@ -3518,7 +3518,7 @@ _02192a98:
bne _02192b4c
ldr r0, _02193164 ; =data_027e0ffc
ldr r1, _02193180 ; =0x0000019d
add r2, sb, #0x48
add r2, r9, #0x48
mov r3, #0
bl func_ov00_020ceacc
mov r0, r4
@@ -3532,7 +3532,7 @@ _02192ad4:
ldr r1, _02193184 ; =0x41525257
cmp r2, r1
bne _02192b4c
ldrsh r1, [sb, #0x78]
ldrsh r1, [r9, #0x78]
mov r2, #1
bl func_ov14_02120ac4
b _02192b4c
@@ -3546,7 +3546,7 @@ _02192b00:
bne _02192b4c
bl func_ov14_02123904
ldr r0, _02193164 ; =data_027e0ffc
add r2, sb, #0x48
add r2, r9, #0x48
mov r1, #0xf6
mov r3, #0
bl func_ov00_020ceacc
@@ -3554,11 +3554,11 @@ _02192b00:
_02192b38:
ldr r0, _02193164 ; =data_027e0ffc
ldr r1, _0219318c ; =0x00000193
add r2, sb, #0x48
add r2, r9, #0x48
mov r3, #0
bl func_ov00_020ceacc
_02192b4c:
mov r0, sb
mov r0, r9
mov r1, #4
bl func_ov48_021923f8
b _02192bd0
@@ -3576,7 +3576,7 @@ _02192b5c:
add r1, r8, #0x48
bl func_01ff9bf8
ldr r0, _02193170 ; =data_027e0f90
ldrb r1, [sb, #0x124]
ldrb r1, [r9, #0x124]
ldr r0, [r0]
add r2, sp, #0x38
ldr r4, [r0]
@@ -3585,7 +3585,7 @@ _02192b5c:
blx r4
cmp r0, #0
beq _02192bd0
mov r0, sb
mov r0, r9
mov r1, #0
bl func_ov48_021923f8
b _02192bd0
@@ -3594,23 +3594,23 @@ _02192bc4:
cmp r6, #3
blt _02192804
_02192bd0:
ldr r0, [sb, #0x130]
ldr r0, [r9, #0x130]
cmp r0, #3
bne _02192d10
ldr r0, [sb, #0x138]
ldr r0, [r9, #0x138]
cmp r0, #0xa
bge _02192ccc
ldr r1, [sb, #0x340]
ldr r0, [sb, #0x338]
ldr r1, [r9, #0x340]
ldr r0, [r9, #0x338]
add r0, r1, r0
bl func_02002c14
ldr r2, [sb, #0x33c]
ldr r2, [r9, #0x33c]
mov r0, #0xc
mla r0, r1, r0, r2
add r7, sp, #0x2c
ldmia r0, {r0, r1, r2}
stmia r7, {r0, r1, r2}
ldr r0, [sb, #0x340]
ldr r0, [r9, #0x340]
mov r8, #0
cmp r0, #0
ble _02192ccc
@@ -3620,12 +3620,12 @@ _02192bd0:
add r5, sp, #0x14
mov r4, r10
_02192c34:
ldr r1, [sb, #0x340]
ldr r0, [sb, #0x338]
ldr r1, [r9, #0x340]
ldr r0, [r9, #0x338]
add r0, r1, r0
sub r0, r0, r8
bl func_02002c14
ldr r0, [sb, #0x33c]
ldr r0, [r9, #0x33c]
mla r0, r1, r10, r0
ldmia r0, {r0, r1, r2}
stmia r6, {r0, r1, r2}
@@ -3638,13 +3638,13 @@ _02192c34:
mov r2, r7
mov r3, r6
bl func_01ff9e64
ldr r1, [sb, #0x340]
ldr r0, [sb, #0x338]
ldr r1, [r9, #0x340]
ldr r0, [r9, #0x338]
add r0, r1, r0
sub r0, r0, r8
bl func_02002c14
mul r2, r1, r4
ldr r3, [sb, #0x33c]
ldr r3, [r9, #0x33c]
ldr r1, [sp, #0x20]
add r0, r3, r2
str r1, [r3, r2]
@@ -3655,13 +3655,13 @@ _02192c34:
ldr r2, [sp, #0x28]
mov r8, r1, asr #0x10
str r2, [r0, #8]
ldr r0, [sb, #0x340]
ldr r0, [r9, #0x340]
cmp r0, r1, asr #16
bgt _02192c34
_02192ccc:
mov r0, sb
mov r0, r9
bl func_ov48_02192484
mov r2, sb
mov r2, r9
mov r0, #0
_02192cdc:
ldr r1, [r2, #0x4ac]
@@ -3680,16 +3680,16 @@ _02192cdc:
_02192d10:
cmp r0, #4
bne _02192e4c
add r0, sb, #0xac
add r1, sb, #0xe8
add r0, r9, #0xac
add r1, r9, #0xe8
add r6, r0, #0x400
add r7, r1, #0x400
mov r8, #0
mov r11, r6
add r10, sb, #0xdc
add r10, r9, #0xdc
add r4, sp, #8
_02192d38:
ldr r1, [sb, #0x138]
ldr r1, [r9, #0x138]
mov r0, r8, lsl #0x10
cmp r1, r0, asr #16
mov r2, r0, asr #0x10
@@ -3722,7 +3722,7 @@ _02192da4:
bne _02192de0
mov r2, r4
add r0, r10, #0x400
add r1, sb, #0x4d0
add r1, r9, #0x4d0
bl func_01ff9bf8
ldr r0, [sp, #8]
cmp r0, #0
@@ -3763,7 +3763,7 @@ _02192e18:
blt _02192d38
b _02192e84
_02192e4c:
mov r2, sb
mov r2, r9
mov r0, #0
_02192e54:
ldr r1, [r2, #0x4ac]
@@ -3779,7 +3779,7 @@ _02192e54:
add r2, r2, #0xc
blt _02192e54
_02192e84:
ldr r0, [sb, #0x130]
ldr r0, [r9, #0x130]
cmp r0, #5
addls pc, pc, r0, lsl #2
b _02193154
@@ -3791,92 +3791,92 @@ _02192e94: ; jump table
b _02192fc4 ; case 4
b _02192fe0 ; case 5
_02192eac:
mov r0, sb
mov r0, r9
bl func_ov48_021920f8
ldr r0, [sb, #0x138]
ldr r0, [r9, #0x138]
cmp r0, #0x14
ble _02193154
mov r0, sb
mov r0, r9
bl func_ov48_021923e8
cmp r0, #0
beq _02193154
mov r0, sb
mov r0, r9
mov r1, #1
bl func_ov48_021923f8
b _02193154
_02192ee0:
mov r0, sb
mov r0, r9
bl func_ov48_02192328
ldrb r0, [sb, #0x110]
ldrb r0, [r9, #0x110]
cmp r0, #0
ldreqb r0, [sb, #0x112]
ldreqb r0, [r9, #0x112]
cmpeq r0, #0
ldreqb r0, [sb, #0x113]
ldreqb r0, [r9, #0x113]
cmpeq r0, #0
beq _02192f14
mov r0, sb
mov r0, r9
mov r1, #0
bl func_ov48_021923f8
b _02193154
_02192f14:
ldr r0, [sb, #0x138]
ldr r0, [r9, #0x138]
cmp r0, #0x5a
ble _02192f30
mov r0, sb
mov r0, r9
mov r1, #0
bl func_ov48_021923f8
b _02193154
_02192f30:
cmp r0, #0x1e
ble _02193154
mov r0, sb
mov r0, r9
bl func_ov48_021923e8
cmp r0, #0
bne _02193154
mov r0, sb
mov r0, r9
mov r1, #0
bl func_ov48_021923f8
b _02193154
_02192f58:
mov r0, sb
mov r0, r9
bl func_ov48_02192354
ldrb r0, [sb, #0x110]
ldrb r0, [r9, #0x110]
cmp r0, #0
ldreqb r0, [sb, #0x112]
ldreqb r0, [r9, #0x112]
cmpeq r0, #0
ldreqb r0, [sb, #0x113]
ldreqb r0, [r9, #0x113]
cmpeq r0, #0
beq _02192f8c
mov r0, sb
mov r0, r9
mov r1, #0
bl func_ov48_021923f8
b _02193154
_02192f8c:
ldr r0, [sb, #0x138]
ldr r0, [r9, #0x138]
cmp r0, #0x5a
ble _02193154
mov r0, sb
mov r0, r9
mov r1, #0
bl func_ov48_021923f8
b _02193154
_02192fa8:
ldr r0, [sb, #0x138]
ldr r0, [r9, #0x138]
cmp r0, #0xa
ble _02193154
mov r0, sb
mov r0, r9
mov r1, #1
bl func_ov48_021923f8
b _02193154
_02192fc4:
ldr r0, [sb, #0x138]
ldr r0, [r9, #0x138]
cmp r0, #0xa
ble _02193154
mov r0, sb
mov r0, r9
mov r1, #0
bl func_ov48_021923f8
b _02193154
_02192fe0:
ldr r0, [sb, #0x138]
ldr r0, [r9, #0x138]
cmp r0, #0xa
bgt _02193010
bge _021930b4
@@ -3899,17 +3899,17 @@ _02193020:
b _02193154
_0219302c:
mov r1, #0
strb r1, [sb, #0x528]
strb r1, [r9, #0x528]
str r1, [sp]
ldr r0, _02193198 ; =data_027e0e58
str r1, [sp, #4]
add r1, sb, #0xdc
add r1, r9, #0xdc
ldr r0, [r0]
add r2, r1, #0x400
mov r1, #0x20c
mov r3, #2
bl func_ov00_0207c1b0
add r1, sb, #0xdc
add r1, r9, #0xdc
ldr r0, _02193164 ; =data_027e0ffc
add r2, r1, #0x400
mov r1, #0x248
@@ -3918,34 +3918,34 @@ _0219302c:
b _02193154
_02193074:
mov r1, #0
strb r1, [sb, #0x527]
strb r1, [r9, #0x527]
str r1, [sp]
ldr r0, _02193198 ; =data_027e0e58
str r1, [sp, #4]
ldr r0, [r0]
add r2, sb, #0x4d0
add r2, r9, #0x4d0
mov r1, #0x20c
mov r3, #2
bl func_ov00_0207c1b0
ldr r0, _02193164 ; =data_027e0ffc
add r2, sb, #0x4d0
add r2, r9, #0x4d0
mov r1, #0x248
mov r3, #0
bl func_ov00_020ceacc
b _02193154
_021930b4:
mov r1, #0
strb r1, [sb, #0x526]
strb r1, [r9, #0x526]
str r1, [sp]
ldr r0, _02193198 ; =data_027e0e58
str r1, [sp, #4]
add r1, sb, #0xc4
add r1, r9, #0xc4
ldr r0, [r0]
add r2, r1, #0x400
mov r1, #0x20c
mov r3, #2
bl func_ov00_0207c1b0
add r1, sb, #0xc4
add r1, r9, #0xc4
ldr r0, _02193164 ; =data_027e0ffc
add r2, r1, #0x400
mov r1, #0x248
@@ -3954,17 +3954,17 @@ _021930b4:
b _02193154
_021930fc:
mov r1, #0
strb r1, [sb, #0x525]
strb r1, [r9, #0x525]
str r1, [sp]
ldr r0, _02193198 ; =data_027e0e58
str r1, [sp, #4]
add r1, sb, #0xb8
add r1, r9, #0xb8
ldr r0, [r0]
add r2, r1, #0x400
mov r1, #0x20c
mov r3, #2
bl func_ov00_0207c1b0
add r1, sb, #0xb8
add r1, r9, #0xb8
ldr r0, _02193164 ; =data_027e0ffc
add r2, r1, #0x400
mov r1, #0x248
@@ -3973,13 +3973,13 @@ _021930fc:
b _02193154
_02193144:
mov r1, #0
mov r0, sb
strb r1, [sb, #0x524]
mov r0, r9
strb r1, [r9, #0x524]
bl func_ov00_020cc180
_02193154:
mov r0, #1
add sp, sp, #0x88
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov48_02192604
_02193160: .word gItemManager
@@ -4001,7 +4001,7 @@ _02193198: .word data_027e0e58
.global func_ov48_0219319c
arm_func_start func_ov48_0219319c
func_ov48_0219319c: ; 0x0219319c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x90
mov r10, r0
add r0, r10, #0xe8
@@ -4009,7 +4009,7 @@ func_ov48_0219319c: ; 0x0219319c
add r8, r0, #0x400
add r0, r10, #0xac
ldr r6, _02193358 ; =data_02050f54
mov sb, r8
mov r9, r8
str r1, [sp, #0x84]
str r1, [sp, #0x88]
str r1, [sp, #0x8c]
@@ -4049,7 +4049,7 @@ _02193240:
mla r0, r1, r0, r4
cmp r7, #4
bne _021932c4
mov r1, sb
mov r1, r9
add r2, sp, #0x54
bl func_01ff9bf8
ldr r0, [sp, #0x54]
@@ -4078,7 +4078,7 @@ _02193240:
blx ip
b _02193330
_021932c4:
mov r1, sb
mov r1, r9
add r2, sp, #0x24
bl func_01ff9bf8
ldr r0, [sp, #0x24]
@@ -4107,7 +4107,7 @@ _021932c4:
blx ip
_02193330:
add r8, r8, #0xc
add sb, sb, #0xc
add r9, r9, #0xc
add r0, r7, #1
mov r0, r0, lsl #0x10
mov r7, r0, asr #0x10
@@ -4115,7 +4115,7 @@ _02193330:
blt _021931dc
mov r0, #1
add sp, sp, #0x90
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov48_0219319c
_02193358: .word data_02050f54
@@ -4477,7 +4477,7 @@ func_ov48_02193644: ; 0x02193644
.global func_ov48_02193658
arm_func_start func_ov48_02193658
func_ov48_02193658: ; 0x02193658
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x26c
mov r10, r0
str r1, [sp, #0xc]
@@ -4534,7 +4534,7 @@ _02193714:
blt _02193704
add r4, r10, #0x100
ldrh r0, [r4, #0x5e]
mov sb, #0
mov r9, #0
mov r1, r0, lsl #0x1
cmp r1, #0
ble _021937b8
@@ -4544,7 +4544,7 @@ _02193714:
add r7, r10, #0x16c
add r5, sp, #0xac
_02193758:
add r0, sb, #1
add r0, r9, #1
add r1, sp, #0xb8
mov r3, r5
mov r0, r0, lsl #0xb
@@ -4561,11 +4561,11 @@ _02193758:
add r1, r7, r6
mov r2, r5
bl func_ov00_0207c518
add r0, sb, #1
add r0, r9, #1
mov r0, r0, lsl #0x10
mov sb, r0, asr #0x10
mov r9, r0, asr #0x10
ldrh r0, [r4, #0x5e]
cmp sb, r0, lsl #1
cmp r9, r0, lsl #1
mov r1, r0, lsl #0x1
blt _02193758
_021937b8:
@@ -4573,7 +4573,7 @@ _021937b8:
cmp r0, #1
bne _02193848
cmp r1, #0
mov sb, #0
mov r9, #0
ble _02193848
mov r0, #0xc
mul r6, r8, r0
@@ -4582,7 +4582,7 @@ _021937b8:
add r4, r10, #0x100
add r5, sp, #0xac
_021937e8:
add r0, sb, #1
add r0, r9, #1
mov r0, r0, lsl #0xb
add r1, sp, #0xb8
mov r3, r5
@@ -4600,11 +4600,11 @@ _021937e8:
add r1, r7, r6
mov r2, r5
bl func_ov00_0207c518
add r0, sb, #1
add r0, r9, #1
mov r0, r0, lsl #0x10
mov sb, r0, asr #0x10
mov r9, r0, asr #0x10
ldrh r0, [r4, #0x5e]
cmp sb, r0, lsl #1
cmp r9, r0, lsl #1
blt _021937e8
_02193848:
ldr r1, [r10, #0x48]
@@ -4701,14 +4701,14 @@ _02193924:
ldrsh r7, [r1, r6]
add r6, r8, #1
mov r6, r6, lsl #0x1
smull sb, r8, r7, r4
adds r7, sb, #0x800
smull r9, r8, r7, r4
adds r7, r9, #0x800
ldrsh r1, [r1, r6]
mov sb, r7, lsr #0xc
mov r9, r7, lsr #0xc
adc r8, r8, #0
smull r7, r6, r1, r4
orr sb, sb, r8, lsl #20
add r0, r0, sb
orr r9, r9, r8, lsl #20
add r0, r0, r9
adds r1, r7, #0x800
str r0, [r10, #0x1cc]
adc r0, r6, #0
@@ -4766,11 +4766,11 @@ _02193924:
sub r0, r3, #0x1800
ldr r7, [sp, #0xa0]
sub r1, r5, #1
umull sb, r8, r7, r0
umull r9, r8, r7, r0
mla r8, r7, r1, r8
mov r1, r7, asr #0x1f
mla r8, r1, r0, r8
adds r7, sb, #0x800
adds r7, r9, #0x800
ldr r6, [sp, #0xa4]
adc r3, r8, #0
mov r7, r7, lsr #0xc
@@ -4857,12 +4857,12 @@ _02193bd4:
cmp r0, #0
ble _02193d10
ldr r11, _02193f40 ; =data_027e0fe4
mov sb, r5
mov r9, r5
add r4, sp, #0x84
_02193c18:
ldr r1, [sp, #0x198]
ldr r0, [r11]
add r1, r1, sb
add r1, r1, r9
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r6, r0
beq _02193cfc
@@ -4920,7 +4920,7 @@ _02193cec:
mov r0, r6
bl func_ov14_02122e98
_02193cfc:
add sb, sb, #8
add r9, r9, #8
add r5, r5, #1
ldr r0, [sp, #0x1a0]
cmp r5, r0
@@ -4963,14 +4963,14 @@ _02193d68:
mov r5, #0
cmp r0, #0
ble _02193ea0
mov sb, r5
mov r9, r5
add r4, sp, #0x74
mov r11, #1
_02193dac:
ldr r0, _02193f40 ; =data_027e0fe4
ldr r1, [sp, #0xc4]
ldr r0, [r0]
add r1, r1, sb
add r1, r1, r9
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r6, r0
beq _02193e8c
@@ -5026,7 +5026,7 @@ _02193e84:
cmp r7, #0
strneb r11, [r6, #0x180]
_02193e8c:
add sb, sb, #8
add r9, r9, #8
add r5, r5, #1
ldr r0, [sp, #0xcc]
cmp r5, r0
@@ -5070,7 +5070,7 @@ _02193f10:
add r2, r10, #0x48
bl func_ov00_0207a1c8
add sp, sp, #0x26c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov48_02193658
_02193f28: .word data_02050f54
+7 -7
View File
@@ -1814,7 +1814,7 @@ _02196d90: .word data_027e0fc8
.global func_ov50_02196d94
arm_func_start func_ov50_02196d94
func_ov50_02196d94: ; 0x02196d94
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x8c
mov r5, #0xff
sub r4, r5, #0x100
@@ -1863,9 +1863,9 @@ func_ov50_02196d94: ; 0x02196d94
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
mov r8, r0
cmp r8, #0
mov sb, r7
mov r9, r7
addle sp, sp, #0x8c
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r4, _02196edc ; =0x42494752
ldr r5, _02196ed8 ; =data_027e0fe4
add r10, sp, #0x34
@@ -1888,14 +1888,14 @@ _02196e74:
mov r2, #0
bl func_ov50_021960c8
add sp, sp, #0x8c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02196ebc:
add sb, sb, #1
cmp sb, r8
add r9, r9, #1
cmp r9, r8
add r10, r10, #8
blt _02196e74
add sp, sp, #0x8c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov50_02196d94
_02196ed4: .word data_ov50_021989f0
+51 -51
View File
@@ -1114,7 +1114,7 @@ _021962ac:
.global func_ov51_021962b4
arm_func_start func_ov51_021962b4
func_ov51_021962b4: ; 0x021962b4
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x2c
mov r10, r0
ldr r0, [r10, #0x2f8]
@@ -1138,7 +1138,7 @@ func_ov51_021962b4: ; 0x021962b4
bgt _02196470
ldr r5, _021964f4 ; =data_027e0e58
mov r8, r10
add sb, r10, #0x490
add r9, r10, #0x490
mov r7, #0
add r6, sp, #0x20
mov r4, #0xc
@@ -1169,7 +1169,7 @@ _02196324:
add r1, r1, #0x85
add r1, r1, #0x300
str r1, [sp, #0x24]
mov r1, sb
mov r1, r9
mov r2, r6
bl func_ov00_0207c474
add r0, r7, #1
@@ -1177,13 +1177,13 @@ _02196324:
mov r7, r0, asr #0x10
cmp r7, #3
add r8, r8, #0xc
add sb, sb, #0xc
add r9, r9, #0xc
blt _02196324
add r0, r10, #0x6c
ldr r11, _021964f8 ; =0x000004cd
ldr r4, _021964fc ; =data_027e0f90
mov r8, r10
add sb, r0, #0x400
add r9, r0, #0x400
mov r7, #0
add r6, sp, #0x14
add r5, sp, #4
@@ -1192,7 +1192,7 @@ _021963d4:
ldr r0, _02196500 ; =data_027e0f94
str r1, [sp, #4]
ldr r2, [r8, #0x470]
mov r1, sb
mov r1, r9
str r2, [sp, #8]
ldr r3, [r8, #0x474]
mov r2, r6
@@ -1225,7 +1225,7 @@ _02196450:
mov r7, r0, asr #0x10
cmp r7, #3
add r8, r8, #0xc
add sb, sb, #0xc
add r9, r9, #0xc
blt _021963d4
b _02196498
_02196470:
@@ -1266,7 +1266,7 @@ _021964e0:
bl func_ov51_02196004
mov r0, #1
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_021962b4
_021964f4: .word data_027e0e58
@@ -1279,14 +1279,14 @@ _02196508: .word 0x00000262
.global func_ov51_0219650c
arm_func_start func_ov51_0219650c
func_ov51_0219650c: ; 0x0219650c
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
mov r10, r0
add r0, r10, #0x6c
add r0, r0, #0x400
ldr r5, _021965b8 ; =0x000004cd
add r8, r10, #0x18
add sb, r0, #0x18
add r9, r0, #0x18
mov r7, #2
add r6, sp, #0x18
mov r4, #0x1f
@@ -1310,19 +1310,19 @@ _0219653c:
str r11, [sp, #0x10]
ldr r0, _021965bc ; =data_ov00_020e9370
mov r1, #0
mov r2, sb
mov r2, r9
mov r3, r5
str r11, [sp, #0x14]
bl func_ov05_02102c2c
sub r0, r7, #1
mov r0, r0, lsl #0x10
sub r8, r8, #0xc
sub sb, sb, #0xc
sub r9, r9, #0xc
movs r7, r0, asr #0x10
bpl _0219653c
mov r0, #1
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_0219650c
_021965b8: .word 0x000004cd
@@ -1599,7 +1599,7 @@ _02196920: .word data_ov51_02198918
.global func_ov51_02196924
arm_func_start func_ov51_02196924
func_ov51_02196924: ; 0x02196924
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x68
ldr r2, _02196b38 ; =func_ov51_02196b4c
ldr r3, _02196b3c ; =func_ov51_02196b50
@@ -1683,33 +1683,33 @@ func_ov51_02196924: ; 0x02196924
str r3, [sp, #0x14]
str ip, [sp, #0x18]
str r11, [sp, #0x10]
ldr sb, [sp, #0xc]
ldr r9, [sp, #0xc]
add r1, r7, #1
smull r2, r7, sb, r0
smull r2, r7, r9, r0
adds r8, r2, #0x800
mov r1, r1, lsl #0x1
ldrsh r6, [r5, r1]
ldr r10, [sp, #8]
ldr r1, [sp, #4]
add r3, r3, r10
smull r5, r2, sb, r6
smull r5, r2, r9, r6
adc r7, r7, #0
adds r5, r5, #0x800
mov r8, r8, lsr #0xc
orr r8, r8, r7, lsl #20
smull r10, r6, r1, r6
adc sb, r2, #0
adc r9, r2, #0
mov r5, r5, lsr #0xc
sub r7, lr, #0x8000
rsb r0, r0, #0
adds r2, r10, #0x800
orr r5, r5, sb, lsl #20
smull r10, sb, r1, r0
orr r5, r5, r9, lsl #20
smull r10, r9, r1, r0
adc r0, r6, #0
adds r6, r10, #0x800
mov r10, r2, lsr #0xc
mov r2, r6, lsr #0xc
adc r1, sb, #0
adc r1, r9, #0
orr r10, r10, r0, lsl #20
add r6, r11, r8
add r6, r6, r10
@@ -1731,7 +1731,7 @@ func_ov51_02196924: ; 0x02196924
bl func_0204f754
mov r0, #1
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_02196924
_02196b38: .word func_ov51_02196b4c
@@ -1985,21 +1985,21 @@ func_ov51_02196dec: ; 0x02196dec
.global func_ov51_02196e18
arm_func_start func_ov51_02196e18
func_ov51_02196e18: ; 0x02196e18
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
ldr r1, _02196f00 ; =data_027e0f94
add r8, sp, #0x24
mov r10, r0
ldmia r1, {r0, r1, r2}
mov sb, #0
mov r9, #0
stmia r8, {r0, r1, r2}
ldr r4, _02196f04 ; =data_027e0e60
mov r5, sb
mov r5, r9
mov r7, #0xa000
mov r6, #0x800
mov r11, #0x2000
_02196e4c:
mov r1, sb
mov r1, r9
mov r2, r6
add r0, r10, #0x48
mov r3, r11
@@ -2033,18 +2033,18 @@ _02196e4c:
movne r0, #0
cmp r0, #0
addne sp, sp, #0x30
strne sb, [r10, #0x74]
strne r9, [r10, #0x74]
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02196ee0:
add r0, sb, #1
add r0, r9, #1
mov r0, r0, lsl #0x10
mov sb, r0, asr #0x10
cmp sb, #4
mov r9, r0, asr #0x10
cmp r9, #4
blt _02196e4c
mov r0, #0
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_02196e18
_02196f00: .word data_027e0f94
@@ -3187,7 +3187,7 @@ _02197df4:
.global func_ov51_02197e08
arm_func_start func_ov51_02197e08
func_ov51_02197e08: ; 0x02197e08
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x90
mov r4, r0
cmp r1, #0
@@ -3195,7 +3195,7 @@ func_ov51_02197e08: ; 0x02197e08
ldreqb r0, [r4, #0xa4]
cmp r0, #0
addeq sp, sp, #0x90
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, #0x1000
str r0, [sp, #0x84]
str r0, [sp, #0x88]
@@ -3262,13 +3262,13 @@ _02197f0c:
str r1, [sp, #0x54]
str r0, [sp, #0x5c]
_02197f1c:
mov sb, #0
str sb, [sp, #0x58]
mov r9, #0
str r9, [sp, #0x58]
add r5, r4, #0x100
ldrh r0, [r5, #0xe6]
cmp r0, #0
ble _02197f94
mov r10, sb
mov r10, r9
add r8, r4, #0x48
add r7, sp, #0x48
add r6, sp, #0x54
@@ -3289,9 +3289,9 @@ _02197f48:
mov r3, r7
blx ip
ldrh r0, [r5, #0xe6]
add sb, sb, #1
add r9, r9, #1
add r10, r10, #0x1000
cmp sb, r0
cmp r9, r0
blt _02197f48
_02197f94:
add r0, r4, #0x48
@@ -3326,7 +3326,7 @@ _02197f94:
mov r3, r3, lsl #0xb
bl func_ov05_02102c2c
add sp, sp, #0x90
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_02197e08
_02198018: .word data_02050f54
@@ -3336,15 +3336,15 @@ _02198020: .word data_ov00_020e9370
.global func_ov51_02198024
arm_func_start func_ov51_02198024
func_ov51_02198024: ; 0x02198024
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
ldr r4, [sb, #0x48]
ldr r5, [sb, #0x50]
ldr r0, [sb, #0x74]
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r9, r0
ldr r4, [r9, #0x48]
ldr r5, [r9, #0x50]
ldr r0, [r9, #0x74]
mov r8, r1
mov r6, r4
mov r7, r5
ldr r10, [sb, #0x4c]
ldr r10, [r9, #0x4c]
bl func_0202bb98
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -3355,7 +3355,7 @@ _02198058: ; jump table
b _02198128 ; case 2
b _021980e8 ; case 3
_02198068:
add r0, sb, #0x100
add r0, r9, #0x100
ldrh r0, [r0, #0xe6]
ldr r1, _02198180 ; =0x000004cd
sub r5, r5, #0xcd
@@ -3372,7 +3372,7 @@ _02198068:
sub r6, r6, #0x400
b _02198164
_021980a8:
add r0, sb, #0x100
add r0, r9, #0x100
ldrh r1, [r0, #0xe6]
ldr r0, _02198180 ; =0x000004cd
sub r5, r5, #0xcd
@@ -3389,7 +3389,7 @@ _021980a8:
sub r6, r6, r0
b _02198164
_021980e8:
add r0, sb, #0x100
add r0, r9, #0x100
ldrh r1, [r0, #0xe6]
ldr r0, _02198180 ; =0x000004cd
sub r4, r4, #0xcd
@@ -3406,7 +3406,7 @@ _021980e8:
sub r7, r7, r0
b _02198164
_02198128:
add r0, sb, #0x100
add r0, r9, #0x100
ldrh r0, [r0, #0xe6]
ldr r1, _02198180 ; =0x000004cd
sub r4, r4, #0xcd
@@ -3428,7 +3428,7 @@ _02198164:
add r0, r10, #0x800
str r0, [r8, #0x10]
str r7, [r8, #0x14]
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov51_02198024
_02198180: .word 0x000004cd
+12 -12
View File
@@ -724,15 +724,15 @@ func_ov52_02195d9c: ; 0x02195d9c
.global func_ov52_02195da0
arm_func_start func_ov52_02195da0
func_ov52_02195da0: ; 0x02195da0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x3c
ldr r2, _02196104 ; =data_027e0618
mov sb, r0
mov r9, r0
ldrb r0, [r2, #0x101]
mov r4, r1
cmp r0, #0
addne sp, sp, #0x3c
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
ldr r0, _02196108 ; =data_027e0f74
ldr r0, [r0]
bl func_ov00_02097738
@@ -742,12 +742,12 @@ func_ov52_02195da0: ; 0x02195da0
ldr r0, [r0, #0x130]
cmp r0, #0
addeq sp, sp, #0x3c
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02195dec:
ldrh r0, [r4]
tst r0, #2
addeq sp, sp, #0x3c
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
add r0, sp, #0x1c
bl func_01ffbe34
mov r1, #0
@@ -772,7 +772,7 @@ _02195dec:
mov r0, #0x6b
mov r1, #0x10
bl func_0203493c
ldrb r0, [sb, #0xd]
ldrb r0, [r9, #0xd]
mov r4, #1
mov r6, #6
cmp r0, #0
@@ -790,10 +790,10 @@ _02195dec:
mov r7, #0xf
mov r8, r4
_02195ea0:
ldrsh r0, [sb, #0xe]
ldrsh r0, [r9, #0xe]
add r0, r0, #1
strh r0, [sb, #0xe]
ldrsh r0, [sb, #0xe]
strh r0, [r9, #0xe]
ldrsh r0, [r9, #0xe]
cmp r0, #0xa
ble _02195eec
cmp r0, #0xb
@@ -804,11 +804,11 @@ _02195ea0:
mov r1, #0xc0
bl func_ov00_020d77e4
_02195ed4:
ldrsh r0, [sb, #0xe]
ldrsh r0, [r9, #0xe]
mov r4, #1
cmp r0, #0x22
movgt r0, #0
strgth r0, [sb, #0xe]
strgth r0, [r9, #0xe]
b _02195ef4
_02195eec:
cmp r0, #0
@@ -946,7 +946,7 @@ _02195ff8:
mov r3, #0xd
bl func_02034bc8
add sp, sp, #0x3c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov52_02195da0
_02196104: .word data_027e0618
+12 -12
View File
@@ -435,13 +435,13 @@ _021991e8: .word 0x00007a29
.global func_ov53_021991ec
arm_func_start func_ov53_021991ec
func_ov53_021991ec: ; 0x021991ec
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x2c
ldr r5, _02199304 ; =data_ov53_0219a580
mov r10, r0
ldrh sb, [r5, #0x42]
ldrh r9, [r5, #0x42]
ldrh r0, [r5, #0x40]
cmp sb, r0
cmp r9, r0
bge _02199280
ldr r8, _02199308 ; =data_ov53_0219a5bc
ldr r4, _0219930c ; =data_027e0e60
@@ -449,7 +449,7 @@ func_ov53_021991ec: ; 0x021991ec
mov r11, #2
add r7, sp, #4
_02199220:
add r0, r8, sb, lsl #1
add r0, r8, r9, lsl #1
ldrb r3, [r0, #8]
ldrb r2, [r0, #9]
ldr r0, [r4]
@@ -471,16 +471,16 @@ _02199220:
bl func_ov00_020be9e4
_02199270:
ldrh r0, [r5, #0x40]
add sb, sb, #1
cmp sb, r0
add r9, r9, #1
cmp r9, r0
blt _02199220
_02199280:
ldr sb, _02199304 ; =data_ov53_0219a580
ldrh r7, [sb, #0x6e]
ldrh r0, [sb, #0x6c]
ldr r9, _02199304 ; =data_ov53_0219a580
ldrh r7, [r9, #0x6e]
ldrh r0, [r9, #0x6c]
cmp r7, r0
addge sp, sp, #0x2c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r6, _02199310 ; =data_ov53_0219a5e4
ldr r8, _02199314 ; =data_027e0fe4
add r4, sp, #0x10
@@ -504,12 +504,12 @@ _021992a8:
ldmia r4, {r1, r2, r3}
bl func_ov00_020be9e4
_021992ec:
ldrh r0, [sb, #0x6c]
ldrh r0, [r9, #0x6c]
add r7, r7, #1
cmp r7, r0
blt _021992a8
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov53_021991ec
_02199304: .word data_ov53_0219a580
+9 -9
View File
@@ -544,7 +544,7 @@ _021993b4: .word data_027e0fcc
.global func_ov55_021993b8
arm_func_start func_ov55_021993b8
func_ov55_021993b8: ; 0x021993b8
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x13c
mov r4, r0
mvn r1, #0
@@ -586,7 +586,7 @@ func_ov55_021993b8: ; 0x021993b8
cmp r0, #0
bne _021994d4
ldr r0, _02199640 ; =data_027e0e60
ldr sb, [sp, #0x1c]
ldr r9, [sp, #0x1c]
ldr r7, [sp, #0x20]
ldr r10, [sp, #0x18]
mov r6, #1
@@ -594,9 +594,9 @@ func_ov55_021993b8: ; 0x021993b8
ldr r0, [r0]
add r1, sp, #0xc
mov r2, r6
add r8, sb, #0x1800
add r8, r9, #0x1800
str r10, [sp, #0xc]
str sb, [sp, #0x10]
str r9, [sp, #0x10]
str r3, [sp, #0x14]
bl func_ov00_02083f44
cmp r0, r8
@@ -608,7 +608,7 @@ func_ov55_021993b8: ; 0x021993b8
add r1, sp, #0
mov r2, r6
str r10, [sp]
str sb, [sp, #4]
str r9, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083f44
cmp r0, r8
@@ -635,7 +635,7 @@ _021994d4:
str r0, [sp, #0xe0]
ldr r0, [sp, #0x58]
ldr r10, _02199648 ; =0x0000038e
mov sb, #0xf000
mov r9, #0xf000
mov r7, #0x1000
str r6, [sp, #0xc8]
ldr r6, [sp, #0x50]
@@ -676,12 +676,12 @@ _021994d4:
add r1, sp, #0x8c
str r6, [sp, #0x114]
str r10, [sp, #0x30]
str sb, [sp, #0x3c]
str r9, [sp, #0x3c]
str r8, [sp, #0x48]
str r7, [sp, #0x44]
str r8, [sp, #0x40]
str r10, [sp, #0xc4]
str sb, [sp, #0xd0]
str r9, [sp, #0xd0]
str r8, [sp, #0xd4]
str r7, [sp, #0xd8]
str r8, [sp, #0xdc]
@@ -705,7 +705,7 @@ _021994d4:
strb r2, [r1, #0x2a]
bl func_ov00_0209a508
add sp, sp, #0x13c
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov55_021993b8
_02199638: .word data_027e0f64
+12 -12
View File
@@ -1186,13 +1186,13 @@ _02199c74: .word 0x00002ccd
.global func_ov57_02199c78
arm_func_start func_ov57_02199c78
func_ov57_02199c78: ; 0x02199c78
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x20
mov r10, r0
ldr r11, _02199d4c ; =data_027e0e60
mov r7, r10
add r8, r10, #0x2c
add sb, r10, #0x24
add r9, r10, #0x24
mov r6, #0
add r4, sp, #4
add r5, sp, #0x14
@@ -1222,7 +1222,7 @@ _02199cb8:
b _02199d2c
_02199cf8:
ldr r0, _02199d50 ; =data_027e0fe4
mov r1, sb
mov r1, r9
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
@@ -1239,10 +1239,10 @@ _02199d2c:
cmp r6, #2
add r7, r7, #0x1c
add r8, r8, #0x1c
add sb, sb, #0x1c
add r9, r9, #0x1c
blt _02199ca0
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov57_02199c78
_02199d4c: .word data_027e0e60
@@ -1882,14 +1882,14 @@ _0219a5a8: .word data_ov57_0219ab28
.global func_ov57_0219a5ac
arm_func_start func_ov57_0219a5ac
func_ov57_0219a5ac: ; 0x0219a5ac
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov r10, r0
bl func_ov57_02199ecc
add r1, r10, #0x100
ldrsh r2, [r1, #0x64]
add r1, sp, #0
mov sb, r0
mov r9, r0
bl func_ov57_0219939c
cmp r0, #0
beq _0219a664
@@ -1918,11 +1918,11 @@ _0219a5ec:
sub r2, r2, #0x8000
strh r2, [r1, #0x70]
mov r0, r7
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0219a63c:
strh r6, [r4, #0x68]
ldrsh r2, [r5]
mov r0, sb
mov r0, r9
mov r1, r8
add r2, r2, #1
strh r2, [r5]
@@ -1931,7 +1931,7 @@ _0219a63c:
cmp r0, #0
bne _0219a5ec
_0219a664:
mov r0, sb
mov r0, r9
bl func_ov14_0213dda0
cmp r0, #1
blt _0219a698
@@ -1942,7 +1942,7 @@ _0219a664:
ldr r1, _0219a6b4 ; =0x00000b33
mov r2, #1
mov r0, r10
strb r2, [sb, #0x69]
strb r2, [r9, #0x69]
bl func_ov14_02123e1c
_0219a698:
mov r0, r10
@@ -1950,7 +1950,7 @@ _0219a698:
bl func_ov14_02123e48
mov r0, #0
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov57_0219a5ac
_0219a6b0: .word 0x00000666
+26 -26
View File
@@ -2085,7 +2085,7 @@ _02199eec: .word 0x00001333
arm_func_start func_ov58_02199ef0
func_ov58_02199ef0: ; 0x02199ef0
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
ldr r0, _02199fd4 ; =data_027e0e60
ldrb r1, [sp, #0x4c]
@@ -2099,13 +2099,13 @@ func_ov58_02199ef0: ; 0x02199ef0
bl func_ov00_02083c7c
mov r8, #0
ldr r4, _02199fd4 ; =data_027e0e60
mov sb, r8
mov r9, r8
add r5, sp, #0xc
mov r7, r8
mov r11, #0x400
add r6, sp, #0
_02199f40:
mov r1, sb, lsl #0x10
mov r1, r9, lsl #0x10
mov r0, r6
mov r1, r1, asr #0x10
str r7, [sp]
@@ -2137,11 +2137,11 @@ _02199fa4:
_02199fb0:
add r8, r8, #1
cmp r8, #4
add sb, sb, #0x4000
add r9, r9, #0x4000
blt _02199f40
mov r0, r10
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
add sp, sp, #0x10
bx lr
.align 2, 0
@@ -2202,7 +2202,7 @@ _0219a080: .word data_ov58_0219afc0
arm_func_start func_ov58_0219a084
func_ov58_0219a084: ; 0x0219a084
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xcc
ldr r0, _0219a3a8 ; =data_027e0e60
ldrb r1, [sp, #0xf4]
@@ -2217,13 +2217,13 @@ func_ov58_0219a084: ; 0x0219a084
mov r8, #0
ldr r4, _0219a3a8 ; =data_027e0e60
add r10, sp, #0x3c
mov sb, r8
mov r9, r8
mov r7, r8
mov r6, #0x400
add r5, sp, #0x24
mov r11, r8
_0219a0d8:
mov r1, sb, lsl #0x10
mov r1, r9, lsl #0x10
mov r0, r5
mov r1, r1, asr #0x10
str r7, [sp, #0x24]
@@ -2245,7 +2245,7 @@ _0219a0d8:
mov r2, r11
bl func_ov00_02083f44
str r0, [r10, #4]
add sb, sb, #0x4000
add r9, r9, #0x4000
add r10, r10, #0xc
add r8, r8, #1
cmp r8, #4
@@ -2293,7 +2293,7 @@ _0219a0d8:
cmp r0, #0
addne sp, sp, #0xcc
movne r0, #7
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
addne sp, sp, #0x10
bxne lr
mov r0, #0x200
@@ -2315,7 +2315,7 @@ _0219a0d8:
cmp r0, #0
addne sp, sp, #0xcc
movne r0, #7
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
addne sp, sp, #0x10
bxne lr
mov r0, #0x200
@@ -2337,7 +2337,7 @@ _0219a0d8:
cmp r0, #0
addne sp, sp, #0xcc
movne r0, #7
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
addne sp, sp, #0x10
bxne lr
mov r0, #0x200
@@ -2360,7 +2360,7 @@ _0219a0d8:
movne r0, #7
add sp, sp, #0xcc
moveq r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
add sp, sp, #0x10
bx lr
_0219a308:
@@ -2373,7 +2373,7 @@ _0219a308:
movlt r0, #4
add sp, sp, #0xcc
movge r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
add sp, sp, #0x10
bx lr
_0219a338:
@@ -2386,7 +2386,7 @@ _0219a338:
movlt r0, #3
add sp, sp, #0xcc
movge r0, #2
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
add sp, sp, #0x10
bx lr
_0219a368:
@@ -2403,7 +2403,7 @@ _0219a368:
movne r0, #5
moveq r0, #7
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
add sp, sp, #0x10
bx lr
.align 2, 0
@@ -2652,19 +2652,19 @@ _0219a698: .word data_027e0c38
.global func_ov58_0219a69c
arm_func_start func_ov58_0219a69c
func_ov58_0219a69c: ; 0x0219a69c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r1, _0219a768 ; =data_027e077c
mov r10, r0
ldr r0, [r1]
mov sb, #0
mov r9, #0
cmp r0, #0xd
bne _0219a760
mov r6, sb
mov r6, r9
mov r8, r10
add r7, r10, #8
mov r11, sb
mov r11, r9
mov r4, #1
mov r5, sb
mov r5, r9
_0219a6d0:
mov r0, r7
ldr ip, [r0]
@@ -2689,7 +2689,7 @@ _0219a718:
cmp r0, #0
beq _0219a74c
_0219a724:
cmp sb, #0
cmp r9, #0
bne _0219a740
ldrh r1, [r8, #0x12]
mov r0, r10
@@ -2697,10 +2697,10 @@ _0219a724:
cmp r0, #0
beq _0219a748
_0219a740:
mov sb, r4
mov r9, r4
b _0219a74c
_0219a748:
mov sb, r11
mov r9, r11
_0219a74c:
add r6, r6, #1
cmp r6, #3
@@ -2708,8 +2708,8 @@ _0219a74c:
add r8, r8, #0x18
blt _0219a6d0
_0219a760:
mov r0, sb
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, r9
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov58_0219a69c
_0219a768: .word data_027e077c
+47 -47
View File
@@ -1421,7 +1421,7 @@ _0219a0a8: .word data_027e1038
.global func_ov59_0219a0ac
arm_func_start func_ov59_0219a0ac
func_ov59_0219a0ac: ; 0x0219a0ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x220
mov r10, r0
bl func_ov59_02198e2c
@@ -1433,7 +1433,7 @@ func_ov59_0219a0ac: ; 0x0219a0ac
movne r2, #1
cmp r2, #0
addne sp, sp, #0x220
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r10, #0x2f4]
ldr r0, _0219a9e8 ; =gItemManager
ldr r4, [r1, #8]
@@ -1442,7 +1442,7 @@ func_ov59_0219a0ac: ; 0x0219a0ac
bl _ZNK11ItemManager18func_ov00_020ad538Ei
cmp r4, r0
addeq sp, sp, #0x220
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r0, [r10, #0x3c2]
cmp r0, #0
bne _0219a4ec
@@ -1468,7 +1468,7 @@ func_ov59_0219a0ac: ; 0x0219a0ac
ldr r2, _0219a9f8 ; =data_02050f54
str r7, [sp, #0x7c]
ldr r0, [r10, #0x4c]
mov sb, #1
mov r9, #1
str r0, [sp, #0x80]
ldr r6, [r10, #0x50]
add r0, sp, #0x7c
@@ -1505,7 +1505,7 @@ func_ov59_0219a0ac: ; 0x0219a0ac
orr r2, r2, r1, lsl #20
add r1, r6, r2
str r1, [r0, #8]
rsb r5, sb, #0x10000
rsb r5, r9, #0x10000
str ip, [sp, #0x98]
str ip, [sp, #0x8c]
str ip, [sp, #0x80]
@@ -1554,7 +1554,7 @@ _0219a24c:
mov r4, #0
str r5, [sp, #8]
ldr r5, [r10, #0xa0]
movne sb, #0
movne r9, #0
str r5, [sp, #0xc]
str r4, [sp, #0x10]
bl func_01ffbf5c
@@ -1656,7 +1656,7 @@ _0219a3f8:
stmia sp, {r2, ip}
ldrh ip, [r10, #0x9c]
mov r2, r6
movne sb, #0
movne r9, #0
str ip, [sp, #8]
ldr ip, [r10, #0xa0]
str ip, [sp, #0xc]
@@ -1668,11 +1668,11 @@ _0219a3f8:
ldr r1, [sp, #0x164]
ldr r0, [sp, #0x168]
str r2, [sp, #0x88]
mov sb, #0
mov r9, #0
str r1, [sp, #0x8c]
str r0, [sp, #0x90]
_0219a48c:
cmp sb, #0
cmp r9, #0
beq _0219a4b4
ldr r1, [r10, #0x98]
mov r0, r5
@@ -1683,10 +1683,10 @@ _0219a48c:
mov r2, r2, asr #0x2
bl func_0202b2f8
_0219a4b4:
cmp sb, #0
cmp r9, #0
bne _0219a3f8
_0219a4bc:
cmp sb, #0
cmp r9, #0
beq _0219a4e4
ldr r1, [r10, #0x98]
add r0, sp, #0x94
@@ -1697,7 +1697,7 @@ _0219a4bc:
mov r2, r2, asr #0x2
bl func_0202b2f8
_0219a4e4:
cmp sb, #0
cmp r9, #0
bne _0219a24c
_0219a4ec:
ldrb r0, [r10, #0x3c2]
@@ -1723,18 +1723,18 @@ _0219a4ec:
str r7, [sp, #0x8c]
adds r3, r3, #0x800
mla r2, r4, r0, r2
add sb, r11, #1
add r9, r11, #1
ldr r5, _0219a9f8 ; =data_02050f54
mov r7, r11, lsl #0x1
mov r4, sb, lsl #0x1
mov r4, r9, lsl #0x1
ldrsh r11, [r5, r7]
ldrsh r7, [r5, r4]
adc r2, r2, #0
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
smull sb, r2, r11, r3
smull r9, r2, r11, r3
smull r4, r3, r7, r3
adds r7, sb, #0x800
adds r7, r9, #0x800
adc r2, r2, #0
adds r4, r4, #0x800
mov r7, r7, lsr #0xc
@@ -1749,9 +1749,9 @@ _0219a4ec:
str r4, [r3, #8]
str r2, [sp, #0x88]
str r4, [sp, #0x90]
ldr sb, [r10, #0x48]
ldr r9, [r10, #0x48]
mov r11, #0x800
str sb, [sp, #0x7c]
str r9, [sp, #0x7c]
ldr r2, [r10, #0x4c]
str r2, [sp, #0x80]
ldr r8, [r10, #0x50]
@@ -1786,7 +1786,7 @@ _0219a4ec:
rsb r7, r0, #0
ldr r0, _0219aa04 ; =0x0000ffff
orr r4, r4, r3, lsl #20
add r3, sb, r4
add r3, r9, r4
add r1, sp, #0x7c
add r2, r8, r2
sub r0, r0, #0x10000
@@ -1855,19 +1855,19 @@ _0219a668:
ldr r0, [sp, #0x108]
str r1, [sp, #0x88]
str r0, [sp, #0x90]
ldr sb, [r10, #0x344]
ldr r9, [r10, #0x344]
mov r6, r8
ldr r11, [sp, #0x14]
umull r8, r3, sb, r7
umull r8, r3, r9, r7
ldr r2, [sp, #0x18]
mla r3, sb, r11, r3
mov ip, sb, asr #0x1f
mla r3, r9, r11, r3
mov ip, r9, asr #0x1f
ldrh r2, [r2, #0x40]
adds sb, r8, #0x800
adds r9, r8, #0x800
mla r3, ip, r7, r3
mov r8, r6
adc r8, r3, r8
mov r3, sb, lsr #0xc
mov r3, r9, lsr #0xc
mov r2, r2, asr #0x4
orr r3, r3, r8, lsl #20
mov r8, r2, lsl #0x1
@@ -1875,15 +1875,15 @@ _0219a668:
ldrsh r2, [r5, r2]
add r8, r8, #1
mov r8, r8, lsl #0x1
smull r11, sb, r2, r3
smull r11, r9, r2, r3
ldrsh r8, [r5, r8]
adds r11, r11, #0x800
smull r3, r2, r8, r3
mov r8, r6
adc r8, sb, r8
mov sb, r11, lsr #0xc
orr sb, sb, r8, lsl #20
add r1, r1, sb
adc r8, r9, r8
mov r9, r11, lsr #0xc
orr r9, r9, r8, lsl #20
add r1, r1, r9
str r1, [r4]
adds r3, r3, #0x800
mov r1, r6
@@ -1913,7 +1913,7 @@ _0219a820:
cmp r0, #0
bne _0219a998
ldr r4, [r10, #0x54]
mov sb, #1
mov r9, #1
str r4, [sp, #0x94]
ldr r3, [r10, #0x58]
ldr r1, _0219aa04 ; =0x0000ffff
@@ -1925,7 +1925,7 @@ _0219a820:
str r2, [sp, #0x9c]
str r2, [sp, #0x90]
ldr r2, [r10, #0x48]
mov r11, sb
mov r11, r9
str r2, [sp, #0x7c]
ldr r2, [r10, #0x4c]
add r6, sp, #0x28
@@ -1976,7 +1976,7 @@ _0219a8c8:
str r2, [sp, #4]
ldrh ip, [r10, #0x9c]
mov r2, r6
movne sb, #0
movne r9, #0
str ip, [sp, #8]
ldr ip, [r10, #0xa0]
str ip, [sp, #0xc]
@@ -1990,10 +1990,10 @@ _0219a8c8:
ldr r0, [sp, #0xa8]
str r1, [sp, #0x8c]
str r0, [sp, #0x90]
mov sb, #0
mov r9, #0
strb r11, [r10, #0x3c2]
_0219a968:
cmp sb, #0
cmp r9, #0
beq _0219a990
ldr r1, [r10, #0x98]
mov r0, r5
@@ -2004,13 +2004,13 @@ _0219a968:
mov r2, r2, asr #0x2
bl func_0202b2f8
_0219a990:
cmp sb, #0
cmp r9, #0
bne _0219a8c8
_0219a998:
ldrb r0, [r10, #0x3c2]
cmp r0, #0
addeq sp, sp, #0x220
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [sp, #0x88]
str r0, [r10, #0x48]
str r0, [r10, #0x158]
@@ -2026,7 +2026,7 @@ _0219a998:
str r0, [r10, #0x64]
str r0, [r10, #0x68]
add sp, sp, #0x220
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov59_0219a0ac
_0219a9e8: .word gItemManager
@@ -2151,7 +2151,7 @@ _0219aba4: .word data_ov00_020e9370
.global func_ov59_0219aba8
arm_func_start func_ov59_0219aba8
func_ov59_0219aba8: ; 0x0219aba8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
sub sp, sp, #0x128
mov r4, r1
mov r5, r0
@@ -2180,14 +2180,14 @@ _0219abcc:
ldr r6, [r5, #0x48]
ldr r8, [r5, #0x50]
mov ip, #0
ldr sb, _0219aefc ; =0x0000ffff
ldr r9, _0219aefc ; =0x0000ffff
add r3, sp, #0x2c
ldmia lr, {r0, r1, r2}
stmia r3, {r0, r1, r2}
strh sb, [sp, #0xec]
strh sb, [sp, #0xee]
strh sb, [sp, #0xf0]
strh sb, [sp, #0xf2]
strh r9, [sp, #0xec]
strh r9, [sp, #0xee]
strh r9, [sp, #0xf0]
strh r9, [sp, #0xf2]
strh ip, [sp, #0xf4]
strb ip, [sp, #0x116]
strb ip, [sp, #0x117]
@@ -2341,7 +2341,7 @@ _0219ae74:
cmp r4, #4
beq _0219aebc
add sp, sp, #0x128
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0219ae8c:
ldr r0, _0219af08 ; =gItemManager
ldr r1, _0219af0c ; =data_ov00_020dc7d0
@@ -2354,7 +2354,7 @@ _0219ae8c:
mov r1, #0
bl func_ov00_020c0e5c
add sp, sp, #0x128
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
_0219aebc:
mov r1, #0
ldr r0, _0219af08 ; =gItemManager
@@ -2369,7 +2369,7 @@ _0219aebc:
mov r1, #1
bl func_ov00_020c0e5c
add sp, sp, #0x128
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
arm_func_end func_ov59_0219aba8
_0219aef4: .word data_027e0fd4
+193 -193
View File
File diff suppressed because it is too large Load Diff
+1827 -1827
View File
File diff suppressed because it is too large Load Diff