mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-09 12:36:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

ActorFilterBase -> FilterActorBase

Browse Source
This commit is contained in:
Aetias
2024-04-13 19:05:17 +02:00
parent 2175c4e5b5
commit 93c2d93d17
23 changed files with 83 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/ActorManager.s
+7 -7
View File
@@ -225,9 +225,9 @@ _020c36ac:
bx lr
arm_func_end _ZN12ActorManager8GetActorEP8ActorRef
.global _ZN11ActorFilter6FilterEP5Actor
arm_func_start _ZN11ActorFilter6FilterEP5Actor
_ZN11ActorFilter6FilterEP5Actor: ; 0x020c36b4
.global _ZN11FilterActor6FilterEP5Actor
arm_func_start _ZN11FilterActor6FilterEP5Actor
_ZN11FilterActor6FilterEP5Actor: ; 0x020c36b4
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
mov r5, r0
@@ -310,7 +310,7 @@ _020c37e0:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN11ActorFilter6FilterEP5Actor
arm_func_end _ZN11FilterActor6FilterEP5Actor
.global _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
arm_func_start _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
@@ -876,6 +876,6 @@ data_ov00_020e72e8: ; 0x020e72e8
.global data_ov00_020e72ec
data_ov00_020e72ec: ; 0x020e72ec
.byte 0x00, 0x00, 0x00, 0x00
.global _ZTV11ActorFilter
_ZTV11ActorFilter: ; 0x020e72f0
.word _ZN11ActorFilter6FilterEP5Actor
.global _ZTV11FilterActor
_ZTV11FilterActor: ; 0x020e72f0
.word _ZN11FilterActor6FilterEP5Actor
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -88,7 +88,7 @@
.extern data_ov00_020e2e3c
.extern data_ov00_020e2f04
.extern data_ov00_020e5684
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e899c
.extern data_ov00_020e8b08
.extern data_ov00_020e9360
asm/ov14/ov14_0213b778.s
+2 -2
View File
@@ -20,7 +20,7 @@ _0213b794:
blo _0213b794
ldr r0, _0213b8fc ; =data_027e0fe4
mov r6, #0
ldr r5, _0213b900 ; =_ZTV11ActorFilter
ldr r5, _0213b900 ; =_ZTV11FilterActor
add r3, sp, #0x40
str r1, [sp, #0x10]
add sb, sp, #0x54
@@ -110,7 +110,7 @@ _0213b8f0:
.align 2, 0
arm_func_end func_ov14_0213b778
_0213b8fc: .word data_027e0fe4
_0213b900: .word _ZTV11ActorFilter
_0213b900: .word _ZTV11FilterActor
.global func_ov14_0213b904
arm_func_start func_ov14_0213b904
asm/ov15.inc
+1 -1
View File
@@ -111,7 +111,7 @@
.extern data_ov00_020e2f04
.extern data_ov00_020e2f68
.extern data_ov00_020e5868
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e83cc
.extern data_ov00_020e899c
.extern data_ov00_020e9360
asm/ov15.s
+2 -2
View File
@@ -59930,7 +59930,7 @@ func_ov15_02152184: ; 0x02152184
sub r8, r1, #2
mov r6, #0
add r5, sp, #0x68
ldr ip, _0215234c ; =_ZTV11ActorFilter
ldr ip, _0215234c ; =_ZTV11FilterActor
ldr sb, _02152350 ; =0x4653524c
add r4, sp, #0xc
mov r3, #5
@@ -60038,7 +60038,7 @@ _02152330:
.align 2, 0
arm_func_end func_ov15_02152184
_02152348: .word data_027e0fe4
_0215234c: .word _ZTV11ActorFilter
_0215234c: .word _ZTV11FilterActor
_02152350: .word 0x4653524c
_02152354: .word data_027e1060
asm/ov19.inc
+1 -1
View File
@@ -53,7 +53,7 @@
.extern data_ov00_020e2dd8
.extern data_ov00_020e2e3c
.extern data_ov00_020e2f04
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e9360
.extern data_ov00_020e9370
.extern data_ov00_020ec9d4
asm/ov19.s
+2 -2
View File
@@ -8741,7 +8741,7 @@ _02174910:
blo _02174910
ldr r0, _021749e8 ; =data_027e0fe4
mov lr, #0
ldr r6, _021749ec ; =_ZTV11ActorFilter
ldr r6, _021749ec ; =_ZTV11FilterActor
add ip, sp, #0x40
ldr r5, _021749f0 ; =0x4d4c4457
add r4, sp, #0x54
@@ -8793,7 +8793,7 @@ _021749dc:
.align 2, 0
arm_func_end func_ov19_021748fc
_021749e8: .word data_027e0fe4
_021749ec: .word _ZTV11ActorFilter
_021749ec: .word _ZTV11FilterActor
_021749f0: .word 0x4d4c4457
.global func_ov19_021749f4
asm/ov23.inc
+1 -1
View File
@@ -80,7 +80,7 @@
.extern data_ov00_020e26b4
.extern data_ov00_020e2dd8
.extern data_ov00_020e2f04
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e899c
.extern data_ov00_020e8b08
.extern data_ov00_020e9360
asm/ov23.s
+6 -6
View File
@@ -2550,7 +2550,7 @@ _0216f6bc:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
_0216f6f4:
ldr r4, _0216f890 ; =_ZTV11ActorFilter
ldr r4, _0216f890 ; =_ZTV11FilterActor
mov r1, #0
add r0, sp, #0x188
mvn r3, #0
@@ -2660,7 +2660,7 @@ _0216f880: .word 0x00000733
_0216f884: .word data_027e0fe4
_0216f888: .word 0x4e545250
_0216f88c: .word 0x50534241
_0216f890: .word _ZTV11ActorFilter
_0216f890: .word _ZTV11FilterActor
_0216f894: .word 0x414d4f53
.global func_ov23_0216f898
@@ -6551,7 +6551,7 @@ func_ov23_02172b88: ; 0x02172b88
sub sp, sp, #0x48
ldr r0, _02172bf4 ; =data_027e0fe4
mov r2, #0
ldr r4, _02172bf8 ; =_ZTV11ActorFilter
ldr r4, _02172bf8 ; =_ZTV11FilterActor
add r3, sp, #0x34
mvn ip, #0
ldr lr, _02172bfc ; =0x424f4d42
@@ -6577,7 +6577,7 @@ func_ov23_02172b88: ; 0x02172b88
.align 2, 0
arm_func_end func_ov23_02172b88
_02172bf4: .word data_027e0fe4
_02172bf8: .word _ZTV11ActorFilter
_02172bf8: .word _ZTV11FilterActor
_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 ; =_ZTV11ActorFilter
ldr r4, _021734d0 ; =_ZTV11FilterActor
mov r1, #0
add r0, sp, #0xf8
mvn r2, #0
@@ -7202,7 +7202,7 @@ _021734a8:
arm_func_end func_ov23_02173124
_021734c8: .word data_02050f54
_021734cc: .word data_027e0ffc
_021734d0: .word _ZTV11ActorFilter
_021734d0: .word _ZTV11FilterActor
_021734d4: .word 0x424f4d42
_021734d8: .word data_027e0fe4
_021734dc: .word 0x00000733
asm/ov25.inc
+1 -1
View File
@@ -40,7 +40,7 @@
.extern data_027e10b8
.extern data_ov00_020e2dd8
.extern data_ov00_020e2f04
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e8398
.extern data_ov00_020e892c
.extern data_ov00_020e8b08
asm/ov25.s
+12 -12
View File
@@ -164,7 +164,7 @@ _0216d860:
blo _0216d860
ldr r0, _0216da98 ; =data_027e0fe4
mov sb, #0
ldr lr, _0216da9c ; =_ZTV11ActorFilter
ldr lr, _0216da9c ; =_ZTV11FilterActor
add r8, sp, #0x40
ldr ip, _0216daa0 ; =0x43425331
add r7, sp, #0x54
@@ -307,7 +307,7 @@ _0216da7c:
.align 2, 0
arm_func_end func_ov25_0216d844
_0216da98: .word data_027e0fe4
_0216da9c: .word _ZTV11ActorFilter
_0216da9c: .word _ZTV11FilterActor
_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 ; =_ZTV11ActorFilter
ldr r7, _0216eed4 ; =_ZTV11FilterActor
ldr r6, _0216eed8 ; =0x43425330
mov r1, #4
add r2, sp, #0x44
@@ -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 _ZTV11ActorFilter
_0216eed4: .word _ZTV11FilterActor
_0216eed8: .word 0x43425330
_0216eedc: .word data_027e0fe4
_0216eee0: .word data_027e0764
@@ -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 ; =_ZTV11ActorFilter
ldr r7, _02173580 ; =_ZTV11FilterActor
mov r4, #0
add r3, sp, #0xc0
mvn r5, #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 _ZTV11ActorFilter
_02173580: .word _ZTV11FilterActor
_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 ; =_ZTV11ActorFilter
ldr lr, _02173a40 ; =_ZTV11FilterActor
ldr ip, _02173a44 ; =0x43425331
ldr r0, [r1]
add r5, sp, #0xc
@@ -7402,7 +7402,7 @@ _02173a30:
.align 2, 0
arm_func_end func_ov25_02173728
_02173a3c: .word data_027e0fe4
_02173a40: .word _ZTV11ActorFilter
_02173a40: .word _ZTV11FilterActor
_02173a44: .word 0x43425331
.global func_ov25_02173a48
@@ -8735,7 +8735,7 @@ _02174d3c:
mov r2, #0
add r1, sp, #0x214
mvn r3, #0
ldr r6, _021750ac ; =_ZTV11ActorFilter
ldr r6, _021750ac ; =_ZTV11FilterActor
ldr r5, _021750b0 ; =0x43425331
add r7, sp, #0x160
mov r0, #0x10
@@ -8965,7 +8965,7 @@ _0217509c: .word 0x00000bb8
_021750a0: .word data_027e0f64
_021750a4: .word data_027e0fe4
_021750a8: .word data_027e0c68
_021750ac: .word _ZTV11ActorFilter
_021750ac: .word _ZTV11FilterActor
_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 ; =_ZTV11ActorFilter
ldr lr, _02175c4c ; =_ZTV11FilterActor
ldr ip, _02175c50 ; =0x43425330
ldr r0, [r1]
add r4, sp, #0xc
@@ -9853,7 +9853,7 @@ _02175c30:
.align 2, 0
arm_func_end func_ov25_02175b08
_02175c48: .word data_027e0fe4
_02175c4c: .word _ZTV11ActorFilter
_02175c4c: .word _ZTV11FilterActor
_02175c50: .word 0x43425330
.global func_ov25_02175c54
asm/ov30.inc
+1 -1
View File
@@ -30,7 +30,7 @@
.extern data_027e0ffc
.extern data_027e1038
.extern data_027e10b4
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e8398
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
asm/ov30.s
+12 -12
View File
@@ -8365,7 +8365,7 @@ func_ov30_02182634: ; 0x02182634
mov r1, #0
add r0, sp, #0x128
mvn r2, #0
ldr r5, _02182abc ; =_ZTV11ActorFilter
ldr r5, _02182abc ; =_ZTV11FilterActor
ldr r3, _02182ac0 ; =0x424f4d42
str r5, [sp, #0xf4]
add r5, sp, #0x74
@@ -8619,7 +8619,7 @@ _02182960:
arm_func_end func_ov30_02182634
_02182ab4: .word 0x0000ffff
_02182ab8: .word data_027e0e60
_02182abc: .word _ZTV11ActorFilter
_02182abc: .word _ZTV11FilterActor
_02182ac0: .word 0x424f4d42
_02182ac4: .word data_027e0fe4
_02182ac8: .word data_02050f54
@@ -9414,7 +9414,7 @@ func_ov30_021833ec: ; 0x021833ec
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
_02183448:
ldr r3, _02183804 ; =_ZTV11ActorFilter
ldr r3, _02183804 ; =_ZTV11FilterActor
mvn r5, #0
mov r6, #0
add r1, sp, #0x2a8
@@ -9499,7 +9499,7 @@ _02183578:
add r8, r8, #8
blt _02183524
_0218358c:
ldr r7, _02183804 ; =_ZTV11ActorFilter
ldr r7, _02183804 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x1d4
mvn r3, #0
@@ -9568,7 +9568,7 @@ _0218367c:
add r8, r8, #8
blt _02183628
_02183690:
ldr r7, _02183804 ; =_ZTV11ActorFilter
ldr r7, _02183804 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x100
mvn r3, #0
@@ -9670,7 +9670,7 @@ _021837f4:
.align 2, 0
arm_func_end func_ov30_021833ec
_02183800: .word 0x43485334
_02183804: .word _ZTV11ActorFilter
_02183804: .word _ZTV11FilterActor
_02183808: .word 0x464f5243
_0218380c: .word data_027e0fe4
_02183810: .word 0x43525953
@@ -11486,7 +11486,7 @@ _02184b38:
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
_02184b4c:
ldr r6, _02185258 ; =_ZTV11ActorFilter
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x490
mvn r3, #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 ; =_ZTV11ActorFilter
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x3bc
mvn r3, #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 ; =_ZTV11ActorFilter
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x2e8
mvn r3, #0
@@ -11779,7 +11779,7 @@ _02184f78:
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
_02184f8c:
ldr r6, _02185258 ; =_ZTV11ActorFilter
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x214
mvn r3, #0
@@ -11874,7 +11874,7 @@ _021850d8:
add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
_021850ec:
ldr r6, _02185258 ; =_ZTV11ActorFilter
ldr r6, _02185258 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x140
mvn r3, #0
@@ -11974,7 +11974,7 @@ _02185240:
_0218524c: .word data_ov30_02188b08
_02185250: .word data_027e0fe4
_02185254: .word data_027e0e60
_02185258: .word _ZTV11ActorFilter
_02185258: .word _ZTV11FilterActor
_0218525c: .word 0x57544352
_02185260: .word 0x43485352
_02185264: .word 0x43485332
asm/ov32.inc
+1 -1
View File
@@ -42,7 +42,7 @@
.extern data_ov00_020e2e3c
.extern data_ov00_020e2f04
.extern data_ov00_020e2f98
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e9370
.extern func_01ff81f8
.extern func_01ff8214
asm/ov32.s
+2 -2
View File
@@ -10255,7 +10255,7 @@ func_ov32_0218439c: ; 0x0218439c
mov r4, r0
add r3, sp, #0x70
mvn r5, #0
ldr r7, _02184540 ; =_ZTV11ActorFilter
ldr r7, _02184540 ; =_ZTV11FilterActor
ldr r6, _02184544 ; =0x42454530
ldr r0, [r1]
add r1, sp, #0x3c
@@ -10355,7 +10355,7 @@ func_ov32_0218439c: ; 0x0218439c
.align 2, 0
arm_func_end func_ov32_0218439c
_0218453c: .word data_027e0fe4
_02184540: .word _ZTV11ActorFilter
_02184540: .word _ZTV11FilterActor
_02184544: .word 0x42454530
_02184548: .word data_02050f54
_0218454c: .word 0x0000019a
asm/ov43.inc
+1 -1
View File
@@ -21,7 +21,7 @@
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e9370
.extern data_ov00_020eec9c
.extern func_01ff9958
asm/ov43.s
+4 -4
View File
@@ -744,7 +744,7 @@ _02189ebc:
blo _02189ebc
ldr r0, _02189f94 ; =data_027e0fe4
mov r7, #0
ldr lr, _02189f98 ; =_ZTV11ActorFilter
ldr lr, _02189f98 ; =_ZTV11FilterActor
add r5, sp, #0x40
ldr ip, _02189f9c ; =0x50424c4e
add r4, sp, #0x54
@@ -796,7 +796,7 @@ _02189f78:
.align 2, 0
arm_func_end func_ov43_02189ea4
_02189f94: .word data_027e0fe4
_02189f98: .word _ZTV11ActorFilter
_02189f98: .word _ZTV11FilterActor
_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 ; =_ZTV11ActorFilter
ldr ip, _0218a0f0 ; =_ZTV11FilterActor
add r6, sp, #0x40
ldr r8, _0218a0f4 ; =0x50424c4e
add r5, sp, #0x54
@@ -895,7 +895,7 @@ _0218a0dc:
.align 2, 0
arm_func_end func_ov43_02189fa0
_0218a0ec: .word data_027e0fe4
_0218a0f0: .word _ZTV11ActorFilter
_0218a0f0: .word _ZTV11FilterActor
_0218a0f4: .word 0x50424c4e
_0218a0f8: .word data_027e0ffc
_0218a0fc: .word 0x000003ad
asm/ov44.inc
+1 -1
View File
@@ -16,7 +16,7 @@
.extern data_027e0fec
.extern data_027e0ff0
.extern data_027e0ffc
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e8398
.extern data_ov00_020e892c
.extern data_ov00_020e9370
asm/ov44.s
+4 -4
View File
@@ -6555,7 +6555,7 @@ func_ov44_0218e4a0: ; 0x0218e4a0
movne r0, #0
ldmneia sp!, {r4, r5, pc}
_0218e4ec:
ldr ip, _0218e58c ; =_ZTV11ActorFilter
ldr ip, _0218e58c ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x38
mvn r3, #0
@@ -6597,7 +6597,7 @@ _0218e4ec:
.align 2, 0
arm_func_end func_ov44_0218e4a0
_0218e588: .word data_027e0e60
_0218e58c: .word _ZTV11ActorFilter
_0218e58c: .word _ZTV11FilterActor
_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 ; =_ZTV11ActorFilter
ldr r7, _0218e6a8 ; =_ZTV11FilterActor
add ip, sp, #0x40
ldr r6, _0218e6ac ; =0x52415448
add r5, sp, #0x54
@@ -6676,7 +6676,7 @@ _0218e684:
.align 2, 0
arm_func_end func_ov44_0218e598
_0218e6a4: .word data_027e0fe4
_0218e6a8: .word _ZTV11ActorFilter
_0218e6a8: .word _ZTV11FilterActor
_0218e6ac: .word 0x52415448
_0218e6b0: .word data_027e0764
asm/ov48.inc
+1 -1
View File
@@ -20,7 +20,7 @@
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
.extern _ZTV11ActorFilter
.extern _ZTV11FilterActor
.extern data_ov00_020e892c
.extern func_01ff81f8
.extern func_01ff8214
asm/ov48.s
+3 -3
View File
@@ -4822,7 +4822,7 @@ _02193b5c:
mov r2, #0
add r1, sp, #0x258
mvn r3, #0
ldr r5, _02193f38 ; =_ZTV11ActorFilter
ldr r5, _02193f38 ; =_ZTV11FilterActor
ldr r4, _02193f3c ; =0x424f4d42
add r6, sp, #0x1a4
mov r0, #0x10
@@ -4926,7 +4926,7 @@ _02193cfc:
cmp r5, r0
blt _02193c18
_02193d10:
ldr r5, _02193f38 ; =_ZTV11ActorFilter
ldr r5, _02193f38 ; =_ZTV11FilterActor
mov r2, #0
add r1, sp, #0x184
mvn r3, #0
@@ -5077,7 +5077,7 @@ _02193f28: .word data_02050f54
_02193f2c: .word data_027e0e58
_02193f30: .word 0x000004cd
_02193f34: .word data_ov48_02194688
_02193f38: .word _ZTV11ActorFilter
_02193f38: .word _ZTV11FilterActor
_02193f3c: .word 0x424f4d42
_02193f40: .word data_027e0fe4
_02193f44: .word 0x424d5459
include/Actor/ActorManager.hpp
+2 -10
View File
@@ -4,6 +4,7 @@
#include "types.h"
#include "Actor/Actor.hpp"
#include "Actor/FilterActorBase.hpp"
#include "Physics/AABB.hpp"
#include "Physics/Sphere.hpp"
@@ -13,15 +14,6 @@ struct ActorRef {
/* 8 */
};
class ActorFilterBase {
public:
/* 0 (vtable) */
/* 4 */
/* 0 */ virtual bool Filter(Actor *actor) = 0;
/* 4 */
};
struct ActorManager_UnkStruct_68 {
/* 0 */ u32 unk_0;
/* 4 */ u32 unk_4;
@@ -29,7 +21,7 @@ struct ActorManager_UnkStruct_68 {
/* c */
};
class ActorFilter : public ActorFilterBase {
class FilterActor : public FilterActorBase {
/* 00 (base) */
/* 04 */ u32 mType;
/* 08 */ s32 mUnk_08;
include/Actor/FilterActorBase.hpp
+15
View File
@@ -0,0 +1,15 @@
#pragma once
#include "global.h"
#include "types.h"
#include "Actor/Actor.hpp"
class FilterActorBase {
public:
/* 0 (vtable) */
/* 4 */
/* 0 */ virtual bool Filter(Actor *actor) = 0;
/* 4 */
};