mirror of
https://github.com/zeldaret/ph
synced 2026-05-23 15:01:37 -04:00
Mangle ActorManager
This commit is contained in:
Aetias
+3
-3
@@ -3,6 +3,9 @@
|
||||
.extern _ZN11ItemManager10GiveRupeesEjj
|
||||
.extern _ZN11ItemManager7AddItemEi
|
||||
.extern _ZN11ItemManager8GiveKeysEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12TouchControl18func_ov00_0207af38Etb
|
||||
.extern _ZN12TouchControlC2Ev
|
||||
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
|
||||
@@ -325,9 +328,6 @@
|
||||
.extern func_ov00_020a5e9c
|
||||
.extern func_ov00_020bce48
|
||||
.extern func_ov00_020bcec8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c3b2c
|
||||
.extern func_ov00_020ce704
|
||||
.extern func_ov00_020cec60
|
||||
.extern func_ov00_020cef9c
|
||||
|
||||
+3
-3
@@ -74905,11 +74905,11 @@ _02036b24:
|
||||
ldr r1, [r0]
|
||||
ldr r2, [r2, r3, lsl #2]
|
||||
add r0, sp, #4
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02036bac ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r2, r0
|
||||
addeq sp, sp, #0xc
|
||||
ldmeqia sp!, {r3, r4, r5, r6, pc}
|
||||
@@ -76464,7 +76464,7 @@ _02037d90:
|
||||
ldr r0, _02037f54 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
movle r0, #0
|
||||
movgt r0, #1
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
.include "macros/function.inc"
|
||||
|
||||
.text
|
||||
.global func_ov00_020c33d4
|
||||
arm_func_start func_ov00_020c33d4
|
||||
func_ov00_020c33d4: ; 0x020c33d4
|
||||
.global _ZN12ActorManager11DeleteActorEjb
|
||||
arm_func_start _ZN12ActorManager11DeleteActorEjb
|
||||
_ZN12ActorManager11DeleteActorEjb: ; 0x020c33d4
|
||||
stmdb sp!, {r4, r5, r6, lr}
|
||||
movs r4, r2
|
||||
mov r6, r0
|
||||
@@ -53,11 +53,11 @@ _020c3470:
|
||||
mov r0, r0, lsr #0x10
|
||||
str r0, [r6, #4]
|
||||
ldmia sp!, {r4, r5, r6, pc}
|
||||
arm_func_end func_ov00_020c33d4
|
||||
arm_func_end _ZN12ActorManager11DeleteActorEjb
|
||||
|
||||
.global func_ov00_020c3484
|
||||
arm_func_start func_ov00_020c3484
|
||||
func_ov00_020c3484: ; 0x020c3484
|
||||
.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
|
||||
mvn r3, #0
|
||||
@@ -120,14 +120,14 @@ _020c3560:
|
||||
blo _020c34e8
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
|
||||
.align 2, 0
|
||||
arm_func_end func_ov00_020c3484
|
||||
arm_func_end _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
|
||||
_020c3570: .word data_027e103c
|
||||
_020c3574: .word data_027e077c
|
||||
_020c3578: .word data_02056be4
|
||||
|
||||
.global func_ov00_020c357c
|
||||
arm_func_start func_ov00_020c357c
|
||||
func_ov00_020c357c: ; 0x020c357c
|
||||
.global _ZN12ActorManager14Actor_vfunc_10Ej
|
||||
arm_func_start _ZN12ActorManager14Actor_vfunc_10Ej
|
||||
_ZN12ActorManager14Actor_vfunc_10Ej: ; 0x020c357c
|
||||
stmdb sp!, {r3, r4, r5, r6, r7, lr}
|
||||
mov r5, r0
|
||||
ldr r0, [r5, #4]
|
||||
@@ -153,11 +153,11 @@ _020c35c0:
|
||||
add r7, r7, #4
|
||||
blt _020c359c
|
||||
ldmia sp!, {r3, r4, r5, r6, r7, pc}
|
||||
arm_func_end func_ov00_020c357c
|
||||
arm_func_end _ZN12ActorManager14Actor_vfunc_10Ej
|
||||
|
||||
.global func_ov00_020c35d8
|
||||
arm_func_start func_ov00_020c35d8
|
||||
func_ov00_020c35d8: ; 0x020c35d8
|
||||
.global _ZN12ActorManager13FindActorByIdEj
|
||||
arm_func_start _ZN12ActorManager13FindActorByIdEj
|
||||
_ZN12ActorManager13FindActorByIdEj: ; 0x020c35d8
|
||||
stmdb sp!, {r3, lr}
|
||||
cmp r1, #0
|
||||
mov ip, #0
|
||||
@@ -201,11 +201,11 @@ _020c3660:
|
||||
_020c366c:
|
||||
mov r0, ip
|
||||
ldmia sp!, {r3, pc}
|
||||
arm_func_end func_ov00_020c35d8
|
||||
arm_func_end _ZN12ActorManager13FindActorByIdEj
|
||||
|
||||
.global func_ov00_020c3674
|
||||
arm_func_start func_ov00_020c3674
|
||||
func_ov00_020c3674: ; 0x020c3674
|
||||
.global _ZN12ActorManager8GetActorEP8ActorRef
|
||||
arm_func_start _ZN12ActorManager8GetActorEP8ActorRef
|
||||
_ZN12ActorManager8GetActorEP8ActorRef: ; 0x020c3674
|
||||
ldr r2, [r1, #4]
|
||||
cmp r2, #0
|
||||
movlt r0, #0
|
||||
@@ -223,11 +223,11 @@ func_ov00_020c3674: ; 0x020c3674
|
||||
_020c36ac:
|
||||
mov r0, #0
|
||||
bx lr
|
||||
arm_func_end func_ov00_020c3674
|
||||
arm_func_end _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global func_ov00_020c36b4
|
||||
arm_func_start func_ov00_020c36b4
|
||||
func_ov00_020c36b4: ; 0x020c36b4
|
||||
.global _ZN11ActorFilter6FilterEP5Actor
|
||||
arm_func_start _ZN11ActorFilter6FilterEP5Actor
|
||||
_ZN11ActorFilter6FilterEP5Actor: ; 0x020c36b4
|
||||
stmdb sp!, {r3, r4, r5, lr}
|
||||
sub sp, sp, #0x18
|
||||
mov r5, r0
|
||||
@@ -310,11 +310,11 @@ _020c37e0:
|
||||
mov r0, #1
|
||||
add sp, sp, #0x18
|
||||
ldmia sp!, {r3, r4, r5, pc}
|
||||
arm_func_end func_ov00_020c36b4
|
||||
arm_func_end _ZN11ActorFilter6FilterEP5Actor
|
||||
|
||||
.global func_ov00_020c37ec
|
||||
arm_func_start func_ov00_020c37ec
|
||||
func_ov00_020c37ec: ; 0x020c37ec
|
||||
.global _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
arm_func_start _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
_ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList: ; 0x020c37ec
|
||||
stmdb sp!, {r4, r5, r6, r7, r8, lr}
|
||||
movs r7, r2
|
||||
mov r4, #0
|
||||
@@ -361,11 +361,11 @@ _020c3880:
|
||||
_020c388c:
|
||||
mov r0, r4
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, pc}
|
||||
arm_func_end func_ov00_020c37ec
|
||||
arm_func_end _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
|
||||
.global func_ov00_020c3894
|
||||
arm_func_start func_ov00_020c3894
|
||||
func_ov00_020c3894: ; 0x020c3894
|
||||
.global _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
arm_func_start _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
_ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j: ; 0x020c3894
|
||||
stmdb sp!, {r3, lr}
|
||||
mvn r3, #0
|
||||
str r3, [r0]
|
||||
@@ -394,11 +394,11 @@ _020c38ec:
|
||||
cmp ip, lr
|
||||
blo _020c38b8
|
||||
ldmia sp!, {r3, pc}
|
||||
arm_func_end func_ov00_020c3894
|
||||
arm_func_end _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
|
||||
.global func_ov00_020c38fc
|
||||
arm_func_start func_ov00_020c38fc
|
||||
func_ov00_020c38fc: ; 0x020c38fc
|
||||
.global _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
arm_func_start _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
_ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p: ; 0x020c38fc
|
||||
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
|
||||
mvn r4, #0
|
||||
mov sb, r0
|
||||
@@ -437,31 +437,31 @@ _020c397c:
|
||||
cmp r5, r6
|
||||
blo _020c3930
|
||||
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
|
||||
arm_func_end func_ov00_020c38fc
|
||||
arm_func_end _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
|
||||
.global func_ov00_020c398c
|
||||
arm_func_start func_ov00_020c398c
|
||||
func_ov00_020c398c: ; 0x020c398c
|
||||
.global _ZN12ActorManager18func_ov00_020c398cEv
|
||||
arm_func_start _ZN12ActorManager18func_ov00_020c398cEv
|
||||
_ZN12ActorManager18func_ov00_020c398cEv: ; 0x020c398c
|
||||
ldr ip, _020c3998 ; =func_ov00_020c3f08
|
||||
ldr r0, [r0, #0x14]
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end func_ov00_020c398c
|
||||
arm_func_end _ZN12ActorManager18func_ov00_020c398cEv
|
||||
_020c3998: .word func_ov00_020c3f08
|
||||
|
||||
.global func_ov00_020c399c
|
||||
arm_func_start func_ov00_020c399c
|
||||
func_ov00_020c399c: ; 0x020c399c
|
||||
.global _ZN12ActorManager18func_ov00_020c399cEv
|
||||
arm_func_start _ZN12ActorManager18func_ov00_020c399cEv
|
||||
_ZN12ActorManager18func_ov00_020c399cEv: ; 0x020c399c
|
||||
ldr ip, _020c39a8 ; =func_ov00_020c3f3c
|
||||
ldr r0, [r0, #0x14]
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end func_ov00_020c399c
|
||||
arm_func_end _ZN12ActorManager18func_ov00_020c399cEv
|
||||
_020c39a8: .word func_ov00_020c3f3c
|
||||
|
||||
.global func_ov00_020c39ac
|
||||
arm_func_start func_ov00_020c39ac
|
||||
func_ov00_020c39ac: ; 0x020c39ac
|
||||
.global _ZN12ActorManager18func_ov00_020c39acEjPjb
|
||||
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPjb
|
||||
_ZN12ActorManager18func_ov00_020c39acEjPjb: ; 0x020c39ac
|
||||
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
sub sp, sp, #0x10
|
||||
movs r8, r2
|
||||
@@ -506,7 +506,7 @@ _020c3a14:
|
||||
mov r1, r8
|
||||
ldr r0, [r0, r5, lsl #2]
|
||||
ldr r0, [r0, #4]
|
||||
bl func_ov00_020c3e1c
|
||||
bl _ZN12ActorManager16ActorTypeIsOneOfEjPj
|
||||
cmp r7, r0
|
||||
beq _020c3b08
|
||||
_020c3a60:
|
||||
@@ -563,11 +563,11 @@ _020c3b20:
|
||||
mov r0, r4
|
||||
add sp, sp, #0x10
|
||||
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
arm_func_end func_ov00_020c39ac
|
||||
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPjb
|
||||
|
||||
.global func_ov00_020c3b2c
|
||||
arm_func_start func_ov00_020c3b2c
|
||||
func_ov00_020c3b2c: ; 0x020c3b2c
|
||||
.global _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
arm_func_start _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
_ZN12ActorManager18func_ov00_020c3b2cEPi: ; 0x020c3b2c
|
||||
stmdb sp!, {r4, lr}
|
||||
cmp r1, #0
|
||||
movne r2, #0
|
||||
@@ -605,11 +605,11 @@ _020c3b94:
|
||||
_020c3ba8:
|
||||
mov r0, lr
|
||||
ldmia sp!, {r4, pc}
|
||||
arm_func_end func_ov00_020c3b2c
|
||||
arm_func_end _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
|
||||
.global func_ov00_020c3bb0
|
||||
arm_func_start func_ov00_020c3bb0
|
||||
func_ov00_020c3bb0: ; 0x020c3bb0
|
||||
.global _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
arm_func_start _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
_ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
|
||||
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
sub sp, sp, #0xd4
|
||||
movs sl, r2
|
||||
@@ -694,12 +694,12 @@ _020c3cd8:
|
||||
add sp, sp, #0xd4
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
.align 2, 0
|
||||
arm_func_end func_ov00_020c3bb0
|
||||
arm_func_end _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
_020c3ce4: .word data_027e0e60
|
||||
|
||||
.global func_ov00_020c3ce8
|
||||
arm_func_start func_ov00_020c3ce8
|
||||
func_ov00_020c3ce8: ; 0x020c3ce8
|
||||
.global _ZN12ActorManager18func_ov00_020c3ce8Eii
|
||||
arm_func_start _ZN12ActorManager18func_ov00_020c3ce8Eii
|
||||
_ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8
|
||||
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
sub sp, sp, #0xcc
|
||||
ldr r3, _020c3dcc ; =data_027e0e60
|
||||
@@ -762,12 +762,12 @@ _020c3db0:
|
||||
add sp, sp, #0xcc
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
.align 2, 0
|
||||
arm_func_end func_ov00_020c3ce8
|
||||
arm_func_end _ZN12ActorManager18func_ov00_020c3ce8Eii
|
||||
_020c3dcc: .word data_027e0e60
|
||||
|
||||
.global func_ov00_020c3dd0
|
||||
arm_func_start func_ov00_020c3dd0
|
||||
func_ov00_020c3dd0: ; 0x020c3dd0
|
||||
.global _ZN12ActorManager14Actor_vfunc_28Ev
|
||||
arm_func_start _ZN12ActorManager14Actor_vfunc_28Ev
|
||||
_ZN12ActorManager14Actor_vfunc_28Ev: ; 0x020c3dd0
|
||||
stmdb sp!, {r4, r5, r6, lr}
|
||||
mov r6, r0
|
||||
ldrh r0, [r6]
|
||||
@@ -789,11 +789,11 @@ _020c3e04:
|
||||
cmp r4, r0
|
||||
blt _020c3dec
|
||||
ldmia sp!, {r4, r5, r6, pc}
|
||||
arm_func_end func_ov00_020c3dd0
|
||||
arm_func_end _ZN12ActorManager14Actor_vfunc_28Ev
|
||||
|
||||
.global func_ov00_020c3e1c
|
||||
arm_func_start func_ov00_020c3e1c
|
||||
func_ov00_020c3e1c: ; 0x020c3e1c
|
||||
.global _ZN12ActorManager16ActorTypeIsOneOfEjPj
|
||||
arm_func_start _ZN12ActorManager16ActorTypeIsOneOfEjPj
|
||||
_ZN12ActorManager16ActorTypeIsOneOfEjPj: ; 0x020c3e1c
|
||||
ldr ip, [r1]
|
||||
ldr r2, _020c3e50 ; =0x4e554c4c
|
||||
mov r3, #0
|
||||
@@ -810,7 +810,7 @@ _020c3e48:
|
||||
mov r0, r3
|
||||
bx lr
|
||||
.align 2, 0
|
||||
arm_func_end func_ov00_020c3e1c
|
||||
arm_func_end _ZN12ActorManager16ActorTypeIsOneOfEjPj
|
||||
_020c3e50: .word 0x4e554c4c
|
||||
|
||||
.data
|
||||
@@ -876,6 +876,6 @@ data_ov00_020e72e8: ; 0x020e72e8
|
||||
.global data_ov00_020e72ec
|
||||
data_ov00_020e72ec: ; 0x020e72ec
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.global data_ov00_020e72f0
|
||||
data_ov00_020e72f0: ; 0x020e72f0
|
||||
.word func_ov00_020c36b4
|
||||
.global _ZTV11ActorFilter
|
||||
_ZTV11ActorFilter: ; 0x020e72f0
|
||||
.word _ZN11ActorFilter6FilterEP5Actor
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
.extern func_ov00_020c0e24
|
||||
.extern func_ov00_020c1500
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov04_0210ade4
|
||||
.extern func_ov04_0210ade8
|
||||
|
||||
@@ -468,7 +468,7 @@ _ZN13LinkStateBase18func_ov00_020a8390EiPv: ; 0x020a8390
|
||||
ldr r0, _020a84b8 ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _020a84a8
|
||||
mov r0, r7
|
||||
@@ -1247,13 +1247,13 @@ _ZN13LinkStateBase12GetGrabActorEv: ; 0x020a8ca4
|
||||
ldr r1, _020a8cbc ; =data_027e0fe4
|
||||
ldr r2, [r0, #8]
|
||||
ldr r0, [r1]
|
||||
ldr ip, _020a8cc0 ; =func_ov00_020c3674
|
||||
ldr ip, _020a8cc0 ; =_ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r2, #0x3c
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end _ZN13LinkStateBase12GetGrabActorEv
|
||||
_020a8cbc: .word data_027e0fe4
|
||||
_020a8cc0: .word func_ov00_020c3674
|
||||
_020a8cc0: .word _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global _ZN13LinkStateBase15GetGrabActorRefEv
|
||||
arm_func_start _ZN13LinkStateBase15GetGrabActorRefEv
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
.extern func_ov00_020c1908
|
||||
.extern func_ov00_020c2a0c
|
||||
.extern func_ov00_020c3180
|
||||
.extern func_ov00_020c3674
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern func_ov00_020d7a84
|
||||
.extern func_ov00_020d7b20
|
||||
.extern func_ov04_0210ab88
|
||||
|
||||
@@ -349,7 +349,7 @@ _020aa684:
|
||||
ldr r0, _020aa7a8 ; =data_027e0fe4
|
||||
add r1, r4, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
mov r0, r4
|
||||
beq _020aa6bc
|
||||
@@ -859,7 +859,7 @@ _020aadbc:
|
||||
str r2, [sp, #0x14]
|
||||
ldr r2, [r3, #0x88]
|
||||
str r2, [sp, #0x18]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
bne _020aae38
|
||||
mov r0, r4
|
||||
@@ -1989,7 +1989,7 @@ _020abce0:
|
||||
ldr r0, _020abd70 ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r6, r0
|
||||
mov r0, r5
|
||||
bl _ZN13LinkStateBase15GetGrabActorRefEv
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
.extern func_ov00_0208ae94
|
||||
.extern func_ov00_0208f030
|
||||
.extern func_ov00_02097700
|
||||
.extern func_ov00_020c357c
|
||||
.extern _ZN12ActorManager14Actor_vfunc_10Ej
|
||||
.extern func_ov04_0210b258
|
||||
.extern func_ov04_0210b280
|
||||
.extern gItemManager
|
||||
|
||||
@@ -362,7 +362,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
|
||||
ldr r0, _020a7f7c ; =data_027e0fe4
|
||||
ldrb r1, [sp, #0x18]
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c357c
|
||||
bl _ZN12ActorManager14Actor_vfunc_10Ej
|
||||
ldrb r0, [sp, #0x18]
|
||||
cmp r0, #0
|
||||
beq _020a7f40
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#pragma once
|
||||
.extern _ZN11ItemManager12GetEquipItemEi
|
||||
.extern _ZN11ItemManager18func_ov00_020ad790Ei
|
||||
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZNK11ItemManager15GetEquippedItemEv
|
||||
.extern _ZNK11ItemManager16GetEquippedFairyEv
|
||||
.extern _ZNK11ItemManager8GetFairyEi
|
||||
@@ -61,8 +63,6 @@
|
||||
.extern func_ov00_020bc46c
|
||||
.extern func_ov00_020c28ec
|
||||
.extern func_ov00_020c2a0c
|
||||
.extern func_ov00_020c3484
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020cebcc
|
||||
.extern func_ov00_020ced64
|
||||
.extern func_ov00_020ced7c
|
||||
|
||||
@@ -160,13 +160,13 @@ _ZN13PlayerControl14GetFollowActorEv: ; 0x020aeffc
|
||||
ldr r1, _020af014 ; =data_027e0fe4
|
||||
mov r2, r0
|
||||
ldr r0, [r1]
|
||||
ldr ip, _020af018 ; =func_ov00_020c3674
|
||||
ldr ip, _020af018 ; =_ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r2, #0x84
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end _ZN13PlayerControl14GetFollowActorEv
|
||||
_020af014: .word data_027e0fe4
|
||||
_020af018: .word func_ov00_020c3674
|
||||
_020af018: .word _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global _ZN13PlayerControl18func_ov00_020af01cEPc
|
||||
arm_func_start _ZN13PlayerControl18func_ov00_020af01cEPc
|
||||
@@ -837,7 +837,7 @@ _020af8b0:
|
||||
ldr r0, _020afacc ; =data_027e0fe4
|
||||
add r1, r1, #0x3c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r8, #1
|
||||
_020af8dc:
|
||||
@@ -847,7 +847,7 @@ _020af8dc:
|
||||
ldr r0, _020afacc ; =data_027e0fe4
|
||||
add r1, sb, #0x8c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
mov r7, r4
|
||||
beq _020af97c
|
||||
@@ -949,7 +949,7 @@ _020afa68:
|
||||
add r0, sp, #0
|
||||
ldr r1, [r1]
|
||||
mov r2, r4
|
||||
bl func_ov00_020c3484
|
||||
bl _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
|
||||
ldr r0, [sp]
|
||||
str r0, [sb, #0x8c]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -1033,7 +1033,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, sb, #0x84
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _020afe74 ; =gItemManager
|
||||
mov r5, r0
|
||||
ldr r6, [r1]
|
||||
|
||||
@@ -5,6 +5,14 @@
|
||||
.extern _ZN10PlayerBase10SetVisibleEb
|
||||
.extern _ZN10PlayerBase12SetUpdatePosEb
|
||||
.extern _ZN11ItemManager21LoadDungeonItemModelsEv
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
.extern _ZN12ActorManager18func_ov00_020c3ce8Eii
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -334,14 +342,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c38fc
|
||||
.extern func_ov00_020c3b2c
|
||||
.extern func_ov00_020c3bb0
|
||||
.extern func_ov00_020c3ce8
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c45c4
|
||||
.extern func_ov00_020c4648
|
||||
|
||||
+16
-16
@@ -787,7 +787,7 @@ _0207b5fa:
|
||||
ldr r2, _0207b804 ; =0x414e4353
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
blx func_ov00_020c3894
|
||||
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
mov r0, #0
|
||||
ldr r1, [sp]
|
||||
mvn r0, r0
|
||||
@@ -796,7 +796,7 @@ _0207b5fa:
|
||||
ldr r0, _0207b800 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0207b6cc
|
||||
add r1, sp, #8
|
||||
@@ -11862,7 +11862,7 @@ _02083718:
|
||||
ldr r0, _0208376c ; =data_027e0fe4
|
||||
mov r1, r2
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #0
|
||||
@@ -11942,7 +11942,7 @@ func_ov00_02083790: ; 0x02083790
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
mov r2, #1
|
||||
bl func_ov00_020c3ce8
|
||||
bl _ZN12ActorManager18func_ov00_020c3ce8Eii
|
||||
_0208381c:
|
||||
ldr r0, [r5, #4]
|
||||
mov r1, r4
|
||||
@@ -11985,7 +11985,7 @@ func_ov00_02083840: ; 0x02083840
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
mov r2, #0
|
||||
bl func_ov00_020c3ce8
|
||||
bl _ZN12ActorManager18func_ov00_020c3ce8Eii
|
||||
_020838ac:
|
||||
ldr r0, [r5, #4]
|
||||
mov r1, r4
|
||||
@@ -13571,7 +13571,7 @@ func_ov00_02084ac4: ; 0x02084ac4
|
||||
stmdb sp!, {r3, lr}
|
||||
ldr r0, _02084b00 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
ldmeqia sp!, {r3, pc}
|
||||
@@ -22866,7 +22866,7 @@ _0208c708:
|
||||
ldmmiia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
ldr r0, _0208c954 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x48
|
||||
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
@@ -27211,7 +27211,7 @@ _0208ffb4:
|
||||
ldr r1, [sp, #8]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, r6, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0208fff4
|
||||
ldr r1, [r0, #4]
|
||||
@@ -27390,14 +27390,14 @@ _0209025c:
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x1c
|
||||
add r3, sp, #0x5c
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, [sp, #0x1c]
|
||||
cmp r0, r4
|
||||
beq _020902d4
|
||||
ldr r0, _02090314 ; =data_027e0fe4
|
||||
add r1, sp, #0x1c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020902d4
|
||||
ldr r1, [r0, #0x48]
|
||||
@@ -27545,7 +27545,7 @@ _0209042c:
|
||||
ldr r0, _02090488 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
ldmneia sp!, {r4, pc}
|
||||
mov r0, r4
|
||||
@@ -27556,7 +27556,7 @@ _02090460:
|
||||
ldr r0, _02090488 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
ldmneia sp!, {r4, pc}
|
||||
mov r0, r4
|
||||
@@ -35735,13 +35735,13 @@ _020968f4:
|
||||
add r1, sp, #0x20
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x58
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ble _02096974
|
||||
ldr r0, _020969f8 ; =data_027e0fe4
|
||||
ldr r1, [sp, #0x58]
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02096974
|
||||
ldr r1, [r4, #0x10]
|
||||
@@ -39248,7 +39248,7 @@ _020993b4:
|
||||
ldr r2, _020994d4 ; =0x414e4353
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -39256,7 +39256,7 @@ _020993b4:
|
||||
ldr r0, _020994b8 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020994a4
|
||||
add r1, sp, #8
|
||||
|
||||
@@ -17,6 +17,13 @@
|
||||
.extern _ZN11ItemManager13UnequipPotionEv
|
||||
.extern _ZN11ItemManager4SaveEP15SaveItemManager
|
||||
.extern _ZN11ItemManager8GiveAmmoEit
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager18func_ov00_020c398cEv
|
||||
.extern _ZN12ActorManager18func_ov00_020c399cEv
|
||||
.extern _ZN12ActorManager18func_ov00_020c39acEjPjb
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12TouchControl19UpdateConditionallyEP10TouchStatet
|
||||
.extern _ZN13LinkStateBase10GetStateIdEv
|
||||
.extern _ZN13LinkStateBase12GetGrabActorEv
|
||||
@@ -322,13 +329,6 @@
|
||||
.extern func_ov00_020a98bc
|
||||
.extern func_ov00_020a9968
|
||||
.extern func_ov00_020a9aac
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c398c
|
||||
.extern func_ov00_020c399c
|
||||
.extern func_ov00_020c39ac
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+17
-17
@@ -6734,11 +6734,11 @@ func_ov00_020b6af0: ; 0x020b6af0
|
||||
ldr r2, _020b6b9c ; =0x574c4354
|
||||
add r0, sp, #0
|
||||
ldr r6, _020b6ba0 ; =0xfffff666
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _020b6b98 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020b6b84
|
||||
ldrh r1, [r0, #0x20]
|
||||
@@ -7608,7 +7608,7 @@ _020b779c:
|
||||
ldr r0, _020b783c ; =data_027e0fe4
|
||||
mov r1, r5
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _020b7814
|
||||
ldr r1, [r0, #0x12c]
|
||||
@@ -10112,7 +10112,7 @@ _020b94e8:
|
||||
str r4, [sp, #0x34]
|
||||
str r5, [sp, #0x38]
|
||||
str r6, [sp, #0x3c]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ble _020b956c
|
||||
ldr r2, [sp, #0x30]
|
||||
@@ -13419,7 +13419,7 @@ _020bbdd8:
|
||||
ldr r0, _020bbe8c ; =data_027e0fe4
|
||||
add r1, r5, #0x3c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r4, #0
|
||||
beq _020bbe58
|
||||
cmp r0, #0
|
||||
@@ -14159,7 +14159,7 @@ func_ov00_020bc71c: ; 0x020bc71c
|
||||
mov r2, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r2, #0x3c
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
ldmeqia sp!, {r3, pc}
|
||||
@@ -14389,7 +14389,7 @@ func_ov00_020bc960: ; 0x020bc960
|
||||
ldr r0, _020bca48 ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
mov r4, r0
|
||||
bl _ZN15LinkStateFollow20GetLinkStateCutsceneEv
|
||||
mov r1, r6
|
||||
@@ -15353,7 +15353,7 @@ func_ov00_020bd510: ; 0x020bd510
|
||||
ldr r0, _020bd5ec ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r5, r0
|
||||
add r3, sp, #0x14
|
||||
ldmia r4, {r0, r1, r2}
|
||||
@@ -18364,7 +18364,7 @@ _020bfb20:
|
||||
ldr r0, _020bff48 ; =data_027e0fe4
|
||||
add r1, r4, #0x38
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _020bfc78
|
||||
mov r0, r4
|
||||
@@ -21035,7 +21035,7 @@ _020c1b2c:
|
||||
add r1, sp, #0
|
||||
mov r2, #0
|
||||
str r3, [sp]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
add sp, sp, #0xa4
|
||||
ldmia sp!, {pc}
|
||||
.align 2, 0
|
||||
@@ -21714,7 +21714,7 @@ func_ov00_020c23d4: ; 0x020c23d4
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r4, #0xc]
|
||||
mov r5, r2
|
||||
bl func_ov00_020c398c
|
||||
bl _ZN12ActorManager18func_ov00_020c398cEv
|
||||
cmp r0, #0
|
||||
mvneq r0, #0
|
||||
streq r0, [r6]
|
||||
@@ -21726,7 +21726,7 @@ func_ov00_020c23d4: ; 0x020c23d4
|
||||
ldr r1, [r4, #0xc]
|
||||
ldr r0, [r0]
|
||||
mov r2, r5
|
||||
bl func_ov00_020c399c
|
||||
bl _ZN12ActorManager18func_ov00_020c399cEv
|
||||
ldmia sp!, {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
arm_func_end func_ov00_020c23d4
|
||||
@@ -21758,7 +21758,7 @@ func_ov00_020c243c: ; 0x020c243c
|
||||
ldr r0, [r0]
|
||||
mov r2, r5
|
||||
mov r3, r4
|
||||
bl func_ov00_020c39ac
|
||||
bl _ZN12ActorManager18func_ov00_020c39acEjPjb
|
||||
movs r5, r0
|
||||
beq _020c26e4
|
||||
mov r0, #0xb
|
||||
@@ -22374,7 +22374,7 @@ func_ov00_020c2c0c: ; 0x020c2c0c
|
||||
ldr r1, [r0, #0xc]
|
||||
ldr r0, [r3]
|
||||
mov r3, #0
|
||||
bl func_ov00_020c39ac
|
||||
bl _ZN12ActorManager18func_ov00_020c39acEjPjb
|
||||
cmp r0, #0
|
||||
addne sp, sp, #8
|
||||
movne r0, #1
|
||||
@@ -22479,7 +22479,7 @@ func_ov00_020c2d54: ; 0x020c2d54
|
||||
ldr r1, [r4, #0xc]
|
||||
ldr r0, [r0]
|
||||
mov r3, #0
|
||||
bl func_ov00_020c39ac
|
||||
bl _ZN12ActorManager18func_ov00_020c39acEjPjb
|
||||
movs r5, r0
|
||||
beq _020c2dd0
|
||||
bl func_ov00_020bff70
|
||||
@@ -22931,11 +22931,11 @@ func_ov00_020c3290: ; 0x020c3290
|
||||
ldr r1, [r0]
|
||||
ldr r2, _020c3320 ; =0x504c444d
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _020c331c ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020c32f8
|
||||
add r1, r0, #0x100
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
.extern _ZN10PlayerBase14GetEquipShieldEv
|
||||
.extern _ZN11ItemManager15SetEquippedItemEi
|
||||
.extern _ZN11ItemManager18func_ov00_020ad790Ei
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
|
||||
.extern _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
|
||||
.extern _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
|
||||
@@ -595,9 +598,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov01_020f8658
|
||||
.extern func_ov03_020f13b0
|
||||
.extern func_ov03_020f3f94
|
||||
|
||||
+33
-33
@@ -1763,7 +1763,7 @@ _020c5420:
|
||||
ldr r2, _020c5460 ; =data_027e0fe4
|
||||
mov r1, r0
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -4268,7 +4268,7 @@ func_ov00_020c73b8: ; 0x020c73b8
|
||||
ldr r0, _020c7480 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r4, #0
|
||||
beq _020c744c
|
||||
ldr r1, [sp, #4]
|
||||
@@ -4390,7 +4390,7 @@ func_ov00_020c7528: ; 0x020c7528
|
||||
ldr r0, _020c75f0 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r4, #0
|
||||
beq _020c75b4
|
||||
ldr r1, [sp, #4]
|
||||
@@ -4454,7 +4454,7 @@ func_ov00_020c7630: ; 0x020c7630
|
||||
mov r1, r6
|
||||
mov r5, r2
|
||||
mov r4, r3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _020c76e0
|
||||
mvn r1, #0
|
||||
@@ -4479,7 +4479,7 @@ func_ov00_020c7630: ; 0x020c7630
|
||||
ldr r0, _020c7728 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x38
|
||||
moveq r0, #0
|
||||
@@ -5064,7 +5064,7 @@ func_ov00_020c7edc: ; 0x020c7edc
|
||||
ldr r0, _020c7f94 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r4, #0
|
||||
beq _020c7f60
|
||||
ldr r1, [sp, #4]
|
||||
@@ -8178,7 +8178,7 @@ func_ov00_020ca600: ; 0x020ca600
|
||||
ldr r0, _020ca64c ; =data_027e0fe4
|
||||
mov r1, r2
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r3, pc}
|
||||
@@ -8319,7 +8319,7 @@ func_ov00_020ca7e8: ; 0x020ca7e8
|
||||
ldr r0, _020ca82c ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
ldr r1, [r0, #4]
|
||||
@@ -11543,7 +11543,7 @@ _020ccfa4:
|
||||
ldr r1, [r8, #0x10]
|
||||
ldr r0, [sb]
|
||||
add r1, r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020ccff0
|
||||
ldr r0, [r0, #4]
|
||||
@@ -17573,7 +17573,7 @@ func_ov00_020d1870: ; 0x020d1870
|
||||
mov r2, #0
|
||||
str ip, [sp]
|
||||
strb r3, [sp, #0xa]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
add sp, sp, #0xc
|
||||
ldmia sp!, {pc}
|
||||
.align 2, 0
|
||||
@@ -17595,7 +17595,7 @@ func_ov00_020d18b4: ; 0x020d18b4
|
||||
str r3, [sp]
|
||||
strh r2, [sp, #8]
|
||||
strb r2, [sp, #0xa]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
add sp, sp, #0xc
|
||||
ldmia sp!, {pc}
|
||||
.align 2, 0
|
||||
@@ -17722,7 +17722,7 @@ func_ov00_020d1a50: ; 0x020d1a50
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x20
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
mov r0, #0x10000
|
||||
@@ -17772,7 +17772,7 @@ func_ov00_020d1af0: ; 0x020d1af0
|
||||
add r3, r0, #0x20
|
||||
ldr r0, [r1]
|
||||
add r1, r3, r2, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0]
|
||||
add r1, sp, #0x38
|
||||
ldr r2, [r2, #0x34]
|
||||
@@ -17965,7 +17965,7 @@ func_ov00_020d1da4: ; 0x020d1da4
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x20
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r0
|
||||
mov r0, r4
|
||||
mov r2, #1
|
||||
@@ -18016,12 +18016,12 @@ _020d1e4c:
|
||||
add r7, r2, r1, lsl #3
|
||||
ldr r0, [r0]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _020d2050 ; =data_027e0fe4
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, sb, #0x20
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0]
|
||||
add r1, sp, #0x34
|
||||
ldr r2, [r2, #0x34]
|
||||
@@ -18214,7 +18214,7 @@ func_ov00_020d20e8: ; 0x020d20e8
|
||||
ldr r0, _020d27c0 ; =data_027e0fe4
|
||||
add r1, r7, #0x20
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r0, _020d27bc ; =data_027e0c68
|
||||
ldr r1, [r0, #0x20]
|
||||
cmp r1, r7
|
||||
@@ -18361,7 +18361,7 @@ _020d2330:
|
||||
add r2, r7, #0x20
|
||||
ldr r0, [r0]
|
||||
add r1, r2, r1, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0]
|
||||
ldr r1, [r6, #4]
|
||||
ldr r2, [r2, #0x6c]
|
||||
@@ -18378,7 +18378,7 @@ _020d236c:
|
||||
ldr r0, [r0]
|
||||
add r1, r1, r2, lsl #3
|
||||
ldrh r4, [r6, #6]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020d23b0
|
||||
ldr r2, [r0]
|
||||
@@ -18401,7 +18401,7 @@ _020d23bc:
|
||||
ldr r0, [r0]
|
||||
add r1, r2, r1, lsl #3
|
||||
add r4, r2, r3, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020d23f4
|
||||
ldr r2, [r0]
|
||||
@@ -18475,7 +18475,7 @@ _020d24a8:
|
||||
add r1, sp, #0
|
||||
str r2, [sp, #4]
|
||||
moveq r5, #0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrb r1, [r6, #1]
|
||||
ldr r3, [r0]
|
||||
cmp r1, #0x37
|
||||
@@ -18699,7 +18699,7 @@ func_ov00_020d27f0: ; 0x020d27f0
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x20
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r0
|
||||
mov r0, r4
|
||||
mov r2, #0
|
||||
@@ -18718,7 +18718,7 @@ func_ov00_020d2820: ; 0x020d2820
|
||||
ldr r0, [r2]
|
||||
mov r5, r1
|
||||
add r1, r4, #0x20
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0]
|
||||
mov r1, r5
|
||||
ldr r2, [r2, #0x78]
|
||||
@@ -18735,7 +18735,7 @@ _020d2864:
|
||||
beq _020d2890
|
||||
ldr r0, [r6]
|
||||
mov r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020d2890
|
||||
ldr r1, [r0]
|
||||
@@ -18768,7 +18768,7 @@ func_ov00_020d28b4: ; 0x020d28b4
|
||||
add r6, r2, r1, lsl #3
|
||||
ldr r0, [r0]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0]
|
||||
add r1, sp, #0x1c
|
||||
ldr r2, [r2, #0x34]
|
||||
@@ -18784,7 +18784,7 @@ _020d2904:
|
||||
beq _020d2934
|
||||
ldr r0, [sl]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020d2934
|
||||
ldr r2, [r0]
|
||||
@@ -18983,7 +18983,7 @@ _020d2bc4:
|
||||
beq _020d2bfc
|
||||
ldr r0, [r7]
|
||||
mov r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020d2bfc
|
||||
ldr r1, [r0]
|
||||
@@ -19394,7 +19394,7 @@ func_ov00_020d30b0: ; 0x020d30b0
|
||||
ldr r0, _020d3128 ; =data_027e0fe4
|
||||
add r1, r4, #0x20
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _020d30f8
|
||||
ldr r1, [r0, #0x48]
|
||||
@@ -19872,7 +19872,7 @@ func_ov00_020d3638: ; 0x020d3638
|
||||
add r1, r1, #0x20
|
||||
ldr r0, [r0]
|
||||
add r1, r1, r2, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0]
|
||||
add r1, sp, #0
|
||||
ldr r2, [r2, #0x34]
|
||||
@@ -19899,7 +19899,7 @@ func_ov00_020d3698: ; 0x020d3698
|
||||
ldr r0, _020d36d4 ; =data_027e0fe4
|
||||
add r1, r1, #0x20
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrb r0, [r0, #0x11c]
|
||||
cmp r0, #0
|
||||
ldrne r0, [r4]
|
||||
@@ -19920,7 +19920,7 @@ func_ov00_020d36d8: ; 0x020d36d8
|
||||
ldr r0, [r3]
|
||||
add r1, r6, #0x20
|
||||
mov r4, r2
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r5]
|
||||
tst r1, #2
|
||||
beq _020d372c
|
||||
@@ -20472,7 +20472,7 @@ _020d3d1c:
|
||||
str ip, [sp, #4]
|
||||
str r5, [sp, #8]
|
||||
str r3, [sp, #0xc]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mov r6, r0
|
||||
cmp r6, #0
|
||||
mov r7, #0
|
||||
@@ -20483,7 +20483,7 @@ _020d3d74:
|
||||
ldr r1, [sp, #4]
|
||||
ldr r0, [r5]
|
||||
add r1, r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #0x30]
|
||||
cmp r4, r1
|
||||
bne _020d3e00
|
||||
|
||||
+8
-8
@@ -5,6 +5,11 @@
|
||||
.extern _ZN11ItemManager4LoadEPK15SaveItemManager
|
||||
.extern _ZN11ItemManager6CreateEv
|
||||
.extern _ZN11ItemManager7DestroyEv
|
||||
.extern _ZN12ActorManager11DeleteActorEjb
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12TouchControlC2Ev
|
||||
.extern _ZN12TouchGestureC2Ev
|
||||
.extern _ZN13PlayerControl18func_ov00_020aef30Ev
|
||||
@@ -351,9 +356,6 @@
|
||||
.extern func_02043594
|
||||
.extern func_020435b4
|
||||
.extern func_02043600
|
||||
.extern strlen
|
||||
.extern strcpy
|
||||
.extern strcat
|
||||
.extern func_0204dd9c
|
||||
.extern func_0204f558
|
||||
.extern func_0204f614
|
||||
@@ -580,11 +582,6 @@
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3388
|
||||
.extern func_ov00_020c33b0
|
||||
.extern func_ov00_020c33d4
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c3f9c
|
||||
.extern func_ov00_020c3fd4
|
||||
.extern func_ov00_020c4014
|
||||
@@ -718,3 +715,6 @@
|
||||
.extern gItemManager
|
||||
.extern gOverlayManager
|
||||
.extern gPlayerAnimHandler
|
||||
.extern strcat
|
||||
.extern strcpy
|
||||
.extern strlen
|
||||
|
||||
+12
-12
@@ -3442,7 +3442,7 @@ _02102578:
|
||||
ldr r2, _021025d4 ; =0x414e4353
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
blx func_ov00_020c3894
|
||||
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
mov r0, #0
|
||||
ldr r1, [sp, #8]
|
||||
mvn r0, r0
|
||||
@@ -3451,7 +3451,7 @@ _02102578:
|
||||
ldr r0, _021025c0 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021025ac
|
||||
blx func_ov18_0215dec0
|
||||
@@ -9198,7 +9198,7 @@ _021053ec:
|
||||
add r0, r5, #0
|
||||
add r1, r4, #0
|
||||
add r2, r7, #0
|
||||
blx func_ov00_020c33d4
|
||||
blx _ZN12ActorManager11DeleteActorEjb
|
||||
_021053fc:
|
||||
ldrh r0, [r5]
|
||||
add r4, r4, #1
|
||||
@@ -9534,7 +9534,7 @@ _02105668:
|
||||
add r0, r6, #0
|
||||
add r1, r4, #0
|
||||
mov r2, #0
|
||||
blx func_ov00_020c33d4
|
||||
blx _ZN12ActorManager11DeleteActorEjb
|
||||
_02105692:
|
||||
ldrh r0, [r6]
|
||||
add r4, r4, #1
|
||||
@@ -14004,7 +14004,7 @@ _0210775c:
|
||||
add r1, r0, #0
|
||||
ldr r0, _02107804 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c35d8
|
||||
blx _ZN12ActorManager13FindActorByIdEj
|
||||
str r0, [r4, #0x14]
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@@ -14017,7 +14017,7 @@ _0210775c:
|
||||
add r1, r0, #0
|
||||
ldr r0, _02107804 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c35d8
|
||||
blx _ZN12ActorManager13FindActorByIdEj
|
||||
str r0, [r4, #0x18]
|
||||
mov r0, #0
|
||||
str r0, [sp]
|
||||
@@ -14030,7 +14030,7 @@ _0210775c:
|
||||
add r1, r0, #0
|
||||
ldr r0, _02107804 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c35d8
|
||||
blx _ZN12ActorManager13FindActorByIdEj
|
||||
str r0, [r4, #0x1c]
|
||||
_021077ee:
|
||||
add sp, #0x30
|
||||
@@ -23396,7 +23396,7 @@ _0210c000:
|
||||
ldr r2, _0210c0f8 ; =0x524d5447
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
blx func_ov00_020c3894
|
||||
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
mov r0, #0
|
||||
ldr r1, [sp, #0x10]
|
||||
mvn r0, r0
|
||||
@@ -23410,7 +23410,7 @@ _0210c000:
|
||||
ldr r0, _0210c0f4 ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0210c054
|
||||
ldr r1, _0210c0fc ; =0x000001b6
|
||||
@@ -23447,7 +23447,7 @@ _0210c062:
|
||||
ldr r2, _0210c104 ; =0x524d4654
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
blx func_ov00_020c3894
|
||||
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
mov r0, #0
|
||||
ldr r1, [sp, #8]
|
||||
mvn r0, r0
|
||||
@@ -23486,7 +23486,7 @@ _0210c092:
|
||||
str r0, [sp, #0x20]
|
||||
ldr r0, _0210c0f4 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c37ec
|
||||
blx _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ble _0210c0c2
|
||||
mov r0, #0
|
||||
@@ -23496,7 +23496,7 @@ _0210c0c2:
|
||||
ldr r2, _0210c114 ; =0x574c4354
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
blx func_ov00_020c3894
|
||||
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
mov r0, #0
|
||||
ldr r1, [sp]
|
||||
mvn r0, r0
|
||||
|
||||
+4
-4
@@ -441,10 +441,10 @@
|
||||
.extern func_ov00_020c0e24
|
||||
.extern func_ov00_020c1500
|
||||
.extern func_ov00_020c2a0c
|
||||
.extern func_ov00_020c33d4
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern _ZN12ActorManager11DeleteActorEjb
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern func_ov00_020c3eb0
|
||||
.extern func_ov00_020ce2f0
|
||||
.extern func_ov00_020ce8e4
|
||||
|
||||
+10
-10
@@ -5512,7 +5512,7 @@ _021052a4:
|
||||
mov r0, r6
|
||||
mov r1, r4
|
||||
mov r2, r7
|
||||
bl func_ov00_020c33d4
|
||||
bl _ZN12ActorManager11DeleteActorEjb
|
||||
_021052cc:
|
||||
ldrh r0, [r6]
|
||||
add r4, r4, #1
|
||||
@@ -8189,7 +8189,7 @@ _02107664:
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #8
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ble _021077e8
|
||||
bl func_ov05_02107870
|
||||
@@ -8503,7 +8503,7 @@ _02107bf4:
|
||||
beq _02107c68
|
||||
ldr r0, [r6]
|
||||
mov r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r7, r0
|
||||
beq _02107c68
|
||||
ldr r1, [r7, #4]
|
||||
@@ -8798,7 +8798,7 @@ _02107ff0:
|
||||
beq _02108060
|
||||
ldr r0, [r4]
|
||||
mov r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r7, r0
|
||||
beq _02108054
|
||||
ldr r1, [r7, #4]
|
||||
@@ -12020,7 +12020,7 @@ func_ov05_0210ab1c: ; 0x0210ab1c
|
||||
strb r2, [r0, #0xba]
|
||||
ldr r0, [r1]
|
||||
add r1, r6, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r5, r0
|
||||
mov r0, r6
|
||||
mov r1, #0
|
||||
@@ -12188,7 +12188,7 @@ func_ov05_0210ad88: ; 0x0210ad88
|
||||
strb r2, [r0, #0xbc]
|
||||
ldr r0, [r1]
|
||||
add r1, r5, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _0210ade0
|
||||
ldr r0, _0210b284 ; =data_027e0f74
|
||||
@@ -12535,7 +12535,7 @@ func_ov05_0210b2a4: ; 0x0210b2a4
|
||||
strb r2, [r0, #0xbc]
|
||||
ldr r0, [r1]
|
||||
add r1, r5, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
bne _0210b2fc
|
||||
mov r0, r5
|
||||
@@ -12668,7 +12668,7 @@ _0210b484:
|
||||
ldr r0, _0210b4f0 ; =data_027e0fe4
|
||||
add r1, r6, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r2, r0
|
||||
addeq sp, sp, #0xc
|
||||
ldmeqia sp!, {r3, r4, r5, r6, pc}
|
||||
@@ -13075,7 +13075,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4
|
||||
bl func_ov00_0208583c
|
||||
mov r1, r0
|
||||
mov r0, r5
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
movs r5, r0
|
||||
mov r0, r4
|
||||
beq _0210ba7c
|
||||
@@ -19893,7 +19893,7 @@ _02111744:
|
||||
strh r2, [sp, #0x3c]
|
||||
ldr r0, [r0]
|
||||
mov r2, #0
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ble _02111868
|
||||
ldr r0, [sp, #0x2c]
|
||||
|
||||
+1
-1
@@ -274,7 +274,7 @@
|
||||
.extern func_ov00_020c0e04
|
||||
.extern func_ov00_020c0e24
|
||||
.extern func_ov00_020c1500
|
||||
.extern func_ov00_020c3dd0
|
||||
.extern _ZN12ActorManager14Actor_vfunc_28Ev
|
||||
.extern func_ov00_020cef40
|
||||
.extern func_ov00_020cf270
|
||||
.extern func_ov00_020cf330
|
||||
|
||||
+1
-1
@@ -3203,7 +3203,7 @@ func_ov09_02114554: ; 0x02114554
|
||||
ldr r0, _021146a8 ; =data_027e0fe4
|
||||
str r1, [sp, #4]
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3dd0
|
||||
blx _ZN12ActorManager14Actor_vfunc_28Ev
|
||||
mov r0, #0
|
||||
str r0, [sp, #8]
|
||||
ldr r0, _021146ac ; =data_027e0e60
|
||||
|
||||
+3
-3
@@ -9,6 +9,9 @@
|
||||
.extern _ZN11ItemManager18EquipItem_vfunc_38Ei
|
||||
.extern _ZN11ItemManager19GetDungeonItemModelEj
|
||||
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p
|
||||
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
|
||||
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
|
||||
@@ -535,9 +538,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5288
|
||||
|
||||
+7
-7
@@ -3826,7 +3826,7 @@ _02115f08:
|
||||
ldr r2, _02116170 ; =data_027e0fe4
|
||||
add r1, r0, #0x3c
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x74
|
||||
ldmeqia sp!, {r3, r4, r5, r6, pc}
|
||||
@@ -5727,7 +5727,7 @@ func_ov12_0211776c: ; 0x0211776c
|
||||
ldr r0, _021177d4 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add sp, sp, #8
|
||||
ldmia sp!, {r3, pc}
|
||||
_021177c8:
|
||||
@@ -8496,7 +8496,7 @@ func_ov12_02119a28: ; 0x02119a28
|
||||
ldr r0, _02119db8 ; =data_027e0fe4
|
||||
add r1, r6, #0x3c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02119aa0
|
||||
ldr r2, _02119dbc ; =data_027e0f94
|
||||
@@ -30940,7 +30940,7 @@ func_ov12_0212bff0: ; 0x0212bff0
|
||||
_0212c058:
|
||||
ldr r0, _0212c1b4 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
bne _0212c0b4
|
||||
ldr r2, _0212c1a8 ; =data_027e0f94
|
||||
@@ -33804,7 +33804,7 @@ func_ov12_0212e274: ; 0x0212e274
|
||||
ldr r0, _0212e300 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _0212e304 ; =data_ov12_0213dd10
|
||||
mov r2, #0
|
||||
str r0, [r1, #0x38]
|
||||
@@ -38261,7 +38261,7 @@ _02131e40:
|
||||
ldr r2, _02131f54 ; =data_027e0fe4
|
||||
add r1, r0, #0x3c
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x38
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -38455,7 +38455,7 @@ _0213207c:
|
||||
str r3, [sp]
|
||||
str ip, [sp, #4]
|
||||
str lr, [sp, #8]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
addle sp, sp, #0xc
|
||||
ldmleia sp!, {r3, r4, pc}
|
||||
|
||||
@@ -6,6 +6,11 @@
|
||||
.extern _ZN11ItemManager12GetItemModelEj
|
||||
.extern _ZN11ItemManager8GiveAmmoEit
|
||||
.extern _ZN11ItemManager8GiveKeysEj
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13PlayerControl13IsNotTouchingEv
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -425,11 +430,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c38fc
|
||||
.extern func_ov00_020c3b2c
|
||||
.extern func_ov00_020c3bb0
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c7764
|
||||
|
||||
+28
-28
@@ -281,7 +281,7 @@ func_ov14_0211f8d0: ; 0x0211f8d0
|
||||
ldr r0, [r1]
|
||||
add r1, sp, #0
|
||||
str r2, [sp, #4]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0211f968
|
||||
ldr r2, [r0, #4]
|
||||
@@ -1279,7 +1279,7 @@ _02120618:
|
||||
ldr r0, _0212076c ; =data_027e0fe4
|
||||
add r1, r6, #0x164
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _02120688
|
||||
ldr r0, [r6, #0x158]
|
||||
@@ -1424,7 +1424,7 @@ func_ov14_021207b8: ; 0x021207b8
|
||||
ldr r0, _0212098c ; =data_027e0fe4
|
||||
add r1, r5, #0x164
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r8, r0
|
||||
beq _0212094c
|
||||
ldrsh r3, [r8, #0x78]
|
||||
@@ -1554,7 +1554,7 @@ func_ov14_02120998: ; 0x02120998
|
||||
ldr r0, _02120a74 ; =data_027e0fe4
|
||||
add r1, r6, #0x164
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r3, r0
|
||||
beq _02120a30
|
||||
ldrsh r1, [r3, #0x78]
|
||||
@@ -7909,7 +7909,7 @@ func_ov14_02125e60: ; 0x02125e60
|
||||
ldr r0, _02125ec4 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -7918,7 +7918,7 @@ _02125ea4:
|
||||
ldr r0, _02125ec4 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -8252,7 +8252,7 @@ func_ov14_021261e4: ; 0x021261e4
|
||||
ldr r0, _02126248 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -8261,7 +8261,7 @@ _02126228:
|
||||
ldr r0, _02126248 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -13783,7 +13783,7 @@ func_ov14_0212aaa8: ; 0x0212aaa8
|
||||
bne _0212ab04
|
||||
ldr r0, _0212ab0c ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -14191,7 +14191,7 @@ func_ov14_0212b010: ; 0x0212b010
|
||||
bne _0212b06c
|
||||
ldr r0, _0212b074 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -14666,7 +14666,7 @@ func_ov14_0212b658: ; 0x0212b658
|
||||
bne _0212b6b4
|
||||
ldr r0, _0212b6bc ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -15175,7 +15175,7 @@ _0212bcd4:
|
||||
blt _0212bd2c
|
||||
ldr r0, _0212bd38 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -15563,7 +15563,7 @@ _0212c184:
|
||||
_0212c1ac:
|
||||
ldr r0, _0212c234 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -16767,7 +16767,7 @@ func_ov14_0212d040: ; 0x0212d040
|
||||
_0212d0b4:
|
||||
ldr r0, _0212d1b0 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x24
|
||||
moveq r0, #1
|
||||
@@ -17845,7 +17845,7 @@ func_ov14_0212dd94: ; 0x0212dd94
|
||||
ldr r0, _0212de70 ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x30
|
||||
mvneq r0, #0
|
||||
@@ -17990,7 +17990,7 @@ _0212dfcc:
|
||||
_0212dff0:
|
||||
ldr r0, _0212e0f4 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _0212e0e4
|
||||
mov r1, #0
|
||||
@@ -19285,11 +19285,11 @@ func_ov14_0212f08c: ; 0x0212f08c
|
||||
ldr r2, _0212f16c ; =0x44475447
|
||||
add r0, sp, #0
|
||||
add r3, r5, #0x18
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, _0212f168 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
beq _0212f154
|
||||
bl func_ov14_021383c0
|
||||
@@ -19595,7 +19595,7 @@ _0212f4cc:
|
||||
ldr r2, _0212f570 ; =data_027e0fe4
|
||||
mov r1, r0
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x58
|
||||
ldmeqia sp!, {r4, r5, r6, pc}
|
||||
@@ -22843,7 +22843,7 @@ func_ov14_02131fec: ; 0x02131fec
|
||||
blt _02132044
|
||||
ldr r0, _0213204c ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r3, pc}
|
||||
@@ -23771,7 +23771,7 @@ func_ov14_02132c18: ; 0x02132c18
|
||||
_02132c38:
|
||||
ldr r0, _02132cdc ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -24344,7 +24344,7 @@ func_ov14_021333ac: ; 0x021333ac
|
||||
ldr r2, _02133418 ; =data_027e0fe4
|
||||
mov r4, r0
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -25328,7 +25328,7 @@ func_ov14_0213411c: ; 0x0213411c
|
||||
blt _02134160
|
||||
ldr r0, _02134168 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r3, pc}
|
||||
@@ -25864,7 +25864,7 @@ func_ov14_021347e0: ; 0x021347e0
|
||||
bne _0213483c
|
||||
ldr r0, _02134844 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -29485,7 +29485,7 @@ _021376d4:
|
||||
ldr r0, _0213775c ; =data_027e0fe4
|
||||
mov r1, r5
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _02137744
|
||||
ldr r2, [r0, #4]
|
||||
@@ -32382,7 +32382,7 @@ _02139b24:
|
||||
mov r1, r0
|
||||
ldr r0, [r2]
|
||||
mov r2, #0
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
addne sp, sp, #0xc
|
||||
ldmneia sp!, {r3, r4, pc}
|
||||
@@ -32556,7 +32556,7 @@ _02139d4c:
|
||||
ldr r0, _02139e20 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
beq _02139dc0
|
||||
ldrb r1, [r5, #0x129]
|
||||
@@ -32921,7 +32921,7 @@ _0213a1f0:
|
||||
ldr r0, _0213a268 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r4, #0
|
||||
addeq sp, sp, #0x44
|
||||
ldmeqia sp!, {r4, r5, pc}
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
.extern data_ov00_020e2e3c
|
||||
.extern data_ov00_020e2f04
|
||||
.extern data_ov00_020e5684
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e899c
|
||||
.extern data_ov00_020e8b08
|
||||
.extern data_ov00_020e9360
|
||||
@@ -545,12 +545,12 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c3b2c
|
||||
.extern func_ov00_020c3bb0
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+36
-36
@@ -20,7 +20,7 @@ _0213b794:
|
||||
blo _0213b794
|
||||
ldr r0, _0213b8fc ; =data_027e0fe4
|
||||
mov r6, #0
|
||||
ldr r5, _0213b900 ; =data_ov00_020e72f0
|
||||
ldr r5, _0213b900 ; =_ZTV11ActorFilter
|
||||
add r3, sp, #0x40
|
||||
str r1, [sp, #0x10]
|
||||
add sb, sp, #0x54
|
||||
@@ -41,7 +41,7 @@ _0213b794:
|
||||
str r6, [r3]
|
||||
str r6, [r3, #4]
|
||||
str r6, [r3, #8]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mov r6, r0
|
||||
cmp r6, #0
|
||||
mov fp, #0
|
||||
@@ -66,7 +66,7 @@ _0213b850:
|
||||
ldr r1, [sp]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, r8
|
||||
beq _0213b8e0
|
||||
ldr r2, [r0, #0x4c]
|
||||
@@ -110,7 +110,7 @@ _0213b8f0:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov14_0213b778
|
||||
_0213b8fc: .word data_027e0fe4
|
||||
_0213b900: .word data_ov00_020e72f0
|
||||
_0213b900: .word _ZTV11ActorFilter
|
||||
|
||||
.global func_ov14_0213b904
|
||||
arm_func_start func_ov14_0213b904
|
||||
@@ -2160,11 +2160,11 @@ func_ov14_0213d0bc: ; 0x0213d0bc
|
||||
ldr r2, _0213d158 ; =0x504c444d
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0213d154 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #0x48]
|
||||
str r1, [r4]
|
||||
ldr r1, [r0, #0x4c]
|
||||
@@ -2198,13 +2198,13 @@ func_ov14_0213d15c: ; 0x0213d15c
|
||||
ldr r1, _0213d174 ; =data_027e0fe4
|
||||
mov r2, r0
|
||||
ldr r0, [r1]
|
||||
ldr ip, _0213d178 ; =func_ov00_020c3674
|
||||
ldr ip, _0213d178 ; =_ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r2, #0x10
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end func_ov14_0213d15c
|
||||
_0213d174: .word data_027e0fe4
|
||||
_0213d178: .word func_ov00_020c3674
|
||||
_0213d178: .word _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global func_ov14_0213d17c
|
||||
arm_func_start func_ov14_0213d17c
|
||||
@@ -2555,13 +2555,13 @@ func_ov14_0213d420: ; 0x0213d420
|
||||
ldr r1, _0213d438 ; =data_027e0fe4
|
||||
mov r2, r0
|
||||
ldr r0, [r1]
|
||||
ldr ip, _0213d43c ; =func_ov00_020c3674
|
||||
ldr ip, _0213d43c ; =_ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r2, #0x10
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end func_ov14_0213d420
|
||||
_0213d438: .word data_027e0fe4
|
||||
_0213d43c: .word func_ov00_020c3674
|
||||
_0213d43c: .word _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global func_ov14_0213d440
|
||||
arm_func_start func_ov14_0213d440
|
||||
@@ -2816,7 +2816,7 @@ func_ov14_0213d71c: ; 0x0213d71c
|
||||
mov r7, r1
|
||||
ldr r0, [r3]
|
||||
mov r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0x1c
|
||||
mul r4, r7, r1
|
||||
add r2, r6, r4
|
||||
@@ -3064,7 +3064,7 @@ _0213da84:
|
||||
ldr r0, _0213dad8 ; =data_027e0fe4
|
||||
mov r1, sb
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
strneh fp, [r7, #0x2e]
|
||||
moveq r0, #0
|
||||
@@ -3729,7 +3729,7 @@ _0213e36c:
|
||||
ldr r0, _0213e538 ; =data_027e0fe4
|
||||
mov r1, r6
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov sb, r0
|
||||
_0213e394:
|
||||
ldr r0, [sp]
|
||||
@@ -4513,13 +4513,13 @@ func_ov14_0213ed74: ; 0x0213ed74
|
||||
ldr r1, _0213ed8c ; =data_027e0fe4
|
||||
mov r2, r0
|
||||
ldr r0, [r1]
|
||||
ldr ip, _0213ed90 ; =func_ov00_020c3674
|
||||
ldr ip, _0213ed90 ; =_ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r2, #0xc
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end func_ov14_0213ed74
|
||||
_0213ed8c: .word data_027e0fe4
|
||||
_0213ed90: .word func_ov00_020c3674
|
||||
_0213ed90: .word _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global func_ov14_0213ed94
|
||||
arm_func_start func_ov14_0213ed94
|
||||
@@ -15395,7 +15395,7 @@ func_ov14_021470a0: ; 0x021470a0
|
||||
ldr r0, _021471d0 ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x30
|
||||
mvneq r0, #0
|
||||
@@ -15487,7 +15487,7 @@ _02147240:
|
||||
_02147268:
|
||||
ldr r0, _021472f0 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -15580,7 +15580,7 @@ func_ov14_02147304: ; 0x02147304
|
||||
ldr r0, _0214744c ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x30
|
||||
mvneq r0, #0
|
||||
@@ -17049,7 +17049,7 @@ _021483f8:
|
||||
str r6, [sp, #0x8c]
|
||||
str r6, [sp, #0x90]
|
||||
str r3, [sp, #0x50]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mov r6, r0
|
||||
cmp r6, #0
|
||||
mov r7, #0
|
||||
@@ -17069,7 +17069,7 @@ _0214858c:
|
||||
beq _02148628
|
||||
ldr r0, [fp]
|
||||
add r1, sp, #0x18
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02148628
|
||||
mov r1, r5
|
||||
@@ -19804,7 +19804,7 @@ _0214aaa8:
|
||||
ldr r0, _0214ab10 ; =data_027e0fe4
|
||||
add r1, r2, #0x70
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0214aad8
|
||||
ldr r2, [r0]
|
||||
@@ -20286,10 +20286,10 @@ _0214b048:
|
||||
str ip, [sp, #0x38]
|
||||
str r3, [sp, #8]
|
||||
str r5, [sp, #0xc]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mov r1, r6
|
||||
mov r0, r4
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x164]
|
||||
cmp r0, #0
|
||||
ldreq r1, [r5, #0x16c]
|
||||
@@ -20304,10 +20304,10 @@ _0214b048:
|
||||
mov r0, r4
|
||||
str r3, [sp]
|
||||
str r5, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mov r1, r6
|
||||
mov r0, r4
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x164]
|
||||
_0214b0e8:
|
||||
ldr r1, [r5, #0x164]
|
||||
@@ -24432,7 +24432,7 @@ func_ov14_0214e6d0: ; 0x0214e6d0
|
||||
bne _0214e72c
|
||||
ldr r0, _0214e734 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -24820,7 +24820,7 @@ func_ov14_0214ebd4: ; 0x0214ebd4
|
||||
bne _0214ec30
|
||||
ldr r0, _0214ec38 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -25521,7 +25521,7 @@ func_ov14_0214f504: ; 0x0214f504
|
||||
ldr r0, _0214f5a0 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -25530,7 +25530,7 @@ _0214f574:
|
||||
ldr r0, _0214f5a0 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -25577,7 +25577,7 @@ _0214f600:
|
||||
ldr r0, _0214f664 ; =data_027e0fe4
|
||||
add r2, r4, #0xb4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
movne r0, #0
|
||||
ldmneia sp!, {r4, pc}
|
||||
@@ -25591,7 +25591,7 @@ _0214f640:
|
||||
ldr r0, _0214f664 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -25642,7 +25642,7 @@ _0214f6e0:
|
||||
ldr r0, _0214f770 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
bne _0214f728
|
||||
mov r0, #0
|
||||
@@ -25651,7 +25651,7 @@ _0214f70c:
|
||||
ldr r0, _0214f770 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -27841,7 +27841,7 @@ func_ov14_02151084: ; 0x02151084
|
||||
bne _02151150
|
||||
ldr r0, _0215115c ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -30338,7 +30338,7 @@ func_ov14_02152d54: ; 0x02152d54
|
||||
ldr r0, _02152e2c ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x30
|
||||
mvneq r0, #0
|
||||
@@ -30415,7 +30415,7 @@ _02152eac:
|
||||
_02152ed0:
|
||||
ldr r0, _02152fd4 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _02152fc4
|
||||
mov r1, #0
|
||||
|
||||
+6
-6
@@ -111,7 +111,7 @@
|
||||
.extern data_ov00_020e2f04
|
||||
.extern data_ov00_020e2f68
|
||||
.extern data_ov00_020e5868
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e83cc
|
||||
.extern data_ov00_020e899c
|
||||
.extern data_ov00_020e9360
|
||||
@@ -639,11 +639,11 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3484
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+135
-135
File diff suppressed because it is too large
Load Diff
+6
-6
@@ -362,12 +362,12 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c38fc
|
||||
.extern func_ov00_020c3b2c
|
||||
.extern func_ov00_020c3bb0
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c4ae8
|
||||
|
||||
+22
-22
@@ -1929,7 +1929,7 @@ _0215cabc:
|
||||
ldr r0, _0215cba4 ; =data_027e0fe4
|
||||
ldr r1, [r4, #0xc0]
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _0215cb34
|
||||
ldr r1, [r4, #0x20]
|
||||
@@ -2035,7 +2035,7 @@ func_ov17_0215cc14: ; 0x0215cc14
|
||||
ldmgeia sp!, {r3, r4, r5, pc}
|
||||
ldr r0, _0215cca8 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
mvneq r0, #0
|
||||
ldmeqia sp!, {r3, r4, r5, pc}
|
||||
@@ -2194,7 +2194,7 @@ func_ov17_0215ce24: ; 0x0215ce24
|
||||
ldr r2, _0215cee4 ; =0x43525953
|
||||
add r0, sp, #4
|
||||
add r3, r5, #0x18
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp, #4]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -2204,7 +2204,7 @@ func_ov17_0215ce24: ; 0x0215ce24
|
||||
ldr r0, _0215cee0 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r2, r0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #0
|
||||
@@ -7756,7 +7756,7 @@ func_ov17_0216161c: ; 0x0216161c
|
||||
ldr r0, _0216167c ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -8832,7 +8832,7 @@ func_ov17_021623e8: ; 0x021623e8
|
||||
mov r4, r0
|
||||
ldr r0, [r3]
|
||||
mov r5, r2
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -9682,7 +9682,7 @@ func_ov17_02162e84: ; 0x02162e84
|
||||
_02162ea4:
|
||||
ldr r0, _02162f38 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -12511,7 +12511,7 @@ func_ov17_02165284: ; 0x02165284
|
||||
mov r2, #0
|
||||
str r3, [sp]
|
||||
str r4, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
movgt r0, #1
|
||||
movle r0, #0
|
||||
@@ -15749,7 +15749,7 @@ _02167b9c:
|
||||
ldr r0, _02167cc8 ; =data_027e0fe4
|
||||
add r1, r5, #0x68
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
bne _02167bd4
|
||||
mov r0, r5
|
||||
@@ -15972,7 +15972,7 @@ _02167eac:
|
||||
_02167eb8:
|
||||
ldr r0, _02168064 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
movs r4, r0
|
||||
beq _02168058
|
||||
ldr r1, [r4, #4]
|
||||
@@ -17440,7 +17440,7 @@ _02168fd4:
|
||||
ldr r0, _02169194 ; =data_027e0fe4
|
||||
add r1, r6, #0xe0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #7
|
||||
str r1, [r0, #0x12c]
|
||||
mov r3, #0
|
||||
@@ -18165,7 +18165,7 @@ func_ov17_02169a58: ; 0x02169a58
|
||||
ldr r0, _02169b40 ; =data_027e0fe4
|
||||
add r1, r4, #0x68
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02169adc
|
||||
ldr r2, [r0, #0x4c]
|
||||
@@ -18318,7 +18318,7 @@ func_ov17_02169cb4: ; 0x02169cb4
|
||||
ble _02169cec
|
||||
ldr r0, _02169cf4 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _02169cec
|
||||
ldr r1, [r0, #4]
|
||||
@@ -18398,7 +18398,7 @@ func_ov17_02169d4c: ; 0x02169d4c
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
add r3, r6, #0x18
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -18406,7 +18406,7 @@ func_ov17_02169d4c: ; 0x02169d4c
|
||||
ldr r0, _02169ebc ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _02169e50
|
||||
bl func_ov50_021965b4
|
||||
@@ -18489,7 +18489,7 @@ func_ov17_02169ecc: ; 0x02169ecc
|
||||
ldr r2, _02169f48 ; =data_027e0fe4
|
||||
add r1, r0, #0x68
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -18872,7 +18872,7 @@ func_ov17_0216a348: ; 0x0216a348
|
||||
ldr r0, _0216a3e4 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -18881,7 +18881,7 @@ _0216a3b8:
|
||||
ldr r0, _0216a3e4 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -18928,7 +18928,7 @@ _0216a444:
|
||||
ldr r0, _0216a4a8 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
movne r0, #0
|
||||
ldmneia sp!, {r4, pc}
|
||||
@@ -18942,7 +18942,7 @@ _0216a484:
|
||||
ldr r0, _0216a4a8 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -18993,7 +18993,7 @@ _0216a524:
|
||||
ldr r0, _0216a5b4 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3bb0
|
||||
bl _ZN12ActorManager18func_ov00_020c3bb0EiPi
|
||||
cmp r0, #0
|
||||
bne _0216a56c
|
||||
mov r0, #0
|
||||
@@ -19002,7 +19002,7 @@ _0216a550:
|
||||
ldr r0, _0216a5b4 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
|
||||
+4
-4
@@ -370,10 +370,10 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c38fc
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+16
-16
@@ -2133,11 +2133,11 @@ func_ov18_0215cfac: ; 0x0215cfac
|
||||
ldr r2, _0215d050 ; =0x4c4e4232
|
||||
add r0, sp, #8
|
||||
add r3, r3, #4
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, _0215d04c ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x11a]
|
||||
@@ -2150,7 +2150,7 @@ func_ov18_0215cfac: ; 0x0215cfac
|
||||
str r2, [sp, #8]
|
||||
ldr r2, [r3, #0x40]
|
||||
str r2, [sp, #0xc]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x11a]
|
||||
@@ -2162,7 +2162,7 @@ func_ov18_0215cfac: ; 0x0215cfac
|
||||
mov r2, #0
|
||||
str ip, [sp]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
add sp, sp, #0x10
|
||||
ldmia sp!, {r3, pc}
|
||||
.align 2, 0
|
||||
@@ -2184,11 +2184,11 @@ func_ov18_0215d060: ; 0x0215d060
|
||||
ldr r2, _0215d0ac ; =0x4c4e4232
|
||||
add r0, sp, #0
|
||||
add r3, r3, #4
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, _0215d0a8 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #1
|
||||
strneb r1, [r0, #0x11a]
|
||||
@@ -4272,7 +4272,7 @@ _0215ecb8:
|
||||
ldr r0, _0215ee78 ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0215ed70
|
||||
ldr r2, [r4, #0x30]
|
||||
@@ -6395,7 +6395,7 @@ func_ov18_0216065c: ; 0x0216065c
|
||||
ldr r0, _02160814 ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02160774
|
||||
ldr r2, [fp, #0x30]
|
||||
@@ -10110,7 +10110,7 @@ func_ov18_02163718: ; 0x02163718
|
||||
_02163758:
|
||||
ldr r0, _021637b0 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -10919,7 +10919,7 @@ _0216424c:
|
||||
_0216425c:
|
||||
ldr r0, _021642b4 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -11102,7 +11102,7 @@ _0216447c:
|
||||
blt _0216452c
|
||||
ldr r0, _02164538 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -14430,7 +14430,7 @@ func_ov18_02166e7c: ; 0x02166e7c
|
||||
ldr r0, _02166f1c ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
bl func_ov18_021658ac
|
||||
@@ -15341,7 +15341,7 @@ _02167bac:
|
||||
ldr r0, _02167dfc ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
bl func_ov18_02165690
|
||||
_02167bdc:
|
||||
ldr r0, _02167e00 ; =data_027e0f74
|
||||
@@ -15375,7 +15375,7 @@ _02167c34:
|
||||
ldr r0, _02167dfc ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
bl func_ov18_021658ac
|
||||
_02167c58:
|
||||
ldrb r0, [r4, #0x475]
|
||||
@@ -15931,7 +15931,7 @@ _02168388:
|
||||
ldr r0, _021686d8 ; =data_027e0fe4
|
||||
add r1, r6, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _021686dc ; =data_ov18_0216d604
|
||||
cmp r0, #0
|
||||
str r0, [r1, #0x2c]
|
||||
@@ -16531,7 +16531,7 @@ _02168cbc:
|
||||
blt _02168d60
|
||||
ldr r0, _02168d70 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x18
|
||||
moveq r0, #1
|
||||
|
||||
+6
-6
@@ -4,6 +4,10 @@
|
||||
.extern _ZN10PlayerBase10SetVisibleEb
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
|
||||
.extern _ZN11ItemManager7AddItemEi
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13LinkStateBase12GetPlayerPosEv
|
||||
.extern _ZN13LinkStateBase12GetPlayerVelEv
|
||||
.extern _ZN13LinkStateBase15ChangeLinkStateEi
|
||||
@@ -49,7 +53,7 @@
|
||||
.extern data_ov00_020e2dd8
|
||||
.extern data_ov00_020e2e3c
|
||||
.extern data_ov00_020e2f04
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e9360
|
||||
.extern data_ov00_020e9370
|
||||
.extern data_ov00_020ec9d4
|
||||
@@ -96,7 +100,6 @@
|
||||
.extern func_0203eba8
|
||||
.extern func_0203ebc8
|
||||
.extern func_02042f74
|
||||
.extern strncpy
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -283,10 +286,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c38fc
|
||||
.extern func_ov00_020c3b2c
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c50d4
|
||||
@@ -371,3 +370,4 @@
|
||||
.extern func_ov17_02168660
|
||||
.extern func_ov17_021687f0
|
||||
.extern gItemManager
|
||||
.extern strncpy
|
||||
|
||||
+16
-16
@@ -1078,7 +1078,7 @@ _0216e46c:
|
||||
ldr r0, _0216e69c ; =data_027e0fe4
|
||||
add r1, sp, #0x24
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [sp, #0x10]
|
||||
ldr r0, _0216e6a0 ; =data_027e0f94
|
||||
add r6, sp, #0x2c
|
||||
@@ -1774,14 +1774,14 @@ func_ov19_0216eda4: ; 0x0216eda4
|
||||
str ip, [sp, #4]
|
||||
str r5, [sp, #8]
|
||||
str r3, [sp, #0xc]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r5, _0216ee58 ; =data_027e0fe4
|
||||
add r7, sp, #0x10
|
||||
mov r6, #0
|
||||
_0216ee24:
|
||||
ldr r0, [r5]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, r6, lsl #2
|
||||
add r1, r1, #0x1000
|
||||
add r6, r6, #1
|
||||
@@ -5206,7 +5206,7 @@ func_ov19_02171a9c: ; 0x02171a9c
|
||||
ldr r0, _02171e48 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _02171af8
|
||||
mov r0, r5
|
||||
@@ -5235,7 +5235,7 @@ _02171b40:
|
||||
ldr r0, _02171e48 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171b78
|
||||
bl func_ov19_0216f054
|
||||
@@ -7793,7 +7793,7 @@ func_ov19_02173cf4: ; 0x02173cf4
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
mov r1, #0
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
movle r0, #0
|
||||
ldmleia sp!, {r4, pc}
|
||||
@@ -7812,7 +7812,7 @@ func_ov19_02173d2c: ; 0x02173d2c
|
||||
ldr r0, _02173d50 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -8197,7 +8197,7 @@ func_ov19_0217416c: ; 0x0217416c
|
||||
ldr r0, _02174208 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x38
|
||||
moveq r0, #0
|
||||
@@ -8499,7 +8499,7 @@ func_ov19_021745b8: ; 0x021745b8
|
||||
ldr r0, _02174784 ; =data_027e0fe4
|
||||
add r1, r7, #0x34c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02174604
|
||||
ldr r1, [r0, #4]
|
||||
@@ -8514,11 +8514,11 @@ _02174604:
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
add r3, r7, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, _02174784 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r1, r0
|
||||
beq _0217467c
|
||||
ldrb r0, [r1, #0x11b]
|
||||
@@ -8647,7 +8647,7 @@ _021747e4:
|
||||
ldr r0, _02174874 ; =data_027e0fe4
|
||||
add r1, r4, #0x34c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02174824
|
||||
ldr r1, [r0, #0x48]
|
||||
@@ -8741,7 +8741,7 @@ _02174910:
|
||||
blo _02174910
|
||||
ldr r0, _021749e8 ; =data_027e0fe4
|
||||
mov lr, #0
|
||||
ldr r6, _021749ec ; =data_ov00_020e72f0
|
||||
ldr r6, _021749ec ; =_ZTV11ActorFilter
|
||||
add ip, sp, #0x40
|
||||
ldr r5, _021749f0 ; =0x4d4c4457
|
||||
add r4, sp, #0x54
|
||||
@@ -8763,7 +8763,7 @@ _02174910:
|
||||
str lr, [ip, #8]
|
||||
str r4, [sp]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ldrgt r0, [sp, #8]
|
||||
movgt r5, #0
|
||||
@@ -8775,7 +8775,7 @@ _021749a4:
|
||||
ldr r1, [sp]
|
||||
ldr r0, [r4]
|
||||
add r1, r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
bl func_ov19_021748e0
|
||||
cmp r0, #0
|
||||
addne sp, sp, #0xd4
|
||||
@@ -8793,7 +8793,7 @@ _021749dc:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov19_021748fc
|
||||
_021749e8: .word data_027e0fe4
|
||||
_021749ec: .word data_ov00_020e72f0
|
||||
_021749ec: .word _ZTV11ActorFilter
|
||||
_021749f0: .word 0x4d4c4457
|
||||
|
||||
.global func_ov19_021749f4
|
||||
|
||||
+3
-3
@@ -264,9 +264,9 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c50fc
|
||||
|
||||
+13
-13
@@ -185,7 +185,7 @@ _0216d8d0:
|
||||
bl func_ov00_020c4048
|
||||
ldr r0, [r4]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sl, sb, lsl #2
|
||||
str r0, [r1, #0xa40]
|
||||
mov r1, sb
|
||||
@@ -4704,7 +4704,7 @@ func_ov20_02171640: ; 0x02171640
|
||||
mov r2, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r2, #0x34
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
bl func_ov20_0216f720
|
||||
ldmia sp!, {r3, pc}
|
||||
.align 2, 0
|
||||
@@ -5766,7 +5766,7 @@ _021724cc:
|
||||
ldr r0, _02172554 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _021724fc
|
||||
mov r0, r5
|
||||
@@ -6033,11 +6033,11 @@ _021727fc:
|
||||
ldr r2, _02172950 ; =0x564c4352
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217294c ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02172850
|
||||
ldr r1, [r0, #0x48]
|
||||
@@ -7421,11 +7421,11 @@ func_ov20_02173a80: ; 0x02173a80
|
||||
mov r6, r0
|
||||
ldr r2, _02173bc4 ; =0x524d4654
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02173bc0 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
cmp r5, #4
|
||||
addls pc, pc, r5, lsl #2
|
||||
@@ -7540,7 +7540,7 @@ _02173c14:
|
||||
ldr r2, _02173cd8 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #0x10]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #0x14]
|
||||
@@ -7551,7 +7551,7 @@ _02173c3c:
|
||||
ldr r2, _02173cd8 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #8]
|
||||
ldr r0, _02173cd4 ; =data_027e0fe4
|
||||
str r1, [r4, #0x180]
|
||||
@@ -7573,7 +7573,7 @@ _02173c3c:
|
||||
str lr, [sp, #0x20]
|
||||
str ip, [sp]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #8]
|
||||
str r0, [r4, #0x188]
|
||||
ldr r0, [sp, #0xc]
|
||||
@@ -9965,11 +9965,11 @@ _02175b0c:
|
||||
ldr r2, _02175f2c ; =0x564c4352
|
||||
add r0, sp, #4
|
||||
str r3, [sp, #0xc8]
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02175f28 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r5, [r4, #0x138]
|
||||
ldr r2, [r0, #0x48]
|
||||
cmp r5, #0x96
|
||||
@@ -10645,7 +10645,7 @@ func_ov20_021763b4: ; 0x021763b4
|
||||
ldr r2, _0217640c ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #4]
|
||||
|
||||
+1
-1
@@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13LinkStateBase12GetPlayerVelEv
|
||||
.extern _ZN13LinkStateBase15ChangeLinkStateEi
|
||||
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
|
||||
@@ -184,7 +185,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5c98
|
||||
|
||||
+1
-1
@@ -888,7 +888,7 @@ func_ov21_0216e128: ; 0x0216e128
|
||||
ldr r0, _0216e1d8 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r0, #1
|
||||
moveq r0, #0
|
||||
|
||||
+5
-5
@@ -1,6 +1,10 @@
|
||||
#pragma once
|
||||
.extern Approach_thunk
|
||||
.extern Divide
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13LinkStateBase10GetStateIdEv
|
||||
.extern _ZN13LinkStateBase12GetPlayerPosEv
|
||||
.extern _ZN13LinkStateBase12GetPlayerVelEv
|
||||
@@ -92,7 +96,6 @@
|
||||
.extern func_0203e7b4
|
||||
.extern func_0203eba8
|
||||
.extern func_0203ebc8
|
||||
.extern strncpy
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -289,10 +292,6 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
@@ -475,3 +474,4 @@
|
||||
.extern func_ov34_0217bf0c
|
||||
.extern func_ov34_0217bf34
|
||||
.extern func_ov46_02193fac
|
||||
.extern strncpy
|
||||
|
||||
+9
-9
@@ -3362,7 +3362,7 @@ _021702f8:
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x20
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x18]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #0x1c]
|
||||
@@ -3372,7 +3372,7 @@ _0217034c:
|
||||
ldr r2, _021703c0 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #8]
|
||||
ldr r0, [sp, #0xc]
|
||||
str r1, [sp, #0x18]
|
||||
@@ -3386,7 +3386,7 @@ _02170380:
|
||||
ldr r2, _021703c0 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
ldr r0, [sp, #4]
|
||||
str r1, [sp, #0x18]
|
||||
@@ -6751,7 +6751,7 @@ _02172f1c:
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x20
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r1, [sp, #0xc]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -6759,7 +6759,7 @@ _02172f1c:
|
||||
ldr r0, _0217307c ; =data_027e0fe4
|
||||
add r1, sp, #0xc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x73c]
|
||||
ldrb r0, [r4, #0xa4]
|
||||
cmp r0, #0
|
||||
@@ -7689,7 +7689,7 @@ func_ov22_02173ab0: ; 0x02173ab0
|
||||
ldr r0, _02173c14 ; =data_027e0fe4
|
||||
add r1, r4, #0x364
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x360]
|
||||
ldr r0, [r4, #0x360]
|
||||
cmp r0, #0
|
||||
@@ -8239,7 +8239,7 @@ _0217436c:
|
||||
ldr r0, _0217462c ; =data_027e0fe4
|
||||
add r1, r5, #0x364
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _021744c8
|
||||
mov r0, r5
|
||||
@@ -8777,7 +8777,7 @@ func_ov22_02174990: ; 0x02174990
|
||||
str r1, [r4, #0x164]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x34
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x278]
|
||||
mov r0, #3
|
||||
strb r0, [r4, #0x1a8]
|
||||
@@ -9643,7 +9643,7 @@ func_ov22_0217556c: ; 0x0217556c
|
||||
blt _021755cc
|
||||
ldr r0, _021755d4 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _021755cc
|
||||
ldr r1, [r0, #4]
|
||||
|
||||
+6
-6
@@ -3,6 +3,10 @@
|
||||
.extern Divide
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
|
||||
.extern _ZN11ItemManager12GetItemModelEj
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13LinkStateBase12ApplyImpulseEii
|
||||
.extern _ZN13LinkStateBase12GetPlayerPosEv
|
||||
.extern _ZN13LinkStateBase12GetPlayerVelEv
|
||||
@@ -76,7 +80,7 @@
|
||||
.extern data_ov00_020e26b4
|
||||
.extern data_ov00_020e2dd8
|
||||
.extern data_ov00_020e2f04
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e899c
|
||||
.extern data_ov00_020e8b08
|
||||
.extern data_ov00_020e9360
|
||||
@@ -139,7 +143,6 @@
|
||||
.extern func_0203e7b4
|
||||
.extern func_0203eba8
|
||||
.extern func_0203ebc8
|
||||
.extern strncpy
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -367,10 +370,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c38fc
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
@@ -576,3 +575,4 @@
|
||||
.extern func_ov52_02195754
|
||||
.extern func_ov52_02195b5c
|
||||
.extern gItemManager
|
||||
.extern strncpy
|
||||
|
||||
+36
-36
@@ -651,7 +651,7 @@ func_ov23_0216dee4: ; 0x0216dee4
|
||||
ldr r1, [r1]
|
||||
ldr r2, _0216df24 ; =0x4e415649
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mov r0, #1
|
||||
str r1, [r4, #0x180]
|
||||
@@ -1328,7 +1328,7 @@ func_ov23_0216e7b0: ; 0x0216e7b0
|
||||
add r1, sp, #0
|
||||
mov r2, #0
|
||||
str r3, [sp]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
add sp, sp, #8
|
||||
ldmia sp!, {r3, pc}
|
||||
.align 2, 0
|
||||
@@ -1924,7 +1924,7 @@ func_ov23_0216eef0: ; 0x0216eef0
|
||||
ldr r1, [r1]
|
||||
ldr r2, _0216ef30 ; =0x4e415649
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mov r0, #1
|
||||
str r1, [r4, #0x180]
|
||||
@@ -2466,7 +2466,7 @@ func_ov23_0216f428: ; 0x0216f428
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x30
|
||||
add r3, sp, #0xc8
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp, #0x30]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -2474,7 +2474,7 @@ func_ov23_0216f428: ; 0x0216f428
|
||||
ldr r0, _0216f884 ; =data_027e0fe4
|
||||
add r1, sp, #0x30
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0x9c
|
||||
bl func_ov00_020c2b00
|
||||
ldr r0, [r5, #0x48]
|
||||
@@ -2504,7 +2504,7 @@ _0216f630:
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x28
|
||||
add r3, sp, #0xc8
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp, #0x28]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -2512,7 +2512,7 @@ _0216f630:
|
||||
ldr r0, _0216f884 ; =data_027e0fe4
|
||||
add r1, sp, #0x28
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r2, #0
|
||||
add r1, sp, #0x26
|
||||
strb r2, [sp, #0x26]
|
||||
@@ -2550,7 +2550,7 @@ _0216f6bc:
|
||||
mov r0, #0
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
|
||||
_0216f6f4:
|
||||
ldr r4, _0216f890 ; =data_ov00_020e72f0
|
||||
ldr r4, _0216f890 ; =_ZTV11ActorFilter
|
||||
mov r1, #0
|
||||
add r0, sp, #0x188
|
||||
mvn r3, #0
|
||||
@@ -2592,7 +2592,7 @@ _0216f73c:
|
||||
str r3, [sp, #0x88]
|
||||
str r3, [sp, #0x8c]
|
||||
str r4, [sp, #0x164]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x98]
|
||||
mov r4, #0
|
||||
cmp r0, #0
|
||||
@@ -2603,7 +2603,7 @@ _0216f7b4:
|
||||
ldr r1, [sp, #0x90]
|
||||
ldr r0, [r7]
|
||||
add r1, r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrb lr, [r0, #0x3a8]
|
||||
ldrb r2, [r6]
|
||||
ldrb ip, [r0, #0x3a9]
|
||||
@@ -2660,7 +2660,7 @@ _0216f880: .word 0x00000733
|
||||
_0216f884: .word data_027e0fe4
|
||||
_0216f888: .word 0x4e545250
|
||||
_0216f88c: .word 0x50534241
|
||||
_0216f890: .word data_ov00_020e72f0
|
||||
_0216f890: .word _ZTV11ActorFilter
|
||||
_0216f894: .word 0x414d4f53
|
||||
|
||||
.global func_ov23_0216f898
|
||||
@@ -3403,7 +3403,7 @@ func_ov23_021701c0: ; 0x021701c0
|
||||
add r0, sp, #0xc
|
||||
add r3, r5, #0x14
|
||||
mov r4, #1
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp, #0xc]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -3411,7 +3411,7 @@ func_ov23_021701c0: ; 0x021701c0
|
||||
ldr r0, _02170668 ; =data_027e0fe4
|
||||
add r1, sp, #0xc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r2, #0
|
||||
add r1, sp, #0xa
|
||||
add r0, r0, #0x48
|
||||
@@ -4732,7 +4732,7 @@ _02171338:
|
||||
str r2, [sp]
|
||||
ldr r2, [r3, #0x88]
|
||||
str r2, [sp, #4]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171388
|
||||
ldr r0, [r0, #0x12c]
|
||||
@@ -6416,7 +6416,7 @@ func_ov23_02172998: ; 0x02172998
|
||||
ldr r2, _02172b10 ; =0x424f4d42
|
||||
add r0, sp, #4
|
||||
str r5, [sp, #0x28]
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp, #4]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -6424,7 +6424,7 @@ func_ov23_02172998: ; 0x02172998
|
||||
ldr r0, _02172b08 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0xc
|
||||
mov r5, r0
|
||||
bl func_ov00_020c2a0c
|
||||
@@ -6551,7 +6551,7 @@ func_ov23_02172b88: ; 0x02172b88
|
||||
sub sp, sp, #0x48
|
||||
ldr r0, _02172bf4 ; =data_027e0fe4
|
||||
mov r2, #0
|
||||
ldr r4, _02172bf8 ; =data_ov00_020e72f0
|
||||
ldr r4, _02172bf8 ; =_ZTV11ActorFilter
|
||||
add r3, sp, #0x34
|
||||
mvn ip, #0
|
||||
ldr lr, _02172bfc ; =0x424f4d42
|
||||
@@ -6568,7 +6568,7 @@ func_ov23_02172b88: ; 0x02172b88
|
||||
str r2, [r3]
|
||||
str r2, [r3, #4]
|
||||
str r2, [r3, #8]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #4
|
||||
movle r0, #1
|
||||
movgt r0, #0
|
||||
@@ -6577,7 +6577,7 @@ func_ov23_02172b88: ; 0x02172b88
|
||||
.align 2, 0
|
||||
arm_func_end func_ov23_02172b88
|
||||
_02172bf4: .word data_027e0fe4
|
||||
_02172bf8: .word data_ov00_020e72f0
|
||||
_02172bf8: .word _ZTV11ActorFilter
|
||||
_02172bfc: .word 0x424f4d42
|
||||
|
||||
.global func_ov23_02172c00
|
||||
@@ -6990,7 +6990,7 @@ func_ov23_02173124: ; 0x02173124
|
||||
mov r3, #0
|
||||
bl func_ov00_020ceacc
|
||||
_021731a4:
|
||||
ldr r4, _021734d0 ; =data_ov00_020e72f0
|
||||
ldr r4, _021734d0 ; =_ZTV11ActorFilter
|
||||
mov r1, #0
|
||||
add r0, sp, #0xf8
|
||||
mvn r2, #0
|
||||
@@ -7024,7 +7024,7 @@ _021731ec:
|
||||
str r3, [sp, #0x34]
|
||||
str r5, [sp, #0x2c]
|
||||
str r4, [sp, #0x30]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x34]
|
||||
mov r5, #0
|
||||
cmp r0, #0
|
||||
@@ -7043,7 +7043,7 @@ _02173260:
|
||||
ldr r1, [sp, #0x2c]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0x1c
|
||||
mov r4, r0
|
||||
bl func_ov00_020c2a0c
|
||||
@@ -7149,7 +7149,7 @@ _02173388:
|
||||
ldr r0, _021734d8 ; =data_027e0fe4
|
||||
add r1, sp, #0x14
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021734a8
|
||||
ldrh r1, [r6, #0x78]
|
||||
@@ -7202,7 +7202,7 @@ _021734a8:
|
||||
arm_func_end func_ov23_02173124
|
||||
_021734c8: .word data_02050f54
|
||||
_021734cc: .word data_027e0ffc
|
||||
_021734d0: .word data_ov00_020e72f0
|
||||
_021734d0: .word _ZTV11ActorFilter
|
||||
_021734d4: .word 0x424f4d42
|
||||
_021734d8: .word data_027e0fe4
|
||||
_021734dc: .word 0x00000733
|
||||
@@ -8170,7 +8170,7 @@ func_ov23_02174204: ; 0x02174204
|
||||
ldr r0, _02174378 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r3, _0217437c ; =data_027e0764
|
||||
ldrh r1, [r5, #0x78]
|
||||
ldr r4, [r3]
|
||||
@@ -8831,7 +8831,7 @@ _021749f8:
|
||||
ldr r0, _02174d20 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r5, #0x1c]
|
||||
mov r2, #0
|
||||
ldrsh r1, [r1, #0x78]
|
||||
@@ -12596,11 +12596,11 @@ func_ov23_02177ba0: ; 0x02177ba0
|
||||
ldr r2, _02177e18 ; =0x504c444d
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02177e14 ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [sp, #0x74]
|
||||
mov r4, r0
|
||||
cmp r1, #0x5000
|
||||
@@ -12617,11 +12617,11 @@ _02177c5c:
|
||||
ldr r2, _02177e1c ; =0x50574253
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02177e14 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs lr, r0
|
||||
beq _02177df0
|
||||
add r3, lr, #0x7c
|
||||
@@ -12668,11 +12668,11 @@ _02177d24:
|
||||
ldr r2, _02177e1c ; =0x50574253
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02177e14 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02177da8
|
||||
ldr r0, [r0, #0x878]
|
||||
@@ -13012,11 +13012,11 @@ func_ov23_02178174: ; 0x02178174
|
||||
ldr r1, [r1]
|
||||
ldr r2, _0217830c ; =0x504c444d
|
||||
add r0, sp, #4
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02178308 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
addeq sp, sp, #0x28
|
||||
ldmeqia sp!, {r3, r4, r5, pc}
|
||||
@@ -13153,11 +13153,11 @@ func_ov23_02178354: ; 0x02178354
|
||||
ldr r1, [r1]
|
||||
ldr r2, _02178404 ; =0x504c444d
|
||||
add r0, sp, #4
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02178400 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
mov r0, r5
|
||||
bl func_ov00_020bc46c
|
||||
|
||||
+4
-4
@@ -274,10 +274,10 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3484
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c56d8
|
||||
|
||||
+70
-70
@@ -2822,11 +2822,11 @@ func_ov24_0216fa3c: ; 0x0216fa3c
|
||||
ldr r1, [r0]
|
||||
ldr r2, _0216fbcc ; =0x574c4354
|
||||
add r0, sp, #4
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0216fbc8 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneh r1, [r4, #0x24]
|
||||
strneb r1, [r0, #0x159]
|
||||
@@ -2884,7 +2884,7 @@ func_ov24_0216fbd4: ; 0x0216fbd4
|
||||
_0216fbf8:
|
||||
ldr r0, _0216fc64 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -4724,7 +4724,7 @@ func_ov24_02171358: ; 0x02171358
|
||||
ldr r0, _021714d4 ; =data_027e0fe4
|
||||
add r1, r5, #0x3c0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
add r0, sp, #4
|
||||
bl func_01ff892c
|
||||
@@ -5089,7 +5089,7 @@ func_ov24_0217174c: ; 0x0217174c
|
||||
ldr r0, [r2]
|
||||
mov r5, r1
|
||||
add r1, r3, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
ldmeqia sp!, {r3, r4, r5, pc}
|
||||
bl func_ov24_0217692c
|
||||
@@ -5112,7 +5112,7 @@ func_ov24_02171790: ; 0x02171790
|
||||
ldr r0, _021717cc ; =data_027e0fe4
|
||||
add r1, r4, #0x3c0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
bl func_ov24_0217692c
|
||||
@@ -5172,7 +5172,7 @@ _0217184c:
|
||||
str r2, [r1, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x20
|
||||
ldmeqia sp!, {r4, r5, r6, pc}
|
||||
@@ -5191,7 +5191,7 @@ _02171894:
|
||||
str r2, [r1, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x20
|
||||
ldmeqia sp!, {r4, r5, r6, pc}
|
||||
@@ -5210,7 +5210,7 @@ _021718dc:
|
||||
str r2, [r1, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171918
|
||||
bl func_ov24_02176908
|
||||
@@ -5244,7 +5244,7 @@ _02171950:
|
||||
str r2, [r1, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171994
|
||||
bl func_ov24_0217686c
|
||||
@@ -5282,7 +5282,7 @@ _021719f0:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171a24
|
||||
bl func_ov24_02176890
|
||||
@@ -5325,7 +5325,7 @@ _02171a8c:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171ac0
|
||||
bl func_ov24_021767f0
|
||||
@@ -5362,7 +5362,7 @@ _02171ad0:
|
||||
ldr r0, _02171e48 ; =data_027e0fe4
|
||||
add r1, r4, #0x3c0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171b4c
|
||||
bl func_ov24_021767f0
|
||||
@@ -5399,7 +5399,7 @@ _02171b5c:
|
||||
ldr r0, _02171e48 ; =data_027e0fe4
|
||||
add r1, r4, #0x3c0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171bd8
|
||||
bl func_ov24_021767f0
|
||||
@@ -5436,7 +5436,7 @@ _02171be8:
|
||||
ldr r0, _02171e48 ; =data_027e0fe4
|
||||
add r1, r4, #0x3c0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171c64
|
||||
bl func_ov24_021767cc
|
||||
@@ -5486,7 +5486,7 @@ _02171cdc:
|
||||
strh r2, [r0, #0xbc]
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171d1c
|
||||
bl func_ov24_02176848
|
||||
@@ -5508,7 +5508,7 @@ _02171d2c:
|
||||
strh r2, [r0, #0xbc]
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171d6c
|
||||
bl func_ov24_02176824
|
||||
@@ -5529,7 +5529,7 @@ _02171d7c:
|
||||
str r2, [r1, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171db8
|
||||
bl func_ov24_0217686c
|
||||
@@ -5553,7 +5553,7 @@ _02171ddc:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171e10
|
||||
bl func_ov24_02176890
|
||||
@@ -5596,7 +5596,7 @@ func_ov24_02171e64: ; 0x02171e64
|
||||
ldr r0, _02171ef0 ; =data_027e0fe4
|
||||
add r1, r4, #0x3c0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02171eb0
|
||||
bl func_ov24_0217692c
|
||||
@@ -5972,7 +5972,7 @@ _021723a4:
|
||||
strb r1, [r4, #0x1a8]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021723e8
|
||||
bl func_ov24_0217692c
|
||||
@@ -6037,7 +6037,7 @@ _02172478:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021724b8
|
||||
bl func_ov24_02176814
|
||||
@@ -6358,7 +6358,7 @@ _0217291c:
|
||||
ldr r0, _02172bd8 ; =data_027e0fe4
|
||||
add r1, r4, #0x3c0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _02172954
|
||||
mov r0, r4
|
||||
@@ -6385,7 +6385,7 @@ _02172970:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3c0
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021729b0
|
||||
bl func_ov24_02176814
|
||||
@@ -6601,7 +6601,7 @@ func_ov24_02172bf8: ; 0x02172bf8
|
||||
add r1, r4, #0x3c0
|
||||
str r3, [sp, #0x28]
|
||||
str r2, [sp, #0x2c]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r5, r0
|
||||
beq _02172ce4
|
||||
add ip, sp, #0
|
||||
@@ -6880,7 +6880,7 @@ func_ov24_02172fe0: ; 0x02172fe0
|
||||
ldr r0, _02173104 ; =data_027e0fe4
|
||||
add r1, r5, #0x3bc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
add r0, sp, #4
|
||||
bl func_01ff892c
|
||||
@@ -6974,7 +6974,7 @@ func_ov24_02173148: ; 0x02173148
|
||||
ldr r0, [r2]
|
||||
mov r5, r1
|
||||
add r1, r3, #0x3bc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
ldmeqia sp!, {r3, r4, r5, pc}
|
||||
bl func_ov24_0217692c
|
||||
@@ -6997,7 +6997,7 @@ func_ov24_0217318c: ; 0x0217318c
|
||||
ldr r0, _021731c8 ; =data_027e0fe4
|
||||
add r1, r4, #0x3bc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
bl func_ov24_0217692c
|
||||
@@ -7080,7 +7080,7 @@ _021732a0:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3bc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021732d4
|
||||
bl func_ov24_021767cc
|
||||
@@ -7099,7 +7099,7 @@ _021732e4:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3bc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02173318
|
||||
bl func_ov24_02176848
|
||||
@@ -7118,7 +7118,7 @@ _02173328:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3bc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217335c
|
||||
bl func_ov24_02176824
|
||||
@@ -7146,7 +7146,7 @@ func_ov24_02173378: ; 0x02173378
|
||||
ldr r0, _02173404 ; =data_027e0fe4
|
||||
add r1, r4, #0x3bc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021733c4
|
||||
bl func_ov24_0217692c
|
||||
@@ -7404,7 +7404,7 @@ func_ov24_021736e4: ; 0x021736e4
|
||||
strb r1, [r4, #0x1a8]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3bc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02173744
|
||||
bl func_ov24_0217692c
|
||||
@@ -7476,7 +7476,7 @@ _021737f0:
|
||||
ldr r0, _02173a10 ; =data_027e0fe4
|
||||
add r1, r4, #0x3bc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _02173828
|
||||
mov r0, r4
|
||||
@@ -7503,7 +7503,7 @@ _02173844:
|
||||
str r2, [r1, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r4, #0x3bc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02173884
|
||||
bl func_ov24_02176814
|
||||
@@ -7663,7 +7663,7 @@ func_ov24_02173a1c: ; 0x02173a1c
|
||||
add r1, r4, #0x3bc
|
||||
str r3, [sp, #0x28]
|
||||
str r2, [sp, #0x2c]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r5, r0
|
||||
beq _02173b08
|
||||
add ip, sp, #0
|
||||
@@ -8020,7 +8020,7 @@ func_ov24_02173f10: ; 0x02173f10
|
||||
add r1, r5, #0x2b8
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
add r0, sp, #4
|
||||
bl func_01ff892c
|
||||
@@ -8453,7 +8453,7 @@ func_ov24_021743d8: ; 0x021743d8
|
||||
ldr r0, [r3]
|
||||
mov r5, r1
|
||||
add r1, r2, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
ldmeqia sp!, {r3, r4, r5, pc}
|
||||
bl func_ov24_0217692c
|
||||
@@ -8477,7 +8477,7 @@ func_ov24_0217441c: ; 0x0217441c
|
||||
add r1, r4, #0x2b8
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
bl func_ov24_0217692c
|
||||
@@ -8537,7 +8537,7 @@ _021744d8:
|
||||
str r3, [r2, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x20
|
||||
ldmeqia sp!, {r4, r5, r6, pc}
|
||||
@@ -8557,7 +8557,7 @@ _02174524:
|
||||
str r3, [r2, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x20
|
||||
ldmeqia sp!, {r4, r5, r6, pc}
|
||||
@@ -8577,7 +8577,7 @@ _02174570:
|
||||
str r3, [r2, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021745b0
|
||||
bl func_ov24_02176908
|
||||
@@ -8612,7 +8612,7 @@ _021745e8:
|
||||
str r3, [r2, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02174630
|
||||
bl func_ov24_0217686c
|
||||
@@ -8651,7 +8651,7 @@ _0217468c:
|
||||
str r3, [r2, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021746c4
|
||||
bl func_ov24_02176890
|
||||
@@ -8715,7 +8715,7 @@ _0217472c:
|
||||
add r2, r4, #0x2b8
|
||||
ldr r0, [r0]
|
||||
add r1, r2, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021747b4
|
||||
bl func_ov24_021767cc
|
||||
@@ -8735,7 +8735,7 @@ _021747c4:
|
||||
str r3, [r2, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021747fc
|
||||
bl func_ov24_021767f0
|
||||
@@ -8773,7 +8773,7 @@ _0217480c:
|
||||
str r2, [r4, #0x13c]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217488c
|
||||
bl func_ov24_021767f0
|
||||
@@ -8811,7 +8811,7 @@ _0217489c:
|
||||
str r2, [r4, #0x13c]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217491c
|
||||
bl func_ov24_021767f0
|
||||
@@ -8849,7 +8849,7 @@ _0217492c:
|
||||
str r2, [r4, #0x13c]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021749ac
|
||||
bl func_ov24_021767cc
|
||||
@@ -8897,7 +8897,7 @@ _02174a24:
|
||||
str r3, [r2, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02174a5c
|
||||
bl func_ov24_021768b4
|
||||
@@ -8945,7 +8945,7 @@ _02174ad4:
|
||||
str r3, [r2, #0x14]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02174b14
|
||||
bl func_ov24_0217686c
|
||||
@@ -8970,7 +8970,7 @@ _02174b38:
|
||||
str r3, [r2, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02174b70
|
||||
bl func_ov24_02176890
|
||||
@@ -9014,7 +9014,7 @@ func_ov24_02174bc4: ; 0x02174bc4
|
||||
add r1, r4, #0x2b8
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02174c14
|
||||
bl func_ov24_0217692c
|
||||
@@ -9533,7 +9533,7 @@ _02175320:
|
||||
add r1, r4, #0x2b8
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02175368
|
||||
ldr r1, [r4, #0x14]
|
||||
@@ -9592,7 +9592,7 @@ _021753f4:
|
||||
add r1, r4, #0x2b8
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217543c
|
||||
bl func_ov24_0217692c
|
||||
@@ -9889,7 +9889,7 @@ _02175848:
|
||||
str r3, [r2, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217588c
|
||||
bl func_ov24_02176814
|
||||
@@ -10183,7 +10183,7 @@ _02175c84:
|
||||
add r1, r4, #0x2b8
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _02175cc0
|
||||
mov r0, r4
|
||||
@@ -10211,7 +10211,7 @@ _02175cdc:
|
||||
str r3, [r2, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02175d20
|
||||
bl func_ov24_02176814
|
||||
@@ -10259,7 +10259,7 @@ _02175d50:
|
||||
str r3, [r2, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02175eac
|
||||
bl func_ov24_021768b4
|
||||
@@ -10393,7 +10393,7 @@ func_ov24_02175ef4: ; 0x02175ef4
|
||||
str r4, [sp, #0x24]
|
||||
str r3, [sp, #0x28]
|
||||
str r2, [sp, #0x2c]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _02175fe4
|
||||
add lr, sp, #0
|
||||
@@ -11640,7 +11640,7 @@ func_ov24_02176eb8: ; 0x02176eb8
|
||||
add r3, r3, #1
|
||||
strh r3, [r0, #0x5c]
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r0, [r0, #0x129]
|
||||
strneb r0, [r4, #0x129]
|
||||
@@ -11730,7 +11730,7 @@ _02177018:
|
||||
ldr r0, _0217722c ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02177048
|
||||
ldr r1, [r0, #0x48]
|
||||
@@ -11759,7 +11759,7 @@ _02177078:
|
||||
ldr r0, _0217722c ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02177220
|
||||
add r1, r4, #0x300
|
||||
@@ -11803,7 +11803,7 @@ _02177118:
|
||||
ldr r0, _0217722c ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
mov r0, r4
|
||||
bne _02177148
|
||||
@@ -11831,7 +11831,7 @@ _02177164:
|
||||
ldr r0, _0217722c ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _021771b0
|
||||
mov r0, r4
|
||||
@@ -11853,7 +11853,7 @@ _021771d8:
|
||||
ldr r0, _0217722c ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _02177220
|
||||
mov r0, r4
|
||||
@@ -13256,7 +13256,7 @@ func_ov24_02178348: ; 0x02178348
|
||||
mov r2, #7
|
||||
str r3, [sp, #0x30]
|
||||
str r3, [sp, #0x34]
|
||||
bl func_ov00_020c3484
|
||||
bl _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
|
||||
ldr r2, [sp, #0x20]
|
||||
ldr r1, [sp, #0x24]
|
||||
mvn r0, #0
|
||||
@@ -13270,7 +13270,7 @@ func_ov24_02178348: ; 0x02178348
|
||||
str r1, [r6, #0xcc]
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x30
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0xbc
|
||||
bl func_ov00_020c2a0c
|
||||
ldr r1, [sp, #0xbc]
|
||||
@@ -13337,7 +13337,7 @@ _021783f8:
|
||||
str r0, [sp, #0x28]
|
||||
str r0, [sp, #0x2c]
|
||||
add r0, sp, #0x18
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #0x1c]
|
||||
ldr r1, [sp, #0x18]
|
||||
str r0, [sp, #0x2c]
|
||||
@@ -13348,7 +13348,7 @@ _021783f8:
|
||||
ldr r0, _02178690 ; =data_027e0fe4
|
||||
add r1, sp, #0x28
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #0x48]
|
||||
str r1, [sp, #0x5c]
|
||||
ldr r1, [r0, #0x4c]
|
||||
|
||||
+6
-6
@@ -1,6 +1,10 @@
|
||||
#pragma once
|
||||
.extern Divide
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
|
||||
@@ -36,7 +40,7 @@
|
||||
.extern data_027e10b8
|
||||
.extern data_ov00_020e2dd8
|
||||
.extern data_ov00_020e2f04
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e8398
|
||||
.extern data_ov00_020e892c
|
||||
.extern data_ov00_020e8b08
|
||||
@@ -82,7 +86,6 @@
|
||||
.extern func_0203eba8
|
||||
.extern func_0203ebc8
|
||||
.extern func_02042f68
|
||||
.extern strncpy
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -255,10 +258,6 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
@@ -412,3 +411,4 @@
|
||||
.extern func_ov30_02187304
|
||||
.extern func_ov30_02187340
|
||||
.extern gItemManager
|
||||
.extern strncpy
|
||||
|
||||
+56
-56
@@ -164,7 +164,7 @@ _0216d860:
|
||||
blo _0216d860
|
||||
ldr r0, _0216da98 ; =data_027e0fe4
|
||||
mov sb, #0
|
||||
ldr lr, _0216da9c ; =data_ov00_020e72f0
|
||||
ldr lr, _0216da9c ; =_ZTV11ActorFilter
|
||||
add r8, sp, #0x40
|
||||
ldr ip, _0216daa0 ; =0x43425331
|
||||
add r7, sp, #0x54
|
||||
@@ -186,7 +186,7 @@ _0216d860:
|
||||
str sb, [r8, #8]
|
||||
str r7, [sp]
|
||||
str r6, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #8]
|
||||
mov r7, sb
|
||||
cmp r0, #0
|
||||
@@ -198,7 +198,7 @@ _0216d8f0:
|
||||
ldr r1, [sp]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r8, r0
|
||||
bl func_ov25_02173238
|
||||
cmp r0, #0
|
||||
@@ -307,7 +307,7 @@ _0216da7c:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov25_0216d844
|
||||
_0216da98: .word data_027e0fe4
|
||||
_0216da9c: .word data_ov00_020e72f0
|
||||
_0216da9c: .word _ZTV11ActorFilter
|
||||
_0216daa0: .word 0x43425331
|
||||
|
||||
.global func_ov25_0216daa4
|
||||
@@ -1719,7 +1719,7 @@ func_ov25_0216ecf4: ; 0x0216ecf4
|
||||
str r3, [sb, #4]
|
||||
mov r5, #0
|
||||
add r4, sp, #0x98
|
||||
ldr r7, _0216eed4 ; =data_ov00_020e72f0
|
||||
ldr r7, _0216eed4 ; =_ZTV11ActorFilter
|
||||
ldr r6, _0216eed8 ; =0x43425330
|
||||
mov r1, #4
|
||||
add r2, sp, #0x44
|
||||
@@ -1757,7 +1757,7 @@ func_ov25_0216ecf4: ; 0x0216ecf4
|
||||
str r3, [sp, #0x30]
|
||||
str r3, [sp, #0x34]
|
||||
str r4, [sp, #0x74]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mvn r1, #0
|
||||
ldr r0, [sp, #0x40]
|
||||
mov r6, #0
|
||||
@@ -1785,7 +1785,7 @@ _0216edf8:
|
||||
ldr r2, [r2, #4]
|
||||
mov r1, r5
|
||||
str r2, [sp, #4]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
bl func_ov25_0216eee4
|
||||
cmp r0, #0
|
||||
beq _0216ee40
|
||||
@@ -1837,7 +1837,7 @@ _0216eeb4:
|
||||
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
|
||||
.align 2, 0
|
||||
arm_func_end func_ov25_0216ecf4
|
||||
_0216eed4: .word data_ov00_020e72f0
|
||||
_0216eed4: .word _ZTV11ActorFilter
|
||||
_0216eed8: .word 0x43425330
|
||||
_0216eedc: .word data_027e0fe4
|
||||
_0216eee0: .word data_027e0764
|
||||
@@ -4204,7 +4204,7 @@ _02170fd8:
|
||||
ldr r0, _02171350 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r5, #0
|
||||
moveq r6, #0
|
||||
beq _02171058
|
||||
@@ -4398,7 +4398,7 @@ _02171200:
|
||||
add r1, r8, #0x2dc
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r2, #0
|
||||
str r2, [r0, #0x60]
|
||||
ldr r1, _02171340 ; =0x00000266
|
||||
@@ -4429,7 +4429,7 @@ func_ov25_0217135c: ; 0x0217135c
|
||||
add r1, r0, #0x2dc
|
||||
ldr r0, [r2]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -4446,7 +4446,7 @@ func_ov25_02171388: ; 0x02171388
|
||||
add r1, r0, #0x2dc
|
||||
ldr r0, [r2]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021713b8
|
||||
bl func_ov25_02171f00
|
||||
@@ -4469,7 +4469,7 @@ func_ov25_021713c4: ; 0x021713c4
|
||||
add r1, r4, #0x2dc
|
||||
ldr r0, [r2]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #0x48]
|
||||
ldr r2, _02171478 ; =data_027e0764
|
||||
str r1, [r4, #0x694]
|
||||
@@ -4599,7 +4599,7 @@ func_ov25_02171508: ; 0x02171508
|
||||
ldr r0, _021715e8 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x38
|
||||
moveq r0, #0
|
||||
@@ -5522,7 +5522,7 @@ _0217210c:
|
||||
ldr r0, _021721e0 ; =data_027e0fe4
|
||||
add r1, r6, #0x174
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
add r0, r6, #0x60
|
||||
bl func_01ff9cec
|
||||
@@ -6950,7 +6950,7 @@ _02173458: .word data_027e0ff0
|
||||
func_ov25_0217345c: ; 0x0217345c
|
||||
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
sub sp, sp, #0xd4
|
||||
ldr r7, _02173580 ; =data_ov00_020e72f0
|
||||
ldr r7, _02173580 ; =_ZTV11ActorFilter
|
||||
mov r4, #0
|
||||
add r3, sp, #0xc0
|
||||
mvn r5, #0
|
||||
@@ -6984,7 +6984,7 @@ _021734c4:
|
||||
add r1, sp, #0x8c
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mvn r0, #0
|
||||
str r0, [sl]
|
||||
str r0, [sl, #4]
|
||||
@@ -7001,7 +7001,7 @@ _02173518:
|
||||
ldr r0, [fp]
|
||||
add r7, r1, r8
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
bl func_ov25_02178cf0
|
||||
cmp r0, #0
|
||||
@@ -7026,7 +7026,7 @@ _02173564:
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
.align 2, 0
|
||||
arm_func_end func_ov25_0217345c
|
||||
_02173580: .word data_ov00_020e72f0
|
||||
_02173580: .word _ZTV11ActorFilter
|
||||
_02173584: .word 0x53504452
|
||||
_02173588: .word data_027e0fe4
|
||||
|
||||
@@ -7179,7 +7179,7 @@ func_ov25_02173728: ; 0x02173728
|
||||
mov r4, r0
|
||||
mov r7, #0
|
||||
add r6, sp, #0x60
|
||||
ldr lr, _02173a40 ; =data_ov00_020e72f0
|
||||
ldr lr, _02173a40 ; =_ZTV11ActorFilter
|
||||
ldr ip, _02173a44 ; =0x43425331
|
||||
ldr r0, [r1]
|
||||
add r5, sp, #0xc
|
||||
@@ -7208,7 +7208,7 @@ func_ov25_02173728: ; 0x02173728
|
||||
str r5, [sp]
|
||||
str r3, [sp, #4]
|
||||
str r7, [sp, #8]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ble _02173a30
|
||||
ldrh r0, [r4, #0x20]
|
||||
@@ -7230,7 +7230,7 @@ _021737e4:
|
||||
_021737fc:
|
||||
ldr r0, [r7]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrh r1, [r0, #0x20]
|
||||
cmp r1, #3
|
||||
addls pc, pc, r1, lsl #2
|
||||
@@ -7274,7 +7274,7 @@ _02173878:
|
||||
_02173890:
|
||||
ldr r0, [r7]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrh r1, [r0, #0x20]
|
||||
cmp r1, #3
|
||||
addls pc, pc, r1, lsl #2
|
||||
@@ -7318,7 +7318,7 @@ _0217390c:
|
||||
_02173924:
|
||||
ldr r0, [r7]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrh r1, [r0, #0x20]
|
||||
cmp r1, #3
|
||||
addls pc, pc, r1, lsl #2
|
||||
@@ -7362,7 +7362,7 @@ _021739a0:
|
||||
_021739b8:
|
||||
ldr r0, [r7]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrh r1, [r0, #0x20]
|
||||
cmp r1, #3
|
||||
addls pc, pc, r1, lsl #2
|
||||
@@ -7402,7 +7402,7 @@ _02173a30:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov25_02173728
|
||||
_02173a3c: .word data_027e0fe4
|
||||
_02173a40: .word data_ov00_020e72f0
|
||||
_02173a40: .word _ZTV11ActorFilter
|
||||
_02173a44: .word 0x43425331
|
||||
|
||||
.global func_ov25_02173a48
|
||||
@@ -7731,7 +7731,7 @@ _02173e74:
|
||||
str r2, [r4, #0x12c]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r0, #0x48
|
||||
mov r0, r4
|
||||
bl func_ov00_020c2938
|
||||
@@ -7768,7 +7768,7 @@ _02173f0c:
|
||||
add r1, r4, #0x144
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r0, #0x48
|
||||
mov r0, r4
|
||||
bl func_ov00_020c2938
|
||||
@@ -8649,7 +8649,7 @@ _02174aa4:
|
||||
add r1, r4, #0x144
|
||||
ldr r0, [r3]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r0, #0x48
|
||||
add r0, r4, #0x48
|
||||
mov r2, r5
|
||||
@@ -8735,7 +8735,7 @@ _02174d3c:
|
||||
mov r2, #0
|
||||
add r1, sp, #0x214
|
||||
mvn r3, #0
|
||||
ldr r6, _021750ac ; =data_ov00_020e72f0
|
||||
ldr r6, _021750ac ; =_ZTV11ActorFilter
|
||||
ldr r5, _021750b0 ; =0x43425331
|
||||
add r7, sp, #0x160
|
||||
mov r0, #0x10
|
||||
@@ -8764,7 +8764,7 @@ _02174d9c:
|
||||
add r1, sp, #0x1e0
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x154
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x15c]
|
||||
mov r6, #1
|
||||
cmp r0, #0
|
||||
@@ -8777,7 +8777,7 @@ _02174de4:
|
||||
ldr r1, [sp, #0x154]
|
||||
ldr r0, [sb]
|
||||
add r1, r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrb r0, [r0, #0x11c]
|
||||
add r7, r7, #1
|
||||
add r8, r8, #8
|
||||
@@ -8965,7 +8965,7 @@ _0217509c: .word 0x00000bb8
|
||||
_021750a0: .word data_027e0f64
|
||||
_021750a4: .word data_027e0fe4
|
||||
_021750a8: .word data_027e0c68
|
||||
_021750ac: .word data_ov00_020e72f0
|
||||
_021750ac: .word _ZTV11ActorFilter
|
||||
_021750b0: .word 0x43425331
|
||||
_021750b4: .word data_027e0d38
|
||||
_021750b8: .word 0x0000019a
|
||||
@@ -9773,7 +9773,7 @@ func_ov25_02175b08: ; 0x02175b08
|
||||
mov r7, #0
|
||||
add r5, sp, #0x60
|
||||
mov r6, r0
|
||||
ldr lr, _02175c4c ; =data_ov00_020e72f0
|
||||
ldr lr, _02175c4c ; =_ZTV11ActorFilter
|
||||
ldr ip, _02175c50 ; =0x43425330
|
||||
ldr r0, [r1]
|
||||
add r4, sp, #0xc
|
||||
@@ -9802,7 +9802,7 @@ func_ov25_02175b08: ; 0x02175b08
|
||||
str r7, [r5, #8]
|
||||
str r4, [sp]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ldrgt r0, [sp, #8]
|
||||
movgt r4, r7
|
||||
@@ -9814,7 +9814,7 @@ _02175bb8:
|
||||
ldr r1, [sp]
|
||||
ldr r0, [r7]
|
||||
add r1, r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [sp]
|
||||
ldrh r1, [r0, #0x20]
|
||||
ldr r0, [r2, r5]
|
||||
@@ -9838,7 +9838,7 @@ _02175bfc:
|
||||
_02175c14:
|
||||
ldr r0, [r5]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02175c30
|
||||
ldrsh r1, [r4, #0x78]
|
||||
@@ -9853,7 +9853,7 @@ _02175c30:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov25_02175b08
|
||||
_02175c48: .word data_027e0fe4
|
||||
_02175c4c: .word data_ov00_020e72f0
|
||||
_02175c4c: .word _ZTV11ActorFilter
|
||||
_02175c50: .word 0x43425330
|
||||
|
||||
.global func_ov25_02175c54
|
||||
@@ -9923,7 +9923,7 @@ func_ov25_02175d1c: ; 0x02175d1c
|
||||
_02175d2c:
|
||||
ldr r0, [r4]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02175d50
|
||||
bl func_ov25_0216eeec
|
||||
@@ -9951,7 +9951,7 @@ func_ov25_02175d6c: ; 0x02175d6c
|
||||
_02175d7c:
|
||||
ldr r0, [r4]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02175da0
|
||||
bl func_ov25_0216ef14
|
||||
@@ -9979,7 +9979,7 @@ func_ov25_02175dbc: ; 0x02175dbc
|
||||
ldr r1, [r1]
|
||||
ldr r2, _02175e7c ; =0x43425330
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -10015,7 +10015,7 @@ _02175e1c:
|
||||
ldrsh r1, [r4, #0xac]
|
||||
ldr r0, [r5]
|
||||
add r1, r7, r1, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02175e1c
|
||||
add sp, sp, #8
|
||||
@@ -10070,7 +10070,7 @@ _02175f0c:
|
||||
ldr r8, [r6, sb, lsl #2]
|
||||
ldr r0, [fp]
|
||||
add r1, r5, r8, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
strne r8, [r4, r7, lsl #2]
|
||||
add sb, sb, #1
|
||||
@@ -10151,7 +10151,7 @@ func_ov25_02175ff8: ; 0x02175ff8
|
||||
_02176010:
|
||||
ldr r0, [r4]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
add r5, r5, #1
|
||||
addne r6, r6, #1
|
||||
@@ -10169,7 +10169,7 @@ _02176010:
|
||||
_02176054:
|
||||
ldr r0, [r5]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02176070
|
||||
ldrsh r1, [r4, #0x78]
|
||||
@@ -10351,7 +10351,7 @@ _021762d0:
|
||||
_021762e4:
|
||||
ldr r0, [r5]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02176310
|
||||
ldrsh r1, [r4, #0xac]
|
||||
@@ -10525,7 +10525,7 @@ _02176510:
|
||||
add r1, r4, #0x158
|
||||
ldr r0, [r0]
|
||||
add r1, r1, r6, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r5, r0
|
||||
beq _02176554
|
||||
add r2, sp, #0x18
|
||||
@@ -10544,7 +10544,7 @@ _02176554:
|
||||
_02176568:
|
||||
ldr r0, [r5]
|
||||
mov r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02176588
|
||||
bl func_ov25_0216ece0
|
||||
@@ -10632,7 +10632,7 @@ _0217669c:
|
||||
_021766ac:
|
||||
ldr r0, [r8]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r5, r0
|
||||
beq _021766e8
|
||||
add r0, r4, r6, lsl #2
|
||||
@@ -10679,7 +10679,7 @@ _02176744:
|
||||
_02176758:
|
||||
ldr r0, [sb]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217677c
|
||||
add r1, r4, r6, lsl #2
|
||||
@@ -10718,7 +10718,7 @@ _021767d8:
|
||||
_021767e4:
|
||||
ldr r0, [r5]
|
||||
mov r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
beq _02176830
|
||||
bl func_ov25_0216ecb0
|
||||
@@ -10749,7 +10749,7 @@ _02176848:
|
||||
_02176854:
|
||||
ldr r0, [r5]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02176870
|
||||
add r1, r4, #0x1b0
|
||||
@@ -10766,7 +10766,7 @@ _02176870:
|
||||
_02176890:
|
||||
ldr r0, [r5]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021768b4
|
||||
bl func_ov25_0216ecc4
|
||||
@@ -10792,7 +10792,7 @@ _021768c4:
|
||||
_021768ec:
|
||||
ldr r0, [r5]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
beq _02176920
|
||||
add r2, sp, #0
|
||||
@@ -11386,7 +11386,7 @@ _02176ff8:
|
||||
blt _02177050
|
||||
ldr r0, _0217705c ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
moveq r0, #1
|
||||
@@ -11435,7 +11435,7 @@ func_ov25_02177064: ; 0x02177064
|
||||
str r3, [sp, #4]
|
||||
strb lr, [sp, #8]
|
||||
strb r5, [sp, #9]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
addgt sp, sp, #0xc
|
||||
ldmgtia sp!, {r4, r5, pc}
|
||||
|
||||
+2
-2
@@ -318,8 +318,8 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c47cc
|
||||
|
||||
+4
-4
@@ -485,7 +485,7 @@ func_ov26_0216db44: ; 0x0216db44
|
||||
ldr r2, _0216db9c ; =0x43574d42
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -787,7 +787,7 @@ func_ov26_0216de8c: ; 0x0216de8c
|
||||
ldr r2, _0216dee4 ; =0x434f4253
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -12415,7 +12415,7 @@ func_ov26_02176db0: ; 0x02176db0
|
||||
ldr r0, _02176e74 ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x30
|
||||
mvneq r0, #0
|
||||
@@ -12446,7 +12446,7 @@ func_ov26_02176e78: ; 0x02176e78
|
||||
blt _02176f30
|
||||
ldr r0, _02176f38 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
|
||||
+3
-3
@@ -1,5 +1,8 @@
|
||||
#pragma once
|
||||
.extern Divide
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13PlayerControl14IsTouchingFastEv
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -234,9 +237,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5d34
|
||||
|
||||
+13
-13
@@ -239,7 +239,7 @@ _0216d878:
|
||||
ldr r0, _0216da34 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
str r0, [r4, #0x514]
|
||||
addeq sp, sp, #0x38
|
||||
@@ -1340,11 +1340,11 @@ func_ov27_0216ea04: ; 0x0216ea04
|
||||
ldr r2, _0216ea80 ; =0x504c4c42
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0216ea7c ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x518]
|
||||
ldr r1, [sp]
|
||||
mov r0, r4
|
||||
@@ -5171,7 +5171,7 @@ func_ov27_02171e10: ; 0x02171e10
|
||||
ldr r0, _02171f38 ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x38c]
|
||||
_02171eec:
|
||||
mov r0, #8
|
||||
@@ -6491,7 +6491,7 @@ func_ov27_02173124: ; 0x02173124
|
||||
ldr r2, _021731d4 ; =0x4c4e424b
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #8]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -6499,7 +6499,7 @@ func_ov27_02173124: ; 0x02173124
|
||||
ldr r0, _021731d0 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0
|
||||
strb r1, [r0, #0x118]
|
||||
_0217317c:
|
||||
@@ -6511,7 +6511,7 @@ _0217317c:
|
||||
ldr r2, _021731d8 ; =0x50524c44
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -6520,7 +6520,7 @@ _0217317c:
|
||||
ldr r0, _021731d0 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x59c]
|
||||
add sp, sp, #0x10
|
||||
ldmia sp!, {r4, pc}
|
||||
@@ -6872,7 +6872,7 @@ _02173650:
|
||||
ldr r2, _02173708 ; =0x55424c4e
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -6880,7 +6880,7 @@ _02173650:
|
||||
ldr r0, _02173704 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021736dc
|
||||
add r0, r0, #0x100
|
||||
@@ -7388,7 +7388,7 @@ _02173d04:
|
||||
ldr r2, _02173d70 ; =0x50524c44
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #8]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #0xc]
|
||||
@@ -7399,7 +7399,7 @@ _02173d2c:
|
||||
ldr r2, _02173d74 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -12279,7 +12279,7 @@ func_ov27_02177e30: ; 0x02177e30
|
||||
ldr r0, _02177ec8 ; =data_027e0fe4
|
||||
mov r1, r2
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _02177ec0
|
||||
ldr r1, [r0, #4]
|
||||
|
||||
+5
-5
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
.extern Approach_thunk
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -93,9 +95,6 @@
|
||||
.extern func_0203e7b4
|
||||
.extern func_0203eba8
|
||||
.extern func_0203ebc8
|
||||
.extern strcpy
|
||||
.extern strncpy
|
||||
.extern strcat
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -276,8 +275,6 @@
|
||||
.extern func_ov00_020c3180
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
.extern func_ov00_020c47cc
|
||||
@@ -405,3 +402,6 @@
|
||||
.extern func_ov14_0214aa2c
|
||||
.extern gItemManager
|
||||
.extern gOverlayManager
|
||||
.extern strcat
|
||||
.extern strcpy
|
||||
.extern strncpy
|
||||
|
||||
+6
-6
@@ -3652,7 +3652,7 @@ func_ov28_021706b4: ; 0x021706b4
|
||||
ldr r2, _0217070c ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -10053,7 +10053,7 @@ func_ov28_02175748: ; 0x02175748
|
||||
ldr r2, _021757a0 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -12248,7 +12248,7 @@ func_ov28_021774c4: ; 0x021774c4
|
||||
ldr r2, _0217752c ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x184]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -12480,7 +12480,7 @@ _02177798:
|
||||
ldr r0, _021778b4 ; =data_027e0fe4
|
||||
add r1, r5, #0x184
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0, #0x48]
|
||||
add r1, sp, #0
|
||||
str r2, [sp]
|
||||
@@ -12776,10 +12776,10 @@ func_ov28_02177b54: ; 0x02177b54
|
||||
ldr r2, _02177b94 ; =0x46524253
|
||||
add r0, sp, #0
|
||||
mov r1, r4
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
add r1, sp, #0
|
||||
mov r0, r4
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x184]
|
||||
add sp, sp, #8
|
||||
ldmia sp!, {r3, r4, r5, pc}
|
||||
|
||||
+4
-4
@@ -2,6 +2,10 @@
|
||||
.extern Approach_thunk
|
||||
.extern Divide
|
||||
.extern _ZN11ItemManager18func_ov00_020ae4dcEj
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
.extern data_02050f54
|
||||
@@ -269,10 +273,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c3b2c
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+12
-12
@@ -3230,7 +3230,7 @@ func_ov29_02170144: ; 0x02170144
|
||||
add r1, sp, #0
|
||||
mov r2, #0
|
||||
str r3, [sp]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, _0217017c ; =data_ov29_0217a60c
|
||||
mov r1, #0
|
||||
str r1, [r0, #0x20]
|
||||
@@ -3891,7 +3891,7 @@ func_ov29_021709c0: ; 0x021709c0
|
||||
add r1, sp, #0
|
||||
str r2, [r3, #0x20]
|
||||
str r4, [sp]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
add sp, sp, #0x10
|
||||
ldmia sp!, {r3, r4, r5, pc}
|
||||
_02170aa8:
|
||||
@@ -4823,7 +4823,7 @@ _02171744:
|
||||
add r1, sp, #0
|
||||
mov r2, #0
|
||||
str r3, [sp]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldmia sp!, {r3, r4, r5, pc}
|
||||
.align 2, 0
|
||||
arm_func_end func_ov29_02171714
|
||||
@@ -5868,7 +5868,7 @@ func_ov29_02172494: ; 0x02172494
|
||||
add r1, sp, #4
|
||||
str r2, [sp, #8]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #8]
|
||||
cmp r0, #1
|
||||
bge _02172590
|
||||
@@ -5946,7 +5946,7 @@ func_ov29_021725b0: ; 0x021725b0
|
||||
add r1, sp, #4
|
||||
str r2, [sp, #8]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #8]
|
||||
cmp r0, #1
|
||||
bge _021726a0
|
||||
@@ -10551,7 +10551,7 @@ func_ov29_02176558: ; 0x02176558
|
||||
ldr r0, _021765a8 ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
movle r0, #0
|
||||
ldmleia sp!, {r4, pc}
|
||||
@@ -10577,7 +10577,7 @@ func_ov29_021765ac: ; 0x021765ac
|
||||
ldr r0, _021765ec ; =data_027e0fe4
|
||||
mov r1, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3b2c
|
||||
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
movne r0, #0
|
||||
@@ -11067,7 +11067,7 @@ _02176b94:
|
||||
ldr r0, _02176c8c ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov lr, r0
|
||||
add r0, r4, #0x48
|
||||
add ip, sp, #0x44
|
||||
@@ -11723,7 +11723,7 @@ _02177450:
|
||||
ldr r0, _021778c0 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _021778ac ; =data_ov29_0217bce0
|
||||
str r0, [r1]
|
||||
ldr r0, [r1, #0x14]
|
||||
@@ -12964,7 +12964,7 @@ func_ov29_02178514: ; 0x02178514
|
||||
ldr r2, _0217856c ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #4]
|
||||
@@ -13028,11 +13028,11 @@ func_ov29_02178570: ; 0x02178570
|
||||
ldr r2, _0217866c ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _02178668 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x4fc]
|
||||
ldr r1, [r4, #0x18]
|
||||
mov r0, r4
|
||||
|
||||
+5
-5
@@ -30,7 +30,7 @@
|
||||
.extern data_027e0ffc
|
||||
.extern data_027e1038
|
||||
.extern data_027e10b4
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e8398
|
||||
.extern data_ov00_020eec68
|
||||
.extern data_ov00_020eec9c
|
||||
@@ -182,10 +182,10 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c38fc
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+61
-61
@@ -1522,7 +1522,7 @@ func_ov30_0217d054: ; 0x0217d054
|
||||
ldr r0, _0217d094 ; =data_027e0fe4
|
||||
mov r1, r2
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r3, pc}
|
||||
@@ -3557,7 +3557,7 @@ _0217ec2c:
|
||||
str r6, [sp, #0x10]
|
||||
str r6, [sp, #0x14]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x20]
|
||||
mov r5, #0
|
||||
cmp r0, #0
|
||||
@@ -3568,7 +3568,7 @@ _0217ec8c:
|
||||
ldr r1, [sp, #0x18]
|
||||
ldr r0, [r8]
|
||||
add r1, r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r0
|
||||
mov r0, r4
|
||||
add r1, r1, #0x48
|
||||
@@ -4125,7 +4125,7 @@ _0217f3e0:
|
||||
ldr r2, [r0, #4]
|
||||
ldr r0, [r8]
|
||||
str r2, [sp, #4]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r1, r0
|
||||
beq _0217f428
|
||||
mov r0, sl
|
||||
@@ -7334,7 +7334,7 @@ func_ov30_021818b8: ; 0x021818b8
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
add r3, r5, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp, #8]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -7342,7 +7342,7 @@ func_ov30_021818b8: ; 0x021818b8
|
||||
ldr r0, _021819e0 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0x34
|
||||
mov r4, r0
|
||||
bl func_ov00_020c2a0c
|
||||
@@ -7372,13 +7372,13 @@ _0218195c:
|
||||
ldr r2, [ip, r4, lsl #2]
|
||||
mov r0, sl
|
||||
add r3, r5, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, [sp]
|
||||
cmp r0, r6
|
||||
beq _021819cc
|
||||
ldr r0, [r7]
|
||||
mov r1, sl
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r8
|
||||
mov sb, r0
|
||||
bl func_ov00_020c2a0c
|
||||
@@ -8284,7 +8284,7 @@ _021825a0:
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x14
|
||||
add r3, r4, #0x860
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp, #0x14]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -8292,7 +8292,7 @@ _021825a0:
|
||||
ldr r0, _0218262c ; =data_027e0fe4
|
||||
add r1, sp, #0x14
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0x24
|
||||
mov r5, r0
|
||||
bl func_ov00_020c2a0c
|
||||
@@ -8365,7 +8365,7 @@ func_ov30_02182634: ; 0x02182634
|
||||
mov r1, #0
|
||||
add r0, sp, #0x128
|
||||
mvn r2, #0
|
||||
ldr r5, _02182abc ; =data_ov00_020e72f0
|
||||
ldr r5, _02182abc ; =_ZTV11ActorFilter
|
||||
ldr r3, _02182ac0 ; =0x424f4d42
|
||||
str r5, [sp, #0xf4]
|
||||
add r5, sp, #0x74
|
||||
@@ -8396,7 +8396,7 @@ _0218271c:
|
||||
str r3, [sp, #0x70]
|
||||
str r6, [sp, #0x68]
|
||||
str r5, [sp, #0x6c]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x70]
|
||||
mov r5, #0
|
||||
cmp r0, #0
|
||||
@@ -8408,7 +8408,7 @@ _02182778:
|
||||
ldr r1, [sp, #0x68]
|
||||
ldr r0, [r7]
|
||||
add r1, r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r8
|
||||
mov sb, r0
|
||||
bl func_ov00_020c2a0c
|
||||
@@ -8619,7 +8619,7 @@ _02182960:
|
||||
arm_func_end func_ov30_02182634
|
||||
_02182ab4: .word 0x0000ffff
|
||||
_02182ab8: .word data_027e0e60
|
||||
_02182abc: .word data_ov00_020e72f0
|
||||
_02182abc: .word _ZTV11ActorFilter
|
||||
_02182ac0: .word 0x424f4d42
|
||||
_02182ac4: .word data_027e0fe4
|
||||
_02182ac8: .word data_02050f54
|
||||
@@ -9176,7 +9176,7 @@ _021830c8:
|
||||
ldr r0, _02183220 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02183208
|
||||
add r1, sp, #0x38
|
||||
@@ -9198,7 +9198,7 @@ _02183118:
|
||||
ldr r0, _02183220 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02183208
|
||||
ldr r1, [sp, #0x38]
|
||||
@@ -9239,7 +9239,7 @@ _021831b8:
|
||||
ldr r0, _02183220 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02183208
|
||||
ldr r1, [sp, #0x38]
|
||||
@@ -9310,7 +9310,7 @@ _021832a8:
|
||||
ldr r0, _021833e0 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021833c8
|
||||
bl func_ov17_02160974
|
||||
@@ -9329,7 +9329,7 @@ _021832f0:
|
||||
ldr r0, _021833e0 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021833c8
|
||||
mov r2, #0
|
||||
@@ -9367,7 +9367,7 @@ _02183380:
|
||||
ldr r0, _021833e0 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021833c8
|
||||
mov r2, #0
|
||||
@@ -9414,7 +9414,7 @@ func_ov30_021833ec: ; 0x021833ec
|
||||
mov r0, #0
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
|
||||
_02183448:
|
||||
ldr r3, _02183804 ; =data_ov00_020e72f0
|
||||
ldr r3, _02183804 ; =_ZTV11ActorFilter
|
||||
mvn r5, #0
|
||||
mov r6, #0
|
||||
add r1, sp, #0x2a8
|
||||
@@ -9462,7 +9462,7 @@ _021834e0:
|
||||
add r1, sp, #0x274
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x1e8
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x1f0]
|
||||
mov r7, #0
|
||||
cmp r0, #0
|
||||
@@ -9474,7 +9474,7 @@ _02183524:
|
||||
ldr r1, [sp, #0x1e8]
|
||||
ldr r0, [sb]
|
||||
add r1, r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02183578
|
||||
ldrb r1, [r0, #0x11b]
|
||||
@@ -9499,7 +9499,7 @@ _02183578:
|
||||
add r8, r8, #8
|
||||
blt _02183524
|
||||
_0218358c:
|
||||
ldr r7, _02183804 ; =data_ov00_020e72f0
|
||||
ldr r7, _02183804 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x1d4
|
||||
mvn r3, #0
|
||||
@@ -9531,7 +9531,7 @@ _021835e4:
|
||||
add r1, sp, #0x1a0
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x114
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x11c]
|
||||
mov r7, #0
|
||||
cmp r0, #0
|
||||
@@ -9543,7 +9543,7 @@ _02183628:
|
||||
ldr r1, [sp, #0x114]
|
||||
ldr r0, [sb]
|
||||
add r1, r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0218367c
|
||||
ldrb r1, [r0, #0x11b]
|
||||
@@ -9568,7 +9568,7 @@ _0218367c:
|
||||
add r8, r8, #8
|
||||
blt _02183628
|
||||
_02183690:
|
||||
ldr r7, _02183804 ; =data_ov00_020e72f0
|
||||
ldr r7, _02183804 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x100
|
||||
mvn r3, #0
|
||||
@@ -9600,7 +9600,7 @@ _021836e8:
|
||||
add r1, sp, #0xcc
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x40
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x48]
|
||||
mov r7, #0
|
||||
cmp r0, #0
|
||||
@@ -9612,7 +9612,7 @@ _0218372c:
|
||||
ldr r1, [sp, #0x40]
|
||||
ldr r0, [sb]
|
||||
add r1, r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02183774
|
||||
add r0, r0, #0x48
|
||||
@@ -9642,7 +9642,7 @@ _02183788:
|
||||
_0218379c:
|
||||
ldr r0, [r7]
|
||||
mov r1, r8
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r0
|
||||
mov r0, r4
|
||||
add r1, r1, #0x48
|
||||
@@ -9670,7 +9670,7 @@ _021837f4:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov30_021833ec
|
||||
_02183800: .word 0x43485334
|
||||
_02183804: .word data_ov00_020e72f0
|
||||
_02183804: .word _ZTV11ActorFilter
|
||||
_02183808: .word 0x464f5243
|
||||
_0218380c: .word data_027e0fe4
|
||||
_02183810: .word 0x43525953
|
||||
@@ -9685,7 +9685,7 @@ func_ov30_02183818: ; 0x02183818
|
||||
add r1, r5, #0x84
|
||||
ldr r0, [r2]
|
||||
add r1, r1, #0x800
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _021838ec
|
||||
ldr r6, [r5, #0x98]
|
||||
@@ -9757,7 +9757,7 @@ func_ov30_02183904: ; 0x02183904
|
||||
ldr r0, [r3]
|
||||
mov r5, r1
|
||||
add r1, r2, #0x800
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _0218395c
|
||||
add r0, r4, #0x48
|
||||
@@ -9905,7 +9905,7 @@ _02183ab0:
|
||||
str r5, [sp, #0x14]
|
||||
str r5, [sp, #0x18]
|
||||
str r3, [sp, #8]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ldrgt r0, [sp, #0x24]
|
||||
movgt r4, #0
|
||||
@@ -9919,7 +9919,7 @@ _02183b1c:
|
||||
ldr r1, [sp, #0x1c]
|
||||
ldr r0, [r7]
|
||||
add r1, r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrb r1, [r0, #0x11a]
|
||||
add r0, r0, #0x48
|
||||
cmp r1, #0
|
||||
@@ -9985,7 +9985,7 @@ _02183bc8:
|
||||
str r5, [sp, #0x14]
|
||||
str r5, [sp, #0x18]
|
||||
str r3, [sp, #8]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ldrgt r0, [sp, #0x24]
|
||||
movgt r4, #0
|
||||
@@ -9999,7 +9999,7 @@ _02183c34:
|
||||
ldr r1, [sp, #0x1c]
|
||||
ldr r0, [r7]
|
||||
add r1, r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add sl, r0, #0x48
|
||||
bl func_ov30_02182454
|
||||
cmp r0, #0
|
||||
@@ -10480,7 +10480,7 @@ _02184170:
|
||||
ldr r2, [r2, #4]
|
||||
mov r1, fp
|
||||
str r2, [sp, #4]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r5, r0
|
||||
beq _021841d0
|
||||
bl func_ov30_021823c4
|
||||
@@ -10746,7 +10746,7 @@ _02184404:
|
||||
str r0, [sp, #0x10]
|
||||
ldr r0, _0218454c ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r4, r0, #0
|
||||
bne _02184422
|
||||
b _0218452a
|
||||
@@ -10998,7 +10998,7 @@ _02184564:
|
||||
ldr r0, _0218463c ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r5, #0x14]
|
||||
str r1, [r0, #0x48]
|
||||
ldr r1, [r5, #0x18]
|
||||
@@ -11097,7 +11097,7 @@ _021846b0:
|
||||
str r0, [sp, #0x14]
|
||||
ldr r0, _02184730 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _02184720 ; =0x000012a4
|
||||
add r7, #8
|
||||
ldr r1, [r5, r1]
|
||||
@@ -11332,7 +11332,7 @@ _021848f4:
|
||||
add r1, sp, #0x24
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x530
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x534]
|
||||
mov r6, #0
|
||||
str r6, [sp, #0x18]
|
||||
@@ -11346,7 +11346,7 @@ _02184940:
|
||||
ldr r1, [sp, #0x530]
|
||||
ldr r0, [r5]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r7, r0
|
||||
beq _021849b8
|
||||
mov r8, #0
|
||||
@@ -11420,7 +11420,7 @@ _02184a34:
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x1c
|
||||
add r2, r2, #0xa4
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x4a8]
|
||||
mov r6, #0
|
||||
str r6, [sp, #0x14]
|
||||
@@ -11434,7 +11434,7 @@ _02184a84:
|
||||
ldr r1, [sp, #0x4a4]
|
||||
ldr r0, [r5]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r7, r0
|
||||
beq _02184afc
|
||||
mov r8, #0
|
||||
@@ -11486,7 +11486,7 @@ _02184b38:
|
||||
add sp, sp, #0x400
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
_02184b4c:
|
||||
ldr r6, _02185258 ; =data_ov00_020e72f0
|
||||
ldr r6, _02185258 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x490
|
||||
mvn r3, #0
|
||||
@@ -11520,7 +11520,7 @@ _02184ba8:
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x5c
|
||||
add r2, sp, #0x3d0
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x3d4]
|
||||
mov r6, #0
|
||||
str r6, [sp, #0x10]
|
||||
@@ -11534,7 +11534,7 @@ _02184bf8:
|
||||
ldr r1, [sp, #0x3d0]
|
||||
ldr r0, [r5]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r7, r0
|
||||
beq _02184c70
|
||||
mov r8, #0
|
||||
@@ -11586,7 +11586,7 @@ _02184cac:
|
||||
add sp, sp, #0x400
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
_02184cc0:
|
||||
ldr r6, _02185258 ; =data_ov00_020e72f0
|
||||
ldr r6, _02185258 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x3bc
|
||||
mvn r3, #0
|
||||
@@ -11618,7 +11618,7 @@ _02184d18:
|
||||
add r1, sp, #0x388
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x2fc
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x300]
|
||||
mov r6, #0
|
||||
str r6, [sp, #0xc]
|
||||
@@ -11632,7 +11632,7 @@ _02184d64:
|
||||
ldr r1, [sp, #0x2fc]
|
||||
ldr r0, [r5]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r7, r0
|
||||
beq _02184ddc
|
||||
mov r8, #0
|
||||
@@ -11684,7 +11684,7 @@ _02184e18:
|
||||
add sp, sp, #0x400
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
_02184e2c:
|
||||
ldr r6, _02185258 ; =data_ov00_020e72f0
|
||||
ldr r6, _02185258 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x2e8
|
||||
mvn r3, #0
|
||||
@@ -11716,7 +11716,7 @@ _02184e84:
|
||||
add r1, sp, #0x2b4
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x228
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x22c]
|
||||
mov r7, #0
|
||||
str r7, [sp, #8]
|
||||
@@ -11731,7 +11731,7 @@ _02184ed4:
|
||||
ldr r1, [sp, #0x228]
|
||||
ldr r0, [r6]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02184f3c
|
||||
mov r8, fp
|
||||
@@ -11779,7 +11779,7 @@ _02184f78:
|
||||
add sp, sp, #0x400
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
_02184f8c:
|
||||
ldr r6, _02185258 ; =data_ov00_020e72f0
|
||||
ldr r6, _02185258 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x214
|
||||
mvn r3, #0
|
||||
@@ -11811,7 +11811,7 @@ _02184fe4:
|
||||
add r1, sp, #0x1e0
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x154
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x158]
|
||||
mov r7, #0
|
||||
str r7, [sp, #4]
|
||||
@@ -11826,7 +11826,7 @@ _02185034:
|
||||
ldr r1, [sp, #0x154]
|
||||
ldr r0, [r6]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0218509c
|
||||
mov r8, fp
|
||||
@@ -11874,7 +11874,7 @@ _021850d8:
|
||||
add sp, sp, #0x400
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
_021850ec:
|
||||
ldr r6, _02185258 ; =data_ov00_020e72f0
|
||||
ldr r6, _02185258 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x140
|
||||
mvn r3, #0
|
||||
@@ -11906,7 +11906,7 @@ _02185144:
|
||||
add r1, sp, #0x10c
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x80
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x84]
|
||||
mov r7, #0
|
||||
str r7, [sp]
|
||||
@@ -11921,7 +11921,7 @@ _02185194:
|
||||
ldr r1, [sp, #0x80]
|
||||
ldr r0, [r6]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021851fc
|
||||
mov r8, fp
|
||||
@@ -11974,7 +11974,7 @@ _02185240:
|
||||
_0218524c: .word data_ov30_02188b08
|
||||
_02185250: .word data_027e0fe4
|
||||
_02185254: .word data_027e0e60
|
||||
_02185258: .word data_ov00_020e72f0
|
||||
_02185258: .word _ZTV11ActorFilter
|
||||
_0218525c: .word 0x57544352
|
||||
_02185260: .word 0x43485352
|
||||
_02185264: .word 0x43485332
|
||||
|
||||
+1
-1
@@ -166,7 +166,7 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020ceacc
|
||||
|
||||
+4
-4
@@ -1265,28 +1265,28 @@ _0217cdc8:
|
||||
func_ov31_0217cdd8: ; 0x0217cdd8
|
||||
ldr r2, _0217cdf0 ; =data_027e0fe4
|
||||
add r3, r0, #0x70
|
||||
ldr ip, _0217cdf4 ; =func_ov00_020c3674
|
||||
ldr ip, _0217cdf4 ; =_ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r0, [r2]
|
||||
add r1, r3, r1, lsl #3
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end func_ov31_0217cdd8
|
||||
_0217cdf0: .word data_027e0fe4
|
||||
_0217cdf4: .word func_ov00_020c3674
|
||||
_0217cdf4: .word _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global func_ov31_0217cdf8
|
||||
arm_func_start func_ov31_0217cdf8
|
||||
func_ov31_0217cdf8: ; 0x0217cdf8
|
||||
ldr r2, _0217ce10 ; =data_027e0fe4
|
||||
add r3, r0, #0x70
|
||||
ldr ip, _0217ce14 ; =func_ov00_020c3674
|
||||
ldr ip, _0217ce14 ; =_ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r0, [r2]
|
||||
add r1, r3, r1, lsl #3
|
||||
bx ip
|
||||
.align 2, 0
|
||||
arm_func_end func_ov31_0217cdf8
|
||||
_0217ce10: .word data_027e0fe4
|
||||
_0217ce14: .word func_ov00_020c3674
|
||||
_0217ce14: .word _ZN12ActorManager8GetActorEP8ActorRef
|
||||
|
||||
.global func_ov31_0217ce18
|
||||
arm_func_start func_ov31_0217ce18
|
||||
|
||||
+5
-5
@@ -3,6 +3,9 @@
|
||||
.extern Divide
|
||||
.extern _ZN10PlayerBase10SetVisibleEb
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
.extern data_02050f54
|
||||
@@ -39,7 +42,7 @@
|
||||
.extern data_ov00_020e2e3c
|
||||
.extern data_ov00_020e2f04
|
||||
.extern data_ov00_020e2f98
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e9370
|
||||
.extern func_01ff81f8
|
||||
.extern func_01ff8214
|
||||
@@ -85,7 +88,6 @@
|
||||
.extern func_0203e7b4
|
||||
.extern func_0203eba8
|
||||
.extern func_0203ebc8
|
||||
.extern strncpy
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -258,9 +260,6 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
@@ -348,3 +347,4 @@
|
||||
.extern func_ov14_0213b904
|
||||
.extern func_ov14_0213b984
|
||||
.extern func_ov14_0213d480
|
||||
.extern strncpy
|
||||
|
||||
+8
-8
@@ -2924,7 +2924,7 @@ func_ov32_0217e10c: ; 0x0217e10c
|
||||
add r1, r4, #0xec
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x4f4]
|
||||
cmp r0, #0
|
||||
movne r0, #1
|
||||
@@ -4944,7 +4944,7 @@ _0217fbcc:
|
||||
str r0, [r4, #0x404]
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x34
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r0, [r0, #0x129]
|
||||
mov r3, #0
|
||||
@@ -7770,7 +7770,7 @@ func_ov32_021822c0: ; 0x021822c0
|
||||
_021822fc:
|
||||
ldr r0, _02182380 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
moveq r0, #1
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -10255,7 +10255,7 @@ func_ov32_0218439c: ; 0x0218439c
|
||||
mov r4, r0
|
||||
add r3, sp, #0x70
|
||||
mvn r5, #0
|
||||
ldr r7, _02184540 ; =data_ov00_020e72f0
|
||||
ldr r7, _02184540 ; =_ZTV11ActorFilter
|
||||
ldr r6, _02184544 ; =0x42454530
|
||||
ldr r0, [r1]
|
||||
add r1, sp, #0x3c
|
||||
@@ -10270,7 +10270,7 @@ func_ov32_0218439c: ; 0x0218439c
|
||||
str r2, [r3]
|
||||
str r2, [r3, #4]
|
||||
str r2, [r3, #8]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0x18
|
||||
addgt sp, sp, #0x84
|
||||
movgt r0, #0
|
||||
@@ -10283,7 +10283,7 @@ func_ov32_0218439c: ; 0x0218439c
|
||||
add r1, sp, #0x3c
|
||||
mov r2, #0
|
||||
str r3, [sp, #0x48]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #8
|
||||
addgt sp, sp, #0x84
|
||||
movgt r0, #0
|
||||
@@ -10355,7 +10355,7 @@ func_ov32_0218439c: ; 0x0218439c
|
||||
.align 2, 0
|
||||
arm_func_end func_ov32_0218439c
|
||||
_0218453c: .word data_027e0fe4
|
||||
_02184540: .word data_ov00_020e72f0
|
||||
_02184540: .word _ZTV11ActorFilter
|
||||
_02184544: .word 0x42454530
|
||||
_02184548: .word data_02050f54
|
||||
_0218454c: .word 0x0000019a
|
||||
@@ -10601,7 +10601,7 @@ func_ov32_0218477c: ; 0x0218477c
|
||||
ldr r2, [r2, #8]
|
||||
str r2, [r4, #0x68]
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x278]
|
||||
mov r0, #3
|
||||
strb r0, [r4, #0x1a8]
|
||||
|
||||
+2
-2
@@ -136,8 +136,8 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c566c
|
||||
.extern func_ov00_020c5c98
|
||||
|
||||
+4
-4
@@ -2145,11 +2145,11 @@ func_ov33_0217d8c0: ; 0x0217d8c0
|
||||
ldr r2, _0217d934 ; =0x4d524547
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217d930 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
bl func_ov33_0217d218
|
||||
ldr r2, _0217d938 ; =0x04001000
|
||||
ldr r1, [r2]
|
||||
@@ -2178,11 +2178,11 @@ func_ov33_0217d93c: ; 0x0217d93c
|
||||
ldr r2, _0217d978 ; =0x4d524547
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217d974 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
bl func_ov33_0217d2d4
|
||||
add sp, sp, #8
|
||||
ldmia sp!, {r3, pc}
|
||||
|
||||
+2
-2
@@ -172,8 +172,8 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+2
-2
@@ -1237,11 +1237,11 @@ func_ov34_0217ce2c: ; 0x0217ce2c
|
||||
ldr r2, _0217ceac ; =0x54534e4d
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217cea8 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, #0x1000
|
||||
str r0, [r1, #0xd70]
|
||||
ldr r2, [r4, #0x4c]
|
||||
|
||||
+2
-2
@@ -4,6 +4,7 @@
|
||||
.extern _ZN10PlayerBase10SetVisibleEb
|
||||
.extern _ZN11ItemManager12GetItemModelEj
|
||||
.extern _ZN11ItemManager7AddItemEi
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13PlayerControl14CheckTouchFastEj
|
||||
.extern _ZN13PlayerControl14IsTouchingFastEv
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
@@ -91,7 +92,6 @@
|
||||
.extern func_02036ce4
|
||||
.extern func_0203e784
|
||||
.extern func_0203e7b4
|
||||
.extern strncpy
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -231,7 +231,6 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c53b0
|
||||
@@ -298,3 +297,4 @@
|
||||
.extern func_ov17_02168660
|
||||
.extern func_ov17_021687f0
|
||||
.extern gItemManager
|
||||
.extern strncpy
|
||||
|
||||
+14
-14
@@ -186,7 +186,7 @@ _0217bfa0:
|
||||
beq _0217bfc4
|
||||
ldr r0, [r8]
|
||||
mov r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
strneb sb, [r0, #0x118]
|
||||
_0217bfc4:
|
||||
@@ -269,7 +269,7 @@ _0217c0c8:
|
||||
beq _0217c0ec
|
||||
ldr r0, [r8]
|
||||
mov r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
strneb sb, [r0, #0x118]
|
||||
_0217c0ec:
|
||||
@@ -344,7 +344,7 @@ func_ov35_0217c1d4: ; 0x0217c1d4
|
||||
mov sl, r0
|
||||
ldr r0, [r1]
|
||||
add r1, sl, #0x34
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
str r0, [sl, #0x234]
|
||||
addeq sp, sp, #0x48
|
||||
@@ -478,7 +478,7 @@ _0217c3c8:
|
||||
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
ldr r0, [r8]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r2, sl, r7, lsl #2
|
||||
add r1, r7, #1
|
||||
and r7, r1, #0xff
|
||||
@@ -873,7 +873,7 @@ _0217c958:
|
||||
add r1, r7, #0x238
|
||||
ldr r0, [r0]
|
||||
add r1, r1, r2, lsl #3
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x118]
|
||||
@@ -1099,7 +1099,7 @@ _0217cc90:
|
||||
beq _0217ccc8
|
||||
ldr r0, [r7]
|
||||
mov r1, r4
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217ccbc
|
||||
add r1, r6, #0x48
|
||||
@@ -2160,7 +2160,7 @@ func_ov35_0217da38: ; 0x0217da38
|
||||
ldr r0, _0217dab8 ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r1, [r0, #0x563]
|
||||
subne r1, r1, #1
|
||||
@@ -2201,7 +2201,7 @@ func_ov35_0217dac0: ; 0x0217dac0
|
||||
ldr r0, _0217db48 ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r1, [r0, #0x563]
|
||||
subne r1, r1, #1
|
||||
@@ -2296,7 +2296,7 @@ func_ov35_0217db50: ; 0x0217db50
|
||||
ldr r0, _0217dc78 ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r1, [r0, #0x563]
|
||||
addne r1, r1, #1
|
||||
@@ -2327,7 +2327,7 @@ func_ov35_0217dc7c: ; 0x0217dc7c
|
||||
ldr r0, _0217dcec ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217dcdc
|
||||
ldr r0, [r0, #0x130]
|
||||
@@ -2362,7 +2362,7 @@ func_ov35_0217dcf0: ; 0x0217dcf0
|
||||
ldr r0, _0217e2c0 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
addeq sp, sp, #0x10
|
||||
moveq r0, #1
|
||||
@@ -3676,7 +3676,7 @@ _0217ee08:
|
||||
ldr r0, _0217f054 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
str r0, [r4, #0x4e4]
|
||||
addeq sp, sp, #0x3c
|
||||
@@ -3752,7 +3752,7 @@ _0217ef90:
|
||||
ldr r0, _0217f054 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x118]
|
||||
@@ -10150,7 +10150,7 @@ func_ov35_021849dc: ; 0x021849dc
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x34
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x158]
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
|
||||
+3
-3
@@ -224,9 +224,9 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c54a0
|
||||
.extern func_ov00_020c5c2c
|
||||
|
||||
+14
-14
@@ -1655,7 +1655,7 @@ func_ov36_0217d2a0: ; 0x0217d2a0
|
||||
ldr r0, _0217d68c ; =data_027e0fe4
|
||||
add r1, sp, #0xc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x6b8]
|
||||
_0217d368:
|
||||
ldr r7, [r5, #0x6b8]
|
||||
@@ -2731,7 +2731,7 @@ _0217e2dc:
|
||||
ldr r2, _0217e3d8 ; =0x504c444d
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x18
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #0x18]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -2739,7 +2739,7 @@ _0217e2dc:
|
||||
ldr r0, _0217e3d4 ; =data_027e0fe4
|
||||
add r1, sp, #0x18
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x6b4]
|
||||
_0217e314:
|
||||
mvn r3, #0
|
||||
@@ -2758,13 +2758,13 @@ _0217e314:
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x2c
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
beq _0217e37c
|
||||
ldr r0, _0217e3d4 ; =data_027e0fe4
|
||||
ldr r1, [sp, #0x2c]
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x11a]
|
||||
@@ -3193,7 +3193,7 @@ _0217e934:
|
||||
ldr r0, _0217eb40 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #4]
|
||||
ldr r0, _0217eb44 ; =0x504c444d
|
||||
cmp r1, r0
|
||||
@@ -4078,7 +4078,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x70
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r1, [sp, #0xc]
|
||||
mov r0, r6
|
||||
cmp r1, r0
|
||||
@@ -4086,7 +4086,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
|
||||
ldr r0, _0217f96c ; =data_027e0fe4
|
||||
mov r1, r4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x6bc]
|
||||
ldrb r0, [r5, #0xa4]
|
||||
cmp r0, #0
|
||||
@@ -5920,7 +5920,7 @@ _02180f44:
|
||||
add r1, r5, #0x18
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x800
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _02181000
|
||||
ldrh r1, [r4, #0x78]
|
||||
@@ -8520,7 +8520,7 @@ func_ov36_02183504: ; 0x02183504
|
||||
ldr r2, _02183a0c ; =0x424d5459
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #8]
|
||||
str r0, [r5, #0x810]
|
||||
ldr r0, [sp, #0xc]
|
||||
@@ -8531,7 +8531,7 @@ _0218354c:
|
||||
ldr r0, _02183a08 ; =data_027e0fe4
|
||||
add r1, r5, #0x810
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r4, r0
|
||||
beq _021839f4
|
||||
add r0, r5, #0x48
|
||||
@@ -9930,7 +9930,7 @@ func_ov36_02184938: ; 0x02184938
|
||||
ldr r2, _021849e0 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #8]
|
||||
add r3, sp, #8
|
||||
str r0, [r4, #0x7dc]
|
||||
@@ -9947,7 +9947,7 @@ func_ov36_02184938: ; 0x02184938
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x10
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
beq _021849d0
|
||||
ldr r1, [sp, #0x10]
|
||||
@@ -12003,7 +12003,7 @@ _021865a4:
|
||||
ldr r0, _02186640 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021865e4
|
||||
bl func_ov36_02185410
|
||||
|
||||
+2
-2
@@ -4,6 +4,8 @@
|
||||
.extern _ZN10PlayerBase10SetVisibleEb
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
|
||||
.extern _ZN11ItemManager12GetItemModelEj
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
.extern data_02050f54
|
||||
@@ -195,8 +197,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+18
-18
@@ -915,7 +915,7 @@ _0217c978:
|
||||
ldr r0, _0217cbe4 ; =data_027e0fe4
|
||||
mov r1, r6
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r5, r0
|
||||
add r0, r8, r4
|
||||
add r0, r0, #0x2000
|
||||
@@ -1009,7 +1009,7 @@ _0217cadc:
|
||||
ldr r0, _0217cbe4 ; =data_027e0fe4
|
||||
mov r1, r7
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r6, r0
|
||||
add r0, r8, #0x21c
|
||||
mov r1, sl
|
||||
@@ -4243,7 +4243,7 @@ func_ov37_0217f8a4: ; 0x0217f8a4
|
||||
_0217f8bc:
|
||||
ldr r0, [r4]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
add r6, r6, #1
|
||||
strneb r5, [r0, #0x118]
|
||||
@@ -4312,7 +4312,7 @@ func_ov37_0217f980: ; 0x0217f980
|
||||
_0217f998:
|
||||
ldr r0, [r4]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
add r6, r6, #1
|
||||
strneb r5, [r0, #0x118]
|
||||
@@ -4355,7 +4355,7 @@ func_ov37_0217f9c4: ; 0x0217f9c4
|
||||
ldr r0, _0217fa88 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, #0x2000
|
||||
str r0, [r1, #0xf98]
|
||||
add r1, sp, #4
|
||||
@@ -4369,7 +4369,7 @@ func_ov37_0217f9c4: ; 0x0217f9c4
|
||||
ldr r0, _0217fa88 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, #0x2000
|
||||
str r0, [r1, #0xf9c]
|
||||
add sp, sp, #0x38
|
||||
@@ -4432,7 +4432,7 @@ func_ov37_0217fab8: ; 0x0217fab8
|
||||
add r1, r4, #0x2ec
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x2c00
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, #0x2000
|
||||
ldr r1, [r1, #0xfa8]
|
||||
cmp r1, #1
|
||||
@@ -4473,7 +4473,7 @@ func_ov37_0217fbac: ; 0x0217fbac
|
||||
add r1, r0, #0x2ec
|
||||
ldr r0, [r2]
|
||||
add r1, r1, #0x2c00
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x118]
|
||||
@@ -4516,7 +4516,7 @@ func_ov37_0217fbd8: ; 0x0217fbd8
|
||||
ldr r0, _0217fcb4 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0217fc6c
|
||||
mov r1, r5
|
||||
@@ -11819,7 +11819,7 @@ _021861b4:
|
||||
ldr r0, _0218620c ; =data_027e0fe4
|
||||
mov r1, r2
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _02186200
|
||||
ldr r2, [r0, #4]
|
||||
@@ -11913,7 +11913,7 @@ func_ov37_021862d0: ; 0x021862d0
|
||||
add r1, r4, #4
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _02186300
|
||||
bl func_ov00_020c3180
|
||||
@@ -11968,7 +11968,7 @@ func_ov37_02186390: ; 0x02186390
|
||||
add r1, r4, #4
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021863c0
|
||||
bl func_ov00_020c3180
|
||||
@@ -12104,7 +12104,7 @@ func_ov37_02186458: ; 0x02186458
|
||||
add r1, r4, #4
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, #0x1a
|
||||
add r0, r4, #0x48
|
||||
add r1, r1, #0x400
|
||||
@@ -12242,7 +12242,7 @@ func_ov37_02186720: ; 0x02186720
|
||||
ldr r0, _02186850 ; =data_027e0fe4
|
||||
add r1, r4, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0x38
|
||||
add r0, r0, #0x48
|
||||
bl func_ov00_020ce2f0
|
||||
@@ -12974,7 +12974,7 @@ _021870d0:
|
||||
add r1, r5, #4
|
||||
ldr r0, [r0]
|
||||
add r1, r1, #0x400
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r3, sp, #0x44
|
||||
add r1, r5, #0x48
|
||||
mov r4, r0
|
||||
@@ -13382,7 +13382,7 @@ _021876bc:
|
||||
ldr r0, _02187744 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r2, r0, #0x2000
|
||||
mov r3, #1
|
||||
mov r0, r5
|
||||
@@ -13396,7 +13396,7 @@ _02187700:
|
||||
ldr r0, _02187744 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r2, r0, #0x2000
|
||||
mov r3, #1
|
||||
mov r0, r5
|
||||
@@ -13482,7 +13482,7 @@ func_ov37_021877c0: ; 0x021877c0
|
||||
ldr r0, _021878a0 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs ip, r0
|
||||
beq _0218786c
|
||||
add r7, sp, #0x10
|
||||
|
||||
+2
-2
@@ -200,8 +200,8 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+23
-23
@@ -162,11 +162,11 @@ func_ov38_0217bf48: ; 0x0217bf48
|
||||
ldr r2, _0217c034 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217c030 ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #1
|
||||
strb r1, [r0, #0x28d]
|
||||
strb r1, [r0, #0x3c1]
|
||||
@@ -178,7 +178,7 @@ func_ov38_0217bf48: ; 0x0217bf48
|
||||
ldr r2, _0217c03c ; =0x57534e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217c030 ; =data_027e0fe4
|
||||
ldr r3, [sp, #8]
|
||||
ldr r2, [sp, #0xc]
|
||||
@@ -186,14 +186,14 @@ func_ov38_0217bf48: ; 0x0217bf48
|
||||
add r1, sp, #0x10
|
||||
str r3, [sp, #0x10]
|
||||
str r2, [sp, #0x14]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #1
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r1, _0217c030 ; =data_027e0fe4
|
||||
ldr r2, _0217c040 ; =0x46434e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #4]
|
||||
ldr r1, [sp]
|
||||
str r0, [sp, #0x14]
|
||||
@@ -201,7 +201,7 @@ func_ov38_0217bf48: ; 0x0217bf48
|
||||
str r1, [sp, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #1
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r0, _0217c044 ; =data_ov00_020eec9c
|
||||
@@ -234,11 +234,11 @@ func_ov38_0217c050: ; 0x0217c050
|
||||
ldr r2, _0217c12c ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217c128 ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0
|
||||
strb r1, [r0, #0x28d]
|
||||
strb r1, [r0, #0x3c1]
|
||||
@@ -246,7 +246,7 @@ func_ov38_0217c050: ; 0x0217c050
|
||||
ldr r2, _0217c130 ; =0x57534e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217c128 ; =data_027e0fe4
|
||||
ldr r3, [sp, #8]
|
||||
ldr r2, [sp, #0xc]
|
||||
@@ -254,14 +254,14 @@ func_ov38_0217c050: ; 0x0217c050
|
||||
add r1, sp, #0x10
|
||||
str r3, [sp, #0x10]
|
||||
str r2, [sp, #0x14]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r1, _0217c128 ; =data_027e0fe4
|
||||
ldr r2, _0217c134 ; =0x46434e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #4]
|
||||
ldr r1, [sp]
|
||||
str r0, [sp, #0x14]
|
||||
@@ -269,7 +269,7 @@ func_ov38_0217c050: ; 0x0217c050
|
||||
str r1, [sp, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r0, _0217c138 ; =data_ov00_020eec9c
|
||||
@@ -1584,7 +1584,7 @@ _0217d30c:
|
||||
bl func_ov00_020c4048
|
||||
ldr r0, [fp]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, sb, lsl #2]
|
||||
str sl, [r0, #0x204]
|
||||
add sb, sb, #1
|
||||
@@ -1642,17 +1642,17 @@ _0217d360:
|
||||
ldr r2, _0217d55c ; =0x42524d31
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0xc
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217d550 ; =data_027e0fe4
|
||||
add r1, sp, #0xc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [sl, #0xff4]
|
||||
ldr r1, _0217d550 ; =data_027e0fe4
|
||||
ldr r2, _0217d560 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #4
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217d550 ; =data_027e0fe4
|
||||
ldr r3, [sp, #4]
|
||||
ldr r2, [sp, #8]
|
||||
@@ -1660,7 +1660,7 @@ _0217d360:
|
||||
add r1, sp, #0xc
|
||||
str r3, [sp, #0xc]
|
||||
str r2, [sp, #0x10]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [sl, #0xff8]
|
||||
mov r0, sl
|
||||
mov r1, #0
|
||||
@@ -9405,7 +9405,7 @@ func_ov38_02184120: ; 0x02184120
|
||||
ldr r0, _021841dc ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add sp, sp, #0x48
|
||||
ldmia sp!, {r4, pc}
|
||||
.align 2, 0
|
||||
@@ -9443,7 +9443,7 @@ func_ov38_021841e0: ; 0x021841e0
|
||||
ldr r0, _02184258 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r4, [r0, #0x244]
|
||||
add sp, sp, #0x38
|
||||
ldmia sp!, {r4, pc}
|
||||
@@ -9641,7 +9641,7 @@ _0218446c:
|
||||
ldr r0, _02184570 ; =data_027e0fe4
|
||||
add r1, sp, #0x20
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r7
|
||||
bl func_ov29_02170e98
|
||||
ldr r0, [sp, #8]
|
||||
@@ -10035,7 +10035,7 @@ func_ov38_02184a18: ; 0x02184a18
|
||||
ldr r0, _02184ba0 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0xff0]
|
||||
ldr r2, _02184ba4 ; =data_027e0d0c
|
||||
ldr lr, _02184ba8 ; =0x0000119a
|
||||
@@ -13777,11 +13777,11 @@ func_ov38_021880d8: ; 0x021880d8
|
||||
ldr r2, _02188190 ; =0x4e564d4d
|
||||
ldr r1, [r0]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0218818c ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r3, _02188188 ; =data_ov38_02189438
|
||||
ldr r1, _02188194 ; =0xfffff99a
|
||||
str r0, [r3]
|
||||
|
||||
+3
-3
@@ -4,6 +4,8 @@
|
||||
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
|
||||
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13PlayerControl14IsTouchingFastEv
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -84,7 +86,6 @@
|
||||
.extern func_02038718
|
||||
.extern func_0203e784
|
||||
.extern func_0203e7b4
|
||||
.extern strncpy
|
||||
.extern func_0204f614
|
||||
.extern func_0204f754
|
||||
.extern func_0204f8d4
|
||||
@@ -210,8 +211,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5c2c
|
||||
@@ -262,3 +261,4 @@
|
||||
.extern func_ov29_02177ff0
|
||||
.extern func_ov29_02178060
|
||||
.extern gItemManager
|
||||
.extern strncpy
|
||||
|
||||
+15
-15
@@ -44,11 +44,11 @@ func_ov39_0217bdc8: ; 0x0217bdc8
|
||||
ldr r2, _0217bf10 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217bf0c ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #1
|
||||
strb r1, [r0, #0x28d]
|
||||
strb r1, [r0, #0x3c1]
|
||||
@@ -60,7 +60,7 @@ func_ov39_0217bdc8: ; 0x0217bdc8
|
||||
ldr r2, _0217bf18 ; =0x57534e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #0xc]
|
||||
ldr r1, [sp, #8]
|
||||
str r0, [sp, #0x14]
|
||||
@@ -68,14 +68,14 @@ func_ov39_0217bdc8: ; 0x0217bdc8
|
||||
str r1, [sp, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #1
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r1, _0217bf0c ; =data_027e0fe4
|
||||
ldr r2, _0217bf1c ; =0x46434e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #4]
|
||||
ldr r1, [sp]
|
||||
str r0, [sp, #0x14]
|
||||
@@ -83,7 +83,7 @@ func_ov39_0217bdc8: ; 0x0217bdc8
|
||||
str r1, [sp, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #1
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r0, _0217bf20 ; =data_ov00_020eec9c
|
||||
@@ -141,11 +141,11 @@ func_ov39_0217bf30: ; 0x0217bf30
|
||||
ldr r1, [r1]
|
||||
ldr r2, _0217c020 ; =0x4e415649
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217c01c ; =data_027e0fe4
|
||||
add r1, sp, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0
|
||||
strb r1, [r0, #0x28d]
|
||||
strb r1, [r0, #0x3c1]
|
||||
@@ -153,7 +153,7 @@ func_ov39_0217bf30: ; 0x0217bf30
|
||||
ldr r2, _0217c024 ; =0x57534e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217c01c ; =data_027e0fe4
|
||||
ldr r1, [sp, #8]
|
||||
ldr r2, [sp, #0xc]
|
||||
@@ -161,14 +161,14 @@ func_ov39_0217bf30: ; 0x0217bf30
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x10
|
||||
str r2, [sp, #0x14]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r1, _0217c01c ; =data_027e0fe4
|
||||
ldr r2, _0217c028 ; =0x46434e56
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #4]
|
||||
ldr r1, [sp]
|
||||
str r0, [sp, #0x14]
|
||||
@@ -176,7 +176,7 @@ func_ov39_0217bf30: ; 0x0217bf30
|
||||
str r1, [sp, #0x10]
|
||||
ldr r0, [r0]
|
||||
add r1, sp, #0x10
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0
|
||||
strb r1, [r0, #0x28d]
|
||||
ldr r0, _0217c02c ; =data_ov00_020eec9c
|
||||
@@ -1704,7 +1704,7 @@ func_ov39_0217d210: ; 0x0217d210
|
||||
ldr r0, _0217d530 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x284]
|
||||
_0217d46c:
|
||||
add r0, r4, #0x7c
|
||||
@@ -1791,11 +1791,11 @@ func_ov39_0217d534: ; 0x0217d534
|
||||
ldr r2, _0217d5d0 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, _0217d5cc ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x280]
|
||||
add sp, sp, #0x14
|
||||
ldmia sp!, {r3, r4, pc}
|
||||
|
||||
+2
-2
@@ -312,8 +312,8 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c42d8
|
||||
.extern func_ov00_020c4588
|
||||
|
||||
+10
-10
@@ -4840,7 +4840,7 @@ _0217fb0c:
|
||||
ldr r1, [r0]
|
||||
add r0, sp, #4
|
||||
mov r2, r4
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #4]
|
||||
mvn r0, #0
|
||||
str r1, [r5, #0xdc]
|
||||
@@ -4872,7 +4872,7 @@ _0217fb98:
|
||||
ldr r0, _0217fbcc ; =data_027e0fe4
|
||||
add r1, r5, #0xdc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add sp, sp, #0x7c
|
||||
ldmia sp!, {r4, r5, pc}
|
||||
.align 2, 0
|
||||
@@ -4896,7 +4896,7 @@ func_ov40_0217fbd0: ; 0x0217fbd0
|
||||
ldr r2, _0217fc00 ; =data_027e0fe4
|
||||
add r1, r0, #0xdc
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x118]
|
||||
@@ -4994,7 +4994,7 @@ func_ov40_0217fd14: ; 0x0217fd14
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0xdc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov lr, #0
|
||||
mov ip, #1
|
||||
mov r3, #2
|
||||
@@ -5063,7 +5063,7 @@ func_ov40_0217fe04: ; 0x0217fe04
|
||||
ldr r0, _0217fe70 ; =data_027e0fe4
|
||||
add r1, r4, #0xdc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r1, #0
|
||||
strneb r1, [r0, #0x118]
|
||||
@@ -5098,7 +5098,7 @@ func_ov40_0217fe74: ; 0x0217fe74
|
||||
ldr r2, _0217febc ; =data_027e0fe4
|
||||
add r1, r0, #0xdc
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
mvneq r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
@@ -5127,7 +5127,7 @@ func_ov40_0217fec0: ; 0x0217fec0
|
||||
ldr r2, _0217ff1c ; =data_027e0fe4
|
||||
add r1, r0, #0xdc
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
ldmeqia sp!, {r3, r4, r5, pc}
|
||||
@@ -5154,7 +5154,7 @@ func_ov40_0217ff20: ; 0x0217ff20
|
||||
ldr r2, _0217ff70 ; =data_027e0fe4
|
||||
add r1, r0, #0xdc
|
||||
ldr r0, [r2]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
moveq r0, #0
|
||||
ldmeqia sp!, {r3, r4, r5, pc}
|
||||
@@ -5178,7 +5178,7 @@ func_ov40_0217ff74: ; 0x0217ff74
|
||||
ldr r0, _0218005c ; =data_027e0fe4
|
||||
add r1, r4, #0xdc
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov lr, #0
|
||||
mov ip, #1
|
||||
mov r3, #2
|
||||
@@ -5241,7 +5241,7 @@ func_ov40_02180060: ; 0x02180060
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0xdc
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0218008c
|
||||
ldr r1, [r0]
|
||||
|
||||
+2
-2
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -176,8 +178,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c47cc
|
||||
|
||||
+9
-9
@@ -381,7 +381,7 @@ _02189a34:
|
||||
ldr r2, _02189b04 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x18
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #0x18]
|
||||
ldr r1, _02189b00 ; =data_027e0fe4
|
||||
str r0, [r4, #0x180]
|
||||
@@ -390,7 +390,7 @@ _02189a34:
|
||||
str r2, [r4, #0x184]
|
||||
ldr r1, [r1]
|
||||
ldr r2, _02189b08 ; =0x4c4e424b
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r2, [sp, #8]
|
||||
ldr r1, [sp, #0xc]
|
||||
mvn r0, #0
|
||||
@@ -402,7 +402,7 @@ _02189a34:
|
||||
ldr r2, _02189b0c ; =0x4c4e4232
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
ldr r0, [sp, #4]
|
||||
str r1, [sp, #0x18]
|
||||
@@ -418,7 +418,7 @@ _02189ac0:
|
||||
ldr r2, _02189b04 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #0x10]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #0x14]
|
||||
@@ -886,7 +886,7 @@ func_ov41_0218a064: ; 0x0218a064
|
||||
ldr r1, [r1]
|
||||
ldr r2, _0218a0a4 ; =0x4e415649
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mov r0, #1
|
||||
str r1, [r4, #0x180]
|
||||
@@ -3215,7 +3215,7 @@ _0218be84:
|
||||
ldr r0, _0218bf0c ; =data_027e0fe4
|
||||
mov r1, sb
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0218bef4
|
||||
ldrb r1, [r0, #0x1f8]
|
||||
@@ -3390,7 +3390,7 @@ func_ov41_0218c0dc: ; 0x0218c0dc
|
||||
_0218c0ec:
|
||||
ldr r0, [r4]
|
||||
mov r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0218c104
|
||||
bl func_ov00_020c3180
|
||||
@@ -3534,7 +3534,7 @@ func_ov41_0218c204: ; 0x0218c204
|
||||
ldr r0, _0218c3cc ; =data_027e0fe4
|
||||
add r1, r4, #0x530
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0218c374
|
||||
ldrb r1, [r4, #0x52b]
|
||||
@@ -4009,7 +4009,7 @@ func_ov41_0218c834: ; 0x0218c834
|
||||
ldr r0, _0218cbe8 ; =data_027e0fe4
|
||||
add r1, r1, #0x400
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _0218cbec ; =data_027e0e60
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
|
||||
+3
-3
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
.extern _ZN11ItemManager13ForceEquipItemEi
|
||||
.extern _ZN11ItemManager20ClearForcedEquipItemEv
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -63,8 +64,6 @@
|
||||
.extern func_020385b8
|
||||
.extern func_0203e784
|
||||
.extern func_0203e7b4
|
||||
.extern strcpy
|
||||
.extern strcat
|
||||
.extern func_0204f8d4
|
||||
.extern func_ov00_0207a1c8
|
||||
.extern func_ov00_0207bb1c
|
||||
@@ -125,7 +124,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5f1c
|
||||
@@ -189,3 +187,5 @@
|
||||
.extern func_ov14_0214a92c
|
||||
.extern func_ov14_0214aa0c
|
||||
.extern gItemManager
|
||||
.extern strcat
|
||||
.extern strcpy
|
||||
|
||||
+7
-7
@@ -503,7 +503,7 @@ func_ov42_02189b84: ; 0x02189b84
|
||||
_02189ba0:
|
||||
ldr r0, [r5]
|
||||
mov r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
strneb r7, [r0, #0x118]
|
||||
add r0, r4, r8, lsl #3
|
||||
@@ -521,7 +521,7 @@ _02189ba0:
|
||||
_02189be4:
|
||||
ldr r0, [r5]
|
||||
mov r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
strneb r7, [r0, #0x118]
|
||||
add r0, r4, r8, lsl #3
|
||||
@@ -812,7 +812,7 @@ _02189f54:
|
||||
_02189fc0:
|
||||
ldr r0, [r4]
|
||||
mov r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r8, r0
|
||||
ldr r1, [r8, #0x204]
|
||||
cmp r1, #0
|
||||
@@ -833,7 +833,7 @@ _02189fe4:
|
||||
ldr r0, _0218a058 ; =data_027e0fe4
|
||||
add r1, sl, #0x10
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
ldr r1, [r4, #0x204]
|
||||
cmp r1, #0
|
||||
@@ -1329,7 +1329,7 @@ func_ov42_0218a63c: ; 0x0218a63c
|
||||
_0218a678:
|
||||
ldr r0, [sl]
|
||||
mov r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #0x204]
|
||||
cmp r1, #0
|
||||
bne _0218a6b8
|
||||
@@ -1359,7 +1359,7 @@ _0218a6c8:
|
||||
_0218a6dc:
|
||||
ldr r0, [r4]
|
||||
mov r1, r7
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #0x204]
|
||||
cmp r1, #0
|
||||
bne _0218a71c
|
||||
@@ -3831,7 +3831,7 @@ func_ov42_0218c644: ; 0x0218c644
|
||||
ldr r0, _0218c68c ; =data_027e0fe4
|
||||
add r1, r4, #0x15c
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldmeqia sp!, {r4, pc}
|
||||
mov r1, #0
|
||||
|
||||
+4
-4
@@ -21,7 +21,7 @@
|
||||
.extern data_027e0fe8
|
||||
.extern data_027e0fec
|
||||
.extern data_027e0ffc
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e9370
|
||||
.extern data_ov00_020eec9c
|
||||
.extern func_01ff9958
|
||||
@@ -120,9 +120,9 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c3894
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
|
||||
+23
-23
@@ -291,7 +291,7 @@ func_ov43_02189904: ; 0x02189904
|
||||
ldr r1, [r0]
|
||||
ldr r2, _021899a4 ; =0x504c4c42
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -299,7 +299,7 @@ func_ov43_02189904: ; 0x02189904
|
||||
ldr r0, _021899a0 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r1, [r0, #0x5ad]
|
||||
subne r1, r1, #1
|
||||
@@ -340,7 +340,7 @@ func_ov43_021899ac: ; 0x021899ac
|
||||
ldr r1, [r0]
|
||||
ldr r2, _02189a54 ; =0x504c4c42
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -348,7 +348,7 @@ func_ov43_021899ac: ; 0x021899ac
|
||||
ldr r0, _02189a50 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r1, [r0, #0x5ad]
|
||||
subne r1, r1, #1
|
||||
@@ -391,7 +391,7 @@ func_ov43_02189a5c: ; 0x02189a5c
|
||||
ldr r1, [r0]
|
||||
ldr r2, _02189afc ; =0x504c4c42
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -399,7 +399,7 @@ func_ov43_02189a5c: ; 0x02189a5c
|
||||
ldr r0, _02189af8 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldrneb r1, [r0, #0x5ad]
|
||||
subne r1, r1, #1
|
||||
@@ -744,7 +744,7 @@ _02189ebc:
|
||||
blo _02189ebc
|
||||
ldr r0, _02189f94 ; =data_027e0fe4
|
||||
mov r7, #0
|
||||
ldr lr, _02189f98 ; =data_ov00_020e72f0
|
||||
ldr lr, _02189f98 ; =_ZTV11ActorFilter
|
||||
add r5, sp, #0x40
|
||||
ldr ip, _02189f9c ; =0x50424c4e
|
||||
add r4, sp, #0x54
|
||||
@@ -766,7 +766,7 @@ _02189ebc:
|
||||
str r7, [r5, #8]
|
||||
str r4, [sp]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ldrgt r0, [sp, #8]
|
||||
movgt r4, r7
|
||||
@@ -779,7 +779,7 @@ _02189f54:
|
||||
ldr r1, [sp]
|
||||
ldr r0, [r7]
|
||||
add r1, r1, r5
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrh r2, [r6, #0x20]
|
||||
ldrh r1, [r0, #0x20]
|
||||
cmp r2, r1
|
||||
@@ -796,7 +796,7 @@ _02189f78:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov43_02189ea4
|
||||
_02189f94: .word data_027e0fe4
|
||||
_02189f98: .word data_ov00_020e72f0
|
||||
_02189f98: .word _ZTV11ActorFilter
|
||||
_02189f9c: .word 0x50424c4e
|
||||
|
||||
.global func_ov43_02189fa0
|
||||
@@ -816,7 +816,7 @@ _02189fb8:
|
||||
blo _02189fb8
|
||||
ldr r0, _0218a0ec ; =data_027e0fe4
|
||||
mov r4, #0
|
||||
ldr ip, _0218a0f0 ; =data_ov00_020e72f0
|
||||
ldr ip, _0218a0f0 ; =_ZTV11ActorFilter
|
||||
add r6, sp, #0x40
|
||||
ldr r8, _0218a0f4 ; =0x50424c4e
|
||||
add r5, sp, #0x54
|
||||
@@ -838,7 +838,7 @@ _02189fb8:
|
||||
str r4, [r6, #8]
|
||||
str r5, [sp]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
ldrgt r0, [sp, #8]
|
||||
movgt r5, r4
|
||||
@@ -850,7 +850,7 @@ _0218a04c:
|
||||
ldr r1, [sp]
|
||||
ldr r0, [r8]
|
||||
add r1, r1, r6
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldrh r1, [r7, #0x20]
|
||||
ldrh r0, [r0, #0x20]
|
||||
add r5, r5, #1
|
||||
@@ -895,7 +895,7 @@ _0218a0dc:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov43_02189fa0
|
||||
_0218a0ec: .word data_027e0fe4
|
||||
_0218a0f0: .word data_ov00_020e72f0
|
||||
_0218a0f0: .word _ZTV11ActorFilter
|
||||
_0218a0f4: .word 0x50424c4e
|
||||
_0218a0f8: .word data_027e0ffc
|
||||
_0218a0fc: .word 0x000003ad
|
||||
@@ -2579,7 +2579,7 @@ func_ov43_0218b720: ; 0x0218b720
|
||||
ldr r2, _0218b7b4 ; =0x50574253
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -2588,7 +2588,7 @@ func_ov43_0218b720: ; 0x0218b720
|
||||
ldr r0, _0218b7b0 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r4, #0x3bc]
|
||||
ldr r0, [r0, #0x4c]
|
||||
str r0, [r4, #0x4c]
|
||||
@@ -2654,7 +2654,7 @@ _0218b820:
|
||||
ldr r2, _0218ba18 ; =0x50574253
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #8]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -2662,7 +2662,7 @@ _0218b820:
|
||||
ldr r0, _0218ba14 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x3bc]
|
||||
ldr r0, [r0, #0x6b4]
|
||||
str r0, [r5, #0x3c0]
|
||||
@@ -2688,7 +2688,7 @@ _0218b8c8:
|
||||
ldr r2, _0218ba1c ; =0x504c444d
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r2, [sp]
|
||||
ldr r1, [sp, #4]
|
||||
mvn r0, #0
|
||||
@@ -2699,7 +2699,7 @@ _0218b8c8:
|
||||
ldr r0, _0218ba14 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
str r0, [r5, #0x3c0]
|
||||
b _0218b9fc
|
||||
_0218b910:
|
||||
@@ -2822,7 +2822,7 @@ _0218ba78:
|
||||
ldr r0, _0218c97c ; =data_027e0fe4
|
||||
add r1, r4, #0x3c4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _0218bacc
|
||||
mvn r0, #0
|
||||
@@ -2985,7 +2985,7 @@ _0218bcfc:
|
||||
ldr r0, _0218c97c ; =data_027e0fe4
|
||||
add r1, r4, #0x3c4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _0218c970
|
||||
mvn r0, #0
|
||||
@@ -4384,7 +4384,7 @@ _0218d0e4:
|
||||
ldr r0, _0218d198 ; =data_027e0fe4
|
||||
add r1, sp, #8
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r0, #4]
|
||||
ldr r1, _0218d19c ; =0x504c444d
|
||||
cmp r2, r1
|
||||
|
||||
+4
-4
@@ -16,7 +16,7 @@
|
||||
.extern data_027e0fec
|
||||
.extern data_027e0ff0
|
||||
.extern data_027e0ffc
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e8398
|
||||
.extern data_ov00_020e892c
|
||||
.extern data_ov00_020e9370
|
||||
@@ -123,9 +123,9 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c38fc
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c4ae8
|
||||
|
||||
+30
-30
@@ -1023,7 +1023,7 @@ func_ov44_0218a1a0: ; 0x0218a1a0
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r0, [r0, #0x74]
|
||||
bl func_0202bb78
|
||||
str r0, [r4, #0x74]
|
||||
@@ -1041,7 +1041,7 @@ func_ov44_0218a1cc: ; 0x0218a1cc
|
||||
mov r5, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r5, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
ldr r0, [r4, #0x74]
|
||||
str r0, [r5, #0x74]
|
||||
@@ -1102,7 +1102,7 @@ func_ov44_0218a294: ; 0x0218a294
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, r0
|
||||
mov r0, r4
|
||||
add r1, r1, #0x48
|
||||
@@ -1304,7 +1304,7 @@ _0218a4a4:
|
||||
ldr r0, _0218a600 ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, #0x318
|
||||
bl func_ov44_0218e598
|
||||
mov r0, #0
|
||||
@@ -1343,14 +1343,14 @@ _0218a564:
|
||||
ldr r0, _0218a600 ; =data_027e0fe4
|
||||
add r1, r4, #0x320
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r5, r0
|
||||
addeq sp, sp, #0xc
|
||||
ldmeqia sp!, {r4, r5, pc}
|
||||
ldr r0, _0218a600 ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0
|
||||
bl func_ov44_0218e6b4
|
||||
add r1, sp, #0
|
||||
@@ -1416,7 +1416,7 @@ _0218a67c:
|
||||
ldr r0, _0218a8f8 ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r4, #0x138]
|
||||
ldr r1, [r4, #0x13c]
|
||||
mov r5, r0
|
||||
@@ -1522,7 +1522,7 @@ _0218a7fc:
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
add r3, r4, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, [sp]
|
||||
add r1, sp, #8
|
||||
str r0, [r4, #0x318]
|
||||
@@ -1553,7 +1553,7 @@ _0218a868:
|
||||
ldr r0, _0218a8f8 ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r0, r4
|
||||
mov r1, #0
|
||||
bl func_ov44_0218a468
|
||||
@@ -1568,7 +1568,7 @@ _0218a8a8:
|
||||
ldr r0, _0218a8f8 ; =data_027e0fe4
|
||||
add r1, r4, #0x320
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _0218a8e0
|
||||
add r1, r4, #0x48
|
||||
@@ -2168,7 +2168,7 @@ func_ov44_0218af88: ; 0x0218af88
|
||||
ldr r0, _0218b038 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
movne r0, #1
|
||||
moveq r0, #0
|
||||
@@ -5478,7 +5478,7 @@ func_ov44_0218d724: ; 0x0218d724
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, [r0, #0x74]
|
||||
cmp r1, #3
|
||||
addls pc, pc, r1, lsl #2
|
||||
@@ -5539,7 +5539,7 @@ func_ov44_0218d7d8: ; 0x0218d7d8
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r2, sp, #0
|
||||
add r0, r0, #0x48
|
||||
add r1, r4, #0x48
|
||||
@@ -5590,7 +5590,7 @@ func_ov44_0218d87c: ; 0x0218d87c
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r2, sp, #0
|
||||
add r0, r0, #0x48
|
||||
add r1, r4, #0x48
|
||||
@@ -5628,7 +5628,7 @@ func_ov44_0218d8e8: ; 0x0218d8e8
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _0218d918 ; =0x00000666
|
||||
add r0, r0, #0x48
|
||||
add r2, r4, #0x48
|
||||
@@ -5647,7 +5647,7 @@ func_ov44_0218d91c: ; 0x0218d91c
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r0, [r0, #0x74]
|
||||
bl func_0202bb78
|
||||
str r0, [r4, #0x74]
|
||||
@@ -5664,7 +5664,7 @@ func_ov44_0218d948: ; 0x0218d948
|
||||
mov r5, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r5, #0x318
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r4, r0
|
||||
ldr r0, [r4, #0x74]
|
||||
str r0, [r5, #0x74]
|
||||
@@ -5870,14 +5870,14 @@ _0218dbf8:
|
||||
ldr r0, _0218dd68 ; =data_027e0fe4
|
||||
add r1, r4, #0x320
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r5, r0
|
||||
addeq sp, sp, #0xc
|
||||
ldmeqia sp!, {r3, r4, r5, r6, pc}
|
||||
ldr r0, _0218dd68 ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, sp, #0
|
||||
bl func_ov44_0218e6b4
|
||||
add r1, sp, #0
|
||||
@@ -5922,7 +5922,7 @@ _0218dc74:
|
||||
ldr r0, _0218dd68 ; =data_027e0fe4
|
||||
add r1, r4, #0x320
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0xc
|
||||
ldmeqia sp!, {r3, r4, r5, r6, pc}
|
||||
@@ -5954,7 +5954,7 @@ _0218dcf4:
|
||||
ldr r0, _0218dd68 ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
add r1, r4, #0x318
|
||||
bl func_ov44_0218e598
|
||||
_0218dd5c:
|
||||
@@ -6017,7 +6017,7 @@ _0218ddf4:
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
add r3, r4, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, [sp]
|
||||
add r1, sp, #8
|
||||
str r0, [r4, #0x318]
|
||||
@@ -6164,7 +6164,7 @@ _0218e018:
|
||||
ldr r0, _0218e18c ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r0, r4
|
||||
mov r1, #7
|
||||
bl func_ov44_0218da70
|
||||
@@ -6205,7 +6205,7 @@ _0218e0cc:
|
||||
ldr r0, _0218e18c ; =data_027e0fe4
|
||||
add r1, r4, #0x318
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r2, [r4, #0x138]
|
||||
ldr r1, [r4, #0x13c]
|
||||
mov r5, r0
|
||||
@@ -6555,7 +6555,7 @@ func_ov44_0218e4a0: ; 0x0218e4a0
|
||||
movne r0, #0
|
||||
ldmneia sp!, {r4, r5, pc}
|
||||
_0218e4ec:
|
||||
ldr ip, _0218e58c ; =data_ov00_020e72f0
|
||||
ldr ip, _0218e58c ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x38
|
||||
mvn r3, #0
|
||||
@@ -6588,7 +6588,7 @@ _0218e4ec:
|
||||
str r4, [sp, #0x28]
|
||||
str r2, [sp, #0x2c]
|
||||
str r3, [sp, #0x30]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
movgt r0, #0
|
||||
movle r0, r5
|
||||
@@ -6597,7 +6597,7 @@ _0218e4ec:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov44_0218e4a0
|
||||
_0218e588: .word data_027e0e60
|
||||
_0218e58c: .word data_ov00_020e72f0
|
||||
_0218e58c: .word _ZTV11ActorFilter
|
||||
_0218e590: .word 0x5053424c
|
||||
_0218e594: .word data_027e0fe4
|
||||
|
||||
@@ -6618,7 +6618,7 @@ _0218e5b0:
|
||||
blo _0218e5b0
|
||||
ldr r0, _0218e6a4 ; =data_027e0fe4
|
||||
mov lr, #0
|
||||
ldr r7, _0218e6a8 ; =data_ov00_020e72f0
|
||||
ldr r7, _0218e6a8 ; =_ZTV11ActorFilter
|
||||
add ip, sp, #0x40
|
||||
ldr r6, _0218e6ac ; =0x52415448
|
||||
add r5, sp, #0x54
|
||||
@@ -6640,7 +6640,7 @@ _0218e5b0:
|
||||
str lr, [ip, #8]
|
||||
str r5, [sp]
|
||||
str r3, [sp, #4]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #8]
|
||||
cmp r0, #0
|
||||
movle r5, #0
|
||||
@@ -6676,7 +6676,7 @@ _0218e684:
|
||||
.align 2, 0
|
||||
arm_func_end func_ov44_0218e598
|
||||
_0218e6a4: .word data_027e0fe4
|
||||
_0218e6a8: .word data_ov00_020e72f0
|
||||
_0218e6a8: .word _ZTV11ActorFilter
|
||||
_0218e6ac: .word 0x52415448
|
||||
_0218e6b0: .word data_027e0764
|
||||
|
||||
|
||||
+3
-3
@@ -140,9 +140,9 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c38fc
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5ec0
|
||||
|
||||
+8
-8
@@ -374,7 +374,7 @@ _021904e4:
|
||||
ldr r2, _02190584 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #0x10]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #0x14]
|
||||
@@ -385,7 +385,7 @@ _0219050c:
|
||||
ldr r2, _02190584 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #8]
|
||||
ldr r1, _02190580 ; =data_027e0fe4
|
||||
str r0, [r4, #0x180]
|
||||
@@ -395,7 +395,7 @@ _0219050c:
|
||||
ldr r1, [r1]
|
||||
ldr r2, _02190588 ; =0x53574f4e
|
||||
add r3, r4, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp]
|
||||
ldr r0, [sp, #4]
|
||||
str r1, [sp, #8]
|
||||
@@ -1503,11 +1503,11 @@ _0219132c:
|
||||
ldr r2, _021913b4 ; =0x414e4353
|
||||
add r0, sp, #0
|
||||
add r3, r4, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r0, _021913b0 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
strne r0, [r4, #0x478]
|
||||
mov r0, #1
|
||||
@@ -1913,7 +1913,7 @@ _021918a4:
|
||||
ldr r2, _02191944 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0x10
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #0x10]
|
||||
str r0, [r4, #0x180]
|
||||
ldr r0, [sp, #0x14]
|
||||
@@ -1924,7 +1924,7 @@ _021918cc:
|
||||
ldr r2, _02191944 ; =0x4e415649
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #8
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r0, [sp, #8]
|
||||
ldr r1, _02191940 ; =data_027e0fe4
|
||||
str r0, [r4, #0x180]
|
||||
@@ -1934,7 +1934,7 @@ _021918cc:
|
||||
ldr r1, [r1]
|
||||
ldr r2, _02191948 ; =0x53574f4e
|
||||
add r3, r4, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp]
|
||||
ldr r0, [sp, #4]
|
||||
str r1, [sp, #8]
|
||||
|
||||
+3
-3
@@ -20,7 +20,7 @@
|
||||
.extern data_027e0fe8
|
||||
.extern data_027e0fec
|
||||
.extern data_027e0ffc
|
||||
.extern data_ov00_020e72f0
|
||||
.extern _ZTV11ActorFilter
|
||||
.extern data_ov00_020e892c
|
||||
.extern func_01ff81f8
|
||||
.extern func_01ff8214
|
||||
@@ -146,8 +146,8 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5c98
|
||||
|
||||
+9
-9
@@ -1359,7 +1359,7 @@ func_ov48_02190e80: ; 0x02190e80
|
||||
ldr r0, _02190f68 ; =data_027e0fe4
|
||||
add r1, sp, #4
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r1, #0x53
|
||||
lsl r1, r1, #4
|
||||
str r0, [r4, r1]
|
||||
@@ -2598,7 +2598,7 @@ _02191ed2:
|
||||
ldr r0, _02192054 ; =data_027e0fe4
|
||||
add r1, sp, #0x20
|
||||
ldr r0, [r0]
|
||||
blx func_ov00_020c3674
|
||||
blx _ZN12ActorManager8GetActorEP8ActorRef
|
||||
ldr r1, _02192058 ; =0x0000052c
|
||||
str r0, [r5, r1]
|
||||
add r0, r1, #0
|
||||
@@ -4822,7 +4822,7 @@ _02193b5c:
|
||||
mov r2, #0
|
||||
add r1, sp, #0x258
|
||||
mvn r3, #0
|
||||
ldr r5, _02193f38 ; =data_ov00_020e72f0
|
||||
ldr r5, _02193f38 ; =_ZTV11ActorFilter
|
||||
ldr r4, _02193f3c ; =0x424f4d42
|
||||
add r6, sp, #0x1a4
|
||||
mov r0, #0x10
|
||||
@@ -4851,7 +4851,7 @@ _02193bd4:
|
||||
add r1, sp, #0x224
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0x198
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0x1a0]
|
||||
mov r5, #0
|
||||
cmp r0, #0
|
||||
@@ -4863,7 +4863,7 @@ _02193c18:
|
||||
ldr r1, [sp, #0x198]
|
||||
ldr r0, [fp]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
beq _02193cfc
|
||||
mov r1, r4
|
||||
@@ -4926,7 +4926,7 @@ _02193cfc:
|
||||
cmp r5, r0
|
||||
blt _02193c18
|
||||
_02193d10:
|
||||
ldr r5, _02193f38 ; =data_ov00_020e72f0
|
||||
ldr r5, _02193f38 ; =_ZTV11ActorFilter
|
||||
mov r2, #0
|
||||
add r1, sp, #0x184
|
||||
mvn r3, #0
|
||||
@@ -4958,7 +4958,7 @@ _02193d68:
|
||||
add r1, sp, #0x150
|
||||
ldr r0, [r0]
|
||||
add r2, sp, #0xc4
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, [sp, #0xcc]
|
||||
mov r5, #0
|
||||
cmp r0, #0
|
||||
@@ -4971,7 +4971,7 @@ _02193dac:
|
||||
ldr r1, [sp, #0xc4]
|
||||
ldr r0, [r0]
|
||||
add r1, r1, sb
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
beq _02193e8c
|
||||
mov r1, r4
|
||||
@@ -5077,7 +5077,7 @@ _02193f28: .word data_02050f54
|
||||
_02193f2c: .word data_027e0e58
|
||||
_02193f30: .word 0x000004cd
|
||||
_02193f34: .word data_ov48_02194688
|
||||
_02193f38: .word data_ov00_020e72f0
|
||||
_02193f38: .word _ZTV11ActorFilter
|
||||
_02193f3c: .word 0x424f4d42
|
||||
_02193f40: .word data_027e0fe4
|
||||
_02193f44: .word 0x424d5459
|
||||
|
||||
+4
-4
@@ -2,6 +2,10 @@
|
||||
.extern Approach_thunk
|
||||
.extern Divide
|
||||
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
.extern data_02050f54
|
||||
@@ -137,10 +141,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c38fc
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c5374
|
||||
.extern func_ov00_020c5c98
|
||||
|
||||
+8
-8
@@ -1860,7 +1860,7 @@ func_ov50_02196d94: ; 0x02196d94
|
||||
add r2, sp, #0x28
|
||||
str r3, [r4, #0xc]
|
||||
str fp, [sp, #0x14]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
mov r8, r0
|
||||
cmp r8, #0
|
||||
mov sb, r7
|
||||
@@ -1873,7 +1873,7 @@ func_ov50_02196d94: ; 0x02196d94
|
||||
_02196e74:
|
||||
ldr r0, [r5]
|
||||
mov r1, sl
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r7, r0
|
||||
beq _02196ebc
|
||||
ldr r2, [r0]
|
||||
@@ -1937,7 +1937,7 @@ func_ov50_02196ee4: ; 0x02196ee4
|
||||
mov r2, #0
|
||||
str r3, [ip, #0xc]
|
||||
str r4, [sp, #0x14]
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
cmp r0, #0
|
||||
movgt r0, #1
|
||||
movle r0, #0
|
||||
@@ -2368,7 +2368,7 @@ func_ov50_021974e4: ; 0x021974e4
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
mov r1, r2
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
addeq sp, sp, #0x18
|
||||
moveq r0, #1
|
||||
@@ -2762,7 +2762,7 @@ func_ov50_021979b4: ; 0x021979b4
|
||||
ldr r2, _021979fc ; =0x52555059
|
||||
add r0, sp, #0
|
||||
add r3, r4, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp]
|
||||
mov r0, #0x8f
|
||||
str r1, [r4, #0x31c]
|
||||
@@ -2785,7 +2785,7 @@ func_ov50_02197a00: ; 0x02197a00
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
add r1, r4, #0x31c
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
mvneq r0, #0
|
||||
streq r0, [r4, #0x31c]
|
||||
@@ -3441,7 +3441,7 @@ _021982d4:
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0
|
||||
add r3, r4, #0x48
|
||||
bl func_ov00_020c38fc
|
||||
bl _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
ldr r1, [sp]
|
||||
mvn r0, #0
|
||||
cmp r1, r0
|
||||
@@ -3449,7 +3449,7 @@ _021982d4:
|
||||
ldr r0, _02198590 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
mov r5, r0
|
||||
add r0, r4, #0x48
|
||||
add r1, r5, #0x48
|
||||
|
||||
+1
-1
@@ -129,7 +129,7 @@
|
||||
.extern func_ov00_020c3200
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c57fc
|
||||
|
||||
+2
-2
@@ -632,7 +632,7 @@ func_ov51_02195c80: ; 0x02195c80
|
||||
ldr r0, _02195e98 ; =data_027e0fe4
|
||||
add r1, r5, #0x34
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
bne _02195cfc
|
||||
mov r0, r5
|
||||
@@ -2216,7 +2216,7 @@ func_ov51_021970a0: ; 0x021970a0
|
||||
ldr r0, _02197278 ; =data_027e0fe4
|
||||
add r1, sp, #0
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
movs r6, r0
|
||||
beq _021971e4
|
||||
bl func_ov51_02197088
|
||||
|
||||
+3
-3
@@ -1,4 +1,6 @@
|
||||
#pragma once
|
||||
.extern _ZN12ActorManager13FindActorByIdEj
|
||||
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
|
||||
.extern _ZN9SysObjectdlEPv
|
||||
.extern _ZN9SysObjectnwEmPjj
|
||||
@@ -65,7 +67,6 @@
|
||||
.extern func_02036edc
|
||||
.extern func_0203e784
|
||||
.extern func_0203e7b4
|
||||
.extern strcpy
|
||||
.extern func_0204f8d4
|
||||
.extern func_ov00_02079470
|
||||
.extern func_ov00_02079e68
|
||||
@@ -143,8 +144,6 @@
|
||||
.extern func_ov00_020c31fc
|
||||
.extern func_ov00_020c322c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c35d8
|
||||
.extern func_ov00_020c3894
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020c4588
|
||||
.extern func_ov00_020c45b0
|
||||
@@ -210,3 +209,4 @@
|
||||
.extern func_ov14_0214a92c
|
||||
.extern func_ov14_0214aa0c
|
||||
.extern gOverlayManager
|
||||
.extern strcpy
|
||||
|
||||
+3
-3
@@ -2116,7 +2116,7 @@ _02196fa4:
|
||||
mov r1, r0
|
||||
ldr r0, _02197084 ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c35d8
|
||||
bl _ZN12ActorManager13FindActorByIdEj
|
||||
cmp r0, #0
|
||||
beq _0219705c
|
||||
mov r1, #3
|
||||
@@ -2234,7 +2234,7 @@ _021971b0:
|
||||
ldr r2, _02197228 ; =0x47524d47
|
||||
ldr r1, [r1]
|
||||
add r0, sp, #0xc
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #0xc]
|
||||
ldr r0, [sp, #0x10]
|
||||
str r1, [sp, #0x14]
|
||||
@@ -2248,7 +2248,7 @@ _021971d4:
|
||||
str r2, [r4, #0x18c]
|
||||
ldr r1, [r1]
|
||||
ldr r2, _02197230 ; =0x4e415649
|
||||
bl func_ov00_020c3894
|
||||
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
|
||||
ldr r1, [sp, #4]
|
||||
ldr r0, [sp, #8]
|
||||
str r1, [sp, #0x14]
|
||||
|
||||
+2
-2
@@ -60,8 +60,8 @@
|
||||
.extern func_ov00_020c1554
|
||||
.extern func_ov00_020c2a0c
|
||||
.extern func_ov00_020c3348
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern func_ov00_020c4048
|
||||
.extern func_ov00_020ceacc
|
||||
.extern func_ov00_020d61b0
|
||||
|
||||
+3
-3
@@ -239,7 +239,7 @@ func_ov53_02198fd4: ; 0x02198fd4
|
||||
stmdb sp!, {r3, lr}
|
||||
ldr r0, _0219900c ; =data_027e0fe4
|
||||
ldr r0, [r0]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
ldmeqia sp!, {r3, pc}
|
||||
ldr r2, [r0, #4]
|
||||
@@ -493,7 +493,7 @@ _021992a8:
|
||||
mov r1, r5
|
||||
str r3, [sp, #8]
|
||||
str r2, [sp, #0xc]
|
||||
bl func_ov00_020c3674
|
||||
bl _ZN12ActorManager8GetActorEP8ActorRef
|
||||
cmp r0, #0
|
||||
beq _021992ec
|
||||
mov r1, r4
|
||||
@@ -765,7 +765,7 @@ _02199518:
|
||||
ldr r0, [r0]
|
||||
ldr r1, _021996f8 ; =data_ov53_0219a5e4
|
||||
mov r2, #0
|
||||
bl func_ov00_020c37ec
|
||||
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
ldr r0, _021996e4 ; =data_ov53_0219a580
|
||||
ldrh r1, [r0, #0x40]
|
||||
ldrh r0, [r0, #0x6c]
|
||||
|
||||
+3
-3
@@ -1,5 +1,8 @@
|
||||
#pragma once
|
||||
.extern _ZN11ItemManager12GetItemModelEj
|
||||
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
|
||||
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
|
||||
.extern _ZN12ActorManager8GetActorEP8ActorRef
|
||||
.extern _ZN13LinkStateBase12GetPlayerPosEv
|
||||
.extern _ZN13LinkStateBase14GetPlayerAngleEv
|
||||
.extern _ZN13LinkStateBase18func_ov00_020a82acEv
|
||||
@@ -52,9 +55,6 @@
|
||||
.extern func_ov00_020b7e6c
|
||||
.extern func_ov00_020ba3b4
|
||||
.extern func_ov00_020be8e4
|
||||
.extern func_ov00_020c3674
|
||||
.extern func_ov00_020c37ec
|
||||
.extern func_ov00_020c38fc
|
||||
.extern func_ov00_020d7a84
|
||||
.extern func_ov05_02106bbc
|
||||
.extern func_ov05_0210f808
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user