sl -> r10

This commit is contained in:
Aetias
2024-04-16 18:15:01 +02:00
parent b81ea029b2
commit 528d882355
64 changed files with 12291 additions and 12291 deletions
+427 -427
View File
File diff suppressed because it is too large Load Diff
+1705 -1705
View File
File diff suppressed because it is too large Load Diff
+39 -39
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, sb, 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
ldrb r0, [r0, #0x24]
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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, sb, r10, pc}
mov r4, #0
_020c34e8:
ldr r0, [r6]
@@ -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, sb, r10, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
_020c3570: .word data_027e103c
@@ -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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x10
movs r8, r2
mov sl, r0
mov r10, r0
mov sb, 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, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020c39d8:
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
mov r4, #0
ldr r11, [r0, sb, 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
@@ -491,18 +491,18 @@ _020c39d8:
ble _020c3b20
_020c3a14:
cmp r5, sb
ldrne r0, [sl, #0x10]
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,9 +519,9 @@ _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, r11
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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,7 +625,7 @@ _ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
cmp r5, #0
addle sp, sp, #0xd4
movle r0, #0
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [sp]
mov r11, #0
ldr r0, [r0, #4]
@@ -669,15 +669,15 @@ _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 r11, r11, #1
_020c3cb8:
@@ -692,7 +692,7 @@ _020c3cb8:
_020c3cd8:
mov r0, r11
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xcc
ldr r3, _020c3dcc ; =data_027e0e60
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, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r4, sp, #0
_020c3d38:
ldr r1, [r7]
@@ -746,7 +746,7 @@ _020c3d64:
cmp r0, #0
beq _020c3da0
ldr r0, [r7]
mov r1, sl
mov r1, r10
bl _ZN5Actor10SetUnk_129Eb
_020c3da0:
add r8, r8, #1
@@ -760,7 +760,7 @@ _020c3db0:
add r7, r7, #4
blt _020c3d38
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3ce8Eii
_020c3dcc: .word data_027e0e60
+15 -15
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldrsh r2, [r1, #0x60]
cmp r2, #0
ble _020a9350
@@ -120,9 +120,9 @@ _020a93cc:
mov r1, r2
_020a9428:
add sb, r0, r1, lsl #1
ldrsh sl, [sb, #0x10]
ldrsh r10, [sb, #0x10]
ldrsh sb, [sb, #0x2c]
add r2, r2, sl
add r2, r2, r10
cmp sb, r3
movlt r3, sb
blt _020a944c
@@ -139,24 +139,24 @@ _020a944c:
_020a9468:
add sb, r0, r1, lsl #1
ldrsh r11, [sb, #0x48]
ldrsh sl, [sb, #0x2c]
add sb, sl, r11
sub sl, sl, r11
ldrsh r10, [sb, #0x2c]
add sb, r10, r11
sub r10, r10, r11
mov sb, sb, lsl #0x10
mov sl, sl, lsl #0x10
mov r10, r10, lsl #0x10
cmp r5, sb, asr #16
mov sb, sb, asr #0x10
mov sl, sl, asr #0x10
mov r10, r10, asr #0x10
movgt r5, sb
bgt _020a94a0
cmp sb, r6
movgt r6, sb
_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, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end _ZN12TouchGesture6UpdateEPv
_020a9520: .word 0xffffd555
+17 -17
View File
@@ -4036,12 +4036,12 @@ _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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _020791d8 ; =data_027e0e60
mov r11, r0
ldr r7, [r4]
mov sl, r1
mov r10, r1
mov r0, r7
mov sb, r2
mov r8, r3
@@ -4055,7 +4055,7 @@ 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]
@@ -4064,13 +4064,13 @@ func_ov00_0207914c: ; 0x0207914c
str r8, [sp, #0xc]
sub r3, r4, r6
str r2, [sp, #0x10]
ldr r2, [sl]
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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207914c
_020791d8: .word data_027e0e60
@@ -4095,12 +4095,12 @@ 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
ldr r4, _0207929c ; =data_027e0e60
mov r11, r0
ldr r7, [r4]
mov sl, r1
mov r10, r1
mov r0, r7
mov sb, r2
mov r8, r3
@@ -4115,7 +4115,7 @@ 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]
@@ -4125,12 +4125,12 @@ func_ov00_0207920c: ; 0x0207920c
add r1, sb, #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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_0207920c
_0207929c: .word data_027e0e60
@@ -4138,10 +4138,10 @@ _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, sb, r10, lr}
sub sp, sp, #4
ldr r0, [r0]
mov sl, r1
mov r10, r1
mov sb, r2
mov r8, r3
cmp r0, #0
@@ -4150,9 +4150,9 @@ 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, sb, r10, pc}
_020792d4:
cmp sl, #0
cmp r10, #0
ldreq r0, _020793b0 ; =data_027e0c38
ldreq r0, [r0, #0x14]
addeq sb, sb, r0, lsl #12
@@ -4180,7 +4180,7 @@ _020792f4:
sub r0, r0, r4
mov r1, #0xc0
bl func_01ff9b4c
cmp sl, #0
cmp r10, #0
beq _02079368
mla r1, sb, r6, r5
str r1, [r7]
@@ -4189,7 +4189,7 @@ _020792f4:
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, sb, r10, pc}
_02079368:
smull r1, r2, sb, r6
adds r3, r1, #0x800
@@ -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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov00_020792a0
_020793b0: .word data_027e0c38
+761 -761
View File
File diff suppressed because it is too large Load Diff
+10 -10
View File
@@ -808,21 +808,21 @@ _020a9c08:
.global func_ov00_020a9c14
arm_func_start func_ov00_020a9c14
func_ov00_020a9c14: ; 0x020a9c14
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x94
mov r8, r2
movs sb, r1
cmpeq r8, #0
mov sl, r0
mov r10, r0
addeq sp, sp, #0x94
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldr r1, [sl, #0x68]
mov r0, sl
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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]
@@ -830,7 +830,7 @@ func_ov00_020a9c14: ; 0x020a9c14
add r11, sp, #0
b _020a9c94
_020a9c68:
mov r0, sl
mov r0, r10
bl func_ov00_020a9624
mov r1, r0
ldr r0, [r1]
@@ -886,7 +886,7 @@ _020a9c94:
mov r2, r0
bl func_01ff8690
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020a9c14
_020a9dbc: .word data_02050f54
+136 -136
View File
@@ -491,7 +491,7 @@ _020b1a48: .word data_027e0e60
.global func_ov00_020b1a4c
arm_func_start func_ov00_020b1a4c
func_ov00_020b1a4c: ; 0x020b1a4c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0xc0
ldr r2, _020b1b48 ; =data_027e0e60
mov r8, r1
@@ -517,23 +517,23 @@ func_ov00_020b1a4c: ; 0x020b1a4c
bl func_ov00_020b199c
cmp r0, #0
addne sp, sp, #0xc0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldr sl, _020b1b50 ; =data_ov00_020dc704
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr r10, _020b1b50 ; =data_ov00_020dc704
add r7, sp, #0
mov r4, #0xc
_020b1ac4:
ldmia sl!, {r0, r1, r2, r3}
ldmia r10!, {r0, r1, r2, r3}
stmia r7!, {r0, r1, r2, r3}
subs r4, r4, #1
bne _020b1ac4
ldr sl, _020b1b4c ; =func_ov00_020b1940
ldr r10, _020b1b4c ; =func_ov00_020b1940
mov r7, #0
add r4, sp, #0
_020b1ae0:
add r0, r4, r7, lsl #3
ldr r3, [r4, r7, lsl #3]
ldr r1, [r0, #4]
mov r2, sl
mov r2, r10
add r0, r5, r3
add r1, r6, r1
bl func_ov00_020b199c
@@ -550,13 +550,13 @@ _020b1ae0:
add sp, sp, #0xc0
add r0, r1, r0, lsl #12
str r0, [sb, #8]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_020b1b34:
add r7, r7, #1
cmp r7, #0x18
blt _020b1ae0
add sp, sp, #0xc0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov00_020b1a4c
_020b1b48: .word data_027e0e60
@@ -5753,18 +5753,18 @@ _020b5cb0: .word 0x00000666
.global func_ov00_020b5cb4
arm_func_start func_ov00_020b5cb4
func_ov00_020b5cb4: ; 0x020b5cb4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x244
mov r6, r2
mov r5, r3
mov sl, r1
mov r10, r1
mov r1, r6
mov r2, r5
mov r7, r0
ldr r4, [sp, #0x268]
bl func_ov00_020b5514
add r3, sp, #0x118
ldmia sl, {r0, r1, r2}
ldmia r10, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, r7
bl func_ov00_020b510c
@@ -5802,7 +5802,7 @@ _020b5d14:
ldr r0, [r7, #0x2c]
str r0, [r7, #0x3c]
ldr sb, [r7, #0x2c]
ldmia sl, {r0, r11, ip}
ldmia r10, {r0, r11, ip}
add sb, r11, sb
str r0, [r7, #0x20]
str sb, [r7, #0x24]
@@ -6103,10 +6103,10 @@ _020b61d4:
_020b61e0:
ldr r0, [r7, #0x20]
ldr r1, _020b6ac8 ; =data_027e0e60
stmia sl, {r0, r8}
stmia r10, {r0, r8}
ldr r2, [r7, #0x28]
add r0, sp, #0x14
str r2, [sl, #8]
str r2, [r10, #8]
ldr r1, [r1]
add r2, r7, #0x20
bl func_ov00_02083a1c
@@ -6135,7 +6135,7 @@ _020b61e0:
stmia r8, {r0, r1, r2}
ldr r3, [r7, #0x2c]
mov r0, r11
mov r1, sl
mov r1, r10
mov r2, r8
str r3, [sp, #0xd0]
bl func_01ff9bf8
@@ -6166,7 +6166,7 @@ _020b61e0:
ldr r0, [r0]
add r1, sp, #0x20
add r3, sp, #0x118
mov r2, sl
mov r2, r10
bl func_ov05_021082e4
_020b62ec:
ldrsh r0, [r7, #0xc8]
@@ -6188,13 +6188,13 @@ _020b6310:
cmp r0, #0
movgt r8, #1
_020b632c:
ldr r1, [sl]
ldr r1, [r10]
ldr r0, _020b6adc ; =data_027e0f78
str r1, [sp, #0x80]
ldr r1, [sl, #4]
ldr r1, [r10, #4]
ldr r0, [r0]
str r1, [sp, #0x84]
ldr r2, [sl, #8]
ldr r2, [r10, #8]
add r1, sp, #0x80
str r2, [sp, #0x88]
add r2, r7, #0x64
@@ -6205,7 +6205,7 @@ _020b632c:
cmpne r8, #0
beq _020b64f8
add r8, sp, #0x38
ldmia sl, {r0, r1, r2}
ldmia r10, {r0, r1, r2}
stmia r8, {r0, r1, r2}
add r3, sp, #0xb8
ldmia r8, {r0, r1, r2}
@@ -6217,13 +6217,13 @@ _020b632c:
ldr r0, _020b6ac8 ; =data_027e0e60
sub r1, r1, #0x1000
str r1, [sp, #0xb4]
ldr r2, [sl]
ldr r2, [r10]
ldr r0, [r0]
str r2, [sp, #0x74]
ldr r3, [sl, #4]
ldr r3, [r10, #4]
add r1, sp, #0x74
str r3, [sp, #0x78]
ldr r3, [sl, #8]
ldr r3, [r10, #8]
mov r2, #1
str r3, [sp, #0x7c]
bl func_ov00_02083ee0
@@ -6285,14 +6285,14 @@ _020b6494:
strb r0, [r7, #0x55]
_020b64a4:
ldr r0, _020b6ac8 ; =data_027e0e60
ldr r1, [sl]
ldr r1, [r10]
ldr r8, [r0]
mov r0, r8
bl func_ov00_020839d4
mov r1, r0
mov r0, r8
bl func_ov00_02083c24
ldr r2, [sl]
ldr r2, [r10]
mov r1, #0
sub r2, r0, r2
mov r0, #0x148
@@ -6311,11 +6311,11 @@ _020b64f8:
cmp sb, #0
beq _020b6830
ldrsh r0, [r7, #0xc6]
mov sl, r8
mov r10, r8
cmp r0, #0
blt _020b6538
ldr r0, [r7, #0x74]
mov sl, #1
mov r10, #1
mov r0, r0, lsr #0xb
and r0, r0, #3
cmp r0, #1
@@ -6350,15 +6350,15 @@ _020b6538:
cmp r0, #0
moveq r0, #0
ldrne r0, [r0, #0xc]
mov sl, #1
mov r10, #1
and r0, r0, #0x1f
strh r0, [r7, #0xc6]
strb sl, [r7, #0xcc]
strb r10, [r7, #0xcc]
ldrsb r0, [sb, #0x12]
cmp r0, #0xd
moveq sl, #0
moveq r10, #0
_020b65c0:
cmp sl, #0
cmp r10, #0
beq _020b65e0
ldrsh r0, [r7, #0x5a]
cmp r0, #2
@@ -6442,20 +6442,20 @@ _020b66e0:
blt _020b671c
sub r5, r3, r0
mov r3, r5, asr #0x1f
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, r3, sb
mla sb, r1, r5, sb
mov r1, sl, lsr #0xc
mov r1, r10, lsr #0xc
orr r1, r1, sb, lsl #20
add r0, r0, r1
b _020b673c
_020b671c:
sub r5, r0, r3
mov r3, r5, asr #0x1f
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, r3, sb
mla sb, r1, r5, sb
mov r1, sl, lsr #0xc
mov r1, r10, lsr #0xc
orr r1, r1, sb, lsl #20
sub r0, r0, r1
_020b673c:
@@ -6468,20 +6468,20 @@ _020b673c:
blt _020b677c
sub r5, r3, r0
mov r3, r5, asr #0x1f
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, r3, sb
mla sb, r1, r5, sb
mov r1, sl, lsr #0xc
mov r1, r10, lsr #0xc
orr r1, r1, sb, lsl #20
add r0, r0, r1
b _020b679c
_020b677c:
sub r5, r0, r3
mov r3, r5, asr #0x1f
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, r3, sb
mla sb, r1, r5, sb
mov r1, sl, lsr #0xc
mov r1, r10, lsr #0xc
orr r1, r1, sb, lsl #20
sub r0, r0, r1
_020b679c:
@@ -6494,10 +6494,10 @@ _020b679c:
blt _020b67e0
sub r5, r3, r0
mov r3, r5, asr #0x1f
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, r3, sb
mla sb, r1, r5, sb
mov r1, sl, lsr #0xc
mov r1, r10, lsr #0xc
orr r1, r1, sb, lsl #20
add r0, r0, r1
str r0, [r6, #4]
@@ -6505,10 +6505,10 @@ _020b679c:
_020b67e0:
sub r5, r0, r3
mov r3, r5, asr #0x1f
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, r3, sb
mla sb, r1, r5, sb
mov r1, sl, lsr #0xc
mov r1, r10, lsr #0xc
orr r1, r1, sb, lsl #20
sub r0, r0, r1
str r0, [r6, #4]
@@ -6528,20 +6528,20 @@ _020b6824:
_020b6830:
ldr r0, [r6, #4]
cmp r0, #0
ldrlt r1, [sl, #4]
ldrlt r1, [r10, #4]
sublt r0, r8, #0x1800
cmplt r1, r0
bge _020b68c0
ldr r1, [sp, #0x11c]
cmp r1, r0
blt _020b68c0
ldr r1, [sl]
ldr r1, [r10]
ldr r0, _020b6ac8 ; =data_027e0e60
str r1, [sp, #0x50]
ldr r2, [sl, #4]
ldr r2, [r10, #4]
ldr r1, [r0]
str r2, [sp, #0x54]
ldr r3, [sl, #8]
ldr r3, [r10, #8]
add r0, sp, #0x1c
add r2, sp, #0x50
str r3, [sp, #0x58]
@@ -6558,7 +6558,7 @@ _020b6830:
beq _020b68c0
mov r0, r4
ldr r3, [r0]
mov r2, sl
mov r2, r10
ldr r3, [r3, #0x70]
mov r1, #4
blx r3
@@ -6651,12 +6651,12 @@ _020b69c4:
add sp, sp, #0x244
bic r0, r0, #8
strh r0, [r7, #0xa4]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b6a08:
ldrsh r2, [r7, #0xc6]
cmp r2, #0
addge sp, sp, #0x244
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, [r7, #0x34]
ldr r0, [r7, #0x24]
cmp r1, r0
@@ -6679,19 +6679,19 @@ _020b6a08:
bic r1, r1, #4
strh r1, [r7, #0xa4]
str r0, [r6, #4]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b6a74:
ldrb r0, [sp, #0x23f]
cmp r0, #0
addeq sp, sp, #0x244
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r1, [r7, #0xa4]
mov r0, #0
add sp, sp, #0x244
bic r1, r1, #8
strh r1, [r7, #0xa4]
str r0, [r6, #4]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b6aa0:
ldrb r0, [sp, #0x23c]
cmp r0, #0
@@ -6700,7 +6700,7 @@ _020b6aa0:
movne r0, #0
strneb r0, [r7, #0xbc]
add sp, sp, #0x244
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020b5cb4
_020b6ac0: .word data_027e0ff8
@@ -9219,15 +9219,15 @@ func_ov00_020b88bc: ; 0x020b88bc
.global func_ov00_020b88c4
arm_func_start func_ov00_020b88c4
func_ov00_020b88c4: ; 0x020b88c4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
movs sb, r1
mov sl, r0
mov r10, r0
movne r0, #0
strne r0, [sb]
ldrb r0, [sl, #0x290]
ldrb r0, [r10, #0x290]
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _020b8b78 ; =data_027e0618
ldr r0, [r0]
cmp r0, #6
@@ -9235,14 +9235,14 @@ func_ov00_020b88c4: ; 0x020b88c4
bl func_ov00_02079e3c
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b8908:
ldr r0, _020b8b7c ; =data_027e0f90
ldr r0, [r0]
ldrsh r0, [r0, #0xa]
cmp r0, #0
movle r0, #1
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _020b8b80 ; =data_027e0f64
ldr r0, [r0]
ldr r0, [r0, #4]
@@ -9268,7 +9268,7 @@ _020b8968:
bne _020b8978
_020b8970:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b8978:
ldr r0, _020b8b84 ; =data_027e0f74
ldr r0, [r0]
@@ -9280,10 +9280,10 @@ _020b8978:
bl func_ov00_02097750
cmp r0, #0
bne _020b8a04
ldrb r0, [sl, #0x11c]
ldrb r0, [r10, #0x11c]
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
bl _ZN13LinkStateBase16GetLinkItemStateEv
bl _ZN13LinkStateItem16IsHammerEquippedEv
mvn r1, #0
@@ -9294,7 +9294,7 @@ _020b8978:
ldr r0, [r0]
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r4, r0
mov r0, sl
mov r0, r10
ldr r1, [r0]
ldr r1, [r1, #0xb4]
blx r1
@@ -9305,13 +9305,13 @@ _020b89f0:
movne r0, #6
strne r0, [sb]
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b8a04:
ldr r0, _020b8b8c ; =data_ov00_020e8b08
ldr r7, [r0]
cmp r7, #0
beq _020b8ae0
ldr r2, [sl, #8]
ldr r2, [r10, #8]
mov r1, #0
_020b8a1c:
add r0, r7, r1, lsl #3
@@ -9325,17 +9325,17 @@ _020b8a1c:
mov r0, #0
_020b8a40:
cmp r0, #0
ldreqb r0, [sl, #0x28e]
ldreqb r0, [r10, #0x28e]
cmpeq r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r8, #0
ldr r4, _020b8b88 ; =gItemManager
mov r6, r8
mov r11, r8
mov r5, #1
_020b8a68:
mov r0, sl
mov r0, r10
ldr r1, [r0]
ldr r1, [r1, #0xb4]
blx r1
@@ -9363,7 +9363,7 @@ _020b8ab8:
movne r0, #6
strne r0, [sb]
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b8ad4:
add r8, r8, #1
cmp r8, #3
@@ -9373,19 +9373,19 @@ _020b8ae0:
ldr r0, [r0]
bl _ZNK11ItemManager16GetEquippedFairyEv
mov r4, r0
mov r0, sl
mov r0, r10
ldr r1, [r0]
ldr r1, [r1, #0xb4]
blx r1
cmp r4, r0
bne _020b8b5c
mov r0, sl
mov r0, r10
ldr r1, [r0]
ldr r1, [r1, #0xb4]
blx r1
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _020b8b88 ; =gItemManager
mov r1, #0
ldr r0, [r0]
@@ -9397,19 +9397,19 @@ _020b8ae0:
movne r0, #6
strne r0, [sb]
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b8b54:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b8b5c:
cmp sb, #0
movne r0, #6
strne r0, [sb]
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020b8b70:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020b88c4
_020b8b78: .word data_027e0618
@@ -9855,7 +9855,7 @@ func_ov00_020b9178: ; 0x020b9178
.global func_ov00_020b917c
arm_func_start func_ov00_020b917c
func_ov00_020b917c: ; 0x020b917c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #8
mov sb, r0
ldr r0, [sb, #0x130]
@@ -9867,7 +9867,7 @@ func_ov00_020b917c: ; 0x020b917c
mov r0, #1
strb r0, [sb, #0x11a]
mov r5, #0
ldr sl, _020b92cc ; =data_ov00_020dc81c
ldr r10, _020b92cc ; =data_ov00_020dc81c
ldr r11, _020b92d0 ; =data_027e0e58
strb r5, [sb, #0x290]
add r7, sb, #0x218
@@ -9883,7 +9883,7 @@ _020b91c0:
blx r1
mov r1, r0
mov r0, r6
ldr r2, [sl, r1, lsl #2]
ldr r2, [r10, r1, lsl #2]
str r4, [sp]
mov r1, r7
add r3, sb, #0x48
@@ -9947,7 +9947,7 @@ _020b92b8:
str r0, [sb, #0x138]
str r8, [sb, #0x130]
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020b917c
_020b92cc: .word data_ov00_020dc81c
@@ -14970,7 +14970,7 @@ func_ov00_020bd0a8: ; 0x020bd0a8
.global func_ov00_020bd0bc
arm_func_start func_ov00_020bd0bc
func_ov00_020bd0bc: ; 0x020bd0bc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0xc
mov r0, r1
mov r4, r2
@@ -15002,19 +15002,19 @@ func_ov00_020bd0bc: ; 0x020bd0bc
str r0, [sp, #4]
b _020bd1ec
_020bd138:
ldr sl, [sp]
ldr r10, [sp]
ldr r7, [sp, #4]
mov r2, #0x97
ldr lr, [sp, #8]
umull r1, r0, sl, r2
umull r1, r0, r10, r2
mov r3, #0
umull sb, r8, r7, r2
umull r6, r5, lr, r2
adds r1, r1, #0x800
ldr ip, _020bd258 ; =data_027e0fcc
mla r0, sl, r3, r0
mov sl, sl, asr #0x1f
mla r0, sl, r2, r0
mla r0, r10, r3, r0
mov r10, r10, asr #0x1f
mla r0, r10, r2, r0
adc r0, r0, #0
mov r1, r1, lsr #0xc
orr r1, r1, r0, lsl #20
@@ -15073,7 +15073,7 @@ _020bd234:
mov r0, #1
strh r2, [r1, #0x5a]
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov00_020bd0bc
_020bd250: .word data_027e0f94
@@ -15652,7 +15652,7 @@ _020bd7d2:
.global func_ov00_020bd7d8
arm_func_start func_ov00_020bd7d8
func_ov00_020bd7d8: ; 0x020bd7d8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
mov r5, r0
mov r0, r1
@@ -15682,7 +15682,7 @@ func_ov00_020bd7d8: ; 0x020bd7d8
adc r6, r7, #0
mov r11, #0x80000000
cmp r6, r11, asr #19
mov sl, r2, asr #0x1f
mov r10, r2, asr #0x1f
mov ip, #0
mov r3, #0x800
blt _020bd868
@@ -15691,15 +15691,15 @@ func_ov00_020bd7d8: ; 0x020bd7d8
_020bd868:
add sp, sp, #0xc
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020bd874:
ldr lr, [r4, #0x20]
ldr sb, [r4]
umull r7, r6, lr, r2
ldr r8, [sp]
mla r6, lr, sl, r6
smull sl, r8, sb, r8
adds sb, sl, r3
mla r6, lr, r10, r6
smull r10, r8, sb, r8
adds sb, r10, r3
adc r8, r8, ip
mov sb, sb, lsr #0xc
orr sb, sb, r8, lsl #20
@@ -15741,11 +15741,11 @@ _020bd874:
stmib r5, {r0, ip}
add sp, sp, #0xc
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_020bd938:
mov r0, #0
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov00_020bd7d8
.global func_ov00_020bd944
@@ -15761,7 +15761,7 @@ func_ov00_020bd944: ; 0x020bd944
.global func_ov00_020bd958
arm_func_start func_ov00_020bd958
func_ov00_020bd958: ; 0x020bd958
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0xac
str r1, [sp]
mov r7, r0
@@ -15775,7 +15775,7 @@ func_ov00_020bd958: ; 0x020bd958
str r2, [sp, #4]
cmplo r4, r0
addhs sp, sp, #0xac
ldmhsia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmhsia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldr r0, _020bde24 ; =0x21230000
ldr r2, _020bde28 ; =0x040004a8
ldr r1, [sp, #0xd0]
@@ -15903,7 +15903,7 @@ _020bdb50:
beq _020bdc78
_020bdb70:
ldr r1, [r7, #8]
ldr sl, [sp, #0x14]
ldr r10, [sp, #0x14]
add r1, r1, r5, lsl #4
ldrh r2, [r1, #0xc]
ldr r1, [sp, #0x34]
@@ -15917,14 +15917,14 @@ _020bdb70:
ldr r8, [sp, #0x10]
ldr r2, _020bde44 ; =data_02050f54
umull sb, r8, lr, r8
mla r8, lr, sl, r8
mla r8, lr, r10, r8
ldrsh r3, [r2, r3]
ldr sl, [sp, #0x10]
ldr r10, [sp, #0x10]
mov ip, lr, asr #0x1f
mla r8, ip, sl, r8
adds sl, sb, #0x800
mla r8, ip, r10, r8
adds r10, sb, #0x800
adc sb, r8, #0
mov r8, sl, lsr #0xc
mov r8, r10, lsr #0xc
orr r8, r8, sb, lsl #20
ldr sb, [sp, #8]
mov r2, r3, asr #0x1f
@@ -16009,7 +16009,7 @@ _020bdcf0:
ldr r0, [sp, #0x24]
cmp r0, #0
addeq sp, sp, #0xac
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldr r0, [sp, #0x20]
cmp r0, #0
bne _020bde08
@@ -16082,7 +16082,7 @@ _020bde08:
mov r0, #1
str r0, [r1, #-0xbc]
add sp, sp, #0xac
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov00_020bd958
_020bde24: .word 0x21230000
@@ -16205,13 +16205,13 @@ _020bdfbc: .word data_027e0f64
.global func_ov00_020bdfc0
arm_func_start func_ov00_020bdfc0
func_ov00_020bdfc0: ; 0x020bdfc0
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x40
mov sb, r0
ldr r0, [sb]
cmp r0, #2
addlo sp, sp, #0x40
ldmloia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmloia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr r2, [sb, #8]
ldr r0, _020be194 ; =data_027e0f64
ldr r1, [r2]
@@ -16251,7 +16251,7 @@ func_ov00_020bdfc0: ; 0x020bdfc0
cmp r0, #1
mov r8, #1
bls _020be130
ldr sl, _020be194 ; =data_027e0f64
ldr r10, _020be194 ; =data_027e0f64
mov r7, r4
add r6, sp, #0x1c
add r5, sp, #8
@@ -16263,7 +16263,7 @@ _020be08c:
add r2, r2, r1, lsl #4
str r0, [sp, #0x1c]
ldr r1, [r2, #4]
ldr r0, [sl]
ldr r0, [r10]
str r1, [sp, #0x20]
ldr r1, [r2, #8]
str r1, [sp, #0x24]
@@ -16309,7 +16309,7 @@ _020be130:
add r1, r0, r1, lsl #4
ldrsh r0, [r1, #-0x14]
strh r0, [r1, #-4]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_020be158:
ldr r3, [sp, #0x10]
ldr r0, [sp, #0x18]
@@ -16325,7 +16325,7 @@ _020be158:
ldr r0, [sb, #8]
strh r2, [r0, #0x1c]
add sp, sp, #0x40
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov00_020bdfc0
_020be194: .word data_027e0f64
@@ -17964,7 +17964,7 @@ _020bf530:
.global func_ov00_020bf538
arm_func_start func_ov00_020bf538
func_ov00_020bf538: ; 0x020bf538
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x1b4
mov r4, r0
ldr r0, [r4, #0x4c]
@@ -18161,17 +18161,17 @@ _020bf794:
umull r7, r6, r5, r0
str r2, [sp, #0x34]
adds r2, r7, #0x800
ldr sl, _020bff24 ; =0x0000ffff
ldr r10, _020bff24 ; =0x0000ffff
add sb, sp, #0x114
strh sl, [sb, #4]
strh sl, [sb, #6]
strh sl, [sb, #8]
strh sl, [sb, #0xa]
strh r10, [sb, #4]
strh r10, [sb, #6]
strh r10, [sb, #8]
strh r10, [sb, #0xa]
strh r3, [sb, #0xc]
mla r6, r5, r3, r6
mov sb, r5, asr #0x1f
mla r6, sb, r0, r6
ldr sl, [sp, #0xc8]
ldr r10, [sp, #0xc8]
ldr sb, [sp, #0xd4]
adc r5, r6, #0
mov r7, r2, lsr #0xc
@@ -18179,7 +18179,7 @@ _020bf794:
umull ip, r2, r1, r0
orr r7, r7, r5, lsl #20
sub r5, r8, r7
sub r6, sb, sl
sub r6, sb, r10
umull r8, r7, r6, r0
mla r2, r1, r3, r2
mla r7, r6, r3, r7
@@ -18200,7 +18200,7 @@ _020bf794:
mov r6, r6, lsr #0xc
orr r6, r6, r2, lsl #20
sub r2, lr, r6
sub r6, r1, sl
sub r6, r1, r10
umull r8, r7, r6, r0
mla r7, r6, r3, r7
str r5, [sp, #0xd4]
@@ -18627,7 +18627,7 @@ _020bff0c:
ldr r0, [r4, #0x44]
str r0, [r4, #0x48]
add sp, sp, #0x1b4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020bf538
_020bff20: .word data_ov00_020dd290
@@ -20105,7 +20105,7 @@ func_ov00_020c10a0: ; 0x020c10a0
.global func_ov00_020c10d4
arm_func_start func_ov00_020c10d4
func_ov00_020c10d4: ; 0x020c10d4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x44
mov r5, r0
add r0, r5, #0x100
@@ -20114,13 +20114,13 @@ func_ov00_020c10d4: ; 0x020c10d4
mov r8, r1
subs r1, r3, r2
addeq sp, sp, #0x44
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
cmp r1, #0
ldrlth r0, [r0, #0x80]
addlt r1, r1, r0
cmp r1, #2
addlt sp, sp, #0x44
ldmltia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r0, r5, #0x100
ldrh r0, [r0, #0x80]
mov r6, r0
@@ -20216,10 +20216,10 @@ func_ov00_020c10d4: ; 0x020c10d4
add r11, r5, #0x100
_020c1288:
ldrh r0, [r11, #0x80]
add sl, r7, sb
add r10, r7, sb
add r1, sp, #0x1c
cmp sl, r0
subge sl, sl, r0
cmp r10, r0
subge r10, r10, r0
mov r0, r8, lsl #0x8
mov r0, r0, asr #0x10
mov r0, r0, lsl #0x10
@@ -20229,11 +20229,11 @@ _020c1288:
str r4, [sp, #0x1c]
bl func_01ffa9fc
mov r0, #0x18
mul r0, sl, r0
add sl, r5, r0
mul r0, r10, r0
add r10, r5, r0
ldr r1, [r5, r0]
ldr r0, [sp, #0x38]
ldr r3, [sl, #8]
ldr r3, [r10, #8]
ldr r2, [sp, #0x40]
sub r1, r1, r0
sub r2, r3, r2
@@ -20242,7 +20242,7 @@ _020c1288:
mov r0, r1, lsl #0x10
mov r1, r2, lsl #0x10
mov r0, r0, asr #0x10
ldr r3, [sl, #4]
ldr r3, [r10, #4]
mov r1, r1, lsr #0x10
ldr r2, [sp, #0x3c]
str r1, [sp, #0x18]
@@ -20270,15 +20270,15 @@ _020c1288:
add r1, sp, #0x10
mov r2, #1
bl func_01ffa9fc
ldr r2, [sl, #0x14]
ldr r2, [r10, #0x14]
ldr r1, [sp, #0x40]
ldr r0, [sl, #0xc]
ldr r0, [r10, #0xc]
sub r1, r2, r1
mov r1, r1, lsl #0x10
mov r1, r1, asr #0x10
mov r1, r1, lsl #0x10
ldr r3, [sp, #0x38]
ldr r2, [sl, #0x10]
ldr r2, [r10, #0x10]
mov r1, r1, lsr #0x10
str r1, [sp, #0xc]
ldr r1, [sp, #0x3c]
@@ -20316,7 +20316,7 @@ _020c13f0:
str r2, [sp, #4]
bl func_01ffa9fc
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov00_020c10d4
_020c141c: .word data_027e0d44
+260 -260
View File
File diff suppressed because it is too large Load Diff
+27 -27
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, sb, r10, lr}
ldr r3, [r0, #4]
ldr r2, [r0, #8]
ldr r4, [r0, #0xc]
@@ -221,11 +221,11 @@ func_ov00_020d5cd8: ; 0x020d5cd8
mul sb, 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
@@ -267,17 +267,17 @@ 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, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r4, [r0]
ldr r5, [r1]
ldmib r1, {r3, r11, lr}
ldmib r0, {r2, sl, ip}
ldmib r0, {r2, r10, ip}
mul sb, r4, lr
mul r1, ip, r5
mul r6, r2, r11
@@ -290,11 +290,11 @@ func_ov00_020d5dc4: ; 0x020d5dc4
add sb, sb, r1, asr #12
add r6, r6, #0x800
add r6, sb, r6, asr #12
mul sb, sl, r3
mul sb, r10, r3
add sb, sb, #0x800
sub r6, r6, sb, asr #12
mul sb, sl, r5
mul r1, sl, lr
mul sb, r10, r5
mul r1, r10, lr
str r6, [r0]
add r8, r8, #0x800
mov r7, r7, asr #0xc
@@ -308,14 +308,14 @@ func_ov00_020d5dc4: ; 0x020d5dc4
mul ip, r4, r5
mul r8, r4, r11
mul r4, r2, r5
mul r2, sl, r11
add sl, r1, #0x800
mul r2, r10, r11
add r10, r1, #0x800
add r1, r8, #0x800
sub r1, sb, r1, asr #12
add r5, ip, #0x800
add r8, r6, #0x800
str r1, [r0, #4]
mov r6, sl, asr #0xc
mov r6, r10, asr #0xc
add sb, r7, #0x800
add r7, r6, r8, asr #12
add r8, r7, sb, asr #12
@@ -330,34 +330,34 @@ 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r5, [r1]
ldr r4, [r0, #0xc]
ldr r2, [r0, #8]
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
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, r11, ip
add sl, sl, #0x800
sub r7, r7, sl, asr #12
mul sl, r11, r6
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
@@ -367,9 +367,9 @@ func_ov00_020d5eac: ; 0x020d5eac
add sb, sb, #0x800
mov r8, r8, asr #0xc
add r8, r8, sb, asr #12
add sl, sl, #0x800
add r10, r10, #0x800
mul sb, r5, r2
add sl, r8, sl, asr #12
add r10, r8, r10, asr #12
mul r8, r5, ip
mul r5, r3, ip
mul r2, r11, r2
@@ -378,7 +378,7 @@ func_ov00_020d5eac: ; 0x020d5eac
add r3, lr, #0x800
add sb, r7, #0x800
mov r7, r11, asr #0xc
sub r1, sl, r1, asr #12
sub r1, r10, r1, asr #12
str r1, [r0, #4]
add r8, r8, #0x800
add r7, r7, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov00_020d5eac
.global func_ov00_020d5f98
+246 -246
View File
File diff suppressed because it is too large Load Diff
+34 -34
View File
@@ -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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x6c
str r0, [sp, #8]
add r0, sp, #0x4c
@@ -6087,13 +6087,13 @@ func_ov02_020f3ae4: ; 0x020f3ae4
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
@@ -6109,33 +6109,33 @@ _020f3b80:
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
add r0, sp, #0x28
mov r2, sl
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
@@ -6164,11 +6164,11 @@ _020f3c58:
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 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
ldr r0, [sp, #0xc]
mov r2, sl
mov r2, r10
sub r1, r0, r1
add r0, sp, #0x28
str r7, [sp, #0x34]
@@ -6202,10 +6202,10 @@ _020f3d00:
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 r2, r4, #0x19
@@ -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
ldr r0, [sp, #0x10]
mov r2, sl
mov r2, r10
sub r1, r0, r1
mov r0, #0
str r0, [sp, #0x28]
@@ -6251,7 +6251,7 @@ _020f3d9c:
mov r11, #9
mov r8, #0x3b
mov sb, #0x42
mov sl, #0x19
mov r10, #0x19
add r6, sp, #0x4c
_020f3dfc:
mov r0, #0xec
@@ -6394,7 +6394,7 @@ _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]
@@ -6404,7 +6404,7 @@ _020f4020:
add r11, r11, #3
add r8, r8, #3
add sb, sb, #2
add sl, sl, #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, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov02_020f3ae4
_020f41ec: .word gItemManager
@@ -8663,7 +8663,7 @@ _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, sb, r10, lr}
sub sp, sp, #8
mov r6, r0
ldr r0, [r6, #0x10]
@@ -8685,8 +8685,8 @@ _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
beq _020f6020
@@ -8696,7 +8696,7 @@ _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
b _020f6030
@@ -8707,15 +8707,15 @@ _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
beq _020f6084
@@ -8725,7 +8725,7 @@ _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
b _020f6094
@@ -8736,15 +8736,15 @@ _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
beq _020f60e4
@@ -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, sb, r10, pc}
arm_func_end func_ov02_020f5f98
.global func_ov02_020f612c
+171 -171
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
+20 -20
View File
@@ -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, sb, r10, lr}
mov r4, r0
ldr r0, [r4, #0x178]
mov r7, #0
@@ -2212,12 +2212,12 @@ 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}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov sb, r4
add sl, r4, #0x184
add r10, r4, #0x184
mov r5, r7
_021025a4:
mov r0, sl
mov r0, r10
add r1, sb, #0x100
ldr ip, [r0]
ldrh r8, [r1, #0x8e]
@@ -2233,16 +2233,16 @@ _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, sb, r10, pc}
add r7, r7, #1
cmp r7, #7
add sb, sb, #0x18
add sl, sl, #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, sb, r10, pc}
ldr r1, [r4, #0x178]
ldr sb, [r6, #0x1c]
ldr r0, [r1, #0xc]
@@ -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, sb, 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, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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
@@ -2804,19 +2804,19 @@ func_ov06_02102d64: ; 0x02102d64
_02102db8:
str r6, [sp]
str r6, [sp, #4]
ldr r0, [sl, #0x234]
ldr r0, [r10, #0x234]
mov r1, r7
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 sb, [r10, #0x70]
mov r1, r8
mov r0, sb
bl func_02023ea4
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov06_02102d64
_02102e78: .word 0x0000ffff
+13 -13
View File
@@ -771,25 +771,25 @@ 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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]
strh r0, [r10, #0x10]
mov sb, r1
strh r8, [sl, #0x12]
strh r8, [r10, #0x12]
mov r5, r7, lsr #0x11
mov r6, #1
mov r4, r8
mov r11, r8
_02113600:
ldr r0, [sl]
ldr r0, [r10]
cmp r8, r0
bge _02113648
mov r0, #0x10
@@ -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 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov08_021135bc
.global func_ov08_02113678
+47 -47
View File
@@ -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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
cmp r6, #0
addeq sp, sp, #0xdc
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrb r1, [r5, #0x9a]
cmp r1, #0
bne _021156e8
@@ -5074,13 +5074,13 @@ _021156e8:
add r8, sp, #0xac
add r6, sp, #0x58
_02115750:
ldr sl, [sp, #0xc]
ldr r10, [sp, #0xc]
add sb, sp, #0x7c
ldmia sl!, {r0, r1, r2, r3}
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}
ldmia r10, {r0, r1, r2, r3}
mov lr, r11
stmia sb, {r0, r1, r2, r3}
ldmia lr!, {r0, r1, r2, r3}
@@ -5157,10 +5157,10 @@ _02115804:
mov r1, r0, lsl #0x1
add r0, r7, r0, lsl #1
ldrsh sb, [r0, #2]
ldrsh sl, [r7, r1]
ldrsh r10, [r7, r1]
mov r0, r8
mov r2, sb
mov r1, sl
mov r1, r10
blx func_01ff8abc
add r1, sp, #0x7c
mov r0, r8
@@ -5186,7 +5186,7 @@ _02115804:
mov r0, r6
mov r2, r1
bl func_01ff8690
mov r1, sl
mov r1, r10
mov r2, sb
mov r0, r6
blx func_01ff8230
@@ -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, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02115a44:
cmp r1, #1
addne sp, sp, #0xdc
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov09_021156a4
_02115a9c: .word data_02050f54
@@ -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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, 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 sb, [r10, #8]
sub r0, r0, #1
cmp sb, r0
bhs _02119f84
mov r0, #0x14
mla r7, sb, r0, sl
mla r7, sb, r0, r10
ldr r0, _02119fa4 ; =data_ov03_02100648
ldr r8, [r0]
_02119d6c:
@@ -12789,7 +12789,7 @@ _02119d6c:
mov r1, #3
str r1, [r0]
sub r5, r0, #0x74
add r4, sl, #0x1000
add r4, r10, #0x1000
add r6, sp, #0xc
add r11, sp, #0
_02119d88:
@@ -12907,7 +12907,7 @@ _02119e98:
str r0, [r5]
mov r0, r1, lsr #0x10
str r0, [r5]
ldr r0, [sl, #4]
ldr r0, [r10, #4]
add sb, sb, #1
cmp sb, r0
add r7, r7, #0x14
@@ -12921,7 +12921,7 @@ _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
blo _02119d6c
@@ -12930,7 +12930,7 @@ _02119f84:
mov r1, #1
str r1, [r0]
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, sb, 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}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr sb, _0211a748 ; =data_ov03_0210041c
mov r4, #0
mvn sl, #0
mvn r10, #0
_0211a6cc:
cmp r4, r5
bgt _0211a734
@@ -13659,7 +13659,7 @@ _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]
@@ -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, sb, 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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov09_0211a69c
_0211a748: .word data_ov03_0210041c
@@ -13687,10 +13687,10 @@ _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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #8
mov sl, r0
ldr r0, [sl, #0x8a4]
mov r10, r0
ldr r0, [r10, #0x8a4]
ldr r11, [sp, #0x30]
cmp r0, #0
str r3, [sp]
@@ -13698,14 +13698,14 @@ func_ov09_0211a74c: ; 0x0211a74c
mov r8, r2
addeq sp, sp, #8
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mvn r0, #0
mov r6, #0
str r0, [sp, #4]
_0211a788:
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
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, sb, r10, lr}
sub sp, sp, #0x9c
mov r4, r1
ldrsh r7, [r4, #0x1e]
@@ -18623,7 +18623,7 @@ _0211d420:
mov r8, #0xc
add r5, r5, #0x10
mov r4, #0
add sl, sp, #0x3c
add r10, sp, #0x3c
add sb, sp, #0x18
mov r7, r8
_0211d574:
@@ -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]
@@ -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, sb, 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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov09_0211d180
_0211d654: .word 0xfffffccd
+140 -140
View File
@@ -5087,7 +5087,7 @@ _02115934: .word 0x00ca0002
.global func_ov10_02115938
arm_func_start func_ov10_02115938
func_ov10_02115938: ; 0x02115938
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x44
mov sb, r0
ldr r0, _02115b68 ; =data_027e0cbc
@@ -5177,11 +5177,11 @@ _02115a4c:
and r0, r1, r0
cmp r0, #0x1000000
addne sp, sp, #0x44
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r6, #0
mov r7, r6
add r8, sb, #0x18
mov sl, #0x32000
mov r10, #0x32000
mov r11, r6
_02115aa4:
ldr r0, [sb, #0x10]
@@ -5197,7 +5197,7 @@ _02115ab4: ; jump table
_02115ac8:
mov r0, r7, asr #0x1
add r2, r7, r0, lsr #30
mov r0, sl
mov r0, r10
mov r1, r11
sub r2, r4, r2, asr #2
bl func_ov00_020d03f8
@@ -5238,7 +5238,7 @@ _02115b4c:
add r8, r8, #0x18
blt _02115aa4
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_02115938
_02115b68: .word data_027e0cbc
@@ -5883,10 +5883,10 @@ _02116278: .word 0x00000112
.global func_ov10_0211627c
arm_func_start func_ov10_0211627c
func_ov10_0211627c: ; 0x0211627c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x28
mov r4, r0
mov sl, r1
mov r10, r1
mov sb, r2
bl func_ov10_0211642c
add r0, sp, #8
@@ -5941,7 +5941,7 @@ _0211633c:
str sb, [sp]
ldr r1, _02116428 ; =0x00000112
mov r2, r8
mov r3, sl
mov r3, r10
str r6, [sp, #4]
bl func_02034b0c
_0211635c:
@@ -5979,7 +5979,7 @@ _021163b8:
_021163c8:
mov r0, r6
mov r1, r5
mov r2, sl
mov r2, r10
mov r3, sb
str r4, [sp]
bl func_ov10_02116228
@@ -5992,16 +5992,16 @@ _021163e4:
bl func_ov10_0211a8ac
cmp r0, #0
addeq sp, sp, #0x28
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, #0x19
add r4, sp, #8
mov r1, r0
mov r2, sl
mov r2, r10
mov r3, sb
str r4, [sp]
bl func_ov10_02116228
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211627c
_02116428: .word 0x00000112
@@ -6009,11 +6009,11 @@ _02116428: .word 0x00000112
.global func_ov10_0211642c
arm_func_start func_ov10_0211642c
func_ov10_0211642c: ; 0x0211642c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x38
str r0, [sp, #8]
add r0, r0, #0x200
mov sl, r1
mov r10, r1
ldrh r1, [r0, #0xc8]
ldr r0, [sp, #8]
mov sb, r2
@@ -6061,7 +6061,7 @@ _021164c4:
ldr r3, [sp, #0x10]
add r1, r5, #0x37
mov r0, r11
add r2, r2, sl
add r2, r2, r10
add r3, r3, sb
bl func_02034984
_021164fc:
@@ -6074,13 +6074,13 @@ _02116508:
ldr r1, _02116538 ; =0x00000112
add r4, sp, #0x18
str sb, [sp]
mov r3, sl
mov r3, r10
add r0, r0, #0xa8
add r2, r2, #3
str r4, [sp, #4]
bl func_02034b0c
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211642c
_02116538: .word 0x00000112
@@ -7025,10 +7025,10 @@ _02117038: .word data_ov00_020eec68
.global func_ov10_0211703c
arm_func_start func_ov10_0211703c
func_ov10_0211703c: ; 0x0211703c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x44
mov sl, r0
ldr r0, [sl, #0x14]
mov r10, r0
ldr r0, [r10, #0x14]
mov r1, #0xf000
mov r0, r0, lsl #0xc
bl Divide
@@ -7038,12 +7038,12 @@ func_ov10_0211703c: ; 0x0211703c
bl func_01ffbe34
mov r0, #1
strb r0, [sp, #0x2e]
add r8, sl, #0x18
add r8, r10, #0x18
mov r7, r6
add r4, sp, #4
mov r11, #0xfa000
_02117080:
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
cmp r7, #4
subeq r5, r5, #0xc00
cmp r0, #7
@@ -7129,7 +7129,7 @@ _02117160:
b _021172cc
_021171b4:
ldr r1, _0211736c ; =data_027e0d54
ldr r0, [sl, #8]
ldr r0, [r10, #8]
ldrh r1, [r1, #0x16]
blx func_ov10_02113358
bl func_ov10_0211a8fc
@@ -7205,7 +7205,7 @@ _021172cc:
add r7, r7, #1
cmp r7, #5
blt _02117080
ldr r0, [sl, #0x10]
ldr r0, [r10, #0x10]
cmp r0, #3
beq _02117308
cmp r0, #4
@@ -7239,11 +7239,11 @@ _02117320:
orr r3, r3, r1, lsl #20
add r3, r3, #0x800
ldrh r1, [r0, #0x16]
ldr r0, [sl, #8]
ldr r0, [r10, #8]
mov r3, r3, asr #0xc
blx func_ov10_02113890
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211703c
_0211736c: .word data_027e0d54
@@ -7393,7 +7393,7 @@ _02117520: .word func_ov10_0211ccec - 1
.global func_ov10_02117524
arm_func_start func_ov10_02117524
func_ov10_02117524: ; 0x02117524
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x30
ldr r2, _021177c4 ; =0x0003f500
mov sb, r1
@@ -7407,7 +7407,7 @@ func_ov10_02117524: ; 0x02117524
add r1, r2, #0xf300
str r0, [sp, #0x24]
add r0, r2, #0x3e800
add sl, r4, #0x30000
add r10, r4, #0x30000
str r3, [sp, #0x18]
str r8, [sp, #0x20]
mov r11, r8
@@ -7449,7 +7449,7 @@ _021175c8:
b _02117664
_021175ec:
ldr r1, _021177c8 ; =data_ov10_0211f400
mov r0, sl
mov r0, r10
ldr r1, [r1]
ldr r1, [r1, sb, lsl #2]
add r1, r1, #0x204
@@ -7480,7 +7480,7 @@ _02117634:
_02117658:
add sp, sp, #0x30
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02117664:
mov r1, #0
str r1, [sp]
@@ -7500,7 +7500,7 @@ _02117664:
cmp r0, #0
addeq sp, sp, #0x30
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [sp, #0x24]
add r8, r8, #1
add r0, r0, #0x1400
@@ -7510,7 +7510,7 @@ _02117664:
add r0, r0, #0x1400
str r0, [sp, #0x20]
ldr r0, [sp, #0x1c]
add sl, sl, #0x80
add r10, r10, #0x80
add r0, r0, #0x500
str r0, [sp, #0x1c]
add r5, r5, #0x80
@@ -7572,7 +7572,7 @@ _02117764:
_021177b8:
mov r0, #1
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_02117524
_021177c4: .word 0x0003f500
@@ -7833,9 +7833,9 @@ _02117b14: .word data_ov10_0211f400
.global func_ov10_02117b18
arm_func_start func_ov10_02117b18
func_ov10_02117b18: ; 0x02117b18
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r8, _02117c10 ; =data_027e0d54
mov sl, r0
mov r10, r0
ldrh r0, [r8, #0x14]
blx func_020400f4
mov sb, #0
@@ -7845,7 +7845,7 @@ func_ov10_02117b18: ; 0x02117b18
mov r5, #2
mov r11, #3
_02117b44:
cmp sl, #0
cmp r10, #0
beq _02117b58
ldrh r0, [r8, #0x16]
cmp sb, r0
@@ -7900,7 +7900,7 @@ _02117bfc:
blx func_02040100
mov r0, #0
strb r0, [r8, #0xd]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_02117b18
_02117c10: .word data_027e0d54
@@ -7909,17 +7909,17 @@ _02117c14: .word data_ov10_0211f400
.global func_ov10_02117c18
arm_func_start func_ov10_02117c18
func_ov10_02117c18: ; 0x02117c18
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x104
ldr r2, _02117d94 ; =data_ov10_0211f400
mov sl, r0
mov r10, r0
str r1, [r2]
ldrb r0, [sl, #0xc]
ldrb r0, [r10, #0xc]
cmp r0, #0
ldreq r0, [sl, #0x10]
ldreq r0, [r10, #0x10]
cmpeq r0, #0
addne sp, sp, #0x104
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, _02117d98 ; =data_027e0618
mov r0, #0
str r0, [sp]
@@ -7944,7 +7944,7 @@ func_ov10_02117c18: ; 0x02117c18
mov r7, r5
mov r8, r5
_02117ca0:
ldrh r1, [sl, #0x16]
ldrh r1, [r10, #0x16]
ldr r3, [r4]
ldr r0, _02117dac ; =data_ov00_020e9e18
ldr r1, [r3, r1, lsl #2]
@@ -7952,7 +7952,7 @@ _02117ca0:
add r1, r1, #4
add r1, r1, r6
bl func_02007984
ldrh r1, [sl, #0x16]
ldrh r1, [r10, #0x16]
ldr r3, [r4]
mov r0, r11
ldr r1, [r3, r1, lsl #2]
@@ -7961,7 +7961,7 @@ _02117ca0:
add r1, r1, #0x2800
add r1, r1, r7
bl func_02007984
ldrh r1, [sl, #0x16]
ldrh r1, [r10, #0x16]
ldr r3, [r4]
add r0, sp, #0x84
ldr r1, [r3, r1, lsl #2]
@@ -7970,7 +7970,7 @@ _02117ca0:
add r1, r1, #0x3000
add r1, r1, r8
bl func_020078d8
ldrh r1, [sl, #0x16]
ldrh r1, [r10, #0x16]
ldr r3, [r4]
add r0, sp, #4
ldr r1, [r3, r1, lsl #2]
@@ -7979,7 +7979,7 @@ _02117ca0:
add r1, r1, #0x3000
add r1, r1, r8
bl func_02007984
ldrh r1, [sl, #0x16]
ldrh r1, [r10, #0x16]
ldr r3, [r4]
mov r0, sb
ldr r1, [r3, r1, lsl #2]
@@ -7995,17 +7995,17 @@ _02117ca0:
cmp r5, #2
blt _02117ca0
_02117d68:
mov r0, sl
mov r0, r10
bl func_ov00_0207a2d8
ldr r0, _02117db0 ; =data_027e08e4
ldr r2, _02117db4 ; =func_ov10_02117b18
ldr r3, [sp]
mov r4, #1
mov r1, #0
strb r4, [sl, #0xd]
strb r4, [r10, #0xd]
blx func_0202f360
add sp, sp, #0x104
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_02117c18
_02117d94: .word data_ov10_0211f400
@@ -8574,7 +8574,7 @@ _02118530: .word func_ov10_021183d8 - 1
.global func_ov10_02118534
arm_func_start func_ov10_02118534
func_ov10_02118534: ; 0x02118534
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
mov r1, #1
@@ -8583,10 +8583,10 @@ func_ov10_02118534: ; 0x02118534
ldr r5, _021185d8 ; =data_027e0d54
ldr r0, [r5, #0x10]
cmp r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r6, #0
ldr sb, _021185dc ; =data_ov00_020ec758
ldr sl, _021185e0 ; =data_ov00_020ec218
ldr r10, _021185e0 ; =data_ov00_020ec218
ldr r4, _021185e4 ; =data_ov10_0211f400
mov r7, r6
mov r8, r6
@@ -8603,7 +8603,7 @@ _02118578:
bl func_02007984
ldrh r1, [r5, #0x16]
ldr r2, [r4]
mov r0, sl
mov r0, r10
ldr r1, [r2, r1, lsl #2]
mov r2, #0x500
add r1, r1, #4
@@ -8615,7 +8615,7 @@ _02118578:
add r7, r7, #0x80
add r8, r8, #0x500
blt _02118578
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_02118534
_021185d8: .word data_027e0d54
@@ -8789,13 +8789,13 @@ _021187f0: .word func_ov10_021186e8 - 1
.global func_ov10_021187f4
arm_func_start func_ov10_021187f4
func_ov10_021187f4: ; 0x021187f4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
ldr r2, _021188b4 ; =data_ov00_020ec678
mov sl, r0
mov r10, r0
ldrb r0, [r2]
cmp r1, r0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr sb, _021188b8 ; =data_ov00_020ec218
strb r1, [r2]
mov r0, sb
@@ -8811,7 +8811,7 @@ func_ov10_021187f4: ; 0x021187f4
mov r8, r6
mov r5, #0x500
_02118848:
ldrh r1, [sl, #0x16]
ldrh r1, [r10, #0x16]
ldr r2, [r4]
mov r0, sb
ldr r1, [r2, r1, lsl #2]
@@ -8824,20 +8824,20 @@ _02118848:
cmp r6, #2
add r8, r8, #0x500
blt _02118848
mov r0, sl
mov r0, r10
bl func_ov00_0207a2d8
orr r0, r7, #0x10
mov r1, r0, lsl #0x10
mov r4, #1
strb r4, [sl, #0xd]
strb r4, [r10, #0xd]
mov r3, r1, lsr #0x10
ldr r0, _021188c0 ; =data_027e08e4
ldr r2, _021188c4 ; =func_ov10_021186e8
mov r1, #0
strb r4, [sl, #0xe]
strb r4, [r10, #0xe]
blx func_0202f360
mov r0, r4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov10_021187f4
_021188b4: .word data_ov00_020ec678
@@ -8849,9 +8849,9 @@ _021188c4: .word func_ov10_021186e8 - 1
.global func_ov10_021188c8
arm_func_start func_ov10_021188c8
func_ov10_021188c8: ; 0x021188c8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r1
mov sl, r0
mov r10, r0
ldr r1, _02118964 ; =data_ov00_020ec218
mov r0, sb
bl func_ov01_020f7c08
@@ -8861,7 +8861,7 @@ func_ov10_021188c8: ; 0x021188c8
mov r8, r7
mov r5, #0x500
_021188f4:
ldrh r1, [sl, #0x16]
ldrh r1, [r10, #0x16]
ldr r2, [r4]
mov r0, sb
ldr r1, [r2, r1, lsl #2]
@@ -8876,19 +8876,19 @@ _021188f4:
blt _021188f4
cmp r6, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
mov r0, sl
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov r0, r10
bl func_ov00_0207a2d8
mov r4, #1
strb r4, [sl, #0xd]
strb r4, [r10, #0xd]
ldr r0, _0211896c ; =data_027e08e4
ldr r2, _02118970 ; =func_ov10_021186e8
mov r3, r6
mov r1, #0
strb r4, [sl, #0xe]
strb r4, [r10, #0xe]
blx func_0202f360
mov r0, r4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov10_021188c8
_02118964: .word data_ov00_020ec218
@@ -9572,7 +9572,7 @@ _02119110:
.global func_ov10_02119154
arm_func_start func_ov10_02119154
func_ov10_02119154: ; 0x02119154
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x4c
ldr r1, _0211951c ; =0x0400101c
mov r2, #0
@@ -9595,12 +9595,12 @@ func_ov10_02119154: ; 0x02119154
add r0, r1, r0, lsr #30
mov r2, #1
str r0, [sp, #8]
mov sl, #0x64000
mov r10, #0x64000
mvn r0, #0
strb r2, [sp, #0x36]
add r8, r11, #0x18
mov r7, r6
rsb sl, sl, #0
rsb r10, r10, #0
add r4, sp, #0xc
str r0, [sp, #4]
_021191d0:
@@ -9803,14 +9803,14 @@ _02119468:
bl func_ov00_020d00c4
b _02119504
_021194bc:
umull lr, ip, r6, sl
umull lr, ip, r6, r10
adds r1, lr, #0x800
mov lr, r1, lsr #0xc
ldr r1, [sp, #4]
mov r0, #0
mla ip, r6, r1, ip
mov sb, r6, asr #0x1f
mla ip, sb, sl, ip
mla ip, sb, r10, ip
mov r2, #0
mov r1, r2
adc r1, ip, r1
@@ -9827,7 +9827,7 @@ _02119504:
cmp r7, #8
blt _021191d0
add sp, sp, #0x4c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_02119154
_0211951c: .word 0x0400101c
@@ -9835,7 +9835,7 @@ _0211951c: .word 0x0400101c
.global func_ov10_02119520
arm_func_start func_ov10_02119520
func_ov10_02119520: ; 0x02119520
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x24
mov r7, r0
ldr r0, [r7, #0x14]
@@ -9851,13 +9851,13 @@ func_ov10_02119520: ; 0x02119520
strb r0, [sp, #0xe]
mov r6, r5
rsb r8, r8, #0
mvn sl, #0
mvn r10, #0
add r4, sp, #4
_02119568:
ldr ip, [r7, #0x10]
mov r2, r11
cmp ip, #2
moveq r0, sl
moveq r0, r10
movne r0, #1
cmp r6, #3
cmpne r6, #6
@@ -10049,7 +10049,7 @@ _021197f0:
b _02119888
_02119844:
umull lr, ip, r5, r8
mla ip, r5, sl, ip
mla ip, r5, r10, ip
mov sb, r5, asr #0x1f
adds r1, lr, #0x800
mov r0, #0
@@ -10070,7 +10070,7 @@ _02119888:
cmp r6, #8
blt _02119568
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_02119520
_0211989c: .word 0x66666667
@@ -10224,7 +10224,7 @@ func_ov10_02119a14: ; 0x02119a14
.global func_ov10_02119a6c
arm_func_start func_ov10_02119a6c
func_ov10_02119a6c: ; 0x02119a6c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov r4, r0
mov r5, r1
mov r1, r4
@@ -10244,13 +10244,13 @@ func_ov10_02119a6c: ; 0x02119a6c
mov r3, #1
ldr r6, [r2]
ldmib r2, {r5, r8}
umull sl, sb, r8, r6
umull r10, sb, r8, r6
mla sb, r8, r5, sb
ldr r7, [r2, #0xc]
ldr lr, [r2, #0x10]
mla sb, r7, r6, sb
ldr ip, [r2, #0x14]
adds r6, lr, sl
adds r6, lr, r10
adc r5, ip, sb
str r6, [r2]
str r5, [r2, #4]
@@ -10262,10 +10262,10 @@ func_ov10_02119a6c: ; 0x02119a6c
umull r8, r7, r6, lr
mla r7, r6, ip, r7
ldr r5, [r2, #0xc]
ldr sl, [r2, #0x10]
ldr r10, [r2, #0x10]
mla r7, r5, lr, r7
ldr sb, [r2, #0x14]
adds r6, sl, r8
adds r6, r10, r8
adc r5, sb, r7
str r6, [r2]
str r5, [r2, #4]
@@ -10275,7 +10275,7 @@ func_ov10_02119a6c: ; 0x02119a6c
mov r1, #0x80
strb r3, [r4, #0x7d]
blx func_0202f134
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov10_02119a6c
_02119b3c: .word 0x415a454a
@@ -10366,7 +10366,7 @@ _02119c6c: .word 0x415a454a
.global func_ov10_02119c70
arm_func_start func_ov10_02119c70
func_ov10_02119c70: ; 0x02119c70
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #4
mov r5, r0
strh r1, [r5]
@@ -10386,15 +10386,15 @@ func_ov10_02119c70: ; 0x02119c70
mov r8, #0
mov r7, #0x16
_02119cbc:
add sl, sb, #0x180
add r10, sb, #0x180
add r6, sb, #0x440
_02119cc4:
mov r0, r8
mov r1, sl
mov r1, r10
mov r2, r7
bl func_020078c0
add sl, sl, #0x16
cmp sl, r6
add r10, r10, #0x16
cmp r10, r6
blo _02119cc4
mov r0, r6
blx func_ov00_0207a4f0
@@ -10408,15 +10408,15 @@ _02119cc4:
mov r8, #0
mov r7, #0x14
_02119d0c:
mov sl, r4
mov r10, r4
add r6, r4, #0x3c
_02119d14:
mov r0, r8
mov r1, sl
mov r1, r10
mov r2, r7
bl func_020078c0
add sl, sl, #0x14
cmp sl, r6
add r10, r10, #0x14
cmp r10, r6
blo _02119d14
mov r0, r4
blx func_ov00_0207c170
@@ -10461,7 +10461,7 @@ _02119db0:
blt _02119db0
mov r0, r5
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov10_02119c70
_02119dd4: .word func_ov10_02112d40 - 1
@@ -10487,7 +10487,7 @@ func_ov10_02119ddc: ; 0x02119ddc
.global func_ov10_02119e0c
arm_func_start func_ov10_02119e0c
func_ov10_02119e0c: ; 0x02119e0c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov r4, r0
add r6, r4, #4
add r0, r4, #0x204
@@ -10495,7 +10495,7 @@ func_ov10_02119e0c: ; 0x02119e0c
add r7, r6, #0x2800
add r8, r0, #0x3000
add sb, r1, #0x3000
add sl, r6, #0x3400
add r10, r6, #0x3400
mov r5, #0
_02119e34:
mov r0, r6
@@ -10506,7 +10506,7 @@ _02119e34:
blx func_ov00_0207a5f4
mov r0, sb
blx func_ov00_0207a68c
mov r0, sl
mov r0, r10
blx func_ov00_0207a6d0
add r5, r5, #1
cmp r5, #2
@@ -10514,17 +10514,17 @@ _02119e34:
add r7, r7, #0x500
add r8, r8, #0x80
add sb, sb, #0x80
add sl, sl, #0x80
add r10, r10, #0x80
blt _02119e34
mov r0, r4
bl func_ov10_02119ddc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
arm_func_end func_ov10_02119e0c
.global func_ov10_02119e88
arm_func_start func_ov10_02119e88
func_ov10_02119e88: ; 0x02119e88
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
add r4, r0, #4
add r5, r1, #4
@@ -10544,7 +10544,7 @@ func_ov10_02119e88: ; 0x02119e88
str r3, [sp, #4]
add r8, r1, #0x3000
add sb, r4, #0x3400
add sl, r5, #0x3400
add r10, r5, #0x3400
str r0, [sp, #0x10]
_02119ee0:
mov r0, r5
@@ -10575,7 +10575,7 @@ _02119f0c:
bl func_02007984
b _02119f54
_02119f48:
mov r0, sl
mov r0, r10
mov r1, sb
bl func_02007984
_02119f54:
@@ -10594,12 +10594,12 @@ _02119f54:
add r7, r7, #0x80
add r8, r8, #0x80
add sb, sb, #0x80
add sl, sl, #0x80
add r10, r10, #0x80
str r0, [sp, #0x10]
cmp r0, #2
blt _02119ee0
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov10_02119e88
.global func_ov10_02119fa8
@@ -11074,7 +11074,7 @@ _0211a5d0:
.global func_ov10_0211a5f4
arm_func_start func_ov10_0211a5f4
func_ov10_0211a5f4: ; 0x0211a5f4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x1c
mov sb, r0
add r1, sb, #0x3000
@@ -11105,7 +11105,7 @@ _0211a648:
add r7, sb, #4
str r0, [sp, #0x14]
add r11, sb, #0x304
add sl, sb, #0x284
add r10, sb, #0x284
add r5, sb, #0x204
add r6, sb, #0x104
_0211a674:
@@ -11170,7 +11170,7 @@ _0211a72c:
b _0211a7e4
_0211a748:
ldrh r1, [sb]
add r0, sl, #0x3000
add r0, r10, #0x3000
mov r2, #0x80
mul r3, r1, r4
add r1, r3, #0x3280
@@ -11212,7 +11212,7 @@ _0211a7b8:
_0211a7d8:
add sp, sp, #0x1c
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0211a7e4:
mov r3, #0
str r3, [sp]
@@ -11228,7 +11228,7 @@ _0211a7e4:
cmp r0, #0
addeq sp, sp, #0x1c
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0211a820:
add r8, r8, #1
cmp r8, #0xa
@@ -11244,11 +11244,11 @@ _0211a820:
cmp r0, #0
addeq sp, sp, #0x1c
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0211a85c:
mov r0, #1
add sp, sp, #0x1c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211a5f4
_0211a868: .word 0x0003f500
@@ -15717,10 +15717,10 @@ _0211cd48: .word data_ov10_0211e980
.global func_ov10_0211cd4c
arm_func_start func_ov10_0211cd4c
func_ov10_0211cd4c: ; 0x0211cd4c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
ldr r2, _0211cdd0 ; =0x0003f500
mov sl, r0
mov r10, r0
mul r0, r1, r2
mov r8, #0
add sb, r0, #0
@@ -15734,7 +15734,7 @@ _0211cd7c:
str r7, [sp, #4]
str r6, [sp, #8]
str r5, [sp, #0xc]
mov r0, sl
mov r0, r10
mov r1, sb
mov r2, r11
mov r3, r7
@@ -15743,14 +15743,14 @@ _0211cd7c:
cmp r0, #0
addeq sp, sp, #0x14
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r8, r8, #1
cmp r8, #2
add sb, sb, #0x1400
blt _0211cd7c
mov r0, #1
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211cd4c
_0211cdd0: .word 0x0003f500
@@ -15758,10 +15758,10 @@ _0211cdd0: .word 0x0003f500
.global func_ov10_0211cdd4
arm_func_start func_ov10_0211cdd4
func_ov10_0211cdd4: ; 0x0211cdd4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
ldr r2, _0211ce58 ; =0x0003f500
mov sl, r0
mov r10, r0
mul r0, r1, r2
mov r8, #0
add sb, r0, #0x3e800
@@ -15775,7 +15775,7 @@ _0211ce04:
str r7, [sp, #4]
str r6, [sp, #8]
str r5, [sp, #0xc]
mov r0, sl
mov r0, r10
mov r1, sb
mov r2, r11
mov r3, r7
@@ -15784,14 +15784,14 @@ _0211ce04:
cmp r0, #0
addeq sp, sp, #0x14
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r8, r8, #1
cmp r8, #2
add sb, sb, #0x500
blt _0211ce04
mov r0, #1
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211cdd4
_0211ce58: .word 0x0003f500
@@ -15921,7 +15921,7 @@ func_ov10_0211cfa0: ; 0x0211cfa0
.global func_ov10_0211cfd8
arm_func_start func_ov10_0211cfd8
func_ov10_0211cfd8: ; 0x0211cfd8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x20
ldr r1, _0211d0a8 ; =0x000037fc
str r0, [sp, #0x14]
@@ -15943,7 +15943,7 @@ _0211d00c:
cmp r1, r0
bne _0211d078
_0211d028:
ldr sl, [sp, #0x18]
ldr r10, [sp, #0x18]
mov r8, #0
_0211d030:
str r7, [sp]
@@ -15951,7 +15951,7 @@ _0211d030:
str r6, [sp, #8]
str r5, [sp, #0xc]
mov r0, sb
mov r1, sl
mov r1, r10
mov r2, r11
mov r3, r7
str r4, [sp, #0x10]
@@ -15959,10 +15959,10 @@ _0211d030:
cmp r0, #0
addeq sp, sp, #0x20
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r8, r8, #1
cmp r8, #0x3c
add sl, sl, #0x1000
add r10, r10, #0x1000
blt _0211d030
_0211d078:
ldr r0, [sp, #0x18]
@@ -15976,7 +15976,7 @@ _0211d078:
blt _0211d00c
mov r0, #1
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211cfd8
_0211d0a8: .word 0x000037fc
@@ -16026,10 +16026,10 @@ _0211d138: .word 0x0007ea00
.global func_ov10_0211d13c
arm_func_start func_ov10_0211d13c
func_ov10_0211d13c: ; 0x0211d13c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
ldr r3, _0211d260 ; =0x0003f500
mov sl, r2
mov r10, r2
mul r4, r1, r3
mul r1, r0, r3
add r0, r4, #0xfe
@@ -16037,7 +16037,7 @@ func_ov10_0211d13c: ; 0x0211d13c
add r7, r1, #0x2800
add r8, r0, #0x3700
mov r6, #0
add r4, sl, #0xf00
add r4, r10, #0xf00
mov r5, #6
mov r11, #1
_0211d174:
@@ -16046,14 +16046,14 @@ _0211d174:
stmib sp, {r0, r5, r11}
str r0, [sp, #0x10]
mov r0, r7
mov r1, sl
mov r1, r10
mov r2, #0x1000
mov r3, #0
blx func_02040464
cmp r0, #0
addeq sp, sp, #0x14
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r0, [r4, #0xfe]
mov r3, #0
cmp r0, #0
@@ -16075,7 +16075,7 @@ _0211d174:
bne _0211d23c
add sp, sp, #0x14
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0211d200:
str r0, [sp, #4]
mov r0, #7
@@ -16084,14 +16084,14 @@ _0211d200:
str r0, [sp, #0xc]
mov r0, #2
str r0, [sp, #0x10]
mov r0, sl
mov r0, r10
mov r1, sb
mov r2, #0x1000
blx func_02040464
cmp r0, #0
addeq sp, sp, #0x14
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0211d23c:
add r7, r7, #0x1000
add r8, r8, #0x1000
@@ -16101,7 +16101,7 @@ _0211d23c:
blt _0211d174
mov r0, #1
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov10_0211d13c
_0211d260: .word 0x0003f500
+510 -510
View File
File diff suppressed because it is too large Load Diff
+29 -29
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02113e34:
ldrh r0, [r4]
cmp r0, #0x26
@@ -1470,19 +1470,19 @@ _02113e68:
mov r0, r6
mov r1, #0xb
bl func_ov13_02113074
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02113e84:
cmp r0, #0xb
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, 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 r11, #6
mov r5, sl
mov r5, r10
b _02113f14
_02113eb4:
ldrh r0, [r8]
@@ -1490,15 +1490,15 @@ _02113eb4:
cmp sb, #0x48
blt _02113f04
ldr r2, [r4, #0xf8]
mov sl, r5
mov r10, r5
cmp r2, #0
beq _02113ee4
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
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
mov r4, r1
cmp r0, #0xa
@@ -1979,14 +1979,14 @@ _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 r11, sl
mov r11, r10
cmp r1, #0
add sb, r0, r8, lsl #3
bne _02114598
@@ -1996,7 +1996,7 @@ _02114554:
_02114598:
cmp r11, #0
cmpne r6, #0
movne sl, #1
movne r10, #1
strh r8, [sb]
cmp r7, #0
beq _021145c8
@@ -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,7 +2051,7 @@ _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
@@ -2129,7 +2129,7 @@ _02114784:
_02114788:
mov r0, r5
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, sb, r10, lr}
sub sp, sp, #4
mov r8, r0
mov r7, r1
@@ -2388,14 +2388,14 @@ func_ov13_02114a34: ; 0x02114a34
_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 r1, r8
mov r2, r7
mov r3, sl
mov r3, r10
bl func_ov13_02112f24
ldr r7, [sp, #0x2c]
ldr r3, [sp, #0x28]
@@ -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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov13_02114a34
_02114b00: .word data_ov13_0211620c
+9 -9
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x18
mov r4, r0
ldrh r0, [r4, #0x20]
@@ -113,16 +113,16 @@ _0213afb4:
ldr r3, _0213b108 ; =data_027e0764
ldr r8, [r3, #0x10]
ldr r6, [r3, #0xc]
adds sl, r8, sb
adds r10, r8, sb
ldr r11, [r3, #0x14]
mla r0, r6, r5, r0
umull r3, lr, r7, sl
umull r3, lr, r7, r10
adc sb, r11, r0
adds r0, r8, r3
str r0, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
mla lr, r7, sb, lr
str sl, [r0]
str r10, [r0]
ldr r3, [sp, #0x14]
str sb, [r0, #4]
str r3, [r0]
@@ -131,7 +131,7 @@ _0213afb4:
umull r0, r5, sb, r0
str r0, [sp, #4]
mla r5, sb, r2, r5
mla lr, r6, sl, lr
mla lr, r6, r10, lr
ldr r0, [sp, #0x10]
mov r3, r2
mla r5, r3, r0, r5
@@ -140,14 +140,14 @@ _0213afb4:
ldr r5, [sp, #0x14]
ldr r0, _0213b108 ; =data_027e0764
adc sb, r11, lr
umull sl, r5, r7, r5
umull r10, r5, r7, r5
mla r5, r7, sb, r5
ldr r7, [sp, #0x14]
rsb r1, r1, #0x334
str sb, [r0, #4]
umull r0, r3, sb, r1
mla r5, r6, r7, r5
mov r6, sl
mov r6, r10
adds r6, r8, r6
adc r7, r11, r5
ldr r5, _0213b108 ; =data_027e0764
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end _ZN10ActorRupee8vfunc_08Ev
_0213b100: .word data_ov14_021589b4
+221 -221
View File
File diff suppressed because it is too large Load Diff
+459 -459
View File
File diff suppressed because it is too large Load Diff
+1629 -1629
View File
File diff suppressed because it is too large Load Diff
+228 -228
View File
File diff suppressed because it is too large Load Diff
+235 -235
View File
File diff suppressed because it is too large Load Diff
+25 -25
View File
@@ -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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x7c
mov r4, r0
add r0, sp, #0x50
@@ -1090,10 +1090,10 @@ _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]
mla r6, lr, ip, r6
@@ -1102,19 +1102,19 @@ _0216e46c:
adc ip, r8, r6
ldr r6, _0216e68c ; =0x00004001
ldr r11, [sp, #0x2c]
umull r6, sl, ip, r6
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
mla r10, r7, r6, r10
sub r6, r10, #0x2000
add r6, r11, r6
ldr sl, [sp, #0x14]
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
adc r6, r8, r6
@@ -1161,9 +1161,9 @@ _0216e46c:
ldr r6, [r5, #0xc]
ldr r11, [r5, #0x10]
mla r8, r6, r3, r8
ldr sl, [r5, #0x14]
ldr r10, [r5, #0x14]
adds r1, r11, sb
adc r3, sl, r8
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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov19_0216e334
_0216e688: .word data_02050f54
@@ -7824,10 +7824,10 @@ _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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
mov sl, r0
ldrb r7, [sl, #0x14]
mov r10, r0
ldrb r7, [r10, #0x14]
mov sb, r1
add r0, r7, #2
cmp r7, r0
@@ -7836,7 +7836,7 @@ func_ov19_02173d54: ; 0x02173d54
add r5, sp, #2
mov r11, #1
_02173d80:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
add r0, r8, #2
cmp r8, r0
bge _02173e08
@@ -7868,24 +7868,24 @@ _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
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov19_02173d54
_02173ee8: .word data_027e0e60
+143 -143
View File
@@ -130,32 +130,32 @@ _0216d844: .word func_ov20_0216da18
.global func_ov20_0216d848
arm_func_start func_ov20_0216d848
func_ov20_0216d848: ; 0x0216d848
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x44
ldr r1, _0216d9fc ; =data_027e0f74
mov sl, r0
mov r10, r0
ldr r0, [r1]
mov r1, #0x1d
bl func_ov00_02097760
cmp r0, #0
addne sp, sp, #0x44
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, _0216da00 ; =data_ov20_02178320
mov r0, sl
mov r0, r10
bl func_ov00_020ca8a4
add r0, sl, #0x100
add r0, r10, #0x100
ldrh r2, [r0, #0xb0]
mov r1, #4
bic r2, r2, #4
strh r2, [r0, #0xb0]
strh r1, [r0, #0x26]
strh r1, [sl, #0x7a]
strh r1, [r10, #0x7a]
mov r2, #0
str r2, [sl, #0x6c]
mov r0, sl
add r1, sl, #0x21c
strh r2, [sl, #0x9c]
str r2, [r10, #0x6c]
mov r0, r10
add r1, r10, #0x21c
strh r2, [r10, #0x9c]
bl func_ov00_020cb140
ldr r11, _0216da04 ; =0x46425331
ldr r5, _0216da08 ; =data_027e0fe8
@@ -173,11 +173,11 @@ _0216d8d0:
bl func_ov00_020c3348
str r7, [sp, #4]
str r7, [sp, #8]
ldr r0, [sl, #8]
ldr r0, [r10, #8]
mov r1, r11
str r0, [sp, #0x34]
ldr r0, [sl, #0xc]
add r2, sl, #0x48
ldr r0, [r10, #0xc]
add r2, r10, #0x48
str r0, [sp, #0x38]
str r6, [sp]
ldr r0, [r5]
@@ -186,7 +186,7 @@ _0216d8d0:
ldr r0, [r4]
mov r1, r6
bl _ZN12ActorManager8GetActorEP8ActorRef
add r1, sl, sb, lsl #2
add r1, r10, sb, lsl #2
str r0, [r1, #0xa40]
mov r1, sb
bl func_ov20_021702b4
@@ -196,7 +196,7 @@ _0216d8d0:
cmp sb, #3
blt _0216d8d0
mov r7, #0
add r0, sl, #0x24c
add r0, r10, #0x24c
ldr r6, _0216da10 ; =data_02050f54
ldr r4, _0216da14 ; =0x55555556
mov r8, r7
@@ -221,7 +221,7 @@ _0216d968:
str r2, [sp, #0x14]
add r1, sp, #0xc
mov r3, sb
add r2, sl, #0x48
add r2, r10, #0x48
str r5, [sp, #0x10]
bl func_01ff9e64
add r0, r7, #1
@@ -232,15 +232,15 @@ _0216d968:
add r8, r0, #0xff00
add sb, sb, #0xc
blt _0216d968
add r2, sl, #0xa00
add r2, r10, #0xa00
mov r1, #0
strh r1, [r2, #0x98]
mov r0, sl
mov r0, r10
strh r1, [r2, #0x9c]
bl func_ov20_0216dae8
mov r0, #1
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216d848
_0216d9fc: .word data_027e0f74
@@ -334,7 +334,7 @@ _0216dae0:
.global func_ov20_0216dae8
arm_func_start func_ov20_0216dae8
func_ov20_0216dae8: ; 0x0216dae8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x124
mov r7, r0
mov r4, #0
@@ -382,7 +382,7 @@ _0216db78:
str r4, [r7, #0x12c]
strb r4, [r7, #0x11a]
str r0, [r7, #0x20c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216dba4:
mov r1, #1
ldr r0, _0216e520 ; =data_027e0fc8
@@ -415,7 +415,7 @@ _0216dba4:
mov r1, #0x1000
str r1, [r0, #0x10]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216dc24:
add r0, r7, #0x21c
mov r1, #5
@@ -424,7 +424,7 @@ _0216dc24:
mov r1, #0x1000
str r1, [r0, #0x10]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216dc44:
add r0, sp, #0xb0
mov r1, #3
@@ -460,11 +460,11 @@ _0216dc60:
ldr r0, [sp, #0xac]
add r1, sb, r1
str sb, [sp, #0x9c]
smull sl, sb, r0, r3
adds sl, sl, #0x800
smull r10, sb, r0, r3
adds r10, r10, #0x800
rsb lr, r3, #0
adc r3, sb, #0
mov sb, sl, lsr #0xc
mov sb, r10, lsr #0xc
orr sb, sb, r3, lsl #20
add r3, r2, sb
smull sb, r2, r0, r8
@@ -478,7 +478,7 @@ _0216dc60:
str r1, [sp, #0x9c]
add r2, r2, sb
smull r8, r1, r0, r8
smull sl, sb, r0, lr
smull r10, sb, r0, lr
mov r0, #0x800
adds r0, r8, r0
adc r1, r1, #0
@@ -487,7 +487,7 @@ _0216dc60:
add r0, r3, r0
str r0, [sp, #0x98]
mov r0, #0x800
adds r1, sl, r0
adds r1, r10, r0
mov r8, #0
mov r0, r8
adc r0, sb, r0
@@ -511,15 +511,15 @@ _0216dc60:
strb r1, [r7, #0x11a]
add sp, sp, #0x124
str r0, [r7, #0x20c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216dd98:
bl func_ov20_0216f7d0
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216dda4:
bl func_ov20_0216f898
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216ddb0:
str r4, [r7, #0xa78]
str r4, [r7, #0xa7c]
@@ -566,7 +566,7 @@ _0216de34:
mov r0, r7
bl func_ov20_0216fa20
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216de60:
add r0, sp, #0x8c
mov r1, #3
@@ -581,7 +581,7 @@ _0216de60:
_0216de88:
add r0, sp, #0x8c
ldr r0, [r0, r5, lsl #2]
add sl, sp, #0x80
add r10, sp, #0x80
rsb r2, r0, r0, lsl #16
ldr r0, _0216e538 ; =0x55555556
add r3, r7, r5, lsl #2
@@ -601,13 +601,13 @@ _0216de88:
ldr r0, _0216e53c ; =data_ov20_02177878
rsb r8, r11, #0
ldmia r0, {r0, r1, r2}
stmia sl, {r0, r1, r2}
stmia r10, {r0, r1, r2}
ldr r2, [r7, #0xa78]
ldr r0, [sp, #0x84]
str r2, [sp, #0x74]
ldr r1, [r7, #0xa7c]
ldr ip, [sp, #0x88]
add sl, r1, r0
add r10, r1, r0
smull r11, r0, ip, r11
str r1, [sp, #0x78]
adds r1, r11, #0x800
@@ -625,16 +625,16 @@ _0216de88:
ldr r11, [r7, #0xa80]
ldr r0, [sp, #0x80]
add r1, r11, r1
str sl, [sp, #0x78]
smull r11, sl, r0, sb
str r10, [sp, #0x78]
smull r11, r10, r0, sb
smull sb, r8, r0, r8
mov r0, #0x800
adds r11, r11, r0
mov r0, #0
adc r0, sl, r0
mov sl, r11, lsr #0xc
orr sl, sl, r0, lsl #20
add r0, r2, sl
adc r0, r10, r0
mov r10, r11, lsr #0xc
orr r10, r10, r0, lsl #20
add r0, r2, r10
str r0, [sp, #0x74]
mov r0, #0x800
adds r2, sb, r0
@@ -663,7 +663,7 @@ _0216de88:
str r1, [r7, #0x12c]
bl func_ov20_0216fc48
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216dfdc:
add r0, r7, r4, lsl #2
ldr r0, [r0, #0xa40]
@@ -702,25 +702,25 @@ _0216dfdc:
cmp r0, #2
beq _0216e09c
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e074:
add r0, r7, #0xa00
mov r1, #0x190
strh r1, [r0, #0x9c]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e088:
add r0, r7, #0xa00
mov r1, #0x12c
strh r1, [r0, #0x9c]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e09c:
add r0, r7, #0xa00
mov r1, #0xc8
strh r1, [r0, #0x9c]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e0b0:
mov r1, r4
add r0, r7, #0x21c
@@ -733,7 +733,7 @@ _0216e0b0:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e0e0:
str r4, [r7, #0x12c]
add r0, r7, #0x21c
@@ -750,7 +750,7 @@ _0216e0e0:
str r4, [r7, #0x20c]
bl func_ov00_020ceacc
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e120:
ldr r0, _0216e544 ; =data_027e0f94
add r3, sp, #0x68
@@ -767,14 +767,14 @@ _0216e120:
str r0, [sp, #0x10]
ldr r0, _0216e548 ; =data_027e0764
add r3, r7, #0x28c
ldr sl, [r0, #0x10]
ldr r10, [r0, #0x10]
ldr sb, [r0, #0x14]
ldr r8, [r0, #8]
ldr r4, [r0]
ldr r6, [r0, #0xc]
umull ip, r11, r8, r4
ldr r0, [r0, #4]
adds ip, sl, ip
adds ip, r10, ip
mla r11, r8, r0, r11
mla r11, r6, r4, r11
ldr r0, _0216e548 ; =data_027e0764
@@ -817,7 +817,7 @@ _0216e120:
umull lr, r0, r8, ip
mla r0, r8, r11, r0
mla r0, r6, ip, r0
adds r8, sl, lr
adds r8, r10, lr
adc r6, sb, r0
ldr r0, _0216e548 ; =data_027e0764
str r4, [sp, #0x64]
@@ -845,7 +845,7 @@ _0216e120:
movne r0, #0
cmp r0, #0
addeq sp, sp, #0x124
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _0216e550 ; =data_027e0e60
add r2, sp, #0x44
ldr r0, [r0]
@@ -868,7 +868,7 @@ _0216e120:
add sp, sp, #0x124
cmp r0, r1
strgt r1, [r7, #0xa94]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e2f4:
add r0, r7, #0x21c
mov r1, #1
@@ -881,7 +881,7 @@ _0216e2f4:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e324:
add r0, r7, #0x21c
mov r1, #2
@@ -894,7 +894,7 @@ _0216e324:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e354:
add r0, r7, #0x21c
mov r1, #6
@@ -909,7 +909,7 @@ _0216e354:
mov r0, #2
add sp, sp, #0x124
str r0, [r7, #0x12c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e38c:
mov r0, #2
str r0, [r7, #0x12c]
@@ -920,7 +920,7 @@ _0216e38c:
mov r1, #0x1000
str r1, [r0, #0x10]
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e3b4:
add r0, r7, #0x21c
mov r1, #3
@@ -931,7 +931,7 @@ _0216e3b4:
str r2, [r1, #0x10]
bl func_ov20_0216fc48
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e3dc:
ldr r0, _0216e554 ; =data_027e0f90
mov r1, r4
@@ -992,7 +992,7 @@ _0216e3dc:
add r2, sp, #0x14
bl func_ov00_020888e8
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e4cc:
add r0, r7, #0x48
add r4, sp, #0x2c
@@ -1014,7 +1014,7 @@ _0216e4cc:
bl func_ov00_0207c31c
_0216e514:
add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216dae8
_0216e51c: .word 0x0000ffff
@@ -1087,7 +1087,7 @@ _0216e600: .word data_ov00_020eec68
.global func_ov20_0216e604
arm_func_start func_ov20_0216e604
func_ov20_0216e604: ; 0x0216e604
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x1e4
mov r4, r0
ldr r0, [r4, #0x130]
@@ -1265,35 +1265,35 @@ _0216e858:
str r1, [sp, #0x138]
mov r0, #0x5a
bl func_ov00_02087d84
ldr sl, [r0, #0x38]
ldr r10, [r0, #0x38]
ldrb r1, [r0, #0x60]
str sl, [sp, #0x40]
ldr sl, [r0, #0x3c]
str r10, [sp, #0x40]
ldr r10, [r0, #0x3c]
str r1, [sp, #0x2c]
str sl, [sp, #8]
ldr sl, [r0, #0x40]
str r10, [sp, #8]
ldr r10, [r0, #0x40]
ldrb r1, [r0, #0x61]
str sl, [sp, #0xc]
ldr sl, [r0, #0x44]
str r10, [sp, #0xc]
ldr r10, [r0, #0x44]
str r1, [sp, #0x30]
str sl, [sp, #0x10]
ldr sl, [r0, #0x48]
str r10, [sp, #0x10]
ldr r10, [r0, #0x48]
ldrb r1, [r0, #0x62]
str sl, [sp, #0x14]
ldr sl, [r0, #0x4c]
str r10, [sp, #0x14]
ldr r10, [r0, #0x4c]
str r1, [sp, #0x34]
ldrb r1, [r0, #0x63]
str sl, [sp, #0x18]
ldr sl, [r0, #0x50]
str r10, [sp, #0x18]
ldr r10, [r0, #0x50]
str r1, [sp, #0x38]
str sl, [sp, #0x1c]
ldr sl, [r0, #0x54]
str r10, [sp, #0x1c]
ldr r10, [r0, #0x54]
ldrb r1, [r0, #0x64]
str sl, [sp, #0x20]
ldr sl, [r0, #0x58]
str r10, [sp, #0x20]
ldr r10, [r0, #0x58]
str r1, [sp, #0x3c]
str sl, [sp, #0x24]
ldr sl, [r0, #0x5c]
str r10, [sp, #0x24]
ldr r10, [r0, #0x5c]
ldr sb, [r0, #4]
ldr r8, [r0, #8]
ldr r7, [r0, #0xc]
@@ -1306,7 +1306,7 @@ _0216e858:
ldr r1, [r0, #0x30]
ldr r11, [r0, #0x34]
ldr r0, [r0]
str sl, [sp, #0x28]
str r10, [sp, #0x28]
str r0, [sp, #0x160]
ldr r0, _0216f470 ; =0x00001388
str r3, [sp, #0x188]
@@ -1340,7 +1340,7 @@ _0216e858:
str r0, [sp, #0x1b8]
mov r0, #0x18000
str r0, [sp, #0x178]
mov r0, sl
mov r0, r10
str r0, [sp, #0x1bc]
ldr r0, [sp, #0x2c]
str r11, [sp, #0x194]
@@ -2069,7 +2069,7 @@ _0216f42c:
_0216f460:
mov r0, #1
add sp, sp, #0x1e4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216e604
_0216f46c: .word data_027e0fc8
@@ -2577,7 +2577,7 @@ _0216fa68: .word 0x00001003
.global func_ov20_0216fa6c
arm_func_start func_ov20_0216fa6c
func_ov20_0216fa6c: ; 0x0216fa6c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x3c
mov r4, r0
add r0, sp, #0x10
@@ -2599,33 +2599,33 @@ func_ov20_0216fa6c: ; 0x0216fa6c
ldr r5, [r0, #8]
ldr sb, [r0]
ldr r8, [r0, #4]
umull ip, sl, r5, sb
mla sl, r5, r8, sl
umull ip, r10, r5, sb
mla r10, r5, r8, r10
ldr r4, [r0, #0xc]
ldr r7, [r0, #0x10]
mla sl, r4, sb, sl
mla r10, r4, sb, r10
ldr r6, [r0, #0x14]
adds sb, r7, ip
adc r8, r6, sl
ldr sl, _0216fb88 ; =data_027e0764
adc r8, r6, r10
ldr r10, _0216fb88 ; =data_027e0764
ldr r11, _0216fb8c ; =0x00004001
str sb, [sl]
str r8, [sl, #4]
umull sl, ip, r8, r11
mov sl, #0
mla ip, r8, sl, ip
mla ip, sl, r11, ip
str sb, [r10]
str r8, [r10, #4]
umull r10, ip, r8, r11
mov r10, #0
mla ip, r8, r10, ip
mla ip, r10, r11, ip
ldr lr, [sp, #4]
sub sl, ip, #0x2000
add sl, lr, sl
str sl, [sp, #4]
umull ip, sl, r5, sb
mla sl, r5, r8, sl
mla sl, r4, sb, sl
sub r10, ip, #0x2000
add r10, lr, r10
str r10, [sp, #4]
umull ip, r10, r5, sb
mla r10, r5, r8, r10
mla r10, r4, sb, r10
adds r5, r7, ip
mov r2, r3
ldr r4, _0216fb88 ; =data_027e0764
adc r6, r6, sl
adc r6, r6, r10
stmia r4, {r5, r6}
umull r4, r5, r6, r11
mov r4, #0
@@ -2646,7 +2646,7 @@ func_ov20_0216fa6c: ; 0x0216fa6c
movge r0, #1
movlt r0, #0
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0216fa6c
_0216fb84: .word data_027e0f94
@@ -6124,7 +6124,7 @@ _02172958: .word data_027e0764
.global func_ov20_0217295c
arm_func_start func_ov20_0217295c
func_ov20_0217295c: ; 0x0217295c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x3c
mov r4, r0
add r0, sp, #0x10
@@ -6147,32 +6147,32 @@ func_ov20_0217295c: ; 0x0217295c
ldr r5, [r0, #8]
ldr sb, [r0]
ldr r8, [r0, #4]
umull ip, sl, r5, sb
mla sl, r5, r8, sl
umull ip, r10, r5, sb
mla r10, r5, r8, r10
ldr r4, [r0, #0xc]
ldr r7, [r0, #0x10]
mla sl, r4, sb, sl
mla r10, r4, sb, r10
ldr r6, [r0, #0x14]
adds sb, r7, ip
adc r8, r6, sl
ldr sl, _02172a74 ; =data_027e0764
adc r8, r6, r10
ldr r10, _02172a74 ; =data_027e0764
ldr r11, _02172a78 ; =0x00006001
str sb, [sl]
str r8, [sl, #4]
umull sl, ip, r8, r11
mov sl, #0
mla ip, r8, sl, ip
mla ip, sl, r11, ip
str sb, [r10]
str r8, [r10, #4]
umull r10, ip, r8, r11
mov r10, #0
mla ip, r8, r10, ip
mla ip, r10, r11, ip
ldr lr, [sp, #4]
sub sl, ip, #0x3000
add sl, lr, sl
str sl, [sp, #4]
umull ip, sl, r5, sb
mla sl, r5, r8, sl
mla sl, r4, sb, sl
sub r10, ip, #0x3000
add r10, lr, r10
str r10, [sp, #4]
umull ip, r10, r5, sb
mla r10, r5, r8, r10
mla r10, r4, sb, r10
adds r5, r7, ip
ldr r4, _02172a74 ; =data_027e0764
adc r6, r6, sl
adc r6, r6, r10
stmia r4, {r5, r6}
umull r4, r5, r6, r11
mov r4, #0
@@ -6193,7 +6193,7 @@ func_ov20_0217295c: ; 0x0217295c
movge r0, #1
movlt r0, #0
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_0217295c
_02172a74: .word data_027e0764
@@ -6720,19 +6720,19 @@ _0217315c: .word data_027e0d44
.global func_ov20_02173160
arm_func_start func_ov20_02173160
func_ov20_02173160: ; 0x02173160
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
ldr r3, _0217324c ; =0x0000ffff
ldr r2, _02173250 ; =0x040004c0
ldr r1, _02173254 ; =0x001f0080
str r3, [r2]
mov sl, r0
mov r10, r0
str r1, [r2, #-0x1c]
ldrh r0, [sl, #0x64]
ldrh r0, [r10, #0x64]
mov sb, #0
cmp r0, #0
addle sp, sp, #0x14
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r5, _02173258 ; =data_027e0d44
ldr r4, _0217325c ; =0x35200000
sub r8, r2, #0x18
@@ -6740,9 +6740,9 @@ func_ov20_02173160: ; 0x02173160
mov r11, #0x31
mov r6, #0x20
_021731ac:
add r0, sl, sb, lsl #2
add r0, r10, sb, lsl #2
ldr r0, [r0, #0x88]
add ip, sl, sb, lsl #3
add ip, r10, sb, lsl #3
cmp r0, #0
movge r2, r11
ldr r0, [r5]
@@ -6774,12 +6774,12 @@ _021731ac:
mov r3, #0
str r3, [sp]
bl func_ov05_0210e344
ldrh r0, [sl, #0x64]
ldrh r0, [r10, #0x64]
add sb, sb, #1
cmp sb, r0
blt _021731ac
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov20_02173160
_0217324c: .word 0x0000ffff
@@ -6791,7 +6791,7 @@ _0217325c: .word 0x35200000
.global func_ov20_02173260
arm_func_start func_ov20_02173260
func_ov20_02173260: ; 0x02173260
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x118
mov r4, r0
str r1, [r4, #8]
@@ -6851,7 +6851,7 @@ _021732a8:
add r0, r1, #0x800
ldr r6, [sp, #4]
ldr r5, [sp, #8]
ldr sl, [sp]
ldr r10, [sp]
ldr sb, [sp, #0x24]
ldr r8, [sp, #0x28]
ldr r7, [sp, #0x2c]
@@ -6860,8 +6860,8 @@ _021732a8:
str r5, [sp, #0x9c]
ldr r6, [sp, #0x38]
ldr r5, [sp, #0x3c]
str sl, [sp, #0x94]
ldr sl, [sp, #0x34]
str r10, [sp, #0x94]
ldr r10, [sp, #0x34]
str ip, [sp, #0xa0]
str sb, [sp, #0xb8]
ldr sb, [sp, #0x40]
@@ -6876,7 +6876,7 @@ _021732a8:
ldr r6, [sp, #0x54]
str r5, [sp, #0xd0]
ldr r5, [sp, #0x58]
str sl, [sp, #0xc8]
str r10, [sp, #0xc8]
str sb, [sp, #0xd4]
str r2, [sp, #0x14]
str r1, [sp, #0x18]
@@ -6993,7 +6993,7 @@ _02173534:
_0217354c:
mov r0, #1
add sp, sp, #0x118
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov20_02173260
_02173558: .word data_027e0f64
@@ -12022,7 +12022,7 @@ _021774e4: .word data_ov20_021793bc
arm_func_start func_ov20_021774e8
func_ov20_021774e8: ; 0x021774e8
stmdb sp!, {r0, r1, r2, r3}
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x24
ldr r0, _021775cc ; =data_027e0e60
ldrb r1, [sp, #0x4c]
@@ -12065,20 +12065,20 @@ _02177538:
mov r1, r5
bne _0217759c
bl func_ov00_02083f44
mov sl, r0
mov r10, r0
b _021775a8
_0217759c:
bl func_ov00_02083f44
cmp sl, r0
movge sl, r0
cmp r10, r0
movge r10, r0
_021775a8:
add r8, r8, #1
cmp r8, #4
add sb, sb, #0x4000
blt _02177538
mov r0, sl
mov r0, r10
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
add sp, sp, #0x10
bx lr
.align 2, 0
+69 -69
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, sb, 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, sb, r10, pc}
mov r1, #0
str r1, [r4, #0x16c]
ldr r2, [r4, #0x48]
@@ -2366,12 +2366,12 @@ func_ov21_0216f25c: ; 0x0216f25c
ldr ip, [r4, #0x4c]
ldr sb, [r4, #0x50]
ldr r8, [r4, #0x48]
sub sl, sb, #0x1000
sub r10, sb, #0x1000
sub r1, r8, #0x1000
sub r2, ip, #0x800
add sb, sb, #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}
@@ -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, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
mov r0, sl
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
add r0, sl, #0x48
add r1, sl, #0x54
add r2, sl, #0x60
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _0216fb88 ; =data_ov21_02171bb4
ldr r0, [r0, #0x20]
tst r0, #1
@@ -2868,9 +2868,9 @@ _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
@@ -2903,7 +2903,7 @@ _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]
@@ -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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216fac4:
add r8, r8, #1
cmp r8, #4
add sb, sb, #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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216fec4:
rsb r0, r0, #0
str r0, [sp, #8]
@@ -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
@@ -3253,7 +3253,7 @@ _0216ff48:
add sp, sp, #0x44
stmia r0, {r1, sb}
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216ff9c:
add r6, r6, #1
cmp r6, #1
@@ -3280,7 +3280,7 @@ _0216ffdc:
ble _0216fe2c
mov r0, #0
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_0216fc5c
_0216fffc: .word data_ov21_02171bb4
@@ -3313,13 +3313,13 @@ 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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 r11, r0
ldr r0, [r1]
@@ -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]
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x28
mov sb, r1
ldr r2, [sb]
ldr r1, _02170328 ; =data_027e0d3c
str r2, [sp, #8]
ldr r4, [sb, #4]
mov sl, r0
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]
@@ -3471,9 +3471,9 @@ _02170268:
ldr r0, [sb, #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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov21_021701b0
_02170328: .word data_027e0d3c
+124 -124
View File
@@ -927,30 +927,30 @@ func_ov22_0216e278: ; 0x0216e278
.global func_ov22_0216e2a8
arm_func_start func_ov22_0216e2a8
func_ov22_0216e2a8: ; 0x0216e2a8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x68
mov sl, r0
ldr r1, [sl, #4]
mov r10, r0
ldr r1, [r10, #4]
orr r1, r1, #0x10
str r1, [sl, #4]
str r1, [r10, #4]
bl func_ov00_0208c214
ldr r0, [sl, #4]
add r6, sl, #0x18
ldr r0, [r10, #4]
add r6, r10, #0x18
orr r0, r0, #0x800
str r0, [sl, #4]
ldrh r0, [sl, #0x2a]
str r0, [r10, #4]
ldrh r0, [r10, #0x2a]
add r5, sp, #0x5c
add r3, sp, #0x50
cmp r0, #0
moveq r0, #1
streqb r0, [sl, #0x64]
ldrh r0, [sl, #0x24]
streqb r0, [r10, #0x64]
ldrh r0, [r10, #0x24]
mov r4, #0x800
add r0, r0, #1
strb r0, [sl, #0x66]
ldrh r0, [sl, #0x26]
strb r0, [r10, #0x66]
ldrh r0, [r10, #0x26]
add r0, r0, #1
strb r0, [sl, #0x67]
strb r0, [r10, #0x67]
ldmia r6, {r0, r1, r2}
stmia r5, {r0, r1, r2}
ldmia r6, {r0, r1, r2}
@@ -984,28 +984,28 @@ func_ov22_0216e2a8: ; 0x0216e2a8
add r3, sp, #0x44
ldmia r4, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, sl
mov r0, r10
bl func_ov00_0208b9cc
mov r2, r0
mov r0, #0
str r0, [sp]
add r0, sl, #0x38
add r0, r10, #0x38
ldr r4, [r0]
ldr r3, [sp, #8]
ldr r4, [r4, #0x14]
mov r1, r5
blx r4
ldrb r2, [sl, #0x66]
ldrb r2, [r10, #0x66]
cmp r2, #1
ldreqb r0, [sl, #0x67]
ldreqb r0, [r10, #0x67]
cmpeq r0, #1
beq _0216e404
ldrb r0, [sl, #0x67]
ldrb r0, [r10, #0x67]
cmp r2, r0
beq _0216e404
cmp r2, #1
mvneq r0, #1
streq r0, [sl, #0x78]
streq r0, [r10, #0x78]
beq _0216e404
cmp r0, #1
bne _0216e404
@@ -1013,46 +1013,46 @@ func_ov22_0216e2a8: ; 0x0216e2a8
rsb r0, r1, r2, lsl #31
adds r0, r1, r0, ror #31
moveq r0, #2
streq r0, [sl, #0x78]
streq r0, [r10, #0x78]
_0216e404:
ldrb r0, [sl, #0x64]
ldrb r0, [r10, #0x64]
cmp r0, #0
beq _0216e53c
ldrh r2, [sl, #0x24]
ldrh r1, [sl, #0x26]
ldrh r2, [r10, #0x24]
ldrh r1, [r10, #0x26]
mov sb, #0
mov r0, #1
strh r2, [sp, #0x24]
strh r1, [sp, #0x26]
ldrh r2, [sl, #0x28]
ldrh r1, [sl, #0x2a]
ldrh r2, [r10, #0x28]
ldrh r1, [r10, #0x2a]
mov r6, sb
add r11, sp, #0x24
strh r2, [sp, #0x28]
strh r1, [sp, #0x2a]
ldrb r2, [sl, #0x2c]
ldrb r1, [sl, #0x2d]
ldrb r2, [r10, #0x2c]
ldrb r1, [r10, #0x2d]
strb r2, [sp, #0x2c]
strb r1, [sp, #0x2d]
ldrb r2, [sl, #0x2e]
ldrb r1, [sl, #0x2f]
ldrb r2, [r10, #0x2e]
ldrb r1, [r10, #0x2f]
strb r2, [sp, #0x2e]
strb r1, [sp, #0x2f]
ldr r1, [sl, #0x30]
ldr r1, [r10, #0x30]
str r1, [sp, #0x30]
ldrsh r1, [sl, #0x34]
ldrsh r1, [r10, #0x34]
strh r1, [sp, #0x34]
ldrb r1, [sl, #0x36]
ldrb r1, [r10, #0x36]
strb r1, [sp, #0x36]
strb sb, [sp, #4]
strb sb, [sp, #5]
strh r0, [sp, #0x2a]
ldrb r0, [sl, #0x66]
ldrb r0, [r10, #0x66]
cmp r0, #0
ble _0216e53c
add r5, sp, #4
_0216e494:
ldrb r0, [sl, #0x67]
ldrb r0, [r10, #0x67]
mov r7, #0
cmp r0, #0
ble _0216e52c
@@ -1061,12 +1061,12 @@ _0216e4a8:
cmp r6, #0
cmpeq r7, #0
beq _0216e51c
ldrb r1, [sl, #0x14]
mov r0, sl
ldrb r1, [r10, #0x14]
mov r0, r10
ldr r8, [r4]
add r1, r6, r1
strb r1, [sp, #4]
ldrb r1, [sl, #0x15]
ldrb r1, [r10, #0x15]
add r1, r7, r1
strb r1, [sp, #5]
ldr r1, [r0]
@@ -1076,7 +1076,7 @@ _0216e4a8:
mov r1, r0
mov r0, r8
mov r2, r5
ldrsh r3, [sl, #0xc]
ldrsh r3, [r10, #0xc]
bl func_ov00_020828c0
ldr r0, [r4]
mov r1, r5
@@ -1088,20 +1088,20 @@ _0216e4a8:
moveq sb, #1
movne sb, #0
_0216e51c:
ldrb r0, [sl, #0x67]
ldrb r0, [r10, #0x67]
add r7, r7, #1
cmp r7, r0
blt _0216e4a8
_0216e52c:
ldrb r0, [sl, #0x66]
ldrb r0, [r10, #0x66]
add r6, r6, #1
cmp r6, r0
blt _0216e494
_0216e53c:
mov r0, sl
mov r0, r10
bl func_ov22_0216ed28
cmp r0, #0
mov r0, sl
mov r0, r10
mov r2, #1
ldr r3, [r0]
beq _0216e56c
@@ -1109,13 +1109,13 @@ _0216e53c:
mov r1, #3
blx r3
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216e56c:
ldr r3, [r3, #0x80]
mov r1, #0
blx r3
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216e2a8
_0216e580: .word 0x00001334
@@ -1272,7 +1272,7 @@ _0216e774: .word 0xffffe4cd
.global func_ov22_0216e778
arm_func_start func_ov22_0216e778
func_ov22_0216e778: ; 0x0216e778
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x188
mov r4, r0
str r1, [r4, #8]
@@ -1355,12 +1355,12 @@ _0216e87c:
add r8, sp, #0xa
_0216e8ac:
ldrb r0, [r4, #0x67]
mov sl, #0
mov r10, #0
cmp r0, #0
ble _0216e948
_0216e8bc:
cmp sb, #0
cmpeq sl, #0
cmpeq r10, #0
beq _0216e938
ldrb r2, [r4, #0x14]
ldr r0, _0216ec8c ; =data_027e0e60
@@ -1369,7 +1369,7 @@ _0216e8bc:
strb r2, [sp, #0xa]
ldrb r2, [r4, #0x15]
ldr r0, [r0]
add r2, sl, r2
add r2, r10, r2
strb r2, [sp, #0xb]
bl func_ov00_020840c4
movs r7, r0
@@ -1392,8 +1392,8 @@ _0216e8bc:
blx r3
_0216e938:
ldrb r0, [r4, #0x67]
add sl, sl, #1
cmp sl, r0
add r10, r10, #1
cmp r10, r0
blt _0216e8bc
_0216e948:
ldrb r0, [r4, #0x66]
@@ -1520,12 +1520,12 @@ _0216eae8:
add r8, sp, #8
_0216eb18:
ldrb r0, [r4, #0x67]
mov sl, #0
mov r10, #0
cmp r0, #0
ble _0216ebb4
_0216eb28:
cmp sb, #0
cmpeq sl, #0
cmpeq r10, #0
beq _0216eba4
ldrb r2, [r4, #0x14]
ldr r0, _0216ec8c ; =data_027e0e60
@@ -1534,7 +1534,7 @@ _0216eb28:
strb r2, [sp, #8]
ldrb r2, [r4, #0x15]
ldr r0, [r0]
add r2, sl, r2
add r2, r10, r2
strb r2, [sp, #9]
bl func_ov00_020840c4
movs r7, r0
@@ -1557,8 +1557,8 @@ _0216eb28:
blx r3
_0216eba4:
ldrb r0, [r4, #0x67]
add sl, sl, #1
cmp sl, r0
add r10, r10, #1
cmp r10, r0
blt _0216eb28
_0216ebb4:
ldrb r0, [r4, #0x66]
@@ -1617,7 +1617,7 @@ _0216ec74:
mov r0, #1
str r1, [r4, #0x44]
add sp, sp, #0x188
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216e778
_0216ec88: .word data_027e0f74
@@ -1800,7 +1800,7 @@ func_ov22_0216ee60: ; 0x0216ee60
.global func_ov22_0216ee88
arm_func_start func_ov22_0216ee88
func_ov22_0216ee88: ; 0x0216ee88
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x20
mov r4, r0
ldr r0, [r4, #0x18]
@@ -1888,10 +1888,10 @@ _0216efa0:
add r6, sp, #4
mov r11, r7
_0216efcc:
ldrb sl, [r4, #0x15]
ldrb r10, [r4, #0x15]
ldrb r0, [r4, #0x39]
add r0, sl, r0
cmp sl, r0
add r0, r10, r0
cmp r10, r0
bge _0216f030
ldr r0, [sp]
and sb, r0, #0xff
@@ -1900,19 +1900,19 @@ _0216efe8:
mov r1, r8
mov r2, r7
strb sb, [sp, #6]
strb sl, [sp, #7]
strb r10, [sp, #7]
bl func_ov00_02082680
ldr r0, [r5]
mov r1, r6
strb sb, [sp, #4]
strb sl, [sp, #5]
strb r10, [sp, #5]
mov r2, r11
bl func_ov00_020826a0
ldrb r1, [r4, #0x15]
ldrb r0, [r4, #0x39]
add sl, sl, #1
add r10, r10, #1
add r0, r1, r0
cmp sl, r0
cmp r10, r0
blt _0216efe8
_0216f030:
ldrb sb, [r4, #0x38]
@@ -1947,7 +1947,7 @@ _0216f050:
str r0, [r4, #0x68]
str r6, [r4, #0x6c]
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216ee88
_0216f0b0: .word data_027e0e60
@@ -1982,16 +1982,16 @@ func_ov22_0216f0d8: ; 0x0216f0d8
.global func_ov22_0216f0e0
arm_func_start func_ov22_0216f0e0
func_ov22_0216f0e0: ; 0x0216f0e0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x48
ldr r2, [r0]
mov sl, r0
mov r10, r0
ldr r2, [r2, #0x88]
blx r2
cmp r0, #0
addeq sp, sp, #0x48
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldrh r1, [sl, #0xc]
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _0216f2b8 ; =data_02050f54
add r0, sp, #0x24
mov r1, r1, asr #0x4
@@ -2002,14 +2002,14 @@ func_ov22_0216f0e0: ; 0x0216f0e0
ldrsh r1, [r3, r4]
ldrsh r2, [r3, r2]
blx func_01ff8214
ldr r2, [sl, #0x4c]
ldr r1, [sl, #0x1c]
ldr r0, [sl, #0x44]
ldr r2, [r10, #0x4c]
ldr r1, [r10, #0x1c]
ldr r0, [r10, #0x44]
mov r7, #0
str r1, [sp, #0x1c]
str r2, [sp, #0x20]
str r0, [sp, #0x18]
ldrb r0, [sl, #0x38]
ldrb r0, [r10, #0x38]
cmp r0, #0
ble _0216f1ec
mvn r5, #0
@@ -2022,56 +2022,56 @@ _0216f168:
mov r8, #0
addne r0, r0, #0x1000
strne r0, [sp, #0x18]
ldrb r0, [sl, #0x39]
ldrb r0, [r10, #0x39]
cmp r0, #0
ble _0216f1dc
mov sb, r8
_0216f18c:
ldr r0, [sl, #0x4c]
ldr r0, [r10, #0x4c]
cmp r8, #0
streq r0, [sp, #0x20]
addne r0, r0, sb
strne r0, [sp, #0x20]
cmp r7, #0
cmpeq r8, #0
streqh r6, [sl, #0x5a]
strneh r5, [sl, #0x5a]
add r0, sl, #0x50
streqh r6, [r10, #0x5a]
strneh r5, [r10, #0x5a]
add r0, r10, #0x50
ldr r3, [r0]
mov r1, r4
ldr r3, [r3, #0x14]
mov r2, r11
blx r3
ldrb r0, [sl, #0x39]
ldrb r0, [r10, #0x39]
add r8, r8, #1
add sb, sb, #0x1000
cmp r8, r0
blt _0216f18c
_0216f1dc:
ldrb r0, [sl, #0x38]
ldrb r0, [r10, #0x38]
add r7, r7, #1
cmp r7, r0
blt _0216f168
_0216f1ec:
ldrsh r0, [sl, #0xc]
ldr r1, [sl, #0x48]
ldr r2, [sl, #0x20]
ldrsh r0, [r10, #0xc]
ldr r1, [r10, #0x48]
ldr r2, [r10, #0x20]
cmp r0, #0x4000
bne _0216f218
ldr r0, [sl, #0x18]
ldr r0, [r10, #0x18]
sub r1, r1, #0x800
str r0, [sp, #0x18]
str r1, [sp, #0x1c]
str r2, [sp, #0x20]
b _0216f22c
_0216f218:
ldr r0, [sl, #0x18]
ldr r0, [r10, #0x18]
sub r1, r1, #0x800
str r0, [sp, #0x18]
str r1, [sp, #0x1c]
str r2, [sp, #0x20]
_0216f22c:
ldrb r0, [sl, #0x39]
ldrb r0, [r10, #0x39]
ldr r3, _0216f2bc ; =0x0000099a
mov r1, #0
mov r0, r0, lsl #0xc
@@ -2091,7 +2091,7 @@ _0216f22c:
str r0, [sp, #0xc]
str r0, [sp, #0x10]
str r0, [sp, #0x14]
ldrb r4, [sl, #0x38]
ldrb r4, [r10, #0x38]
ldr r0, _0216f2c0 ; =data_ov00_020e9370
add r2, sp, #0x18
mov r4, r4, lsl #0xc
@@ -2105,7 +2105,7 @@ _0216f22c:
orr r3, r3, r4, lsl #20
bl func_ov05_02102c2c
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216f0e0
_0216f2b8: .word data_02050f54
@@ -2952,7 +2952,7 @@ _0216fd98: .word func_ov22_0216f41c
.global func_ov22_0216fd9c
arm_func_start func_ov22_0216fd9c
func_ov22_0216fd9c: ; 0x0216fd9c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x48
mov r6, r0
cmp r1, #8
@@ -3141,8 +3141,8 @@ _0216ffdc:
mov r5, #2
add r7, sp, #0x10
_02170058:
ldr sl, [r7, sb, lsl #2]
ldr r0, [sl]
ldr r10, [r7, sb, lsl #2]
ldr r0, [r10]
cmp r0, #0
beq _021700c4
beq _021700b4
@@ -3165,7 +3165,7 @@ _02170058:
add r1, r2, r1
str r1, [r0, #0x30]
_021700b4:
mov r0, sl
mov r0, r10
mov r1, r6
bl func_ov00_020b7ea4
b _021700f4
@@ -3173,13 +3173,13 @@ _021700c4:
str r5, [sp]
ldr r0, [r11]
ldr r2, [r8, sb, lsl #2]
mov r1, sl
mov r1, r10
add r3, r4, #0x400
bl func_ov00_0207c1f8
ldr r0, [sl]
ldr r0, [r10]
cmp r0, #0
beq _021700f4
mov r0, sl
mov r0, r10
mov r1, r6
bl func_ov00_020b7ea4
_021700f4:
@@ -3203,7 +3203,7 @@ _02170120:
_0217012c:
add sp, sp, #0x48
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02170138:
add r0, r6, #0x1d8
mov r1, #5
@@ -3244,11 +3244,11 @@ _021701b0:
mov r2, r2, asr #0x10
bl func_0202b154
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021701c8:
mov r0, #1
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_0216fd9c
_021701d4: .word data_027e0e58
@@ -4258,7 +4258,7 @@ _02170ef4: .word data_ov22_021793cc
.global func_ov22_02170ef8
arm_func_start func_ov22_02170ef8
func_ov22_02170ef8: ; 0x02170ef8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x38
mov r4, r0
ldr r1, [r4, #0x14]
@@ -4437,8 +4437,8 @@ _021710fc:
mov r5, #2
add r7, sp, #0x18
_02171180:
ldr sl, [r7, sb, lsl #2]
ldr r0, [sl]
ldr r10, [r7, sb, lsl #2]
ldr r0, [r10]
cmp r0, #0
beq _021711ec
beq _021711dc
@@ -4461,7 +4461,7 @@ _02171180:
add r1, r2, r1
str r1, [r0, #0x30]
_021711dc:
mov r0, sl
mov r0, r10
mov r1, r6
bl func_ov00_020b7ea4
b _0217121c
@@ -4469,13 +4469,13 @@ _021711ec:
str r5, [sp]
ldr r0, [r11]
ldr r2, [r8, sb, lsl #2]
mov r1, sl
mov r1, r10
add r3, r4, #0x7c
bl func_ov00_0207c1f8
ldr r0, [sl]
ldr r0, [r10]
cmp r0, #0
beq _0217121c
mov r0, sl
mov r0, r10
mov r1, r6
bl func_ov00_020b7ea4
_0217121c:
@@ -4521,7 +4521,7 @@ _02171280:
add r0, r4, #0x360
bl func_ov00_020c5e20
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_02170ef8
_021712ac: .word data_027e0ffc
@@ -9155,14 +9155,14 @@ func_ov22_02174ea0: ; 0x02174ea0
.global func_ov22_02174f00
arm_func_start func_ov22_02174f00
func_ov22_02174f00: ; 0x02174f00
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x18
mov r5, r0
mov r4, r1
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
addeq sp, sp, #0x18
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _02175058 ; =data_027e0f64
mov r1, #0
ldr r0, [r0]
@@ -9183,7 +9183,7 @@ func_ov22_02174f00: ; 0x02174f00
str r0, [sp]
cmp r0, r1
addge sp, sp, #0x18
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02174f74:
ldrb r4, [sp, #4]
ldrb r1, [sp, #5]
@@ -9207,10 +9207,10 @@ _02174f9c:
umull lr, ip, r3, r1
mla ip, r3, r0, ip
ldr r2, [r6, #0xc]
ldr sl, [r6, #0x10]
ldr r10, [r6, #0x10]
mla ip, r2, r1, ip
ldr sb, [r6, #0x14]
adds r0, sl, lr
adds r0, r10, lr
adc r2, sb, ip
stmia r6, {r0, r2}
umull r0, r1, r2, r11
@@ -9244,7 +9244,7 @@ _02175038:
cmp r0, r1
blt _02174f74
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_02174f00
_02175058: .word data_027e0f64
@@ -10214,7 +10214,7 @@ _02175c40: .word data_027e0e58
.global func_ov22_02175c44
arm_func_start func_ov22_02175c44
func_ov22_02175c44: ; 0x02175c44
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #4
mov sb, r0
ldr r0, [sb, #0x18]
@@ -10233,8 +10233,8 @@ func_ov22_02175c44: ; 0x02175c44
add r0, r7, #2
cmp r7, r0
addge sp, sp, #4
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldr sl, _02175cfc ; =data_027e0e60
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldr r10, _02175cfc ; =data_027e0e60
add r5, sp, #0
mov r4, #1
_02175ca0:
@@ -10244,7 +10244,7 @@ _02175ca0:
bge _02175ce0
and r6, r7, #0xff
_02175cb4:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
strb r6, [sp]
@@ -10262,7 +10262,7 @@ _02175ce0:
cmp r7, r0
blt _02175ca0
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov22_02175c44
_02175cfc: .word data_027e0e60
@@ -12878,7 +12878,7 @@ func_ov22_02177ddc: ; 0x02177ddc
.global func_ov22_02177e04
arm_func_start func_ov22_02177e04
func_ov22_02177e04: ; 0x02177e04
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x20
mov r4, r1
mov r8, r0
@@ -12892,7 +12892,7 @@ func_ov22_02177e04: ; 0x02177e04
add r2, r8, #0x18
mov r3, #0
bl func_ov00_020ceacc
mov sl, #0
mov r10, #0
ldr r0, [r8, #0x18]
ldr r2, [r8, #0x20]
ldr r1, [r8, #0x1c]
@@ -12901,11 +12901,11 @@ func_ov22_02177e04: ; 0x02177e04
str r0, [sp, #0x14]
str r1, [sp, #0x18]
str r2, [sp, #0x1c]
mov sb, sl
mov sb, r10
mov r8, #0xf7
add r7, sp, #0x14
mov r6, #4
mov r5, sl
mov r5, r10
mov r11, #0xf8
_02177e78:
str sb, [sp]
@@ -12923,10 +12923,10 @@ _02177e78:
mov r3, #4
bl func_ov00_0207c1b0
ldr r0, [sp, #0x14]
add sl, sl, #1
add r10, r10, #1
add r0, r0, #0x1000
str r0, [sp, #0x14]
cmp sl, #2
cmp r10, #2
blt _02177e78
b _02177f44
_02177ecc:
@@ -12964,7 +12964,7 @@ _02177f10:
_02177f44:
mov r0, #1
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov22_02177e04
_02177f50: .word data_027e0ffc
+75 -75
View File
@@ -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, sb, 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, sb, r10, pc}
ldr r1, [r4]
mov r0, #0
str r1, [sp, #0xc]
@@ -3846,19 +3846,19 @@ func_ov23_021707e0: ; 0x021707e0
bl func_01ff9d4c
ldr sb, [sp]
mov r1, #0x2800
umull r0, sl, sb, r1
umull r0, r10, sb, 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
mla r10, sb, r2, r10
mov r8, sb, asr #0x1f
mla sl, r8, r1, sl
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, sb, 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, sb, 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, sb, 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, sb, r10, pc}
_02172a44:
add r0, r4, #0x184
mov r2, #0
@@ -6455,7 +6455,7 @@ _02172a44:
mvn r7, #0
ldr sb, _02172b14 ; =data_027e0e60
mov r6, r7
add sl, sp, #0x1c
add r10, sp, #0x1c
add r5, sp, #0
_02172a74:
mov r8, r6
@@ -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, sb, 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, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x10c
mov r6, r0
bl func_ov23_02173014
@@ -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
umull r10, r3, r2, r8
mla r3, r2, r11, r3
mov ip, r2, asr #0x1f
mla r3, ip, r8, r3
adds sl, sl, #0x800
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 r11, sl, r3, sb
mla sl, r3, r1, sl
umull r11, r10, r3, sb
mla r10, r3, r1, r10
mov r2, r3, asr #0x1f
mla sl, r2, sb, sl
mla r10, r2, sb, r10
adds r2, r11, #0x800
adc r1, sl, #0
adc r1, r10, #0
mov r2, r2, lsr #0xc
orr r2, r2, r1, lsl #20
str r2, [r4, #0x68]
@@ -7127,19 +7127,19 @@ _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
mov r0, r10
add r1, sb, #0x400
bl func_ov00_0208b7d0
cmp r0, #0
beq _021734a8
mov r0, sl
mov r0, r10
add r1, sp, #0x14
str r11, [sp, #0x14]
str r11, [sp, #0x18]
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov23_02173124
_021734c8: .word data_02050f54
@@ -11638,7 +11638,7 @@ _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, sb, r10, lr}
sub sp, sp, #4
mov sb, r0
ldr r1, [sb, #0x18]
@@ -11661,8 +11661,8 @@ func_ov23_02177020: ; 0x02177020
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, sb, r10, pc}
ldr r10, _021770e8 ; =data_027e0e60
add r5, sp, #0
mov r4, #1
_0217708c:
@@ -11672,7 +11672,7 @@ _0217708c:
bge _021770cc
and r6, r7, #0xff
_021770a0:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
strb r6, [sp]
@@ -11690,7 +11690,7 @@ _021770cc:
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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov23_02177020
_021770e8: .word data_027e0e60
@@ -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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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
@@ -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
@@ -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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
mov r0, sl
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov23_02178ab0
_02179014: .word data_027e0e60
+38 -38
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, sb, r10, lr}
sub sp, sp, #0x54
mov r5, r0
ldr r0, [r5, #0x18]
@@ -168,10 +168,10 @@ _0216d878:
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
_0216d8cc:
@@ -179,13 +179,13 @@ _0216d8cc:
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]
@@ -218,7 +218,7 @@ _0216d914:
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
@@ -232,7 +232,7 @@ _0216d914:
ldmia r1, {r0, r1, r2}
stmia r8, {r0, r1, r2}
str sb, [sp, #0x3c]
str sl, [sp, #0x40]
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, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldrh r1, [sl, #0xc]
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r1, [r10, #0xc]
ldr r3, _0216dca8 ; =data_02050f54
add r0, sp, #0xc
mov r1, r1, asr #0x4
@@ -421,17 +421,17 @@ 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, r11, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mvn r5, #0
mov r6, r7
add r4, sp, #0xc
@@ -442,38 +442,38 @@ _0216dc1c:
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
_0216dc40:
ldr r0, [sl, #0x70]
ldr r0, [r10, #0x70]
cmp r8, #0
streq r0, [sp, #8]
addne r0, r0, sb
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, r11
blx r3
ldrb r0, [sl, #0x65]
ldrb r0, [r10, #0x65]
add r8, r8, #1
add sb, sb, #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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov24_0216db90
_0216dca8: .word data_02050f54
@@ -14054,10 +14054,10 @@ _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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x10
mov sl, r0
ldrb r7, [sl, #0x14]
mov r10, r0
ldrb r7, [r10, #0x14]
mov sb, r1
add r0, r7, #2
cmp r7, r0
@@ -14066,7 +14066,7 @@ func_ov24_02178e20: ; 0x02178e20
add r5, sp, #2
mov r11, #1
_02178e4c:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
add r0, r8, #2
cmp r8, r0
bge _02178ed4
@@ -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
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov24_02178e20
_02179010: .word data_027e0e60
+100 -100
View File
@@ -49,28 +49,28 @@ _0216d710: .word data_027e10b8
.global func_ov25_0216d714
arm_func_start func_ov25_0216d714
func_ov25_0216d714: ; 0x0216d714
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov r4, r0
mov r8, #0
mov sl, r4
mov r10, r4
add r5, r4, #0x900
mov sb, #0xff
mvn r7, #0
mov r6, r8
_0216d734:
strb sb, [sl]
str r8, [sl, #4]
strh r8, [sl, #0x24]
add r0, sl, #0x28
strb sb, [r10]
str r8, [r10, #4]
strh r8, [r10, #0x24]
add r0, r10, #0x28
bl func_ov00_020c1500
str r7, [sl, #0x3c]
str r7, [sl, #0x40]
str r7, [sl, #0x44]
str r6, [sl, #0x18]
str r6, [sl, #0x1c]
str r6, [sl, #0x20]
add sl, sl, #0x48
cmp sl, r5
str r7, [r10, #0x3c]
str r7, [r10, #0x40]
str r7, [r10, #0x44]
str r6, [r10, #0x18]
str r6, [r10, #0x1c]
str r6, [r10, #0x20]
add r10, r10, #0x48
cmp r10, r5
blo _0216d734
mov r0, #0xff
strb r0, [r4, #0x900]
@@ -96,7 +96,7 @@ _0216d734:
mov r2, #0
bl func_ov00_0209779c
mov r0, r4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov25_0216d714
_0216d7d0: .word data_027e0f74
@@ -313,12 +313,12 @@ _0216daa0: .word 0x43425331
.global func_ov25_0216daa4
arm_func_start func_ov25_0216daa4
func_ov25_0216daa4: ; 0x0216daa4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x78
mov sl, r0
mov r10, r0
ldr r11, _0216dcc8 ; =data_027e0fe8
mov sb, r1
mov r8, sl
mov r8, r10
mov r7, #0
mvn r6, #0
add r5, sp, #0x4c
@@ -376,12 +376,12 @@ _0216db80:
cmp r7, #0x20
add r8, r8, #0x48
blt _0216dacc
ldrb r0, [sl, #0x900]
ldrb r0, [r10, #0x900]
cmp r0, #0xff
addeq sp, sp, #0x78
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mvn r2, #0
add r1, sl, #0x104
add r1, r10, #0x104
add r0, sp, #0x20
str r2, [sp, #4]
str r2, [sp, #8]
@@ -447,11 +447,11 @@ _0216db80:
strh r4, [sp, #0x34]
str r1, [sp]
ldr r0, [r0]
ldr r1, [sl, #0x904]
ldr r1, [r10, #0x904]
add r3, sp, #0x20
bl func_ov00_020c4048
add sp, sp, #0x78
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov25_0216daa4
_0216dcc8: .word data_027e0fe8
@@ -1711,7 +1711,7 @@ func_ov25_0216ece0: ; 0x0216ece0
.global func_ov25_0216ecf4
arm_func_start func_ov25_0216ecf4
func_ov25_0216ecf4: ; 0x0216ecf4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0xac
mov sb, r1
mvn r3, #0
@@ -1772,13 +1772,13 @@ func_ov25_0216ecf4: ; 0x0216ecf4
str r1, [sp, #0x24]
cmp r0, #0
ble _0216ee54
ldr sl, _0216eedc ; =data_027e0fe4
ldr r10, _0216eedc ; =data_027e0fe4
mov r8, r6
add r4, sp, #8
add r5, sp, #0
_0216edf8:
ldr r2, [sp, #0x38]
ldr r0, [sl]
ldr r0, [r10]
ldr r1, [r2, r8]
add r2, r2, r8
str r1, [sp]
@@ -1804,7 +1804,7 @@ _0216ee40:
_0216ee54:
cmp r6, #0
addeq sp, sp, #0xac
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
movle r3, #0
ble _0216eeb4
ldr r0, _0216eee0 ; =data_027e0764
@@ -1834,7 +1834,7 @@ _0216eeb4:
ldr r0, [r1, #4]
str r0, [sb, #4]
add sp, sp, #0xac
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov25_0216ecf4
_0216eed4: .word _ZTV11FilterActor
@@ -4087,7 +4087,7 @@ func_ov25_02170e34: ; 0x02170e34
.global func_ov25_02170e64
arm_func_start func_ov25_02170e64
func_ov25_02170e64: ; 0x02170e64
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x94
mov r8, r0
bl func_ov25_0216ecd8
@@ -4123,7 +4123,7 @@ func_ov25_02170e64: ; 0x02170e64
ldr r0, [sp, #0x54]
str r1, [sp, #0x60]
add r0, r1, r0
ldr sl, [r8, #0x50]
ldr r10, [r8, #0x50]
ldr sb, [sp, #0x58]
str r0, [sp, #0x60]
rsb r0, r2, #0
@@ -4139,12 +4139,12 @@ func_ov25_02170e64: ; 0x02170e64
adc r2, r2, #0
mov sb, sb, lsr #0xc
orr sb, sb, r2, lsl #20
add r2, sl, sb
smull sl, sb, r1, r3
add r2, r10, sb
smull r10, sb, r1, r3
smull r3, r0, r1, r0
adds sl, sl, #0x800
adds r10, r10, #0x800
adc r1, sb, #0
mov sb, sl, lsr #0xc
mov sb, r10, lsr #0xc
orr sb, sb, r1, lsl #20
add r1, r7, sb
str r1, [sp, #0x5c]
@@ -4158,14 +4158,14 @@ func_ov25_02170e64: ; 0x02170e64
mov r0, #3
ldr r2, [lr]
ldmib lr, {r1, r7}
umull sl, sb, r7, r2
umull r10, sb, r7, r2
mla sb, r7, r1, sb
ldr r3, [lr, #0xc]
ldr ip, [lr, #0x10]
mla sb, r3, r2, sb
ldr r11, [lr, #0x14]
sub r0, r0, #4
adds r1, ip, sl
adds r1, ip, r10
adc r2, r11, sb
stmia lr, {r1, r2}
mov r1, #3
@@ -4222,11 +4222,11 @@ _02171058:
ldrsh ip, [r4, r1]
mov r1, #0
add r2, r4, r2, lsl #1
umull sl, lr, ip, sb
umull r10, lr, ip, sb
mla lr, ip, r1, lr
mov r3, ip, asr #0x1f
mla lr, r3, sb, lr
adds r3, sl, #0x800
adds r3, r10, #0x800
adc r1, lr, #0
mov r3, r3, lsr #0xc
orr r3, r3, r1, lsl #20
@@ -4237,9 +4237,9 @@ _02171058:
mov r3, #0
umull r2, r1, ip, sb
mla r1, ip, r3, r1
mov sl, ip, asr #0x1f
mov r10, ip, asr #0x1f
adds r3, r2, #0x800
mla r1, sl, sb, r1
mla r1, r10, sb, r1
adc r1, r1, #0
mov r2, r3, lsr #0xc
orr r2, r2, r1, lsl #20
@@ -4254,14 +4254,14 @@ _02171058:
_021710ec:
add sp, sp, #0x94
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021710f8:
add r5, r5, #1
cmp r5, #3
blt _02170fd8
add sp, sp, #0x94
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02171110:
add r0, sp, #0x24
bl func_ov00_020c1500
@@ -4353,11 +4353,11 @@ _02171200:
adds r11, r2, #0x800
ldr r2, [sp, #0x10]
rsb r4, r3, #0
add sl, r7, r2
add r10, r7, r2
ldr r2, [r8, #0x50]
adc r7, r5, #0
str sl, [sp, #0x1c]
smull r5, sl, r0, r6
str r10, [sp, #0x1c]
smull r5, r10, r0, r6
mov r0, r11, lsr #0xc
orr r0, r0, r7, lsl #20
ldr sb, [sp, #0xc]
@@ -4365,7 +4365,7 @@ _02171200:
add r1, r1, r0
smull r7, r6, sb, r6
smull r5, r4, sb, r4
adc r0, sl, #0
adc r0, r10, #0
mov sb, r11, lsr #0xc
orr sb, sb, r0, lsl #20
adds r7, r7, #0x800
@@ -4393,7 +4393,7 @@ _02171200:
cmp r0, #0
addlt sp, sp, #0x94
movlt r0, #0
ldmltia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _02171350 ; =data_027e0fe4
add r1, r8, #0x2dc
ldr r0, [r0]
@@ -4406,7 +4406,7 @@ _02171200:
str r1, [r0, #0x68]
mov r0, #1
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov25_02170e64
_02171330: .word data_ov25_02179340
@@ -5801,7 +5801,7 @@ func_ov25_021724f8: ; 0x021724f8
.global func_ov25_021724fc
arm_func_start func_ov25_021724fc
func_ov25_021724fc: ; 0x021724fc
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x48
mov r4, r0
add r0, r4, #0x48
@@ -5841,14 +5841,14 @@ func_ov25_021724fc: ; 0x021724fc
ldr r8, [sp, #0xc]
str r0, [sp, #0x14]
rsb r0, r2, #0
smull r2, sl, r8, r2
smull r2, r10, r8, r2
adds r2, r2, #0x800
adc sl, sl, #0
adc r10, r10, #0
mov r2, r2, lsr #0xc
orr r2, r2, sl, lsl #20
orr r2, r2, r10, lsl #20
add r7, r7, r2
smull sl, r2, r8, r6
adds r8, sl, #0x800
smull r10, r2, r8, r6
adds r8, r10, #0x800
ldr r1, [sp, #4]
adc r2, r2, #0
mov r8, r8, lsr #0xc
@@ -5881,7 +5881,7 @@ func_ov25_021724fc: ; 0x021724fc
cmp r0, #0
addlt sp, sp, #0x48
movlt r0, r5
ldmltia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
add r0, r4, #0x100
ldrsh r2, [r0, #0x70]
mov r1, r5
@@ -5897,7 +5897,7 @@ func_ov25_021724fc: ; 0x021724fc
cmp r0, #0
addlt sp, sp, #0x48
movlt r0, r5
ldmltia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
add r0, r4, #0x100
ldrsh r2, [r0, #0x70]
mov r1, r5
@@ -5914,7 +5914,7 @@ func_ov25_021724fc: ; 0x021724fc
movge r0, #1
movlt r0, r5
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov25_021724fc
_021726c4: .word data_ov25_02179524
@@ -6948,7 +6948,7 @@ _02173458: .word data_027e0ff0
.global func_ov25_0217345c
arm_func_start func_ov25_0217345c
func_ov25_0217345c: ; 0x0217345c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xd4
ldr r7, _02173580 ; =_ZTV11FilterActor
mov r4, #0
@@ -6957,7 +6957,7 @@ func_ov25_0217345c: ; 0x0217345c
ldr r6, _02173584 ; =0x53504452
add r8, sp, #0xc
mov r2, #0x10
mov sl, r0
mov r10, r0
mov sb, r1
str r7, [sp, #0x8c]
str r6, [sp, #0x90]
@@ -6986,14 +6986,14 @@ _021734c4:
add r2, sp, #0
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
mvn r0, #0
str r0, [sl]
str r0, [sl, #4]
str r0, [r10]
str r0, [r10, #4]
ldr r0, [sp, #8]
mov r5, #0x3000
cmp r0, #0
mov r6, #0
addle sp, sp, #0xd4
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r11, _02173588 ; =data_027e0fe4
mov r8, r6
_02173518:
@@ -7013,9 +7013,9 @@ _02173518:
ble _02173564
ldr r1, [r7]
mov r5, r0
str r1, [sl]
str r1, [r10]
ldr r0, [r7, #4]
str r0, [sl, #4]
str r0, [r10, #4]
_02173564:
ldr r0, [sp, #8]
add r6, r6, #1
@@ -7023,7 +7023,7 @@ _02173564:
add r8, r8, #8
blt _02173518
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov25_0217345c
_02173580: .word _ZTV11FilterActor
@@ -9412,7 +9412,7 @@ func_ov25_02175598: ; 0x02175598
.global func_ov25_02175638
arm_func_start func_ov25_02175638
func_ov25_02175638: ; 0x02175638
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x38
mov r4, r0
ldr r0, [r4]
@@ -9423,7 +9423,7 @@ func_ov25_02175638: ; 0x02175638
cmp r0, r1
addeq sp, sp, #0x38
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
add r1, sp, #0x2c
add r0, r4, #0xb0
bl func_ov00_020c53e8
@@ -9444,7 +9444,7 @@ func_ov25_02175638: ; 0x02175638
cmp r6, r1
addeq sp, sp, #0x38
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldrh r1, [sp, #0x28]
ldr r6, [r4, #0xc]
ldrh r0, [sp, #0x2a]
@@ -9459,7 +9459,7 @@ func_ov25_02175638: ; 0x02175638
add sp, sp, #0x38
str r1, [r4]
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_021756f8:
mov r0, #0
strh r0, [sp, #0x24]
@@ -9501,7 +9501,7 @@ _02175744:
strh r2, [sp, #0x1e]
addeq sp, sp, #0x38
moveq r0, #1
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov r8, #1
mov r7, #0
add r6, sp, #0x20
@@ -9529,11 +9529,11 @@ _021757ac:
strh r1, [sp, #0x20]
strh r0, [sp, #0x22]
_021757fc:
ldrh sl, [sp, #0x28]
ldrh r10, [sp, #0x28]
ldrh r3, [sp, #0x20]
ldrh sb, [sp, #0x2a]
ldrh r2, [sp, #0x22]
strh sl, [sp]
strh r10, [sp]
strh r3, [sp, #4]
ldrsh r1, [sp, #4]
ldrsh r0, [sp]
@@ -9542,7 +9542,7 @@ _021757fc:
cmp r1, r0
ldreqsh r1, [sp, #6]
ldreqsh r0, [sp, #2]
strh sl, [sp, #0x10]
strh r10, [sp, #0x10]
strh sb, [sp, #0x12]
strh r3, [sp, #0x14]
strh r2, [sp, #0x16]
@@ -9564,7 +9564,7 @@ _021757fc:
_0217587c:
add sp, sp, #0x38
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_02175888:
mov r0, r6
mov r1, r5
@@ -9593,7 +9593,7 @@ _021758d0:
cmp r0, r1
addeq sp, sp, #0x38
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldrh r1, [sp, #0x28]
ldr r5, [r4, #0xc]
ldrh r0, [sp, #0x2a]
@@ -9608,33 +9608,33 @@ _021758d0:
add sp, sp, #0x38
str r1, [r4]
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_02175930:
add r8, r8, #1
_02175934:
ldr sl, [r4]
ldr r10, [r4]
ldr sb, [r4, #4]
cmp sb, sl
suble r0, sl, sb
cmp sb, r10
suble r0, r10, sb
ble _02175954
ldr r0, [r4, #8]
add r0, sl, r0
add r0, r10, r0
sub r0, r0, sb
_02175954:
cmp r8, r0
blt _021757ac
ldr r1, [r4, #8]
add r0, sl, #1
add r0, r10, #1
bl func_02002c14
cmp sb, r1
addeq sp, sp, #0x38
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldrh r1, [sp, #0x28]
ldr r5, [r4, #0xc]
ldrh r0, [sp, #0x2a]
mov r3, sl, lsl #0x2
add r2, r5, sl, lsl #2
mov r3, r10, lsl #0x2
add r2, r5, r10, lsl #2
strh r1, [r5, r3]
strh r0, [r2, #2]
ldr r0, [r4]
@@ -9644,11 +9644,11 @@ _02175954:
add sp, sp, #0x38
str r1, [r4]
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_021759b4:
mov r0, #0
add sp, sp, #0x38
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
arm_func_end func_ov25_02175638
.global func_ov25_021759c0
@@ -9859,7 +9859,7 @@ _02175c50: .word 0x43425330
.global func_ov25_02175c54
arm_func_start func_ov25_02175c54
func_ov25_02175c54: ; 0x02175c54
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x28
mov r11, r0
add r0, r11, #0x100
@@ -9879,8 +9879,8 @@ func_ov25_02175c54: ; 0x02175c54
sub r8, r1, r7
mov r6, #0
addle sp, sp, #0x28
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
mov sl, r11
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r10, r11
add sb, r11, #0x17c
_02175cb0:
mov r0, r11
@@ -9900,15 +9900,15 @@ _02175cb0:
add r1, r5, r5, lsr #31
add r0, r7, r0
add r0, r0, r1, asr #1
str r0, [sl, #0x17c]
str r0, [r10, #0x17c]
ldrsh r0, [r4, #0x78]
add r6, r6, #1
add sb, sb, #0xc
cmp r6, r0
add sl, sl, #0xc
add r10, r10, #0xc
blt _02175cb0
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov25_02175c54
_02175d18: .word data_027e0e60
@@ -10029,13 +10029,13 @@ _02175e80: .word data_027e0764
.global func_ov25_02175e84
arm_func_start func_ov25_02175e84
func_ov25_02175e84: ; 0x02175e84
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x20
mov sl, r0
mov r10, r0
add r0, sp, #0x10
mov r1, #4
bl func_ov00_020c5a5c
add r0, sl, #0x100
add r0, r10, #0x100
ldrsh r0, [r0, #0x78]
mov r2, #0
cmp r0, #4
@@ -10063,7 +10063,7 @@ _02175ee4:
mov r7, #0
ldr r11, _02175fa8 ; =data_027e0fe4
mov sb, r7
add r5, sl, #0x158
add r5, r10, #0x158
add r4, sp, #0
add r6, sp, #0x10
_02175f0c:
@@ -10087,12 +10087,12 @@ _02175f40:
cmp r3, #4
blt _02175f40
_02175f54:
add r2, sl, #0x100
add r2, r10, #0x100
ldrsh r0, [r2, #0x78]
mov r6, #0
cmp r0, #0
addle sp, sp, #0x20
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r5, sp, #0x10
mvn r1, #0
_02175f74:
@@ -10101,7 +10101,7 @@ _02175f74:
beq _02175f90
mov r0, r6, lsl #0x10
mov r3, r0, asr #0x10
add r0, sl, r4, lsl #2
add r0, r10, r4, lsl #2
str r3, [r0, #0x1bc]
_02175f90:
ldrsh r0, [r2, #0x78]
@@ -10109,7 +10109,7 @@ _02175f90:
cmp r6, r0
blt _02175f74
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov25_02175e84
_02175fa8: .word data_027e0fe4
+112 -112
View File
@@ -1019,7 +1019,7 @@ _0216e118: .word data_027e0f6c
.global func_ov26_0216e11c
arm_func_start func_ov26_0216e11c
func_ov26_0216e11c: ; 0x0216e11c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x6c
mov sb, r0
mov r0, #0x800
@@ -1045,7 +1045,7 @@ func_ov26_0216e11c: ; 0x0216e11c
add r0, r7, #5
cmp r7, r0
bge _0216e1e4
ldr sl, _0216e320 ; =data_027e0e60
ldr r10, _0216e320 ; =data_027e0e60
add r5, sp, #4
mov r4, #1
_0216e190:
@@ -1055,7 +1055,7 @@ _0216e190:
bge _0216e1d0
and r6, r7, #0xff
_0216e1a4:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
strb r6, [sp, #4]
@@ -1145,14 +1145,14 @@ _0216e1e4:
mov r2, r1
blx r3
add sp, sp, #0x6c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_0216e308:
ldr r3, [r3, #0x80]
mov r1, #0
mov r2, #1
blx r3
add sp, sp, #0x6c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov26_0216e11c
_0216e320: .word data_027e0e60
@@ -2233,10 +2233,10 @@ _0216efb0: .word data_ov00_020eec9c
.global func_ov26_0216efb4
arm_func_start func_ov26_0216efb4
func_ov26_0216efb4: ; 0x0216efb4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r2
mov sl, r0
mov r10, r0
mov r5, r1
add r2, sp, #0x20
add r3, sp, #0x1c
@@ -2262,19 +2262,19 @@ func_ov26_0216efb4: ; 0x0216efb4
add r0, r0, #3
strb r0, [sp, #0x2c]
_0216f024:
ldrb r0, [sl, #0xbe]
ldrb r0, [r10, #0xbe]
mov r1, #0x3c
cmp r0, #0
moveq r0, #1
streqb r0, [sp, #0x2e]
ldr r0, [sl, #0xb8]
ldr r0, [r10, #0xb8]
add r0, r0, #0x3b
bl func_01ff9b4c
mov r4, r0
mov r0, sl
mov r0, r10
bl func_ov26_0216f334
movs r5, r0
ldrneb r0, [sl, #0xc2]
ldrneb r0, [r10, #0xc2]
mov r6, #1
cmpne r0, #2
beq _0216f0d4
@@ -2283,11 +2283,11 @@ _0216f024:
bl func_ov00_02084a50
cmp r0, #0
bne _0216f0d4
ldr r0, [sl, #0xb8]
ldr r0, [r10, #0xb8]
mov r7, r6
cmp r0, #0
beq _0216f0cc
ldrb r0, [sl, #0xb1]
ldrb r0, [r10, #0xb1]
mov r1, #0x3c
add r0, r0, #0x3b
bl func_01ff9b88
@@ -2310,7 +2310,7 @@ _0216f0cc:
_0216f0d4:
cmp r6, #0
addeq sp, sp, #0x44
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, r4
mov r1, #0x3c
bl func_01ff9b4c
@@ -2322,7 +2322,7 @@ _0216f0d4:
str r8, [sp]
add r2, sp, #0x24
str r2, [sp, #4]
mov r0, sl
mov r0, r10
mov r1, #0xc5
mov r2, #0
mov r3, sb
@@ -2380,7 +2380,7 @@ _0216f0d4:
str r4, [sp, #0x18]
bl func_02034bc8
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_0216efb4
_0216f1f8: .word data_027e0c38
@@ -3740,7 +3740,7 @@ _0217031c: .word data_027e0764
.global func_ov26_02170320
arm_func_start func_ov26_02170320
func_ov26_02170320: ; 0x02170320
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
mov r4, r0
add r6, r4, #0x400
@@ -3772,7 +3772,7 @@ func_ov26_02170320: ; 0x02170320
str r1, [sp]
umull r7, r5, r1, r11
adds r1, r2, #0x800
mov sl, r1, lsr #0xc
mov r10, r1, lsr #0xc
ldmia r0, {r0, r1, r2}
stmia ip, {r0, r1, r2}
mov r1, #0
@@ -3780,10 +3780,10 @@ func_ov26_02170320: ; 0x02170320
mov r2, r8, asr #0x1f
mla sb, r2, r11, sb
adc r1, sb, #0
orr sl, sl, r1, lsl #20
orr r10, r10, r1, lsl #20
ldr r0, [sp, #8]
ldr r2, [sp]
add ip, r0, sl
add ip, r0, r10
adds r0, r7, #0x800
mov r7, #0
mla r5, r2, r7, r5
@@ -3793,9 +3793,9 @@ func_ov26_02170320: ; 0x02170320
adc r2, r5, #0
ldr r1, [sp, #0x10]
orr r0, r0, r2, lsl #20
add sl, r1, r0
add r10, r1, r0
str ip, [sp, #8]
str sl, [sp, #0x10]
str r10, [sp, #0x10]
ldrsh r1, [r4, #0x78]
add r0, sp, #8
ldr r7, [sp, #0xc]
@@ -3834,7 +3834,7 @@ func_ov26_02170320: ; 0x02170320
mov r5, r5, lsr #0xc
adc r8, r8, #0
orr r5, r5, r8, lsl #20
add r5, sl, r5
add r5, r10, r5
str r5, [sp, #0x10]
ldrh r5, [r6, #0xe8]
mov r5, r5, asr #0x4
@@ -3875,12 +3875,12 @@ func_ov26_02170320: ; 0x02170320
bl func_ov00_02084164
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r0, r4, #0x48
bl func_ov00_020c5288
cmp r0, #0
addne sp, sp, #0x14
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [r4, #0x48]
str r0, [r4, #0x4d0]
ldr r0, [r4, #0x4c]
@@ -3888,7 +3888,7 @@ func_ov26_02170320: ; 0x02170320
ldr r0, [r4, #0x50]
str r0, [r4, #0x4d8]
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02170320
_02170574: .word 0x0000071c
@@ -10854,22 +10854,22 @@ _02175b7c:
.global func_ov26_02175bb4
arm_func_start func_ov26_02175bb4
func_ov26_02175bb4: ; 0x02175bb4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r3, _02175e78 ; =0x04000444
mov r1, #0
ldr r0, _02175e7c ; =0x21230000
str r1, [r3]
str r0, [r3, #0x64]
add r0, sl, #0x1700
add r0, r10, #0x1700
ldrh r2, [r0, #0x82]
ldr r0, _02175e80 ; =0x42108000
add r1, sl, #0x1000
add r1, r10, #0x1000
orr r2, r2, #0x108000
orr r2, r2, #0x42000000
str r2, [r3, #0x7c]
@@ -10883,13 +10883,13 @@ func_ov26_02175bb4: ; 0x02175bb4
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 sb, [r10, #8]
sub r0, r0, #1
cmp sb, r0
bhs _02175e64
mov r0, #0x14
mla r7, sb, r0, sl
mla r7, sb, r0, r10
ldr r0, _02175e84 ; =data_ov03_02100648
ldr r8, [r0]
_02175c4c:
@@ -10897,7 +10897,7 @@ _02175c4c:
mov r1, #3
str r1, [r0]
sub r5, r0, #0x74
add r4, sl, #0x1000
add r4, r10, #0x1000
add r6, sp, #0xc
add r11, sp, #0
_02175c68:
@@ -11015,7 +11015,7 @@ _02175d78:
str r0, [r5]
mov r0, r1, lsr #0x10
str r0, [r5]
ldr r0, [sl, #4]
ldr r0, [r10, #4]
add sb, sb, #1
cmp sb, r0
add r7, r7, #0x14
@@ -11029,7 +11029,7 @@ _02175e48:
ldr r0, _02175e8c ; =0x04000504
mov r1, #0
str r1, [r0]
ldr r0, [sl, #4]
ldr r0, [r10, #4]
sub r0, r0, #1
cmp sb, r0
blo _02175c4c
@@ -11038,7 +11038,7 @@ _02175e64:
mov r1, #1
str r1, [r0]
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02175bb4
_02175e78: .word 0x04000444
@@ -11551,7 +11551,7 @@ func_ov26_02176330: ; 0x02176330
.global func_ov26_02176354
arm_func_start func_ov26_02176354
func_ov26_02176354: ; 0x02176354
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov r7, r1
ldr r1, [r7, #0xc]
ldr r2, [r7, #8]
@@ -11563,18 +11563,18 @@ func_ov26_02176354: ; 0x02176354
mov r6, #0
bge _021763bc
_02176380:
ldr sl, [r7]
cmp sl, sb
ldr r10, [r7]
cmp r10, sb
bge _021763b0
_0217638c:
mov r0, r8
mov r1, sl
mov r1, r10
mov r2, r5
bl func_ov00_02079ab4
cmp r0, #0
add sl, sl, #1
add r10, r10, #1
addne r6, r6, #1
cmp sl, sb
cmp r10, sb
blt _0217638c
_021763b0:
add r5, r5, #1
@@ -11586,7 +11586,7 @@ _021763bc:
mov r0, r6, lsl #0xc
mul r1, r2, r1
bl func_01ff9b4c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
arm_func_end func_ov26_02176354
.global func_ov26_021763d4
@@ -11957,15 +11957,15 @@ func_ov26_021767ec: ; 0x021767ec
.global func_ov26_02176814
arm_func_start func_ov26_02176814
func_ov26_02176814: ; 0x02176814
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #8
ldr r2, _021768ac ; =data_ov26_02179554
mov r8, #0
mov sl, r0
mov r10, r0
ldrb r0, [r2, r1]
mov r2, #1
strb r2, [sl, #0x1a1]
strb r1, [sl, #0x1a0]
strb r2, [r10, #0x1a1]
strb r1, [r10, #0x1a0]
add sb, r0, #2
mov r7, r8
mov r6, #0xa
@@ -11975,27 +11975,27 @@ func_ov26_02176814: ; 0x02176814
_02176850:
sub r2, sb, r8
str r7, [sp]
mov r0, sl
mov r0, r10
mov r1, r6
mov r3, r7
and r2, r2, #0xff
str r7, [sp, #4]
bl func_020350b4
mov r0, sl
mov r0, r10
mov r1, r5
str r11, [sp]
mov r2, r11
mov r3, r11
bl func_020351b8
mov r0, sl
str r4, [sl, #0x64]
mov r0, r10
str r4, [r10, #0x64]
bl func_020352d8
add r8, r8, #1
cmp r8, #3
add sl, sl, #0x88
add r10, r10, #0x88
blt _02176850
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02176814
_021768ac: .word data_ov26_02179554
@@ -12049,22 +12049,22 @@ _02176930:
.global func_ov26_02176948
arm_func_start func_ov26_02176948
func_ov26_02176948: ; 0x02176948
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #8
mov sl, r0
ldrb r0, [sl, #0x1a1]
mov r10, r0
ldrb r0, [r10, #0x1a1]
cmp r0, #0
addeq sp, sp, #8
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r7, _021769e0 ; =data_ov26_02179558
ldr r4, _021769e4 ; =data_027e0d3c
mov sb, sl
mov sb, r10
mov r8, #0
mov r11, #0xde
add r6, sp, #4
add r5, sp, #0
_02176980:
ldrb r1, [sl, #0x1a0]
ldrb r1, [r10, #0x1a0]
mov r0, r11
mov r2, r6
add r1, r1, r1, lsl #1
@@ -12087,7 +12087,7 @@ _02176980:
cmp r8, #3
blt _02176980
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_02176948
_021769e0: .word data_ov26_02179558
@@ -13027,9 +13027,9 @@ _021775c4: .word func_ov26_02177584 + 1
.global func_ov26_021775c8
arm_func_start func_ov26_021775c8
func_ov26_021775c8: ; 0x021775c8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
mov sl, r0
mov r10, r0
mov r3, #0x80000
mov r2, #0xc0000
mov r1, #0
@@ -13046,7 +13046,7 @@ func_ov26_021775c8: ; 0x021775c8
mov r7, #1
mov r1, #9
_02177610:
add r0, sl, r1, lsl #1
add r0, r10, r1, lsl #1
add r0, r0, #0x200
ldrsb r0, [r0, #0x35]
cmp r0, #0
@@ -13058,8 +13058,8 @@ _02177610:
_02177634:
mov r8, #0
ldr r4, _02177798 ; =data_027e0764
add sb, sl, #4
add r5, sl, #0x234
add sb, r10, #4
add r5, r10, #0x234
mov r11, r8
mov r6, r8
_0217764c:
@@ -13108,11 +13108,11 @@ _021776e0:
add sb, sb, #0x1c
blt _0217764c
_021776f0:
add r6, sl, #4
add r6, r10, #4
mov r5, #0
add r4, sp, #0
_021776fc:
ldrb r2, [sl]
ldrb r2, [r10]
mov r0, r6
mov r1, r4
bl func_ov26_0217710c
@@ -13120,10 +13120,10 @@ _021776fc:
cmp r5, #0x14
add r6, r6, #0x1c
blt _021776fc
ldrb r0, [sl]
ldrb r0, [r10]
cmp r0, #0
addne sp, sp, #0xc
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, #0
mov r3, r0
mov r1, r0
@@ -13131,7 +13131,7 @@ _021776fc:
_0217773c:
cmp r0, #0
bne _02177758
add r0, sl, r3, lsl #1
add r0, r10, r3, lsl #1
add r0, r0, #0x200
ldrsb r0, [r0, #0x35]
cmp r0, #0
@@ -13150,9 +13150,9 @@ _02177764:
_02177778:
cmp r0, #0
moveq r0, #1
streqb r0, [sl]
streqb r0, [r10]
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_021775c8
_0217778c: .word data_ov00_020eec60
@@ -13671,7 +13671,7 @@ func_ov26_02177ddc: ; 0x02177ddc
.global func_ov26_02177e14
arm_func_start func_ov26_02177e14
func_ov26_02177e14: ; 0x02177e14
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #8
mov r7, r0
mov r5, #0
@@ -13708,12 +13708,12 @@ _02177e90:
ldrb r3, [r4, r5, lsl #1]
ldrb r1, [sp, #4]
ldrb r0, [sp, #5]
add sl, r3, r1
add r10, r3, r1
add r3, r2, r0
ldr r0, [r6]
mov r1, sb
mov r2, r8
strb sl, [sp, #2]
strb r10, [sp, #2]
strb r3, [sp, #3]
bl func_ov00_020826a0
add r5, r5, #1
@@ -13724,7 +13724,7 @@ _02177e90:
strb r0, [sp]
strb r0, [sp, #1]
mov r6, #6
add sl, sp, #0
add r10, sp, #0
mov sb, #1
mov r4, #3
_02177ef0:
@@ -13735,7 +13735,7 @@ _02177ef4:
ldr r0, [r8]
add ip, r2, r5
add r3, r1, r6
mov r1, sl
mov r1, r10
mov r2, sb
strb ip, [sp]
strb r3, [sp, #1]
@@ -13756,7 +13756,7 @@ _02177ef4:
str r2, [r7, #0x50]
str r1, [r7, #0x4c]
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov26_02177e14
_02177f60: .word data_027e0e60
@@ -14303,34 +14303,34 @@ func_ov26_02178534: ; 0x02178534
.global func_ov26_0217855c
arm_func_start func_ov26_0217855c
func_ov26_0217855c: ; 0x0217855c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x20
mov sl, r0
ldrb r2, [sl, #0x15]
mov r10, r0
ldrb r2, [r10, #0x15]
ldr r0, _021786d4 ; =data_027e0e60
ldrb r1, [sl, #0x14]
ldrb r1, [r10, #0x14]
ldr r0, [r0]
sub r2, r2, #1
bl func_ov00_02083e34
str r0, [sl, #0x1c]
ldr r1, [sl, #0x18]
str r0, [r10, #0x1c]
ldr r1, [r10, #0x18]
ldr r0, _021786d4 ; =data_027e0e60
add r1, r1, #0x800
str r1, [sl, #0x18]
str r1, [sl, #0x50]
ldr r2, [sl, #0x1c]
str r1, [r10, #0x18]
str r1, [r10, #0x50]
ldr r2, [r10, #0x1c]
add r1, sp, #6
str r2, [sl, #0x54]
ldr r2, [sl, #0x20]
str r2, [sl, #0x58]
ldr r2, [sl, #0x50]
str r2, [sl, #0x5c]
ldr r2, [sl, #0x54]
str r2, [sl, #0x60]
ldr r2, [sl, #0x58]
str r2, [sl, #0x64]
ldrb r3, [sl, #0x15]
ldrb r2, [sl, #0x14]
str r2, [r10, #0x54]
ldr r2, [r10, #0x20]
str r2, [r10, #0x58]
ldr r2, [r10, #0x50]
str r2, [r10, #0x5c]
ldr r2, [r10, #0x54]
str r2, [r10, #0x60]
ldr r2, [r10, #0x58]
str r2, [r10, #0x64]
ldrb r3, [r10, #0x15]
ldrb r2, [r10, #0x14]
ldr r0, [r0]
strb r2, [sp, #6]
strb r3, [sp, #7]
@@ -14350,14 +14350,14 @@ _02178604:
bne _02178618
_0217860c:
mov r0, #1
strb r0, [sl, #0x38]
strb r0, [r10, #0x38]
b _02178620
_02178618:
mov r0, #0
strb r0, [sl, #0x38]
strb r0, [r10, #0x38]
_02178620:
ldrb r11, [sl, #0x14]
ldrb r1, [sl, #0x15]
ldrb r11, [r10, #0x14]
ldrb r1, [r10, #0x15]
add r0, r11, #2
str r0, [sp]
cmp r11, r0
@@ -14367,7 +14367,7 @@ _02178620:
add r6, sp, #4
mov r5, #1
_02178648:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
cmp r8, sb
bge _0217867c
and r7, r11, #0xff
@@ -14387,7 +14387,7 @@ _0217867c:
cmp r11, r0
blt _02178648
_0217868c:
add r0, sl, #0x18
add r0, r10, #0x18
mov r5, #0x800
mov r4, #0
mov r3, #0x5800
@@ -14398,13 +14398,13 @@ _0217868c:
str r3, [sp, #0x1c]
bl func_01ff9bc4
mov r0, r4
str r0, [sl, #0x78]
str r0, [sl, #0x7c]
str r0, [sl, #0x80]
str r0, [r10, #0x78]
str r0, [r10, #0x7c]
str r0, [r10, #0x80]
mov r0, #0xc000
str r0, [sl, #0x84]
str r0, [r10, #0x84]
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov26_0217855c
_021786d4: .word data_027e0e60
+184 -184
View File
File diff suppressed because it is too large Load Diff
+28 -28
View File
@@ -5435,7 +5435,7 @@ _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, sb, r10, lr}
sub sp, sp, #0x70
mov sb, r0
ldr r1, [sb, #0x18]
@@ -5545,7 +5545,7 @@ func_ov28_02171d10: ; 0x02171d10
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:
@@ -5555,7 +5555,7 @@ _02171ed4:
bge _02171f14
and r6, r7, #0xff
_02171ee8:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
strb r6, [sp, #4]
@@ -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, sb, 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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov28_02171d10
_02171f70: .word data_027e0f6c
@@ -5854,7 +5854,7 @@ 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, sb, r10, lr}
sub sp, sp, #0x54
mov sb, r0
ldr r1, [sb, #0x18]
@@ -5927,7 +5927,7 @@ func_ov28_02172280: ; 0x02172280
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:
@@ -5937,7 +5937,7 @@ _021723b0:
bge _021723f0
and r6, r7, #0xff
_021723c4:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
mov r2, r4
strb r6, [sp, #4]
@@ -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, sb, 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, sb, 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, sb, r10, lr}
ldr r3, _021728fc ; =gItemManager
mov sb, 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
add r3, r10, #0x1f8
mov r0, r10
mov r1, sb
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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov28_0217280c
_021728fc: .word gItemManager
+118 -118
View File
@@ -280,7 +280,7 @@ _0216d9ac: .word func_02017d30
.global func_ov29_0216d9b0
arm_func_start func_ov29_0216d9b0
func_ov29_0216d9b0: ; 0x0216d9b0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r3, [r1, #0x2c]
ldr r4, [r1, #0x38]
mov r3, r3, lsl #0x10
@@ -342,19 +342,19 @@ _0216da94:
add r2, r2, #1
add r4, r4, #2
mov r0, r3, asr #0x5
mov sl, r3, asr #0xa
mov r10, r3, asr #0xa
and r3, r3, #0x1f
and r0, r0, #0x1f
and sl, sl, #0x1f
and r10, r10, #0x1f
add r0, r3, r0
add sl, sl, r0
mul r0, sl, r7
add r10, r10, r0
mul r0, r10, r7
add r0, r0, #0x3000
mov r3, r0, asr #0xc
mul r0, sl, r8
mul r0, r10, r8
add r0, r0, #0x3000
mov ip, r0, asr #0xc
mul r0, sl, lr
mul r0, r10, lr
add r0, r0, #0x3000
cmp r3, #0x1f
movgt r3, r1
@@ -372,7 +372,7 @@ _0216db0c:
ldr r0, [sb, #4]
ldr r1, [sb, #0xc]
bl func_0200e2a4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_0216d9b0
_0216db1c: .word 0x00000554
@@ -1764,7 +1764,7 @@ _0216ed7c: .word 0x000004cd
.global func_ov29_0216ed80
arm_func_start func_ov29_0216ed80
func_ov29_0216ed80: ; 0x0216ed80
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x38
ldr r6, _0216f124 ; =data_027e0764
mov r7, #0
@@ -1777,24 +1777,24 @@ func_ov29_0216ed80: ; 0x0216ed80
mla r8, r4, r3, r8
adds sb, r2, r5
ldr r5, [r6, #0x14]
umull r3, sl, r11, sb
umull r3, r10, r11, sb
adc r8, r5, r8
mla sl, r11, r8, sl
mla r10, r11, r8, r10
mov r1, #0xb5
adds r2, r2, r3
umull r11, r3, r8, r1
mla sl, r4, sb, sl
mla r10, r4, sb, r10
str sb, [r6]
stmia r6, {r2, r8}
adc sl, r5, sl
umull r4, r5, sl, r1
adc r10, r5, r10
umull r4, r5, r10, r1
mla r3, r8, r7, r3
mov r2, r7
mla r3, r2, r1, r3
mla r5, sl, r7, r5
mla r5, r10, r7, r5
mla r5, r2, r1, r5
sub r3, r3, #0x5a
str sl, [r6, #4]
str r10, [r6, #4]
add r1, r3, #0x96
str r1, [r0, #0x4e4]
ldr r1, _0216f128 ; =data_027e0d38
@@ -1803,7 +1803,7 @@ func_ov29_0216ed80: ; 0x0216ed80
ldr r1, [r1, #0x14]
cmp r1, #1
addeq sp, sp, #0x38
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, _0216f12c ; =data_ov29_021798e8
ldr r8, [r0, #0x50]
ldr r2, [r1]
@@ -1817,15 +1817,15 @@ func_ov29_0216ed80: ; 0x0216ed80
ble _0216ee98
ldr r11, [r6]
ldmib r6, {r7, r8}
umull sl, sb, r8, r11
umull r10, sb, r8, r11
mla sb, r8, r7, sb
ldr r7, [r6, #0x10]
ldr r8, [r6, #0x14]
adds sl, r7, sl
adds r10, r7, r10
ldr r7, [r6, #0xc]
mla sb, r7, r11, sb
adc r7, r8, sb
str sl, [r6]
str r10, [r6]
str r7, [r6, #4]
cmp lr, #0
beq _0216ee98
@@ -1849,12 +1849,12 @@ _0216ee98:
ble _0216ef18
ldr r8, _0216f124 ; =data_027e0764
ldr sb, [r8]
ldmib r8, {r4, sl}
umull r2, r1, sl, sb
mla r1, sl, r4, r1
ldr sl, [r8, #0xc]
ldmib r8, {r4, r10}
umull r2, r1, r10, sb
mla r1, r10, r4, r1
ldr r10, [r8, #0xc]
ldr r4, [r8, #0x10]
mla r1, sl, sb, r1
mla r1, r10, sb, r1
ldr sb, [r8, #0x14]
adds r2, r4, r2
adc r1, sb, r1
@@ -1920,13 +1920,13 @@ _0216efa0:
ldr r6, _0216f124 ; =data_027e0764
ldr r7, [r6]
ldmib r6, {r5, r8}
umull sl, sb, r8, r7
umull r10, sb, r8, r7
mla sb, r8, r5, sb
ldr r5, [r6, #0xc]
ldr r8, [r6, #0x10]
mla sb, r5, r7, sb
ldr r5, [r6, #0x14]
adds r7, r8, sl
adds r7, r8, r10
adc r5, r5, sb
str r7, [r6]
str r5, [r6, #4]
@@ -1977,7 +1977,7 @@ _0216f074:
mov r3, #2
bl func_ov00_0207c1b0
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0216f0c4:
cmp ip, #0
strgt r2, [sp, #0x14]
@@ -2002,7 +2002,7 @@ _0216f0c4:
mov r3, #2
bl func_ov00_0207c1b0
add sp, sp, #0x38
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_0216ed80
_0216f124: .word data_027e0764
@@ -3127,7 +3127,7 @@ _0216ffe4: .word 0x474f3154
.global func_ov29_0216ffe8
arm_func_start func_ov29_0216ffe8
func_ov29_0216ffe8: ; 0x0216ffe8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xb8
ldr r0, _02170130 ; =data_027e0fec
ldr r0, [r0]
@@ -3156,7 +3156,7 @@ _02170040:
ldr r11, [r1, r0, lsl #2]
ldr r1, _0217013c ; =data_ov29_02179ad0
cmp r11, #0
ldr sl, [r1, r0, lsl #2]
ldr r10, [r1, r0, lsl #2]
ldr r1, _02170140 ; =data_ov29_02179ac8
ldr r0, [r1, r0, lsl #2]
str r0, [sp]
@@ -3191,13 +3191,13 @@ _02170070:
mov r1, r6
bl func_ov00_020a97e0
mov r0, r5
mov r1, sl
mov r1, r10
bl func_ov00_020a9960
mov r0, r5
bl func_ov00_020a9968
add r8, r8, #1
add sb, sb, #0x1000
add sl, sl, #0x58
add r10, r10, #0x58
cmp r8, r11
blt _02170070
_02170104:
@@ -3211,7 +3211,7 @@ _02170104:
add r0, sp, #0x5c
blx func_ov00_020a95a4
add sp, sp, #0xb8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_0216ffe8
_02170130: .word data_027e0fec
@@ -3395,7 +3395,7 @@ _02170368: .word data_ov29_021793a0
.global func_ov29_0217036c
arm_func_start func_ov29_0217036c
func_ov29_0217036c: ; 0x0217036c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov r3, #0
str r3, [r0, #0x130]
ldr r2, [r1]
@@ -3419,13 +3419,13 @@ func_ov29_0217036c: ; 0x0217036c
str r3, [r0, #0x24c]
ldr r2, [r6]
ldmib r6, {r1, r7}
umull sl, sb, r7, r2
umull r10, sb, r7, r2
mla sb, r7, r1, sb
ldr r1, [r6, #0xc]
ldr r7, [r6, #0x10]
mla sb, r1, r2, sb
ldr r1, [r6, #0x14]
adds r2, r7, sl
adds r2, r7, r10
adc sb, r1, sb
umull r7, r1, sb, ip
mla r1, sb, r3, r1
@@ -3454,7 +3454,7 @@ func_ov29_0217036c: ; 0x0217036c
ldr r1, [r5, #0x14]
str r2, [r0, #0x158]
str r1, [r0, #0x15c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov29_0217036c
_0217045c: .word data_027e0764
@@ -3738,7 +3738,7 @@ _0217084c: .word 0x00000433
.global func_ov29_02170850
arm_func_start func_ov29_02170850
func_ov29_02170850: ; 0x02170850
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r4, #2
str r4, [r0, #0x130]
add r8, r0, #0x200
@@ -3787,20 +3787,20 @@ func_ov29_02170850: ; 0x02170850
ldr r2, [r0, #0x50]
str r2, [r0, #0x23c]
str r3, [r0, #0x24c]
ldr sl, [r5]
ldr r10, [r5]
ldmib r5, {sb, r11}
umull r8, r2, r11, sl
umull r8, r2, r11, r10
mla r2, r11, sb, r2
ldr sb, [r5, #0xc]
ldr r11, [r5, #0x10]
mla r2, sb, sl, r2
mla r2, sb, r10, r2
ldr sb, [r5, #0x14]
adds r8, r11, r8
adc sl, sb, r2
umull sb, r2, sl, r1
mla r2, sl, r3, r2
adc r10, sb, r2
umull sb, r2, r10, r1
mla r2, r10, r3, r2
mla r2, r7, r1, r2
stmia r5, {r8, sl}
stmia r5, {r8, r10}
umull r5, r1, r2, ip
adds r5, r5, #0x800
mla r1, r2, r3, r1
@@ -3826,7 +3826,7 @@ func_ov29_02170850: ; 0x02170850
ldr r1, [r4, #0x24]
str r2, [r0, #0x158]
str r1, [r0, #0x15c]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_02170850
_021709b4: .word data_027e0764
@@ -7393,7 +7393,7 @@ _021739d0: .word data_ov29_02179db0
.global func_ov29_021739d4
arm_func_start func_ov29_021739d4
func_ov29_021739d4: ; 0x021739d4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x2c
mov r4, r0
ldr r0, [r4, #0x288]
@@ -7724,7 +7724,7 @@ _02173e68:
ldrsh r1, [r6, #2]
add r5, r5, r5, lsr #31
smull r7, sb, r0, r3
adds sl, r7, #0x800
adds r10, r7, #0x800
mov r5, r5, lsl #0xf
mov r5, r5, lsr #0x10
mov r5, r5, asr #0x4
@@ -7735,8 +7735,8 @@ _02173e68:
smull r11, r7, r1, r2
adc ip, sb, #0
adds r11, r11, #0x800
mov sb, sl, lsr #0xc
ldrsh sl, [r6, r5]
mov sb, r10, lsr #0xc
ldrsh r10, [r6, r5]
orr sb, sb, ip, lsl #20
ldrsh r8, [r6, r8]
adc r5, r7, #0
@@ -7744,7 +7744,7 @@ _02173e68:
orr r7, r7, r5, lsl #20
smull r6, r5, r7, r8
adds r6, r6, #0x800
smull lr, ip, sb, sl
smull lr, ip, sb, r10
smull r3, r11, r1, r3
smull r2, r1, r0, r2
adc r0, r5, #0
@@ -7764,14 +7764,14 @@ _02173e68:
adc r0, r1, #0
mov r1, r3, lsr #0xc
orr r1, r1, r0, lsl #20
smull r3, r0, r1, sl
smull r3, r0, r1, r10
adds r5, r3, #0x800
adc r3, r0, #0
mov r0, r5, lsr #0xc
orr r0, r0, r3, lsl #20
smull r6, r5, r1, r8
smull r3, r1, r7, sl
smull sl, r7, r2, sl
smull r3, r1, r7, r10
smull r10, r7, r2, r10
smull ip, r11, r2, r8
smull r8, r2, sb, r8
adds ip, ip, #0x800
@@ -7780,7 +7780,7 @@ _02173e68:
orr r11, r11, sb, lsl #20
add r0, r0, r11
str r0, [r4, #0x214]
adds sb, sl, #0x800
adds sb, r10, #0x800
adc r0, r7, #0
mov r7, sb, lsr #0xc
orr r7, r7, r0, lsl #20
@@ -7804,7 +7804,7 @@ _02173e68:
add r1, r4, #0x244
bl func_ov38_021854e4
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021739d4
_02173ffc: .word 0xfffff555
@@ -8015,7 +8015,7 @@ _021742dc: .word 0x00000e39
.global func_ov29_021742e0
arm_func_start func_ov29_021742e0
func_ov29_021742e0: ; 0x021742e0
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x24
mov r4, r0
ldr r0, [r4, #0x288]
@@ -8209,7 +8209,7 @@ _02174578:
ldrsh r1, [r6, #2]
add r5, r5, r5, lsr #31
smull r7, sb, r0, r3
adds sl, r7, #0x800
adds r10, r7, #0x800
mov r5, r5, lsl #0xf
mov r5, r5, lsr #0x10
mov r5, r5, asr #0x4
@@ -8220,8 +8220,8 @@ _02174578:
smull r11, r7, r1, r2
adc ip, sb, #0
adds r11, r11, #0x800
mov sb, sl, lsr #0xc
ldrsh sl, [r6, r5]
mov sb, r10, lsr #0xc
ldrsh r10, [r6, r5]
orr sb, sb, ip, lsl #20
ldrsh r8, [r6, r8]
adc r5, r7, #0
@@ -8229,7 +8229,7 @@ _02174578:
orr r7, r7, r5, lsl #20
smull r6, r5, r7, r8
adds r6, r6, #0x800
smull lr, ip, sb, sl
smull lr, ip, sb, r10
smull r3, r11, r1, r3
smull r2, r1, r0, r2
adc r0, r5, #0
@@ -8249,14 +8249,14 @@ _02174578:
adc r0, r1, #0
mov r1, r3, lsr #0xc
orr r1, r1, r0, lsl #20
smull r3, r0, r1, sl
smull r3, r0, r1, r10
adds r5, r3, #0x800
adc r3, r0, #0
mov r0, r5, lsr #0xc
orr r0, r0, r3, lsl #20
smull r6, r5, r1, r8
smull r3, r1, r7, sl
smull sl, r7, r2, sl
smull r3, r1, r7, r10
smull r10, r7, r2, r10
smull ip, r11, r2, r8
smull r8, r2, sb, r8
adds ip, ip, #0x800
@@ -8265,7 +8265,7 @@ _02174578:
orr r11, r11, sb, lsl #20
add r0, r0, r11
str r0, [sp, #0xc]
adds sb, sl, #0x800
adds sb, r10, #0x800
adc r0, r7, #0
mov r7, sb, lsr #0xc
orr r7, r7, r0, lsl #20
@@ -8295,7 +8295,7 @@ _02174578:
add r1, r4, #0x244
bl func_ov38_021854e4
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021742e0
_0217471c: .word 0x000038e4
@@ -8463,7 +8463,7 @@ _0217494c: .word data_02050f54
.global func_ov29_02174950
arm_func_start func_ov29_02174950
func_ov29_02174950: ; 0x02174950
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x10
mov r4, r0
add r0, r4, #0x244
@@ -8518,14 +8518,14 @@ func_ov29_02174950: ; 0x02174950
mov sb, sb, lsr #0xc
adds r7, r7, #0x800
orr sb, sb, r8, lsl #20
ldrsh sl, [r5, #2]
ldrsh r10, [r5, #2]
ldrsh r8, [r5]
smull r3, r11, r1, r3
adc r5, r6, #0
mov r7, r7, lsr #0xc
orr r7, r7, r5, lsl #20
smull r6, r5, r7, r8
smull lr, ip, sb, sl
smull lr, ip, sb, r10
smull r2, r1, r0, r2
adds r6, r6, #0x800
adc r0, r5, #0
@@ -8545,22 +8545,22 @@ func_ov29_02174950: ; 0x02174950
adc r0, r1, #0
mov r1, r3, lsr #0xc
orr r1, r1, r0, lsl #20
smull r3, r0, r1, sl
smull r3, r0, r1, r10
adds r5, r3, #0x800
adc r3, r0, #0
mov r0, r5, lsr #0xc
smull ip, r11, r2, r8
orr r0, r0, r3, lsl #20
smull r6, r5, r1, r8
smull r3, r1, r7, sl
smull sl, r7, r2, sl
smull r3, r1, r7, r10
smull r10, r7, r2, r10
adds ip, ip, #0x800
smull r8, r2, sb, r8
adc sb, r11, #0
mov r11, ip, lsr #0xc
orr r11, r11, sb, lsl #20
add r0, r0, r11
adds sb, sl, #0x800
adds sb, r10, #0x800
str r0, [sp, #4]
adc r0, r7, #0
mov r7, sb, lsr #0xc
@@ -8606,13 +8606,13 @@ _02174b2c:
adc r8, r8, #0
mov r11, sb, lsr #0xc
adds r7, r7, #0x800
ldrsh sl, [r5, #0x1c]
ldrsh r10, [r5, #0x1c]
ldrsh ip, [r5, #0x1e]
smull r3, lr, r1, r3
adc r5, r6, #0
mov sb, r7, lsr #0xc
orr sb, sb, r5, lsl #20
smull r5, r7, sb, sl
smull r5, r7, sb, r10
orr r11, r11, r8, lsl #20
adds r8, r5, #0x800
smull r2, r1, r0, r2
@@ -8639,11 +8639,11 @@ _02174b2c:
adc r3, r0, #0
mov r0, r5, lsr #0xc
orr r0, r0, r3, lsl #20
smull r6, r5, r1, sl
smull r6, r5, r1, r10
smull r3, r1, sb, ip
smull r8, r7, r2, ip
smull ip, sb, r2, sl
smull sl, r2, r11, sl
smull ip, sb, r2, r10
smull r10, r2, r11, r10
adds r11, ip, #0x800
adc sb, sb, #0
mov r11, r11, lsr #0xc
@@ -8663,7 +8663,7 @@ _02174b2c:
str r0, [sp, #8]
adc r0, r1, #0
mov r3, r3, lsr #0xc
adds r1, sl, #0x800
adds r1, r10, #0x800
orr r3, r3, r0, lsl #20
adc r0, r2, #0
mov r1, r1, lsr #0xc
@@ -8681,7 +8681,7 @@ _02174c88:
add r1, r4, #0x244
bl func_ov38_021854e4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_02174950
_02174cb4: .word data_02050f54
@@ -9249,7 +9249,7 @@ _021753a8: .word data_ov29_02179f4c
.global func_ov29_021753ac
arm_func_start func_ov29_021753ac
func_ov29_021753ac: ; 0x021753ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x68
ldr r3, _0217558c ; =data_027e0d0c
mov r4, r0
@@ -9320,7 +9320,7 @@ func_ov29_021753ac: ; 0x021753ac
mla r6, r5, r3, r6
ldr r0, [r0]
ldr sb, [r2, #0x10]
ldrsh sl, [r0, #0x78]
ldrsh r10, [r0, #0x78]
mla r6, lr, ip, r6
ldr r8, [r2, #0x14]
adds r3, sb, r7
@@ -9334,7 +9334,7 @@ func_ov29_021753ac: ; 0x021753ac
ldr r0, _021755a8 ; =0xfffffc72
add r1, r4, #0x200
add r0, r3, r0
add r0, sl, r0
add r0, r10, r0
strh r0, [r1, #0xbe]
ldr r0, _021755ac ; =0xffffe38e
strh r0, [r1, #0xbc]
@@ -9368,7 +9368,7 @@ func_ov29_021753ac: ; 0x021753ac
bl func_ov29_02175724
mov r0, #1
add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021753ac
_0217558c: .word data_027e0d0c
@@ -10590,10 +10590,10 @@ _021765ec: .word data_027e0fe4
.global func_ov29_021765f0
arm_func_start func_ov29_021765f0
func_ov29_021765f0: ; 0x021765f0
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
mov sl, r0
ldrb r7, [sl, #0x14]
mov r10, r0
ldrb r7, [r10, #0x14]
mov sb, r1
add r0, r7, #2
cmp r7, r0
@@ -10602,7 +10602,7 @@ func_ov29_021765f0: ; 0x021765f0
add r5, sp, #2
mov r11, #1
_0217661c:
ldrb r8, [sl, #0x15]
ldrb r8, [r10, #0x15]
add r0, r8, #2
cmp r8, r0
bge _021766a4
@@ -10634,24 +10634,24 @@ _02176668:
mov r3, #0x35
bl func_ov00_02084d24
_02176690:
ldrb r0, [sl, #0x15]
ldrb r0, [r10, #0x15]
add r8, r8, #1
add r0, r0, #2
cmp r8, r0
blt _02176630
_021766a4:
ldrb r0, [sl, #0x14]
ldrb r0, [r10, #0x14]
add r7, r7, #1
add r0, r0, #2
cmp r7, r0
blt _0217661c
_021766b8:
ldrh r4, [sl, #0x2a]
ldrh r4, [r10, #0x2a]
ldr r1, _02176788 ; =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, _02176788 ; =data_027e0f6c
add r0, sp, #4
@@ -10678,7 +10678,7 @@ _021766b8:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217673c:
ldr r0, _02176788 ; =data_027e0f6c
ldr r1, [sp, #8]
@@ -10697,7 +10697,7 @@ _0217673c:
str r3, [sp, #4]
bl func_ov00_02093a3c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov29_021765f0
_02176784: .word data_027e0e60
@@ -13773,14 +13773,14 @@ _02179000: .word data_ov29_0217bd70
.global func_ov29_02179004
arm_func_start func_ov29_02179004
func_ov29_02179004: ; 0x02179004
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x24
ldr r1, _021791f4 ; =data_ov29_0217bd50
mov r4, r0
ldr r0, [r1, #0xc]
cmp r0, #0
addeq sp, sp, #0x24
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldrsh r0, [r4, #0x56]
mov r1, #0x100
mov r0, r0, lsl #0xd
@@ -13807,7 +13807,7 @@ func_ov29_02179004: ; 0x02179004
str r1, [sp, #4]
movs r0, #0x14
addeq sp, sp, #0x24
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldr r0, [sp, #0x18]
str r6, [sp, #0x20]
mov r0, r0, asr #0x1f
@@ -13836,32 +13836,32 @@ _021790ac:
smull r2, r1, r0, r1
ldr r0, [sp, #0x20]
mov r3, sb, asr #0x1f
sub sl, r6, r0
mov r0, sl, asr #0x1
add r0, sl, r0, lsr #30
mov sl, r0, asr #0x2
sub r10, r6, r0
mov r0, r10, asr #0x1
add r0, r10, r0, lsr #30
mov r10, r0, asr #0x2
ldr r0, _02179200 ; =data_ov29_0217949c
ldr r0, [r0, sl, lsl #2]
ldr sl, [sp, #0x18]
umull lr, ip, sl, sb
mla ip, sl, r3, ip
ldr r0, [r0, r10, lsl #2]
ldr r10, [sp, #0x18]
umull lr, ip, r10, sb
mla ip, r10, r3, ip
ldr r3, [sp, #0x1c]
adds sl, lr, #0x800
adds r10, lr, #0x800
mla ip, r3, sb, ip
adc sb, ip, #0
mov r3, sl, lsr #0xc
mov r3, r10, lsr #0xc
orr r3, r3, sb, lsl #20
adds sb, r2, #0x800
adc r1, r1, #0
mov r2, sb, lsr #0xc
orr r2, r2, r1, lsl #20
sub r3, r3, r2
umull sl, sb, r7, r3
adds r1, sl, #0x80000000
umull r10, sb, r7, r3
adds r1, r10, #0x80000000
mov r2, r3, asr #0x1f
mla sb, r7, r2, sb
ldr r1, [sp, #0xc]
ldr sl, [sp, #0x10]
ldr r10, [sp, #0x10]
mla sb, r1, r3, sb
adc r1, sb, #0
str r1, [r4, #4]
@@ -13870,22 +13870,22 @@ _021790ac:
rsb ip, r1, #0
smull r2, r1, r3, r1
mov r3, ip, asr #0x1f
umull sb, lr, sl, ip
mla lr, sl, r3, lr
umull sb, lr, r10, ip
mla lr, r10, r3, lr
ldr r3, [sp, #0x14]
adds sl, sb, #0x800
adds r10, sb, #0x800
mla lr, r3, ip, lr
adc sb, lr, #0
mov r3, sl, lsr #0xc
mov r3, r10, lsr #0xc
orr r3, r3, sb, lsl #20
adds sb, r2, #0x800
adc r1, r1, #0
mov r2, sb, lsr #0xc
orr r2, r2, r1, lsl #20
sub r3, r3, r2
umull sl, sb, r8, r3
umull r10, sb, r8, r3
mov r2, r3, asr #0x1f
adds r1, sl, #0x80000000
adds r1, r10, #0x80000000
mla sb, r8, r2, sb
ldr r1, [sp, #4]
mla sb, r1, r3, sb
@@ -13898,7 +13898,7 @@ _021791dc:
cmp r6, r0
bne _021790ac
add sp, sp, #0x24
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov29_02179004
_021791f4: .word data_ov29_0217bd50
+138 -138
View File
@@ -190,7 +190,7 @@ func_ov30_0217bfe0: ; 0x0217bfe0
.global func_ov30_0217c020
arm_func_start func_ov30_0217c020
func_ov30_0217c020: ; 0x0217c020
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x3c
mov sb, r0
ldr r0, [sb, #0x200]
@@ -200,7 +200,7 @@ func_ov30_0217c020: ; 0x0217c020
mov r7, r2
mov r6, r3
addmi sp, sp, #0x3c
ldmmiia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmmiia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r11, sp, #0x24
_0217c050:
mov r0, sb
@@ -211,8 +211,8 @@ _0217c050:
beq _0217c0f4
ldr r0, [sp, #0x34]
ldr lr, [sp, #0x30]
add sl, r0, r7
str sl, [sp, #0x34]
add r10, r0, r7
str r10, [sp, #0x34]
ldmia r8, {r0, r1, r2}
stmia r11, {r0, r1, r2}
ldr ip, [sp, #0x38]
@@ -222,9 +222,9 @@ _0217c050:
str r0, [sp, #0x14]
str lr, [sp, #0x18]
str ip, [sp, #0x20]
str sl, [sp, #0x28]
str sl, [sp, #0x1c]
str sl, [sp, #0x10]
str r10, [sp, #0x28]
str r10, [sp, #0x1c]
str r10, [sp, #0x10]
mov r0, #6
stmia sp, {r0, r6}
mov r0, #0
@@ -237,7 +237,7 @@ _0217c050:
bl func_01ffe1cc
cmp r0, #0
addne sp, sp, #0x3c
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [sp, #0x30]
str r0, [r5]
ldr r0, [sp, #0x34]
@@ -248,7 +248,7 @@ _0217c0f4:
subs r4, r4, #1
bpl _0217c050
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_0217c020
_0217c104: .word data_027e0e60
@@ -2051,14 +2051,14 @@ _0217d7d4: .word 0x00000333
.global func_ov30_0217d7d8
arm_func_start func_ov30_0217d7d8
func_ov30_0217d7d8: ; 0x0217d7d8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x30
ldr r3, _0217d988 ; =data_027e0f94
mov r11, #0
ldr r5, [r3]
ldr r4, [r3, #4]
ldr r2, _0217d98c ; =data_027e0e60
mov sl, r0
mov r10, r0
ldr r0, [r2]
str r1, [sp]
strh r11, [sp, #0x14]
@@ -2115,9 +2115,9 @@ _0217d874:
mov r1, r6
add r2, sp, #0x24
bl func_ov00_0208439c
ldr r1, [sl, #8]
ldr r1, [r10, #8]
ldr r0, [sp, #0x2c]
ldr r3, [sl]
ldr r3, [r10]
sub r2, r1, r0
smull r1, r0, r2, r2
ldr r2, [sp, #0x24]
@@ -2162,7 +2162,7 @@ _0217d934:
_0217d97c:
mov r0, r11
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_0217d7d8
_0217d988: .word data_027e0f94
@@ -3070,7 +3070,7 @@ _0217e5a0: .word data_027e0764
.global func_ov30_0217e5a4
arm_func_start func_ov30_0217e5a4
func_ov30_0217e5a4: ; 0x0217e5a4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x30
mov r6, r0
bl func_ov00_020c5118
@@ -3081,7 +3081,7 @@ func_ov30_0217e5a4: ; 0x0217e5a4
cmp r1, #1
beq _0217e72c
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217e5d4:
bl func_ov30_02182dc0
mov r0, r6
@@ -3089,7 +3089,7 @@ _0217e5d4:
ldrsh r1, [r6, #0xc]
cmp r0, r1
addle sp, sp, #0x30
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldrsh r0, [r5, #0x78]
bl func_0202bbbc
bl func_0202bba8
@@ -3098,7 +3098,7 @@ _0217e5d4:
cmp r0, #2
bne _0217e690
ldr r4, _0217e760 ; =data_02050f54
mov sl, #0
mov r10, #0
mov sb, #0x3000
add r8, sp, #0x24
add r7, sp, #0x18
@@ -3117,7 +3117,7 @@ _0217e620:
add lr, r4, lr, lsl #1
ldrsh ip, [r4, ip]
ldrsh lr, [lr, #2]
str sl, [sp, #0x28]
str r10, [sp, #0x28]
str ip, [sp, #0x24]
str lr, [sp, #0x2c]
bl func_01ff9e64
@@ -3130,12 +3130,12 @@ _0217e620:
mov r1, #1
bl func_ov30_0217e4b0
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217e690:
cmp r0, #3
bne _0217e71c
ldr r4, _0217e760 ; =data_02050f54
mov sl, #0
mov r10, #0
mov sb, #0x3000
add r8, sp, #0xc
add r7, sp, #0
@@ -3154,7 +3154,7 @@ _0217e6ac:
add lr, r4, lr, lsl #1
ldrsh ip, [r4, ip]
ldrsh lr, [lr, #2]
str sl, [sp, #0x10]
str r10, [sp, #0x10]
str ip, [sp, #0xc]
str lr, [sp, #0x14]
bl func_01ff9e64
@@ -3167,12 +3167,12 @@ _0217e6ac:
mov r1, #1
bl func_ov30_0217e4b0
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217e71c:
mov r0, r6
bl func_ov00_020c50fc
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217e72c:
ldrsh r1, [r6, #0xe]
bl func_ov30_02182e34
@@ -3181,12 +3181,12 @@ _0217e72c:
bl func_ov30_02182e50
cmp r0, #0
addeq sp, sp, #0x30
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov r0, r6
mov r1, #0
bl func_ov30_0217e4b0
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov30_0217e5a4
_0217e760: .word data_02050f54
@@ -3974,7 +3974,7 @@ func_ov30_0217f1a0: ; 0x0217f1a0
.global func_ov30_0217f1c4
arm_func_start func_ov30_0217f1c4
func_ov30_0217f1c4: ; 0x0217f1c4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x68
mov r7, r0
bl func_ov00_020c5118
@@ -4005,13 +4005,13 @@ _0217f1f8:
mov r2, #0
bl func_ov00_020c50d4
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217f23c:
mov r0, r7
mov r1, #1
bl func_ov30_0217f130
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217f250:
bl func_ov30_02182dc0
mov r0, r5
@@ -4022,7 +4022,7 @@ _0217f250:
bl func_0202e58c
cmp r0, #0
addeq sp, sp, #0x68
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov r0, r5
mov r1, #0
bl func_ov30_02183e50
@@ -4053,13 +4053,13 @@ _0217f250:
mov r1, #2
bl func_ov30_0217f130
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217f2f4:
mov r0, r7
bl func_ov00_020c50f0
cmp r0, #0xa
addle sp, sp, #0x68
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr r3, _0217f550 ; =data_ov00_020e8398
mvn r2, #0
mov r6, #1
@@ -4113,7 +4113,7 @@ _0217f3b8:
ble _0217f43c
ldr sb, _0217f55c ; =data_027e10b4
ldr r8, _0217f560 ; =data_027e0fe4
add sl, sp, #0x50
add r10, sp, #0x50
add r4, sp, #0
_0217f3e0:
ldr r0, [sb]
@@ -4128,12 +4128,12 @@ _0217f3e0:
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r1, r0
beq _0217f428
mov r0, sl
mov r0, r10
add r1, r1, #0x48
bl func_ov00_020ce2f0
cmp r0, #0x2000
addlt sp, sp, #0x68
ldmltia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmltia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217f428:
ldr r0, [sb]
add r6, r6, #1
@@ -4153,7 +4153,7 @@ _0217f43c:
strh r2, [r5, #0x78]
bl func_ov30_0217f130
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217f470:
bl func_ov30_02182dc0
mov r0, r7
@@ -4168,7 +4168,7 @@ _0217f470:
mov r3, #0
bl func_ov00_020ceacc
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217f4a8:
cmp r0, #0x33
bne _0217f4f8
@@ -4189,10 +4189,10 @@ _0217f4a8:
ldr r0, [r0]
bl func_ov30_021840b0
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217f4f8:
addle sp, sp, #0x68
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov r0, r5
mov r1, #0
bl func_ov00_020cb160
@@ -4201,7 +4201,7 @@ _0217f4f8:
bl func_0202e58c
cmp r0, #0
addeq sp, sp, #0x68
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
mov r0, r5
bl func_ov30_02183e90
mov r0, r7
@@ -4210,7 +4210,7 @@ _0217f4f8:
bl func_ov00_020c50d4
_0217f53c:
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov30_0217f1c4
_0217f544: .word data_027e0f74
@@ -7318,7 +7318,7 @@ _021818b4: .word 0x0000018f
.global func_ov30_021818b8
arm_func_start func_ov30_021818b8
func_ov30_021818b8: ; 0x021818b8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x54
mov r5, r0
ldr r1, [r5, #0x2a0]
@@ -7326,7 +7326,7 @@ func_ov30_021818b8: ; 0x021818b8
cmpne r1, #1
cmpne r1, #0xc
addeq sp, sp, #0x54
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r1, sp, #0x44
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r1, _021819e0 ; =data_027e0fe4
@@ -7356,7 +7356,7 @@ func_ov30_021818b8: ; 0x021818b8
_02181944:
ldr r7, _021819e0 ; =data_027e0fe4
mov r4, #0
add sl, sp, #0
add r10, sp, #0
add r8, sp, #0x10
add r11, sp, #0x44
mvn r6, #0
@@ -7370,14 +7370,14 @@ _0218195c:
ldr r1, [r7]
str sb, [lr]
ldr r2, [ip, r4, lsl #2]
mov r0, sl
mov r0, r10
add r3, r5, #0x48
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
ldr r0, [sp]
cmp r0, r6
beq _021819cc
ldr r0, [r7]
mov r1, sl
mov r1, r10
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, r8
mov sb, r0
@@ -7394,7 +7394,7 @@ _021819cc:
cmp r4, #5
blt _0218195c
add sp, sp, #0x54
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_021818b8
_021819e0: .word data_027e0fe4
@@ -9953,7 +9953,7 @@ _02183b8c: .word 0x00002aaa
.global func_ov30_02183b90
arm_func_start func_ov30_02183b90
func_ov30_02183b90: ; 0x02183b90
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0xa8
ldr r3, _02183c9c ; =data_ov30_02188b08
mov r2, #0
@@ -10000,11 +10000,11 @@ _02183c34:
ldr r0, [r7]
add r1, r1, r5
bl _ZN12ActorManager8GetActorEP8ActorRef
add sl, r0, #0x48
add r10, r0, #0x48
bl func_ov30_02182454
cmp r0, #0
beq _02183c7c
str sl, [sp]
str r10, [sp]
ldrsh r1, [r6, #0x78]
mov r2, sb
mov r3, r8
@@ -10013,7 +10013,7 @@ _02183c34:
cmp r0, #0
addne sp, sp, #0xa8
movne r0, #1
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_02183c7c:
ldr r0, [sp, #0x24]
add r4, r4, #1
@@ -10023,7 +10023,7 @@ _02183c7c:
_02183c90:
mov r0, #0
add sp, sp, #0xa8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov30_02183b90
_02183c9c: .word data_ov30_02188b08
@@ -10450,20 +10450,20 @@ func_ov30_021840ec: ; 0x021840ec
.global func_ov30_0218411c
arm_func_start func_ov30_0218411c
func_ov30_0218411c: ; 0x0218411c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #8
ldr r1, _021842fc ; =data_027e0fc8
mov sl, r0
mov r10, r0
ldr r0, [r1]
bl func_ov00_020bbb64
cmp r0, #0
addne sp, sp, #8
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r8, #0
sub r0, r8, #1
str r0, [sl, #0x8c]
str r0, [sl, #0x90]
ldrsh r0, [sl, #4]
str r0, [r10, #0x8c]
str r0, [r10, #0x90]
ldrsh r0, [r10, #4]
mov r6, r8
sub r7, r8, #0x80000001
cmp r0, #0
@@ -10472,7 +10472,7 @@ func_ov30_0218411c: ; 0x0218411c
mov sb, r8
add r11, sp, #0
_02184170:
ldr r2, [sl]
ldr r2, [r10]
ldr r0, [r4]
ldr r1, [r2, sb]
add r2, r2, sb
@@ -10494,10 +10494,10 @@ _02184170:
ldr r2, [sp, #4]
ldr r1, [sp]
mov r7, r0
str r1, [sl, #0x8c]
str r2, [sl, #0x90]
str r1, [r10, #0x8c]
str r2, [r10, #0x90]
_021841d0:
ldrsh r1, [sl, #4]
ldrsh r1, [r10, #4]
add r0, r6, #1
mov r0, r0, lsl #0x10
cmp r1, r0, asr #16
@@ -10508,7 +10508,7 @@ _021841ec:
ldr r0, _02184304 ; =data_ov00_020eec68
cmp r8, #0
str r7, [r0, #0x28]
str r8, [sl, #0x88]
str r8, [r10, #0x88]
bne _0218424c
bl func_ov00_020d7424
cmp r0, #0xa7
@@ -10530,7 +10530,7 @@ _021841ec:
bl func_ov00_02084924
b _02184298
_0218424c:
ldr r0, [sl, #0x88]
ldr r0, [r10, #0x88]
cmp r0, #0
ble _02184298
ldr r0, _02184304 ; =data_ov00_020eec68
@@ -10550,32 +10550,32 @@ _0218424c:
ldr r0, [r0]
bl func_ov00_02084924
_02184298:
ldr r0, [sl, #0x94]
ldr r0, [r10, #0x94]
cmp r0, #0
ble _021842d4
sub r0, r0, #1
str r0, [sl, #0x94]
ldr r0, [sl, #0x98]
str r0, [r10, #0x94]
ldr r0, [r10, #0x98]
sub r0, r0, #1
str r0, [sl, #0x98]
str r0, [r10, #0x98]
cmp r0, #0
bgt _021842d4
ldr r0, _0218430c ; =data_ov00_020eec9c
mov r2, #0x10
mov r1, #0x1c0
str r2, [sl, #0x98]
str r2, [r10, #0x98]
bl func_ov00_020d77e4
_021842d4:
ldr r0, [sl, #0x9c]
ldr r0, [r10, #0x9c]
cmp r0, #0
subgt r0, r0, #1
strgt r0, [sl, #0x9c]
ldrsh r0, [sl, #0xa0]
strgt r0, [r10, #0x9c]
ldrsh r0, [r10, #0xa0]
cmp r0, #0
subgt r0, r0, #1
strgth r0, [sl, #0xa0]
strgth r0, [r10, #0xa0]
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_0218411c
_021842fc: .word data_027e0fc8
@@ -11285,7 +11285,7 @@ func_ov30_02184850: ; 0x02184850
.global func_ov30_02184868
arm_func_start func_ov30_02184868
func_ov30_02184868: ; 0x02184868
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x1bc
sub sp, sp, #0x400
mov r4, r0
@@ -11293,7 +11293,7 @@ func_ov30_02184868: ; 0x02184868
cmp r0, #0
addeq sp, sp, #0x1bc
addeq sp, sp, #0x400
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, r4
bl _ZN5Actor20IncreaseActiveFramesEv
ldr r0, [r4, #0x130]
@@ -11337,7 +11337,7 @@ _021848f4:
mov r6, #0
str r6, [sp, #0x18]
cmp r0, #0
ldrh sl, [r4, #0x20]
ldrh r10, [r4, #0x20]
ble _021849cc
ldr sb, [sp, #0x18]
ldr r11, _02185254 ; =data_027e0e60
@@ -11350,14 +11350,14 @@ _02184940:
movs r7, r0
beq _021849b8
mov r8, #0
cmp sl, #0
cmp r10, #0
moveq r8, #1
beq _02184998
ldr r1, [r7, #0x48]
ldr r0, [r11]
str r1, [sp, #0x74]
ldr r2, [r7, #0x4c]
mov r1, sl
mov r1, r10
str r2, [sp, #0x78]
ldr r3, [r7, #0x50]
add r2, sp, #0x74
@@ -11390,13 +11390,13 @@ _021849cc:
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021849f4:
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184a08:
ldr r2, _0218524c ; =data_ov30_02188b08
mov r1, #0
@@ -11425,7 +11425,7 @@ _02184a34:
mov r6, #0
str r6, [sp, #0x14]
cmp r0, #0
ldrh sl, [r4, #0x20]
ldrh r10, [r4, #0x20]
ble _02184b10
ldr sb, [sp, #0x14]
ldr r11, _02185254 ; =data_027e0e60
@@ -11438,14 +11438,14 @@ _02184a84:
movs r7, r0
beq _02184afc
mov r8, #0
cmp sl, #0
cmp r10, #0
moveq r8, #1
beq _02184adc
ldr r1, [r7, #0x48]
ldr r0, [r11]
str r1, [sp, #0x68]
ldr r2, [r7, #0x4c]
mov r1, sl
mov r1, r10
str r2, [sp, #0x6c]
ldr r3, [r7, #0x50]
add r2, sp, #0x68
@@ -11478,13 +11478,13 @@ _02184b10:
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184b38:
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184b4c:
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
@@ -11525,7 +11525,7 @@ _02184ba8:
mov r6, #0
str r6, [sp, #0x10]
cmp r0, #0
ldrh sl, [r4, #0x20]
ldrh r10, [r4, #0x20]
ble _02184c84
ldr sb, [sp, #0x10]
ldr r11, _02185254 ; =data_027e0e60
@@ -11538,14 +11538,14 @@ _02184bf8:
movs r7, r0
beq _02184c70
mov r8, #0
cmp sl, #0
cmp r10, #0
moveq r8, #1
beq _02184c50
ldr r1, [r7, #0x48]
ldr r0, [r11]
str r1, [sp, #0x5c]
ldr r2, [r7, #0x4c]
mov r1, sl
mov r1, r10
str r2, [sp, #0x60]
ldr r3, [r7, #0x50]
add r2, sp, #0x5c
@@ -11578,13 +11578,13 @@ _02184c84:
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184cac:
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184cc0:
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
@@ -11623,7 +11623,7 @@ _02184d18:
mov r6, #0
str r6, [sp, #0xc]
cmp r0, #0
ldrh sl, [r4, #0x20]
ldrh r10, [r4, #0x20]
ble _02184df0
ldr sb, [sp, #0xc]
ldr r11, _02185254 ; =data_027e0e60
@@ -11636,14 +11636,14 @@ _02184d64:
movs r7, r0
beq _02184ddc
mov r8, #0
cmp sl, #0
cmp r10, #0
moveq r8, #1
beq _02184dbc
ldr r1, [r7, #0x48]
ldr r0, [r11]
str r1, [sp, #0x50]
ldr r2, [r7, #0x4c]
mov r1, sl
mov r1, r10
str r2, [sp, #0x54]
ldr r3, [r7, #0x50]
add r2, sp, #0x50
@@ -11676,13 +11676,13 @@ _02184df0:
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184e18:
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184e2c:
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
@@ -11721,7 +11721,7 @@ _02184e84:
mov r7, #0
str r7, [sp, #8]
cmp r0, #0
ldrh sl, [r4, #0x20]
ldrh r10, [r4, #0x20]
ble _02184f50
ldr sb, [sp, #8]
ldr r5, _02185254 ; =data_027e0e60
@@ -11735,11 +11735,11 @@ _02184ed4:
cmp r0, #0
beq _02184f3c
mov r8, r11
cmp sl, #0
cmp r10, #0
moveq r8, #1
beq _02184f2c
ldr r2, [r0, #0x48]
mov r1, sl
mov r1, r10
str r2, [sp, #0x44]
ldr r3, [r0, #0x4c]
add r2, sp, #0x44
@@ -11771,13 +11771,13 @@ _02184f50:
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184f78:
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184f8c:
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
@@ -11816,7 +11816,7 @@ _02184fe4:
mov r7, #0
str r7, [sp, #4]
cmp r0, #0
ldrh sl, [r4, #0x20]
ldrh r10, [r4, #0x20]
ble _021850b0
ldr sb, [sp, #4]
ldr r5, _02185254 ; =data_027e0e60
@@ -11830,11 +11830,11 @@ _02185034:
cmp r0, #0
beq _0218509c
mov r8, r11
cmp sl, #0
cmp r10, #0
moveq r8, #1
beq _0218508c
ldr r2, [r0, #0x48]
mov r1, sl
mov r1, r10
str r2, [sp, #0x38]
ldr r3, [r0, #0x4c]
add r2, sp, #0x38
@@ -11866,13 +11866,13 @@ _021850b0:
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021850d8:
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021850ec:
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
@@ -11911,7 +11911,7 @@ _02185144:
mov r7, #0
str r7, [sp]
cmp r0, #0
ldrh sl, [r4, #0x20]
ldrh r10, [r4, #0x20]
ble _02185210
ldr sb, [sp]
ldr r5, _02185254 ; =data_027e0e60
@@ -11925,11 +11925,11 @@ _02185194:
cmp r0, #0
beq _021851fc
mov r8, r11
cmp sl, #0
cmp r10, #0
moveq r8, #1
beq _021851ec
ldr r2, [r0, #0x48]
mov r1, sl
mov r1, r10
str r2, [sp, #0x2c]
ldr r3, [r0, #0x4c]
add r2, sp, #0x2c
@@ -11961,14 +11961,14 @@ _02185210:
bl _ZN5Actor18func_ov00_020c1c20Eiii
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02185238:
mov r2, r1
bl _ZN5Actor18func_ov00_020c1c20Eiii
_02185240:
add sp, sp, #0x1bc
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_02184868
_0218524c: .word data_ov30_02188b08
@@ -15170,9 +15170,9 @@ func_ov30_02187dfc: ; 0x02187dfc
.global func_ov30_02187e18
arm_func_start func_ov30_02187e18
func_ov30_02187e18: ; 0x02187e18
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x3c
mov sl, r0
mov r10, r0
mov sb, r1
mov r8, r2
mov r7, r3
@@ -15182,17 +15182,17 @@ func_ov30_02187e18: ; 0x02187e18
add r5, sp, #0x24
mov r4, #6
_02187e44:
mov r0, sl
mov r0, r10
bl func_ov30_02187ef0
cmp r0, #0
addne sp, sp, #0x3c
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
mov r0, sl
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, r10
add r1, sp, #0x30
bl func_ov30_02187dac
cmp r0, #0
addeq sp, sp, #0x3c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [sp, #0x34]
ldr r3, [sp, #0x30]
add ip, r0, r8
@@ -15218,8 +15218,8 @@ _02187e44:
bl func_01ffe1cc
cmp r0, #0
addne sp, sp, #0x3c
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
mov r0, sl
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, r10
bl func_ov30_02187dfc
b _02187e44
arm_func_end func_ov30_02187e18
@@ -15228,7 +15228,7 @@ _02187e44:
arm_func_start func_ov30_02187ee4
func_ov30_02187ee4: ; 0x02187ee4
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_02187ee4
_02187eec: .word data_027e0e60
@@ -15273,7 +15273,7 @@ _02187f2c:
.global func_ov30_02187f58
arm_func_start func_ov30_02187f58
func_ov30_02187f58: ; 0x02187f58
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
str r0, [sp]
add r0, r0, #0x1000
@@ -15285,7 +15285,7 @@ func_ov30_02187f58: ; 0x02187f58
ldr r0, [r2, #4]
cmp r0, #0
addle sp, sp, #0xc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02187f8c:
ldr r8, [r2]
and r7, sb, #0xff
@@ -15297,7 +15297,7 @@ _02187f8c:
cmp r0, r1
bne _02188054
ldrb r0, [r2, #1]
mov sl, #0
mov r10, #0
cmp r0, #0
ble _02188054
ldr r0, [sp]
@@ -15308,7 +15308,7 @@ _02187f8c:
_02187fd4:
ldr r0, [r11]
strb sb, [sp, #0xa]
strb sl, [sp, #0xb]
strb r10, [sp, #0xb]
add r1, sp, #0xa
bl func_ov00_020c47cc
ldrsb r0, [r0, #0x16]
@@ -15333,10 +15333,10 @@ _02187fd4:
str r0, [r5]
_02188038:
ldr r1, [r8, r7, lsl #3]
add r0, sl, #1
add r0, r10, #1
mov r0, r0, lsl #0x18
ldrb r1, [r1, #1]
mov sl, r0, asr #0x18
mov r10, r0, asr #0x18
cmp r1, r0, asr #24
bgt _02187fd4
_02188054:
@@ -15349,7 +15349,7 @@ _02188054:
cmp r1, r0, asr #24
bgt _02187f8c
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_02187f58
_0218807c: .word data_027e0ff0
@@ -15452,10 +15452,10 @@ _021881b4:
.global func_ov30_021881bc
arm_func_start func_ov30_021881bc
func_ov30_021881bc: ; 0x021881bc
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x2c
mov sl, r0
ldr r3, [sl]
mov r10, r0
ldr r3, [r10]
mov r7, #0
cmp r3, #0
sub r2, r7, #0x80000001
@@ -15471,13 +15471,13 @@ _021881dc:
cmp r3, #0
bne _021881dc
_02188200:
mov r0, sl
mov r0, r10
mov r1, r7
bl func_ov30_0218727c
mov r1, r7
add r0, sl, #8
add r0, r10, #8
bl func_ov30_02187234
add r0, sl, #0x1000
add r0, r10, #0x1000
ldr r3, [r0, #0x18]
ldr r0, _02188394 ; =data_027e0ff0
ldrsb r2, [r3, #0x1c]
@@ -15502,7 +15502,7 @@ _02188200:
mov r6, r0
mov r11, #0
add sb, r6, #0x14
add r4, sl, #0x1000
add r4, r10, #0x1000
_02188280:
ldrsb r0, [sb, #2]
sub r0, r0, #1
@@ -15523,14 +15523,14 @@ _02188280:
strb r2, [sp, #3]
bl func_ov00_020c47cc
mov r5, r0
mov r0, sl
mov r0, r10
add r1, sp, #2
bl func_ov30_02188168
mov r8, r0
ldr r0, [r8, #8]
cmp r0, #0
bne _02188378
mov r0, sl
mov r0, r10
str r7, [r8, #0x14]
mov r1, r8
bl func_ov30_02187234
@@ -15565,7 +15565,7 @@ _02188280:
cmp r8, r0
addeq sp, sp, #0x2c
moveq r0, #1
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02188378:
add r11, r11, #1
cmp r11, #4
@@ -15573,7 +15573,7 @@ _02188378:
blt _02188280
mov r0, #0
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov30_021881bc
_02188394: .word data_027e0ff0
+59 -59
View File
@@ -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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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}
@@ -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]
@@ -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
@@ -1674,13 +1674,13 @@ _0217d2c8:
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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov31_0217cfd4
_0217d3e8: .word 0x00005555
@@ -2843,29 +2843,29 @@ _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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r7, _0217e278 ; =data_02057878
ldr r6, _0217e27c ; =data_0205785c
ldr r5, _0217e280 ; =gItemManager
ldr r4, _0217e284 ; =data_ov31_021822b0
ldr r11, _0217e288 ; =data_027e0ce0
mov sl, #0
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]
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]
beq _0217e0c0
cmp sl, #8
cmp r10, #8
ldreq r0, [r5]
ldreqh r0, [r0, #0xb8]
cmpeq r0, #1
@@ -2873,9 +2873,9 @@ _0217e05c:
ldreq sb, [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 sb, [r0, r10, lsl #2]
_0217e0c0:
ldr r1, [r11, #4]
mov r0, #0x14
@@ -2892,7 +2892,7 @@ _0217e0c0:
_0217e0f0:
ldr r1, _0217e294 ; =data_ov31_021840a8
mov r2, #4
str r0, [r1, sl, lsl #2]
str r0, [r1, r10, lsl #2]
ldr r1, [r11, #4]
mov r0, #0x14
bl _ZN9SysObjectnwEmPjj
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov31_0217e040
_0217e278: .word data_02057878
@@ -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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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
and r1, r10, #0x1f
add r1, r1, #0x1f
mov r0, #0x1f000
mov r1, r1, lsl #0xc
@@ -7639,7 +7639,7 @@ 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
@@ -7647,23 +7647,23 @@ func_ov31_02181610: ; 0x02181610
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, r11
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
@@ -7683,18 +7683,18 @@ _02181780:
ldr r0, [r0, #0xc]
bl func_0200e2a4
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
str r1, [r4, #4]
ldr r0, [r4, #0x14]
ldr ip, [r4, #8]
@@ -7715,18 +7715,18 @@ _021817d4:
and sb, 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
mov r1, r10, asr #0xa
and r10, r3, #0x1f
mul r3, sb, 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
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov31_02181798
.global func_ov31_0218186c
+105 -105
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217e934:
add r0, r5, #0x100
ldrsb r1, [r0, #0xa0]
@@ -3477,7 +3477,7 @@ _0217e934:
ldrsb r7, [r0, #0xab]
ldrsb r8, [r0, #0xac]
ldrsh sb, [r0, #0xae]
ldrh sl, [r0, #0xb0]
ldrh r10, [r0, #0xb0]
ldmia r1, {r0, r1, r2}
stmia ip, {r0, r1, r2}
strb r3, [r5, #0x1a0]
@@ -3538,11 +3538,11 @@ _0217ea20:
strb r8, [r5, #0x1ac]
add r0, r5, #0x100
strh sb, [r0, #0xae]
strh sl, [r0, #0xb0]
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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217eb7c:
mov r0, #0
add sp, sp, #0x78
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r2, #0x2b8
str r2, [sp, #0x28]
ldrsb r1, [r0, #2]
@@ -3824,13 +3824,13 @@ _0217ee34:
mov r0, r1, lsl #0x1
ldrsh r3, [r8, r0]
add r0, r8, r1, lsl #1
ldr sl, [r7, #0x48]
ldr r10, [r7, #0x48]
mov r11, r3, asr #0x1f
umull lr, ip, r6, r3
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 r11, ip, #0
@@ -3842,15 +3842,15 @@ _0217ee34:
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 r11, sl, r6, r2
mla sl, r6, r3, sl
umull r11, r10, r6, r2
mla r10, r6, r3, r10
adds r3, r11, #0x800
mla sl, r5, r2, sl
adc r2, sl, #0
mla r10, r5, r2, r10
adc r2, r10, #0
mov r3, r3, lsr #0xc
orr r3, r3, r2, lsl #20
ldr r0, [r0]
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
ldr r1, _0218027c ; =0x000005ed
mov r7, r0
@@ -5347,7 +5347,7 @@ _02180108:
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
@@ -5366,7 +5366,7 @@ _02180108:
adc r2, r8, #0
mov r8, sb, 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
@@ -5379,9 +5379,9 @@ _02180108:
ldrsh ip, [r2, #2]
umull r8, r2, ip, r11
mla r2, ip, sb, r2
mov sl, ip, asr #0x1f
mov r10, ip, asr #0x1f
adds sb, r8, #0x800
mla r2, sl, r11, r2
mla r2, r10, r11, r2
adc r2, r2, #0
mov r8, sb, lsr #0xc
orr r8, r8, r2, lsl #20
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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
@@ -5636,7 +5636,7 @@ func_ov32_021804a4: ; 0x021804a4
orr r6, r6, r5, lsl #20
add r11, r1, r6
str r11, [sp, #0x18]
ldrsh r5, [sl, #0x78]
ldrsh r5, [r10, #0x78]
mov r3, r3, lsl #0x1
ldr r7, [sp, #0x20]
sub r4, r5, r4
@@ -5659,12 +5659,12 @@ func_ov32_021804a4: ; 0x021804a4
orr r2, r2, r3, lsl #20
add sb, r7, r2
str sb, [sp, #0x20]
add r1, sl, #0x400
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
@@ -5726,29 +5726,29 @@ func_ov32_021804a4: ; 0x021804a4
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 sb, r10, #0xb8
ble _021807b4
ldr r6, _02180864 ; =data_027e0f6c
ldr r5, _02180854 ; =data_027e0f94
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x1c
mov r7, r0
mov r2, #2
@@ -5888,7 +5888,7 @@ _021808dc:
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]
@@ -5904,7 +5904,7 @@ _021808dc:
adc r2, r8, #0
mov r8, sb, 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
@@ -5914,9 +5914,9 @@ _021808dc:
ldrsh ip, [r4, r2]
umull r8, r2, ip, r11
mla r2, ip, sb, r2
mov sl, ip, asr #0x1f
mov r10, ip, asr #0x1f
adds sb, r8, #0x800
mla r2, sl, r11, r2
mla r2, r10, r11, r2
adc r2, r2, #0
mov r8, sb, lsr #0xc
orr r8, r8, r2, lsl #20
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_02180870
_02180a34: .word data_027e0f94
@@ -8075,15 +8075,15 @@ _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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x1c
mov sl, r0
ldr r2, [sl, #4]
mov r10, r0
ldr r2, [r10, #4]
mov sb, r1
tst r2, #0x10
addeq sp, sp, #0x1c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldrb r1, [sl, #0x68]
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrb r1, [r10, #0x68]
cmp r1, #0
beq _021827ec
str sb, [sp]
@@ -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]
@@ -8124,8 +8124,8 @@ _02182790:
str r1, [sp, #8]
mov r0, r0, asr #0xc
str r0, [sp, #0xc]
ldrsh r1, [sl, #0xc]
mov r0, sl
ldrsh r1, [r10, #0xc]
mov r0, r10
mov r2, r11
rsb r1, r1, #0x4000
mov r1, r1, lsl #0x10
@@ -8145,31 +8145,31 @@ _021827ec:
bne _02182804
tst r0, #2
addeq sp, sp, #0x1c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldrb r0, [sl, #0x6a]
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrb r0, [r10, #0x6a]
cmp r0, #0
addeq sp, sp, #0x1c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_021826f0
_02182860: .word data_027e080c
@@ -8925,22 +8925,22 @@ _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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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, sb, r10, r5
adc r4, r2, r4
mla sb, sl, r4, sb
mla sb, r10, r4, sb
str r5, [ip]
ldr r1, _02183334 ; =0x00000e39
adds r6, r3, r6
@@ -9010,9 +9010,9 @@ func_ov32_0218318c: ; 0x0218318c
umull r8, r7, r6, lr
mla r7, r6, r11, r7
mla r7, r5, lr, r7
ldr sl, [ip, #0x10]
ldr r10, [ip, #0x10]
ldr sb, [ip, #0x14]
adds r5, sl, r8
adds r5, r10, r8
adc r7, sb, r7
stmia ip, {r5, r7}
umull r5, r6, r7, r3
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_0218318c
_02183330: .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, sb, r10, lr}
ldr lr, _021836ec ; =data_027e0764
mov r3, #0
ldr r2, [lr]
@@ -9278,10 +9278,10 @@ 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
adds r1, r10, r8
adc r4, sb, r7
stmia lr, {r1, r4}
umull r1, lr, r4, ip
@@ -9289,7 +9289,7 @@ func_ov32_021835a0: ; 0x021835a0
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, sb, 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, sb, r10, lr}
mov r4, r0
bl _ZN5Actor14GetAngleToLinkEv
mov r0, r0, lsl #0x10
@@ -9356,10 +9356,10 @@ 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
adds r1, r10, r8
adc r5, sb, r7
stmia ip, {r1, r5}
umull r1, ip, r5, r3
@@ -9367,7 +9367,7 @@ func_ov32_021836f8: ; 0x021836f8
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, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r0, sp, #0x10
bl func_ov00_020c1500
mov r1, r5
@@ -10324,11 +10324,11 @@ func_ov32_0218439c: ; 0x0218439c
mla r8, r7, ip, r8
adds r7, sb, #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
@@ -10351,7 +10351,7 @@ func_ov32_0218439c: ; 0x0218439c
movge r0, #1
movlt r0, #0
add sp, sp, #0x84
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov32_0218439c
_0218453c: .word data_027e0fe4
+12 -12
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r4, r0
ldr r0, [r4, #0x138]
mov r1, #0x1e
@@ -777,14 +777,14 @@ func_ov33_0217c66c: ; 0x0217c66c
str r2, [r4, #0x48]
ldr r5, [r7]
ldmib r7, {r2, sb}
umull r11, sl, sb, r5
mla sl, sb, r2, sl
umull r11, r10, sb, r5
mla r10, sb, 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, r11
adc sb, ip, sl
adc sb, ip, r10
umull r5, r8, sb, r6
mla r8, sb, r1, r8
mla r8, r3, r6, r8
@@ -810,9 +810,9 @@ func_ov33_0217c66c: ; 0x0217c66c
ldr ip, [r7, #0xc]
ldr r11, [r7, #0x10]
mla r8, ip, r5, r8
ldr sl, [r7, #0x14]
ldr r10, [r7, #0x14]
adds r2, r11, sb
adc r8, sl, r8
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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov33_0217c66c
_0217c7fc: .word 0x000002aa
@@ -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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
ldr r3, _0217f88c ; =0x00000666
mov r4, r0
@@ -4502,12 +4502,12 @@ func_ov33_0217f744: ; 0x0217f744
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]
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]
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov33_0217f744
_0217f88c: .word 0x00000666
+81 -81
View File
@@ -1621,14 +1621,14 @@ _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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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
@@ -1644,34 +1644,34 @@ func_ov34_0217d354: ; 0x0217d354
umull r11, r3, r5, sb
adc r8, r6, r8
adds ip, r7, r11
sub r11, sl, #1
umull sl, lr, r8, r0
sub r11, r10, #1
umull r10, lr, r8, r0
mla r3, r5, r8, r3
str sl, [sp, #4]
mov sl, #0
str r10, [sp, #4]
mov r10, #0
str sb, [r1]
mla r3, r4, sb, r3
mla lr, r8, sl, lr
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
mov sb, r10
mla r3, r8, sb, r3
mla r3, sb, r0, r3
ldr sb, _0217d4a0 ; =0xfffffe66
str ip, [r1]
add r3, r3, sb
umull sl, sb, r5, ip
umull r10, sb, r5, ip
mla sb, r5, r8, sb
mla sb, r4, ip, sb
str r8, [r1, #4]
str r3, [r2, #0x184]
adds r4, r7, sl
adds r4, r7, r10
adc r5, r6, sb
stmia r1, {r4, r5}
umull r1, r4, r5, r0
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r2, _0217e8b4 ; =data_027e0764
mov ip, #0xa5
ldr r3, [r2]
@@ -2947,24 +2947,24 @@ func_ov34_0217e674: ; 0x0217e674
ldr r6, [r2, #0xc]
ldr sb, [r2, #0x10]
mla r5, r6, r3, r5
adds sl, sb, r4
adds r10, sb, 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
str r10, [r2]
mla r1, r6, r10, r1
adds r5, sb, r4
adc r4, r8, r1
str r3, [r2, #4]
umull sl, r1, r3, ip
umull r10, r1, r3, ip
mov r11, #0
mov sl, r11
mla r1, r3, sl, r1
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, r11
mla r1, r4, r3, r1
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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 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
@@ -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
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, sb, 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
ldr r10, _0217ef80 ; =data_ov34_021861a0
str r0, [sb, #0xd74]
ldr r0, [sl, #0x78]
ldr r0, [r10, #0x78]
mov r6, #0
cmp r0, #0
ble _0217eedc
@@ -3519,7 +3519,7 @@ _0217ee90:
movlt r5, r0
strlt r6, [sb, #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, sb, 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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov34_0217ee58
_0217ef80: .word data_ov34_021861a0
@@ -8450,39 +8450,39 @@ _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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
add r0, sl, #0x304
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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
add r0, r10, #0xb90
ldr r11, _02183cfc ; =0x000002cb
add r6, r2, #0x30
add sb, r1, #0x90
@@ -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]
@@ -8612,7 +8612,7 @@ _02183690:
sub sb, sb, #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
@@ -8737,7 +8737,7 @@ _02183710:
mla r3, r4, r5, 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
@@ -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
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov34_02183474
_02183cf8: .word data_ov34_0218577c
+136 -136
View File
@@ -338,55 +338,55 @@ _0217c1d0: .word func_ov35_0217bf4c
.global func_ov35_0217c1d4
arm_func_start func_ov35_0217c1d4
func_ov35_0217c1d4: ; 0x0217c1d4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x48
ldr r1, _0217c498 ; =data_027e0fe4
mov sl, r0
mov r10, r0
ldr r0, [r1]
add r1, sl, #0x34
add r1, r10, #0x34
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
str r0, [sl, #0x234]
str r0, [r10, #0x234]
addeq sp, sp, #0x48
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, _0217c49c ; =0xfffffe66
ldr r0, _0217c4a0 ; =0x000004cd
str r1, [sl, #0x7c]
str r1, [r10, #0x7c]
mov r1, #0xc00
rsb r1, r1, #0
str r0, [sl, #0x80]
str r1, [sl, #0x84]
str r0, [r10, #0x80]
str r1, [r10, #0x84]
rsb r0, r0, #0x2000
str r0, [sl, #0x88]
str r0, [r10, #0x88]
mov r3, r1, asr #0xc
ldr r1, _0217c4a4 ; =data_027e0d0c
str r3, [sl, #0x98]
str r3, [r10, #0x98]
ldr r2, [r1]
ldr r0, _0217c4a8 ; =data_027e0fec
str r2, [sl, #0xa8]
str r2, [r10, #0xa8]
ldr r2, [r1, #4]
str r2, [sl, #0xac]
str r2, [r10, #0xac]
ldr r1, [r1, #8]
str r1, [sl, #0xb0]
str r3, [sl, #0xb4]
str r1, [r10, #0xb0]
str r3, [r10, #0xb4]
ldr r0, [r0]
add r0, r0, #0x530
add r0, r0, #0x2000
bl func_ov00_020c4588
mov r1, r0
add r0, sl, #0x294
add r0, r10, #0x294
ldr r2, [r0]
ldr r2, [r2, #0xc]
blx r2
add r0, sl, #4
add r0, r10, #4
ldr r11, _0217c4a8 ; =data_027e0fec
mov r8, sl
add r7, sl, #0x2f0
mov r8, r10
add r7, r10, #0x2f0
add sb, r0, #0x400
mov r5, #0
_0217c290:
add r1, sl, r5
add r1, r10, r5
mov r0, #0
strb r0, [r1, #0x551]
ldr r0, _0217c4ac ; =data_ov35_0218512c
@@ -438,23 +438,23 @@ _0217c290:
cmp r5, #3
blt _0217c290
mov r2, #0
strb r2, [sl, #0x556]
str r2, [sl, #0x54c]
ldr r1, [sl, #0x234]
strb r2, [r10, #0x556]
str r2, [r10, #0x54c]
ldr r1, [r10, #0x234]
add r0, sp, #0xc
ldrb r1, [r1, #0x125]
strb r1, [sl, #0x125]
strb r2, [sl, #0x554]
strb r1, [r10, #0x125]
strb r2, [r10, #0x554]
bl func_ov00_020c1500
mvn r1, #0
add r0, sp, #0xc
str r1, [sp, #0x28]
str r1, [sp, #0x2c]
bl func_ov00_020c3348
ldr r1, [sl, #8]
ldr r1, [r10, #8]
mvn r0, #0
str r1, [sp, #0x28]
ldr r1, [sl, #0xc]
ldr r1, [r10, #0xc]
ldr r5, _0217c4b8 ; =0x52594448
ldr r8, _0217c498 ; =data_027e0fe4
ldr sb, _0217c4bc ; =data_027e0fe8
@@ -470,30 +470,30 @@ _0217c3c8:
ldr r0, [sb]
mov r1, r5
mov r3, r4
add r2, sl, #0x48
add r2, r10, #0x48
bl func_ov00_020c4048
cmp r0, #0
addeq sp, sp, #0x48
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [r8]
mov r1, r6
bl _ZN12ActorManager8GetActorEP8ActorRef
add r2, sl, r7, lsl #2
add r2, r10, r7, lsl #2
add r1, r7, #1
and r7, r1, #0xff
str r0, [r2, #0x280]
cmp r7, #5
blo _0217c3c8
mov sb, #0
str sb, [sl, #0x218]
strb sb, [sl, #0x22f]
str sb, [r10, #0x218]
strb sb, [r10, #0x22f]
mov r0, #2
str sb, [sl, #0x228]
str sb, [r10, #0x228]
ldr r8, _0217c4c0 ; =data_ov35_02185154
ldr r5, _0217c4c4 ; =0x0000017b
mov r11, sl
str r0, [sl, #0x230]
mov r11, r10
str r0, [r10, #0x230]
mov r6, r0
mov r4, #0x17c
mov r3, sb
@@ -501,8 +501,8 @@ _0217c3c8:
_0217c44c:
mov r0, sb, lsl #0x1
ldrsh r7, [r8, r0]
add r2, sl, sb, lsl #2
add r0, sl, sb
add r2, r10, sb, lsl #2
add r0, r10, sb
str r7, [r11, #0x1f8]
str r6, [r11, #0x1fc]
str r5, [r11, #0x15c]
@@ -517,7 +517,7 @@ _0217c44c:
blt _0217c44c
mov r0, #1
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov35_0217c1d4
_0217c498: .word data_027e0fe4
@@ -1528,31 +1528,31 @@ _0217d20c: .word data_ov35_02185146
.global func_ov35_0217d210
arm_func_start func_ov35_0217d210
func_ov35_0217d210: ; 0x0217d210
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x64
mov sl, r0
ldr r0, [sl, #0x218]
mov r10, r0
ldr r0, [r10, #0x218]
mov r5, #0
cmp r0, #0
beq _0217d374
sub r3, r0, #1
add r2, sp, #4
add r0, sl, #0x4d0
add r1, sl, #0x500
str r3, [sl, #0x218]
add r0, r10, #0x4d0
add r1, r10, #0x500
str r3, [r10, #0x218]
bl func_01ff8e84
add r0, sp, #4
add r1, sp, #0x34
bl func_020079d8
ldr r0, [sl, #0x1a4]
ldr r0, [r10, #0x1a4]
ldr r6, _0217d398 ; =data_ov35_0218515a
cmp r0, #0x174
moveq r11, #1
add r0, sl, #0x48
add r0, r10, #0x48
ldr r7, _0217d39c ; =data_ov35_02185184
ldr sb, _0217d3a0 ; =data_ov35_021851ae
movne r11, #0
add r8, sl, #0x1a0
add r8, r10, #0x1a0
str r0, [sp]
add r4, sp, #0x58
_0217d27c:
@@ -1596,7 +1596,7 @@ _0217d2b8:
add r1, sp, #0x34
mov r2, r4
bl func_01ff88b0
ldr r3, [sl, #0x1a0]
ldr r3, [r10, #0x1a0]
ldr r0, [sp, #0x58]
ldr r2, [sp, #0x5c]
mov r0, r0, lsl #0x10
@@ -1616,12 +1616,12 @@ _0217d2b8:
add r7, r7, #6
add r8, r8, #0xc
add sb, sb, #6
add sl, sl, #0xc
add r10, r10, #0xc
blt _0217d27c
add sp, sp, #0x64
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217d374:
add r4, sl, #0x1a0
add r4, r10, #0x1a0
_0217d378:
mov r0, r4
bl func_ov00_020b7e6c
@@ -1630,7 +1630,7 @@ _0217d378:
add r4, r4, #0xc
blt _0217d378
add sp, sp, #0x64
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov35_0217d210
_0217d398: .word data_ov35_0218515a
@@ -1641,7 +1641,7 @@ _0217d3a4: .word data_027e0e58
.global func_ov35_0217d3a8
arm_func_start func_ov35_0217d3a8
func_ov35_0217d3a8: ; 0x0217d3a8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x78
mov r6, r0
ldrb r0, [r6, #0x22f]
@@ -1650,7 +1650,7 @@ func_ov35_0217d3a8: ; 0x0217d3a8
mov r7, #0
add r8, r6, #0x1f4
add sb, r6, #0x158
add sl, r6, #0x17c
add r10, r6, #0x17c
mov r5, r7
mov r4, #0xff
_0217d3d8:
@@ -1658,7 +1658,7 @@ _0217d3d8:
bl func_ov00_020b7e6c
mov r0, sb
bl func_ov00_020b7e6c
mov r0, sl
mov r0, r10
bl func_ov00_020b7e6c
add r1, r6, r7, lsl #2
add r0, r6, r7
@@ -1668,11 +1668,11 @@ _0217d3d8:
cmp r7, #3
add r8, r8, #0xc
add sb, sb, #0xc
add sl, sl, #0xc
add r10, r10, #0xc
blt _0217d3d8
add sp, sp, #0x78
str r5, [r6, #0x228]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217d424:
add r2, sp, #0x18
add r0, r6, #0x4d0
@@ -1796,22 +1796,22 @@ _0217d5d0:
adc r3, r8, lr
stmia r0, {r1, r3}
umull r1, r2, r3, r11
mov sl, #0
mov r1, sl
mov r10, #0
mov r1, r10
mla r2, r3, r1, r2
mla r2, r1, r11, r2
strb r2, [r4, #0x22c]
_0217d614:
cmp r5, sl
cmp r5, r10
beq _0217d630
ldrb r2, [r4, #0x22c]
add r1, r6, sl
add r1, r6, r10
ldrb r1, [r1, #0x22c]
cmp r2, r1
beq _0217d5d0
_0217d630:
add sl, sl, #1
cmp sl, #3
add r10, r10, #1
cmp r10, #3
blt _0217d614
ldr r1, _0217d760 ; =0x0000017b
ldr r0, [sp, #0xc]
@@ -1881,7 +1881,7 @@ _0217d680:
subne r0, r0, #1
strne r0, [r6, #0x228]
add sp, sp, #0x78
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov35_0217d3a8
_0217d74c: .word data_ov35_021851d8
@@ -3906,7 +3906,7 @@ func_ov35_0217f210: ; 0x0217f210
.global func_ov35_0217f234
arm_func_start func_ov35_0217f234
func_ov35_0217f234: ; 0x0217f234
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x520
mov r4, r0
ldr r2, [r4, #0x168]
@@ -3961,7 +3961,7 @@ _0217f2f8:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, [r4, #0x168]
mov r2, #0x1000
add r0, sp, #0x470
@@ -4062,7 +4062,7 @@ _0217f2f8:
ldr r1, [sp, #0x420]
ldr ip, [sp, #0x424]
ldr r11, [sp, #0x428]
ldr sl, [sp, #0x42c]
ldr r10, [sp, #0x42c]
ldr sb, [sp, #0x430]
ldr r8, [sp, #0x434]
str r1, [sp, #0x4b4]
@@ -4072,8 +4072,8 @@ _0217f2f8:
ldr ip, [sp, #0x43c]
str r11, [sp, #0x4bc]
ldr r11, [sp, #0x440]
str sl, [sp, #0x4c0]
ldr sl, [sp, #0x444]
str r10, [sp, #0x4c0]
ldr r10, [sp, #0x444]
str sb, [sp, #0x4c4]
ldr sb, [sp, #0x448]
str r8, [sp, #0x4c8]
@@ -4089,8 +4089,8 @@ _0217f2f8:
ldr ip, [sp, #0x454]
str r11, [sp, #0x4d4]
ldr r11, [sp, #0x458]
str sl, [sp, #0x4d8]
ldr sl, [sp, #0x45c]
str r10, [sp, #0x4d8]
ldr r10, [sp, #0x45c]
str sb, [sp, #0x4dc]
ldr sb, [sp, #0x460]
str r8, [sp, #0x4e0]
@@ -4100,7 +4100,7 @@ _0217f2f8:
add r1, sp, #0x470
str ip, [sp, #0x4e8]
str r11, [sp, #0x4ec]
str sl, [sp, #0x4f0]
str r10, [sp, #0x4f0]
str sb, [sp, #0x4f4]
str r8, [sp, #0x4f8]
strb r7, [sp, #0x4fc]
@@ -4116,7 +4116,7 @@ _0217f2f8:
add r0, sp, #0x470
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217f574:
mov r1, #6
add r0, r4, #0xe8
@@ -4220,7 +4220,7 @@ _0217f688:
blx func_02036140
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217f6f8:
ldr r0, [r4, #0x4e4]
mov r1, #1
@@ -4441,7 +4441,7 @@ _0217fa0c:
bl func_ov00_020bd3b0
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r2, _021800b8 ; =data_027e0d0c
add r0, r4, #0x158
ldr r3, [r2]
@@ -4476,23 +4476,23 @@ _0217fa0c:
mov r1, r1, asr #0x4
mov r7, r1, lsl #0x1
mov r1, r7, lsl #0x1
ldrsh sl, [r5, r1]
ldrsh r10, [r5, r1]
add r1, r7, #1
mov r1, r1, lsl #0x1
ldrsh r8, [r5, r1]
umull ip, r11, sl, r2
mla r11, sl, r3, r11
mov sb, sl, asr #0x1f
adds sl, ip, #0x800
umull ip, r11, r10, r2
mla r11, r10, r3, r11
mov sb, r10, asr #0x1f
adds r10, ip, #0x800
mla r11, sb, r2, r11
adc sb, r11, #0
mov sl, sl, lsr #0xc
orr sl, sl, sb, lsl #20
add r0, r0, sl
umull sl, sb, r8, r2
mov r10, r10, lsr #0xc
orr r10, r10, sb, lsl #20
add r0, r0, r10
umull r10, sb, r8, r2
mla sb, r8, r3, sb
mov r7, r8, asr #0x1f
adds r3, sl, #0x800
adds r3, r10, #0x800
mla sb, r7, r2, sb
str r0, [r4, #0x48]
ldr r0, [r4, #0x50]
@@ -4563,16 +4563,16 @@ _0217fc10:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _021800c0 ; =data_027e0c54
ldrb r1, [r0]
cmp r1, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
bl func_0203608c
cmp r0, #0
addne sp, sp, #0x520
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, #0x1f000
mov r1, #0x1000
bl Divide
@@ -4592,7 +4592,7 @@ _0217fc10:
blx func_02036140
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r0, sp, #0x358
bl func_ov00_0209a4f4
add r0, r4, #0x48
@@ -4637,7 +4637,7 @@ _0217fd30:
ldr r1, [sp, #0x2f4]
ldr ip, [sp, #0x2f8]
ldr r11, [sp, #0x2fc]
ldr sl, [sp, #0x300]
ldr r10, [sp, #0x300]
ldr sb, [sp, #0x304]
str r2, [sp, #0x384]
ldr r2, [sp, #0x308]
@@ -4647,8 +4647,8 @@ _0217fd30:
ldr ip, [sp, #0x310]
str r11, [sp, #0x390]
ldr r11, [sp, #0x314]
str sl, [sp, #0x394]
ldr sl, [sp, #0x318]
str r10, [sp, #0x394]
ldr r10, [sp, #0x318]
str sb, [sp, #0x398]
ldr sb, [sp, #0x31c]
str r2, [sp, #0x39c]
@@ -4660,8 +4660,8 @@ _0217fd30:
ldr ip, [sp, #0x328]
str r11, [sp, #0x3a8]
ldr r11, [sp, #0x32c]
str sl, [sp, #0x3ac]
ldr sl, [sp, #0x330]
str r10, [sp, #0x3ac]
ldr r10, [sp, #0x330]
str sb, [sp, #0x3b0]
ldr sb, [sp, #0x334]
ldrb r8, [sp, #0x350]
@@ -4677,8 +4677,8 @@ _0217fd30:
ldr ip, [sp, #0x340]
str r11, [sp, #0x3c0]
ldr r11, [sp, #0x344]
str sl, [sp, #0x3c4]
ldr sl, [sp, #0x348]
str r10, [sp, #0x3c4]
ldr r10, [sp, #0x348]
str sb, [sp, #0x3c8]
ldr sb, [sp, #0x34c]
str r2, [sp, #0x3cc]
@@ -4688,7 +4688,7 @@ _0217fd30:
add r1, sp, #0x358
str ip, [sp, #0x3d4]
str r11, [sp, #0x3d8]
str sl, [sp, #0x3dc]
str r10, [sp, #0x3dc]
str sb, [sp, #0x3e0]
strb r8, [sp, #0x3e4]
strb r7, [sp, #0x3e5]
@@ -4704,7 +4704,7 @@ _0217fd30:
add r0, sp, #0x358
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217fe50:
ldr r2, _021800b8 ; =data_027e0d0c
add r0, r4, #0x158
@@ -4746,7 +4746,7 @@ _0217fee0:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r0, r4, #0x48
add r3, sp, #0x48
ldmia r0, {r0, r1, r2}
@@ -4810,7 +4810,7 @@ _0217fee0:
add r0, sp, #0x240
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217fff0:
ldr r1, [sp, #0x48]
add r0, r4, #0x158
@@ -4891,7 +4891,7 @@ _0218010c:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, [r4, #0x4e4]
mov r2, #0
add r0, sp, #0x190
@@ -4907,16 +4907,16 @@ _0218010c:
mov r0, r0, asr #0x4
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
ldr r5, _02180108 ; =0x00001b33
ldrsh r8, [r2, r0]
umull r6, r0, sl, r5
umull r6, r0, r10, r5
umull r3, r2, r8, r5
adds r6, r6, #0x800
mla r0, sl, lr, r0
mov sb, sl, asr #0x1f
mla r0, r10, lr, r0
mov sb, r10, asr #0x1f
mla r0, sb, r5, r0
adc r0, r0, #0
mov r6, r6, lsr #0xc
@@ -4944,9 +4944,9 @@ _0218010c:
sub r0, r1, #0x2000
str r3, [sp, #0x1b4]
sub r3, r5, #0x800
umull r6, r5, sl, r0
umull r6, r5, r10, r0
sub r11, lr, #1
mla r5, sl, r11, r5
mla r5, r10, r11, r5
ldr r2, [sp, #0x44]
mla r5, sb, r0, r5
adds r6, r6, #0x800
@@ -4984,8 +4984,8 @@ _0218010c:
adc r1, r0, #0
mov r0, r3, lsr #0xc
orr r0, r0, r1, lsl #20
umull r3, r1, sl, ip
mla r1, sl, lr, r1
umull r3, r1, r10, ip
mla r1, r10, lr, r1
adds r3, r3, #0x800
mla r1, sb, ip, r1
strb r2, [sp, #0x19a]
@@ -5027,7 +5027,7 @@ _0218010c:
add r0, sp, #0x190
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0218033c:
add r0, r4, #0x158
mov r1, #5
@@ -5107,7 +5107,7 @@ _02180424:
mov r1, #0x19
bl func_ov35_0217f234
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0218046c:
add r0, r4, #0x158
mov r1, #0xb
@@ -5198,7 +5198,7 @@ _021805ac:
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x520
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _021800ac ; =data_027e0fc8
ldr r0, [r0]
ldr r1, [r0]
@@ -5292,7 +5292,7 @@ _021805ac:
ldr r0, _021800a4 ; =data_027e0f74
ldr ip, [sp, #0xb0]
ldr r11, [sp, #0xb4]
ldr sl, [sp, #0xb8]
ldr r10, [sp, #0xb8]
str sb, [sp, #0x138]
ldr sb, [sp, #0xbc]
ldrb r8, [sp, #0xd8]
@@ -5308,8 +5308,8 @@ _021805ac:
ldr ip, [sp, #0xc8]
str r11, [sp, #0x148]
ldr r11, [sp, #0xcc]
str sl, [sp, #0x14c]
ldr sl, [sp, #0xd0]
str r10, [sp, #0x14c]
ldr r10, [sp, #0xd0]
str sb, [sp, #0x150]
ldr sb, [sp, #0xd4]
str r2, [sp, #0x154]
@@ -5319,7 +5319,7 @@ _021805ac:
add r1, sp, #0xe0
str ip, [sp, #0x15c]
str r11, [sp, #0x160]
str sl, [sp, #0x164]
str r10, [sp, #0x164]
str sb, [sp, #0x168]
strb r8, [sp, #0x16c]
strb r7, [sp, #0x16d]
@@ -5335,7 +5335,7 @@ _021805ac:
add r0, sp, #0xe0
bl func_ov00_0209a508
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021807e0:
ldr r0, _021800d8 ; =data_ov00_020eec68
mov r2, #0
@@ -5446,7 +5446,7 @@ _02180974:
ldr r0, [sp, #8]
str r0, [r4, #0x130]
add sp, sp, #0x520
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
_0218098c: .word data_027e0764
_02180990: .word 0x00000223
@@ -7918,7 +7918,7 @@ _02182b18: .word 0x00001ccd
.global func_ov35_02182b1c
arm_func_start func_ov35_02182b1c
func_ov35_02182b1c: ; 0x02182b1c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x118
mov r4, r0
ldr r0, [r4, #0x550]
@@ -7926,11 +7926,11 @@ func_ov35_02182b1c: ; 0x02182b1c
subgt r0, r0, #1
addgt sp, sp, #0x118
strgt r0, [r4, #0x550]
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldrb r0, [r4, #0x563]
cmp r0, #3
addhs sp, sp, #0x118
ldmhsia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmhsia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr r0, _02182f88 ; =data_027e0f64
ldr r3, _02182f8c ; =data_027e0f94
ldr r0, [r0]
@@ -7975,17 +7975,17 @@ _02182be8:
ldr r7, [sp, #0xac]
sub r8, sb, #0x7000
add sb, sb, #0x6000
add sl, r7, #0x8000
add r10, r7, #0x8000
sub sb, sb, r8
add r7, sb, #1
cmp r7, #0
str sl, [sp, #0xac]
str r10, [sp, #0xac]
movle r3, r0
ble _02182c44
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
adds r2, ip, sl
adds r2, ip, r10
adc r3, r3, sb
stmia r6, {r2, r3}
cmp r7, #0
@@ -8003,17 +8003,17 @@ _02182c50:
ldr r7, [sp, #0xac]
sub r8, sb, #0x7000
add sb, sb, #0x6000
sub sl, r7, #0x8000
sub r10, r7, #0x8000
sub sb, sb, r8
add r7, sb, #1
cmp r7, #0
str sl, [sp, #0xac]
str r10, [sp, #0xac]
movle r3, r0
ble _02182cac
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
adds r2, ip, sl
adds r2, ip, r10
adc r3, r3, sb
stmia r6, {r2, r3}
cmp r7, #0
@@ -8035,10 +8035,10 @@ _02182cb8:
cmp r7, #0
movle r3, r0
ble _02182d08
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
adds r2, ip, sl
adds r2, ip, r10
adc r3, r3, sb
stmia r6, {r2, r3}
cmp r7, #0
@@ -8063,10 +8063,10 @@ _02182d20:
cmp r7, #0
movle r3, r0
ble _02182d70
umull sl, sb, r2, r5
umull r10, sb, r2, r5
mla sb, r2, lr, sb
mla sb, r1, r5, sb
adds r2, ip, sl
adds r2, ip, r10
adc r3, r3, sb
stmia r6, {r2, r3}
cmp r7, #0
@@ -8101,7 +8101,7 @@ _02182d84:
movne r0, #0
cmp r0, #0
addne sp, sp, #0x118
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr r0, _02182f88 ; =data_027e0f64
ldr r3, [sp, #0xac]
ldr r2, [sp, #0xb0]
@@ -8132,7 +8132,7 @@ _02182d84:
_02182e40:
cmp r5, #0
addne sp, sp, #0x118
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
ldr r0, _02182f8c ; =data_027e0f94
mov r8, #0
ldr ip, _02182f98 ; =0x0000ffff
@@ -8185,7 +8185,7 @@ _02182e40:
bl func_01ffbe78
cmp r0, #0
addne sp, sp, #0x118
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
add r0, sp, #0x58
bl func_ov00_020c1500
mvn r1, #0
@@ -8211,7 +8211,7 @@ _02182e40:
mov r0, #0x1e
str r0, [r4, #0x550]
add sp, sp, #0x118
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov35_02182b1c
_02182f88: .word data_027e0f64
+89 -89
View File
@@ -2145,7 +2145,7 @@ _0217da68: .word data_027e0f74
.global func_ov36_0217da6c
arm_func_start func_ov36_0217da6c
func_ov36_0217da6c: ; 0x0217da6c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x60
mov r4, r0
bl func_ov36_02184e10
@@ -2251,7 +2251,7 @@ _0217dbac:
add r0, r4, #0x2c
add r0, r0, #0x800
ldrh r5, [r4, #0x78]
add sl, r3, #0x800
add r10, r3, #0x800
ldmia r0, {r0, r1, r2}
mov r3, r5, asr #0x4
mov r5, r3, lsl #0x1
@@ -2266,7 +2266,7 @@ _0217dbac:
add sb, sp, #0x3c
ldrsh r8, [r1, r2]
sub lr, r0, #5
ldmia sl, {r0, r1, r2}
ldmia r10, {r0, r1, r2}
stmia sb, {r0, r1, r2}
mov r2, sb
ldr sb, [r4, #0x864]
@@ -2276,12 +2276,12 @@ _0217dbac:
str r1, [sp, #0x34]
ldr ip, _0217dd74 ; =0x0000099a
str r5, [sp, #0x38]
umull sl, r5, sb, ip
umull r10, r5, sb, ip
mla r5, sb, r6, r5
mov r0, sb, asr #0x1f
str r6, [sp, #0x2c]
mla r5, r0, ip, r5
adds r6, sl, #0x800
adds r6, r10, #0x800
adc r0, r5, #0
mov r5, r6, lsr #0xc
orr r5, r5, r0, lsl #20
@@ -2329,16 +2329,16 @@ _0217dbac:
ldr r0, [r4, #0x130]
cmp r0, #1
addlt sp, sp, #0x60
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
cmp r0, #0x16
addge sp, sp, #0x60
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmgeia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, _0217dd64 ; =data_027e0fc8
add r1, r4, #0x48
ldr r0, [r0]
bl func_ov00_020bb6d4
add sp, sp, #0x60
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_0217da6c
_0217dd64: .word data_027e0fc8
@@ -5306,7 +5306,7 @@ func_ov36_02180660: ; 0x02180660
.global func_ov36_02180664
arm_func_start func_ov36_02180664
func_ov36_02180664: ; 0x02180664
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xd4
mov r7, r0
ldr r0, [r7, #0x878]
@@ -5361,7 +5361,7 @@ _021806cc:
b _02180860
_02180730:
ldrsh r1, [r7, #0x78]
ldr sl, _0218098c ; =data_02050f54
ldr r10, _0218098c ; =data_02050f54
mov sb, #5
strh r1, [r0, #0x9c]
add r0, r1, #0x2000
@@ -5387,8 +5387,8 @@ _02180774:
str r3, [sp, #0x1c]
mov r3, r0, lsl #0x1
mov r0, r3, lsl #0x1
ldrsh lr, [sl, r0]
add r0, sl, r3, lsl #1
ldrsh lr, [r10, r0]
add r0, r10, r3, lsl #1
ldrsh ip, [r0, #2]
mov r0, lr, asr #0x1f
mov r0, r0, lsl #0xe
@@ -5510,7 +5510,7 @@ _0218091c:
strb r0, [r7, #0x8a6]
mov r0, #1
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02180664
_02180980: .word data_027e0d0c
@@ -6008,7 +6008,7 @@ _02181068:
.global func_ov36_0218108c
arm_func_start func_ov36_0218108c
func_ov36_0218108c: ; 0x0218108c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x118
mov r4, r0
ldr r2, [r4, #0x878]
@@ -6049,17 +6049,17 @@ _0218110c:
str r2, [r4, #0x66c]
bl func_ov36_0217d6bc
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02181128:
mov r0, #0
add sp, sp, #0x118
str r0, [r4, #0x138]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02181138:
ldr r1, [r4, #0x138]
cmp r1, #0x1e
addlt sp, sp, #0x118
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
beq _0218116c
@@ -6084,7 +6084,7 @@ _02181194:
mvn r0, #0
add sp, sp, #0x118
str r0, [r4, #0x66c]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021811a4:
ldr r1, [r4, #0x66c]
mvn r0, #0
@@ -6115,18 +6115,18 @@ _021811a4:
str r2, [sp, #0x90]
ldr r0, [r0, #4]
bl func_ov00_02087d34
mov sl, #0
mov r10, #0
ldr r3, _0218154c ; =0x000004cd
ldr r2, _02181550 ; =0x00001e84
ldr r1, _02181554 ; =0x0000038e
mov r5, #0x19000
ldr r0, [sp]
str r5, [sp, #0x18]
str sl, [sp, #0x24]
str r10, [sp, #0x24]
str r3, [sp, #0x20]
str sl, [sp, #0x1c]
str r10, [sp, #0x1c]
str r2, [sp, #0x10]
str sl, [sp, #0x14]
str r10, [sp, #0x14]
str r1, [sp, #0xc]
str r0, [r4, #0x6e4]
ldr r0, [sp, #4]
@@ -6248,7 +6248,7 @@ _021811a4:
strb r3, [sp, #0xf7]
strb r2, [sp, #0xf8]
strb r11, [sp, #0x7c]
strb sl, [sp, #0x7e]
strb r10, [sp, #0x7e]
bl func_ov00_02097810
str r0, [r4, #0x66c]
cmp r0, #0
@@ -6256,7 +6256,7 @@ _021811a4:
bge _02181450
bl func_ov00_0209a508
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02181450:
bl func_ov00_0209a508
_02181454:
@@ -6300,7 +6300,7 @@ _021814c8:
mov r1, #0x16
bl func_ov36_0217d6bc
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021814ec:
ldr r0, _0218155c ; =data_027e0ffc
ldr r1, _02181560 ; =0x000002cb
@@ -6322,7 +6322,7 @@ _021814ec:
ldr r0, [r0, #4]
bl func_ov00_02088000
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_0218108c
_02181540: .word data_027e0f74
@@ -6340,14 +6340,14 @@ _02181568: .word data_027e1038
.global func_ov36_0218156c
arm_func_start func_ov36_0218156c
func_ov36_0218156c: ; 0x0218156c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x118
mov r4, r0
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x118
mov r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
str r0, [r4, #0x12c]
strb r0, [r4, #0x8a7]
ldr r0, [r4, #0x878]
@@ -6415,7 +6415,7 @@ _0218166c:
str r0, [sp, #0xa4]
ldr r0, [sp, #0x2c]
ldr r1, [sp, #0xc]
ldr sl, [sp, #0x14]
ldr r10, [sp, #0x14]
ldr sb, [sp, #0x18]
str r8, [sp, #0x94]
ldr r8, [sp, #0x1c]
@@ -6427,8 +6427,8 @@ _0218166c:
ldr r0, [sp, #0x48]
str r1, [sp, #0xa0]
ldr r1, [sp, #0x28]
str sl, [sp, #0xa8]
ldr sl, [sp, #0x30]
str r10, [sp, #0xa8]
ldr r10, [sp, #0x30]
str sb, [sp, #0xac]
ldr sb, [sp, #0x34]
str r8, [sp, #0xb0]
@@ -6446,8 +6446,8 @@ _0218166c:
ldr r0, _0218178c ; =data_027e0f74
str r1, [sp, #0xbc]
ldr r1, [sp, #0x44]
str sl, [sp, #0xc4]
ldr sl, [sp, #0x4c]
str r10, [sp, #0xc4]
ldr r10, [sp, #0x4c]
str sb, [sp, #0xc8]
ldr sb, [sp, #0x50]
str r8, [sp, #0xcc]
@@ -6460,7 +6460,7 @@ _0218166c:
str r1, [sp, #0xd8]
ldr r0, [r0]
add r1, sp, #0x68
str sl, [sp, #0xe0]
str r10, [sp, #0xe0]
str sb, [sp, #0xe4]
str r8, [sp, #0xe8]
str r7, [sp, #0xec]
@@ -6477,7 +6477,7 @@ _0218166c:
bl func_ov00_0209a508
mov r0, r11
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_0218156c
_02181784: .word data_ov36_02186cdc
@@ -6570,7 +6570,7 @@ _021818b0: .word data_027e0f64
.global func_ov36_021818b4
arm_func_start func_ov36_021818b4
func_ov36_021818b4: ; 0x021818b4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x118
ldr r1, _02181b80 ; =data_027e103c
mov r4, r0
@@ -6697,7 +6697,7 @@ _021818fc:
str r0, [sp, #0xdc]
ldr r0, _02181b88 ; =data_027e0f74
ldr r1, [sp, #0x44]
ldr sl, [sp, #0x4c]
ldr r10, [sp, #0x4c]
ldr sb, [sp, #0x50]
ldr r8, [sp, #0x54]
ldr r7, [sp, #0x58]
@@ -6707,7 +6707,7 @@ _021818fc:
str r1, [sp, #0xd8]
ldr r0, [r0]
add r1, sp, #0x68
str sl, [sp, #0xe0]
str r10, [sp, #0xe0]
str sb, [sp, #0xe4]
str r8, [sp, #0xe8]
str r7, [sp, #0xec]
@@ -6751,7 +6751,7 @@ _02181b40:
bl func_ov00_0209a508
mov r0, #1
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_021818b4
_02181b80: .word data_027e103c
@@ -7706,7 +7706,7 @@ _0218298c: .word data_027e0e60
.global func_ov36_02182990
arm_func_start func_ov36_02182990
func_ov36_02182990: ; 0x02182990
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x124
ldr r1, _02182c64 ; =data_027e0e60
mov r4, r0
@@ -7859,14 +7859,14 @@ _02182a7c:
ldrb ip, [sp, #0x6f]
ldrb r3, [sp, #0x70]
ldr r0, _02182c7c ; =data_027e0f74
ldr sl, [sp, #0x5c]
ldr r10, [sp, #0x5c]
ldr sb, [sp, #0x60]
ldr r8, [sp, #0x64]
ldr r7, [sp, #0x68]
mov r2, #1
ldr r0, [r0]
add r1, sp, #0x74
str sl, [sp, #0xf0]
str r10, [sp, #0xf0]
str sb, [sp, #0xf4]
str r8, [sp, #0xf8]
str r7, [sp, #0xfc]
@@ -7889,7 +7889,7 @@ _02182a7c:
bl func_ov00_0209a508
mov r0, #1
add sp, sp, #0x124
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov36_02182990
_02182c64: .word data_027e0e60
@@ -8509,7 +8509,7 @@ _02183500: .word 0x00002aab
.global func_ov36_02183504
arm_func_start func_ov36_02183504
func_ov36_02183504: ; 0x02183504
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14c
mov r5, r0
ldr r1, [r5, #0x810]
@@ -8526,7 +8526,7 @@ func_ov36_02183504: ; 0x02183504
ldr r0, [sp, #0xc]
add sp, sp, #0x14c
str r0, [r5, #0x814]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0218354c:
ldr r0, _02183a08 ; =data_027e0fe4
add r1, r5, #0x810
@@ -8577,24 +8577,24 @@ _0218354c:
cmp r0, #2
beq _0218397c
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02183614:
mov r0, r4
bl func_ov14_02125038
cmp r0, #0
addeq sp, sp, #0x14c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r0, sp, #0x28
add r1, r4, #0x48
bl func_ov00_020ce2f0
cmp r0, #0x1000
addge sp, sp, #0x14c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, r5
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x14c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r0, sp, #0x9c
bl func_ov00_0209a4f4
mvn r6, #0
@@ -8616,18 +8616,18 @@ _02183614:
str r2, [sp, #0xc4]
ldr r0, [r0, #4]
bl func_ov00_02087d34
mov sl, #0
mov r10, #0
ldr r3, _02183a18 ; =0x000004cd
ldr r2, _02183a1c ; =0x00001e84
ldr r1, _02183a20 ; =0x0000038e
mov r6, #0x19000
ldr r0, [sp, #0x34]
str r6, [sp, #0x4c]
str sl, [sp, #0x58]
str r10, [sp, #0x58]
str r3, [sp, #0x54]
str sl, [sp, #0x50]
str r10, [sp, #0x50]
str r2, [sp, #0x44]
str sl, [sp, #0x48]
str r10, [sp, #0x48]
str r1, [sp, #0x40]
str r0, [r5, #0x6e4]
ldr r0, [sp, #0x38]
@@ -8749,7 +8749,7 @@ _02183614:
strb r3, [sp, #0x12b]
strb r2, [sp, #0x12c]
strb r11, [sp, #0xb0]
strb sl, [sp, #0xb2]
strb r10, [sp, #0xb2]
bl func_ov00_02097810
str r0, [r5, #0x66c]
cmp r0, #0
@@ -8765,7 +8765,7 @@ _021838ec:
add r0, sp, #0x9c
bl func_ov00_0209a508
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021838fc:
ldr r1, [r4, #0x48]
ldr r2, _02183a14 ; =data_027e0f64
@@ -8789,7 +8789,7 @@ _021838fc:
ldr r1, _02183a28 ; =0x00000333
cmp r0, r1
addge sp, sp, #0x14c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r2, r5, #0x26c
mov r0, r4
add r1, r5, #0x48
@@ -8798,7 +8798,7 @@ _021838fc:
mov r0, #2
add sp, sp, #0x14c
strb r0, [r5, #0x8a6]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0218397c:
ldr r1, [r4, #0x48]
ldr r2, _02183a14 ; =data_027e0f64
@@ -8821,7 +8821,7 @@ _0218397c:
bl func_ov00_020ce2f0
cmp r0, #0x1000
addge sp, sp, #0x14c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r2, r6
strb r2, [r4, #0x118]
mov r0, r5
@@ -8829,13 +8829,13 @@ _0218397c:
strb r2, [r5, #0x8a6]
bl func_ov36_0217d6bc
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021839f4:
mvn r0, #0
str r0, [r5, #0x810]
str r0, [r5, #0x814]
add sp, sp, #0x14c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02183504
_02183a08: .word data_027e0fe4
@@ -8956,7 +8956,7 @@ _02183b78: .word data_027e0764
.global func_ov36_02183b7c
arm_func_start func_ov36_02183b7c
func_ov36_02183b7c: ; 0x02183b7c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x58
mov r6, r0
ldrb r2, [r6, #0x8ad]
@@ -8965,7 +8965,7 @@ func_ov36_02183b7c: ; 0x02183b7c
beq _02183ba4
bl func_ov36_021840c4
add sp, sp, #0x58
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02183ba4:
ldrb r0, [r6, #0x8a6]
cmp r0, #0
@@ -8977,13 +8977,13 @@ _02183ba4:
cmp r1, r0
addeq sp, sp, #0x58
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02183bd0:
ldr r0, [r6, #0x870]
cmp r0, #0
addne sp, sp, #0x58
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [r5, #0x14]
cmp r0, #0
beq _02183c18
@@ -9064,7 +9064,7 @@ _02183ce8:
add r1, sp, #0x48
mov r0, r3
bl func_ov00_020ce2f0
mov sl, r0
mov r10, r0
add r0, sp, #0x48
add r1, sp, #0x3c
add r2, sp, #0x30
@@ -9120,10 +9120,10 @@ _02183ce8:
bl func_01ff9cec
ldr r1, [sp, #0x54]
add r0, r1, r0
cmp r0, sl
cmp r0, r10
addlt sp, sp, #0x58
movlt r0, r11
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [r5, #0x14]
cmp r0, #0
beq _02183f44
@@ -9214,7 +9214,7 @@ _02183f2c:
_02183f38:
add sp, sp, #0x58
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02183f44:
ldr r0, [r5, #0x10]
cmp r0, #8
@@ -9305,7 +9305,7 @@ _02184078:
str r0, [r6, #0x870]
mov r0, #1
add sp, sp, #0x58
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02183b7c
_0218408c: .word 0x424d5459
@@ -9332,7 +9332,7 @@ _021840c0: .word func_01fffcec
.global func_ov36_021840c4
arm_func_start func_ov36_021840c4
func_ov36_021840c4: ; 0x021840c4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x30
mov r5, r1
ldr r1, [r5, #0x10]
@@ -9352,7 +9352,7 @@ _021840ec:
bl func_ov00_020ceacc
add sp, sp, #0x30
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184114:
ldr r0, [r5, #0x14]
cmp r0, #0
@@ -9369,28 +9369,28 @@ _02184114:
bl func_ov00_020ceacc
add sp, sp, #0x30
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184154:
add sp, sp, #0x30
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184160:
ldr r0, [r6, #0x870]
cmp r0, #0
addne sp, sp, #0x30
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrb r0, [r5]
cmp r0, #0
addeq sp, sp, #0x30
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r0, [r6, #0x130]
cmp r0, #0x13
cmpne r0, #0x11
addne sp, sp, #0x30
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r3, [r5, #0x14]
mov r4, #0
cmp r3, #0
@@ -9402,7 +9402,7 @@ _02184160:
cmp r1, r0
addlt sp, sp, #0x30
movlt r0, r4
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, [r3, #4]
ldr r0, _02184414 ; =0x41525257
cmp r1, r0
@@ -9440,11 +9440,11 @@ _02184160:
adds sb, sb, #0x800
adc r7, r8, #0
mov r8, sb, lsr #0xc
ldr sl, [r6, #0x50]
ldr r10, [r6, #0x50]
orr r8, r8, r7, lsl #20
ldr r3, [r6, #0x4c]
ldr ip, [r6, #0x48]
add r7, sl, r8
add r7, r10, r8
str r7, [sp, #0x2c]
umull r8, r7, r2, r0
str r3, [sp, #0x28]
@@ -9487,11 +9487,11 @@ _021842d4:
bge _0218432c
add sp, sp, #0x30
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184320:
add sp, sp, #0x30
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0218432c:
ldr r0, [r6, #0x50]
ldr r2, [r6, #0x4c]
@@ -9550,7 +9550,7 @@ _021843e8:
_021843fc:
mov r0, #1
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_021840c4
_02184408: .word data_027e0ffc
@@ -10014,7 +10014,7 @@ _02184a5c:
.global func_ov36_02184a64
arm_func_start func_ov36_02184a64
func_ov36_02184a64: ; 0x02184a64
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x118
ldr r2, _02184dd8 ; =data_027e0f74
mov r5, r0
@@ -10186,7 +10186,7 @@ _02184c94:
ldr r0, [sp, #0x38]
str r1, [sp, #0xb4]
ldr r1, [sp, #0x34]
ldr sl, [sp, #8]
ldr r10, [sp, #8]
str sb, [sp, #0xbc]
ldr sb, [sp, #0x3c]
str r8, [sp, #0xc0]
@@ -10202,9 +10202,9 @@ _02184c94:
ldrb r3, [sp, #0x64]
str r1, [sp, #0xc8]
ldr r1, [sp, #0x48]
str sl, [sp, #0x9c]
str r10, [sp, #0x9c]
str sb, [sp, #0xd0]
ldr sl, [sp, #0x50]
ldr r10, [sp, #0x50]
str r8, [sp, #0xd4]
ldr sb, [sp, #0x54]
str r4, [sp, #0xd8]
@@ -10215,7 +10215,7 @@ _02184c94:
str r0, [sp, #0xe0]
ldr r0, [r11]
add r1, sp, #0x68
str sl, [sp, #0xe4]
str r10, [sp, #0xe4]
str sb, [sp, #0xe8]
str r8, [sp, #0xec]
str r4, [sp, #0xf0]
@@ -10235,12 +10235,12 @@ _02184c94:
bl func_ov00_0209a508
add sp, sp, #0x118
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184dc8:
bl func_ov00_0209a508
mov r0, #1
add sp, sp, #0x118
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov36_02184a64
_02184dd8: .word data_027e0f74
+179 -179
View File
File diff suppressed because it is too large Load Diff
+251 -251
View File
File diff suppressed because it is too large Load Diff
+76 -76
View File
@@ -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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, #6
mul r0, r2, r0
ldr r1, _0217e818 ; =data_ov39_02186590
@@ -3068,14 +3068,14 @@ _0217e6dc:
add r2, sp, #0x24
bl func_01ff9bf8
ldr r0, [r11]
mov sl, #0
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,7 +3094,7 @@ _0217e6dc:
movne r0, #0
strneb r0, [r1, #0x25c]
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217e7ec:
add sb, sb, #1
cmp sb, #2
@@ -3102,7 +3102,7 @@ _0217e7ec:
blt _0217e6dc
mov r0, #0
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x1c
mov r5, r0
ldr r1, _0217f264 ; =data_027e0fac
@@ -3835,11 +3835,11 @@ func_ov39_0217f10c: ; 0x0217f10c
mov r6, r7, asr #0x1f
mla r8, r6, r3, r8
adds r6, sb, #0x800
ldr sl, [sp, #4]
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 r11, ip, asr #0x1f
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, sb, 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, sb, r10, pc}
_0217f868:
bl _ZN5Actor16IsFollowedByLinkEv
cmp r0, #0
@@ -4364,7 +4364,7 @@ _0217f868:
ldrsh r8, [r5, r6]
mov ip, #0xcd
add r3, r3, #1
umull sl, sb, r8, ip
umull r10, sb, r8, ip
mov r3, r3, lsl #0x1
ldrsh lr, [r5, r3]
add r3, sp, #0xc
@@ -4373,10 +4373,10 @@ _0217f868:
mla sb, r8, r7, sb
mov r0, r8, asr #0x1f
mla sb, r0, ip, sb
adds sl, sl, #0x800
adds r10, r10, #0x800
mla r5, lr, r7, r5
adc r1, sb, #0
mov r0, sl, lsr #0xc
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, sb, 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, sb, 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, sb, r10, lr}
sub sp, sp, #0x40
mov r4, #1
mov sl, r0
mov r10, r0
mov r5, r4
bl _ZN5Actor14GetAngleToLinkEv
mov r6, #0
@@ -6701,26 +6701,26 @@ func_ov39_0218199c: ; 0x0218199c
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
@@ -6852,38 +6852,38 @@ _02181c04:
strh sb, [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, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x124
mov r4, r0
ldr r0, _02183c10 ; =data_027e0ffc
@@ -9040,7 +9040,7 @@ func_ov39_021838c4: ; 0x021838c4
mov r11, #0
ldr r6, [sp, #0xc]
ldr r5, [sp, #0x10]
ldr sl, [sp, #0x14]
ldr r10, [sp, #0x14]
ldr sb, [sp, #0x18]
ldr r8, [sp, #0x1c]
ldr r7, [sp, #0x24]
@@ -9048,8 +9048,8 @@ func_ov39_021838c4: ; 0x021838c4
ldr r6, [sp, #0x34]
str r5, [sp, #0xa4]
ldr r5, [sp, #0x38]
str sl, [sp, #0xa8]
ldr sl, [sp, #0x3c]
str r10, [sp, #0xa8]
ldr r10, [sp, #0x3c]
str sb, [sp, #0xac]
ldr sb, [sp, #0x40]
str r8, [sp, #0xb0]
@@ -9065,8 +9065,8 @@ 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 r10, [sp, #0xd0]
ldr r10, [sp, #0x54]
str sb, [sp, #0xd4]
ldr sb, [sp, #0x58]
str r8, [sp, #0xd8]
@@ -9077,7 +9077,7 @@ 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 r11, [sp, #0x30]
str r11, [sp, #0x2c]
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r2, [r0, #0x30]
cmp r1, r2
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184d60: ; jump table
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc} ; case 0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc} ; case 0
b _02184d70 ; case 1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc} ; case 2
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02184d7c:
ldr lr, _02184e64 ; =data_027e0764
mov ip, #0
@@ -10396,9 +10396,9 @@ _02184d7c:
ldr r6, [lr, #0xc]
ldr r11, [lr, #0x10]
mla r8, r6, r5, r8
ldr sl, [lr, #0x14]
ldr r10, [lr, #0x14]
adds r4, r11, sb
adc r5, sl, r8
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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x30
mov r4, r0
ldr r0, [r4, #0x30]
@@ -10530,8 +10530,8 @@ _02184fc8:
mov r1, #0x2e
umull r3, r5, r6, r1
mla r5, r6, r11, r5
mov sl, r11
mla r5, sl, r1, r5
mov r10, r11
mla r5, r10, r1, r5
str r6, [r2, #4]
add r1, r5, #0x2d
str r1, [r4, #0x34]
@@ -10549,7 +10549,7 @@ _02184fc8:
str r5, [r2]
umull r3, r5, r6, r0
mla r5, r6, r11, r5
mla r5, sl, r0, r5
mla r5, r10, r0, r5
sub r1, r0, #0x4000
str r6, [r2, #4]
add r1, r5, r1
@@ -10566,7 +10566,7 @@ _02184fc8:
stmia r2, {r3, r5}
umull r2, r3, r5, r0
mla r3, r5, r11, r3
mla r3, sl, r0, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov39_02184e6c
_021850e8: .word 0xffffce39
+134 -134
View File
@@ -2292,15 +2292,15 @@ _0217dbd0:
.global func_ov40_0217dbec
arm_func_start func_ov40_0217dbec
func_ov40_0217dbec: ; 0x0217dbec
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
mov sl, r0
ldr r2, [sl, #0x3c]
add r0, sl, #0x10
str r2, [sl, #0x4c]
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r10, r0
ldr r2, [r10, #0x3c]
add r0, r10, #0x10
str r2, [r10, #0x4c]
mov sb, r1
bl func_ov40_0217ec84
ldr r7, [sl, #4]
ldr r1, [sl, #8]
ldr r7, [r10, #4]
ldr r1, [r10, #8]
mov r8, r0
add r0, r7, r1, lsl #2
cmp r7, r0
@@ -2317,8 +2317,8 @@ _0217dc2c:
ldr r2, [r6, #0x14]
cmpeq r8, #0
movne r8, r11
ldr r1, [sl, #4]
ldr r0, [sl, #8]
ldr r1, [r10, #4]
ldr r0, [r10, #8]
add r7, r7, #4
add r0, r1, r0, lsl #2
moveq r8, #0
@@ -2329,8 +2329,8 @@ _0217dc2c:
_0217dc70:
orr r1, r4, r5, lsl #16
mov r0, r8
str r1, [sl, #0x48]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
str r1, [r10, #0x48]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov40_0217dbec
.global func_ov40_0217dc80
@@ -3089,9 +3089,9 @@ func_ov40_0217e59c: ; 0x0217e59c
.global func_ov40_0217e5a4
arm_func_start func_ov40_0217e5a4
func_ov40_0217e5a4: ; 0x0217e5a4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov sb, r1
mov sl, r0
mov r10, r0
mov r8, r2
ldr r1, _0217e6f0 ; =data_ov40_02188010
mov r0, sb
@@ -3099,19 +3099,19 @@ func_ov40_0217e5a4: ; 0x0217e5a4
bl func_0204366c
cmp r0, #0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r1, [sb, #4]
ldr r0, _0217e6f4 ; =0x0000feff
cmp r1, r0
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldrh r1, [sb, #6]
cmp r1, #1
movlo r0, #0
ldmloia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmloia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
cmp r1, #3
movhi r0, #0
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmhiia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, [sb, #0xc]
add r7, sb, #0x20
cmp r1, #0
@@ -3138,39 +3138,39 @@ _0217e64c:
beq _0217e698
b _0217e6b4
_0217e658:
mov r0, sl
mov r0, r10
mov r1, r7
mov r2, r8
bl func_ov40_0217e700
cmp r0, #0
bne _0217e6d0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217e678:
mov r0, sl
mov r0, r10
mov r1, r7
mov r2, r8
bl func_ov40_0217e740
cmp r0, #0
bne _0217e6d0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217e698:
mov r0, sl
mov r0, r10
mov r1, r7
bl func_ov40_0217e748
cmp r0, #0
bne _0217e6d0
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217e6b4:
mov r0, sl
mov r0, r10
mov r1, r7
mov r2, r8
bl func_ov40_0217e77c
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0217e6d0:
ldr r1, [r7]
ldr r0, [sb, #0xc]
@@ -3180,7 +3180,7 @@ _0217e6d0:
blo _0217e620
_0217e6e8:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_0217e5a4
_0217e6f0: .word data_ov40_02188010
@@ -3635,7 +3635,7 @@ func_ov40_0217ec68: ; 0x0217ec68
.global func_ov40_0217ec84
arm_func_start func_ov40_0217ec84
func_ov40_0217ec84: ; 0x0217ec84
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
mov r8, r1
mov r7, #0
@@ -3669,7 +3669,7 @@ _0217ecd4:
blx r1
_0217ecf8:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217ed00:
ldr r0, [sb, #0x14]
cmp r0, #8
@@ -3704,11 +3704,11 @@ _0217ed48:
blx r2
_0217ed70:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217ed78:
mov r6, #1
mov r5, #2
mov sl, r6
mov r10, r6
mov r4, #0
_0217ed88:
ldr r0, [sb, #0x34]
@@ -3736,7 +3736,7 @@ _0217edc0:
blx r1
_0217ede0:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0217ede8:
ldrb r0, [sb, #0x24]
cmp r0, #0
@@ -3757,7 +3757,7 @@ _0217ee08:
cmp r1, #0
beq _0217ec94
_0217ee2c:
mov r7, sl
mov r7, r10
cmp r8, r1
blo _0217ee54
mov r0, sb
@@ -3777,7 +3777,7 @@ _0217ee54:
ldr r2, [r2, #0x30]
blx r2
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
arm_func_end func_ov40_0217ec84
.global func_ov40_0217ee7c
@@ -10360,29 +10360,29 @@ _02183e50: .word data_027e0fe0
.global func_ov40_02183e54
arm_func_start func_ov40_02183e54
func_ov40_02183e54: ; 0x02183e54
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
mov sl, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r10, r0
bl func_ov40_0217bf30
ldr r0, _02183f28 ; =data_ov40_021891d4
mov r3, #0
str r0, [sl]
str r3, [sl, #0x7f4]
str r0, [r10]
str r3, [r10, #0x7f4]
sub r0, r3, #1
str r0, [sl, #0x7f8]
str r0, [sl, #0x7fc]
str r3, [sl, #0x800]
str r3, [sl, #0x804]
add r0, sl, #0x800
str r0, [r10, #0x7f8]
str r0, [r10, #0x7fc]
str r3, [r10, #0x800]
str r3, [r10, #0x804]
add r0, r10, #0x800
strh r3, [r0, #0x28]
mov r2, #1
strh r2, [r0, #0x2a]
add r1, sl, #0x44
strb r2, [sl, #0x82c]
strb r2, [sl, #0x82d]
add r1, r10, #0x44
strb r2, [r10, #0x82c]
strb r2, [r10, #0x82d]
add r0, r1, #0x800
mov r1, #0x800
mov r2, #0x200
str r3, [sl, #0x830]
str r3, [r10, #0x830]
blx func_0202f194
mov sb, #0
ldr r4, _02183f2c ; =data_027e0ce0
@@ -10392,7 +10392,7 @@ func_ov40_02183e54: ; 0x02183e54
mov r5, #0xc000
mov r11, #0x200
_02183ed0:
add r0, sl, sb, lsl #2
add r0, r10, sb, lsl #2
str r8, [r0, #0x808]
str r8, [r0, #0x810]
str r7, [r0, #0x818]
@@ -10401,19 +10401,19 @@ _02183ed0:
mov r1, r5
mov r2, r7
blx func_0201739c
add r1, sl, sb, lsl #2
add r1, r10, sb, lsl #2
str r0, [r1, #0x834]
ldr r0, [r4, #4]
mov r1, r11
mov r2, #4
blx func_0201739c
add r1, sl, sb, lsl #2
add r1, r10, sb, lsl #2
add sb, sb, #1
str r0, [r1, #0x83c]
cmp sb, #2
blo _02183ed0
mov r0, sl
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
mov r0, r10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02183e54
_02183f28: .word data_ov40_021891d4
@@ -11284,7 +11284,7 @@ _02184a7c: .word 0x00001b94
.global func_ov40_02184a80
arm_func_start func_ov40_02184a80
func_ov40_02184a80: ; 0x02184a80
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
ldr r4, [r1, #0x38]
str r0, [sp]
@@ -11295,7 +11295,7 @@ func_ov40_02184a80: ; 0x02184a80
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]
@@ -11305,17 +11305,17 @@ func_ov40_02184a80: ; 0x02184a80
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
and r1, r10, #0x1f
add r1, r1, #0x1f
mov r0, #0x1f000
mov r1, r1, lsl #0xc
@@ -11339,7 +11339,7 @@ func_ov40_02184a80: ; 0x02184a80
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
@@ -11347,23 +11347,23 @@ func_ov40_02184a80: ; 0x02184a80
mov lr, r0, asr #0xc
ble _02184bf0
_02184b78:
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, r11
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
@@ -11383,18 +11383,18 @@ _02184bf0:
ldr r0, [r0, #0xc]
bl func_0200e2a4
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov40_02184a80
.global func_ov40_02184c08
arm_func_start func_ov40_02184c08
func_ov40_02184c08: ; 0x02184c08
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
str r1, [r4, #4]
ldr r0, [r4, #0x14]
ldr ip, [r4, #8]
@@ -11415,18 +11415,18 @@ _02184c44:
and sb, 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
mov r1, r10, asr #0xa
and r10, r3, #0x1f
mul r3, sb, 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
@@ -11443,7 +11443,7 @@ _02184cb8:
ldr r3, [r4, #0x14]
mov r0, #1
bl func_02017d30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov40_02184c08
.global func_ov40_02184cdc
@@ -12932,14 +12932,14 @@ _02185e1c: .word data_02068ebc
.global func_ov40_02185e20
arm_func_start func_ov40_02185e20
func_ov40_02185e20: ; 0x02185e20
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x34
cmp r1, #0
mov sl, r0
mov r10, r0
addne sp, sp, #0x34
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, _0218613c ; =data_027e0c68
add r0, sl, #0xa000
add r0, r10, #0xa000
ldr r2, [r1, #0x14]
ldr r1, [r0, #0xd5c]
ldr r2, [r2]
@@ -12950,23 +12950,23 @@ func_ov40_02185e20: ; 0x02185e20
add r0, r1, r0
str r0, [sp, #0x10]
bge _02185ea0
add r0, sl, #0xd60
add r0, r10, #0xd60
add r0, r0, #0xa000
bl func_ov40_02185cd4
ldr r1, [sp, #0x10]
cmp r1, r0
bne _02185e90
add r0, sl, #0xa000
add r0, r10, #0xa000
ldr r1, [r0, #0xd5c]
add r1, r1, #0x1000
str r1, [r0, #0xd5c]
_02185e90:
add r0, sl, #0xa000
add r0, r10, #0xa000
ldr r1, [r0, #0xd54]
add r1, r1, #0x1000
str r1, [r0, #0xd54]
_02185ea0:
add r5, sl, #0xa000
add r5, r10, #0xa000
ldr r2, [r5, #0xd54]
ldr r1, [r5, #0xd58]
mov r0, r2, asr #0xb
@@ -12978,7 +12978,7 @@ _02185ea0:
str r0, [sp, #0xc]
cmp r0, r1
addeq sp, sp, #0x34
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
sub r0, r0, r1
str r0, [sp, #8]
cmp r0, #0
@@ -12987,13 +12987,13 @@ _02185ea0:
ldr r1, _02186144 ; =data_ov40_021897d4
ldr r4, _02186148 ; =0x00640003
ldrsh r0, [r1, #0x20]
add r8, sl, #0x54
add r8, r10, #0x54
str r0, [sp, #0x14]
ldrsh r0, [r1, #0x22]
add r1, sl, #0x164
add r1, r10, #0x164
add r7, r1, #0xac00
str r0, [sp, #0x18]
add r0, sl, #0xd60
add r0, r10, #0xd60
add r6, r0, #0xa000
sub r0, r4, #2
str r0, [sp, #0x24]
@@ -13029,13 +13029,13 @@ _02185f40:
mov r0, r6
bl func_ov40_02185cd4
mov r1, r0
mov r0, sl
mov r0, r10
bl func_ov40_021861b0
mov sb, r0
ldr r0, [sp, #0x1c]
cmp sb, r0
bne _02185fc8
mov r0, sl
mov r0, r10
mov r1, #0x1b
bl func_ov40_0218646c
mov r0, #0
@@ -13051,7 +13051,7 @@ _02185fc8:
mov r3, r2
str r3, [sp, #4]
ldr r3, [r5, #0xd64]
mov r0, sl
mov r0, r10
add r3, r3, #0x800
mov r3, r3, asr #0xc
add r3, r3, #0xd2
@@ -13063,7 +13063,7 @@ _02186000:
strh r1, [r6]
bl func_ov40_02185cd4
mov r1, r0
mov r0, sl
mov r0, r10
bl func_ov40_021861b0
cmp sb, #0x640000
beq _02186040
@@ -13127,13 +13127,13 @@ _021860d8:
bne _02186118
_021860f4:
ldr r0, _0218614c ; =data_02068ebc
str r0, [sl, #0x2c]
str r0, [r10, #0x2c]
mov r0, #0xd
strb r0, [r5, #0xd62]
b _02186118
_02186108:
ldr r0, _02186150 ; =data_02068eac
str r0, [sl, #0x2c]
str r0, [r10, #0x2c]
mov r0, #8
strb r0, [r5, #0xd62]
_02186118:
@@ -13143,10 +13143,10 @@ _02186118:
blt _02185f40
_02186128:
ldr r0, [sp, #0xc]
add r1, sl, #0xa000
add r1, r10, #0xa000
str r0, [r1, #0xd58]
add sp, sp, #0x34
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02185e20
_0218613c: .word data_027e0c68
@@ -13229,7 +13229,7 @@ _0218622c: .word data_027e0c68
.global func_ov40_02186230
arm_func_start func_ov40_02186230
func_ov40_02186230: ; 0x02186230
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x24
sub sp, sp, #0x400
mov r11, r3
@@ -13238,7 +13238,7 @@ func_ov40_02186230: ; 0x02186230
str r3, [sp, #4]
str r0, [sp, #0x10]
str r1, [sp, #0x14]
mov sl, r2
mov r10, r2
str r3, [sp, #8]
add r0, sp, #0x24
mov r1, #0x1c
@@ -13252,7 +13252,7 @@ func_ov40_02186230: ; 0x02186230
cmp r0, #0
addle sp, sp, #0x24
addle sp, sp, #0x400
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
add r7, sp, #0x24
_02186294:
ldr r0, [sp, #0x1c]
@@ -13285,7 +13285,7 @@ _021862e8:
ldr r0, [sp, #0x10]
mov r2, r3, lsl #0x7
mov r3, r3, lsl #0x18
add r2, sl, r2, lsr #26
add r2, r10, r2, lsr #26
add r3, r11, r3, lsr #27
ldr r1, [sp, #0x14]
add r2, r6, r2
@@ -13310,7 +13310,7 @@ _0218633c:
blt _02186294
add sp, sp, #0x24
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02186230
_02186364: .word 0xc000c000
@@ -13396,7 +13396,7 @@ _02186454:
.global func_ov40_0218646c
arm_func_start func_ov40_0218646c
func_ov40_0218646c: ; 0x0218646c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xa0
mov r5, r0
ldr r0, _021865fc ; =data_027e05f4
@@ -13431,7 +13431,7 @@ func_ov40_0218646c: ; 0x0218646c
mov r1, #0
mov r11, r6
mov r8, r6
mov sl, #1
mov r10, #1
mov r0, r1
_02186500:
mov r2, #0
@@ -13444,7 +13444,7 @@ _02186514:
add sb, r7, #0x9000
ldrb sb, [sb, #0x854]
cmp sb, #0
movne r2, sl
movne r2, r10
bne _02186538
add r7, r7, #1
add ip, ip, #1
@@ -13470,12 +13470,12 @@ _02186560:
sub sb, r0, r6
rsb r0, sb, #0x20
add r0, r0, r0, lsr #31
mov sl, r0, asr #0x1
mov r10, r0, asr #0x1
mov r8, #0
add r7, r5, #0x54
mov r11, #0x20
_0218658c:
stmia sp, {r7, sl}
stmia sp, {r7, r10}
add r0, r4, r8
str r0, [sp, #8]
str r11, [sp, #0xc]
@@ -13504,7 +13504,7 @@ _021865cc:
cmp r7, #0x100
blt _021865c8
add sp, sp, #0xa0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_0218646c
_021865fc: .word data_027e05f4
@@ -14628,8 +14628,8 @@ func_ov40_021873f4: ; 0x021873f4
.global func_ov40_02187410
arm_func_start func_ov40_02187410
func_ov40_02187410: ; 0x02187410
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
mov sl, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r10, r0
bl func_ov40_0217c2b8
ldr r2, _02187548 ; =gItemManager
ldr r1, _0218754c ; =0x91a2b3c5
@@ -14638,7 +14638,7 @@ func_ov40_02187410: ; 0x02187410
ldr r3, [r3, #0xc]
umull r0, r4, r3, r1
mov r4, r4, lsr #0xb
str r4, [sl, #0x800]
str r4, [r10, #0x800]
ldr r0, [r2]
ldr r2, [r0, #0xc]
umull r0, r1, r2, r1
@@ -14651,19 +14651,19 @@ func_ov40_02187410: ; 0x02187410
movhs r0, #2
_02187464:
add r0, r0, #1
str r0, [sl, #0x804]
ldr r0, [sl, #0x800]
str r0, [r10, #0x804]
ldr r0, [r10, #0x800]
cmp r0, #0
moveq r0, #0
streq r0, [sl, #0x804]
streq r0, [r10, #0x804]
ldr r0, _02187550 ; =data_027e0f74
ldr r0, [r0]
bl func_ov00_02097c08
cmp r0, #0x15
cmpne r0, #0x16
moveq r0, #0
streq r0, [sl, #0x804]
ldr r0, [sl, #0x158]
streq r0, [r10, #0x804]
ldr r0, [r10, #0x158]
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
@@ -14679,7 +14679,7 @@ _021874c4:
add r0, r6, #4
bl func_0201e388
mov r5, r0
ldr r0, [sl, #0x158]
ldr r0, [r10, #0x158]
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
@@ -14689,13 +14689,13 @@ _021874c4:
add r0, r6, #4
mov r1, sb
bl func_0201e388
add r1, sl, r7, lsl #2
add r1, r10, r7, lsl #2
str r0, [r1, #0x7f4]
ldr r0, [sl, #0x158]
ldr r0, [r10, #0x158]
ldr r1, [r0]
ldr r1, [r1, #8]
blx r1
add r1, sl, r7, lsl #2
add r1, r10, r7, lsl #2
ldr r1, [r1, #0x7f4]
mov r2, r11
bl func_02019570
@@ -14704,10 +14704,10 @@ _021874c4:
add r7, r7, #1
cmp r7, #3
blo _021874c4
mov r0, sl
mov r0, r10
bl func_ov40_021875d8
ldr r0, [sp]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02187410
_02187548: .word gItemManager
@@ -15235,14 +15235,14 @@ _02187bbc: .word data_ov40_02189a24
.global func_ov40_02187bc0
arm_func_start func_ov40_02187bc0
func_ov40_02187bc0: ; 0x02187bc0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x48
ldr r11, [r2]
str r2, [sp, #4]
ldrb r5, [r11, #3]
ldrh r4, [r11, #4]
ldr r2, _02187da4 ; =0x00ff0002
mov sl, r0
mov r10, r0
orr r0, r4, r5, lsl #16
mov sb, r1
str r3, [sp, #8]
@@ -15269,7 +15269,7 @@ _02187c28:
cmp r1, #0
cmpne r1, #0xa
beq _02187c90
ldr r8, [sl, #0x2c]
ldr r8, [r10, #0x2c]
mov r0, r8
bl func_02023ea4
mov r1, r0
@@ -15280,7 +15280,7 @@ _02187c28:
mov r0, r8
bl func_02023eec
ldrsb r1, [r0, #2]
ldr r0, [sl, #0x30]
ldr r0, [r10, #0x30]
add r7, r7, #1
add r0, r1, r0
add r5, r5, r0
@@ -15290,13 +15290,13 @@ _02187c80:
cmp r7, r6
blt _02187c28
_02187c90:
ldr r0, [sl, #0x30]
ldr r0, [r10, #0x30]
add r1, sp, #0x28
str r0, [sp, #0xc]
ldr r3, [sp, #0xc]
add r0, r11, #7
mov r2, r4, lsl #0x1
ldr r11, [sl, #0x2c]
ldr r11, [r10, #0x2c]
sub r5, r5, r3
bl func_02007ad8
add r1, sp, #0x28
@@ -15304,9 +15304,9 @@ _02187c90:
mov r3, #0
strh r3, [r1, r0]
ldr r2, _02187dac ; =data_02068e8c
mov r0, sl
str r2, [sl, #0x2c]
str r3, [sl, #0x30]
mov r0, r10
str r2, [r10, #0x2c]
str r3, [r10, #0x30]
bl func_02033cbc
ldr r1, _02187db0 ; =data_020579f8
sub r0, r5, r0
@@ -15341,7 +15341,7 @@ _02187d4c:
str r7, [sp]
mov r0, r8, lsl #0x1
ldrh r1, [r6, r0]
mov r0, sl
mov r0, r10
mov r2, r5
mov r3, r7
bl func_020334b4
@@ -15350,18 +15350,18 @@ _02187d4c:
blo _02187d4c
_02187d74:
ldr r0, [sp, #0xc]
str r11, [sl, #0x2c]
str r0, [sl, #0x30]
str r11, [r10, #0x2c]
str r0, [r10, #0x30]
_02187d80:
ldr r4, [sp, #0x70]
ldr r2, [sp, #4]
ldr r3, [sp, #8]
mov r0, sl
mov r0, r10
mov r1, sb
str r4, [sp]
bl func_0203b814
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov40_02187bc0
_02187da4: .word 0x00ff0002
+20 -20
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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
mov sl, r0
mov r10, r0
mov r5, #0
add sb, sl, #0x470
add sb, 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
@@ -3246,7 +3246,7 @@ _0218bef4:
add sb, sb, #8
blt _0218be3c
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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 sb, 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]
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
@@ -3371,7 +3371,7 @@ _0218c094:
cmp r8, #4
blt _0218bf60
add sp, sp, #0x4c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov41_0218bf1c
_0218c0c8: .word data_027e0e58
+34 -34
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, sb, r10, lr}
sub sp, sp, #0x80
mov r7, r0
bl func_ov42_021897dc
@@ -365,14 +365,14 @@ _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
_021899d4:
ldr r0, [sp, #0xc]
mov r1, sl
mov r1, r10
sub r0, r0, #0x1000
str r0, [sp, #0xc]
str r6, [sp]
@@ -388,7 +388,7 @@ _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]
@@ -398,7 +398,7 @@ _021899d4:
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]
@@ -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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov42_02189834
_02189af4: .word data_027e0e60
@@ -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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
str r0, [r10, #0x60]
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r1, #0
add r0, sp, #0
_02189f34:
@@ -805,7 +805,7 @@ _02189f54:
blt _02189f54
mov r7, #0
ldr r4, _0218a058 ; =data_027e0fe4
add sb, sl, #0x28
add sb, r10, #0x28
mov r6, r7
mov r11, #3
add r5, sp, #0
@@ -831,7 +831,7 @@ _02189fe4:
add sb, sb, #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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov42_02189efc
_0218a054: .word data_027e0764
@@ -1311,7 +1311,7 @@ _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}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
ldr r0, [sb, #0x60]
mov r8, r1
@@ -1320,14 +1320,14 @@ func_ov42_0218a63c: ; 0x0218a63c
mov r7, r2
mov r6, r3
strgt r0, [sb, #0x60]
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmgtia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
cmp r7, #0
mov r4, #0
ble _0218a6c8
ldr sl, _0218a730 ; =data_027e0fe4
ldr r10, _0218a730 ; =data_027e0fe4
add r5, sb, #0x28
_0218a678:
ldr r0, [sl]
ldr r0, [r10]
mov r1, r5
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, [r0, #0x204]
@@ -1344,7 +1344,7 @@ _0218a6a4:
_0218a6ac:
mov r0, #0xf
str r0, [sb, #0x60]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0218a6b8:
add r4, r4, #1
cmp r4, r7
@@ -1353,7 +1353,7 @@ _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, sb, r10, pc}
ldr r4, _0218a730 ; =data_027e0fe4
add r7, sb, #0x10
_0218a6dc:
@@ -1374,13 +1374,13 @@ _0218a708:
_0218a710:
mov r0, #0xf
str r0, [sb, #0x60]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov42_0218a63c
_0218a730: .word data_027e0fe4
@@ -2443,7 +2443,7 @@ _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}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
mov r6, #0
mov r8, #0x1000
@@ -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
@@ -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
@@ -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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov42_0218b440
_0218b67c: .word 0x0000ffff
+35 -35
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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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
@@ -1312,7 +1312,7 @@ func_ov43_0218a674: ; 0x0218a674
str r0, [sp, #4]
umull r0, r7, r6, r0
add r11, r1, #0x800
str sl, [sp, #0x14]
str r10, [sp, #0x14]
ldr r1, [r4, #0x4c]
adds r0, r0, #0x800
str r1, [sp, #0x18]
@@ -1330,7 +1330,7 @@ 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, r11
mov r2, #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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov43_0218a674
_0218a84c: .word 0x0000099a
@@ -4126,10 +4126,10 @@ _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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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]
@@ -4140,14 +4140,14 @@ func_ov43_0218cd7c: ; 0x0218cd7c
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 r1, [r10, #0x3c0]
ldr r11, [r0]
cmp r1, #0
ldmib r0, {r4, r5}
@@ -4159,22 +4159,22 @@ func_ov43_0218cd7c: ; 0x0218cd7c
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
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 r11, #0x80000000
@@ -4184,40 +4184,40 @@ _0218ce34:
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 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
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 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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,9 +4244,9 @@ _0218cf04:
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0218cf40:
ldrb r0, [sl, #0x3e6]
ldrb r0, [r10, #0x3e6]
cmp r0, #0
bne _0218cf64
ldr r0, [sb]
@@ -4254,17 +4254,17 @@ _0218cf40:
ble _0218cf78
add sp, sp, #0x18
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmgtia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0218cf78:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov43_0218cd7c
_0218cf84: .word data_027e0fc8
+63 -63
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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, _02191e44 ; =data_ov46_02194c2c
add r0, r7, #0x4a0
mov r2, #0xc
@@ -2118,11 +2118,11 @@ _02191b68:
ldr r8, [r0]
ldr r6, [r0, #4]
mov ip, #0
umull sl, sb, r8, r3
umull r10, sb, r8, r3
mla sb, r8, ip, sb
mov r7, r8, asr #0x1f
ldr r4, [r0, #8]
adds r8, sl, #0x800
adds r8, r10, #0x800
mla sb, r7, r3, sb
adc r7, sb, #0
mov r8, r8, lsr #0xc
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xc
mov r4, r0
ldrh r0, [r4, #0x20]
@@ -3474,14 +3474,14 @@ 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
adds r2, r10, r6
adc r6, sb, 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
@@ -3500,7 +3500,7 @@ func_ov46_02192c90: ; 0x02192c90
mov r3, r3, lsr #0x10
mov r3, r3, lsl #0x10
str r2, [r0, #4]
adds r7, sl, ip
adds r7, r10, ip
adc r2, sb, r11
mov r5, r2, lsr #0x10
mov r5, r5, lsl #0x10
@@ -3541,18 +3541,18 @@ func_ov46_02192c90: ; 0x02192c90
ldrsh r7, [r0, r5]
smull r2, ip, r3, sb
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, r11]
adc r11, r2, r1
mov r2, sl, lsr #0xc
mov r2, r10, lsr #0xc
orr r2, r2, r11, lsl #20
smull ip, r11, r2, r0
smull sl, sb, r7, sb
smull r10, sb, r7, sb
smull r8, r7, r3, r8
adds r3, ip, #0x800
adc r11, r11, r1
@@ -3566,10 +3566,10 @@ func_ov46_02192c90: ; 0x02192c90
orr r2, r2, lr, lsl #20
sub r2, r3, r2
str r2, [r4, #0x1d0]
adds r3, sl, #0x800
adds r3, r10, #0x800
adc r2, sb, r1
mov sl, r3, lsr #0xc
orr sl, sl, r2, lsl #20
mov r10, r3, lsr #0xc
orr r10, r10, r2, lsl #20
adds r3, r8, #0x800
adc r2, r7, r1
mov sb, r3, lsr #0xc
@@ -3580,9 +3580,9 @@ func_ov46_02192c90: ; 0x02192c90
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, sb, r0
adds r7, r7, #0x800
adc r6, r6, r1
mov r7, r7, lsr #0xc
@@ -3593,7 +3593,7 @@ 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
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x40
ldr r1, _02193494 ; =data_ov46_0219449c
add r3, sp, #0x34
@@ -3825,10 +3825,10 @@ _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
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]
@@ -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 sb, r10, asr #0x1f
str r3, [sp, #0x18]
mov r3, r0, lsl #0x1
ldr r0, _0219349c ; =data_02050f54
@@ -3882,12 +3882,12 @@ _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 r11, r0, lsr #0xc
mla r3, r8, sb, r3
ldr r0, [sp, #0x18]
mla r3, r0, sl, r3
mla r3, r0, r10, r3
adc r0, r3, r2
orr r11, r11, r0, lsl #20
ldr r0, [sp, #0x24]
@@ -3914,11 +3914,11 @@ _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
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
@@ -3930,10 +3930,10 @@ _02193144:
orr r0, r0, ip, lsl #20
add r0, r3, r0
str r0, [r4, #0x1e4]
umull r3, r0, r11, sl
umull r3, r0, r11, r10
mla r0, r11, sb, r0
ldr r11, [sp, #0x28]
mla r0, r11, sl, r0
mla r0, r11, r10, r0
adds r11, r3, r1
adc r3, r0, r2
mov r0, r11, lsr #0xc
@@ -3943,11 +3943,11 @@ _02193144:
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
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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x78
mov r4, r0
ldr r1, _02193b14 ; =0x0000019a
@@ -4201,11 +4201,11 @@ _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
mov r0, r10, asr #0x1f
str r0, [sp, #8]
ldrsh r0, [r2]
str r11, [r1]
@@ -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
@@ -4301,32 +4301,32 @@ _02193710:
str r2, [sp, #0x2c]
sub r2, lr, r2
str r2, [sp, #0x40]
umull r3, r2, r8, sl
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 r11, sl
ldr sl, [sp, #0x14]
umull r8, r3, r10, sb
mov r11, r10
ldr r10, [sp, #0x14]
adds r8, r8, #0x800
mla r3, r11, sl, r3
ldr sl, [sp, #0x10]
mla r3, r11, r10, r3
ldr r10, [sp, #0x10]
mov r11, r8, lsr #0xc
mla r3, sl, sb, r3
mla r3, r10, sb, r3
adc r3, r3, ip
orr r11, r11, r3, lsl #20
umull sb, r8, r11, r7
adds r3, sb, #0x800
mla r8, r11, r6, r8
mov sl, r11, asr #0x1f
mla r8, sl, r7, r8
mov r10, r11, asr #0x1f
mla r8, r10, r7, r8
mov sb, r3, lsr #0xc
adc r3, r8, ip
umull r8, lr, r2, r5
@@ -4356,7 +4356,7 @@ _02193710:
umull r3, r2, r11, r5
mla r2, r11, sb, 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
@@ -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, r11, pc}
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov46_02193574
_02193b14: .word 0x0000019a
@@ -4884,7 +4884,7 @@ _021940d8:
.global func_ov46_0219416c
arm_func_start func_ov46_0219416c
func_ov46_0219416c: ; 0x0219416c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x34
ldr r11, _021942ec ; =data_027e0764
mov r6, r0
@@ -4923,8 +4923,8 @@ _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, [r11]
ldmib r11, {r0, ip}
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov46_0219416c
_021942ec: .word data_027e0764
+20 -20
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x90
mov r4, r0
ldrb r1, [r4, #0x17c]
@@ -778,15 +778,15 @@ _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, [sb, #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]
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02190c88:
add r0, sp, #0x54
add r1, sp, #0x60
@@ -962,10 +962,10 @@ _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
adds r1, r10, r8
adc r2, sb, r7
ldr r3, _02190df8 ; =0x00001001
stmia ip, {r1, r2}
@@ -1010,11 +1010,11 @@ _02190c88:
_02190dc0:
add sp, sp, #0x90
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02190dcc:
mov r0, #0
add sp, sp, #0x90
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x44
mov r4, r0
add r0, sp, #0x18
@@ -3650,13 +3650,13 @@ func_ov47_0219305c: ; 0x0219305c
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]
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,10 +3665,10 @@ func_ov47_0219305c: ; 0x0219305c
mov r0, ip, asr #0x1f
str r0, [sp, #8]
ldr r0, _0219320c ; =0x00000e3d
mov r11, 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, r11, r0, r6
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov47_0219305c
_02193208: .word data_02050f54
+139 -139
View File
@@ -169,7 +169,7 @@ func_ov48_02190224: ; 0x02190224
.global func_ov48_0219022c
arm_func_start func_ov48_0219022c
func_ov48_0219022c: ; 0x0219022c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #0x1c
mov r4, r0
ldr r2, [r4, #0x1c]
@@ -216,23 +216,23 @@ _021902c4:
add r0, r0, #0x60
ldmia r0, {r0, r1, r2}
stmia r5, {r0, r1, r2}
ldr sl, [sp, #0x10]
ldr r10, [sp, #0x10]
ldr r2, _02190444 ; =0x00000ccd
ldr r7, [sp, #0x14]
umull r1, r0, sl, r2
umull r1, r0, r10, r2
mov ip, #0
mla r0, sl, ip, r0
mla r0, r10, ip, r0
umull sb, r8, r7, r2
mov sl, sl, asr #0x1f
mov r10, r10, asr #0x1f
ldr r5, [sp, #0x18]
mla r0, sl, r2, r0
mla r0, r10, r2, r0
adds r1, r1, #0x800
adc sl, r0, #0
adc r10, r0, #0
mov r0, r1, lsr #0xc
adds r1, sb, #0x800
mov sb, r1, lsr #0xc
umull r6, lr, r5, r2
orr r0, r0, sl, lsl #20
orr r0, r0, r10, lsl #20
mla r8, r7, ip, r8
mov r1, r7, asr #0x1f
mla r8, r1, r2, r8
@@ -263,12 +263,12 @@ _02190378:
add r2, r2, #0x48
bl func_ov00_020cec60
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_021903a0:
add r0, r4, #0x17c
bl func_ov00_020b7e6c
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_021903b0:
cmp r0, #0
beq _02190410
@@ -294,13 +294,13 @@ _021903e8:
add r7, r7, #0xc
blo _021903e8
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_02190410:
add r5, r4, #0x188
add r4, r4, #0x1a0
cmp r5, r4
addeq sp, sp, #0x1c
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_02190424:
mov r0, r5
bl func_ov00_020b7e6c
@@ -308,7 +308,7 @@ _02190424:
cmp r5, r4
bne _02190424
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov48_0219022c
_02190440: .word data_027e0e58
@@ -3191,7 +3191,7 @@ _02192600: .word 0x0000013f
.global func_ov48_02192604
arm_func_start func_ov48_02192604
func_ov48_02192604: ; 0x02192604
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x88
mov sb, r0
ldr r0, [sb, #0x130]
@@ -3323,7 +3323,7 @@ _021927dc:
str r7, [r3, r5, lsl #2]
cmp r8, #3
blt _021927a4
ldr sl, _02193170 ; =data_027e0f90
ldr r10, _02193170 ; =data_027e0f90
mov r6, #0
add r4, sp, #0x44
add r5, sp, #0x60
@@ -3566,7 +3566,7 @@ _02192b5c:
mov r0, r8
mov r1, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [sl]
ldr r0, [r10]
mov r1, r4
bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
cmp r0, #0
@@ -3614,11 +3614,11 @@ _02192bd0:
mov r8, #0
cmp r0, #0
ble _02192ccc
mov sl, #0xc
mov r10, #0xc
ldr r11, _02193190 ; =0x00000e66
add r6, sp, #0x20
add r5, sp, #0x14
mov r4, sl
mov r4, r10
_02192c34:
ldr r1, [sb, #0x340]
ldr r0, [sb, #0x338]
@@ -3626,7 +3626,7 @@ _02192c34:
sub r0, r0, r8
bl func_02002c14
ldr r0, [sb, #0x33c]
mla r0, r1, sl, r0
mla r0, r1, r10, r0
ldmia r0, {r0, r1, r2}
stmia r6, {r0, r1, r2}
mov r0, r6
@@ -3686,7 +3686,7 @@ _02192d10:
add r7, r1, #0x400
mov r8, #0
mov r11, r6
add sl, sb, #0xdc
add r10, sb, #0xdc
add r4, sp, #8
_02192d38:
ldr r1, [sb, #0x138]
@@ -3721,7 +3721,7 @@ _02192da4:
cmp r8, #4
bne _02192de0
mov r2, r4
add r0, sl, #0x400
add r0, r10, #0x400
add r1, sb, #0x4d0
bl func_01ff9bf8
ldr r0, [sp, #8]
@@ -3979,7 +3979,7 @@ _02193144:
_02193154:
mov r0, #1
add sp, sp, #0x88
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov48_02192604
_02193160: .word gItemManager
@@ -4001,13 +4001,13 @@ _02193198: .word data_027e0e58
.global func_ov48_0219319c
arm_func_start func_ov48_0219319c
func_ov48_0219319c: ; 0x0219319c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x90
mov sl, r0
add r0, sl, #0xe8
mov r10, r0
add r0, r10, #0xe8
mov r1, #0x1800
add r8, r0, #0x400
add r0, sl, #0xac
add r0, r10, #0xac
ldr r6, _02193358 ; =data_02050f54
mov sb, r8
str r1, [sp, #0x84]
@@ -4018,13 +4018,13 @@ func_ov48_0219319c: ; 0x0219319c
add r5, sp, #0x84
add r11, sp, #0x60
_021931dc:
add r0, sl, r7
add r0, r10, r7
ldrb r0, [r0, #0x524]
cmp r0, #0
beq _02193330
cmp r7, #0
bne _02193240
ldrh r1, [sl, #0x78]
ldrh r1, [r10, #0x78]
mov r0, r11
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4033,9 +4033,9 @@ _021931dc:
add r2, r6, r2, lsl #1
ldrsh r2, [r2, #2]
blx func_01ff8214
add r0, sl, #0x21c
add r0, r10, #0x21c
bl func_ov00_020b41ec
add r0, sl, #0x21c
add r0, r10, #0x21c
mov r1, r5
mov r2, r11
mov r3, r8
@@ -4067,9 +4067,9 @@ _02193240:
ldrsh r2, [r2, #2]
add r0, sp, #0x30
blx func_01ff8214
add r0, sl, #0x2d4
add r0, r10, #0x2d4
bl func_ov00_020b41ec
add r0, sl, #0x2d4
add r0, r10, #0x2d4
ldr ip, [r0]
mov r1, r5
ldr ip, [ip, #0x10]
@@ -4096,9 +4096,9 @@ _021932c4:
ldrsh r2, [r2, #2]
add r0, sp, #0
blx func_01ff8214
add r0, sl, #0x278
add r0, r10, #0x278
bl func_ov00_020b41ec
add r0, sl, #0x278
add r0, r10, #0x278
ldr ip, [r0]
mov r1, r5
ldr ip, [ip, #0x10]
@@ -4115,7 +4115,7 @@ _02193330:
blt _021931dc
mov r0, #1
add sp, sp, #0x90
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov48_0219319c
_02193358: .word data_02050f54
@@ -4477,33 +4477,33 @@ func_ov48_02193644: ; 0x02193644
.global func_ov48_02193658
arm_func_start func_ov48_02193658
func_ov48_02193658: ; 0x02193658
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x26c
mov sl, r0
mov r10, r0
str r1, [sp, #0xc]
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _02193f10
ldr r1, [sl, #0x48]
mov r0, sl
str r1, [sl, #0x54]
ldr r1, [sl, #0x4c]
str r1, [sl, #0x58]
ldr r1, [sl, #0x50]
str r1, [sl, #0x5c]
ldr r1, [r10, #0x48]
mov r0, r10
str r1, [r10, #0x54]
ldr r1, [r10, #0x4c]
str r1, [r10, #0x58]
ldr r1, [r10, #0x50]
str r1, [r10, #0x5c]
bl _ZN5Actor20IncreaseActiveFramesEv
mov r0, sl
mov r0, r10
bl _ZN5Actor18func_ov00_020c1cf8Ev
ldrb r0, [sl, #0xa4]
ldrb r0, [r10, #0xa4]
mov r4, #0
cmp r0, #0
ldreqb r0, [sl, #0xa5]
ldreqb r0, [r10, #0xa5]
cmpeq r0, #0
beq _0219389c
add r0, sl, #0x100
add r0, r10, #0x100
ldrh r0, [r0, #0x5c]
ldr r2, _02193f28 ; =data_02050f54
add r5, sl, #0x16c
add r5, r10, #0x16c
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
@@ -4514,7 +4514,7 @@ func_ov48_02193658: ; 0x02193658
str r4, [sp, #0xbc]
str r1, [sp, #0xb8]
str r0, [sp, #0xc0]
ldr r0, [sl, #0x138]
ldr r0, [r10, #0x138]
mov r1, r0, lsr #0x1f
rsb r0, r1, r0, lsl #28
add r0, r1, r0, ror #28
@@ -4532,7 +4532,7 @@ _02193714:
cmp r4, #8
add r5, r5, #0xc
blt _02193704
add r4, sl, #0x100
add r4, r10, #0x100
ldrh r0, [r4, #0x5e]
mov sb, #0
mov r1, r0, lsl #0x1
@@ -4541,20 +4541,20 @@ _02193714:
mov r0, #0xc
mul r6, r8, r0
ldr r11, _02193f2c ; =data_027e0e58
add r7, sl, #0x16c
add r7, r10, #0x16c
add r5, sp, #0xac
_02193758:
add r0, sb, #1
add r1, sp, #0xb8
mov r3, r5
mov r0, r0, lsl #0xb
add r2, sl, #0x48
add r2, r10, #0x48
bl func_01ff9e64
ldr r1, [sp, #0xb0]
ldr r0, [r11]
add r1, r1, #0x800
str r1, [sp, #0xb0]
add r1, sl, #0x160
add r1, r10, #0x160
mov r2, r5
bl func_ov00_0207c518
ldr r0, [r11]
@@ -4569,7 +4569,7 @@ _02193758:
mov r1, r0, lsl #0x1
blt _02193758
_021937b8:
ldr r0, [sl, #0x158]
ldr r0, [r10, #0x158]
cmp r0, #1
bne _02193848
cmp r1, #0
@@ -4578,8 +4578,8 @@ _021937b8:
mov r0, #0xc
mul r6, r8, r0
ldr r11, _02193f2c ; =data_027e0e58
add r7, sl, #0x16c
add r4, sl, #0x100
add r7, r10, #0x16c
add r4, r10, #0x100
add r5, sp, #0xac
_021937e8:
add r0, sb, #1
@@ -4587,13 +4587,13 @@ _021937e8:
add r1, sp, #0xb8
mov r3, r5
rsb r0, r0, #0
add r2, sl, #0x48
add r2, r10, #0x48
bl func_01ff9e64
ldr r1, [sp, #0xb0]
ldr r0, [r11]
add r1, r1, #0x800
str r1, [sp, #0xb0]
add r1, sl, #0x160
add r1, r10, #0x160
mov r2, r5
bl func_ov00_0207c518
ldr r0, [r11]
@@ -4607,20 +4607,20 @@ _021937e8:
cmp sb, r0, lsl #1
blt _021937e8
_02193848:
ldr r1, [sl, #0x48]
ldr r1, [r10, #0x48]
ldr r0, _02193f2c ; =data_027e0e58
str r1, [sp, #0xac]
ldr r1, [sl, #0x4c]
ldr r1, [r10, #0x4c]
ldr r0, [r0]
str r1, [sp, #0xb0]
ldr r4, [sl, #0x50]
ldr r4, [r10, #0x50]
add r3, r1, #0x800
add r2, sp, #0xac
add r1, sl, #0x160
add r1, r10, #0x160
str r4, [sp, #0xb4]
str r3, [sp, #0xb0]
bl func_ov00_0207c518
add r1, sl, #0x16c
add r1, r10, #0x16c
mov r0, #0xc
mla r1, r8, r0, r1
ldr r2, _02193f2c ; =data_027e0e58
@@ -4629,9 +4629,9 @@ _02193848:
bl func_ov00_0207c518
b _021938c8
_0219389c:
add r0, sl, #0x160
add r0, r10, #0x160
bl func_ov00_020b7e6c
add r5, sl, #0x16c
add r5, r10, #0x16c
_021938a8:
mov r0, r5
bl func_ov00_020b7e6c
@@ -4642,12 +4642,12 @@ _021938a8:
add r5, r5, #0xc
blt _021938a8
_021938c8:
ldr r0, [sl, #0x154]
ldr r0, [r10, #0x154]
cmp r0, #0
bne _02193ea0
add r0, sl, #0x100
add r0, r10, #0x100
ldrh r2, [r0, #0x5e]
ldrh r1, [sl, #0x20]
ldrh r1, [r10, #0x20]
mov r4, r2, lsl #0xc
cmp r1, #0
beq _021938f8
@@ -4683,17 +4683,17 @@ _02193924:
str r3, [sp, #0xa0]
str r0, [sp, #0xa8]
str r2, [sp, #0xa4]
ldr r2, [sl, #0x48]
add r0, sl, #0x100
str r2, [sl, #0x1cc]
ldr r2, [sl, #0x4c]
ldr r2, [r10, #0x48]
add r0, r10, #0x100
str r2, [r10, #0x1cc]
ldr r2, [r10, #0x4c]
add r5, sp, #0xa0
str r2, [sl, #0x1d0]
ldr r3, [sl, #0x50]
str r2, [r10, #0x1d0]
ldr r3, [r10, #0x50]
mov r2, #4
str r3, [sl, #0x1d4]
str r3, [r10, #0x1d4]
ldrh r6, [r0, #0x5c]
ldr r0, [sl, #0x1cc]
ldr r0, [r10, #0x1cc]
ldr r3, _02193f30 ; =0x000004cd
mov r6, r6, asr #0x4
mov r8, r6, lsl #0x1
@@ -4710,33 +4710,33 @@ _02193924:
orr sb, sb, r8, lsl #20
add r0, r0, sb
adds r1, r7, #0x800
str r0, [sl, #0x1cc]
str r0, [r10, #0x1cc]
adc r0, r6, #0
mov r1, r1, lsr #0xc
ldr r6, [sl, #0x1d4]
ldr r6, [r10, #0x1d4]
orr r1, r1, r0, lsl #20
add r0, r6, r1
str r0, [sl, #0x1d4]
str r0, [r10, #0x1d4]
str r5, [sp]
ldrb r5, [sl, #0x124]
mov r0, sl
add r1, sl, #0x48
ldrb r5, [r10, #0x124]
mov r0, r10
add r1, r10, #0x48
str r5, [sp, #4]
str r2, [sp, #8]
add r2, sl, #0x1cc
add r2, r10, #0x1cc
bl _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
ldr r0, [sl, #0x158]
ldr r0, [r10, #0x158]
cmp r0, #1
bne _02193b5c
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
ldr r6, _02193f28 ; =data_02050f54
str r0, [sl, #0x1d8]
ldr r0, [sl, #0x4c]
str r0, [r10, #0x1d8]
ldr r0, [r10, #0x4c]
mov r5, #0
str r0, [sl, #0x1dc]
ldr r1, [sl, #0x50]
add r0, sl, #0x100
str r1, [sl, #0x1e0]
str r0, [r10, #0x1dc]
ldr r1, [r10, #0x50]
add r0, r10, #0x100
str r1, [r10, #0x1e0]
ldrh r1, [r0, #0x5c]
rsb r0, r4, #0
mov r3, #0x800
@@ -4753,16 +4753,16 @@ _02193924:
adc r4, r4, #0
smull r2, r0, r1, r0
adds r1, r2, #0x800
ldr r2, [sl, #0x1d8]
ldr r2, [r10, #0x1d8]
orr r6, r6, r4, lsl #20
add r2, r2, r6
str r2, [sl, #0x1d8]
str r2, [r10, #0x1d8]
adc r0, r0, #0
mov r1, r1, lsr #0xc
ldr r2, [sl, #0x1e0]
ldr r2, [r10, #0x1e0]
orr r1, r1, r0, lsl #20
add r0, r2, r1
str r0, [sl, #0x1e0]
str r0, [r10, #0x1e0]
sub r0, r3, #0x1800
ldr r7, [sp, #0xa0]
sub r1, r5, #1
@@ -4801,21 +4801,21 @@ _02193924:
str r1, [sp, #0xa8]
add r0, sp, #0xa0
str r0, [sp]
ldrb r3, [sl, #0x124]
ldrb r3, [r10, #0x124]
mov r2, #4
mov r0, sl
mov r0, r10
str r3, [sp, #4]
str r2, [sp, #8]
ldr r3, _02193f30 ; =0x000004cd
add r1, sl, #0x48
add r2, sl, #0x1d8
add r1, r10, #0x48
add r2, r10, #0x1d8
bl _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
_02193b5c:
ldr r0, _02193f34 ; =data_ov48_02194688
add r3, sp, #0x94
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
mov r0, sl
mov r0, r10
mov r1, r3
mov r2, #0
bl _ZN5Actor18func_ov00_020c243cEiPi
@@ -4868,46 +4868,46 @@ _02193c18:
beq _02193cfc
mov r1, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
mov r7, #1
str r0, [sp, #0x68]
ldr r1, [sl, #0x4c]
ldr r1, [r10, #0x4c]
mov r0, r4
str r1, [sp, #0x6c]
ldr r2, [sl, #0x50]
ldr r2, [r10, #0x50]
add r1, sp, #0x68
str r2, [sp, #0x70]
ldr r3, [sl, #0x1cc]
ldr r3, [r10, #0x1cc]
add r2, sp, #0x5c
str r3, [sp, #0x5c]
ldr r3, [sl, #0x1d0]
ldr r3, [r10, #0x1d0]
str r3, [sp, #0x60]
ldr r3, [sl, #0x1d4]
ldr r3, [r10, #0x1d4]
str r3, [sp, #0x64]
ldr r3, [sl, #0x88]
ldr r3, [r10, #0x88]
bl func_ov00_0208f030
cmp r0, #0
bne _02193cec
ldr r0, [sl, #0x158]
ldr r0, [r10, #0x158]
mov r8, #0
cmp r0, #1
bne _02193ce4
ldr r1, [sl, #0x1d8]
ldr r1, [r10, #0x1d8]
mov r0, r4
str r1, [sp, #0x50]
ldr r2, [sl, #0x1dc]
ldr r2, [r10, #0x1dc]
add r1, sp, #0x44
str r2, [sp, #0x54]
ldr r3, [sl, #0x1e0]
ldr r3, [r10, #0x1e0]
add r2, sp, #0x50
str r3, [sp, #0x58]
ldr r3, [sl, #0x48]
ldr r3, [r10, #0x48]
str r3, [sp, #0x44]
ldr r3, [sl, #0x4c]
ldr r3, [r10, #0x4c]
str r3, [sp, #0x48]
ldr r3, [sl, #0x50]
ldr r3, [r10, #0x50]
str r3, [sp, #0x4c]
ldr r3, [sl, #0x88]
ldr r3, [r10, #0x88]
bl func_ov00_0208f030
cmp r0, #0
movne r8, r7
@@ -4976,46 +4976,46 @@ _02193dac:
beq _02193e8c
mov r1, r4
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [sl, #0x48]
ldr r0, [r10, #0x48]
mov r7, #1
str r0, [sp, #0x38]
ldr r1, [sl, #0x4c]
ldr r1, [r10, #0x4c]
mov r0, r4
str r1, [sp, #0x3c]
ldr r2, [sl, #0x50]
ldr r2, [r10, #0x50]
add r1, sp, #0x38
str r2, [sp, #0x40]
ldr r3, [sl, #0x1cc]
ldr r3, [r10, #0x1cc]
add r2, sp, #0x2c
str r3, [sp, #0x2c]
ldr r3, [sl, #0x1d0]
ldr r3, [r10, #0x1d0]
str r3, [sp, #0x30]
ldr r3, [sl, #0x1d4]
ldr r3, [r10, #0x1d4]
str r3, [sp, #0x34]
ldr r3, [sl, #0x88]
ldr r3, [r10, #0x88]
bl func_ov00_0208f030
cmp r0, #0
bne _02193e84
ldr r0, [sl, #0x158]
ldr r0, [r10, #0x158]
mov r8, #0
cmp r0, #1
bne _02193e7c
ldr r1, [sl, #0x1d8]
ldr r1, [r10, #0x1d8]
mov r0, r4
str r1, [sp, #0x20]
ldr r2, [sl, #0x1dc]
ldr r2, [r10, #0x1dc]
add r1, sp, #0x14
str r2, [sp, #0x24]
ldr r3, [sl, #0x1e0]
ldr r3, [r10, #0x1e0]
add r2, sp, #0x20
str r3, [sp, #0x28]
ldr r3, [sl, #0x48]
ldr r3, [r10, #0x48]
str r3, [sp, #0x14]
ldr r3, [sl, #0x4c]
ldr r3, [r10, #0x4c]
str r3, [sp, #0x18]
ldr r3, [sl, #0x50]
ldr r3, [r10, #0x50]
str r3, [sp, #0x1c]
ldr r3, [sl, #0x88]
ldr r3, [r10, #0x88]
bl func_ov00_0208f030
cmp r0, #0
movne r8, r7
@@ -5032,10 +5032,10 @@ _02193e8c:
cmp r5, r0
blt _02193dac
_02193ea0:
ldr r0, [sl, #0x130]
ldr r0, [r10, #0x130]
cmp r0, #0
bne _02193f10
ldrh r0, [sl, #0x22]
ldrh r0, [r10, #0x22]
mov r2, #0x12c
cmp r0, #0
beq _02193ed4
@@ -5047,30 +5047,30 @@ _02193ea0:
_02193ed0:
mov r2, #0x258
_02193ed4:
ldrh r0, [sl, #0x20]
ldrh r0, [r10, #0x20]
cmp r0, #0
beq _02193eec
cmp r0, #1
beq _02193f00
b _02193f10
_02193eec:
add r0, sl, #0x100
add r0, r10, #0x100
ldrsh r1, [r0, #0x5c]
add r1, r1, r2
strh r1, [r0, #0x5c]
b _02193f10
_02193f00:
add r0, sl, #0x100
add r0, r10, #0x100
ldrsh r1, [r0, #0x5c]
sub r1, r1, r2
strh r1, [r0, #0x5c]
_02193f10:
ldr r1, [sp, #0xc]
add r0, sl, #0xa4
add r2, sl, #0x48
add r0, r10, #0xa4
add r2, r10, #0x48
bl func_ov00_0207a1c8
add sp, sp, #0x26c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov48_02193658
_02193f28: .word data_02050f54
+7 -7
View File
@@ -1814,7 +1814,7 @@ _02196d90: .word data_027e0fc8
.global func_ov50_02196d94
arm_func_start func_ov50_02196d94
func_ov50_02196d94: ; 0x02196d94
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x8c
mov r5, #0xff
sub r4, r5, #0x100
@@ -1865,14 +1865,14 @@ func_ov50_02196d94: ; 0x02196d94
cmp r8, #0
mov sb, r7
addle sp, sp, #0x8c
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmleia sp!, {r4, r5, r6, r7, r8, sb, 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
@@ -1888,14 +1888,14 @@ _02196e74:
mov r2, #0
bl func_ov50_021960c8
add sp, sp, #0x8c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02196ebc:
add sb, sb, #1
cmp sb, r8
add sl, sl, #8
add r10, r10, #8
blt _02196e74
add sp, sp, #0x8c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov50_02196d94
_02196ed4: .word data_ov50_021989f0
+69 -69
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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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 sb, 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
@@ -1179,10 +1179,10 @@ _02196324:
add r8, r8, #0xc
add sb, sb, #0xc
blt _02196324
add r0, sl, #0x6c
add r0, r10, #0x6c
ldr r11, _021964f8 ; =0x000004cd
ldr r4, _021964fc ; =data_027e0f90
mov r8, sl
mov r8, r10
add sb, r0, #0x400
mov r7, #0
add r6, sp, #0x14
@@ -1201,8 +1201,8 @@ _021963d4:
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]
@@ -1229,7 +1229,7 @@ _02196450:
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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_021962b4
_021964f4: .word data_027e0e58
@@ -1279,13 +1279,13 @@ _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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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 r8, r10, #0x18
add sb, r0, #0x18
mov r7, #2
add r6, sp, #0x18
@@ -1297,7 +1297,7 @@ _0219653c:
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]
@@ -1322,7 +1322,7 @@ _0219653c:
bpl _0219653c
mov r0, #1
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x68
ldr r2, _02196b38 ; =func_ov51_02196b4c
ldr r3, _02196b3c ; =func_ov51_02196b50
@@ -1689,30 +1689,30 @@ func_ov51_02196924: ; 0x02196924
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
add r3, r3, r10
smull r5, r2, sb, 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
smull r10, r6, r1, r6
adc sb, r2, #0
mov r5, r5, lsr #0xc
sub r7, lr, #0x8000
rsb r0, r0, #0
adds r2, sl, #0x800
adds r2, r10, #0x800
orr r5, r5, sb, lsl #20
smull sl, sb, r1, r0
smull r10, sb, 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
orr r10, r10, r0, lsl #20
add r6, r11, r8
add r6, r6, sl
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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_02196924
_02196b38: .word func_ov51_02196b4c
@@ -1985,11 +1985,11 @@ 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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
stmia r8, {r0, r1, r2}
@@ -2001,7 +2001,7 @@ func_ov51_02196e18: ; 0x02196e18
_02196e4c:
mov r1, sb
mov r2, r6
add r0, sl, #0x48
add r0, r10, #0x48
mov r3, r11
stmia sp, {r7, r8}
bl func_ov00_020c57fc
@@ -2013,29 +2013,29 @@ _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 sb, [r10, #0x74]
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02196ee0:
add r0, sb, #1
mov r0, r0, lsl #0x10
@@ -2044,7 +2044,7 @@ _02196ee0:
blt _02196e4c
mov r0, #0
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r0, #0x1000
str r0, [sp, #0x84]
str r0, [sp, #0x88]
@@ -3268,7 +3268,7 @@ _02197f1c:
ldrh r0, [r5, #0xe6]
cmp r0, #0
ble _02197f94
mov sl, sb
mov r10, sb
add r8, r4, #0x48
add r7, sp, #0x48
add r6, sp, #0x54
@@ -3276,7 +3276,7 @@ _02197f1c:
_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
@@ -3290,7 +3290,7 @@ _02197f48:
blx ip
ldrh r0, [r5, #0xe6]
add sb, sb, #1
add sl, sl, #0x1000
add r10, r10, #0x1000
cmp sb, r0
blt _02197f48
_02197f94:
@@ -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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov51_02197e08
_02198018: .word data_02050f54
@@ -3336,7 +3336,7 @@ _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}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
ldr r4, [sb, #0x48]
ldr r5, [sb, #0x50]
@@ -3344,7 +3344,7 @@ func_ov51_02198024: ; 0x02198024
mov r8, r1
mov r6, r4
mov r7, r5
ldr sl, [sb, #0x4c]
ldr r10, [sb, #0x4c]
bl func_0202bb98
cmp r0, #3
addls pc, pc, r0, lsl #2
@@ -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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov51_02198024
_02198180: .word 0x000004cd
+7 -7
View File
@@ -724,7 +724,7 @@ 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, sb, r10, lr}
sub sp, sp, #0x3c
ldr r2, _02196104 ; =data_027e0618
mov sb, r0
@@ -732,7 +732,7 @@ func_ov52_02195da0: ; 0x02195da0
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, sb, 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, sb, 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, sb, r10, pc}
add r0, sp, #0x1c
bl func_01ffbe34
mov r1, #0
@@ -781,9 +781,9 @@ _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
@@ -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, sb, r10, pc}
.align 2, 0
arm_func_end func_ov52_02195da0
_02196104: .word data_027e0618
+8 -8
View File
@@ -435,10 +435,10 @@ _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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x2c
ldr r5, _02199304 ; =data_ov53_0219a580
mov sl, r0
mov r10, r0
ldrh sb, [r5, #0x42]
ldrh r0, [r5, #0x40]
cmp sb, r0
@@ -464,8 +464,8 @@ _02199220:
ldr r3, [r3, #0x64]
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
@@ -480,7 +480,7 @@ _02199280:
ldrh r0, [sb, #0x6c]
cmp r7, r0
addge sp, sp, #0x2c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r6, _02199310 ; =data_ov53_0219a5e4
ldr r8, _02199314 ; =data_027e0fe4
add r4, sp, #0x10
@@ -498,8 +498,8 @@ _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
@@ -509,7 +509,7 @@ _021992ec:
cmp r7, r0
blt _021992a8
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov53_021991ec
_02199304: .word data_ov53_0219a580
+9 -9
View File
@@ -544,7 +544,7 @@ _021993b4: .word data_027e0fcc
.global func_ov55_021993b8
arm_func_start func_ov55_021993b8
func_ov55_021993b8: ; 0x021993b8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x13c
mov r4, r0
mvn r1, #0
@@ -588,26 +588,26 @@ func_ov55_021993b8: ; 0x021993b8
ldr r0, _02199640 ; =data_027e0e60
ldr sb, [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 r10, [sp, #0xc]
str sb, [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 r10, [sp]
str sb, [sp, #4]
str r3, [sp, #8]
bl func_ov00_02083f44
@@ -634,7 +634,7 @@ _021994d4:
ldr r1, [sp, #0x38]
str r0, [sp, #0xe0]
ldr r0, [sp, #0x58]
ldr sl, _02199648 ; =0x0000038e
ldr r10, _02199648 ; =0x0000038e
mov sb, #0xf000
mov r7, #0x1000
str r6, [sp, #0xc8]
@@ -675,12 +675,12 @@ _021994d4:
ldr r0, [r0]
add r1, sp, #0x8c
str r6, [sp, #0x114]
str sl, [sp, #0x30]
str r10, [sp, #0x30]
str sb, [sp, #0x3c]
str r8, [sp, #0x48]
str r7, [sp, #0x44]
str r8, [sp, #0x40]
str sl, [sp, #0xc4]
str r10, [sp, #0xc4]
str sb, [sp, #0xd0]
str r8, [sp, #0xd4]
str r7, [sp, #0xd8]
@@ -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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov55_021993b8
_02199638: .word data_027e0f64
+24 -24
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x20
mov sl, r0
mov r10, r0
ldr r11, _02199d4c ; =data_027e0e60
mov r7, sl
add r8, sl, #0x2c
add sb, sl, #0x24
mov r7, r10
add r8, r10, #0x2c
add sb, r10, #0x24
mov r6, #0
add r4, sp, #4
add r5, sp, #0x14
@@ -1214,8 +1214,8 @@ _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
@@ -1229,8 +1229,8 @@ _02199cf8:
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
@@ -1242,7 +1242,7 @@ _02199d2c:
add sb, sb, #0x1c
blt _02199ca0
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov57_02199c78
_02199d4c: .word data_027e0e60
@@ -1882,11 +1882,11 @@ _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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, 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
@@ -1894,13 +1894,13 @@ func_ov57_0219a5ac: ; 0x0219a5ac
cmp r0, #0
beq _0219a664
ldr r11, _0219a6b0 ; =0x00000666
add r5, sl, #0x164
add r4, sl, #0x100
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
@@ -1909,16 +1909,16 @@ _0219a5ec:
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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0219a63c:
strh r6, [r4, #0x68]
ldrsh r2, [r5]
@@ -1935,22 +1935,22 @@ _0219a664:
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
mov r0, r10
strb r2, [sb, #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, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov57_0219a5ac
_0219a6b0: .word 0x00000666
+31 -31
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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x24
ldr r0, _02199fd4 ; =data_027e0e60
ldrb r1, [sp, #0x4c]
@@ -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
blt _02199f40
mov r0, sl
mov r0, r10
add sp, sp, #0x24
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xcc
ldr r0, _0219a3a8 ; =data_027e0e60
ldrb r1, [sp, #0xf4]
@@ -2216,7 +2216,7 @@ func_ov58_0219a084: ; 0x0219a084
bl func_ov00_02083c7c
mov r8, #0
ldr r4, _0219a3a8 ; =data_027e0e60
add sl, sp, #0x3c
add r10, sp, #0x3c
mov sb, r8
mov r7, r8
mov r6, #0x400
@@ -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 r1, r10
mov r2, r11
bl func_ov00_02083f44
str r0, [sl, #4]
str r0, [r10, #4]
add sb, sb, #0x4000
add sl, sl, #0xc
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, r11, lr}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, sb, 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, r11, lr}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
add sp, sp, #0x10
bx lr
.align 2, 0
@@ -2652,16 +2652,16 @@ _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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldr r1, _0219a768 ; =data_027e077c
mov sl, r0
mov r10, r0
ldr r0, [r1]
mov sb, #0
cmp r0, #0xd
bne _0219a760
mov r6, sb
mov r8, sl
add r7, sl, #8
mov r8, r10
add r7, r10, #8
mov r11, sb
mov r4, #1
mov r5, sb
@@ -2680,19 +2680,19 @@ _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
bne _0219a740
ldrh r1, [r8, #0x12]
mov r0, sl
mov r0, r10
bl func_ov58_0219a76c
cmp r0, #0
beq _0219a748
@@ -2709,7 +2709,7 @@ _0219a74c:
blt _0219a6d0
_0219a760:
mov r0, sb
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov58_0219a69c
_0219a768: .word data_027e077c
+76 -76
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, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldr r1, [sl, #0x2f4]
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
ldr r1, [r10, #0x2f4]
ldr r0, _0219a9e8 ; =gItemManager
ldr r4, [r1, #8]
ldr r0, [r0]
@@ -1442,38 +1442,38 @@ 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, r11, pc}
ldrb r0, [sl, #0x3c2]
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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]
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]
ldr r0, [r10, #0x4c]
mov sb, #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, r11, r3
@@ -1526,7 +1526,7 @@ func_ov59_0219a0ac: ; 0x0219a0ac
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,16 +1544,16 @@ _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]
ldr r5, [r10, #0xa0]
movne sb, #0
str r5, [sp, #0xc]
str r4, [sp, #0x10]
@@ -1561,7 +1561,7 @@ _0219a24c:
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
@@ -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 ip, [r10, #8]
ldr r0, [r11]
ldr r2, [sl, #0x98]
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
str ip, [sp, #8]
ldr ip, [sl, #0xa0]
ldr ip, [r10, #0xa0]
str ip, [sp, #0xc]
str r4, [sp, #0x10]
bl func_01ffbf5c
@@ -1674,7 +1674,7 @@ _0219a3f8:
_0219a48c:
cmp sb, #0
beq _0219a4b4
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
mov r0, r5
add r3, r1, r1, lsl #1
mov r1, r8
@@ -1688,7 +1688,7 @@ _0219a4b4:
_0219a4bc:
cmp sb, #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
@@ -1700,19 +1700,19 @@ _0219a4e4:
cmp sb, #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
@@ -1749,15 +1749,15 @@ _0219a4ec:
str r4, [r3, #8]
str r2, [sp, #0x88]
str r4, [sp, #0x90]
ldr sb, [sl, #0x48]
ldr sb, [r10, #0x48]
mov r11, #0x800
str sb, [sp, #0x7c]
ldr r2, [sl, #0x4c]
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
@@ -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,7 +1855,7 @@ _0219a668:
ldr r0, [sp, #0x108]
str r1, [sp, #0x88]
str r0, [sp, #0x90]
ldr sb, [sl, #0x344]
ldr sb, [r10, #0x344]
mov r6, r8
ldr r11, [sp, #0x14]
umull r8, r3, sb, r7
@@ -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]
ldr r4, [r10, #0x54]
mov sb, #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]
ldr r2, [r10, #0x48]
mov r11, sb
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
str ip, [sp, #8]
ldr ip, [sl, #0xa0]
ldr ip, [r10, #0xa0]
str ip, [sp, #0xc]
str r4, [sp, #0x10]
bl func_01ffbf5c
@@ -1991,11 +1991,11 @@ _0219a8c8:
str r1, [sp, #0x8c]
str r0, [sp, #0x90]
mov sb, #0
strb r11, [sl, #0x3c2]
strb r11, [r10, #0x3c2]
_0219a968:
cmp sb, #0
beq _0219a990
ldr r1, [sl, #0x98]
ldr r1, [r10, #0x98]
mov r0, r5
add r3, r1, r1, lsl #1
mov r1, r7
@@ -2007,26 +2007,26 @@ _0219a990:
cmp sb, #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, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, 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, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov59_0219a0ac
_0219a9e8: .word gItemManager
+148 -148
View File
@@ -6,22 +6,22 @@
.global func_ov60_0213dec0
arm_func_start func_ov60_0213dec0
func_ov60_0213dec0: ; 0x0213dec0
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
mov r8, r1
bl func_ov60_021400d0
mov r7, r0
cmp sb, #0x3e8
movlo r0, r8
ldmloia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmloia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
cmp r7, #0
beq _0213df88
_0213dee8:
ldr r0, [r7]
cmp r0, sb
bne _0213df7c
ldr sl, _0213df90 ; =data_ov60_02147700
ldr r0, [sl, #4]
ldr r10, _0213df90 ; =data_ov60_02147700
ldr r0, [r10, #4]
cmp sb, r0
bne _0213df60
mov r6, #0
@@ -44,9 +44,9 @@ _0213df10:
cmp r6, #2
bgt _0213df60
_0213df4c:
ldr r0, [sl]
ldr r0, [r10]
cmp r8, r0
ldrne r0, [sl, #8]
ldrne r0, [r10, #8]
cmpne r8, r0
beq _0213df10
_0213df60:
@@ -56,14 +56,14 @@ _0213df60:
ldr r2, [r1]
str r2, [r1, #8]
str r8, [r1]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_0213df7c:
ldr r7, [r7, #0x28]
cmp r7, #0
bne _0213dee8
_0213df88:
mvn r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov60_0213dec0
_0213df90: .word data_ov60_02147700
@@ -421,7 +421,7 @@ _0213e3e8:
.global func_ov60_0213e3fc
arm_func_start func_ov60_0213e3fc
func_ov60_0213e3fc: ; 0x0213e3fc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #8
mov r5, r1
mov r1, #0x6c
@@ -434,14 +434,14 @@ func_ov60_0213e3fc: ; 0x0213e3fc
strb r8, [r1, r0]
add sb, r1, r0
add r0, r6, #0x1f8
movs sl, r3
movs r10, r3
str r0, [sp, #4]
mov r7, #0
mov r4, r2
addeq sp, sp, #8
moveq r0, r7
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
cmp sl, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
cmp r10, #0
ble _0213e914
mvn r11, #0
_0213e458:
@@ -490,7 +490,7 @@ _0213e4f0:
cmp r0, #0
addeq sp, sp, #8
moveq r0, r7
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
mov r8, #3
b _0213e90c
_0213e508:
@@ -520,7 +520,7 @@ _0213e530: ; jump table
_0213e560:
add sp, sp, #8
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e56c:
mov r8, #5
b _0213e90c
@@ -537,7 +537,7 @@ _0213e57c:
_0213e594:
add sp, sp, #8
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e5a0:
mov r8, #0xa
b _0213e90c
@@ -564,7 +564,7 @@ _0213e5d0:
strb r0, [sb]
add sp, sp, #8
add r0, r7, #9
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e5fc:
mov r0, r4
add r1, sb, #0xa
@@ -608,7 +608,7 @@ _0213e678:
strb r0, [sb]
add sp, sp, #8
add r0, r7, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e69c:
ldr r0, [r6]
cmp r0, #2
@@ -619,7 +619,7 @@ _0213e69c:
_0213e6b4:
add sp, sp, #8
add r0, r7, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e6c0:
mov r0, r6
mov r2, r5
@@ -628,7 +628,7 @@ _0213e6c0:
bl func_ov60_0213e204
add sp, sp, #8
add r0, r7, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e6e0:
mov r0, r4
add r1, sb, #0x10
@@ -660,7 +660,7 @@ _0213e730:
add sp, sp, #8
mov r0, r7
strb r1, [sb]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e754:
ldr r0, [r6]
cmp r0, #4
@@ -687,7 +687,7 @@ _0213e784:
_0213e7a8:
add sp, sp, #8
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e7b4:
mov r8, #8
b _0213e90c
@@ -723,7 +723,7 @@ _0213e81c:
add sp, sp, #8
mov r0, r7
strb r1, [sb]
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e830:
str r4, [sb, #0x20]
ldr r0, [r6]
@@ -770,7 +770,7 @@ _0213e8c0:
_0213e8d4:
add sp, sp, #8
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_0213e8e0:
mov r0, r6
mov r1, #0xf
@@ -785,7 +785,7 @@ _0213e8f8:
mov r3, #4
bl func_ov60_0213e204
_0213e90c:
cmp r7, sl
cmp r7, r10
blt _0213e458
_0213e914:
mov r0, r6
@@ -795,13 +795,13 @@ _0213e914:
bl func_ov60_0213e204
mov r0, r7
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov60_0213e3fc
.global func_ov60_0213e934
arm_func_start func_ov60_0213e934
func_ov60_0213e934: ; 0x0213e934
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #8
mov r3, #0x6c
mul r6, r1, r3
@@ -819,15 +819,15 @@ func_ov60_0213e934: ; 0x0213e934
mov r0, #0
cmpeq r1, #2
addne sp, sp, #8
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
bl func_ov60_0213fc64
mov sl, r0
mov r10, r0
bl func_ov60_0214000c
mov sb, r0
bl func_ov60_0213fffc
str sb, [sp]
mov r1, r5
mov r2, sl, lsl #0x10
mov r2, r10, lsl #0x10
mov r3, r2, asr #0x10
str r0, [sp, #4]
mov r0, r7
@@ -839,7 +839,7 @@ func_ov60_0213e934: ; 0x0213e934
mov r2, #0
str r2, [r1, #0x23c]
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
arm_func_end func_ov60_0213e934
.global func_ov60_0213e9d0
@@ -906,16 +906,16 @@ func_ov60_0213ea38: ; 0x0213ea38
.global func_ov60_0213ea9c
arm_func_start func_ov60_0213ea9c
func_ov60_0213ea9c: ; 0x0213ea9c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0x14
mov r3, #0x6c
mul r7, r1, r3
mov sl, r0
mov r10, r0
str r1, [sp, #0xc]
add r1, sl, #0x1d4
add r1, r10, #0x1d4
ldrb r0, [r1, r7]
mov sb, r2
add r5, sl, #0x138
add r5, r10, #0x138
cmp r0, #2
add r6, r1, r7
mov r11, #0
@@ -967,7 +967,7 @@ _0213eb68:
strh r0, [r5, #0x20]
mov r3, #0
ldr r2, [sp, #0xc]
mov r0, sl
mov r0, r10
str r3, [r5, #0x1c]
mov r1, #0xd
bl func_ov60_0213e204
@@ -987,13 +987,13 @@ _0213eb68:
_0213ebd0:
mov r0, #1
strb r0, [r6]
add r0, sl, r7
add r0, r10, r7
mov r1, #0
str r1, [r0, #0x23c]
_0213ebe4:
mov r0, r11
add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov60_0213ea9c
_0213ebf0: .word 0x0000fffe
@@ -1109,7 +1109,7 @@ _0213ed60: .word 0x0000ffff
.global func_ov60_0213ed64
arm_func_start func_ov60_0213ed64
func_ov60_0213ed64: ; 0x0213ed64
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #4
mov r5, r0
ldr r2, [r5]
@@ -1141,16 +1141,16 @@ _0213edb4:
mov r3, r6
bl func_ov60_0213f144
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_0213ede0:
mov r8, r0
add sb, r5, #0x1f8
mov r7, #1
mvn r6, #0
_0213edf0:
mov sl, r7, lsl r8
mov r10, r7, lsl r8
ldrh r2, [r5, #8]
mov r1, sl, lsl #0x10
mov r1, r10, lsl #0x10
tst r2, r1, lsr #16
beq _0213ee70
mov r0, sb
@@ -1158,7 +1158,7 @@ _0213edf0:
cmp r0, r6
bne _0213ee30
ldrb r2, [r5, #0xc]
mov r1, sl, lsl #0x10
mov r1, r10, lsl #0x10
ldr r3, [r5, #0x14]
mov r0, r4
mov r1, r1, lsr #0x10
@@ -1182,14 +1182,14 @@ _0213ee58:
_0213ee64:
cmp r0, #0
addne sp, sp, #4
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_0213ee70:
add r8, r8, #1
cmp r8, #0x10
add sb, sb, #0x6c
blt _0213edf0
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
_0213ee88:
ldrb r1, [r5, #0x1d]
mov r0, r4
@@ -1200,7 +1200,7 @@ _0213ee88:
bl func_ov60_0213f5c4
_0213eea4:
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
arm_func_end func_ov60_0213ed64
.global func_ov60_0213eeac
@@ -2457,7 +2457,7 @@ _0213fed0:
.global func_ov60_0213ff00
arm_func_start func_ov60_0213ff00
func_ov60_0213ff00: ; 0x0213ff00
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
mov sb, r0
mov r7, #0
bl func_0200ee4c
@@ -2472,7 +2472,7 @@ func_ov60_0213ff00: ; 0x0213ff00
cmp r0, #0
beq _0213ffa0
mov r6, r7
mov sl, #0x10
mov r10, #0x10
mov r4, #1
_0213ff44:
mov r0, r4, lsl r6
@@ -2485,7 +2485,7 @@ _0213ff44:
mvn r1, r0
and r1, r2, r1
strh r1, [r8, #8]
str sl, [r8, #4]
str r10, [r8, #4]
strh r0, [r8, #0xa]
ldr r1, [r8, #0x10]
mov r7, r4
@@ -2503,7 +2503,7 @@ _0213ffa0:
mov r0, r5
bl func_0200ee60
mov r0, r7
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov60_0213ff00
_0213ffb0: .word data_ov60_021477e0
@@ -2767,10 +2767,10 @@ func_ov60_021401dc: ; 0x021401dc
.global func_ov60_02140210
arm_func_start func_ov60_02140210
func_ov60_02140210: ; 0x02140210
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
ldrh r4, [sp, #0x28]
mov sl, r0
ldrb r0, [sl, #1]
mov r10, r0
ldrb r0, [r10, #1]
cmp r4, #0xff
movhi r4, #0xff
mov sb, r1
@@ -2779,13 +2779,13 @@ func_ov60_02140210: ; 0x02140210
and r4, r4, #0xff
cmp r0, #0
beq _021403dc
ldrb r0, [sl, #2]
ldrb r0, [r10, #2]
mov r6, #0
cmp r0, #0
ble _021403dc
mov r5, r6
_02140254:
ldr r1, [sl, #4]
ldr r1, [r10, #4]
ldrh r0, [r1, r5]
add r2, r1, r5
cmp r0, #1
@@ -2795,18 +2795,18 @@ _02140254:
bl func_ov60_0214289c
cmp r0, #0
bne _021403c8
ldr r1, [sl, #8]
ldr r1, [r10, #8]
mov r0, #0x2c
mla r0, r6, r0, r1
bl func_0200ec14
bl func_0200ee4c
mov r1, #0xe0
mul r2, r6, r1
ldr r1, [sl, #4]
ldr r1, [r10, #4]
ldr r8, _02140540 ; =0x2aaaaaab
add r1, r1, r2
strh r7, [r1, #8]
ldr r1, [sl, #4]
ldr r1, [r10, #4]
mov r5, r0
add r1, r1, #0xb
ldrb r7, [r1, r2]
@@ -2820,12 +2820,12 @@ _02140254:
sub ip, r0, r7
and r7, ip, #0xff
strb r7, [r1, r2]
ldr r0, [sl, #4]
ldr r0, [r10, #4]
mov r1, r3
add r0, r0, r2
add r0, r0, r7
strb r4, [r0, #0xc]
ldr r7, [sl, #4]
ldr r7, [r10, #4]
add r2, r7, r2
_021402fc:
ldrb r0, [r2, #0xc]
@@ -2841,13 +2841,13 @@ _021402fc:
smull r0, r7, r1, r3
add r7, r7, r3, lsr #31
strb r7, [r2, #0xa]
ldr r1, [sl, #4]
ldr r1, [r10, #4]
ldr r0, [sp, #0x2c]
add r1, r1, r4
add r1, r1, #0x20
mov r2, #0xc0
bl func_02007984
ldr r0, [sl, #4]
ldr r0, [r10, #4]
mov r1, #0xc0
add r0, r0, r4
add r0, r0, #0x20
@@ -2856,12 +2856,12 @@ _021402fc:
bl func_0200ee60
mov r0, #0x2c
mul r5, r6, r0
ldr r0, [sl, #4]
ldr r0, [r10, #4]
mov r6, #0
add r0, r0, r4
ldr r1, _02140544 ; =0x000082ea
str r0, [sp]
ldr r0, [sl, #8]
ldr r0, [r10, #8]
mov r2, r6
umull r7, r4, sb, r1
mla r4, sb, r2, r4
@@ -2872,35 +2872,35 @@ _021402fc:
mov r2, r4, lsr #0x6
orr r1, r1, r4, lsl #26
bl func_0200eba8
ldrb r1, [sl]
ldr r0, [sl, #8]
ldrb r1, [r10]
ldr r0, [r10, #8]
add r0, r0, r5
add r1, r1, #0x80
bl func_0200ed9c
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_021403c8:
ldrb r0, [sl, #2]
ldrb r0, [r10, #2]
add r6, r6, #1
add r5, r5, #0xe0
cmp r6, r0
blt _02140254
_021403dc:
ldrb r0, [sl, #2]
ldrb r0, [r10, #2]
mov r6, #0
cmp r0, #0
ble _02140538
ldr r5, [sl, #4]
ldr r5, [r10, #4]
_021403f0:
ldrh r0, [r5]
cmp r0, #0
bne _02140524
bl func_0200ee4c
ldrb r3, [sl, #1]
ldrb r3, [r10, #1]
mov r2, #1
mov r1, #0
add r3, r3, #1
strb r3, [sl, #1]
strb r3, [r10, #1]
strh r2, [r5]
ldrb r2, [r8]
mov r11, r0
@@ -2916,7 +2916,7 @@ _021403f0:
ldrb r0, [r8, #5]
strb r0, [r5, #7]
strh r7, [r5, #8]
str sl, [r5, #0x14]
str r10, [r5, #0x14]
strb r1, [r5, #0xb]
_02140458:
add r0, r5, r1
@@ -2936,50 +2936,50 @@ _02140458:
bl func_0200ee60
mov r0, #0x2c
mul r4, r6, r0
ldr r0, [sl, #8]
ldr r0, [r10, #8]
add r0, r0, r4
bl func_0200ec14
mov r0, #0xe0
mul r5, r6, r0
mov r6, #0
ldr r1, _02140544 ; =0x000082ea
ldr r0, [sl, #4]
ldr r0, [r10, #4]
mov r2, r6
umull r8, r7, sb, r1
mla r7, sb, r2, r7
mla r7, r6, r1, r7
add r0, r0, r5
str r0, [sp]
ldr r0, [sl, #8]
ldr r0, [r10, #8]
mov r1, r8, lsr #0x6
ldr r3, _02140548 ; =func_ov60_0214054c
add r0, r0, r4
mov r2, r7, lsr #0x6
orr r1, r1, r7, lsl #26
bl func_0200eba8
ldrb r1, [sl]
ldr r0, [sl, #8]
ldrb r1, [r10]
ldr r0, [r10, #8]
add r0, r0, r4
add r1, r1, #0x80
bl func_0200ed9c
ldr r1, [sl, #0xc]
ldr r1, [r10, #0xc]
cmp r1, #0
beq _0214051c
ldr r0, [sl, #4]
ldr r0, [r10, #4]
add r0, r0, r5
blx r1
_0214051c:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
_02140524:
ldrb r0, [sl, #2]
ldrb r0, [r10, #2]
add r6, r6, #1
add r5, r5, #0xe0
cmp r6, r0
blt _021403f0
_02140538:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov60_02140210
_02140540: .word 0x2aaaaaab
@@ -3061,14 +3061,14 @@ func_ov60_021405c4: ; 0x021405c4
.global func_ov60_02140604
arm_func_start func_ov60_02140604
func_ov60_02140604: ; 0x02140604
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #4
mov sl, r0
ldrb r0, [sl, #2]
mov r10, r0
ldrb r0, [r10, #2]
mov r5, #0
cmp r0, #0
addle sp, sp, #4
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmleia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
ldr r0, _021406c4 ; =0x000082ea
mov r2, r5
umull r4, r3, r1, r0
@@ -3081,36 +3081,36 @@ func_ov60_02140604: ; 0x02140604
mov r8, r3, lsr #0x6
orr sb, sb, r3, lsl #26
_02140650:
ldr r0, [sl, #4]
ldr r0, [r10, #4]
ldrh r0, [r0, r6]
cmp r0, #1
bne _021406a4
ldr r0, [sl, #8]
ldr r0, [r10, #8]
add r0, r0, r7
bl func_0200ec14
ldr r0, [sl, #4]
ldr r0, [r10, #4]
mov r1, sb
add r0, r0, r6
str r0, [sp]
ldr r0, [sl, #8]
ldr r0, [r10, #8]
mov r2, r8
add r0, r0, r7
mov r3, r4
bl func_0200eba8
ldrb r1, [sl]
ldr r0, [sl, #8]
ldrb r1, [r10]
ldr r0, [r10, #8]
add r0, r0, r7
add r1, r1, #0x80
bl func_0200ed9c
_021406a4:
ldrb r0, [sl, #2]
ldrb r0, [r10, #2]
add r5, r5, #1
add r6, r6, #0xe0
cmp r5, r0
add r7, r7, #0x2c
blt _02140650
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov60_02140604
_021406c4: .word 0x000082ea
@@ -4669,14 +4669,14 @@ _02141ad0: .word data_ov60_02148088
.global func_ov60_02141ad4
arm_func_start func_ov60_02141ad4
func_ov60_02141ad4: ; 0x02141ad4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
mov sl, r0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r10, r0
mov r11, r1
mov r4, #0
_02141ae4:
mov r0, #6
mul r7, r4, r0
add sb, sl, r7
add sb, r10, r7
mov r0, sb
bl func_ov60_02142cb4
add r8, r11, r7
@@ -4687,7 +4687,7 @@ _02141ae4:
ldrb r1, [r8, #1]
mov r6, r0
cmp r5, #0
strb r2, [sl, r7]
strb r2, [r10, r7]
strb r1, [sb, #1]
ldrb r1, [r8, #2]
ldrb r0, [r8, #3]
@@ -4717,7 +4717,7 @@ _02141b74:
mov r4, r0, lsr #0x10
cmp r4, #0x10
blo _02141ae4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
arm_func_end func_ov60_02141ad4
.global func_ov60_02141b8c
@@ -6000,10 +6000,10 @@ _02142ad0: .word 0x1b0cb173
.global func_ov60_02142ad4
arm_func_start func_ov60_02142ad4
func_ov60_02142ad4: ; 0x02142ad4
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
ldr sl, _02142b98 ; =data_ov60_021480a0
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
ldr r10, _02142b98 ; =data_ov60_021480a0
mov r6, #0
ldr r0, [sl]
ldr r0, [r10]
mov r5, r6
ldrb r0, [r0, #0xc]
cmp r0, #0
@@ -6038,7 +6038,7 @@ _02142b00:
_02142b5c:
mov r6, r4
_02142b60:
ldr r0, [sl]
ldr r0, [r10]
add r1, r5, #1
ldrb r0, [r0, #0xc]
and r5, r1, #0xff
@@ -6047,12 +6047,12 @@ _02142b60:
_02142b78:
cmp r6, #0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
add r0, r6, #0x20
mov r1, #1
bl func_ov60_021417f8
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov60_02142ad4
_02142b98: .word data_ov60_021480a0
@@ -7054,15 +7054,15 @@ _021438a4: .word data_ov60_02148090
.global func_ov60_021438a8
arm_func_start func_ov60_021438a8
func_ov60_021438a8: ; 0x021438a8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, lr}
mov sl, r1
ldrh r5, [sl, #0x22]
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, lr}
mov r10, r1
ldrh r5, [r10, #0x22]
mov r11, r0
mov r4, #0
cmp r5, #0
beq _021439a8
ldr r0, _021439b0 ; =data_ov60_02148090
add r7, sl, #0x24
add r7, r10, #0x24
ldr r0, [r0]
add r8, r11, #0x24
ldrb sb, [r0]
@@ -7098,8 +7098,8 @@ _02143940:
ldr r0, [r0]
ldr r1, [r0, #0x18]
ldr r0, [r1, r4, lsl #2]
cmp r0, sl
ldreq r0, [sl, #4]
cmp r0, r10
ldreq r0, [r10, #4]
streq r0, [r1, r4, lsl #2]
add r0, r4, #1
mov r0, r0, lsl #0x10
@@ -7112,7 +7112,7 @@ _02143968:
blt _02143914
mov r2, #0
ldr r0, _021439b8 ; =data_ov60_02148088
strh r2, [sl, #0x22]
strh r2, [r10, #0x22]
ldr r1, [r0]
add r0, r11, #0x20
ldrh r1, [r1, #0x98]
@@ -7123,7 +7123,7 @@ _02143968:
mov r4, #1
_021439a8:
mov r0, r4
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov60_021438a8
_021439b0: .word data_ov60_02148090
@@ -9052,9 +9052,9 @@ _02145060: .word data_ov60_02148088
.global func_ov60_02145064
arm_func_start func_ov60_02145064
func_ov60_02145064: ; 0x02145064
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
ldr r1, _021450dc ; =data_ov00_020ee698
mov sl, r0
mov r10, r0
ldrh r8, [r1, #2]
cmp r8, #0
beq _021450c8
@@ -9067,7 +9067,7 @@ _0214508c:
beq _021450b4
sub r0, r7, #1
mla sb, r0, r4, r5
add r0, sl, #0xa
add r0, r10, #0xa
add r1, sb, #0x16
bl func_ov60_0214289c
cmp r0, #0
@@ -9085,7 +9085,7 @@ _021450cc:
cmp r0, #0
movne r0, #1
moveq r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov60_02145064
_021450dc: .word data_ov00_020ee698
@@ -11316,7 +11316,7 @@ _02146d5c: .word func_ov60_02146458
.global func_ov60_02146d60
arm_func_start func_ov60_02146d60
func_ov60_02146d60: ; 0x02146d60
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, lr}
sub sp, sp, #8
mov r8, r0
mov r7, r1
@@ -11328,18 +11328,18 @@ func_ov60_02146d60: ; 0x02146d60
ldr r1, [sb, #8]
cmp r1, #0
bne _02146f58
mov sl, #1
mov r10, #1
mov r0, r8
mov r1, r7
mov r2, r6
mov r3, r5
str sl, [sb, #8]
str r10, [sb, #8]
bl func_ov60_02146cb4
mov r0, r4
bl func_0200ee60
mov r0, sb
ldr r8, [r0, #4]
mov r3, sl
mov r3, r10
add sb, r8, #0x440
ldr r2, _02146f68 ; =0x00010770
mov r0, sb
@@ -11350,34 +11350,34 @@ func_ov60_02146d60: ; 0x02146d60
mov r0, sb
bl func_0200e2c0
bl func_0200e2e4
add sl, sb, #0xc0
add r10, sb, #0xc0
add r0, sb, #0x10000
str sl, [r0, #0x740]
str r10, [r0, #0x740]
add r0, sb, #0x740
ldr r4, _02146f6c ; =0xea0ea0eb
mov r6, sl
mov r6, r10
add r5, r0, #0x10000
mov r7, #0
_02146e08:
add r1, sl, #0x8c0
add r0, sl, #0x38
str r1, [sl]
add r1, r10, #0x8c0
add r0, r10, #0x38
str r1, [r10]
blx func_02041ca8
add r0, sl, #0x8c0
add r0, r10, #0x8c0
add r0, r0, #0x8c00000
sub r1, r0, r6
smull r0, r2, r4, r1
str r7, [sl, #0x84]
str r7, [r10, #0x84]
add r2, r1, r2
mov r0, r1, lsr #0x1f
str r7, [sl, #0x80]
str r7, [r10, #0x80]
add r2, r0, r2, asr #11
str r2, [sl, #0x8c]
ldr r0, [sl]
str r2, [r10, #0x8c]
ldr r0, [r10]
cmp r0, r5
strhs r7, [sl]
strhs r7, [r10]
bhs _02146e58
mov sl, r0
mov r10, r0
b _02146e08
_02146e58:
add r2, sb, #0x10000
@@ -11444,11 +11444,11 @@ _02146f44:
bl func_0200ee60
bl func_ov60_02145c58
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
_02146f58:
bl func_0200ee60
add sp, sp, #8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, pc}
.align 2, 0
arm_func_end func_ov60_02146d60
_02146f64: .word data_ov60_0214857c
@@ -11715,7 +11715,7 @@ _02147278: .word data_ov60_02148580
.global func_ov60_0214727c
arm_func_start func_ov60_0214727c
func_ov60_0214727c: ; 0x0214727c
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, r11, lr}
stmdb sp!, {r4, r5, r6, r7, r8, sb, r10, r11, lr}
sub sp, sp, #0xf4
movs r5, r0
mov r0, #0
@@ -11854,18 +11854,18 @@ _02147450:
mov r0, r5
bl func_0200ee60
ldr r0, [sp, #8]
mov sl, #0
mov r10, #0
str r7, [r0]
add sb, r0, #4
add r6, sp, #0x2c
add r5, sp, #0x4c
_02147498:
add r0, r6, sl, lsl #3
add r0, r6, r10, lsl #3
ldr r1, [r0, #4]
add r0, sp, #0xc
str r1, [sb]
ldr r1, [r6, sl, lsl #3]
str sb, [r0, sl, lsl #2]
ldr r1, [r6, r10, lsl #3]
str sb, [r0, r10, lsl #2]
mov r0, r5
mov r2, #0
add r1, r7, r1
@@ -11875,11 +11875,11 @@ _02147498:
add r1, sb, #4
blx func_02041fa4
add r0, sp, #0x1c
ldr r0, [r0, sl, lsl #2]
add sl, sl, #1
ldr r0, [r0, r10, lsl #2]
add r10, r10, #1
add r0, r0, #4
add sb, sb, r0
cmp sl, #4
cmp r10, #4
blt _02147498
cmp r11, #0
beq _021475bc
@@ -11890,7 +11890,7 @@ _02147498:
mov r0, #2
add r5, r2, #4
mov r6, r1, lsr #0x3
add sl, r5, r6, lsl #3
add r10, r5, r6, lsl #3
str r0, [sp]
_02147518:
ldr r0, [sp]
@@ -11910,7 +11910,7 @@ _0214753c:
add r1, r11, r1, lsl #3
blx func_02041fb0
add r0, sp, #0x4c
mov r1, sl
mov r1, r10
mov r2, #8
blx func_02041fa4
ldr r2, [r5, r6, lsl #3]
@@ -11920,7 +11920,7 @@ _0214753c:
add r0, r5, r6, lsl #3
str r2, [r5, r6, lsl #3]
ldr r2, [r0, #4]
add sl, sl, #8
add r10, r10, #8
add r2, r2, r4
str r2, [r0, #4]
str r6, [r1, #0x18]
@@ -11951,7 +11951,7 @@ _021475bc:
ldr r0, [sp, #4]
str r0, [r1, #0x24]
add sp, sp, #0xf4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, r11, pc}
ldmia sp!, {r4, r5, r6, r7, r8, sb, r10, r11, pc}
.align 2, 0
arm_func_end func_ov60_0214727c
_021475f8: .word data_ov60_02148580
+1623 -1623
View File
File diff suppressed because it is too large Load Diff