Merge pull request #27 from AetiasHax/docs

Update inline assembler docs, remove register aliases `sb`, `sl`, `fp`
This commit is contained in:
AetiasHax
2024-04-16 18:24:21 +02:00
committed by GitHub
67 changed files with 25306 additions and 25299 deletions
+881 -881
View File
File diff suppressed because it is too large Load Diff
+3819 -3819
View File
File diff suppressed because it is too large Load Diff
+69 -69
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, sl, lr}
mov sl, r0
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r10, r0
mvn r3, #0
str r3, [sl]
str r3, [r10]
ldr r0, _020c3570 ; =data_027e103c
str r3, [sl, #4]
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, sl, 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, sl, 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
@@ -111,14 +111,14 @@ _020c34e8:
ldr r1, [r6]
mov r5, r0
ldr r0, [r1, #8]
str r0, [sl]
str r0, [r10]
ldr r0, [r1, #0xc]
str r0, [sl, #4]
str r0, [r10, #4]
_020c3560:
add r6, r6, #4
cmp r6, r7
blo _020c34e8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, 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,26 +462,26 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
movs r8, r2
mov sl, r0
mov sb, r1
mov r10, r0
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, sl, fp, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_020c39d8:
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
mov r4, #0
ldr fp, [r0, sb, lsl #2]
cmp fp, #0
ldrneb r0, [fp, #0x118]
ldr r11, [r0, r9, lsl #2]
cmp r11, #0
ldrneb r0, [r11, #0x118]
cmpne r0, #0
beq _020c3b20
ldr r0, [sl, #4]
ldr r0, [r10, #4]
cmp r8, #0
cmpeq r7, #0
moveq r6, #1
@@ -490,19 +490,19 @@ _020c39d8:
cmp r0, #0
ble _020c3b20
_020c3a14:
cmp r5, sb
ldrne r0, [sl, #0x10]
cmp r5, r9
ldrne r0, [r10, #0x10]
ldrne r0, [r0, r5, lsl #2]
cmpne r0, #0
beq _020c3b08
ldr r0, [sl, #0x14]
ldr r0, [r10, #0x14]
mov r1, r5
bl func_ov00_020c3f08
cmp r0, #0
beq _020c3b08
cmp r6, #0
bne _020c3a60
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
mov r1, r8
ldr r0, [r0, r5, lsl #2]
ldr r0, [r0, #4]
@@ -510,7 +510,7 @@ _020c3a14:
cmp r7, r0
beq _020c3b08
_020c3a60:
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
add r3, sp, #0
ldr r0, [r0, r5, lsl #2]
add ip, r0, #0x7c
@@ -519,12 +519,12 @@ _020c3a60:
ldr r0, [ip, #0xc]
mov r1, r5
str r0, [sp, #0xc]
ldr r0, [sl, #0x14]
ldr r0, [r10, #0x14]
bl func_ov00_020c3ef0
ldr r1, [sl, #0x10]
ldr r1, [r10, #0x10]
ldr r3, [r0]
ldr r2, [r1, r5, lsl #2]
mov r1, fp
mov r1, r11
str r3, [r2, #0x7c]
ldr r3, [r0, #4]
str r3, [r2, #0x80]
@@ -532,14 +532,14 @@ _020c3a60:
str r3, [r2, #0x84]
ldr r0, [r0, #0xc]
str r0, [r2, #0x88]
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
ldr r0, [r0, r5, lsl #2]
ldr r2, [r0]
ldr r2, [r2, #0x44]
blx r2
cmp r0, #0
ldrne r0, [sl, #0x10]
ldr r1, [sl, #0x10]
ldrne r0, [r10, #0x10]
ldr r1, [r10, #0x10]
ldrne r4, [r0, r5, lsl #2]
ldr r0, [sp]
ldr r1, [r1, r5, lsl #2]
@@ -555,14 +555,14 @@ _020c3a60:
_020c3b08:
add r0, r5, #1
mov r0, r0, lsl #0x10
ldr r1, [sl, #4]
ldr r1, [r10, #4]
mov r5, r0, lsr #0x10
cmp r1, r0, lsr #16
bgt _020c3a14
_020c3b20:
mov r0, r4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPjb
.global _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -610,12 +610,12 @@ _020c3ba8:
.global _ZN12ActorManager18func_ov00_020c3bb0EiPi
arm_func_start _ZN12ActorManager18func_ov00_020c3bb0EiPi
_ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xd4
movs sl, r2
movs r10, r2
str r0, [sp]
movne r0, #0
strne r0, [sl]
strne r0, [r10]
ldr r0, _020c3ce4 ; =data_027e0e60
add r2, sp, #0x14
ldr r0, [r0]
@@ -625,11 +625,11 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
cmp r5, #0
addle sp, sp, #0xd4
movle r0, #0
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [sp]
mov fp, #0
mov r11, #0
ldr r0, [r0, #4]
str fp, [sp, #4]
str r11, [sp, #4]
cmp r0, #0
ldr r0, [sp]
ldr r7, [r0, #0x10]
@@ -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,22 +664,22 @@ _020c3c44:
bne _020c3c88
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
add r9, r9, #0x18
blt _020c3c44
_020c3c88:
cmp r6, #0
beq _020c3cb8
cmp sl, #0
cmp r10, #0
beq _020c3cb4
ldr r0, [r7]
add r0, r0, #0x100
ldrsh r0, [r0, #0x20]
cmp r0, #0
ldrgt r0, [sl]
ldrgt r0, [r10]
addgt r0, r0, #1
strgt r0, [sl]
strgt r0, [r10]
_020c3cb4:
add fp, fp, #1
add r11, r11, #1
_020c3cb8:
ldr r0, [sp]
add r7, r7, #4
@@ -690,9 +690,9 @@ _020c3cb8:
cmp r0, r1
blt _020c3c10
_020c3cd8:
mov r0, fp
mov r0, r11
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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,25 +700,25 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xcc
ldr r3, _020c3dcc ; =data_027e0e60
mov fp, r0
mov r11, r0
ldr r0, [r3]
mov sl, r2
mov r10, r2
add r2, sp, #0xc
mov r3, #8
bl func_ov00_020836cc
mov r5, r0
cmp r5, #0
addle sp, sp, #0xcc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r0, [fp, #4]
ldr r7, [fp, #0x10]
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, sl, fp, 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]
@@ -746,21 +746,21 @@ _020c3d64:
cmp r0, #0
beq _020c3da0
ldr r0, [r7]
mov r1, sl
mov r1, r10
bl _ZN5Actor10SetUnk_129Eb
_020c3da0:
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
add r9, r9, #0x18
blt _020c3d64
_020c3db0:
ldr r0, [fp, #4]
ldr r0, [r11, #4]
add r6, r6, #1
cmp r6, r0
add r7, r7, #4
blt _020c3d38
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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
+35 -35
View File
@@ -54,7 +54,7 @@ _020a9314:
.global _ZN12TouchGesture6UpdateEPv
arm_func_start _ZN12TouchGesture6UpdateEPv
_ZN12TouchGesture6UpdateEPv: ; 0x020a9334
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldrsh r2, [r1, #0x60]
cmp r2, #0
ble _020a9350
@@ -119,44 +119,44 @@ _020a93cc:
mov r8, r7
mov r1, r2
_020a9428:
add sb, r0, r1, lsl #1
ldrsh sl, [sb, #0x10]
ldrsh sb, [sb, #0x2c]
add r2, r2, sl
cmp sb, r3
movlt r3, sb
add r9, r0, r1, lsl #1
ldrsh r10, [r9, #0x10]
ldrsh r9, [r9, #0x2c]
add r2, r2, r10
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 fp, [sb, #0x48]
ldrsh sl, [sb, #0x2c]
add sb, sl, fp
sub sl, sl, fp
mov sb, sb, lsl #0x10
mov sl, sl, lsl #0x10
cmp r5, sb, asr #16
mov sb, sb, asr #0x10
mov sl, sl, asr #0x10
movgt r5, sb
add r9, r0, r1, lsl #1
ldrsh r11, [r9, #0x48]
ldrsh r10, [r9, #0x2c]
add r9, r10, r11
sub r10, r10, r11
mov r9, r9, lsl #0x10
mov r10, r10, lsl #0x10
cmp r5, r9, asr #16
mov r9, r9, asr #0x10
mov r10, r10, asr #0x10
movgt r5, r9
bgt _020a94a0
cmp sb, r6
movgt r6, sb
cmp r9, r6
movgt r6, r9
_020a94a0:
cmp sl, r7
movlt r7, sl
cmp r10, r7
movlt r7, r10
blt _020a94b4
cmp sl, r8
movgt r8, sl
cmp r10, r8
movgt r8, r10
_020a94b4:
add r1, r1, #1
cmp r1, #0xe
@@ -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, sl, fp, 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, sl, fp, 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, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12TouchGesture6UpdateEPv
_020a9520: .word 0xffffd555
+41 -41
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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _020791d8 ; =data_027e0e60
mov fp, r0
mov r11, r0
ldr r7, [r4]
mov sl, r1
mov r10, r1
mov r0, r7
mov sb, r2
mov r9, r2
mov r8, r3
bl func_ov00_02083394
mov r6, r0
@@ -4055,22 +4055,22 @@ func_ov00_0207914c: ; 0x0207914c
mov r4, r0
mov r0, r7
bl func_ov00_020833b8
ldr r1, [sl, #8]
ldr r1, [r10, #8]
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
str r2, [sp, #0x10]
ldr r2, [sl]
mov r0, fp
ldr r2, [r10]
mov r0, r11
mov r1, #1
sub r2, r2, r6
bl func_ov00_02079024
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _0207929c ; =data_027e0e60
mov fp, r0
mov r11, r0
ldr r7, [r4]
mov sl, r1
mov r10, r1
mov r0, r7
mov sb, r2
mov r9, r2
mov r8, r3
bl func_ov00_02083394
mov r6, r0
@@ -4115,22 +4115,22 @@ func_ov00_0207920c: ; 0x0207920c
mov r0, r7
bl func_ov00_020833b8
sub r3, r4, r6
ldr r1, [sl, #8]
ldr r1, [r10, #8]
sub r0, r0, r5
sub r1, r1, r5
str r1, [sp]
str r0, [sp, #4]
mov r0, fp
str sb, [sp, #8]
add r1, sb, #4
mov r0, r11
str r9, [sp, #8]
add r1, r9, #4
str r1, [sp, #0xc]
str r8, [sp, #0x10]
ldr r2, [sl]
ldr r2, [r10]
mov r1, #0
sub r2, r2, r6
bl func_ov00_02079024
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
ldr r0, [r0]
mov sl, r1
mov sb, r2
mov r10, r1
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, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_020792d4:
cmp sl, #0
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]
@@ -4180,18 +4180,18 @@ _020792f4:
sub r0, r0, r4
mov r1, #0xc0
bl func_01ff9b4c
cmp sl, #0
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, sl, 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, sl, 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
+1512 -1512
View File
File diff suppressed because it is too large Load Diff
+26 -26
View File
@@ -808,29 +808,29 @@ _020a9c08:
.global func_ov00_020a9c14
arm_func_start func_ov00_020a9c14
func_ov00_020a9c14: ; 0x020a9c14
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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 sl, r0
mov r10, r0
addeq sp, sp, #0x94
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r1, [sl, #0x68]
mov r0, sl
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r10, #0x68]
mov r0, r10
bl func_ov00_020a9624
ldr r5, [sl, #8]
ldr r5, [r10, #8]
mov r6, r0
ldr r4, [r5, #4]
ldr r7, [sl, #0x68]
ldr r7, [r10, #0x68]
mvn r1, #0
add r0, sp, #0x70
str r1, [sp]
bl func_01ff80d4
add fp, sp, #0
add r11, sp, #0
b _020a9c94
_020a9c68:
mov r0, sl
mov r0, r10
bl func_ov00_020a9624
mov r1, r0
ldr r0, [r1]
@@ -842,7 +842,7 @@ _020a9c68:
add r1, r1, #0x28
bl func_01ff8690
_020a9c94:
mov r0, fp
mov r0, r11
mov r2, r7
add r1, r5, r4
bl func_0201b2f8
@@ -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, sl, fp, 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, sl, fp, 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
+341 -341
View File
File diff suppressed because it is too large Load Diff
+505 -505
View File
File diff suppressed because it is too large Load Diff
+62 -62
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, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
ldr r3, [r0, #4]
ldr r2, [r0, #8]
ldr r4, [r0, #0xc]
@@ -218,23 +218,23 @@ 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 sl, r0, #0x800
add r10, r0, #0x800
mul r0, r4, lr
add lr, r5, #0x800
mul r5, r2, r3
mov r4, sl, asr #0xc
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,58 +267,58 @@ func_ov00_020d5cd8: ; 0x020d5cd8
str r0, [r1, #0x1c]
rsb r0, r4, #0x1000
str r0, [r1, #0x20]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r4, [r0]
ldr r5, [r1]
ldmib r1, {r3, fp, lr}
ldmib r0, {r2, sl, ip}
mul sb, r4, lr
ldmib r1, {r3, r11, lr}
ldmib r0, {r2, r10, ip}
mul r9, r4, lr
mul r1, ip, r5
mul r6, r2, fp
add sb, sb, #0x800
mul r6, r2, r11
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, sl, r3
add sb, sb, #0x800
sub r6, r6, sb, asr #12
mul sb, sl, r5
mul r1, sl, lr
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, fp
mul r6, ip, r11
mul lr, ip, lr
mul ip, r4, r5
mul r8, r4, fp
mul r8, r4, r11
mul r4, r2, r5
mul r2, sl, fp
add sl, r1, #0x800
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, sl, asr #0xc
add sb, r7, #0x800
mov r6, r10, asr #0xc
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,58 +330,58 @@ 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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r5, [r1]
ldr r4, [r0, #0xc]
ldr r2, [r0, #8]
ldmib r1, {r3, fp, lr}
ldmib r1, {r3, r11, lr}
ldmia r0, {r6, ip}
mul sl, r5, r4
mul r10, r5, r4
mul r1, lr, r6
mul r7, r3, r2
add sl, sl, #0x800
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 sl, sl, asr #0xc
add sl, sl, r1, asr #12
mov r10, r10, asr #0xc
add r10, r10, r1, asr #12
add r7, r7, #0x800
add r7, sl, r7, asr #12
mul sl, fp, ip
add sl, sl, #0x800
sub r7, r7, sl, asr #12
mul sl, fp, r6
mul r1, fp, r4
add r7, r10, r7, asr #12
mul r10, r11, ip
add r10, r10, #0x800
sub r7, r7, r10, asr #12
mul r10, r11, r6
mul r1, r11, r4
str r7, [r0]
mul r4, lr, r4
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 sl, sl, #0x800
mul sb, r5, r2
add sl, r8, sl, asr #12
add r8, r8, r9, asr #12
add r10, r10, #0x800
mul r9, r5, r2
add r10, r8, r10, asr #12
mul r8, r5, ip
mul r5, r3, ip
mul r2, fp, r2
add fp, r1, #0x800
add r1, sb, #0x800
mul r2, r11, r2
add r11, r1, #0x800
add r1, r9, #0x800
add r3, lr, #0x800
add sb, r7, #0x800
mov r7, fp, asr #0xc
sub r1, sl, r1, asr #12
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, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov00_020d5eac
.global func_ov00_020d5f98
+389 -389
View File
File diff suppressed because it is too large Load Diff
+77 -77
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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x6c
str r0, [sp, #8]
add r0, sp, #0x4c
@@ -6083,59 +6083,59 @@ func_ov02_020f3ae4: ; 0x020f3ae4
str r3, [sp, #0x38]
str r2, [sp, #0x2c]
str r1, [sp, #0x30]
mov fp, #5
mov r11, #5
mov r6, #0x30
mov r7, #0x3b
mov r8, #0x1c
add sl, sp, #0x4c
add r10, sp, #0x4c
_020f3b80:
mov r0, #0x4d
add r1, r4, #1
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
ldr r0, _020f41ec ; =gItemManager
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
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
ldr r0, [sp, #8]
mov r1, r5
add r0, r0, r4, lsl #2
ldr r0, [r0, #0x10]
mov r2, #0
mov r3, sl
mov r3, r10
bl func_02032788
ldr r1, [sp, #0x1c]
mov r0, #0x4d
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #1
str r0, [sp, #0x28]
mov r1, sb
mov r1, r9
add r0, sp, #0x28
mov r2, sl
str fp, [sp, #0x34]
mov r2, r10
str r11, [sp, #0x34]
bl func_ov02_020f5f98
mov r0, #0x4d
add r1, r4, #0x10
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
blx func_0202ab48
cmp r0, #1
@@ -6157,18 +6157,18 @@ _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
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
add r0, sp, #0x28
mov r1, sb
mov r2, sl
mov r1, r9
mov r2, r10
str r6, [sp, #0x34]
bl func_ov02_020f5f98
_020f3cc4:
@@ -6176,12 +6176,12 @@ _020f3cc4:
add r1, r4, #0x38
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #0xc
mul r1, sb, r0
mul r1, r9, r0
ldr r0, [sp, #0xc]
mov r2, sl
mov r2, r10
sub r1, r0, r1
add r0, sp, #0x28
str r7, [sp, #0x34]
@@ -6195,19 +6195,19 @@ _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
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #0
stmia sp, {r0, sl}
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
@@ -6216,12 +6216,12 @@ _020f3d5c:
add r1, r4, #0x16
mov r2, r5
mov r3, #0
str sl, [sp]
str r10, [sp]
bl func_0203493c
mov r0, #0x64
mul r1, sb, r0
mul r1, r9, r0
ldr r0, [sp, #0x10]
mov r2, sl
mov r2, r10
sub r1, r0, r1
mov r0, #0
str r0, [sp, #0x28]
@@ -6233,7 +6233,7 @@ _020f3d9c:
add r4, r4, #1
add r0, r0, #3
str r0, [sp, #0x1c]
add fp, fp, #3
add r11, r11, #3
add r6, r6, #3
add r7, r7, #2
add r8, r8, #2
@@ -6248,10 +6248,10 @@ _020f3d9c:
str r1, [sp, #0x2c]
mov r7, #0
str r0, [sp, #0x20]
mov fp, #9
mov r11, #9
mov r8, #0x3b
mov sb, #0x42
mov sl, #0x19
mov r9, #0x42
mov r10, #0x19
add r6, sp, #0x4c
_020f3dfc:
mov r0, #0xec
@@ -6296,7 +6296,7 @@ _020f3dfc:
mov r1, r4
add r0, sp, #0x28
mov r2, r6
str fp, [sp, #0x34]
str r11, [sp, #0x34]
bl func_ov02_020f5f98
_020f3eac:
mov r0, #0xec
@@ -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:
@@ -6394,17 +6394,17 @@ _020f3fe0:
mov r0, #0
str r0, [sp, #0x28]
add r0, sp, #0x28
str sl, [sp, #0x34]
str r10, [sp, #0x34]
bl func_ov02_020f5f98
_020f4020:
ldr r0, [sp, #0x20]
add r7, r7, #1
add r0, r0, #3
str r0, [sp, #0x20]
add fp, fp, #3
add r11, r11, #3
add r8, r8, #3
add sb, sb, #2
add sl, sl, #2
add r9, r9, #2
add r10, r10, #2
cmp r7, #2
blt _020f3dfc
ldr r0, _020f41ec ; =gItemManager
@@ -6499,7 +6499,7 @@ _020f40fc:
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
addeq sp, sp, #0x6c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, 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
@@ -8685,10 +8685,10 @@ _020f5fdc:
mov r0, r5
mov r1, #0x3e8
bl func_01ff9b4c
mov sl, r0
cmp sl, #0
mov r10, r0
cmp r10, #0
bgt _020f5ffc
cmp sb, #0
cmp r9, #0
beq _020f6020
_020f5ffc:
ldr r0, [r6, #0x18]
@@ -8696,9 +8696,9 @@ _020f5ffc:
stmia sp, {r0, r4}
ldmib r6, {r0, r1}
mov r3, r8
add r1, r1, sl
add r1, r1, r10
bl func_020349cc
mov sb, #1
mov r9, #1
b _020f6030
_020f6020:
ldr r0, [r6]
@@ -8707,17 +8707,17 @@ _020f6020:
subeq r8, r8, r0
_020f6030:
mov r0, #0x3e8
mul r0, sl, r0
mul r0, r10, r0
add r7, r7, #1
sub r5, r5, r0
_020f6040:
mov r0, r5
mov r1, #0x64
bl func_01ff9b4c
mov sl, r0
cmp sl, #0
mov r10, r0
cmp r10, #0
bgt _020f6060
cmp sb, #0
cmp r9, #0
beq _020f6084
_020f6060:
ldr r0, [r6, #0x18]
@@ -8725,9 +8725,9 @@ _020f6060:
stmia sp, {r0, r4}
ldmib r6, {r0, r1}
mov r3, r8
add r1, r1, sl
add r1, r1, r10
bl func_020349cc
mov sb, #1
mov r9, #1
b _020f6094
_020f6084:
ldr r0, [r6]
@@ -8736,17 +8736,17 @@ _020f6084:
subeq r8, r8, r0
_020f6094:
mov r0, #0x64
mul r0, sl, r0
mul r0, r10, r0
add r7, r7, #1
sub r5, r5, r0
_020f60a4:
mov r0, r5
mov r1, #0xa
bl func_01ff9b4c
mov sl, r0
cmp sl, #0
mov r10, r0
cmp r10, #0
bgt _020f60c4
cmp sb, #0
cmp r9, #0
beq _020f60e4
_020f60c4:
ldr r0, [r6, #0x18]
@@ -8754,7 +8754,7 @@ _020f60c4:
stmia sp, {r0, r4}
ldmib r6, {r0, r1}
mov r3, r8
add r1, r1, sl
add r1, r1, r10
bl func_020349cc
b _020f60f4
_020f60e4:
@@ -8778,7 +8778,7 @@ _020f60f8:
bl func_020349cc
_020f6124:
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov02_020f5f98
.global func_ov02_020f612c
+363 -363
View File
File diff suppressed because it is too large Load Diff
+575 -575
View File
File diff suppressed because it is too large Load Diff
+39 -39
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, sl, 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, sl, pc}
mov sb, r4
add sl, r4, #0x184
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r9, r4
add r10, r4, #0x184
mov r5, r7
_021025a4:
mov r0, sl
add r1, sb, #0x100
mov r0, r10
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, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
add r7, r7, #1
cmp r7, #7
add sb, sb, #0x18
add sl, sl, #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, sl, 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, sl, 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, sl, 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,10 +2780,10 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov sl, r0
add r0, sl, #0x44
mov r10, r0
add r0, r10, #0x44
ldr r2, [r0]
mov r1, #0
ldr r2, [r2, #0x10]
@@ -2791,7 +2791,7 @@ func_ov06_02102d64: ; 0x02102d64
mov r0, #0
str r0, [sp, #0xc]
str r0, [sp, #8]
ldr r1, [sl, #0x178]
ldr r1, [r10, #0x178]
ldr r0, [r1, #0x20]
ldr r7, [r1, #0x1c]
add r0, r0, #1
@@ -2800,31 +2800,31 @@ func_ov06_02102d64: ; 0x02102d64
ldr r4, _02102e78 ; =0x0000ffff
mov r5, #6
mov r6, #4
add fp, sp, #0xc
add r11, sp, #0xc
_02102db8:
str r6, [sp]
str r6, [sp, #4]
ldr r0, [sl, #0x234]
ldr r0, [r10, #0x234]
mov r1, r7
mov r2, fp
mov r2, r11
add r3, sp, #8
bl func_020347b0
ldr r0, [sl, #0x178]
ldr r0, [r10, #0x178]
ldr r2, [r0]
ldr r1, [r0, #0x1c]
ldr r2, [r2, #0x10]
sub r1, r7, r1
blx r2
mov r8, r0
ldr sb, [sl, #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]
@@ -2833,24 +2833,24 @@ _02102db8:
ldr r8, [sp, #0xc]
add r1, r1, r1, lsr #31
sub r1, r8, r1, asr #1
add r0, sl, #0x44
add r0, r10, #0x44
ldr r8, [r0]
sub r2, r2, #7
ldr r8, [r8, #0xc]
and r1, r1, #0xff
and r2, r2, #0xff
blx r8
ldr r0, [sl, #0x178]
ldr r0, [r10, #0x178]
add r7, r7, #1
ldr r0, [r0, #0x20]
add r0, r0, #1
cmp r7, r0
blt _02102db8
_02102e68:
mov r0, sl
mov r0, r10
bl func_ov06_02101ee8
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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
+17 -17
View File
@@ -771,29 +771,29 @@ 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov sl, r0
mov r10, r0
mov r8, #0
mov r0, #2
str r0, [sl]
str r0, [r10]
mov r7, #0x2000
rsb r7, r7, #0
strh r8, [sl, #0xe]
strh r8, [r10, #0xe]
mov r0, #0x1000
strh r0, [sl, #0x10]
mov sb, r1
strh r8, [sl, #0x12]
strh r0, [r10, #0x10]
mov r9, r1
strh r8, [r10, #0x12]
mov r5, r7, lsr #0x11
mov r6, #1
mov r4, r8
mov fp, r8
mov r11, r8
_02113600:
ldr r0, [sl]
ldr r0, [r10]
cmp r8, r0
bge _02113648
mov r0, #0x10
mov r1, sb
mov r1, r9
mov r2, #4
bl _ZN9SysObjectnwEmPjj
cmp r0, #0
@@ -805,23 +805,23 @@ _02113600:
str r6, [sp, #4]
bl func_ov08_021136c0
_0211363c:
add r1, sl, r8, lsl #2
add r1, r10, r8, lsl #2
str r0, [r1, #4]
b _02113650
_02113648:
add r0, sl, r8, lsl #2
add r0, r10, r8, lsl #2
str r4, [r0, #4]
_02113650:
add r0, sl, r8
add r0, r10, r8
add r8, r8, #1
strb fp, [r0, #0xc]
strb r11, [r0, #0xc]
cmp r8, #2
blt _02113600
mov r0, sl
mov r0, r10
bl func_ov00_020a1a3c
mov r0, sl
mov r0, r10
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov08_021135bc
.global func_ov08_02113678
+100 -100
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, sl, fp, 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, sl, fp, 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, sl, fp, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r1, [r5, #0x9a]
cmp r1, #0
bne _021156e8
@@ -5067,22 +5067,22 @@ _021156e8:
ldr r2, [sp, #8]
bl func_ov09_02115e38
add r0, r6, #0x5c
add fp, r6, #0x1ac
add r11, r6, #0x1ac
ldr r7, _02115a9c ; =data_02050f54
str r0, [sp, #0xc]
mov r4, #0
add r8, sp, #0xac
add r6, sp, #0x58
_02115750:
ldr sl, [sp, #0xc]
add sb, sp, #0x7c
ldmia sl!, {r0, r1, r2, r3}
ldr r10, [sp, #0xc]
add r9, sp, #0x7c
ldmia r10!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
ldmia sl!, {r0, r1, r2, r3}
ldmia r10!, {r0, r1, r2, r3}
stmia sb!, {r0, r1, r2, r3}
ldmia sl, {r0, r1, r2, r3}
mov lr, fp
stmia sb, {r0, r1, r2, r3}
ldmia r10, {r0, r1, r2, r3}
mov lr, r11
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,17 +5150,17 @@ _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 sl, [r7, r1]
ldrsh r9, [r0, #2]
ldrsh r10, [r7, r1]
mov r0, r8
mov r2, sb
mov r1, sl
mov r2, r9
mov r1, r10
blx func_01ff8abc
add r1, sp, #0x7c
mov r0, r8
@@ -5186,8 +5186,8 @@ _02115804:
mov r0, r6
mov r2, r1
bl func_01ff8690
mov r1, sl
mov r2, sb
mov r1, r10
mov r2, r9
mov r0, r6
blx func_01ff8230
add r1, sp, #0x34
@@ -5242,7 +5242,7 @@ _021159d0:
add r4, r4, #1
add r0, r0, #0x30
str r0, [sp, #0xc]
add fp, fp, #0x24
add r11, r11, #0x24
cmp r4, #7
blt _02115750
mov r0, r5
@@ -5250,7 +5250,7 @@ _021159d0:
ldr r0, [r5, #0x54]
cmp r0, #0
addeq sp, sp, #0xdc
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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,22 +12746,22 @@ _02119c9c:
.global func_ov09_02119cd4
arm_func_start func_ov09_02119cd4
func_ov09_02119cd4: ; 0x02119cd4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov sl, r0
ldr r0, [sl, #4]
mov r10, r0
ldr r0, [r10, #4]
cmp r0, #1
addls sp, sp, #0x18
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r3, _02119f98 ; =0x04000444
mov r1, #0
ldr r0, _02119f9c ; =0x21230000
str r1, [r3]
str r0, [r3, #0x64]
add r0, sl, #0x1f00
add r0, r10, #0x1f00
ldrh r2, [r0, #0x52]
ldr r0, _02119fa0 ; =0x42108000
add r1, sl, #0x1000
add r1, r10, #0x1000
orr r2, r2, #0x108000
orr r2, r2, #0x42000000
str r2, [r3, #0x7c]
@@ -12775,13 +12775,13 @@ func_ov09_02119cd4: ; 0x02119cd4
str r0, [r3, #0x28]
str r0, [r3, #0x28]
str r0, [r3, #0x28]
ldr r0, [sl, #4]
ldrh sb, [sl, #8]
ldr r0, [r10, #4]
ldrh r9, [r10, #8]
sub r0, r0, #1
cmp sb, r0
cmp r9, r0
bhs _02119f84
mov r0, #0x14
mla r7, sb, r0, sl
mla r7, r9, r0, r10
ldr r0, _02119fa4 ; =data_ov03_02100648
ldr r8, [r0]
_02119d6c:
@@ -12789,9 +12789,9 @@ _02119d6c:
mov r1, #3
str r1, [r0]
sub r5, r0, #0x74
add r4, sl, #0x1000
add r4, r10, #0x1000
add r6, sp, #0xc
add fp, sp, #0
add r11, sp, #0
_02119d88:
ldrb r0, [r4, #0xf50]
cmp r0, #0x58
@@ -12868,7 +12868,7 @@ _02119e98:
mov r0, r6
mov r1, r8
bl func_01fffbec
mov r0, fp
mov r0, r11
mov r1, r8
bl func_01fffbec
ldr r0, [sp, #0x10]
@@ -12907,9 +12907,9 @@ _02119e98:
str r0, [r5]
mov r0, r1, lsr #0x10
str r0, [r5]
ldr r0, [sl, #4]
add sb, sb, #1
cmp sb, r0
ldr r0, [r10, #4]
add r9, r9, #1
cmp r9, r0
add r7, r7, #0x14
bhs _02119f68
ldr r0, [r7, #4]
@@ -12921,16 +12921,16 @@ _02119f68:
ldr r0, _02119fac ; =0x04000504
mov r1, #0
str r1, [r0]
ldr r0, [sl, #4]
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, sl, fp, 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, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r8, r0
ldr r0, [r8, #0x8a4]
mov r7, r1
@@ -13643,10 +13643,10 @@ func_ov09_0211a69c: ; 0x0211a69c
mov r6, r2
mov r5, r3
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, 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 sl, #0
mvn r10, #0
_0211a6cc:
cmp r4, r5
bgt _0211a734
@@ -13659,10 +13659,10 @@ _0211a6cc:
blt _0211a734
cmp r1, #0
ldrneh r0, [r1, #8]
moveq r0, sl
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, sl, 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, sl, 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,25 +13687,25 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #8
mov sl, r0
ldr r0, [sl, #0x8a4]
ldr fp, [sp, #0x30]
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, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mvn r0, #0
mov r6, #0
str r0, [sp, #4]
_0211a788:
cmp r6, fp
cmp r6, r11
bgt _0211a81c
add r0, sl, r6, lsl #2
add r0, r10, r6, lsl #2
ldr r2, [r0, #0x8a4]
cmp r2, #0
beq _0211a81c
@@ -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
@@ -13732,12 +13732,12 @@ _0211a7d8:
ldr r1, [sp, #0x34]
add sp, sp, #8
cmp r1, #0
addne r0, sl, r6, lsl #2
addne r0, r10, r6, lsl #2
ldrne r0, [r0, #0x8b0]
strne r0, [r1]
ldr r0, _0211a834 ; =data_ov03_0210041c
ldr r0, [r0, r7, lsl #2]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, 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
@@ -18623,8 +18623,8 @@ _0211d420:
mov r8, #0xc
add r5, r5, #0x10
mov r4, #0
add sl, sp, #0x3c
add sb, sp, #0x18
add r10, sp, #0x3c
add r9, sp, #0x18
mov r7, r8
_0211d574:
ldr r1, [r5]
@@ -18642,9 +18642,9 @@ _0211d574:
mov r0, r4, lsr #0x1
mul ip, r0, r8
ldr r0, [r1, #0x20]
ldr r3, [sl, ip]
ldr r3, [r10, ip]
ldr r2, [r0]
add r0, sl, ip
add r0, r10, ip
ldr r2, [r2, #4]
add r2, r3, r2
str r2, [r1, #0x28]
@@ -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, sl, 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, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov09_0211d180
_0211d654: .word 0xfffffccd
+477 -477
View File
File diff suppressed because it is too large Load Diff
+806 -806
View File
File diff suppressed because it is too large Load Diff
+47 -47
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, sl, fp, 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,16 +1398,16 @@ func_ov13_02113d48: ; 0x02113d48
mov r1, r4
bl func_ov13_021130b0
cmp r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113d70:
cmp r4, #0
mov sl, #0
mov r10, #0
bne _02113e34
add r1, r6, #0x5000
mov r0, #1
str r0, [r1, #0xf0]
add r0, r6, #0x1e0
str sl, [r1, #0x108]
str r10, [r1, #0x108]
add r0, r0, #0x5000
str r0, [r1, #0x5e0]
add r0, r6, #0x5500
@@ -1434,7 +1434,7 @@ _02113d70:
add r3, r6, #0x5500
mov r1, #1
strh r1, [r3, #0xf0]
mov r4, sl
mov r4, r10
add r0, r0, #0x5400
mov r1, #0xff
mov r2, #0x20
@@ -1448,7 +1448,7 @@ _02113d70:
mov r0, r6
mov r1, #0x26
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113e34:
ldrh r0, [r4]
cmp r0, #0x26
@@ -1470,35 +1470,35 @@ _02113e68:
mov r0, r6
mov r1, #0xb
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r4, r6, #0x5000
ldr r0, [r4, #0xf4]
cmp r0, #5
bne _02113f7c
add r0, r6, #0x1e0
mov r7, sl
mov r7, r10
add r8, r0, #0x5000
mov fp, #6
mov r5, sl
mov r11, #6
mov r5, r10
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 sl, r5
mov r10, r5
cmp r2, #0
beq _02113ee4
mov r0, fp
mov r0, r11
mov r1, r8
blx r2
mov sl, r0
mov r10, r0
_02113ee4:
cmp sl, #0
cmp r10, #0
beq _02113f04
add r1, r6, #0x120
mov r0, r8
@@ -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
@@ -1516,7 +1516,7 @@ _02113f14:
cmp r7, r0
blt _02113eb4
_02113f20:
cmp sl, #0
cmp r10, #0
bne _02113f7c
ldr r4, _02113fb8 ; =data_ov13_02116204
ldrh r1, [r4]
@@ -1538,13 +1538,13 @@ _02113f20:
mov r0, r6
mov r1, #0x26
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02113f7c:
cmp sl, #0
cmp r10, #0
beq _02113f90
mov r0, #0
bl func_ov13_02113b2c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
mov r4, r1
cmp r0, #0xa
@@ -1979,31 +1979,31 @@ _02114554:
cmp r7, #0
ldrneh r0, [r4, #0x10]
ldr r1, _02114794 ; =data_ov13_0211620c
mov sl, #0
mov r10, #0
ldr r2, [r1]
moveq r0, #0
mov r0, r0, lsl #0x10
ldr r1, [r2, #0xd8]
mov r8, r0, lsr #0x10
add r0, r2, #0x58
mov fp, sl
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
moveq fp, #1
moveq r11, #1
_02114598:
cmp fp, #0
cmp r11, #0
cmpne r6, #0
movne sl, #1
strh r8, [sb]
movne r10, #1
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]
@@ -2025,7 +2025,7 @@ _021145ec:
add r0, r0, #0x760
add r0, r0, #0x5000
bl func_ov13_02112dbc
cmp sl, #0
cmp r10, #0
ldrne r0, [r6, #0x10]
cmpne r0, #0
ldrne r0, [r6, #0x20]
@@ -2051,10 +2051,10 @@ _0211464c:
add r0, r0, #0x5000
mov r1, r1, lsr #0x10
bl func_ov13_02112f1c
cmp sl, #0
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, sl, fp, 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, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #4
mov r8, r0
mov r7, r1
@@ -2381,25 +2381,25 @@ 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
_02114aac:
ldr r0, [sp, #0x30]
bl func_ov13_02112d6c
movs sl, r0
movs r10, r0
bne _02114ac0
bl func_0200f248
_02114ac0:
mov r0, sb
mov r0, r9
mov r1, r8
mov r2, r7
mov r3, sl
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, sl, 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
+22 -22
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, sl, fp, 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,30 +108,30 @@ _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 sl, r8, sb
ldr fp, [r3, #0x14]
adds r10, r8, r9
ldr r11, [r3, #0x14]
mla r0, r6, r5, r0
umull r3, lr, r7, sl
adc sb, fp, r0
umull r3, lr, r7, r10
adc r9, r11, r0
adds r0, r8, r3
str r0, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
mla lr, r7, sb, lr
str sl, [r0]
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 lr, r6, sl, lr
mla r5, r9, r2, r5
mla lr, r6, r10, lr
ldr r0, [sp, #0x10]
mov r3, r2
mla r5, r3, r0, r5
@@ -139,19 +139,19 @@ _0213afb4:
str r0, [sp]
ldr r5, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
adc sb, fp, lr
umull sl, r5, r7, r5
mla r5, r7, sb, r5
adc r9, r11, lr
umull r10, r5, r7, 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, sl
mov r6, r10
adds r6, r8, r6
adc r7, fp, r5
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
@@ -169,7 +169,7 @@ _0213afb4:
mov r0, r4
str r2, [r4, #0x64]
ldr r2, [sp]
str sl, [sp, #0xc]
str r10, [sp, #0xc]
str r2, [r4, #0x68]
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b0f4
@@ -189,7 +189,7 @@ _0213b0e8:
_0213b0f4:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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
+373 -373
View File
File diff suppressed because it is too large Load Diff
+843 -843
View File
File diff suppressed because it is too large Load Diff
+3799 -3799
View File
File diff suppressed because it is too large Load Diff
+411 -411
View File
File diff suppressed because it is too large Load Diff
+532 -532
View File
File diff suppressed because it is too large Load Diff
+47 -47
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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x7c
mov r4, r0
add r0, sp, #0x50
@@ -1090,33 +1090,33 @@ _0216e46c:
ldr r0, [sp, #0x34]
ldr r3, [r5, #4]
str r0, [sp, #0x18]
ldr sl, [sp, #0x14]
ldr r10, [sp, #0x14]
mov r0, r6
umull r7, r6, sl, ip
mla r6, sl, r3, r6
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 fp, [sp, #0x2c]
umull r6, sl, ip, r6
ldr r11, [sp, #0x2c]
umull r6, r10, ip, r6
mov r6, #0
mla sl, ip, r6, sl
mla r10, ip, r6, r10
mov r7, r6
ldr r6, _0216e68c ; =0x00004001
stmia r5, {r3, ip}
mla sl, r7, r6, sl
sub r6, sl, #0x2000
add r6, fp, r6
ldr sl, [sp, #0x14]
mla r10, r7, r6, r10
sub r6, r10, #0x2000
add r6, r11, r6
ldr r10, [sp, #0x14]
str r6, [sp, #0x2c]
umull r7, r6, sl, r3
mla r6, sl, ip, r6
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,15 +1155,15 @@ _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 fp, [r5, #0x10]
ldr r11, [r5, #0x10]
mla r8, r6, r3, r8
ldr sl, [r5, #0x14]
adds r1, fp, sb
adc r3, sl, r8
ldr r10, [r5, #0x14]
adds r1, r11, r9
adc r3, r10, r8
stmia r5, {r1, r3}
mov r1, #0x7c
umull r1, r6, r3, r1
@@ -1183,7 +1183,7 @@ _0216e46c:
_0216e64c:
add sp, sp, #0x7c
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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,29 +7824,29 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov sl, r0
ldrb r7, [sl, #0x14]
mov sb, r1
mov r10, r0
ldrb r7, [r10, #0x14]
mov r9, r1
add r0, r7, #2
cmp r7, r0
bge _02173e1c
ldr r4, _02173ee8 ; =data_027e0e60
add r5, sp, #2
mov fp, #1
mov r11, #1
_02173d80:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
add r0, r8, #2
cmp r8, r0
bge _02173e08
and r6, r7, #0xff
_02173d94:
cmp sb, #0
cmp r9, #0
ldr r0, [r4]
beq _02173dcc
mov r1, r5
mov r2, fp
mov r2, r11
strb r6, [sp, #2]
strb r8, [sp, #3]
bl func_ov00_02082680
@@ -7868,31 +7868,31 @@ _02173dcc:
mov r3, #0x15
bl func_ov00_02084d24
_02173df4:
ldrb r0, [sl, #0x15]
ldrb r0, [r10, #0x15]
add r8, r8, #1
add r0, r0, #2
cmp r8, r0
blt _02173d94
_02173e08:
ldrb r0, [sl, #0x14]
ldrb r0, [r10, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _02173d80
_02173e1c:
ldrh r4, [sl, #0x2a]
ldrh r4, [r10, #0x2a]
ldr r1, _02173eec ; =data_027e0f6c
add r0, sp, #8
ldr r1, [r1]
mov r2, r4
ldrh r5, [sl, #0x28]
ldrh r5, [r10, #0x28]
bl func_ov00_02093a4c
ldr r1, _02173eec ; =data_027e0f6c
add r0, sp, #4
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, sl, fp, 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, sl, fp, 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
+236 -236
View File
File diff suppressed because it is too large Load Diff
+98 -98
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, sl, 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, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r1, #0
str r1, [r4, #0x16c]
ldr r2, [r4, #0x48]
@@ -2364,21 +2364,21 @@ 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 sl, 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 sl, [sp, #0x4c]
str r10, [sp, #0x4c]
str r1, [sp, #0x44]
str r2, [sp, #0x48]
ldmia r0, {r0, r1, r2}
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, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
arm_func_end func_ov21_0216f25c
.global func_ov21_0216f398
@@ -2724,32 +2724,32 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x118
mov sl, r0
ldr r0, [sl, #0x224]
mov r10, r0
ldr r0, [r10, #0x224]
cmp r0, #0
ldreq r0, [sl, #0x228]
ldreq r0, [r10, #0x228]
cmpeq r0, #0
addeq sp, sp, #0x118
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
mov r0, sl
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, sl, fp, pc}
add r0, sl, #0x48
add r1, sl, #0x54
add r2, sl, #0x60
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r10, #0x48
add r1, r10, #0x54
add r2, r10, #0x60
bl func_01ff9bf8
ldr r0, [sl, #0x138]
ldr r0, [r10, #0x138]
cmp r0, #0x1e
addlt sp, sp, #0x118
movlt r0, #0
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, _0216fb80 ; =0x0000ffff
mov r5, #0
add r4, sp, #0x48
@@ -2768,31 +2768,31 @@ func_ov21_0216f7c8: ; 0x0216f7c8
strb r5, [sp, #0x113]
strb r5, [sp, #0x114]
strb r5, [sp, #0x115]
add r0, sl, #0x8c
add r0, r10, #0x8c
ldmia r0, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
ldr r0, _0216fb84 ; =data_027e0e60
str r1, [sp, #0x54]
ldr r2, [sl, #0x48]
ldr r2, [r10, #0x48]
add r1, sp, #0xb8
str r2, [sp, #0x24]
ldr r3, [sl, #0x4c]
ldr r3, [r10, #0x4c]
add r2, sp, #0x24
str r3, [sp, #0x28]
ldr r6, [sl, #0x50]
ldr r6, [r10, #0x50]
add r3, sp, #0x18
str r6, [sp, #0x2c]
ldr r6, [sl, #0x54]
ldr r6, [r10, #0x54]
str r6, [sp, #0x18]
ldr r6, [sl, #0x58]
ldr r6, [r10, #0x58]
str r6, [sp, #0x1c]
ldr r6, [sl, #0x5c]
ldr r6, [r10, #0x5c]
str r6, [sp, #0x20]
str r4, [sp]
ldr r4, [sl, #8]
ldr r4, [r10, #8]
str r4, [sp, #4]
ldrh r4, [sl, #0x9c]
ldrh r4, [r10, #0x9c]
str r4, [sp, #8]
str r5, [sp, #0xc]
str r5, [sp, #0x10]
@@ -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, sl, fp, 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
@@ -2868,19 +2868,19 @@ _0216f9c0:
strh r0, [sp, #0x7e]
strh r0, [sp, #0x80]
strh r0, [sp, #0x82]
ldr r0, [sl, #0x4c]
ldr r2, [sl, #0x50]
ldr r1, [sl, #0x48]
ldr r0, [r10, #0x4c]
ldr r2, [r10, #0x50]
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]
str r2, [sp, #0x44]
mov r6, #0x800
mov r5, #0xd
mov fp, r8
mov r11, r8
add r7, sp, #0x30
_0216fa3c:
ldr r1, [sp, #0x3c]
@@ -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]
@@ -2903,12 +2903,12 @@ _0216fa3c:
bl func_ov00_020b199c
cmp r0, #0
beq _0216fac4
ldr r0, [sl, #8]
ldr r0, [r10, #8]
add r1, sp, #0x58
stmia sp, {r0, r6}
str r5, [sp, #8]
str fp, [sp, #0xc]
str fp, [sp, #0x10]
str r11, [sp, #0xc]
str r11, [sp, #0x10]
ldr r0, [r4]
mov r2, r7
add r3, sp, #0x3c
@@ -2916,19 +2916,19 @@ _0216fa3c:
cmp r0, #0
addeq sp, sp, #0x118
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, [sl, #0x224]
ldr r1, [sl, #0x228]
ldr r0, [r10, #0x224]
ldr r1, [r10, #0x228]
rsb r0, r0, #0
str r0, [sl, #0x224]
str r0, [r10, #0x224]
rsb r1, r1, #0
ldr r0, _0216fbb8 ; =data_027e0fc8
str r1, [sl, #0x228]
str r1, [r10, #0x228]
ldr r0, [r0]
mov r4, #0
bl func_ov00_020bc500
@@ -2942,7 +2942,7 @@ _0216fac4:
cmp r0, #0
moveq r4, #1
_0216fb20:
ldrb r0, [sl, #0x158]
ldrb r0, [r10, #0x158]
cmp r0, #0
bne _0216fb60
ldr r0, _0216fbb8 ; =data_027e0fc8
@@ -2952,14 +2952,14 @@ _0216fb20:
beq _0216fb60
cmp r4, #0
bne _0216fb60
mov r0, sl
mov r0, r10
ldr r2, [r0]
mov r1, #3
ldr r2, [r2, #0xb8]
blx r2
b _0216fb74
_0216fb60:
mov r0, sl
mov r0, r10
ldr r2, [r0]
mov r1, #6
ldr r2, [r2, #0xb8]
@@ -2967,7 +2967,7 @@ _0216fb60:
_0216fb74:
mov r0, #0
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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,11 +3037,11 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r2
ldr r2, [r4]
mov sl, r0
mov r10, r0
cmp r2, #0
ldreq r2, [r4, #4]
str r1, [sp]
@@ -3051,18 +3051,18 @@ func_ov21_0216fc5c: ; 0x0216fc5c
mov r2, r3
bl func_ov21_02170050
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fc98:
ldrb r0, [sp, #0x68]
cmp r0, #0
beq _0216fcc0
ldr r1, [sp]
ldr r3, [sp, #4]
mov r0, sl
mov r0, r10
mov r2, r4
bl func_ov21_021701b0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fcc0:
ldr r0, _0216fffc ; =data_ov21_02171bb4
ldr r0, [r0, #0x54]
@@ -3183,7 +3183,7 @@ _0216fe2c:
cmp r0, #0
beq _0216ffdc
add r1, sp, #0x24
mov r0, sl
mov r0, r10
bl func_ov21_02170388
cmp r0, #0
beq _0216ffdc
@@ -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, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216fec4:
rsb r0, r0, #0
str r0, [sp, #8]
@@ -3217,7 +3217,7 @@ _0216fee4:
subge r2, r2, #8
_0216ff0c:
ldr r0, _02170004 ; =data_ov21_02171780
ldr fp, [sp, #0x1c]
ldr r11, [sp, #0x1c]
add r1, r0, r2, lsl #3
ldr r2, [r0, r2, lsl #3]
ldr r0, [r1, #4]
@@ -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
@@ -3243,7 +3243,7 @@ _0216ff48:
bl func_ov00_02079ab4
cmp r0, #0
beq _0216ff9c
mov r0, sl
mov r0, r10
mov r1, r5
bl func_ov21_02170388
cmp r0, #0
@@ -3251,16 +3251,16 @@ _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, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0216ff9c:
add r6, r6, #1
cmp r6, #1
ble _0216ff48
add r8, r8, #1
add fp, fp, #1
cmp fp, #1
add r11, r11, #1
cmp r11, #1
ble _0216ff44
_0216ffb8:
ldr r0, [sp, #0x14]
@@ -3280,7 +3280,7 @@ _0216ffdc:
ble _0216fe2c
mov r0, #0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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,27 +3313,27 @@ 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x28
mov sl, r1
ldr r1, [sl]
mov r10, r1
ldr r1, [r10]
str r2, [sp]
str r1, [sp, #8]
ldr r3, [sl, #4]
ldr r3, [r10, #4]
ldr r1, _021701a4 ; =data_027e0d3c
mov fp, r0
mov r11, r0
ldr r0, [r1]
add r1, sp, #8
add r2, sp, #0x1c
str r3, [sp, #0xc]
bl func_ov00_020793b8
ldr r1, [fp, #0x48]
ldr r1, [r11, #0x48]
ldr r0, _021701a8 ; =data_027e0e60
str r1, [sp, #0x10]
ldr r1, [fp, #0x4c]
ldr r1, [r11, #0x4c]
ldr r0, [r0]
str r1, [sp, #0x14]
ldr r3, [fp, #0x50]
ldr r3, [r11, #0x50]
add r1, sp, #0x10
mov r2, #0
str r3, [sp, #0x18]
@@ -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
@@ -3363,11 +3363,11 @@ _021700e0:
cmp r0, r6
blt _02170174
_02170108:
ldr r1, [sl]
ldr r1, [r10]
ldr r0, _021701ac ; =data_027e103c
add r8, r4, r1
str r8, [sp, #8]
ldr r1, [sl, #4]
ldr r1, [r10, #4]
ldr r0, [r0]
add r7, r5, r1
str r7, [sp, #0xc]
@@ -3377,7 +3377,7 @@ _02170108:
bl func_ov00_02079ab4
cmp r0, #0
beq _02170174
mov r0, fp
mov r0, r11
add r1, sp, #8
bl func_ov21_02170388
cmp r0, #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, sl, fp, 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, sl, fp, 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,27 +3414,27 @@ _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, sl, fp, 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]
mov sl, r0
ldr r4, [r9, #4]
mov r10, r0
ldr r0, [r1]
add r1, sp, #8
add r2, sp, #0x1c
str r4, [sp, #0xc]
str r3, [sp]
bl func_ov00_020793b8
ldr r1, [sl, #0x48]
ldr r1, [r10, #0x48]
ldr r0, _0217032c ; =data_027e0e60
str r1, [sp, #0x10]
ldr r1, [sl, #0x4c]
ldr r1, [r10, #0x4c]
ldr r0, [r0]
str r1, [sp, #0x14]
ldr r3, [sl, #0x50]
ldr r3, [r10, #0x50]
add r1, sp, #0x10
mov r2, #0
str r3, [sp, #0x18]
@@ -3451,11 +3451,11 @@ _0217022c:
mov r0, r5
cmp r0, r6
bgt _02170304
rsb fp, r4, #0
rsb r11, r4, #0
_02170240:
cmp r4, #0
movge r0, r4
movlt r0, fp
movlt r0, r11
cmp r0, r6
bge _02170268
cmp r5, #0
@@ -3464,16 +3464,16 @@ _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, [sl, #0x21c]
ldr r0, [r10, #0x21c]
cmp r0, r8
ldreq r0, [sl, #0x220]
ldreq r0, [r10, #0x220]
cmpeq r0, r1
moveq r2, #1
cmp r2, #0
@@ -3487,7 +3487,7 @@ _02170268:
bl func_ov00_02079ab4
cmp r0, #0
beq _021702f8
mov r0, sl
mov r0, r10
add r1, sp, #8
bl func_ov21_02170388
cmp r0, #0
@@ -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, sl, fp, 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, sl, fp, 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
+218 -218
View File
File diff suppressed because it is too large Load Diff
+145 -145
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, sl, 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, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
ldr r1, [r4]
mov r0, #0
str r1, [sp, #0xc]
@@ -3844,21 +3844,21 @@ 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, sl, 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 sl, sb, r2, sl
mov r8, sb, asr #0x1f
mla sl, r8, r1, sl
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
mov r0, r0, lsr #0xc
adc r8, sl, #0
adc r8, r10, #0
orr r0, r0, r8, lsl #20
str r0, [sp]
adds r0, r7, #0x800
@@ -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, sl, 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, sl, 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, sl, 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, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
_02172a44:
add r0, r4, #0x184
mov r2, #0
@@ -6453,16 +6453,16 @@ _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 sl, sp, #0x1c
add r10, sp, #0x1c
add r5, sp, #0
_02172a74:
mov r8, r6
_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
@@ -6477,7 +6477,7 @@ _02172a78:
cmp r0, #0x24
bne _02172ae4
mov r0, r4
mov r1, sl
mov r1, r10
bl func_ov00_0208b7d0
cmp r0, #0
beq _02172ae4
@@ -6486,7 +6486,7 @@ _02172a78:
cmp r0, #0
addne sp, sp, #0x2c
movne r0, #2
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, 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, sl, 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, sl, fp, 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]
@@ -7054,7 +7054,7 @@ _02173260:
cmp r0, #0
beq _02173330
ldrh r1, [r6, #0x78]
mov fp, #0
mov r11, #0
add r0, r4, #0x48
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -7062,26 +7062,26 @@ _02173260:
mov r2, r3, lsl #0x1
ldrsh r2, [r1, r2]
add r1, r1, r3, lsl #1
umull sl, r3, r2, r8
mla r3, r2, fp, r3
umull r10, r3, r2, r8
mla r3, r2, r11, r3
mov ip, r2, asr #0x1f
mla r3, ip, r8, r3
adds sl, sl, #0x800
mov r2, fp
adds r10, r10, #0x800
mov r2, r11
adc r2, r3, r2
mov r3, sl, lsr #0xc
mov r3, r10, lsr #0xc
orr r3, r3, r2, lsl #20
ldr r2, _021734dc ; =0x00000733
str r3, [r4, #0x60]
str r2, [r4, #0x64]
ldrsh r3, [r1, #2]
mov r1, #0
umull fp, sl, r3, sb
mla sl, r3, r1, sl
umull r11, r10, r3, r9
mla r10, r3, r1, r10
mov r2, r3, asr #0x1f
mla sl, r2, sb, sl
adds r2, fp, #0x800
adc r1, sl, #0
mla r10, r2, r9, r10
adds r2, r11, #0x800
adc r1, r10, #0
mov r2, r2, lsr #0xc
orr r2, r2, r1, lsl #20
str r2, [r4, #0x68]
@@ -7112,9 +7112,9 @@ _02173364:
sub r0, r0, #0x4c0
str r0, [sp, #8]
ldr r0, _021734dc ; =0x00000733
mov fp, r5
mov r11, r5
sub r7, r0, #0x400
add sb, r6, #0x184
add r9, r6, #0x184
mov r8, r7
_02173388:
ldrb r1, [sp, #0x13]
@@ -7127,22 +7127,22 @@ _02173388:
add r1, sp, #0x10
strb r2, [sp, #0x10]
bl func_ov00_020840c4
movs sl, r0
movs r10, r0
beq _021734a8
ldr r1, [r0]
ldr r1, [r1, #0x1c]
blx r1
cmp r0, #0x24
bne _021734a8
mov r0, sl
add r1, sb, #0x400
mov r0, r10
add r1, r9, #0x400
bl func_ov00_0208b7d0
cmp r0, #0
beq _021734a8
mov r0, sl
mov r0, r10
add r1, sp, #0x14
str fp, [sp, #0x14]
str fp, [sp, #0x18]
str r11, [sp, #0x14]
str r11, [sp, #0x18]
bl func_ov14_0212de90
cmp r0, #0
beq _021734a8
@@ -7160,11 +7160,11 @@ _02173388:
ldrsh ip, [r1, r2]
add r2, r1, r3, lsl #1
mov r1, #0
umull sl, lr, ip, r7
umull r10, lr, ip, r7
mla lr, ip, r1, lr
mov r3, ip, asr #0x1f
mla lr, r3, r7, lr
adds r3, sl, #0x800
adds r3, r10, #0x800
adc r1, lr, #0
mov r3, r3, lsr #0xc
orr r3, r3, r1, lsl #20
@@ -7175,9 +7175,9 @@ _02173388:
ldrsh ip, [r2, #2]
umull r2, r1, ip, r8
mla r1, ip, r3, r1
mov sl, ip, asr #0x1f
mov r10, ip, asr #0x1f
adds r3, r2, #0x800
mla r1, sl, r8, r1
mla r1, r10, r8, r1
adc r1, r1, #0
mov r2, r3, lsr #0xc
orr r2, r2, r1, lsl #20
@@ -7197,7 +7197,7 @@ _021734a8:
cmp r4, #1
ble _02173364
add sp, sp, #0x10c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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,59 +11638,59 @@ _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, sl, 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, sl, pc}
ldr sl, _021770e8 ; =data_027e0e60
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
and r6, r7, #0xff
_021770a0:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
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, sl, 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,9 +13670,9 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x50
mov sl, r0
mov r10, r0
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r2, r0
ldr r1, _02179014 ; =data_027e0e60
@@ -13685,7 +13685,7 @@ func_ov23_02178ab0: ; 0x02178ab0
mov r0, r4
bl func_ov00_02083e58
mov r7, #0
ldr fp, _02179018 ; =data_02050f54
ldr r11, _02179018 ; =data_02050f54
str r0, [sp]
mov r8, r7
str r7, [sp, #0x44]
@@ -13702,8 +13702,8 @@ _02178b10:
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
mov r0, r1, lsl #0x1
ldrsh r2, [fp, r0]
add r0, fp, r1, lsl #1
ldrsh r2, [r11, r0]
add r0, r11, r1, lsl #1
ldrsh r1, [r0, #2]
mov r0, r2, asr #0x1f
mov r3, r0, lsl #0xb
@@ -13730,7 +13730,7 @@ _02178b10:
add r0, r6, r1
str r0, [r5, #8]
str r6, [sp, #0x3c]
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r2, [r0]
mov r1, r5
@@ -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
@@ -13778,25 +13778,25 @@ _02178c2c:
ldr r1, _0217901c ; =0x00000333
add r0, sp, #0x44
bl func_01fffbec
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r1, [sp, #0x44]
str r1, [r0]
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r1, [sp, #0x4c]
b _02178c94
_02178c78:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, #0
str r1, [r0]
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, #0
_02178c94:
str r1, [r0, #8]
ldrb r0, [sl, #0x31]
ldrb r0, [r10, #0x31]
cmp r0, #0
beq _02178e48
ldr r0, _02179020 ; =data_027e0d38
@@ -13805,11 +13805,11 @@ _02178c94:
bl func_ov00_020a5e9c
cmp r0, #0x2e
bne _02178e48
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r0, [r0]
cmp r0, #0x800
mov r0, sl
mov r0, r10
blt _02178ce4
bl _ZN13LinkStateBase12GetPlayerVelEv
mvn r1, #0xcc
@@ -13821,7 +13821,7 @@ _02178ce4:
ldr r0, [r0]
rsb r1, r1, #0
cmp r0, r1
mov r0, sl
mov r0, r10
bgt _02178d10
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, #0xcd
@@ -13832,11 +13832,11 @@ _02178d10:
mov r1, #0
str r1, [r0]
_02178d1c:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r0, [r0, #8]
cmp r0, #0x5800
mov r0, sl
mov r0, r10
blt _02178d44
bl _ZN13LinkStateBase12GetPlayerVelEv
mvn r1, #0xcc
@@ -13846,7 +13846,7 @@ _02178d44:
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r0, [r0, #8]
cmp r0, #0x4800
mov r0, sl
mov r0, r10
bgt _02178d68
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, #0xcd
@@ -13857,20 +13857,20 @@ _02178d68:
mov r1, #0
str r1, [r0, #8]
_02178d74:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r1, [r0]
str r1, [sp, #0x20]
ldr r1, [r0, #4]
str r1, [sp, #0x24]
ldr r1, [r0, #8]
mov r0, sl
mov r0, r10
str r1, [sp, #0x28]
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r0, [r0]
cmp r0, #0
beq _02178e48
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r0, [r0]
cmp r0, #0
@@ -13880,7 +13880,7 @@ _02178d74:
str r0, [sp, #0x20]
b _02178de8
_02178dcc:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r0, [r0]
cmp r0, #0
@@ -13908,12 +13908,12 @@ _02178de8:
and r0, r0, #3
cmp r0, #2
beq _02178e48
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, #0
str r1, [r0]
_02178e48:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r2, [r0, #4]
ldr r1, _02179024 ; =0xfffff99a
@@ -13921,10 +13921,10 @@ _02178e48:
add r0, r0, r1
cmp r2, r0
bgt _02178f10
ldrb r0, [sl, #0x31]
ldrb r0, [r10, #0x31]
cmp r0, #0
bne _02178f00
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase19GetCurrentCharacterEv
cmp r0, #0
beq _02178e90
@@ -13933,26 +13933,26 @@ _02178e48:
b _02178eb4
_02178e90:
ldr r1, _02179028 ; =data_ov23_0217ab30
mov r0, sl
mov r0, r10
mov r2, #1
bl _ZN13LinkStateBase18func_ov00_020a8a4cEii
b _02178eb4
_02178ea4:
ldr r1, _0217902c ; =data_ov23_0217ab20
mov r0, sl
mov r0, r10
mov r2, #1
bl _ZN13LinkStateBase18func_ov00_020a8a4cEii
_02178eb4:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
ldr r2, _02179024 ; =0xfffff99a
ldr r1, [sp]
add r1, r1, r2
str r1, [r0, #4]
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase20GetPlayerControlDataEv
mov r4, r0
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
mov r2, r0
mov r0, r4
@@ -13961,21 +13961,21 @@ _02178eb4:
ldr r3, [r3, #0x70]
blx r3
mov r0, #1
strb r0, [sl, #0x31]
strb r0, [r10, #0x31]
_02178f00:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
mvn r1, #0x7a
str r1, [r0, #4]
_02178f10:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerPosEv
add r3, sp, #0x14
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [sp]
str r0, [sp, #0x18]
ldr r0, [sl, #0xac]
ldr r0, [r10, #0xac]
cmp r0, #0
beq _02178f80
ldr r1, [r0, #0x20]
@@ -13997,44 +13997,44 @@ _02178f10:
add r1, r2, r1
str r1, [r0, #0x30]
_02178f80:
ldrb r0, [sl, #0x31]
ldrb r0, [r10, #0x31]
cmp r0, #0
addeq sp, sp, #0x50
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, pc}
mov r0, sl
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r0, [r0]
cmp r0, #0
bne _02178fd8
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
ldr r0, [r0, #8]
cmp r0, #0
addeq sp, sp, #0x50
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02178fd8:
mov r0, sl
mov r0, r10
bl _ZN13LinkStateBase12GetPlayerVelEv
mov r1, r0
ldr r0, [r1]
ldr r1, [r1, #8]
bl func_01ffa0f4
mov r1, r0, lsl #0x10
mov r0, sl
mov r0, r10
mov r4, r1, asr #0x10
bl _ZN13LinkStateBase14GetPlayerAngleEv
mov r1, r4
mov r2, #0x3e8
bl func_0202b154
add sp, sp, #0x50
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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
+84 -84
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, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x54
mov r5, r0
ldr r0, [r5, #0x18]
@@ -159,40 +159,40 @@ _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
mov r7, #1
_0216d8b4:
ldrb sl, [r5, #0x15]
ldrb r10, [r5, #0x15]
ldrb r0, [r5, #0x65]
add r0, sl, r0
cmp sl, r0
add r0, r10, r0
cmp r10, r0
bge _0216d8fc
and r4, sb, #0xff
and r4, r9, #0xff
_0216d8cc:
ldr r0, [r6]
mov r1, r8
mov r2, r7
strb r4, [sp, #4]
strb sl, [sp, #5]
strb r10, [sp, #5]
bl func_ov00_020826a0
ldrb r1, [r5, #0x15]
ldrb r0, [r5, #0x65]
add sl, sl, #1
add r10, r10, #1
add r0, r1, r0
cmp sl, r0
cmp r10, r0
blt _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,11 +214,11 @@ _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
add sl, r8, #0x400
add r10, r8, #0x400
add r3, r3, r6, asr #1
str r3, [sp, #0x44]
bic r1, r1, #0x1f
@@ -231,8 +231,8 @@ _0216d914:
str r0, [sp, #0x50]
ldmia r1, {r0, r1, r2}
stmia r8, {r0, r1, r2}
str sb, [sp, #0x3c]
str sl, [sp, #0x40]
str r9, [sp, #0x3c]
str r10, [sp, #0x40]
add r0, sp, #0x3c
add r3, sp, #0x30
ldmia r0, {r0, r1, r2}
@@ -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, sl, 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,16 +401,16 @@ 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
ldr r2, [r0]
mov sl, r0
mov r10, r0
ldr r2, [r2, #0x88]
blx r2
cmp r0, #0
addeq sp, sp, #0x30
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldrh r1, [sl, #0xc]
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
mov r1, r1, asr #0x4
@@ -421,59 +421,59 @@ func_ov24_0216db90: ; 0x0216db90
ldrsh r1, [r3, r4]
ldrsh r2, [r3, r2]
blx func_01ff8214
ldr r2, [sl, #0x70]
ldr r1, [sl, #0x1c]
ldr r0, [sl, #0x68]
ldr r2, [r10, #0x70]
ldr r1, [r10, #0x1c]
ldr r0, [r10, #0x68]
mov r7, #0
str r1, [sp, #4]
str r2, [sp, #8]
str r0, [sp]
ldrb r0, [sl, #0x64]
ldrb r0, [r10, #0x64]
cmp r0, #0
addle sp, sp, #0x30
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mvn r5, #0
mov r6, r7
add r4, sp, #0xc
add fp, sp, #0
add r11, sp, #0
_0216dc1c:
cmp r7, #0
ldrne r0, [sp]
mov r8, #0
addne r0, r0, #0x1000
strne r0, [sp]
ldrb r0, [sl, #0x65]
ldrb r0, [r10, #0x65]
cmp r0, #0
ble _0216dc90
mov sb, r8
mov r9, r8
_0216dc40:
ldr r0, [sl, #0x70]
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
streqh r6, [sl, #0x82]
strneh r5, [sl, #0x82]
add r0, sl, #0x78
streqh r6, [r10, #0x82]
strneh r5, [r10, #0x82]
add r0, r10, #0x78
ldr r3, [r0]
mov r1, r4
ldr r3, [r3, #0x14]
mov r2, fp
mov r2, r11
blx r3
ldrb r0, [sl, #0x65]
ldrb r0, [r10, #0x65]
add r8, r8, #1
add sb, sb, #0x1000
add r9, r9, #0x1000
cmp r8, r0
blt _0216dc40
_0216dc90:
ldrb r0, [sl, #0x64]
ldrb r0, [r10, #0x64]
add r7, r7, #1
cmp r7, r0
blt _0216dc1c
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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,29 +14054,29 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov sl, r0
ldrb r7, [sl, #0x14]
mov sb, r1
mov r10, r0
ldrb r7, [r10, #0x14]
mov r9, r1
add r0, r7, #2
cmp r7, r0
bge _02178ee8
ldr r4, _02179010 ; =data_027e0e60
add r5, sp, #2
mov fp, #1
mov r11, #1
_02178e4c:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
add r0, r8, #2
cmp r8, r0
bge _02178ed4
and r6, r7, #0xff
_02178e60:
cmp sb, #0
cmp r9, #0
ldr r0, [r4]
beq _02178e98
mov r1, r5
mov r2, fp
mov r2, r11
strb r6, [sp, #2]
strb r8, [sp, #3]
bl func_ov00_02082680
@@ -14098,25 +14098,25 @@ _02178e98:
mov r3, #0x35
bl func_ov00_02084d24
_02178ec0:
ldrb r0, [sl, #0x15]
ldrb r0, [r10, #0x15]
add r8, r8, #1
add r0, r0, #2
cmp r8, r0
blt _02178e60
_02178ed4:
ldrb r0, [sl, #0x14]
ldrb r0, [r10, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _02178e4c
_02178ee8:
ldrh r4, [sl, #0x2a]
ldrh r4, [r10, #0x2a]
ldr r1, _02179014 ; =data_027e0f6c
add r0, sp, #0xc
ldr r1, [r1]
mov r2, r4
ldrh r5, [sl, #0x26]
ldrh r6, [sl, #0x28]
ldrh r5, [r10, #0x26]
ldrh r6, [r10, #0x28]
bl func_ov00_02093a4c
ldr r1, _02179014 ; =data_027e0f6c
add r0, sp, #8
@@ -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, sl, fp, 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, sl, fp, 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
+243 -243
View File
File diff suppressed because it is too large Load Diff
+241 -241
View File
File diff suppressed because it is too large Load Diff
+262 -262
View File
File diff suppressed because it is too large Load Diff
+73 -73
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, sl, 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,47 +5536,47 @@ 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
ldr sl, _02171f74 ; =data_027e0e60
ldr r10, _02171f74 ; =data_027e0e60
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
and r6, r7, #0xff
_02171ee8:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
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, sl, 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, sl, 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, sl, 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,53 +5912,53 @@ 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
ldr sl, _02172450 ; =data_027e0e60
ldr r10, _02172450 ; =data_027e0e60
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
and r6, r7, #0xff
_021723c4:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
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, sl, 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, sl, 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,34 +6291,34 @@ _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, sl, 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 sl, r0
mov r10, r0
ldrb r4, [r7, #0x25]
ldrb r5, [r7, #0x26]
ldrb r6, [r7, #0x24]
mov r3, #0
mov r0, r7
str r4, [sl, #0x1f8]
str r5, [sl, #0x1fc]
str r6, [sl, #0x200]
str r3, [sl, #0x204]
str r3, [sl, #0x208]
str r4, [r10, #0x1f8]
str r5, [r10, #0x1fc]
str r6, [r10, #0x200]
str r3, [r10, #0x204]
str r3, [r10, #0x208]
mov r1, #1
mov r8, r2
str r3, [sl, #0x20c]
str r3, [r10, #0x20c]
bl _ZNK11ItemManager13GetFairyLevelEi
cmp r0, #0
beq _02172870
cmp r0, #1
rsbeq r0, r4, #0x14
streq r0, [sl, #0x204]
streq r0, [r10, #0x204]
b _02172878
_02172870:
rsb r0, r4, #0xa
str r0, [sl, #0x204]
str r0, [r10, #0x204]
_02172878:
mov r0, r7
mov r1, #2
@@ -6327,11 +6327,11 @@ _02172878:
beq _0217289c
cmp r0, #1
rsbeq r0, r5, #0x14
streq r0, [sl, #0x208]
streq r0, [r10, #0x208]
b _021728a4
_0217289c:
rsb r0, r5, #0xa
str r0, [sl, #0x208]
str r0, [r10, #0x208]
_021728a4:
mov r0, r7
mov r1, #0
@@ -6340,23 +6340,23 @@ _021728a4:
beq _021728c8
cmp r0, #1
rsbeq r0, r6, #0x14
streq r0, [sl, #0x20c]
streq r0, [r10, #0x20c]
b _021728d0
_021728c8:
rsb r0, r6, #0xa
str r0, [sl, #0x20c]
str r0, [r10, #0x20c]
_021728d0:
add r3, sl, #0x1f8
mov r0, sl
mov r1, sb
add r3, r10, #0x1f8
mov r0, r10
mov r1, r9
mov r2, r8
str r3, [r8, #0x38]
mov r3, #6
strh r3, [r8, #0x3c]
bl func_ov14_02144d70
mov r0, sl
mov r0, r10
bl func_ov28_02172b40
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov28_0217280c
_021728fc: .word gItemManager
+273 -273
View File
File diff suppressed because it is too large Load Diff
+314 -314
View File
File diff suppressed because it is too large Load Diff
+96 -96
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,10 +1464,10 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x5c
mov sl, r0
add r0, sl, #0x1d8
mov r10, r0
add r0, r10, #0x1d8
mov r1, #0x3800
str r1, [r0, #0x7c]
mov r1, #0x4000
@@ -1477,11 +1477,11 @@ func_ov31_0217cfd4: ; 0x0217cfd4
str r2, [r0, #0x80]
strh r1, [r0, #0x86]
mov r1, #0
strb r1, [sl, #0x285]
strb r1, [r10, #0x285]
bl func_ov14_02145e48
ldr r1, [sl, #0x1e8]
ldr r1, [r10, #0x1e8]
mov r2, #0x1000
mov r0, sl
mov r0, r10
str r2, [r1, #0x10]
bl func_ov31_0217d588
add r0, sp, #0x30
@@ -1491,7 +1491,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
str r1, [sp, #0x4c]
str r1, [sp, #0x50]
bl func_ov00_020c3348
add r0, sl, #0x48
add r0, r10, #0x48
add r3, sp, #0x24
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1515,7 +1515,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
add r0, r0, #0xe2
str r0, [sp, #0xc]
ldr r0, _0217d3ec ; =0x49544150
ldr fp, _0217d3f4 ; =gItemManager
ldr r11, _0217d3f4 ; =gItemManager
add r0, r0, #0x1200
str r0, [sp, #0x18]
ldr r0, _0217d3f8 ; =0x49545452
@@ -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
@@ -1538,7 +1538,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
add r0, r0, #0xf2
str r0, [sp, #4]
_0217d0f8:
mov r0, sl
mov r0, r10
ldr r2, [r0]
mov r1, r7
ldr r2, [r2, #0x114]
@@ -1590,21 +1590,21 @@ _0217d1a4:
beq _0217d21c
b _0217d25c
_0217d1b4:
ldr r0, [fp]
ldr r0, [r11]
mov r1, #4
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1cc:
ldr r0, [fp]
ldr r0, [r11]
mov r1, #5
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
moveq r8, r4
b _0217d25c
_0217d1e4:
ldr r0, [fp]
ldr r0, [r11]
mov r1, #7
bl _ZNK11ItemManager7HasItemEi
cmp r0, #0
@@ -1620,7 +1620,7 @@ _0217d1fc:
add r5, r5, #1
b _0217d25c
_0217d21c:
ldr r0, [sl, #0x470]
ldr r0, [r10, #0x470]
cmp r0, #2
bne _0217d240
add r0, r6, #2
@@ -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,19 +1668,19 @@ _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
mov r0, #0
str r0, [sp, #0x54]
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
sub r0, r0, #0x1000
str r0, [sp, #0x24]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
add r0, r0, #0x800
str r0, [sp, #0x28]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
add r0, r0, #0x2800
str r0, [sp, #0x2c]
bl func_ov31_0217bdb8
@@ -1692,13 +1692,13 @@ _0217d2c8:
add r2, sp, #0x24
add r3, sp, #0x30
bl func_ov00_020c4048
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
add r0, r0, #0x1000
str r0, [sp, #0x24]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
add r0, r0, #0x800
str r0, [sp, #0x28]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
add r0, r0, #0x2800
str r0, [sp, #0x2c]
bl func_ov31_0217bdb8
@@ -1710,13 +1710,13 @@ _0217d2c8:
add r2, sp, #0x24
add r3, sp, #0x30
bl func_ov00_020c4048
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
add r0, r0, #0x1000
str r0, [sp, #0x24]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
add r0, r0, #0x800
str r0, [sp, #0x28]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
add r0, r0, #0x2800
str r0, [sp, #0x2c]
bl func_ov31_0217bdb8
@@ -1729,17 +1729,17 @@ _0217d2c8:
add r3, sp, #0x30
bl func_ov00_020c4048
mov r0, #0
str r0, [sl, #0x478]
str r0, [r10, #0x478]
ldr r0, _0217d400 ; =data_027e0dbc
blx func_ov00_0207ba90
ldrb r2, [r0, #0xb]
mov r1, #0
mov r0, sl
str r2, [sl, #0x47c]
strb r1, [sl, #0x480]
mov r0, r10
str r2, [r10, #0x47c]
strb r1, [r10, #0x480]
bl func_ov14_021450f0
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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,41 +2843,41 @@ _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, sl, fp, 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
ldr r4, _0217e284 ; =data_ov31_021822b0
ldr fp, _0217e288 ; =data_027e0ce0
mov sl, #0
ldr r11, _0217e288 ; =data_027e0ce0
mov r10, #0
_0217e05c:
cmp sl, #6
cmp r10, #6
ldreq r0, [r5]
ldreqh r0, [r0, #0xb6]
cmpeq r0, #1
ldreq r8, [r4, #0xb0]
ldreq sb, [r4, #0x104]
ldreq r9, [r4, #0x104]
beq _0217e0c0
cmp sl, #7
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 sl, #8
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, sl, lsl #2]
ldr r8, [r0, r10, lsl #2]
ldr r0, _0217e290 ; =data_ov31_0218236c
ldr sb, [r0, sl, lsl #2]
ldr r9, [r0, r10, lsl #2]
_0217e0c0:
ldr r1, [fp, #4]
ldr r1, [r11, #4]
mov r0, #0x14
mov r2, #4
bl _ZN9SysObjectnwEmPjj
@@ -2892,13 +2892,13 @@ _0217e0c0:
_0217e0f0:
ldr r1, _0217e294 ; =data_ov31_021840a8
mov r2, #4
str r0, [r1, sl, lsl #2]
ldr r1, [fp, #4]
str r0, [r1, r10, lsl #2]
ldr r1, [r11, #4]
mov r0, #0x14
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]
@@ -2906,9 +2906,9 @@ _0217e0f0:
strb r1, [r0, #0x10]
_0217e128:
ldr r1, _0217e298 ; =data_ov31_021840f0
str r0, [r1, sl, lsl #2]
add sl, sl, #1
cmp sl, #0x12
str r0, [r1, r10, lsl #2]
add r10, r10, #1
cmp r10, #0x12
blt _0217e05c
ldr r1, _0217e288 ; =data_027e0ce0
mov r0, #0x14
@@ -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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r4, [r1, #0x38]
str r0, [sp]
@@ -7595,7 +7595,7 @@ func_ov31_02181610: ; 0x02181610
mov r0, r0, lsl #0x10
mov r2, r0, lsr #0xd
ldr r0, [sp]
ldrh sl, [sp, #0x34]
ldrh r10, [sp, #0x34]
str r2, [r0, #0x18]
ldrh r1, [r1, #0x30]
ldr r2, [r0, #0x14]
@@ -7605,17 +7605,17 @@ func_ov31_02181610: ; 0x02181610
cmp r2, r1, lsl #3
strlo r2, [sp, #8]
ldr r0, [sp, #8]
and r3, sl, #0x3e0
and r3, r10, #0x3e0
cmp r0, r2
movlo r1, r0
ldrlo r0, [sp]
and r2, sl, #0x7c00
and r2, r10, #0x7c00
strlo r1, [r0, #0x14]
ldr r1, [sp, #8]
mov r5, r2, asr #0xa
ldr r2, [sp]
mov sb, r1, lsr #0x1
and r1, sl, #0x1f
mov r9, r1, lsr #0x1
and r1, r10, #0x1f
add r1, r1, #0x1f
mov r0, #0x1f000
mov r1, r1, lsl #0xc
@@ -7626,7 +7626,7 @@ func_ov31_02181610: ; 0x02181610
mul r1, r6, r0
add r1, r1, #0x800
add r0, r4, #0x1f
mov fp, r1, asr #0xc
mov r11, r1, asr #0xc
mov r1, r0, lsl #0xc
mov r0, #0x1f000
bl Divide
@@ -7639,31 +7639,31 @@ func_ov31_02181610: ; 0x02181610
mov r1, r1, lsl #0xc
bl Divide
ldr r3, [sp, #0x30]
mov r1, sl, lsl #0x1b
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
_02181708:
ldrh sl, [r7]
ldrh r10, [r7]
add r2, r2, #1
add r7, r7, #2
mov r0, sl, asr #0xa
mov r0, r10, asr #0xa
and r3, r0, #0x1f
and r0, sl, #0x1f
mov sl, sl, asr #0x5
and sl, sl, #0x1f
add r0, r0, sl
add sl, r3, r0
mul r0, sl, fp
and r0, r10, #0x1f
mov r10, r10, asr #0x5
and r10, r10, #0x1f
add r0, r0, r10
add r10, r3, r0
mul r0, r10, r11
add r0, r0, r1, lsr #15
mov r3, r0, asr #0xc
mul r0, sl, r6
mul r0, r10, r6
add r0, r0, r4, lsl #12
mov ip, r0, asr #0xc
mul r0, sl, lr
mul r0, r10, lr
add r0, r0, r5, lsl #12
cmp r3, #0x1f
movgt r3, #0x1f
@@ -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,23 +7683,23 @@ _02181780:
ldr r0, [r0, #0xc]
bl func_0200e2a4
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, fp, 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]
mov fp, r0, lsr #0x1
cmp fp, #0
mov r11, r0, lsr #0x1
cmp r11, #0
ldr lr, [r4, #0xc]
ldr r5, [r4, #0x10]
mov r6, #0
@@ -7712,26 +7712,26 @@ _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 sl, r3, #0x7c00
and r10, r3, #0x7c00
mul r0, r1, r2
add r6, r6, #1
mov r1, sl, asr #0xa
and sl, r3, #0x1f
mul r3, sb, r2
mov r1, r10, asr #0xa
and r10, r3, #0x1f
mul r3, r9, r2
rsb r2, r2, #0x1000
mla r0, r1, r2, r0
mov r1, r8, asr #0x5
mla r7, r1, r2, r7
mov r1, r7, asr #0xc
mla r2, sl, r2, r3
mla r2, r10, r2, r3
mov r1, r1, lsl #0x5
mov r3, r0, asr #0xc
orr r0, r1, r2, asr #12
orr r0, r0, r3, lsl #10
cmp r6, fp
cmp r6, r11
strh r0, [r5], #2
blt _021817d4
_02181848:
@@ -7743,7 +7743,7 @@ _02181848:
ldr r3, [r4, #0x14]
mov r0, #1
bl func_02017d30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end func_ov31_02181798
.global func_ov31_0218186c
+175 -175
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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0217e934:
add r0, r5, #0x100
ldrsb r1, [r0, #0xa0]
@@ -3472,12 +3472,12 @@ _0217e934:
str r2, [sp, #0xc]
ldrsb r2, [r0, #0xa8]
str r2, [sp, #8]
ldrsb fp, [r0, #0xa9]
ldrsb r11, [r0, #0xa9]
ldrsb r6, [r0, #0xaa]
ldrsb r7, [r0, #0xab]
ldrsb r8, [r0, #0xac]
ldrsh sb, [r0, #0xae]
ldrh sl, [r0, #0xb0]
ldrsh r9, [r0, #0xae]
ldrh r10, [r0, #0xb0]
ldmia r1, {r0, r1, r2}
stmia ip, {r0, r1, r2}
strb r3, [r5, #0x1a0]
@@ -3532,17 +3532,17 @@ _0217ea20:
ldr r0, [sp, #8]
add sp, sp, #0x78
strb r0, [r5, #0x1a8]
strb fp, [r5, #0x1a9]
strb r11, [r5, #0x1a9]
strb r6, [r5, #0x1aa]
strb r7, [r5, #0x1ab]
strb r8, [r5, #0x1ac]
add r0, r5, #0x100
strh sb, [r0, #0xae]
strh sl, [r0, #0xb0]
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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r2, #0x2b8
str r2, [sp, #0x28]
ldrsb r1, [r0, #2]
@@ -3824,38 +3824,38 @@ _0217ee34:
mov r0, r1, lsl #0x1
ldrsh r3, [r8, r0]
add r0, r8, r1, lsl #1
ldr sl, [r7, #0x48]
mov fp, r3, asr #0x1f
ldr r10, [r7, #0x48]
mov r11, r3, asr #0x1f
umull lr, ip, r6, r3
mla ip, r6, fp, ip
mla ip, r6, r11, ip
mla ip, r5, r3, ip
adds r3, lr, #0x800
str sl, [sp, #0x1c]
str r10, [sp, #0x1c]
ldrsh r2, [r0, #2]
ldr r0, [r7, #0x4c]
adc fp, ip, #0
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, fp, lsl #20
orr r3, r3, r11, lsl #20
str r0, [sp, #8]
ldr r0, _0217efcc ; =data_027e0f90
add r1, sp, #0x1c
add sl, sl, r3
add r10, r10, r3
mov r3, r1
str sl, [r3]
str r10, [r3]
ldr r3, [sp, #8]
umull fp, sl, r6, r2
mla sl, r6, r3, sl
adds r3, fp, #0x800
mla sl, r5, r2, sl
adc r2, sl, #0
umull r11, r10, r6, r2
mla r10, r6, r3, r10
adds r3, r11, #0x800
mla r10, r5, r2, r10
adc r2, r10, #0
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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r1, _0218027c ; =0x000005ed
mov r7, r0
@@ -5340,14 +5340,14 @@ func_ov32_021800e0: ; 0x021800e0
ldr r4, _02180280 ; =data_02050f54
str r6, [r7, #0x12c]
add r5, r7, #0x48
mov fp, #0x1800
mov r11, #0x1800
_02180108:
add r3, sp, #0
ldmia r5, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrsh r1, [r7, #0x78]
mov r2, #0x1800
ldr sl, [sp]
ldr r10, [sp]
sub r1, r1, #0x8000
mov r1, r1, lsl #0x10
mov r1, r1, lsr #0x10
@@ -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, sl, r8
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
@@ -5377,13 +5377,13 @@ _02180108:
mov r2, r2, asr #0x4
add r2, r4, r2, lsl #2
ldrsh ip, [r2, #2]
umull r8, r2, ip, fp
mla r2, ip, sb, r2
mov sl, ip, asr #0x1f
adds sb, r8, #0x800
mla r2, sl, fp, r2
umull r8, r2, ip, r11
mla r2, ip, r9, r2
mov r10, ip, asr #0x1f
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, sl, fp, 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,22 +5597,22 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
mov sl, r0
add r0, sl, #0x300
mov r10, r0
add r0, r10, #0x300
ldrsh r1, [r0, #0xfc]
ldrsh r2, [sl, #0x78]
ldrsh r2, [r10, #0x78]
ldr r0, _0218084c ; =0x0000071c
ldr r3, _02180850 ; =data_027e0fac
smlabb r1, r1, r0, r2
strh r1, [sl, #0x78]
strh r1, [r10, #0x78]
ldr r0, _02180854 ; =data_027e0f94
ldrsh r4, [r3]
add r8, sp, #0x18
ldmia r0, {r0, r1, r2}
stmia r8, {r0, r1, r2}
ldrsh r1, [sl, #0x78]
ldrsh r1, [r10, #0x78]
ldr r0, _02180858 ; =data_02050f54
mov r3, r4, lsl #0x10
sub r1, r1, r4
@@ -5634,9 +5634,9 @@ func_ov32_021804a4: ; 0x021804a4
adc r5, r5, #0
mov r6, r6, lsr #0xc
orr r6, r6, r5, lsl #20
add fp, r1, r6
str fp, [sp, #0x18]
ldrsh r5, [sl, #0x78]
add r11, r1, r6
str r11, [sp, #0x18]
ldrsh r5, [r10, #0x78]
mov r3, r3, lsl #0x1
ldr r7, [sp, #0x20]
sub r4, r5, r4
@@ -5657,14 +5657,14 @@ 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 r1, sl, #0x400
add r9, r7, r2
str r9, [sp, #0x20]
add r1, r10, #0x400
ldrsh r2, [r1, #2]
mov r1, r6, asr #0x1f
str r1, [sp, #4]
ldr r1, _0218085c ; =0x00000333
ldrsh r4, [sl, #0x78]
ldrsh r4, [r10, #0x78]
mov r3, r1, lsr #0x1
ldr lr, [sp, #0x1c]
add r1, r4, r2
@@ -5708,7 +5708,7 @@ func_ov32_021804a4: ; 0x021804a4
adc r3, r7, #0
mov r6, r6, lsr #0xc
orr r6, r6, r3, lsl #20
add r3, fp, r6
add r3, r11, r6
str r3, [sp, #0x18]
mov r3, ip
umull r7, r6, r5, r4
@@ -5719,48 +5719,48 @@ 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
bl func_ov00_020c5288
cmp r0, #0
beq _021806bc
add r0, sl, #0x21c
add r0, r10, #0x21c
mov r1, #3
mov r2, #0
bl func_ov00_020c515c
b _021806d4
_021806bc:
ldr r0, [sp, #0x18]
str r0, [sl, #0x48]
str r0, [r10, #0x48]
ldr r0, [sp, #0x1c]
str r0, [sl, #0x4c]
str r0, [r10, #0x4c]
ldr r0, [sp, #0x20]
str r0, [sl, #0x50]
str r0, [r10, #0x50]
_021806d4:
mov r0, sl
mov r0, r10
ldr r1, [r0]
ldr r1, [r1, #0x104]
blx r1
ldrh r7, [sl, #0xe4]
ldrh r7, [r10, #0xe4]
mov r8, #0
cmp r7, #0
ble _021807b4
cmp r7, #0
add sb, sl, #0xb8
add r9, r10, #0xb8
ble _021807b4
ldr r6, _02180864 ; =data_027e0f6c
ldr r5, _02180854 ; =data_027e0f94
ldr r4, _02180868 ; =0x0000ffff
add fp, sp, #0x14
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
ldr r1, [r6]
mov r0, fp
mov r0, r11
bl func_ov00_02093a1c
ldr r0, [sp, #0x14]
and r0, r0, #0x1f
@@ -5768,13 +5768,13 @@ _02180710:
bne _02180764
ldr r0, [r5]
mov r1, #3
str r0, [sl, #0x48]
str r0, [r10, #0x48]
ldr r2, [r5, #4]
add r0, sl, #0x21c
str r2, [sl, #0x4c]
add r0, r10, #0x21c
str r2, [r10, #0x4c]
ldr r3, [r5, #8]
mov r2, #0
str r3, [sl, #0x50]
str r3, [r10, #0x50]
bl func_ov00_020c515c
_02180764:
ldr r0, [sp, #0x14]
@@ -5784,13 +5784,13 @@ _02180764:
bne _021807a0
ldr r0, [r5]
mov r1, #3
str r0, [sl, #0x48]
str r0, [r10, #0x48]
ldr r2, [r5, #4]
add r0, sl, #0x21c
str r2, [sl, #0x4c]
add r0, r10, #0x21c
str r2, [r10, #0x4c]
ldr r3, [r5, #8]
mov r2, #0
str r3, [sl, #0x50]
str r3, [r10, #0x50]
bl func_ov00_020c515c
_021807a0:
add r0, r8, #1
@@ -5799,7 +5799,7 @@ _021807a0:
mov r8, r0, lsr #0x10
bgt _02180710
_021807b4:
ldrh r1, [sl, #0xe2]
ldrh r1, [r10, #0xe2]
ldr r0, _02180868 ; =0x0000ffff
cmp r1, r0
beq _0218081c
@@ -5815,30 +5815,30 @@ _021807b4:
cmp r0, #1
bne _0218081c
ldr r3, _02180854 ; =data_027e0f94
add r0, sl, #0x21c
add r0, r10, #0x21c
ldr r2, [r3]
mov r1, #3
str r2, [sl, #0x48]
str r2, [r10, #0x48]
ldr r4, [r3, #4]
mov r2, #0
str r4, [sl, #0x4c]
str r4, [r10, #0x4c]
ldr r3, [r3, #8]
str r3, [sl, #0x50]
str r3, [r10, #0x50]
bl func_ov00_020c515c
_0218081c:
mov r0, sl
mov r0, r10
bl _ZN5Actor14DistanceToLinkEv
ldr r1, _0218086c ; =0x00000a66
cmp r0, r1
ble _02180840
add r0, sl, #0x21c
add r0, r10, #0x21c
mov r1, #3
mov r2, #0
bl func_ov00_020c515c
_02180840:
mov r0, #1
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1c
mov r7, r0
mov r2, #2
@@ -5881,44 +5881,44 @@ _021808c4:
strh r0, [r7, #0x78]
mov r6, #0
add r5, r7, #0x48
mov fp, #0x1800
mov r11, #0x1800
_021808dc:
add r3, sp, #0x10
ldmia r5, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldrh r1, [r7, #0x78]
mov r2, #0x1800
ldr sl, [sp, #0x10]
ldr r10, [sp, #0x10]
mov r1, r1, asr #0x4
add r1, r4, r1, lsl #2
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, sl, r8
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, fp
mla r2, ip, sb, r2
mov sl, ip, asr #0x1f
adds sb, r8, #0x800
mla r2, sl, fp, r2
umull r8, r2, ip, r11
mla r2, ip, r9, r2
mov r10, ip, asr #0x1f
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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x1c
mov sl, r0
ldr r2, [sl, #4]
mov sb, r1
mov r10, r0
ldr r2, [r10, #4]
mov r9, r1
tst r2, #0x10
addeq sp, sp, #0x1c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldrb r1, [sl, #0x68]
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
@@ -8104,7 +8104,7 @@ func_ov32_021826f0: ; 0x021826f0
str r0, [sp, #0x18]
str r1, [sp, #0x10]
str r1, [sp, #0x14]
ldrsh r1, [sl, #0xc]
ldrsh r1, [r10, #0xc]
add r0, sp, #0x10
bl func_ov00_020a61ac
ldr r1, [sp, #0x10]
@@ -8114,7 +8114,7 @@ func_ov32_021826f0: ; 0x021826f0
mov r7, r0, asr #0x1
mvn r5, #0
mov r4, r8
mov fp, #0x2e
mov r11, #0x2e
_02182790:
str r5, [sp]
add r1, r6, #0x800
@@ -8124,12 +8124,12 @@ _02182790:
str r1, [sp, #8]
mov r0, r0, asr #0xc
str r0, [sp, #0xc]
ldrsh r1, [sl, #0xc]
mov r0, sl
mov r2, fp
ldrsh r1, [r10, #0xc]
mov r0, r10
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,36 +8140,36 @@ _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, sl, fp, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02182804:
ldr r0, [sl, #8]
ldr r0, [r10, #8]
cmp r0, #0xc
addne sp, sp, #0x1c
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, pc}
ldrb r0, [sl, #0x6a]
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, sl, fp, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r2, #0
str r2, [sp]
ldrsh r1, [sl, #0x6c]
ldrsh r1, [r10, #0x6c]
ldr r0, _02182868 ; =data_ov32_02184cc0
mov r3, r2
ldr r1, [r0, r1, lsl #2]
mov r0, #0x44
bl func_0203493c
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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,30 +8925,30 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr ip, _02183330 ; =data_027e0764
mov r8, #0x800
ldr r2, [ip]
ldmib ip, {r1, sl}
umull r5, r4, sl, r2
mla r4, sl, r1, r4
ldmib ip, {r1, r10}
umull r5, r4, r10, r2
mla r4, r10, r1, r4
ldr r7, [ip, #0xc]
ldr r3, [ip, #0x10]
mla r4, r7, r2, r4
adds r5, r3, r5
ldr r2, [ip, #0x14]
umull r6, sb, sl, r5
umull r6, r9, r10, r5
adc r4, r2, r4
mla sb, sl, 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
@@ -9000,7 +9000,7 @@ func_ov32_0218318c: ; 0x0218318c
ldr lr, [ip]
str r5, [sp]
ldr r5, [r4, #0x4c]
ldr fp, [ip, #4]
ldr r11, [ip, #4]
str r5, [sp, #4]
ldr r5, [r4, #0x50]
add r1, sp, #0
@@ -9008,12 +9008,12 @@ func_ov32_0218318c: ; 0x0218318c
ldr r6, [ip, #8]
ldr r5, [ip, #0xc]
umull r8, r7, r6, lr
mla r7, r6, fp, r7
mla r7, r6, r11, r7
mla r7, r5, lr, r7
ldr sl, [ip, #0x10]
ldr sb, [ip, #0x14]
adds r5, sl, r8
adc r7, sb, r7
ldr r10, [ip, #0x10]
ldr r9, [ip, #0x14]
adds r5, r10, r8
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, sl, fp, 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, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
ldr lr, _021836ec ; =data_027e0764
mov r3, #0
ldr r2, [lr]
@@ -9278,18 +9278,18 @@ func_ov32_021835a0: ; 0x021835a0
umull r8, r7, r6, r4
mla r7, r6, r1, r7
ldr r5, [lr, #0xc]
ldr sl, [lr, #0x10]
ldr r10, [lr, #0x10]
mla r7, r5, r4, r7
ldr sb, [lr, #0x14]
adds r1, sl, r8
adc r4, sb, r7
ldr r9, [lr, #0x14]
adds r1, r10, r8
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, sl, 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, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
mov r4, r0
bl _ZN5Actor14GetAngleToLinkEv
mov r0, r0, lsl #0x10
@@ -9356,18 +9356,18 @@ func_ov32_021836f8: ; 0x021836f8
umull r8, r7, r6, lr
mla r7, r6, r1, r7
ldr r5, [ip, #0xc]
ldr sl, [ip, #0x10]
ldr r10, [ip, #0x10]
mla r7, r5, lr, r7
ldr sb, [ip, #0x14]
adds r1, sl, r8
adc r5, sb, r7
ldr r9, [ip, #0x14]
adds r1, r10, r8
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, sl, 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, sl, fp, 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, sl, fp, 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, sl, fp, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, sp, #0x10
bl func_ov00_020c1500
mov r1, r5
@@ -10320,15 +10320,15 @@ 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 sl, [sp, #4]
ldr r10, [sp, #4]
adc r6, r8, #0
mov r7, r7, lsr #0xc
orr r7, r7, r6, lsl #20
add r6, sl, r7
add r6, r10, r7
str r6, [sp, #4]
umull r7, r6, r4, r0
mla r6, r4, ip, r6
@@ -10341,17 +10341,17 @@ func_ov32_0218439c: ; 0x0218439c
orr r4, r4, r0, lsl #20
add r0, r5, r4
str r0, [sp, #0xc]
ldr fp, _02184550 ; =data_027e0fe8
ldr r11, _02184550 ; =data_027e0fe8
str ip, [sp]
ldr r1, _02184544 ; =0x42454530
ldr r0, [fp]
ldr r0, [r11]
add r3, sp, #0x10
bl func_ov00_020c4048
cmp r0, #0
movge r0, #1
movlt r0, #0
add sp, sp, #0x84
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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
+46 -46
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, sl, fp, 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 fp, sl, sb, r5
mla sl, sb, r2, sl
ldmib r7, {r2, r9}
umull r11, r10, r9, r5
mla r10, r9, r2, r10
ldr r8, [r7, #0xc]
ldr lr, [r7, #0x10]
mla sl, r8, r5, sl
mla r10, r8, r5, r10
ldr ip, [r7, #0x14]
adds r2, lr, fp
adc sb, ip, sl
umull r5, r8, sb, r6
mla r8, sb, r1, r8
adds r2, lr, r11
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,14 +805,14 @@ 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 fp, [r7, #0x10]
ldr r11, [r7, #0x10]
mla r8, ip, r5, r8
ldr sl, [r7, #0x14]
adds r2, fp, sb
adc r8, sl, r8
ldr r10, [r7, #0x14]
adds r2, r11, r9
adc r8, r10, r8
stmia r7, {r2, r8}
umull r5, r7, r8, r6
mla r7, r8, r1, r7
@@ -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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
ldr r3, _0217f88c ; =0x00000666
mov r4, r0
@@ -4497,21 +4497,21 @@ func_ov33_0217f744: ; 0x0217f744
mov r1, r5
bl func_ov33_0217dec4
ldr r0, _0217f890 ; =data_027e0764
ldr fp, _0217f894 ; =data_02050f54
ldr r11, _0217f894 ; =data_02050f54
ldr r6, [r0, #8]
ldr lr, [r0]
ldr ip, [r0, #4]
umull r8, r7, r6, lr
ldr sl, [r0, #0x10]
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, sl, r8
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
@@ -4524,10 +4524,10 @@ func_ov33_0217f744: ; 0x0217f744
mov r5, r5, asr #0x4
mov r7, r5, lsl #0x1
mov r5, r7, lsl #0x1
ldrsh r6, [fp, r5]
ldrsh r6, [r11, r5]
add r5, r7, #1
mov r5, r5, lsl #0x1
ldrsh r5, [fp, r5]
ldrsh r5, [r11, r5]
ldr r2, _0217f898 ; =data_027e0f94
mov r0, #0x7000
add r1, sp, #0
@@ -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, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov33_0217f744
_0217f88c: .word 0x00000666
+154 -154
View File
@@ -1621,58 +1621,58 @@ _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, sl, fp, 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]
cmp r0, #0
bne _0217d454
ldr sl, [r2, #0x194]
cmp sl, #0
ldr r10, [r2, #0x194]
cmp r10, #0
beq _0217d470
ldr r1, _0217d498 ; =data_027e0764
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 fp, r3, r5, sb
umull r11, r3, r5, r9
adc r8, r6, r8
adds ip, r7, fp
sub fp, sl, #1
umull sl, lr, r8, r0
adds ip, r7, r11
sub r11, r10, #1
umull r10, lr, r8, r0
mla r3, r5, r8, r3
str sl, [sp, #4]
mov sl, #0
str sb, [r1]
mla r3, r4, sb, r3
mla lr, r8, sl, lr
str r10, [sp, #4]
mov r10, #0
str r9, [r1]
mla r3, r4, r9, r3
mla lr, r8, r10, lr
str r8, [r1, #4]
adc r8, r6, r3
mov r3, sl
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, sl
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 sl, 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, sl
adc r5, r6, sb
adds r4, r7, r10
adc r5, r6, r9
stmia r1, {r4, r5}
umull r1, r4, r5, r0
mov r1, #0
@@ -1683,7 +1683,7 @@ func_ov34_0217d354: ; 0x0217d354
add r0, r4, r0
str r0, [r2, #0x188]
str r3, [r2, #0x190]
str fp, [r2, #0x194]
str r11, [r2, #0x194]
b _0217d470
_0217d454:
ldr r0, _0217d4a4 ; =data_ov00_020eec9c
@@ -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, sl, fp, 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, sl, fp, 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,46 +2945,46 @@ 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 sl, sb, r4
adds r10, r9, r4
ldr r8, [r2, #0x14]
umull r4, r1, r7, sl
umull r4, r1, r7, r10
adc r3, r8, r5
mla r1, r7, r3, r1
str sl, [r2]
mla r1, r6, sl, r1
adds r5, sb, r4
str r10, [r2]
mla r1, r6, r10, r1
adds r5, r9, r4
adc r4, r8, r1
str r3, [r2, #4]
umull sl, r1, r3, ip
mov fp, #0
mov sl, fp
mla r1, r3, sl, r1
mla r1, fp, ip, r1
umull r10, r1, r3, ip
mov r11, #0
mov r10, r11
mla r1, r3, r10, r1
mla r1, r11, ip, r1
str r5, [r2]
ldr ip, _0217e8b8 ; =0x00001001
add sl, r1, #0x29
add r10, r1, #0x29
umull r3, r1, r4, ip
mov r3, fp
mov r3, r11
mla r1, r4, r3, r1
mla r1, fp, ip, r1
mla r1, r11, ip, r1
umull ip, r3, r7, r5
mla r3, r7, r4, r3
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]
ldr r2, _0217e8bc ; =0x00005557
add r1, r0, #0x1000
umull r2, r3, r4, r2
mov r2, fp
mov r2, r11
mla r3, r4, r2, r3
ldr r2, _0217e8bc ; =0x00005557
mla r3, fp, r2, r3
mla r3, r11, r2, r3
ldr r2, _0217e8c0 ; =0xffffd555
add r2, r3, r2
mov r2, r2, lsl #0x10
@@ -3046,8 +3046,8 @@ _0217e7f4:
cmp r5, r4
strlt r4, [r1, #0xa70]
_0217e820:
mul r2, sl, r2
mul r1, sl, r3
mul r2, r10, r2
mul r1, r10, r3
add r2, r2, #0x800
mov r2, r2, asr #0xc
add r1, r1, #0x800
@@ -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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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
@@ -3426,13 +3426,13 @@ _0217ece0:
and r4, r4, #0xff
strh r4, [sp, #0x10]
ldrh r1, [r1, #0x7e]
ldr sl, [r2, #0xd04]
ldr fp, _0217ee4c ; =data_027e0fe8
ldr r10, [r2, #0xd04]
ldr r11, _0217ee4c ; =data_027e0fe8
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
mov r1, r4, lsl #0x1
ldrsh r6, [r3, r1]
str sl, [sp, #4]
str r10, [sp, #4]
ldr r5, [r2, #0xd08]
umull r8, r7, r6, r0
add r1, r4, #1
@@ -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
@@ -3450,7 +3450,7 @@ _0217ece0:
adc r5, r7, #0
mov r6, r6, lsr #0xc
orr r6, r6, r5, lsl #20
add r5, sl, r6
add r5, r10, r6
str r5, [sp, #4]
umull r6, r5, r4, r0
mla r5, r4, ip, r5
@@ -3460,11 +3460,11 @@ _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
ldr r0, [fp]
ldr r0, [r11]
add r2, sp, #4
add r3, sp, #0x10
bl func_ov00_020c4048
@@ -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, sl, fp, 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,15 +3488,15 @@ _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, sl, 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
ldr sl, _0217ef80 ; =data_ov34_021861a0
str r0, [sb, #0xd74]
ldr r0, [sl, #0x78]
add r9, r7, #0x1000
ldr r10, _0217ef80 ; =data_ov34_021861a0
str r0, [r9, #0xd74]
ldr r0, [r10, #0x78]
mov r6, #0
cmp r0, #0
ble _0217eedc
@@ -3517,9 +3517,9 @@ _0217ee90:
bl func_01ff9ec0
cmp r0, r5
movlt r5, r0
strlt r6, [sb, #0xd74]
strlt r6, [r9, #0xd74]
_0217eecc:
ldr r0, [sl, #0x78]
ldr r0, [r10, #0x78]
add r6, r6, #1
cmp r6, r0
blt _0217ee90
@@ -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, sl, 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, sl, 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,42 +8450,42 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xa8
mov sl, r0
add r0, sl, #0x1d00
mov r10, r0
add r0, r10, #0x1d00
ldrsh r1, [r0, #0x80]
add r0, sl, #0x7e
add r0, r10, #0x7e
add r0, r0, #0x1d00
mov r2, #0x200
bl func_0202b154
add r1, sl, #0x1d00
add r0, sl, #0x17c
add r1, r10, #0x1d00
add r0, r10, #0x17c
ldrsh r1, [r1, #0x82]
add r0, r0, #0x1c00
mov r2, #0x200
bl func_0202b154
add r2, sl, #0x128
add r2, r10, #0x128
ldr r1, _02183cf8 ; =data_ov34_0218577c
add r0, sl, #0x48
add r0, r10, #0x48
add r2, r2, #0x1c00
bl func_01ff9bc4
add r4, sl, #0x1000
add r4, r10, #0x1000
ldrb r0, [r4, #0xd88]
cmp r0, #0
addeq sp, sp, #0xa8
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
add r0, sl, #0x304
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, r10, #0x304
add r2, r0, #0x1800
add r0, sl, #0x1b40
add r1, sl, #0xba0
add r0, r10, #0x1b40
add r1, r10, #0xba0
add r1, r1, #0x1000
str r0, [sp, #4]
add r7, r0, #0x40
add r0, sl, #0xb90
ldr fp, _02183cfc ; =0x000002cb
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]
@@ -8514,7 +8514,7 @@ _02183510:
add r1, sp, #0x90
add r2, sp, #0x9c
bl func_ov00_020d5f98
add r0, sl, r5, lsl #4
add r0, r10, r5, lsl #4
add r2, r0, #0x1000
ldr r1, [r2, #0xb40]
str r0, [sp, #8]
@@ -8569,7 +8569,7 @@ _02183510:
_02183640:
mov r0, r7
add r1, sp, #0x80
mov r2, fp
mov r2, r11
bl func_ov00_020d59f0
rsb r0, r5, #4
rsb r0, r0, r0, lsl #5
@@ -8602,17 +8602,17 @@ _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 fp, fp, #0x66
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, sl, #0x1000
add r0, r10, #0x1000
ldr r1, [r0, #0xd30]
ldr r0, [r0, #0xab8]
sub r0, r1, r0
@@ -8625,7 +8625,7 @@ _02183710:
mov r1, #0xc000
bl Divide
ldr r1, _02183d04 ; =0x00005555
ldr r2, [sl, #0x22c]
ldr r2, [r10, #0x22c]
mul r3, r0, r1
sub r0, r1, #0x8000
add r0, r0, r3, asr #12
@@ -8634,7 +8634,7 @@ _02183710:
cmp r1, #4
mov r0, r0, asr #0x10
bhi _0218398c
add r2, sl, #0x1d00
add r2, r10, #0x1d00
ldrsh r1, [r2, #0x86]
mov ip, #0
add r0, r0, r0, lsr #31
@@ -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
ldrsh fp, [r4, r8]
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
@@ -8692,15 +8692,15 @@ _02183710:
adc r0, r5, #0
mov r5, r6, lsr #0xc
orr r5, r5, r0, lsl #20
mov r0, fp, asr #0x1f
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, fp
smull r0, r6, r9, r11
adds r0, r0, #0x800
adc r6, r6, #0
mov r0, r0, lsr #0xc
@@ -8717,7 +8717,7 @@ _02183710:
orr r6, r6, r0, lsl #20
mov r0, r6, asr #0x1f
str r0, [sp, #0x28]
smull r1, r0, r6, fp
smull r1, r0, r6, r11
adds r2, r1, #0x800
adc r1, r0, #0
mov r0, r2, lsr #0xc
@@ -8730,14 +8730,14 @@ _02183710:
add r0, r0, r2
mov lr, r4, asr #0x1f
str r0, [sp, #0x84]
umull r5, r3, r4, fp
umull r5, r3, r4, r11
str r5, [sp, #0x34]
ldr r5, [sp, #0x18]
ldr r2, _02183d0c ; =0x00000333
mla r3, r4, r5, r3
mla r3, lr, fp, r3
mla r3, lr, r11, r3
ldr r4, [sp, #0x34]
add r0, sl, #0x1b40
add r0, r10, #0x1b40
adds r4, r4, #0x800
mov r5, r4, lsr #0xc
adc r3, r3, ip
@@ -8754,19 +8754,19 @@ _02183710:
sub r3, r5, r4
str r3, [sp, #0x88]
ldr r5, [sp, #0x18]
umull r4, r3, r7, fp
umull r4, r3, r7, r11
mla r3, r7, r5, r3
ldr r5, [sp, #0x24]
add r1, sp, #0x80
mla r3, r5, fp, r3
mla r3, r5, r11, r3
adds r5, r4, #0x800
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
@@ -8775,14 +8775,14 @@ _02183710:
add r3, r3, r5
str r3, [sp, #0x8c]
bl func_ov00_020d59f0
add r2, sl, #0x1000
add r2, r10, #0x1000
ldr r2, [r2, #0xd64]
add r0, sl, #0x1b40
add r0, r10, #0x1b40
add r1, sp, #0x60
bl func_ov00_020d59f0
b _02183b3c
_0218398c:
add r1, sl, #0x1d00
add r1, r10, #0x1d00
ldrsh r1, [r1, #0x86]
ldr r5, _02183d08 ; =data_02050f54
add r4, r0, r0, lsr #31
@@ -8799,7 +8799,7 @@ _0218398c:
ldrsh r2, [r5, #2]
ldrsh r1, [r5, r1]
smull r6, r7, r0, r3
adds fp, r6, #0x800
adds r11, r6, #0x800
mov r4, r4, lsl #0xf
mov r4, r4, lsr #0x10
mov r4, r4, asr #0x4
@@ -8808,18 +8808,18 @@ _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 fp, fp, lsr #0xc
mov r11, r11, lsr #0xc
ldrsh ip, [r5, r4]
orr fp, fp, 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, fp, ip
smull r5, r4, r11, ip
smull r3, lr, r1, r3
smull r2, r1, r0, r2
adc r0, r6, #0
@@ -8844,16 +8844,16 @@ _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, fp, sb
adds fp, ip, #0x800
smull ip, r8, r2, r9
smull r9, r2, r11, r9
adds r11, ip, #0x800
adc r8, r8, #0
mov fp, fp, lsr #0xc
orr fp, fp, r8, lsl #20
add r0, r0, fp
mov r11, r11, lsr #0xc
orr r11, r11, r8, lsl #20
add r0, r0, r11
str r0, [sp, #0x84]
adds r7, r7, #0x800
adc r0, r6, #0
@@ -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
@@ -8877,28 +8877,28 @@ _0218398c:
str r0, [sp, #0x8c]
ldr r2, _02183d0c ; =0x00000333
add r1, sp, #0x80
add r0, sl, #0x1b40
add r0, r10, #0x1b40
bl func_ov00_020d59f0
add r0, sl, #0x1000
add r0, r10, #0x1000
ldr r2, [r0, #0xd64]
ldr r1, _02183d00 ; =data_ov34_021861cc
add r0, sl, #0x1b40
add r0, r10, #0x1b40
bl func_ov00_020d59f0
add r1, sl, #0x1d00
add r0, sl, #0x86
add r1, r10, #0x1d00
add r0, r10, #0x86
ldrsh r1, [r1, #0x7e]
add r0, r0, #0x1d00
mov r2, #0x100
bl func_0202b154
_02183b3c:
add r0, sl, #0x1b40
add r0, r10, #0x1b40
bl func_ov00_020d5c54
add r1, sl, #0xba0
add r0, sl, #0x1b40
add r1, r10, #0xba0
add r0, r10, #0x1b40
add r1, r1, #0x1000
bl func_ov00_020d5cd8
ldr r0, _02183d10 ; =data_ov34_02185740
add r3, sl, #0x1000
add r3, r10, #0x1000
ldr r2, [r0, #0x24]
ldr r1, [r0, #0x28]
str r2, [sp, #0x9c]
@@ -8915,7 +8915,7 @@ _02183b3c:
ldr r3, [r3, #0xd18]
str r3, [sp, #0x98]
bl func_ov00_020d5f98
add r2, sl, #0x1000
add r2, r10, #0x1000
ldr r1, [r2, #0xb90]
add r0, sp, #0x80
str r1, [sp, #0x70]
@@ -8932,15 +8932,15 @@ _02183b3c:
str r0, [sp, #0xa0]
mov r0, #0x1000
str r0, [sp, #0xa4]
add r0, sl, #0x1d00
add r0, r10, #0x1d00
ldrsh r1, [r0, #0x7c]
add r0, sp, #0x9c
bl func_ov00_020a6110
add r1, sl, #0x1d00
add r1, r10, #0x1d00
ldrsh r1, [r1, #0x7e]
add r0, sp, #0x9c
bl func_ov00_020a61ac
add r2, sl, #0x1000
add r2, r10, #0x1000
ldr r1, [r2, #0xd1c]
add r0, sp, #0x50
str r1, [sp, #0x90]
@@ -8954,7 +8954,7 @@ _02183b3c:
add r0, sp, #0x50
add r1, sp, #0x80
bl func_ov00_020d5dc4
add r0, sl, #0x1000
add r0, r10, #0x1000
ldr r7, [r0, #0xb9c]
ldr r5, [r0, #0xb98]
ldr r3, [r0, #0xb90]
@@ -8982,27 +8982,27 @@ _02183b3c:
str r1, [sp, #0x54]
str r0, [sp, #0x58]
_02183ca4:
add r0, sl, #0xb90
add r0, r10, #0xb90
add r1, sp, #0x50
add r0, r0, #0x1000
mov r2, #0xc00
bl func_ov00_020d59f0
add r1, sl, #0x1000
add r0, sl, #0xb90
add r1, r10, #0x1000
add r0, r10, #0xb90
ldr r2, [r1, #0xd64]
ldr r1, _02183d00 ; =data_ov34_021861cc
add r0, r0, #0x1000
bl func_ov00_020d59f0
add r0, sl, #0xb90
add r0, r10, #0xb90
add r0, r0, #0x1000
bl func_ov00_020d5c54
add r0, sl, #0xb90
add r1, sl, #0x54
add r0, r10, #0xb90
add r1, r10, #0x54
add r0, r0, #0x1000
add r1, r1, #0x1c00
bl func_ov00_020d5cd8
add sp, sp, #0xa8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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
+269 -269
View File
File diff suppressed because it is too large Load Diff
+176 -176
View File
File diff suppressed because it is too large Load Diff
+483 -483
View File
File diff suppressed because it is too large Load Diff
+410 -410
View File
File diff suppressed because it is too large Load Diff
+121 -121
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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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
@@ -3020,8 +3020,8 @@ _0217e69c:
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
ldrsh r0, [r2, r0]
ldr fp, _0217e824 ; =data_027e0f90
str sb, [sp, #0x1c]
ldr r11, _0217e824 ; =data_027e0f90
str r9, [sp, #0x1c]
str r1, [sp, #0x18]
str r0, [sp, #0x20]
add r6, sp, #0x3c
@@ -3067,15 +3067,15 @@ _0217e6dc:
mov r1, r5
add r2, sp, #0x24
bl func_01ff9bf8
ldr r0, [fp]
mov sl, #0
ldr r0, [r11]
mov r10, #0
mov r1, r5
mov r2, r6
mov r3, r8
bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
cmp r0, #0
movne sl, #1
cmp sl, #0
movne r10, #1
cmp r10, #0
beq _0217e7ec
ldr r0, _0217e824 ; =data_027e0f90
add r2, sp, #0x18
@@ -3094,15 +3094,15 @@ _0217e6dc:
movne r0, #0
strneb r0, [r1, #0x25c]
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, fp, 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,27 +3828,27 @@ 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
ldr sl, [sp, #4]
adds r6, r9, #0x800
ldr r10, [sp, #4]
adc r3, r8, #0
mov r6, r6, lsr #0xc
orr r6, r6, r3, lsl #20
add r3, sl, r6
add r3, r10, r6
str r3, [sp, #4]
ldr r3, _0217f270 ; =0x00002b33
mov fp, ip, asr #0x1f
mov r11, ip, asr #0x1f
umull r7, r6, ip, r3
mov r3, #0
mla r6, ip, r3, r6
ldr r3, _0217f270 ; =0x00002b33
adds r7, r7, #0x800
mla r6, fp, r3, r6
mla r6, r11, r3, r6
adc r3, r6, #0
mov r6, r7, lsr #0xc
ldr lr, [sp, #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, sl, fp, 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, sl, 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, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
_0217f868:
bl _ZN5Actor16IsFollowedByLinkEv
cmp r0, #0
@@ -4364,19 +4364,19 @@ _0217f868:
ldrsh r8, [r5, r6]
mov ip, #0xcd
add r3, r3, #1
umull sl, 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
adds sl, sl, #0x800
mla r9, r0, ip, r9
adds r10, r10, #0x800
mla r5, lr, r7, r5
adc r1, sb, #0
mov r0, sl, lsr #0xc
adc r1, r9, #0
mov r0, r10, lsr #0xc
orr r0, r0, r1, lsl #20
adds r1, r6, #0x800
mov r2, r1, lsr #0xc
@@ -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, sl, 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, sl, 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,10 +6682,10 @@ _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, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x40
mov r4, #1
mov sl, r0
mov r10, r0
mov r5, r4
bl _ZN5Actor14GetAngleToLinkEv
mov r6, #0
@@ -6694,33 +6694,33 @@ 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]
str r3, [sp, #0x3c]
str r0, [sl, #0x274]
str r0, [r10, #0x274]
ldr r3, [r2, #4]
add r0, sp, #0x34
str r3, [sl, #0x278]
str r3, [r10, #0x278]
ldr r2, [r2, #8]
mov r1, r1, asr #0x10
str r2, [sl, #0x27c]
str r2, [r10, #0x27c]
bl func_ov00_020a61ac
ldr r1, [sl, #0x274]
ldr r1, [r10, #0x274]
add r0, sp, #0x34
str r1, [sp, #0xc]
ldr r2, [sl, #0x278]
ldr r2, [r10, #0x278]
add r1, sp, #0xc
str r2, [sp, #0x10]
ldr r3, [sl, #0x27c]
ldr r3, [r10, #0x27c]
mov r2, r0
str r3, [sp, #0x14]
bl func_01ff9bc4
add r1, sp, #0x34
mov r0, sl
mov r0, r10
bl func_ov39_0217eaa0
cmp r0, #0
mov r3, #0
@@ -6735,18 +6735,18 @@ func_ov39_0218199c: ; 0x0218199c
mov r1, r1, asr #0x10
movne r5, r6
bl func_ov00_020a61ac
ldr r1, [sl, #0x274]
ldr r1, [r10, #0x274]
add r0, sp, #0x34
str r1, [sp]
ldr r2, [sl, #0x278]
ldr r2, [r10, #0x278]
add r1, sp, #0
str r2, [sp, #4]
ldr r3, [sl, #0x27c]
ldr r3, [r10, #0x27c]
mov r2, r0
str r3, [sp, #8]
bl func_01ff9bc4
add r1, sp, #0x34
mov r0, sl
mov r0, r10
bl func_ov39_0217eaa0
cmp r0, #0
movne r4, #0
@@ -6834,12 +6834,12 @@ _02181bcc:
cmp r5, #0
movne r6, #0
_02181bd4:
mov r0, sl
mov r0, r10
bl func_ov39_0217e404
str r0, [sl, #0x1b4]
str r0, [r10, #0x1b4]
cmp r6, #0
add r0, sl, #0x3ec
add r2, sl, #0x100
add r0, r10, #0x3ec
add r2, r10, #0x100
beq _02181c04
add r0, r0, #0x400
mov r1, #0x14
@@ -6849,41 +6849,41 @@ _02181bd4:
_02181c04:
add r0, r0, #0x400
mov r1, #0x13
strh sb, [r2, #0x64]
strh r9, [r2, #0x64]
bl func_ov39_0217ca2c
_02181c14:
ldr r0, [sl, #0x7fc]
ldr r0, [r10, #0x7fc]
mov r3, #0
str r3, [r0, #0x10]
mov r2, #0x8f
add r0, sl, #0x100
add r0, r10, #0x100
strh r7, [r0, #0x66]
add r1, r2, r2, lsl #3
str r2, [sl, #0x6c]
str r3, [sl, #0x60]
str r2, [r10, #0x6c]
str r3, [r10, #0x60]
mov r0, r1, asr #0x1
str r0, [sl, #0x64]
str r3, [sl, #0x68]
ldr r0, [sl, #0x158]
str r0, [r10, #0x64]
str r3, [r10, #0x68]
ldr r0, [r10, #0x158]
sub r5, r2, #0x90
orr r0, r0, #0x2400
bic r1, r0, #0x2000000
orr r0, r1, #0x4000000
orr r0, r0, #0x40000
str r0, [sl, #0x158]
str r5, [sl, #0x88]
ldr r0, [sl, #0x284]
str r0, [r10, #0x158]
str r5, [r10, #0x88]
ldr r0, [r10, #0x284]
add r4, sp, #0x18
add r0, r0, #0x7c
ldmia r0, {r0, r1, r2}
stmia r4, {r0, r1, r2}
str r5, [sp, #0x24]
ldr r5, [sl, #0x284]
ldr r5, [r10, #0x284]
ldr r1, [sp, #0x18]
ldr r0, _02181cc8 ; =data_027e0ffc
str r1, [r5, #0x7c]
ldr r1, [sp, #0x1c]
add r2, sl, #0x48
add r2, r10, #0x48
str r1, [r5, #0x80]
ldr r4, [sp, #0x20]
mov r1, #0x324
@@ -6893,7 +6893,7 @@ _02181c14:
bl func_ov00_020ceacc
mov r0, #1
add sp, sp, #0x40
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x124
mov r4, r0
ldr r0, _02183c10 ; =data_027e0ffc
@@ -9037,21 +9037,21 @@ func_ov39_021838c4: ; 0x021838c4
str r2, [sp, #0x18]
str r1, [sp, #0x1c]
bl _ZN5Actor14GetAngleToLinkEv
mov fp, #0
mov r11, #0
ldr r6, [sp, #0xc]
ldr r5, [sp, #0x10]
ldr sl, [sp, #0x14]
ldr sb, [sp, #0x18]
ldr r10, [sp, #0x14]
ldr r9, [sp, #0x18]
ldr r8, [sp, #0x1c]
ldr r7, [sp, #0x24]
str r6, [sp, #0xa0]
ldr r6, [sp, #0x34]
str r5, [sp, #0xa4]
ldr r5, [sp, #0x38]
str sl, [sp, #0xa8]
ldr sl, [sp, #0x3c]
str sb, [sp, #0xac]
ldr sb, [sp, #0x40]
str r10, [sp, #0xa8]
ldr r10, [sp, #0x3c]
str r9, [sp, #0xac]
ldr r9, [sp, #0x40]
str r8, [sp, #0xb0]
ldr r8, [sp, #0x44]
str r7, [sp, #0xb8]
@@ -9065,10 +9065,10 @@ func_ov39_021838c4: ; 0x021838c4
ldrb r3, [sp, #0x6e]
ldrb r2, [sp, #0x6f]
ldrb r1, [sp, #0x70]
str sl, [sp, #0xd0]
ldr sl, [sp, #0x54]
str sb, [sp, #0xd4]
ldr sb, [sp, #0x58]
str r10, [sp, #0xd0]
ldr r10, [sp, #0x54]
str r9, [sp, #0xd4]
ldr r9, [sp, #0x58]
str r8, [sp, #0xd8]
ldr r8, [sp, #0x5c]
str r7, [sp, #0xdc]
@@ -9077,16 +9077,16 @@ func_ov39_021838c4: ; 0x021838c4
ldr r6, [sp, #0x64]
str r5, [sp, #0xe4]
ldr r5, [sp, #0x68]
str sl, [sp, #0xe8]
str r10, [sp, #0xe8]
str r0, [sp, #0x20]
str fp, [sp, #0x30]
str fp, [sp, #0x2c]
str fp, [sp, #0x28]
str r11, [sp, #0x30]
str r11, [sp, #0x2c]
str r11, [sp, #0x28]
str r0, [sp, #0xb4]
str fp, [sp, #0xbc]
str fp, [sp, #0xc0]
str fp, [sp, #0xc4]
str sb, [sp, #0xec]
str r11, [sp, #0xbc]
str r11, [sp, #0xc0]
str r11, [sp, #0xc4]
str r9, [sp, #0xec]
str r8, [sp, #0xf0]
str r7, [sp, #0xf4]
str r6, [sp, #0xf8]
@@ -9099,9 +9099,9 @@ func_ov39_021838c4: ; 0x021838c4
mov r1, r0, lsl #0x10
add r0, sp, #0
mov r1, r1, asr #0x10
str fp, [sp]
str fp, [sp, #4]
str fp, [sp, #8]
str r11, [sp]
str r11, [sp, #4]
str r11, [sp, #8]
bl func_ov00_020a61ac
add r0, sp, #0
add r1, r4, #0x48
@@ -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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02184d7c:
ldr lr, _02184e64 ; =data_027e0764
mov ip, #0
@@ -10391,14 +10391,14 @@ _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 fp, [lr, #0x10]
ldr r11, [lr, #0x10]
mla r8, r6, r5, r8
ldr sl, [lr, #0x14]
adds r4, fp, sb
adc r5, sl, r8
ldr r10, [lr, #0x14]
adds r4, r11, r9
adc r5, r10, r8
stmia lr, {r4, r5}
umull lr, r4, r5, r3
mla r4, r5, ip, r4
@@ -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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x30
mov r4, r0
ldr r0, [r4, #0x30]
@@ -10515,7 +10515,7 @@ _02184fc8:
strgt r0, [r4, #0x34]
bgt _021850bc
ldr r2, _021850f4 ; =data_027e0764
mov fp, #0
mov r11, #0
ldr r3, [r2]
ldmib r2, {r1, r5}
umull r7, r6, r5, r3
@@ -10529,9 +10529,9 @@ _02184fc8:
str r3, [r2]
mov r1, #0x2e
umull r3, r5, r6, r1
mla r5, r6, fp, r5
mov sl, fp
mla r5, sl, r1, r5
mla r5, r6, r11, r5
mov r10, r11
mla r5, r10, r1, r5
str r6, [r2, #4]
add r1, r5, #0x2d
str r1, [r4, #0x34]
@@ -10548,8 +10548,8 @@ _02184fc8:
adc r6, r3, r6
str r5, [r2]
umull r3, r5, r6, r0
mla r5, r6, fp, r5
mla r5, sl, r0, r5
mla r5, r6, r11, r5
mla r5, r10, r0, r5
sub r1, r0, #0x4000
str r6, [r2, #4]
add r1, r5, r1
@@ -10558,15 +10558,15 @@ _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
mla r3, r5, fp, r3
mla r3, sl, r0, r3
mla r3, r5, r11, r3
mla r3, r10, r0, r3
sub r1, r0, #0x4000
add r0, r3, r1
strh r0, [r4, #0x42]
@@ -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, sl, fp, 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
+293 -293
View File
File diff suppressed because it is too large Load Diff
+30 -30
View File
@@ -3185,18 +3185,18 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x14
mov sl, r0
mov r10, r0
mov r5, #0
add sb, sl, #0x470
mov fp, r5
add r9, r10, #0x470
mov r11, r5
add r4, sp, #8
_0218be3c:
ldr r6, [sl, #0x48]
ldr r8, [sl, #0x50]
ldr r6, [r10, #0x48]
ldr r8, [r10, #0x50]
cmp r5, #0
ldr r7, [sl, #0x4c]
ldr r7, [r10, #0x4c]
addeq r8, r8, #0x1000
subeq r6, r6, #0x2800
beq _0218be84
@@ -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
@@ -3227,9 +3227,9 @@ _0218be84:
str r0, [sp, #0xc]
str r6, [sp, #8]
str r8, [sp, #0x10]
str fp, [sp]
str r11, [sp]
ldr r0, _0218bf10 ; =data_027e0e58
str fp, [sp, #4]
str r11, [sp, #4]
ldr r0, [r0]
mov r1, #0x1ac
mov r2, r4
@@ -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, sl, fp, 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,33 +3257,33 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x4c
mov sl, r0
ldr r0, [sl, #0x48]
mov r10, r0
ldr r0, [r10, #0x48]
mov r8, #0
str r0, [sp, #0x40]
ldr r0, [sl, #0x4c]
add sb, sl, #0x470
ldr r0, [r10, #0x4c]
add r9, r10, #0x470
str r0, [sp, #0x44]
ldr r0, [sl, #0x50]
add r4, sl, #0x500
ldr r0, [r10, #0x50]
add r4, r10, #0x500
str r0, [sp, #0x48]
strb r8, [sl, #0x527]
mov fp, r8
strb r8, [r10, #0x527]
mov r11, r8
add r6, sp, #0x34
add r5, sp, #8
mvn r7, #0
_0218bf60:
cmp r8, #0
add r0, sl, r8, lsl #3
add r0, r10, r8, lsl #3
str r7, [r0, #0x470]
str r7, [r0, #0x474]
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
str r0, [sp, #0x40]
ldr r1, [sl, #0x4c]
ldr r1, [r10, #0x4c]
str r1, [sp, #0x44]
ldr r1, [sl, #0x50]
ldr r1, [r10, #0x50]
str r1, [sp, #0x48]
bne _0218bfa0
add r1, r1, #0x1000
@@ -3323,9 +3323,9 @@ _0218bff0:
ldr r0, [sp, #0x48]
str r1, [sp, #0x34]
str r0, [sp, #0x3c]
str fp, [sp]
str r11, [sp]
ldr r0, _0218c0c8 ; =data_027e0e58
str fp, [sp, #4]
str r11, [sp, #4]
ldr r0, [r0]
mov r1, #0x1ac
mov r2, r6
@@ -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, sl, fp, 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
+77 -77
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, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, lr}
sub sp, sp, #0x80
mov r7, r0
bl func_ov42_021897dc
@@ -365,20 +365,20 @@ _02189918:
add r4, sp, #4
ldmia r0, {r0, r1, r2}
stmia r4, {r0, r1, r2}
ldr sl, _02189b08 ; =0x4d544748
ldr r10, _02189b08 ; =0x4d544748
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, sl
mov r1, r10
sub r0, r0, #0x1000
str r0, [sp, #0xc]
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
@@ -388,22 +388,22 @@ _021899d4:
ldr r0, [sp, #0xc]
add r1, r1, #0x1000
add r0, r0, #0x3000
ldr sl, _02189b10 ; =0x4d544752
ldr r10, _02189b10 ; =0x4d544752
ldr r6, _02189b0c ; =data_027e0fe8
str r1, [sp, #4]
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]
mov r1, sl
mov r1, r10
sub r0, r0, #0x1000
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, sl, 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
mov sl, r0
ldr r0, [sl, #0x60]
mov r10, r0
ldr r0, [r10, #0x60]
cmp r0, #0
addle sp, sp, #0x10
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, [sl, #0x60]
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
str r0, [r10, #0x60]
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, sl, #0x28
add r9, r10, #0x28
mov r6, r7
mov fp, #3
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]
@@ -821,17 +821,17 @@ _02189fc0:
bl func_ov42_0218c0ec
_02189fe4:
mov r0, r8
mov r1, fp
mov r1, r11
bl func_ov42_0218c0ec
ldr r1, [r5, r7, lsl #2]
mov r0, r8
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, sl, #0x10
add r1, r10, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r4, r0
@@ -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, sl, fp, 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,23 +1311,23 @@ _0218a624:
.global func_ov42_0218a63c
arm_func_start func_ov42_0218a63c
func_ov42_0218a63c: ; 0x0218a63c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, 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, sl, pc}
strgt r0, [r9, #0x60]
ldmgtia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
cmp r7, #0
mov r4, #0
ble _0218a6c8
ldr sl, _0218a730 ; =data_027e0fe4
add r5, sb, #0x28
ldr r10, _0218a730 ; =data_027e0fe4
add r5, r9, #0x28
_0218a678:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, [r0, #0x204]
@@ -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, sl, 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, sl, 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, sl, 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, sl, 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, sl, 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
@@ -2461,35 +2461,35 @@ _0218b468: ; jump table
b _0218b47c ; case 4
_0218b47c:
mov r6, #0x100
mov sl, #0x100000
mov r10, #0x100000
mov r4, #0x40000
mov r5, #0x4d
mov r7, #5
b _0218b4f0
_0218b494:
mov sl, #0x40000
mov r4, sl
mov r10, #0x40000
mov r4, r10
mov r6, #0x40
mov r5, #0x4c
mov r7, #3
b _0218b4f0
_0218b4ac:
mov sl, #0x40000
mov r4, sl
mov r10, #0x40000
mov r4, r10
mov r6, #0x40
mov r5, #0x4b
mov r7, #3
b _0218b4f0
_0218b4c4:
mov sl, #0x40000
mov r4, sl
mov r10, #0x40000
mov r4, r10
mov r6, #0x40
mov r5, #0x4a
mov r7, #3
b _0218b4f0
_0218b4dc:
mov r6, #0x100
mov sl, #0x100000
mov r10, #0x100000
mov r4, #0x40000
mov r5, #0x4e
mov r7, #5
@@ -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
@@ -2564,7 +2564,7 @@ _0218b4f0:
mov r4, r0
add r0, r7, #0x60
bl func_ov05_0210e2a4
mov r1, sl, lsl #0x8
mov r1, r10, lsl #0x8
mov r1, r1, asr #0x10
mov r1, r1, lsl #0x10
mov r5, r1, 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, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov42_0218b440
_0218b67c: .word 0x0000ffff
+52 -52
View File
@@ -1293,13 +1293,13 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
ldr r1, _0218a84c ; =0x0000099a
mov r4, r0
str r1, [sp, #0x20]
ldrh r0, [r4, #0x78]
ldr sl, [r4, #0x48]
ldr r10, [r4, #0x48]
ldr r3, _0218a850 ; =data_02050f54
mov r0, r0, asr #0x4
mov r5, r0, lsl #0x1
@@ -1311,12 +1311,12 @@ func_ov43_0218a674: ; 0x0218a674
add r0, r1, #0x800
str r0, [sp, #4]
umull r0, r7, r6, r0
add fp, r1, #0x800
str sl, [sp, #0x14]
add r11, r1, #0x800
str r10, [sp, #0x14]
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]
@@ -1330,19 +1330,19 @@ func_ov43_0218a674: ; 0x0218a674
mla r7, r5, r2, r7
adc r2, r7, #0
orr r8, r8, r2, lsl #20
add r2, sl, r8
add r2, r10, r8
str r2, [r1]
umull lr, ip, r3, fp
umull lr, ip, r3, r11
mov r2, #0
mla ip, r3, r2, ip
mov r2, r3, asr #0x1f
adds r5, lr, #0x800
mla ip, r2, fp, ip
mla ip, r2, r11, ip
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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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,98 +4126,98 @@ _0218cd64:
.global func_ov43_0218cd7c
arm_func_start func_ov43_0218cd7c
func_ov43_0218cd7c: ; 0x0218cd7c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov sl, r0
ldrsh r4, [sl, #0x78]
mov r10, r0
ldrsh r4, [r10, #0x78]
mov r8, r2
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
cmp r0, #1
bne _0218ce34
mov r0, sl
mov r0, r10
bl _ZN5Actor16XzDistanceToLinkEv
str r0, [r7]
mov r0, sl
mov r0, r10
bl _ZN5Actor14GetAngleToLinkEv
strh r0, [r6]
ldr r0, _0218cf88 ; =data_027e0f94
ldr r1, [sl, #0x3c0]
ldr fp, [r0]
ldr r1, [r10, #0x3c0]
ldr r11, [r0]
cmp r1, #0
ldmib r0, {r4, r5}
bne _0218cdfc
mvn r0, #0x80000000
str r0, [sb]
str r0, [r9]
mov r1, #0
mov r3, r0
strh r1, [r8]
b _0218ceac
_0218cdfc:
add r0, sl, #0x48
add r0, r10, #0x48
add r1, r1, #0x48
bl func_ov00_020ce2f0
str r0, [sb]
ldr r1, [sl, #0x3c0]
mov r0, sl
str r0, [r9]
ldr r1, [r10, #0x3c0]
mov r0, r10
add r1, r1, #0x48
bl _ZN5Actor10GetAngleToEP5Vec3p
strh r0, [r8]
ldr r2, [sl, #0x3c0]
ldr r2, [r10, #0x3c0]
ldr r0, [r2, #0x48]
ldr r1, [r2, #0x4c]
ldr r3, [r2, #0x50]
b _0218ceac
_0218ce34:
ldr r1, [sl, #0x3c0]
ldr r1, [r10, #0x3c0]
cmp r1, #0
bne _0218ce58
mvn fp, #0x80000000
str fp, [r7]
mvn r11, #0x80000000
str r11, [r7]
mov r4, #0
mov r5, fp
mov r5, r11
strh r4, [r6]
b _0218ce8c
_0218ce58:
add r0, sl, #0x48
add r0, r10, #0x48
add r1, r1, #0x48
bl func_ov00_020ce2f0
str r0, [r7]
ldr r1, [sl, #0x3c0]
mov r0, sl
ldr r1, [r10, #0x3c0]
mov r0, r10
add r1, r1, #0x48
bl _ZN5Actor10GetAngleToEP5Vec3p
strh r0, [r6]
ldr r0, [sl, #0x3c0]
ldr fp, [r0, #0x48]
ldr r0, [r10, #0x3c0]
ldr r11, [r0, #0x48]
ldr r4, [r0, #0x4c]
ldr r5, [r0, #0x50]
_0218ce8c:
mov r0, sl
mov r0, r10
bl _ZN5Actor16XzDistanceToLinkEv
str r0, [sb]
mov r0, sl
str r0, [r9]
mov r0, r10
bl _ZN5Actor14GetAngleToLinkEv
ldr r2, _0218cf88 ; =data_027e0f94
strh r0, [r8]
ldmia r2, {r0, r1, r3}
_0218ceac:
ldrh r2, [sl, #0x26]
ldrh r2, [r10, #0x26]
cmp r2, #0
beq _0218cf40
ldrb r2, [sl, #0x3e6]
ldrb r2, [r10, #0x3e6]
cmp r2, #0
beq _0218cf04
ldr r0, _0218cf8c ; =data_027e0e60
str fp, [sp, #0xc]
str r11, [sp, #0xc]
str r4, [sp, #0x10]
str r5, [sp, #0x14]
ldrh r1, [sl, #0x26]
ldrh r1, [r10, #0x26]
ldr r0, [r0]
add r2, sp, #0xc
bl func_ov00_02083770
@@ -4228,14 +4228,14 @@ _0218ceac:
beq _0218cf40
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218cf04:
ldr r2, _0218cf8c ; =data_027e0e60
str r0, [sp]
ldr r0, [r2]
str r3, [sp, #8]
str r1, [sp, #4]
ldrh r1, [sl, #0x26]
ldrh r1, [r10, #0x26]
add r2, sp, #0
bl func_ov00_02083770
cmp r0, #0
@@ -4244,27 +4244,27 @@ _0218cf04:
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_0218cf40:
ldrb r0, [sl, #0x3e6]
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, sl, fp, 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, sl, fp, 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, sl, fp, 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
+158 -158
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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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,25 +2118,25 @@ _02191b68:
ldr r8, [r0]
ldr r6, [r0, #4]
mov ip, #0
umull sl, 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, sl, #0x800
mla sb, r7, r3, sb
adc r7, sb, #0
adds r8, r10, #0x800
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
ldr r0, _02191e4c ; =data_ov46_02194c20
str r8, [r7]
umull r8, r7, r6, r3
ldr fp, [r0]
ldr r11, [r0]
mla r7, r6, ip, r7
mov r5, r6, asr #0x1f
adds r6, r8, #0x800
mla r7, r5, r3, r7
mov r0, fp, asr #0x1f
mov r0, r11, asr #0x1f
str r0, [sp, #0x18]
ldr r0, _02191e4c ; =data_ov46_02194c20
adc r5, r7, #0
@@ -2159,9 +2159,9 @@ _02191b68:
ldr r4, _02191e48 ; =data_ov46_02194c14
str r0, [sp, #0x24]
str r5, [r4, #8]
umull r6, r5, fp, r3
umull r6, r5, r11, r3
ldr r0, [sp, #0x1c]
mla r5, fp, ip, r5
mla r5, r11, ip, r5
ldr r4, [sp, #0x18]
mov r0, r0, asr #0x1f
str r0, [sp, #0x20]
@@ -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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov r4, r0
ldrh r0, [r4, #0x20]
@@ -3474,20 +3474,20 @@ func_ov46_02192c90: ; 0x02192c90
umull r6, r5, r8, r3
mla r5, r8, r2, r5
ldr r7, [r0, #0xc]
ldr sl, [r0, #0x10]
ldr r10, [r0, #0x10]
mla r5, r7, r3, r5
ldr sb, [r0, #0x14]
adds r2, sl, r6
adc r6, sb, r5
ldr r9, [r0, #0x14]
adds r2, r10, r6
adc r6, r9, r5
umull r5, r3, r8, r2
mla r3, r8, r6, r3
adds r5, sl, r5
adds r5, r10, r5
str r2, [r0]
mla r3, r7, r2, r3
adc r2, sb, r3
umull ip, fp, r8, r5
mla fp, r8, r2, fp
mla fp, r7, r5, fp
adc r2, r9, r3
umull ip, r11, r8, r5
mla r11, r8, r2, r11
mla r11, r7, r5, r11
mov r3, r6, lsr #0x10
mov r3, r3, lsl #0x10
str r6, [r0, #4]
@@ -3500,8 +3500,8 @@ func_ov46_02192c90: ; 0x02192c90
mov r3, r3, lsr #0x10
mov r3, r3, lsl #0x10
str r2, [r0, #4]
adds r7, sl, ip
adc r2, sb, fp
adds r7, r10, ip
adc r2, r9, r11
mov r5, r2, lsr #0x10
mov r5, r5, lsl #0x10
mov r5, r5, lsr #0x10
@@ -3528,37 +3528,37 @@ 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 fp, r2, lsl #0x1
ldrsh sb, [r0, sb]
mov r11, r2, lsl #0x1
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 sl, r2, r7, r8
smull r10, r2, r7, r8
adc ip, ip, r1
adds sl, sl, #0x800
adds r10, r10, #0x800
mov r5, r5, lsr #0xc
ldrsh r6, [r0, r6]
orr r5, r5, ip, lsl #20
ldrsh r0, [r0, fp]
adc fp, r2, r1
mov r2, sl, lsr #0xc
orr r2, r2, fp, lsl #20
smull ip, fp, r2, r0
smull sl, sb, r7, sb
ldrsh r0, [r0, r11]
adc r11, r2, r1
mov r2, r10, lsr #0xc
orr r2, r2, r11, lsl #20
smull ip, r11, r2, r0
smull r10, r9, r7, r9
smull r8, r7, r3, r8
adds r3, ip, #0x800
adc fp, fp, r1
adc r11, r11, r1
mov r3, r3, lsr #0xc
orr r3, r3, fp, lsl #20
smull ip, fp, r2, r6
orr r3, r3, r11, lsl #20
smull ip, r11, r2, r6
smull r2, lr, r5, r6
adds r2, r2, #0x800
adc lr, lr, r1
@@ -3566,23 +3566,23 @@ func_ov46_02192c90: ; 0x02192c90
orr r2, r2, lr, lsl #20
sub r2, r3, r2
str r2, [r4, #0x1d0]
adds r3, sl, #0x800
adc r2, sb, r1
mov sl, r3, lsr #0xc
orr sl, sl, r2, lsl #20
adds r3, r10, #0x800
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, sl, r6
smull r7, r6, sl, r0
smull sl, r0, sb, r0
smull r5, lr, r10, r6
smull r7, r6, r10, r0
smull r10, r0, r9, r0
adds r7, r7, #0x800
adc r6, r6, r1
mov r7, r7, lsr #0xc
@@ -3593,14 +3593,14 @@ func_ov46_02192c90: ; 0x02192c90
adc r5, lr, r1
mov r6, r6, lsr #0xc
orr r6, r6, r5, lsl #20
adds r5, sl, #0x800
adds r5, r10, #0x800
adc r0, r0, r1
mov r5, r5, lsr #0xc
orr r5, r5, r0, lsl #20
sub r0, r6, r5
str r0, [r4, #0x1d8]
adds r5, ip, #0x800
adc r0, fp, r1
adc r0, r11, r1
mov r5, r5, lsr #0xc
orr r5, r5, r0, lsl #20
adds r3, r3, #0x800
@@ -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, sl, fp, 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, sl, fp, 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
@@ -3760,19 +3760,19 @@ _02193130:
_02193144:
ldr r3, _02193498 ; =data_027e0764
ldr r1, [r3]
ldmib r3, {r0, r7, fp}
ldmib r3, {r0, r7, r11}
umull r5, r2, r7, r1
mla r2, r7, r0, r2
ldr sb, [r3, #0x10]
mla r2, fp, r1, r2
adds r5, sb, r5
ldr r9, [r3, #0x10]
mla r2, r11, r1, r2
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, fp, r5, r0
adds r6, sb, r1
mla r0, r11, r5, r0
adds r6, r9, r1
adc r0, r8, r0
str r0, [sp, #0x2c]
mov r0, r2, lsr #0x10
@@ -3825,14 +3825,14 @@ _02193144:
str r0, [sp, #0x10]
mov r0, ip, asr #0x1f
str r0, [sp, #0x14]
umull sl, r0, r7, r6
str sl, [sp]
ldr sl, [sp, #0x2c]
mla r0, r7, sl, r0
mla r0, fp, r6, r0
umull r10, r0, r7, r6
str r10, [sp]
ldr r10, [sp, #0x2c]
mla r0, r7, r10, r0
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
@@ -3850,7 +3850,7 @@ _02193144:
add r3, r0, #1
mov r6, r3, lsl #0x1
ldr r3, _0219349c ; =data_02050f54
ldrsh sl, [r3, r6]
ldrsh r10, [r3, r6]
ldr r3, [sp, #0x30]
smull r7, r6, r3, r5
adds r7, r7, #0x800
@@ -3858,7 +3858,7 @@ _02193144:
mov r8, r7, lsr #0xc
orr r8, r8, r3, lsl #20
mov r3, r8, asr #0x1f
mov sb, sl, asr #0x1f
mov r9, r10, asr #0x1f
str r3, [sp, #0x18]
mov r3, r0, lsl #0x1
ldr r0, _0219349c ; =data_02050f54
@@ -3882,27 +3882,27 @@ _02193144:
mov r3, r3, lsr #0xc
orr r0, r3, r0, lsl #20
str r0, [sp, #0x24]
umull r0, r3, r8, sl
umull r0, r3, r8, r10
adds r0, r0, r1
mov fp, r0, lsr #0xc
mla r3, r8, sb, r3
mov r11, r0, lsr #0xc
mla r3, r8, r9, r3
ldr r0, [sp, #0x18]
mla r3, r0, sl, r3
mla r3, r0, r10, r3
adc r0, r3, r2
orr fp, fp, r0, lsl #20
orr r11, r11, r0, lsl #20
ldr r0, [sp, #0x24]
sub r0, r0, fp
sub r0, r0, r11
str r0, [r4, #0x1e0]
ldr r0, [sp, #8]
umull fp, r3, ip, r5
umull r11, r3, ip, r5
mla r3, ip, r0, r3
ldr r0, [sp, #0x14]
mla r3, r0, r5, r3
adds r5, fp, r1
adds r5, r11, r1
adc r0, r3, r2
mov fp, r5, lsr #0xc
orr fp, fp, r0, lsl #20
mov r0, fp, asr #0x1f
mov r11, r5, lsr #0xc
orr r11, r11, r0, lsl #20
mov r0, r11, asr #0x1f
str r0, [sp, #0x28]
ldr r0, [sp, #0x30]
ldr r3, [sp, #0x10]
@@ -3914,40 +3914,40 @@ _02193144:
adc r3, r5, r2
mov r0, r0, lsr #0xc
orr r0, r0, r3, lsl #20
umull r3, ip, r0, sl
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, sl, ip
mla ip, r5, r10, ip
mov r3, r3, lsr #0xc
adc r5, ip, r2
orr r3, r3, r5, lsl #20
smull r5, lr, r0, r7
smull r0, ip, fp, r7
smull r0, ip, r11, r7
adds r0, r0, r1
adc ip, ip, r2
mov r0, r0, lsr #0xc
orr r0, r0, ip, lsl #20
add r0, r3, r0
str r0, [r4, #0x1e4]
umull r3, r0, fp, sl
mla r0, fp, sb, r0
ldr fp, [sp, #0x28]
mla r0, fp, sl, r0
adds fp, r3, r1
umull r3, r0, r11, r10
mla r0, r11, r9, r0
ldr r11, [sp, #0x28]
mla r0, r11, r10, r0
adds r11, r3, r1
adc r3, r0, r2
mov r0, fp, lsr #0xc
mov r0, r11, lsr #0xc
adds r5, r5, r1
orr r0, r0, r3, lsl #20
adc r3, lr, r2
mov r5, r5, lsr #0xc
orr r5, r5, r3, lsl #20
sub r0, r0, r5
umull r5, r3, r6, sl
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, sl, r3
mla r3, r0, r10, r3
adds r0, r5, r1
adc r3, r3, r2
mov r0, r0, lsr #0xc
@@ -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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x78
mov r4, r0
ldr r1, _02193b14 ; =0x0000019a
@@ -4183,7 +4183,7 @@ _02193710:
mla r7, r0, r3, r7
str r0, [sp, #0x38]
ldr r6, [r1, #0x14]
adds fp, lr, r8
adds r11, lr, r8
ldr r0, _02193b24 ; =0x00004001
adc r7, r6, r7
umull r0, r8, r7, r0
@@ -4201,17 +4201,17 @@ _02193710:
ldr r2, _02193b28 ; =data_02050f54
mov r3, r0, lsl #0x1
mov r0, r3, lsl #0x1
ldrsh sl, [r2, r0]
ldrsh r10, [r2, r0]
add r0, r3, #1
mov r0, r0, lsl #0x1
ldrsh sb, [r2, r0]
mov r0, sl, asr #0x1f
ldrsh r9, [r2, r0]
mov r0, r10, asr #0x1f
str r0, [sp, #8]
ldrsh r0, [r2]
str fp, [r1]
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]
@@ -4219,11 +4219,11 @@ _02193710:
str r0, [sp, #0x10]
mov r0, r8, asr #0x1f
str r0, [sp, #0x18]
umull r0, r3, r5, fp
umull r0, r3, r5, r11
str r0, [sp, #4]
mla r3, r5, r7, r3
ldr r0, [sp, #0x38]
mla r3, r0, fp, r3
mla r3, r0, r11, r3
ldr r0, [sp, #4]
adds r0, lr, r0
adc r5, r6, r3
@@ -4249,7 +4249,7 @@ _02193710:
ldrsh r5, [r2, r0]
ldr r0, [sp, #0xc]
mov r6, r7, asr #0x1f
smull r2, r1, r0, sl
smull r2, r1, r0, r10
adds r0, r2, #0x800
adc r1, r1, #0
mov r0, r0, lsr #0xc
@@ -4259,8 +4259,8 @@ _02193710:
str r0, [sp, #0x20]
mov r0, r5, asr #0x1f
str r0, [sp, #0x3c]
umull fp, r2, r8, sb
adds r3, fp, #0x800
umull r11, r2, r8, r9
adds r3, r11, #0x800
mov r3, r3, lsr #0xc
str r3, [sp, #0x24]
ldr r3, [sp, #0x14]
@@ -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
@@ -4276,61 +4276,61 @@ _02193710:
mov r2, r2, asr #0x1f
ldr r3, [sp, #0x24]
str r2, [sp, #0x28]
umull r2, fp, r3, r5
umull r2, r11, r3, r5
adds r2, r2, #0x800
mov lr, r2, lsr #0xc
ldr r2, [sp, #0x3c]
mla fp, r3, r2, fp
mla r11, r3, r2, r11
ldr r2, [sp, #0x28]
ldr r3, [sp, #0x1c]
mla fp, r2, r5, fp
adc r2, fp, ip
mla r11, r2, r5, r11
adc r2, r11, ip
orr lr, lr, r2, lsl #20
umull r2, fp, r3, r7
umull r2, r11, r3, r7
adds r2, r2, #0x800
mov r2, r2, lsr #0xc
str r2, [sp, #0x2c]
mov r2, r3
mla fp, r2, r6, fp
mla r11, r2, r6, r11
ldr r2, [sp, #0x20]
mla fp, r2, r7, fp
adc r3, fp, ip
mla r11, r2, r7, r11
adc r3, r11, ip
ldr r2, [sp, #0x2c]
ldr fp, [sp, #8]
ldr r11, [sp, #8]
orr r2, r2, r3, lsl #20
str r2, [sp, #0x2c]
sub r2, lr, r2
str r2, [sp, #0x40]
umull r3, r2, r8, sl
mla r2, r8, fp, r2
umull r3, r2, r8, r10
mla r2, r8, r11, r2
ldr r8, [sp, #0x18]
mla r2, r8, sl, r2
mla r2, r8, r10, r2
adds r8, r3, #0x800
adc r3, r2, ip
mov r2, r8, lsr #0xc
orr r2, r2, r3, lsl #20
ldr sl, [sp, #0xc]
ldr r10, [sp, #0xc]
mov r3, r2, asr #0x1f
str r3, [sp, #0x30]
umull r8, r3, sl, sb
mov fp, sl
ldr sl, [sp, #0x14]
umull r8, r3, r10, r9
mov r11, r10
ldr r10, [sp, #0x14]
adds r8, r8, #0x800
mla r3, fp, sl, r3
ldr sl, [sp, #0x10]
mov fp, r8, lsr #0xc
mla r3, sl, sb, r3
mla r3, r11, r10, r3
ldr r10, [sp, #0x10]
mov r11, r8, lsr #0xc
mla r3, r10, r9, r3
adc r3, r3, ip
orr fp, fp, r3, lsl #20
umull sb, r8, fp, r7
adds r3, sb, #0x800
mla r8, fp, r6, r8
mov sl, fp, asr #0x1f
mla r8, sl, r7, r8
mov sb, r3, lsr #0xc
orr r11, r11, r3, lsl #20
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 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,33 +4342,33 @@ _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, fp, r5
mla r2, fp, sb, r2
umull r3, r2, r11, r5
mla r2, r11, r9, r2
adds r3, r3, #0x800
mla r2, sl, r5, r2
mla r2, r10, r5, r2
adc r2, r2, ip
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
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, sl, fp, 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, sl, fp, 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,9 +4884,9 @@ _021940d8:
.global func_ov46_0219416c
arm_func_start func_ov46_0219416c
func_ov46_0219416c: ; 0x0219416c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x34
ldr fp, _021942ec ; =data_027e0764
ldr r11, _021942ec ; =data_027e0764
mov r6, r0
mov r5, #0
add r4, sp, #0x10
@@ -4923,20 +4923,20 @@ _02194184:
cmp r0, #0
beq _021942d8
sub r1, r8, r7
ldr sl, [sp, #0x10]
cmp sl, #0
ldr r10, [sp, #0x10]
cmp r10, #0
bne _02194264
ldr r2, [fp]
ldmib fp, {r0, ip}
ldr r2, [r11]
ldmib r11, {r0, ip}
umull r7, lr, ip, r2
mla lr, ip, r0, lr
ldr r3, [fp, #0xc]
ldr sb, [fp, #0x10]
ldr r3, [r11, #0xc]
ldr r9, [r11, #0x10]
mla lr, r3, r2, lr
ldr r8, [fp, #0x14]
adds r0, sb, r7
ldr r8, [r11, #0x14]
adds r0, r9, r7
adc r2, r8, lr
stmia fp, {r0, r2}
stmia r11, {r0, r2}
mov r0, #0x53
umull r0, r3, r2, r0
mov r0, #0
@@ -4945,7 +4945,7 @@ _02194184:
mov r0, #0x53
mla r3, r2, r0, r3
sub r0, r3, #0x29
add r0, sl, r0
add r0, r10, r0
str r0, [sp, #0x10]
_02194264:
mov r0, r4
@@ -4982,7 +4982,7 @@ _021942d8:
cmp r5, #4
blt _02194184
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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
+37 -37
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, sl, fp, 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
@@ -778,18 +778,18 @@ _02190964:
str r7, [r8, #0x60]
str r6, [r8, #0x64]
str r5, [r8, #0x68]
ldrh sl, [r3, #0x76]
ldrh r10, [r3, #0x76]
add r2, r4, #0x48
mov r1, #0x394
add sl, sl, #1
strh sl, [r3, #0x76]
ldrh sl, [sb, #0x76]
add r10, r10, #1
strh r10, [r3, #0x76]
ldrh r10, [r9, #0x76]
mov r3, #0
str r7, [sp, #0x6c]
add r7, sl, #1
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, sl, fp, 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, sl, fp, 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, sl, fp, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02190c88:
add r0, sp, #0x54
add r1, sp, #0x60
@@ -962,16 +962,16 @@ _02190c88:
umull r8, r7, r2, r6
mla r7, r2, r5, r7
ldr r1, [ip, #0xc]
ldr sl, [ip, #0x10]
ldr r10, [ip, #0x10]
mla r7, r1, r6, r7
ldr sb, [ip, #0x14]
adds r1, sl, r8
adc r2, sb, r7
ldr r9, [ip, #0x14]
adds r1, r10, r8
adc r2, r9, r7
ldr r3, _02190df8 ; =0x00001001
stmia ip, {r1, r2}
mov fp, lr
mov r11, lr
umull r1, r5, r2, r3
mla r5, r2, fp, r5
mla r5, r2, r11, r5
mla r5, lr, r3, r5
add r0, sp, #0x3c
bl func_01fffb4c
@@ -1005,16 +1005,16 @@ _02190c88:
mov r1, #0x394
str r2, [r4, #0x68]
add r2, r4, #0x48
mov r3, fp
mov r3, r11
bl func_ov00_020ceacc
_02190dc0:
add sp, sp, #0x90
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r0
add r0, sp, #0x18
@@ -3646,17 +3646,17 @@ 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
ldrsh sl, [r1, r0]
ldrsh r10, [r1, r0]
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, sl, #0
rsb ip, r10, #0
str r0, [sp, #0x10]
add r0, r0, #0xae
ldr r8, [r4, #0x50]
@@ -3665,35 +3665,35 @@ func_ov47_0219305c: ; 0x0219305c
mov r0, ip, asr #0x1f
str r0, [sp, #8]
ldr r0, _0219320c ; =0x00000e3d
mov fp, sl, asr #0x1f
umull r7, r6, sl, r0
mov r11, r10, asr #0x1f
umull r7, r6, r10, r0
mov r0, #0
mla r6, sl, r0, r6
mla r6, r10, r0, r6
ldr r0, _0219320c ; =0x00000e3d
adds r7, r7, #0x800
mla r6, fp, r0, r6
mla r6, r11, r0, r6
adc r0, r6, #0
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, sl, fp, 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
+297 -297
View File
File diff suppressed because it is too large Load Diff
+14 -14
View File
@@ -1814,19 +1814,19 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x8c
mov r5, #0xff
sub r4, r5, #0x100
add r3, sp, #0x34
mov fp, r0
mov r11, r0
mov r7, #0
mov r6, #0xb
mov r2, #8
add r1, sp, #0x18
strb r5, [sp, #0x74]
str r6, [sp, #0x84]
str fp, [sp, #0x88]
str r11, [sp, #0x88]
str r4, [sp, #0x34]
str r4, [sp, #0x38]
str r4, [sp, #0x3c]
@@ -1859,20 +1859,20 @@ func_ov50_02196d94: ; 0x02196d94
add r1, sp, #0
add r2, sp, #0x28
str r3, [r4, #0xc]
str fp, [sp, #0x14]
str r11, [sp, #0x14]
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, sl, fp, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r4, _02196edc ; =0x42494752
ldr r5, _02196ed8 ; =data_027e0fe4
add sl, sp, #0x34
add r10, sp, #0x34
add r6, sp, #0x74
_02196e74:
ldr r0, [r5]
mov r1, sl
mov r1, r10
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r7, r0
beq _02196ebc
@@ -1883,19 +1883,19 @@ _02196e74:
ldr r0, [r7, #4]
cmp r0, r4
bne _02196ebc
mov r0, fp
mov r0, r11
mov r1, #4
mov r2, #0
bl func_ov50_021960c8
add sp, sp, #0x8c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
_02196ebc:
add sb, sb, #1
cmp sb, r8
add sl, sl, #8
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, sl, fp, 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
+113 -113
View File
@@ -1114,37 +1114,37 @@ _021962ac:
.global func_ov51_021962b4
arm_func_start func_ov51_021962b4
func_ov51_021962b4: ; 0x021962b4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x2c
mov sl, r0
ldr r0, [sl, #0x2f8]
mov r10, r0
ldr r0, [r10, #0x2f8]
add r0, r0, #1
str r0, [sl, #0x2f8]
ldr r1, [sl, #0x300]
str r0, [r10, #0x2f8]
ldr r1, [r10, #0x300]
bl func_02002c14
mov r0, #0xc
mul r2, r1, r0
str r1, [sl, #0x2f8]
ldr r1, [sl, #0x2fc]
ldr r0, [sl, #0x48]
str r1, [r10, #0x2f8]
ldr r1, [r10, #0x2fc]
ldr r0, [r10, #0x48]
add r3, r1, r2
str r0, [r1, r2]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
str r0, [r3, #4]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
str r0, [r3, #8]
ldr r0, [sl, #0x154]
ldr r0, [r10, #0x154]
cmp r0, #1
bgt _02196470
ldr r5, _021964f4 ; =data_027e0e58
mov r8, sl
add sb, sl, #0x490
mov r8, r10
add r9, r10, #0x490
mov r7, #0
add r6, sp, #0x20
mov r4, #0xc
_02196324:
ldr r1, [sl, #0x300]
ldr r2, [sl, #0x2f8]
ldr r1, [r10, #0x300]
ldr r2, [r10, #0x2f8]
sub r0, r1, #1
mul r0, r7, r0
add r2, r1, r2
@@ -1152,7 +1152,7 @@ _02196324:
sub r0, r2, r0, asr #1
bl func_02002c14
mul r2, r1, r4
ldr r3, [sl, #0x2fc]
ldr r3, [r10, #0x2fc]
add r0, r8, #0x6c
ldr r1, [r3, r2]
add r2, r3, r2
@@ -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, sl, #0x6c
ldr fp, _021964f8 ; =0x000004cd
add r0, r10, #0x6c
ldr r11, _021964f8 ; =0x000004cd
ldr r4, _021964fc ; =data_027e0f90
mov r8, sl
add sb, r0, #0x400
mov r8, r10
add r9, r0, #0x400
mov r7, #0
add r6, sp, #0x14
add r5, sp, #4
@@ -1192,17 +1192,17 @@ _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
str r3, [sp, #0xc]
str fp, [sp, #0x10]
str r11, [sp, #0x10]
bl func_01ff9bf8
mov r0, #5
str r0, [sp]
ldrb r3, [sl, #0x124]
mov r0, sl
ldrb r3, [r10, #0x124]
mov r0, r10
mov r1, r5
mov r2, r6
bl _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
@@ -1213,7 +1213,7 @@ _021963d4:
cmp r0, #0
beq _02196450
ldr r0, [r4]
ldrb r1, [sl, #0x124]
ldrb r1, [r10, #0x124]
ldr ip, [r0]
mov r2, r6
ldr ip, [ip, #0x30]
@@ -1225,11 +1225,11 @@ _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:
add r5, sl, #0x490
add r5, r10, #0x490
mov r4, #0
_02196478:
mov r0, r5
@@ -1243,30 +1243,30 @@ _02196478:
_02196498:
mov r0, #0
str r0, [sp]
ldr r3, [sl, #8]
ldr r3, [r10, #8]
ldr r0, _02196504 ; =data_027e0ffc
ldr r1, _02196508 ; =0x00000262
add r2, sl, #0x48
add r2, r10, #0x48
bl func_ov00_020cec60
ldr r0, [sl, #0x130]
ldr r0, [r10, #0x130]
cmp r0, #0
beq _021964cc
cmp r0, #1
beq _021964d8
b _021964e0
_021964cc:
mov r0, sl
mov r0, r10
bl func_ov51_02196220
b _021964e0
_021964d8:
mov r0, sl
mov r0, r10
bl func_ov51_02196254
_021964e0:
add r0, sl, #0x21c
add r0, r10, #0x21c
bl func_ov51_02196004
mov r0, #1
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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,25 +1279,25 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x24
mov sl, r0
add r0, sl, #0x6c
mov r10, r0
add r0, r10, #0x6c
add r0, r0, #0x400
ldr r5, _021965b8 ; =0x000004cd
add r8, sl, #0x18
add sb, r0, #0x18
add r8, r10, #0x18
add r9, r0, #0x18
mov r7, #2
add r6, sp, #0x18
mov r4, #0x1f
mov fp, #1
mov r11, #1
_0219653c:
add r0, r8, #0x6c
add r0, r0, #0x400
ldmia r0, {r0, r1, r2}
stmia r6, {r0, r1, r2}
ldr r1, [sp, #0x1c]
add r0, sl, #0x21c
add r0, r10, #0x21c
add r1, r1, #0x85
add r1, r1, #0x300
str r1, [sp, #0x1c]
@@ -1307,22 +1307,22 @@ _0219653c:
mov r0, #0
stmib sp, {r0, r4}
str r0, [sp, #0xc]
str fp, [sp, #0x10]
str r11, [sp, #0x10]
ldr r0, _021965bc ; =data_ov00_020e9370
mov r1, #0
mov r2, sb
mov r2, r9
mov r3, r5
str fp, [sp, #0x14]
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, sl, fp, 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, sl, fp, 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
@@ -1673,7 +1673,7 @@ func_ov51_02196924: ; 0x02196924
ldr r0, _02196b44 ; =data_ov51_02198274
ldr r3, [r1, #0x4c]
ldr ip, [r5, #0xc]
ldr fp, [r5, #4]
ldr r11, [r5, #4]
ldr r5, _02196b48 ; =data_02050f54
add r8, sp, #4
ldmia r0, {r0, r1, r2}
@@ -1682,37 +1682,37 @@ func_ov51_02196924: ; 0x02196924
ldrsh r0, [r5, r6]
str r3, [sp, #0x14]
str ip, [sp, #0x18]
str fp, [sp, #0x10]
ldr sb, [sp, #0xc]
str r11, [sp, #0x10]
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 sl, [sp, #8]
ldr r10, [sp, #8]
ldr r1, [sp, #4]
add r3, r3, sl
smull r5, r2, sb, r6
add r3, r3, r10
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 sl, r6, r1, r6
adc sb, r2, #0
smull r10, r6, r1, r6
adc r9, r2, #0
mov r5, r5, lsr #0xc
sub r7, lr, #0x8000
rsb r0, r0, #0
adds r2, sl, #0x800
orr r5, r5, sb, lsl #20
smull sl, sb, r1, r0
adds r2, r10, #0x800
orr r5, r5, r9, lsl #20
smull r10, r9, r1, r0
adc r0, r6, #0
adds r6, sl, #0x800
mov sl, r2, lsr #0xc
adds r6, r10, #0x800
mov r10, r2, lsr #0xc
mov r2, r6, lsr #0xc
adc r1, sb, #0
orr sl, sl, r0, lsl #20
add r6, fp, r8
add r6, r6, sl
adc r1, r9, #0
orr r10, r10, r0, lsl #20
add r6, r11, r8
add r6, r6, r10
orr r2, r2, r1, lsl #20
add r0, ip, r5
add r0, r0, r2
@@ -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, sl, fp, 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,24 +1985,24 @@ 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, sl, fp, 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 sl, r0
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 fp, #0x2000
mov r11, #0x2000
_02196e4c:
mov r1, sb
mov r1, r9
mov r2, r6
add r0, sl, #0x48
mov r3, fp
add r0, r10, #0x48
mov r3, r11
stmia sp, {r7, r8}
bl func_ov00_020c57fc
cmp r0, #0
@@ -2013,38 +2013,38 @@ _02196e4c:
ldr r0, [sp, #0x2c]
str r1, [sp, #0x1c]
str r0, [sp, #0x20]
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
add r1, sp, #0x18
str r0, [sp, #0xc]
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
add r2, sp, #0xc
str r0, [sp, #0x10]
ldr r0, [sl, #0x50]
ldr r0, [r10, #0x50]
str r0, [sp, #0x14]
ldr r0, [sl, #8]
ldr r0, [r10, #8]
str r0, [sp]
ldrh r0, [sl, #0x9c]
ldrh r0, [r10, #0x9c]
stmib sp, {r0, r5}
ldr r0, [r4]
ldr r3, [sl, #0x88]
ldr r3, [r10, #0x88]
bl func_01ffe1cc
cmp r0, #0
moveq r0, #1
movne r0, #0
cmp r0, #0
addne sp, sp, #0x30
strne sb, [sl, #0x74]
strne r9, [r10, #0x74]
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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,36 +3262,36 @@ _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 sl, sb
mov r10, r9
add r8, r4, #0x48
add r7, sp, #0x48
add r6, sp, #0x54
add fp, sp, #0x84
add r11, sp, #0x84
_02197f48:
ldmia r8, {r0, r1, r2}
stmia r7, {r0, r1, r2}
mov r0, sl
mov r0, r10
mov r1, r6
mov r2, r7
mov r3, r7
bl func_01ff9e64
add r0, r4, #0x158
ldr ip, [r0]
mov r1, fp
mov r1, r11
ldr ip, [ip, #0x10]
add r2, sp, #0x60
mov r3, r7
blx ip
ldrh r0, [r5, #0xe6]
add sb, sb, #1
add sl, sl, #0x1000
cmp sb, r0
add r9, r9, #1
add r10, r10, #0x1000
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, sl, fp, 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, sl, 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 sl, [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
@@ -3423,12 +3423,12 @@ _02198128:
sub r7, r7, #0x400
_02198164:
str r4, [r8]
sub r0, sl, #0x800
sub r0, r10, #0x800
stmib r8, {r0, r5, r6}
add r0, sl, #0x800
add r0, r10, #0x800
str r0, [r8, #0x10]
str r7, [r8, #0x14]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
arm_func_end func_ov51_02198024
_02198180: .word 0x000004cd
+14 -14
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, sl, 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, sl, 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, sl, 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, sl, 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
@@ -781,19 +781,19 @@ _02195dec:
mov r8, #0
beq _02195ef4
bl func_ov52_0219564c
mov sl, r0
mov r10, r0
bl func_ov52_02195500
cmp sl, r0
cmp r10, r0
bls _02195ea0
mov r5, #0x1f
mov r6, #0xe
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, sl, 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
+19 -19
View File
@@ -435,21 +435,21 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x2c
ldr r5, _02199304 ; =data_ov53_0219a580
mov sl, r0
ldrh sb, [r5, #0x42]
mov r10, r0
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
add r6, sp, #0x20
mov fp, #2
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]
@@ -462,25 +462,25 @@ _02199220:
ldr r3, [r0]
mov r1, r6
ldr r3, [r3, #0x64]
mov r2, fp
mov r2, r11
blx r3
ldrsh r1, [sl, #0x2c]
mov r0, sl
ldrsh r1, [r10, #0x2c]
mov r0, r10
str r1, [sp]
ldmia r6, {r1, r2, r3}
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, sl, fp, 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
@@ -498,18 +498,18 @@ _021992a8:
beq _021992ec
mov r1, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
ldrsh r1, [sl, #0x2c]
mov r0, sl
ldrsh r1, [r10, #0x2c]
mov r0, r10
str r1, [sp]
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, sl, fp, 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
+18 -18
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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x13c
mov r4, r0
mvn r1, #0
@@ -586,29 +586,29 @@ 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 sl, [sp, #0x18]
ldr r10, [sp, #0x18]
mov r6, #1
add r3, r7, #0x2000
ldr r0, [r0]
add r1, sp, #0xc
mov r2, r6
add r8, sb, #0x1800
str sl, [sp, #0xc]
str sb, [sp, #0x10]
add r8, r9, #0x1800
str r10, [sp, #0xc]
str r9, [sp, #0x10]
str r3, [sp, #0x14]
bl func_ov00_02083f44
cmp r0, r8
bge _021994cc
ldr r0, _02199640 ; =data_027e0e60
ldr sl, [sp, #0x18]
ldr r10, [sp, #0x18]
ldr r0, [r0]
add r3, r7, #0x3000
add r1, sp, #0
mov r2, r6
str sl, [sp]
str sb, [sp, #4]
str r10, [sp]
str r9, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083f44
cmp r0, r8
@@ -634,8 +634,8 @@ _021994d4:
ldr r1, [sp, #0x38]
str r0, [sp, #0xe0]
ldr r0, [sp, #0x58]
ldr sl, _02199648 ; =0x0000038e
mov sb, #0xf000
ldr r10, _02199648 ; =0x0000038e
mov r9, #0xf000
mov r7, #0x1000
str r6, [sp, #0xc8]
ldr r6, [sp, #0x50]
@@ -671,17 +671,17 @@ _021994d4:
str r1, [sp, #0x10c]
mov r1, #1
strb r1, [sp, #0xa0]
mov fp, #0x5c
mov r11, #0x5c
ldr r0, [r0]
add r1, sp, #0x8c
str r6, [sp, #0x114]
str sl, [sp, #0x30]
str sb, [sp, #0x3c]
str r10, [sp, #0x30]
str r9, [sp, #0x3c]
str r8, [sp, #0x48]
str r7, [sp, #0x44]
str r8, [sp, #0x40]
str sl, [sp, #0xc4]
str sb, [sp, #0xd0]
str r10, [sp, #0xc4]
str r9, [sp, #0xd0]
str r8, [sp, #0xd4]
str r7, [sp, #0xd8]
str r8, [sp, #0xdc]
@@ -690,7 +690,7 @@ _021994d4:
strb ip, [sp, #0x11a]
strb r3, [sp, #0x11b]
strb r2, [sp, #0x11c]
str fp, [sp, #0x120]
str r11, [sp, #0x120]
bl func_ov00_02097810
ldr r2, _02199650 ; =data_027e103c
str r0, [r4, #0x5c]
@@ -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, sl, fp, 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
+34 -34
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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x20
mov sl, r0
ldr fp, _02199d4c ; =data_027e0e60
mov r7, sl
add r8, sl, #0x2c
add sb, sl, #0x24
mov r10, r0
ldr r11, _02199d4c ; =data_027e0e60
mov r7, r10
add r8, r10, #0x2c
add r9, r10, #0x24
mov r6, #0
add r4, sp, #4
add r5, sp, #0x14
@@ -1204,7 +1204,7 @@ _02199ca0:
beq _02199cf8
b _02199d2c
_02199cb8:
ldr r0, [fp]
ldr r0, [r11]
mov r1, r8
bl func_ov00_020840c4
cmp r0, #0
@@ -1214,23 +1214,23 @@ _02199cb8:
ldr r3, [r3, #0x64]
mov r2, #6
blx r3
ldrsh r1, [sl, #0x6c]
mov r0, sl
ldrsh r1, [r10, #0x6c]
mov r0, r10
str r1, [sp]
ldmia r5, {r1, r2, r3}
bl func_ov00_020be9e4
b _02199d2c
_02199cf8:
ldr r0, _02199d50 ; =data_027e0fe4
mov r1, sb
mov r1, r9
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
beq _02199d2c
mov r1, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
ldrsh r1, [sl, #0x6c]
mov r0, sl
ldrsh r1, [r10, #0x6c]
mov r0, r10
str r1, [sp]
ldmia r4, {r1, r2, r3}
bl func_ov00_020be9e4
@@ -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, sl, fp, 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,47 +1882,47 @@ _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, sl, fp, lr}
stmdb sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xc
mov sl, r0
mov r10, r0
bl func_ov57_02199ecc
add r1, sl, #0x100
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
ldr fp, _0219a6b0 ; =0x00000666
add r5, sl, #0x164
add r4, sl, #0x100
ldr r11, _0219a6b0 ; =0x00000666
add r5, r10, #0x164
add r4, r10, #0x100
mov r6, #0x2d
add r8, sp, #0
_0219a5ec:
mov r1, r8
add r0, sl, #0x48
add r0, r10, #0x48
bl func_01ff9ec0
ldrh r1, [r4, #0x68]
mov r7, r0
cmp r1, #0
beq _0219a63c
cmp r7, fp
cmp r7, r11
ble _0219a63c
add r1, sp, #0
mov r0, sl
mov r0, r10
mov r2, #1
bl func_ov14_02123cd0
ldrsh r2, [sl, #0x78]
add r1, sl, #0x100
ldrsh r2, [r10, #0x78]
add r1, r10, #0x100
add sp, sp, #0xc
sub r2, r2, #0x8000
strh r2, [r1, #0x70]
mov r0, r7
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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,26 +1931,26 @@ _0219a63c:
cmp r0, #0
bne _0219a5ec
_0219a664:
mov r0, sb
mov r0, r9
bl func_ov14_0213dda0
cmp r0, #1
blt _0219a698
add r1, sl, #0x100
add r1, r10, #0x100
ldrsh r1, [r1, #0x64]
cmp r1, r0
ble _0219a698
ldr r1, _0219a6b4 ; =0x00000b33
mov r2, #1
mov r0, sl
strb r2, [sb, #0x69]
mov r0, r10
strb r2, [r9, #0x69]
bl func_ov14_02123e1c
_0219a698:
mov r0, sl
mov r0, r10
mov r1, #1
bl func_ov14_02123e48
mov r0, #0
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
arm_func_end func_ov57_0219a5ac
_0219a6b0: .word 0x00000666
+49 -49
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, sl, fp, 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,18 +2099,18 @@ 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 fp, #0x400
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]
str r7, [sp, #4]
str fp, [sp, #8]
str r11, [sp, #8]
bl func_ov00_020a61ac
ldr r1, [sp, #0x18]
ldr r0, [sp, #0x1c]
@@ -2128,20 +2128,20 @@ _02199f40:
mov r1, r5
bne _02199fa4
bl func_ov00_02083f44
mov sl, r0
mov r10, r0
b _02199fb0
_02199fa4:
bl func_ov00_02083f44
cmp sl, r0
movle sl, r0
cmp r10, r0
movle r10, r0
_02199fb0:
add r8, r8, #1
cmp r8, #4
add sb, sb, #0x4000
add r9, r9, #0x4000
blt _02199f40
mov r0, sl
mov r0, r10
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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]
@@ -2216,14 +2216,14 @@ func_ov58_0219a084: ; 0x0219a084
bl func_ov00_02083c7c
mov r8, #0
ldr r4, _0219a3a8 ; =data_027e0e60
add sl, sp, #0x3c
mov sb, r8
add r10, sp, #0x3c
mov r9, r8
mov r7, r8
mov r6, #0x400
add r5, sp, #0x24
mov fp, r8
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]
@@ -2232,21 +2232,21 @@ _0219a0d8:
bl func_ov00_020a61ac
ldr r1, [sp, #0x30]
ldr r0, [sp, #0x34]
str r1, [sl]
str r1, [r10]
ldr r2, [sp, #0x38]
str r0, [sl, #4]
mov r0, sl
str r0, [r10, #4]
mov r0, r10
mov r1, r5
str r2, [sl, #8]
mov r2, sl
str r2, [r10, #8]
mov r2, r10
bl func_01ff9bc4
ldr r0, [r4]
mov r1, sl
mov r2, fp
mov r1, r10
mov r2, r11
bl func_ov00_02083f44
str r0, [sl, #4]
add sb, sb, #0x4000
add sl, sl, #0xc
str r0, [r10, #4]
add r9, r9, #0x4000
add r10, r10, #0xc
add r8, r8, #1
cmp r8, #4
blt _0219a0d8
@@ -2293,7 +2293,7 @@ _0219a0d8:
cmp r0, #0
addne sp, sp, #0xcc
movne r0, #7
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, 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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
ldr r1, _0219a768 ; =data_027e077c
mov sl, r0
mov r10, r0
ldr r0, [r1]
mov sb, #0
mov r9, #0
cmp r0, #0xd
bne _0219a760
mov r6, sb
mov r8, sl
add r7, sl, #8
mov fp, sb
mov r6, r9
mov r8, r10
add r7, r10, #8
mov r11, r9
mov r4, #1
mov r5, sb
mov r5, r9
_0219a6d0:
mov r0, r7
ldr ip, [r0]
@@ -2680,27 +2680,27 @@ _0219a6d0:
beq _0219a718
cmp r6, #2
bne _0219a724
ldrb r0, [sl, #0xdf]
ldrb r0, [r10, #0xdf]
cmp r0, #0
beq _0219a724
b _0219a74c
_0219a718:
ldrb r0, [sl, #0xdf]
ldrb r0, [r10, #0xdf]
cmp r0, #0
beq _0219a74c
_0219a724:
cmp sb, #0
cmp r9, #0
bne _0219a740
ldrh r1, [r8, #0x12]
mov r0, sl
mov r0, r10
bl func_ov58_0219a76c
cmp r0, #0
beq _0219a748
_0219a740:
mov sb, r4
mov r9, r4
b _0219a74c
_0219a748:
mov sb, fp
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, sl, fp, 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
+139 -139
View File
@@ -1421,9 +1421,9 @@ _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, sl, fp, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x220
mov sl, r0
mov r10, r0
bl func_ov59_02198e2c
ldrb r1, [r0, #0x27]
mov r2, #0
@@ -1433,8 +1433,8 @@ func_ov59_0219a0ac: ; 0x0219a0ac
movne r2, #1
cmp r2, #0
addne sp, sp, #0x220
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r1, [sl, #0x2f4]
ldmneia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r1, [r10, #0x2f4]
ldr r0, _0219a9e8 ; =gItemManager
ldr r4, [r1, #8]
ldr r0, [r0]
@@ -1442,41 +1442,41 @@ func_ov59_0219a0ac: ; 0x0219a0ac
bl _ZNK11ItemManager18func_ov00_020ad538Ei
cmp r4, r0
addeq sp, sp, #0x220
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldrb r0, [sl, #0x3c2]
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldrb r0, [r10, #0x3c2]
cmp r0, #0
bne _0219a4ec
ldr r1, [sl, #0x54]
ldr r1, [r10, #0x54]
ldr r0, _0219a9f0 ; =data_027e0f94
str r1, [sp, #0x94]
ldr r1, [sl, #0x58]
ldr r1, [r10, #0x58]
ldr r0, [r0, #4]
str r1, [sp, #0x98]
ldr r1, [sl, #0x5c]
ldr r1, [r10, #0x5c]
add r8, r0, #0x99
str r1, [sp, #0x9c]
ldr r0, [sl, #0x54]
ldr r0, [r10, #0x54]
ldr lr, _0219a9f4 ; =0x00000666
str r0, [sp, #0x88]
ldr r0, [sl, #0x58]
mov fp, #0
ldr r0, [r10, #0x58]
mov r11, #0
str r0, [sp, #0x8c]
ldr r0, [sl, #0x5c]
add r1, sl, #0x300
ldr r0, [r10, #0x5c]
add r1, r10, #0x300
str r0, [sp, #0x90]
ldr r7, [sl, #0x48]
ldr r7, [r10, #0x48]
ldr r2, _0219a9f8 ; =data_02050f54
str r7, [sp, #0x7c]
ldr r0, [sl, #0x4c]
mov sb, #1
ldr r0, [r10, #0x4c]
mov r9, #1
str r0, [sp, #0x80]
ldr r6, [sl, #0x50]
ldr r6, [r10, #0x50]
add r0, sp, #0x7c
str r6, [sp, #0x84]
ldr r5, [sl, #0x344]
ldr r5, [r10, #0x344]
ldrh r1, [r1, #0x40]
umull r4, r3, r5, lr
mla r3, r5, fp, r3
mla r3, r5, r11, r3
mov r5, r5, asr #0x1f
mla r3, r5, lr, r3
adds r4, r4, #0x800
@@ -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]
@@ -1514,19 +1514,19 @@ func_ov59_0219a0ac: ; 0x0219a0ac
strh r5, [r0, #0xca]
strh r5, [r0, #0xcc]
strh r5, [r0, #0xce]
strh fp, [r0, #0xd0]
strb fp, [sp, #0x20e]
strb fp, [sp, #0x20f]
strb fp, [sp, #0x210]
strb fp, [sp, #0x211]
strb fp, [sp, #0x218]
strb fp, [sp, #0x219]
strb fp, [sp, #0x21a]
strb fp, [sp, #0x21b]
strb fp, [sp, #0x21c]
strb fp, [sp, #0x21d]
strh r11, [r0, #0xd0]
strb r11, [sp, #0x20e]
strb r11, [sp, #0x20f]
strb r11, [sp, #0x210]
strb r11, [sp, #0x211]
strb r11, [sp, #0x218]
strb r11, [sp, #0x219]
strb r11, [sp, #0x21a]
strb r11, [sp, #0x21b]
strb r11, [sp, #0x21c]
strb r11, [sp, #0x21d]
_0219a24c:
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
add r0, sp, #0x88
add r2, r1, r1, lsl #1
mov r1, r2, asr #0x1
@@ -1544,24 +1544,24 @@ _0219a24c:
ldmia r4, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, _0219a9fc ; =data_027e0e60
ldr r4, [sl, #8]
ldr r4, [r10, #8]
ldr r0, [r0]
ldr r2, [sl, #0x98]
ldr r2, [r10, #0x98]
add r1, sp, #0x1c0
stmia sp, {r2, r4}
ldrh r5, [sl, #0x9c]
ldrh r5, [r10, #0x9c]
mov r2, r6
mov r4, #0
str r5, [sp, #8]
ldr r5, [sl, #0xa0]
movne sb, #0
ldr r5, [r10, #0xa0]
movne r9, #0
str r5, [sp, #0xc]
str r4, [sp, #0x10]
bl func_01ffbf5c
cmp r0, #0
beq _0219a4bc
mov r6, #1
strb r6, [sl, #0x3c2]
strb r6, [r10, #0x3c2]
ldr r4, [sp, #0x1c0]
ldr r0, [sp, #0x1c4]
ldr r3, [sp, #0x1c8]
@@ -1574,9 +1574,9 @@ _0219a24c:
str r4, [sp, #0x7c]
str r0, [sp, #0x80]
str r3, [sp, #0x84]
add r1, sl, #0x300
add r1, r10, #0x300
ldr r5, _0219aa00 ; =0xfffff99a
ldr r2, [sl, #0x344]
ldr r2, [r10, #0x344]
sub r6, r6, #2
umull r7, r0, r2, r5
mla r0, r2, r6, r0
@@ -1618,7 +1618,7 @@ _0219a24c:
strh r7, [r0, #0x6e]
mov r6, #0
strh r6, [r0, #0x70]
ldr fp, _0219a9fc ; =data_027e0e60
ldr r11, _0219a9fc ; =data_027e0e60
strb r6, [sp, #0x1ae]
strb r6, [sp, #0x1af]
strb r6, [sp, #0x1b0]
@@ -1634,7 +1634,7 @@ _0219a24c:
add r5, sp, #0x94
mov r4, #0
_0219a3f8:
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
mov r0, r7
add r3, r1, r1, lsl #1
mov r2, r3, asr #0x1
@@ -1649,16 +1649,16 @@ _0219a3f8:
mov ip, r3
ldmia r5, {r0, r1, r2}
stmia ip, {r0, r1, r2}
ldr ip, [sl, #8]
ldr r0, [fp]
ldr r2, [sl, #0x98]
ldr ip, [r10, #8]
ldr r0, [r11]
ldr r2, [r10, #0x98]
add r1, sp, #0x160
stmia sp, {r2, ip}
ldrh ip, [sl, #0x9c]
ldrh ip, [r10, #0x9c]
mov r2, r6
movne sb, #0
movne r9, #0
str ip, [sp, #8]
ldr ip, [sl, #0xa0]
ldr ip, [r10, #0xa0]
str ip, [sp, #0xc]
str r4, [sp, #0x10]
bl func_01ffbf5c
@@ -1668,13 +1668,13 @@ _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, [sl, #0x98]
ldr r1, [r10, #0x98]
mov r0, r5
add r3, r1, r1, lsl #1
mov r1, r8
@@ -1683,12 +1683,12 @@ _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, [sl, #0x98]
ldr r1, [r10, #0x98]
add r0, sp, #0x94
add r2, r1, r1, lsl #1
mov r1, r2, asr #0x1
@@ -1697,44 +1697,44 @@ _0219a4bc:
mov r2, r2, asr #0x2
bl func_0202b2f8
_0219a4e4:
cmp sb, #0
cmp r9, #0
bne _0219a24c
_0219a4ec:
ldrb r0, [sl, #0x3c2]
ldrb r0, [r10, #0x3c2]
cmp r0, #0
bne _0219a820
ldr r8, [sl, #0x54]
add r2, sl, #0x300
ldr r8, [r10, #0x54]
add r2, r10, #0x300
str r8, [sp, #0x94]
ldr r7, [sl, #0x58]
ldr r7, [r10, #0x58]
ldr r0, _0219a9f4 ; =0x00000666
str r7, [sp, #0x98]
ldr r6, [sl, #0x5c]
ldr r6, [r10, #0x5c]
mov r1, #0
str r6, [sp, #0x9c]
ldr r4, [sl, #0x344]
ldr r4, [r10, #0x344]
ldrh r5, [r2, #0x40]
str r2, [sp, #0x18]
umull r3, r2, r4, r0
mla r2, r4, r1, r2
mov r4, r4, asr #0x1f
mov r5, r5, asr #0x4
mov fp, r5, lsl #0x1
mov r11, r5, lsl #0x1
str r7, [sp, #0x8c]
adds r3, r3, #0x800
mla r2, r4, r0, r2
add sb, fp, #1
add r9, r11, #1
ldr r5, _0219a9f8 ; =data_02050f54
mov r7, fp, lsl #0x1
mov r4, sb, lsl #0x1
ldrsh fp, [r5, r7]
mov r7, r11, 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, fp, 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,15 +1749,15 @@ _0219a4ec:
str r4, [r3, #8]
str r2, [sp, #0x88]
str r4, [sp, #0x90]
ldr sb, [sl, #0x48]
mov fp, #0x800
str sb, [sp, #0x7c]
ldr r2, [sl, #0x4c]
ldr r9, [r10, #0x48]
mov r11, #0x800
str r9, [sp, #0x7c]
ldr r2, [r10, #0x4c]
str r2, [sp, #0x80]
ldr r8, [sl, #0x50]
ldr r8, [r10, #0x50]
ldr r2, [sp, #0x18]
str r8, [sp, #0x84]
ldr r7, [sl, #0x344]
ldr r7, [r10, #0x344]
ldrh r2, [r2, #0x40]
umull r6, r4, r7, r0
mov r2, r2, asr #0x4
@@ -1775,10 +1775,10 @@ _0219a4ec:
ldrsh r6, [r5, r3]
ldrsh r2, [r5, r2]
smull r4, r3, r6, r7
adds r4, r4, fp
adds r4, r4, r11
smull r7, r6, r2, r7
adc r3, r3, r1
adds r2, r7, fp
adds r2, r7, r11
mov r4, r4, lsr #0xc
adc r1, r6, r1
mov r2, r2, lsr #0xc
@@ -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
@@ -1796,7 +1796,7 @@ _0219a4ec:
str r0, [sp, #0x14]
add r4, sp, #0x88
_0219a668:
ldr r2, [sl, #0x98]
ldr r2, [r10, #0x98]
mov r0, r4
add r3, r2, r2, lsl #1
mov r2, r3, asr #0x1
@@ -1833,16 +1833,16 @@ _0219a668:
ldmia r0, {r0, r1, r2}
stmia r8, {r0, r1, r2}
ldr r0, _0219a9fc ; =data_027e0e60
ldr r8, [sl, #8]
ldr r8, [r10, #8]
ldr r0, [r0]
ldr r2, [sl, #0x98]
ldr r2, [r10, #0x98]
add r1, sp, #0x100
stmia sp, {r2, r8}
ldrh r8, [sl, #0x9c]
ldrh r8, [r10, #0x9c]
add r2, sp, #0x40
movne r6, #0
str r8, [sp, #8]
ldr r8, [sl, #0xa0]
ldr r8, [r10, #0xa0]
str r8, [sp, #0xc]
mov r8, #0
str r8, [sp, #0x10]
@@ -1855,19 +1855,19 @@ _0219a668:
ldr r0, [sp, #0x108]
str r1, [sp, #0x88]
str r0, [sp, #0x90]
ldr sb, [sl, #0x344]
ldr r9, [r10, #0x344]
mov r6, r8
ldr fp, [sp, #0x14]
umull r8, r3, sb, r7
ldr r11, [sp, #0x14]
umull r8, r3, r9, r7
ldr r2, [sp, #0x18]
mla r3, sb, fp, 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 fp, sb, r2, r3
smull r11, r9, r2, r3
ldrsh r8, [r5, r8]
adds fp, fp, #0x800
adds r11, r11, #0x800
smull r3, r2, r8, r3
mov r8, r6
adc r8, sb, r8
mov sb, fp, 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
@@ -1893,11 +1893,11 @@ _0219a668:
add r0, r0, r2
str r0, [r4, #8]
mov r0, #1
strb r0, [sl, #0x3c2]
strb r0, [r10, #0x3c2]
_0219a7f0:
cmp r6, #0
beq _0219a818
ldr r2, [sl, #0x98]
ldr r2, [r10, #0x98]
add r0, sp, #0x94
add r3, r2, r2, lsl #1
mov r2, r3, asr #0x1
@@ -1909,28 +1909,28 @@ _0219a818:
cmp r6, #0
bne _0219a668
_0219a820:
ldrb r0, [sl, #0x3c2]
ldrb r0, [r10, #0x3c2]
cmp r0, #0
bne _0219a998
ldr r4, [sl, #0x54]
mov sb, #1
ldr r4, [r10, #0x54]
mov r9, #1
str r4, [sp, #0x94]
ldr r3, [sl, #0x58]
ldr r3, [r10, #0x58]
ldr r1, _0219aa04 ; =0x0000ffff
str r3, [sp, #0x98]
ldr r2, [sl, #0x5c]
ldr r2, [r10, #0x5c]
mov r0, #0
str r4, [sp, #0x88]
str r3, [sp, #0x8c]
str r2, [sp, #0x9c]
str r2, [sp, #0x90]
ldr r2, [sl, #0x48]
mov fp, sb
ldr r2, [r10, #0x48]
mov r11, r9
str r2, [sp, #0x7c]
ldr r2, [sl, #0x4c]
ldr r2, [r10, #0x4c]
add r6, sp, #0x28
str r2, [sp, #0x80]
ldr r2, [sl, #0x50]
ldr r2, [r10, #0x50]
add r8, sp, #0x88
str r2, [sp, #0x84]
strh r1, [sp, #0xc4]
@@ -1952,7 +1952,7 @@ _0219a820:
mov r4, r0
add r7, sp, #0x7c
_0219a8c8:
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
mov r0, r8
add r3, r1, r1, lsl #1
mov r2, r3, asr #0x1
@@ -1968,17 +1968,17 @@ _0219a8c8:
ldmia r5, {r0, r1, r2}
stmia ip, {r0, r1, r2}
ldr r0, _0219a9fc ; =data_027e0e60
ldr r2, [sl, #8]
ldr r2, [r10, #8]
ldr r0, [r0]
ldr ip, [sl, #0x98]
ldr ip, [r10, #0x98]
add r1, sp, #0xa0
str ip, [sp]
str r2, [sp, #4]
ldrh ip, [sl, #0x9c]
ldrh ip, [r10, #0x9c]
mov r2, r6
movne sb, #0
movne r9, #0
str ip, [sp, #8]
ldr ip, [sl, #0xa0]
ldr ip, [r10, #0xa0]
str ip, [sp, #0xc]
str r4, [sp, #0x10]
bl func_01ffbf5c
@@ -1990,12 +1990,12 @@ _0219a8c8:
ldr r0, [sp, #0xa8]
str r1, [sp, #0x8c]
str r0, [sp, #0x90]
mov sb, #0
strb fp, [sl, #0x3c2]
mov r9, #0
strb r11, [r10, #0x3c2]
_0219a968:
cmp sb, #0
cmp r9, #0
beq _0219a990
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
mov r0, r5
add r3, r1, r1, lsl #1
mov r1, r7
@@ -2004,29 +2004,29 @@ _0219a968:
mov r2, r2, asr #0x2
bl func_0202b2f8
_0219a990:
cmp sb, #0
cmp r9, #0
bne _0219a8c8
_0219a998:
ldrb r0, [sl, #0x3c2]
ldrb r0, [r10, #0x3c2]
cmp r0, #0
addeq sp, sp, #0x220
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
ldr r0, [sp, #0x88]
str r0, [sl, #0x48]
str r0, [sl, #0x158]
str r0, [r10, #0x48]
str r0, [r10, #0x158]
ldr r0, [sp, #0x90]
str r0, [sl, #0x50]
str r0, [sl, #0x160]
ldrb r0, [sl, #0x3c0]
str r0, [r10, #0x50]
str r0, [r10, #0x160]
ldrb r0, [r10, #0x3c0]
cmp r0, #0
moveq r0, #1
streqb r0, [sl, #0x3c0]
streqb r0, [r10, #0x3c0]
mov r0, #0
str r0, [sl, #0x60]
str r0, [sl, #0x64]
str r0, [sl, #0x68]
str r0, [r10, #0x60]
str r0, [r10, #0x64]
str r0, [r10, #0x68]
add sp, sp, #0x220
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, 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
+314 -314
View File
File diff suppressed because it is too large Load Diff
+3201 -3201
View File
File diff suppressed because it is too large Load Diff
+10 -3
View File
@@ -9,20 +9,27 @@ to contribute to the list!
- [Comments](#comments)
### Pool constants
There is no `.word` or other data directives in the inline assembler. Instead, use the built-in `dcd` instruction:
There is no `.word` or other data directives in the inline assembler. Instead, there are three built-in instructions you can
use:
#### `dcd`: Emits a literal 32-bit value
```asm
mov r0, [pc, #0]
bx lr
dcd 0x1234
```
This can also be written as:
#### `ldconst`: Loads a literal 32-bit value
```asm
ldconst 0x1234
bx lr
```
This code is equivalent to the above example using `dcd`.
The built-in `ldconst` instruction will be replaced by an ARM load instruction and also append a pool constant to the function.
#### `lda`: Loads the address to a symbol
```
lda r0, data_ov00_02abcdef
```
### Data sections
Directives such as `.section`, `.data` and `.bss` are not supported in the inline assembler. It's possible to change section