mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-29 16:44:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remangle ActorManager::FilterActors

Browse Source
This commit is contained in:
Aetias
2024-05-26 10:49:03 +02:00
parent 2b81d5a387
commit 9d46c1de01
53 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -8,7 +8,7 @@
.extern _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c398cEj
.extern _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
asm/ov00/Actor/Actor.s
+1 -1
View File
@@ -617,7 +617,7 @@ _020c1b2c:
add r1, sp, #0
mov r2, #0
str r3, [sp]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
add sp, sp, #0xa4
ldmia sp!, {pc}
.align 2, 0
asm/ov00/Actor/ActorManager.s
+4 -4
View File
@@ -312,9 +312,9 @@ _020c37e0:
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN11FilterActor6FilterEP5Actor
.global _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
arm_func_start _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
_ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList: ; 0x020c37ec
.global _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
arm_func_start _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
_ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList: ; 0x020c37ec
stmdb sp!, {r4, r5, r6, r7, r8, lr}
movs r7, r2
mov r4, #0
@@ -361,7 +361,7 @@ _020c3880:
_020c388c:
mov r0, r4
ldmia sp!, {r4, r5, r6, r7, r8, pc}
arm_func_end _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
arm_func_end _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.global _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
arm_func_start _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
asm/ov00/ov00_02086cd0.inc
+1 -1
View File
@@ -39,7 +39,7 @@
.extern _ZN11TriggerBase8vfunc_08Ev
.extern _ZN11TriggerBase8vfunc_0cEv
.extern _ZN11TriggerBase8vfunc_10Ev
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
asm/ov00/ov00_02086cd0.s
+1 -1
View File
@@ -19715,7 +19715,7 @@ _020968f4:
add r1, sp, #0x20
ldr r0, [r0]
add r2, sp, #0x58
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ble _02096974
ldr r0, _020969f8 ; =gActorManager
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -39,7 +39,7 @@
.extern _ZN11ItemManager13UnequipPotionEv
.extern _ZN11ItemManager4SaveEP15SaveItemManager
.extern _ZN11ItemManager8GiveAmmoEit
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov00/ov00_020b1498.s
+1 -1
View File
@@ -10112,7 +10112,7 @@ _020b94e8:
str r4, [sp, #0x34]
str r5, [sp, #0x38]
str r6, [sp, #0x3c]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ble _020b956c
ldr r2, [sp, #0x30]
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -25,7 +25,7 @@
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern _ZN11ItemManager15SetEquippedItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
asm/ov00/ov00_020c3e54.s
+3 -3
View File
@@ -17573,7 +17573,7 @@ func_ov00_020d1870: ; 0x020d1870
mov r2, #0
str ip, [sp]
strb r3, [sp, #0xa]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
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 _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
@@ -20472,7 +20472,7 @@ _020d3d1c:
str ip, [sp, #4]
str r5, [sp, #8]
str r3, [sp, #0xc]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mov r6, r0
cmp r6, #0
mov r7, #0
asm/ov04.inc
+1 -1
View File
@@ -29,7 +29,7 @@
.extern _ZN11ItemManager6CreateEv
.extern _ZN11ItemManager7DestroyEv
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov04.s
+1 -1
View File
@@ -23486,7 +23486,7 @@ _0210c092:
str r0, [sp, #0x20]
ldr r0, _0210c0f4 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
blx _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ble _0210c0c2
mov r0, #0
asm/ov05.inc
+1 -1
View File
@@ -30,7 +30,7 @@
.extern _ZN11ItemManager18PlayItemFanfareSfxEi
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase10GetStateIdEv
asm/ov05.s
+2 -2
View File
@@ -8189,7 +8189,7 @@ _02107664:
mov r2, #0
ldr r0, [r0]
add r1, sp, #8
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ble _021077e8
bl func_ov05_02107870
@@ -19893,7 +19893,7 @@ _02111744:
strh r2, [sp, #0x3c]
ldr r0, [r0]
mov r2, #0
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ble _02111868
ldr r0, [sp, #0x2c]
asm/ov12.inc
+1 -1
View File
@@ -28,7 +28,7 @@
.extern _ZN11ItemManager18EquipItem_vfunc_38Ei
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p
asm/ov12.s
+1 -1
View File
@@ -38455,7 +38455,7 @@ _0213207c:
str r3, [sp]
str ip, [sp, #4]
str lr, [sp, #8]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
addle sp, sp, #0xc
ldmleia sp!, {r3, r4, pc}
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -50,7 +50,7 @@
.extern _ZN11ItemManager18PlayItemFanfareSfxEi
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN11ItemManager9SetPotionEjh
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
asm/ov14/ov14_0213b778.s
+4 -4
View File
@@ -41,7 +41,7 @@ _0213b794:
str r6, [r3]
str r6, [r3, #4]
str r6, [r3, #8]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mov r6, r0
cmp r6, #0
mov r11, #0
@@ -17049,7 +17049,7 @@ _021483f8:
str r6, [sp, #0x8c]
str r6, [sp, #0x90]
str r3, [sp, #0x50]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mov r6, r0
cmp r6, #0
mov r7, #0
@@ -20286,7 +20286,7 @@ _0214b048:
str ip, [sp, #0x38]
str r3, [sp, #8]
str r5, [sp, #0xc]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mov r1, r6
mov r0, r4
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -20304,7 +20304,7 @@ _0214b048:
mov r0, r4
str r3, [sp]
str r5, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mov r1, r6
mov r0, r4
bl _ZN12ActorManager8GetActorEP8ActorRef
asm/ov15.inc
+1 -1
View File
@@ -53,7 +53,7 @@
.extern _ZN11ItemManager18func_ov00_020ad528Ev
.extern _ZN11ItemManager19SetTreasureSalvagedEj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
asm/ov15.s
+7 -7
View File
@@ -4512,7 +4512,7 @@ func_ov15_021232b4: ; 0x021232b4
add r1, sp, #0x28
ldr r0, [r0]
add r2, sp, #0x40
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
movne r0, r5
moveq r0, #1
@@ -18178,7 +18178,7 @@ _0212e7dc:
add r2, sp, #0x10
str r3, [sp]
strh ip, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
beq _0212e854
ldr r0, _0212e86c ; =gActorManager
@@ -59961,7 +59961,7 @@ func_ov15_02152184: ; 0x02152184
str r8, [sp, #0x30]
str r4, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #8]
mov r3, r6
cmp r0, #0
@@ -76075,7 +76075,7 @@ _02160188:
ldr r0, [r1]
add r1, sp, #0
add r2, sp, #0x10
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
str r0, [r4, #0x3c0]
cmp r0, #0
ble _021602fc
@@ -86466,7 +86466,7 @@ func_ov15_021690bc: ; 0x021690bc
add r1, sp, #0
ldr r0, [r0]
mov r2, #0
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -98021,7 +98021,7 @@ _02172f7c:
add r1, sp, #0
ldr r0, [r0]
add r2, sp, #0xc
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mov r6, r0
cmp r6, #0
mov r7, #0
@@ -103934,7 +103934,7 @@ _02177fa0:
add r1, sp, #0
ldr r0, [r0]
add r2, sp, #4
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
beq _0217804c
ldr r0, [sp, #0xc]
asm/ov17.inc
+1 -1
View File
@@ -3,7 +3,7 @@
.extern Divide
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
asm/ov17.s
+1 -1
View File
@@ -12511,7 +12511,7 @@ func_ov17_02165284: ; 0x02165284
mov r2, #0
str r3, [sp]
str r4, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
movgt r0, #1
movle r0, #0
asm/ov18.inc
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov18.s
+1 -1
View File
@@ -2162,7 +2162,7 @@ func_ov18_0215cfac: ; 0x0215cfac
mov r2, #0
str ip, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
add sp, sp, #0x10
ldmia sp!, {r3, pc}
.align 2, 0
asm/ov19.inc
+1 -1
View File
@@ -12,7 +12,7 @@
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov19.s
+2 -2
View File
@@ -1774,7 +1774,7 @@ func_ov19_0216eda4: ; 0x0216eda4
str ip, [sp, #4]
str r5, [sp, #8]
str r3, [sp, #0xc]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r5, _0216ee58 ; =gActorManager
add r7, sp, #0x10
mov r6, #0
@@ -8763,7 +8763,7 @@ _02174910:
str lr, [ip, #8]
str r4, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ldrgt r0, [sp, #8]
movgt r5, #0
asm/ov20.inc
+1 -1
View File
@@ -11,7 +11,7 @@
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12GetPlayerPosEv
asm/ov20.s
+1 -1
View File
@@ -7573,7 +7573,7 @@ _02173c3c:
str lr, [sp, #0x20]
str ip, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #8]
str r0, [r4, #0x188]
ldr r0, [sp, #0xc]
asm/ov22.inc
+1 -1
View File
@@ -20,7 +20,7 @@
.extern _ZN10MapManager18func_ov00_02084ac4Ej
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov22.s
+2 -2
View File
@@ -3362,7 +3362,7 @@ _021702f8:
add r1, sp, #0x10
ldr r0, [r0]
add r2, sp, #0x20
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x18]
str r0, [r4, #0x180]
ldr r0, [sp, #0x1c]
@@ -6751,7 +6751,7 @@ _02172f1c:
add r1, sp, #4
ldr r0, [r0]
add r2, sp, #0x20
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r1, [sp, #0xc]
mvn r0, #0
cmp r1, r0
asm/ov23.inc
+1 -1
View File
@@ -25,7 +25,7 @@
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov23.s
+4 -4
View File
@@ -1328,7 +1328,7 @@ func_ov23_0216e7b0: ; 0x0216e7b0
add r1, sp, #0
mov r2, #0
str r3, [sp]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
add sp, sp, #8
ldmia sp!, {r3, pc}
.align 2, 0
@@ -2592,7 +2592,7 @@ _0216f73c:
str r3, [sp, #0x88]
str r3, [sp, #0x8c]
str r4, [sp, #0x164]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x98]
mov r4, #0
cmp r0, #0
@@ -6568,7 +6568,7 @@ func_ov23_02172b88: ; 0x02172b88
str r2, [r3]
str r2, [r3, #4]
str r2, [r3, #8]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #4
movle r0, #1
movgt r0, #0
@@ -7024,7 +7024,7 @@ _021731ec:
str r3, [sp, #0x34]
str r5, [sp, #0x2c]
str r4, [sp, #0x30]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x34]
mov r5, #0
cmp r0, #0
asm/ov25.inc
+1 -1
View File
@@ -12,7 +12,7 @@
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov25.s
+7 -7
View File
@@ -186,7 +186,7 @@ _0216d860:
str r9, [r8, #8]
str r7, [sp]
str r6, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #8]
mov r7, r9
cmp r0, #0
@@ -1757,7 +1757,7 @@ func_ov25_0216ecf4: ; 0x0216ecf4
str r3, [sp, #0x30]
str r3, [sp, #0x34]
str r4, [sp, #0x74]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mvn r1, #0
ldr r0, [sp, #0x40]
mov r6, #0
@@ -6984,7 +6984,7 @@ _021734c4:
add r1, sp, #0x8c
ldr r0, [r0]
add r2, sp, #0
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mvn r0, #0
str r0, [r10]
str r0, [r10, #4]
@@ -7208,7 +7208,7 @@ func_ov25_02173728: ; 0x02173728
str r5, [sp]
str r3, [sp, #4]
str r7, [sp, #8]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ble _02173a30
ldrh r0, [r4, #0x20]
@@ -8764,7 +8764,7 @@ _02174d9c:
add r1, sp, #0x1e0
ldr r0, [r0]
add r2, sp, #0x154
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x15c]
mov r6, #1
cmp r0, #0
@@ -9802,7 +9802,7 @@ func_ov25_02175b08: ; 0x02175b08
str r7, [r5, #8]
str r4, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ldrgt r0, [sp, #8]
movgt r4, r7
@@ -11435,7 +11435,7 @@ func_ov25_02177064: ; 0x02177064
str r3, [sp, #4]
strb lr, [sp, #8]
strb r5, [sp, #9]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
addgt sp, sp, #0xc
ldmgtia sp!, {r4, r5, pc}
asm/ov29.inc
+1 -1
View File
@@ -11,7 +11,7 @@
.extern _ZN10MapManager18func_ov00_020846a4Ev
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN11ItemManager18func_ov00_020ae4dcEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov29.s
+5 -5
View File
@@ -3230,7 +3230,7 @@ func_ov29_02170144: ; 0x02170144
add r1, sp, #0
mov r2, #0
str r3, [sp]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
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 _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
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 _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02171764: .word data_ov29_0217bc30
@@ -5868,7 +5868,7 @@ func_ov29_02172494: ; 0x02172494
add r1, sp, #4
str r2, [sp, #8]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
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 _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #8]
cmp r0, #1
bge _021726a0
asm/ov30.inc
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov30.s
+14 -14
View File
@@ -3557,7 +3557,7 @@ _0217ec2c:
str r6, [sp, #0x10]
str r6, [sp, #0x14]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x20]
mov r5, #0
cmp r0, #0
@@ -8396,7 +8396,7 @@ _0218271c:
str r3, [sp, #0x70]
str r6, [sp, #0x68]
str r5, [sp, #0x6c]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x70]
mov r5, #0
cmp r0, #0
@@ -9462,7 +9462,7 @@ _021834e0:
add r1, sp, #0x274
ldr r0, [r0]
add r2, sp, #0x1e8
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x1f0]
mov r7, #0
cmp r0, #0
@@ -9531,7 +9531,7 @@ _021835e4:
add r1, sp, #0x1a0
ldr r0, [r0]
add r2, sp, #0x114
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x11c]
mov r7, #0
cmp r0, #0
@@ -9600,7 +9600,7 @@ _021836e8:
add r1, sp, #0xcc
ldr r0, [r0]
add r2, sp, #0x40
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x48]
mov r7, #0
cmp r0, #0
@@ -9905,7 +9905,7 @@ _02183ab0:
str r5, [sp, #0x14]
str r5, [sp, #0x18]
str r3, [sp, #8]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ldrgt r0, [sp, #0x24]
movgt r4, #0
@@ -9985,7 +9985,7 @@ _02183bc8:
str r5, [sp, #0x14]
str r5, [sp, #0x18]
str r3, [sp, #8]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ldrgt r0, [sp, #0x24]
movgt r4, #0
@@ -11332,7 +11332,7 @@ _021848f4:
add r1, sp, #0x24
ldr r0, [r0]
add r2, sp, #0x530
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x534]
mov r6, #0
str r6, [sp, #0x18]
@@ -11420,7 +11420,7 @@ _02184a34:
ldr r0, [r0]
add r1, sp, #0x1c
add r2, r2, #0xa4
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x4a8]
mov r6, #0
str r6, [sp, #0x14]
@@ -11520,7 +11520,7 @@ _02184ba8:
ldr r0, [r0]
add r1, r1, #0x5c
add r2, sp, #0x3d0
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x3d4]
mov r6, #0
str r6, [sp, #0x10]
@@ -11618,7 +11618,7 @@ _02184d18:
add r1, sp, #0x388
ldr r0, [r0]
add r2, sp, #0x2fc
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x300]
mov r6, #0
str r6, [sp, #0xc]
@@ -11716,7 +11716,7 @@ _02184e84:
add r1, sp, #0x2b4
ldr r0, [r0]
add r2, sp, #0x228
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x22c]
mov r7, #0
str r7, [sp, #8]
@@ -11811,7 +11811,7 @@ _02184fe4:
add r1, sp, #0x1e0
ldr r0, [r0]
add r2, sp, #0x154
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x158]
mov r7, #0
str r7, [sp, #4]
@@ -11906,7 +11906,7 @@ _02185144:
add r1, sp, #0x10c
ldr r0, [r0]
add r2, sp, #0x80
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x84]
mov r7, #0
str r7, [sp]
asm/ov32.inc
+1 -1
View File
@@ -8,7 +8,7 @@
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
asm/ov32.s
+2 -2
View File
@@ -10270,7 +10270,7 @@ func_ov32_0218439c: ; 0x0218439c
str r2, [r3]
str r2, [r3, #4]
str r2, [r3, #8]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
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 _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #8
addgt sp, sp, #0x84
movgt r0, #0
asm/ov36.inc
+1 -1
View File
@@ -3,7 +3,7 @@
.extern Divide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
asm/ov36.s
+3 -3
View File
@@ -2758,7 +2758,7 @@ _0217e314:
add r1, sp, #8
ldr r0, [r0]
add r2, sp, #0x2c
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
beq _0217e37c
ldr r0, _0217e3d4 ; =gActorManager
@@ -4078,7 +4078,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
add r1, sp, #4
ldr r0, [r0]
add r2, sp, #0x70
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r1, [sp, #0xc]
mov r0, r6
cmp r1, r0
@@ -9947,7 +9947,7 @@ func_ov36_02184938: ; 0x02184938
add r1, sp, #0
ldr r0, [r0]
add r2, sp, #0x10
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
beq _021849d0
ldr r1, [sp, #0x10]
asm/ov43.inc
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
asm/ov43.s
+2 -2
View File
@@ -766,7 +766,7 @@ _02189ebc:
str r7, [r5, #8]
str r4, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ldrgt r0, [sp, #8]
movgt r4, r7
@@ -838,7 +838,7 @@ _02189fb8:
str r4, [r6, #8]
str r5, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ldrgt r0, [sp, #8]
movgt r5, r4
asm/ov44.inc
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
asm/ov44.s
+2 -2
View File
@@ -6588,7 +6588,7 @@ _0218e4ec:
str r4, [sp, #0x28]
str r2, [sp, #0x2c]
str r3, [sp, #0x30]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
movgt r0, #0
movle r0, r5
@@ -6640,7 +6640,7 @@ _0218e5b0:
str lr, [ip, #8]
str r5, [sp]
str r3, [sp, #4]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #8]
cmp r0, #0
movle r5, #0
asm/ov48.inc
+2 -2
View File
@@ -3,7 +3,7 @@
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN10PlayerBase6LookAtEP5Vec3p
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -63,7 +63,7 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
asm/ov48.s
+2 -2
View File
@@ -4851,7 +4851,7 @@ _02193bd4:
add r1, sp, #0x224
ldr r0, [r0]
add r2, sp, #0x198
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0x1a0]
mov r5, #0
cmp r0, #0
@@ -4958,7 +4958,7 @@ _02193d68:
add r1, sp, #0x150
ldr r0, [r0]
add r2, sp, #0xc4
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, [sp, #0xcc]
mov r5, #0
cmp r0, #0
asm/ov50.inc
+1 -1
View File
@@ -6,7 +6,7 @@
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_020840dcEv
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
asm/ov50.s
+2 -2
View File
@@ -1860,7 +1860,7 @@ func_ov50_02196d94: ; 0x02196d94
add r2, sp, #0x28
str r3, [r4, #0xc]
str r11, [sp, #0x14]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
mov r8, r0
cmp r8, #0
mov r9, r7
@@ -1937,7 +1937,7 @@ func_ov50_02196ee4: ; 0x02196ee4
mov r2, #0
str r3, [ip, #0xc]
str r4, [sp, #0x14]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
movgt r0, #1
movle r0, #0
asm/ov53.inc
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase18func_ov00_020a81fcEv
asm/ov53.s
+1 -1
View File
@@ -765,7 +765,7 @@ _02199518:
ldr r0, [r0]
ldr r1, _021996f8 ; =data_ov53_0219a5e4
mov r2, #0
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
ldr r0, _021996e4 ; =data_ov53_0219a580
ldrh r1, [r0, #0x40]
ldrh r0, [r0, #0x6c]
asm/ov54.inc
+1 -1
View File
@@ -5,7 +5,7 @@
.extern _ZN10MapManager18func_ov00_02085594Ev
.extern _ZN10MapManager18func_ov00_02085a34Eii
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12GetPlayerPosEv
asm/ov54.s
+1 -1
View File
@@ -312,7 +312,7 @@ _02199050:
ldr r3, [r7, #0x40]
mov r2, r4
str r3, [sp, #0x20]
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
bl _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
bgt _021990c4
ldr r0, _02199290 ; =gMapManager