From 9d46c1de014471507ca6e672ac7edadca6798b97 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 26 May 2024 10:49:03 +0200 Subject: [PATCH] Remangle `ActorManager::FilterActors` --- asm/ov00/Actor/Actor.inc | 2 +- asm/ov00/Actor/Actor.s | 2 +- asm/ov00/Actor/ActorManager.s | 8 ++++---- asm/ov00/ov00_02086cd0.inc | 2 +- asm/ov00/ov00_02086cd0.s | 2 +- asm/ov00/ov00_020b1498.inc | 2 +- asm/ov00/ov00_020b1498.s | 2 +- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 6 +++--- asm/ov04.inc | 2 +- asm/ov04.s | 2 +- asm/ov05.inc | 2 +- asm/ov05.s | 4 ++-- asm/ov12.inc | 2 +- asm/ov12.s | 2 +- asm/ov14/ov14_0213b778.inc | 2 +- asm/ov14/ov14_0213b778.s | 8 ++++---- asm/ov15.inc | 2 +- asm/ov15.s | 14 +++++++------- asm/ov17.inc | 2 +- asm/ov17.s | 2 +- asm/ov18.inc | 2 +- asm/ov18.s | 2 +- asm/ov19.inc | 2 +- asm/ov19.s | 4 ++-- asm/ov20.inc | 2 +- asm/ov20.s | 2 +- asm/ov22.inc | 2 +- asm/ov22.s | 4 ++-- asm/ov23.inc | 2 +- asm/ov23.s | 8 ++++---- asm/ov25.inc | 2 +- asm/ov25.s | 14 +++++++------- asm/ov29.inc | 2 +- asm/ov29.s | 10 +++++----- asm/ov30.inc | 2 +- asm/ov30.s | 28 ++++++++++++++-------------- asm/ov32.inc | 2 +- asm/ov32.s | 4 ++-- asm/ov36.inc | 2 +- asm/ov36.s | 6 +++--- asm/ov43.inc | 2 +- asm/ov43.s | 4 ++-- asm/ov44.inc | 2 +- asm/ov44.s | 4 ++-- asm/ov48.inc | 4 ++-- asm/ov48.s | 4 ++-- asm/ov50.inc | 2 +- asm/ov50.s | 4 ++-- asm/ov53.inc | 2 +- asm/ov53.s | 2 +- asm/ov54.inc | 2 +- asm/ov54.s | 2 +- 53 files changed, 104 insertions(+), 104 deletions(-) diff --git a/asm/ov00/Actor/Actor.inc b/asm/ov00/Actor/Actor.inc index 4822b021..e4f2f7ef 100644 --- a/asm/ov00/Actor/Actor.inc +++ b/asm/ov00/Actor/Actor.inc @@ -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 diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 10889bce..b0dc5487 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -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 diff --git a/asm/ov00/Actor/ActorManager.s b/asm/ov00/Actor/ActorManager.s index 87a6a619..eeb3471b 100644 --- a/asm/ov00/Actor/ActorManager.s +++ b/asm/ov00/Actor/ActorManager.s @@ -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 diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index f29f79d4..6902838e 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -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 diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 60563c82..1f9d368a 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -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 diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index 55936f9f..d9eee867 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -39,7 +39,7 @@ .extern _ZN11ItemManager13UnequipPotionEv .extern _ZN11ItemManager4SaveEP15SaveItemManager .extern _ZN11ItemManager8GiveAmmoEit -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 13b6dd40..cb8f0169 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -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] diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index c5b76ca5..ebdec746 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -25,7 +25,7 @@ .extern _ZN10PlayerBase14GetEquipShieldEv .extern _ZN11ItemManager15SetEquippedItemEi .extern _ZN11ItemManager18func_ov00_020ad790Ei -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN14AdventureFlags18func_Ov00_02097810Ei diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 1228b832..9635ea10 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -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 diff --git a/asm/ov04.inc b/asm/ov04.inc index 1e56b9ba..539e4a0e 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -29,7 +29,7 @@ .extern _ZN11ItemManager6CreateEv .extern _ZN11ItemManager7DestroyEv .extern _ZN12ActorManager11DeleteActorEjb -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov04.s b/asm/ov04.s index c09fd995..40669bdf 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -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 diff --git a/asm/ov05.inc b/asm/ov05.inc index 8a840f09..881f86a2 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -30,7 +30,7 @@ .extern _ZN11ItemManager18PlayItemFanfareSfxEi .extern _ZN11ItemManager8GiveItemEi .extern _ZN12ActorManager11DeleteActorEjb -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase10GetStateIdEv diff --git a/asm/ov05.s b/asm/ov05.s index d9316952..f14275e6 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -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] diff --git a/asm/ov12.inc b/asm/ov12.inc index ac96f42e..65917eb1 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -28,7 +28,7 @@ .extern _ZN11ItemManager18EquipItem_vfunc_38Ei .extern _ZN11ItemManager19GetDungeonItemModelEj .extern _ZN11ItemManager22UpdateSwordShieldInUseEv -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p diff --git a/asm/ov12.s b/asm/ov12.s index 2fcf2950..5287929d 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -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} diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index d6df7888..670ca0b3 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -50,7 +50,7 @@ .extern _ZN11ItemManager18PlayItemFanfareSfxEi .extern _ZN11ItemManager8GiveItemEi .extern _ZN11ItemManager9SetPotionEjh -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager18func_ov00_020c3b2cEPi diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 3ffa645a..a8b4310f 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -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 diff --git a/asm/ov15.inc b/asm/ov15.inc index 17a000b7..af5c95d2 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -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 diff --git a/asm/ov15.s b/asm/ov15.s index 17a3ea23..62c2a705 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -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] diff --git a/asm/ov17.inc b/asm/ov17.inc index 7a51885d..5e248ae9 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -3,7 +3,7 @@ .extern Divide .extern _ZN11ItemManager12GetItemModelEj .extern _ZN11ItemManager19GetDungeonItemModelEj -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager18func_ov00_020c3b2cEPi .extern _ZN12ActorManager18func_ov00_020c3bb0EiPi diff --git a/asm/ov17.s b/asm/ov17.s index 176c563a..ec0c0ad3 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -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 diff --git a/asm/ov18.inc b/asm/ov18.inc index 91b3a568..cf271ff5 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -1,7 +1,7 @@ #pragma once .extern Approach_thunk .extern Divide -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov18.s b/asm/ov18.s index 94b6d2ef..d1446bfe 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -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 diff --git a/asm/ov19.inc b/asm/ov19.inc index 7ace5dba..1ea9900f 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -12,7 +12,7 @@ .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN11ItemManager7AddItemEi -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager18func_ov00_020c3b2cEPi .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov19.s b/asm/ov19.s index a99116f7..75e4e7f8 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -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 diff --git a/asm/ov20.inc b/asm/ov20.inc index 480b7d4d..4ee908f7 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -11,7 +11,7 @@ .extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN11ItemManager7AddItemEi -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase12GetPlayerPosEv diff --git a/asm/ov20.s b/asm/ov20.s index 1c8dfcbb..a27c02e3 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -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] diff --git a/asm/ov22.inc b/asm/ov22.inc index 87ea724f..a47af56a 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -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 diff --git a/asm/ov22.s b/asm/ov22.s index 2b406907..f4b8edd2 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -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 diff --git a/asm/ov23.inc b/asm/ov23.inc index 5ca9be5d..2be0119e 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -25,7 +25,7 @@ .extern _ZN10MapManager18func_ov00_02084d24Ecci .extern _ZN10PlayerBase12CollidesWithEP8Cylinder .extern _ZN11ItemManager12GetItemModelEj -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov23.s b/asm/ov23.s index 587af445..c9930f0e 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -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 diff --git a/asm/ov25.inc b/asm/ov25.inc index 84d9b1b7..7150ff48 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -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 diff --git a/asm/ov25.s b/asm/ov25.s index 8592f1ed..72fe5436 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -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} diff --git a/asm/ov29.inc b/asm/ov29.inc index 6ffc6013..2a4d6536 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -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 diff --git a/asm/ov29.s b/asm/ov29.s index 27a98020..80ad31ff 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -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 diff --git a/asm/ov30.inc b/asm/ov30.inc index bd3ab860..3db0a956 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -1,7 +1,7 @@ #pragma once .extern Divide .extern _ZN10PlayerBase12CollidesWithEP8Cylinder -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov30.s b/asm/ov30.s index c239dda2..d1e89937 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -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] diff --git a/asm/ov32.inc b/asm/ov32.inc index 7c9ac082..d26f5c62 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -8,7 +8,7 @@ .extern _ZN10MapManager18func_ov00_02084cc8Ei .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase12CollidesWithEP8Cylinder -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN14AdventureFlags18func_Ov00_02097810Ei diff --git a/asm/ov32.s b/asm/ov32.s index f07d46db..2081d2c2 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -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 diff --git a/asm/ov36.inc b/asm/ov36.inc index 09d33e41..3406095f 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -3,7 +3,7 @@ .extern Divide .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN11ItemManager12GetEquipItemEi -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN5Actor10GetAngleToEP5Vec3p diff --git a/asm/ov36.s b/asm/ov36.s index c4640108..d03372d1 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -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] diff --git a/asm/ov43.inc b/asm/ov43.inc index e34e395f..138f350e 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -1,7 +1,7 @@ #pragma once .extern Divide .extern _ZN10PlayerBase12CollidesWithEP8Cylinder -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN5Actor10GetAngleToEP5Vec3p diff --git a/asm/ov43.s b/asm/ov43.s index 7d6d705b..9a98abfd 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -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 diff --git a/asm/ov44.inc b/asm/ov44.inc index 4f197842..2c242081 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -1,7 +1,7 @@ #pragma once .extern Approach_thunk .extern Divide -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN5Actor10SetUnk_11bEv diff --git a/asm/ov44.s b/asm/ov44.s index a0af6e4c..dc47ea0f 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -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 diff --git a/asm/ov48.inc b/asm/ov48.inc index 18e32c3e..315a8ca7 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -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 diff --git a/asm/ov48.s b/asm/ov48.s index ca75871c..521a85cf 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -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 diff --git a/asm/ov50.inc b/asm/ov50.inc index 18c4ddbc..48e7af45 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -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 diff --git a/asm/ov50.s b/asm/ov50.s index d9aedd29..16778493 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -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 diff --git a/asm/ov53.inc b/asm/ov53.inc index 3aa3e55f..a790ead7 100644 --- a/asm/ov53.inc +++ b/asm/ov53.inc @@ -1,6 +1,6 @@ #pragma once .extern _ZN11ItemManager12GetItemModelEj -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase14GetPlayerAngleEv .extern _ZN13LinkStateBase18func_ov00_020a81fcEv diff --git a/asm/ov53.s b/asm/ov53.s index e4718c3e..e84bc5ff 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -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] diff --git a/asm/ov54.inc b/asm/ov54.inc index eeea191f..c51d7380 100644 --- a/asm/ov54.inc +++ b/asm/ov54.inc @@ -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 diff --git a/asm/ov54.s b/asm/ov54.s index c72f851d..a73c779c 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -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