Decomp Actor

asm/ov00/Actor/Actor.s

@@ -525,9 +525,9 @@ _020c1a28: .word gPlayer
 _020c1a2c: .word gPlayerLink
 	arm_func_end _ZN5Actor18func_ov00_020c198cEv
 
-	.global _ZN20KillPickupItemActors6FilterEP5Actor
-	arm_func_start _ZN20KillPickupItemActors6FilterEP5Actor
-_ZN20KillPickupItemActors6FilterEP5Actor: ; 0x020c1a30
+	.global _ZN17KillPickupsFilter6FilterEP5Actor
+	arm_func_start _ZN17KillPickupsFilter6FilterEP5Actor
+_ZN17KillPickupsFilter6FilterEP5Actor: ; 0x020c1a30
 	stmdb sp!, {r3, lr}
 	ldr ip, [r1, #4]
 	ldr r3, _020c1af8 ; =0x464c414c
@@ -595,7 +595,7 @@ _020c1b08: .word 0x424f4d42
 _020c1b0c: .word 0x464c544d
 _020c1b10: .word 0x48415254
 _020c1b14: .word 0x52555059
-	arm_func_end _ZN20KillPickupItemActors6FilterEP5Actor
+	arm_func_end _ZN17KillPickupsFilter6FilterEP5Actor
 
 	.global _ZN5Actor20KillPickupItemActorsEv
 	arm_func_start _ZN5Actor20KillPickupItemActorsEv
@@ -612,7 +612,7 @@ _020c1b2c:
 	cmp r2, r0
 	blo _020c1b2c
 	ldr r0, _020c1b64 ; =gActorManager
-	ldr r3, _020c1b68 ; =_ZTV20KillPickupItemActors
+	ldr r3, _020c1b68 ; =_ZTV17KillPickupsFilter
 	ldr r0, [r0]
 	add r1, sp, #0
 	mov r2, #0
@@ -622,7 +622,7 @@ _020c1b2c:
 	ldmia sp!, {pc}
 	.align 2, 0
 _020c1b64: .word gActorManager
-_020c1b68: .word _ZTV20KillPickupItemActors
+_020c1b68: .word _ZTV17KillPickupsFilter
 	arm_func_end _ZN5Actor20KillPickupItemActorsEv
 
 	.global _ZN5Actor15TrySetTransformEP9Transform
@@ -691,9 +691,9 @@ _020c1c18: .word gMapManager
 _020c1c1c: .word _ZN10MapManager18func_ov00_02084be0Eii
 	arm_func_end _ZN5Actor18func_Ov00_020c1bfcEi
 
-	.global _ZN5Actor18func_ov00_020c1c20Eiii
-	arm_func_start _ZN5Actor18func_ov00_020c1c20Eiii
-_ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20
+	.global _ZN5Actor18func_ov00_020c1c20Eii
+	arm_func_start _ZN5Actor18func_ov00_020c1c20Eii
+_ZN5Actor18func_ov00_020c1c20Eii: ; 0x020c1c20
 	stmdb sp!, {r3, lr}
 	add ip, r0, r1
 	ldr r0, _020c1c44 ; =gMapManager
@@ -705,7 +705,7 @@ _ZN5Actor18func_ov00_020c1c20Eiii: ; 0x020c1c20
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _020c1c44: .word gMapManager
-	arm_func_end _ZN5Actor18func_ov00_020c1c20Eiii
+	arm_func_end _ZN5Actor18func_ov00_020c1c20Eii
 
 	.global _ZN5Actor8vfunc_48Ei
 	arm_func_start _ZN5Actor8vfunc_48Ei
@@ -2814,9 +2814,9 @@ data_ov00_020e71dc: ; 0x020e71dc
     .word data_ov00_020e71a0
 	.byte 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
-	.global _ZTV20KillPickupItemActors
-_ZTV20KillPickupItemActors: ; 0x020e71e8
-    .word _ZN20KillPickupItemActors6FilterEP5Actor
+	.global _ZTV17KillPickupsFilter
+_ZTV17KillPickupsFilter: ; 0x020e71e8
+    .word _ZN17KillPickupsFilter6FilterEP5Actor
 	.byte 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.global _ZTV5Actor

asm/ov00/ov00_02086cd0.inc

@@ -58,7 +58,7 @@
 .extern _ZN5Actor15TrySetTransformEP9Transform
 .extern _ZN5Actor16CollidesWithLinkEv
 .extern _ZN5Actor18func_Ov00_020c1bfcEi
-.extern _ZN5Actor18func_ov00_020c1c20Eiii
+.extern _ZN5Actor18func_ov00_020c1c20Eii
 .extern _ZN5Actor18func_ov00_020c313cEj
 .extern _ZN5Actor6GetPosEv
 .extern _ZN5Actor8vfunc_08Ev

asm/ov00/ov00_02086cd0.s

@@ -10921,12 +10921,12 @@ func_ov00_0208fc10: ; 0x0208fc10
 _0208fc38:
 	mov r1, #0
 	mov r2, r1
-	bl _ZN5Actor18func_ov00_020c1c20Eiii
+	bl _ZN5Actor18func_ov00_020c1c20Eii
 	b _0208fc74
 _0208fc48:
 	mov r1, #0
 	mov r2, #1
-	bl _ZN5Actor18func_ov00_020c1c20Eiii
+	bl _ZN5Actor18func_ov00_020c1c20Eii
 	ldr r0, [r4, #0x158]
 	cmp r0, #0
 	moveq r0, #0
@@ -11559,7 +11559,7 @@ func_ov00_0209048c: ; 0x0209048c
 	bne _020904bc
 	mov r1, #0
 	mov r2, #1
-	bl _ZN5Actor18func_ov00_020c1c20Eiii
+	bl _ZN5Actor18func_ov00_020c1c20Eii
 	mov r0, #0
 	strb r0, [r4, #0x118]
 _020904bc:

asm/ov00/ov00_020b1498.inc

@@ -107,7 +107,7 @@
 .extern _ZN5Actor16CollidesWithLinkEv
 .extern _ZN5Actor16XzDistanceToLinkEv
 .extern _ZN5Actor18func_Ov00_020c1bfcEi
-.extern _ZN5Actor18func_ov00_020c1c20Eiii
+.extern _ZN5Actor18func_ov00_020c1c20Eii
 .extern _ZN5Actor18func_ov00_020c313cEj
 .extern _ZN5Actor20IncreaseActiveFramesEv
 .extern _ZN5Actor4KillEv

asm/ov00/ov00_020b1498.s

@@ -16521,7 +16521,7 @@ _020be3e4:
 	mov r1, #1
 	mov r0, r5
 	mov r2, r1
-	bl _ZN5Actor18func_ov00_020c1c20Eiii
+	bl _ZN5Actor18func_ov00_020c1c20Eii
 	mov r0, r5
 	bl _ZN5Actor4KillEv
 	ldmia sp!, {r3, r4, r5, pc}

asm/ov00/ov00_020c3e54.inc

@@ -60,7 +60,7 @@
 .extern _ZN5Actor18func_Ov00_020c1bfcEi
 .extern _ZN5Actor18func_ov00_020c195cEv
 .extern _ZN5Actor18func_ov00_020c198cEv
-.extern _ZN5Actor18func_ov00_020c1c20Eiii
+.extern _ZN5Actor18func_ov00_020c1c20Eii
 .extern _ZN5Actor18func_ov00_020c1cf8Ev
 .extern _ZN5Actor18func_ov00_020c1fc8Ej
 .extern _ZN5Actor18func_ov00_020c243cEiPi

asm/ov00/ov00_020c3e54.s

@@ -20420,7 +20420,7 @@ func_ov00_020d3ca8: ; 0x020d3ca8
 	stmdb sp!, {r3, lr}
 	mov r1, #1
 	mov r2, r1
-	bl _ZN5Actor18func_ov00_020c1c20Eiii
+	bl _ZN5Actor18func_ov00_020c1c20Eii
 	mov r0, #1
 	ldmia sp!, {r3, pc}
 	arm_func_end func_ov00_020d3ca8