diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index 79a800db..43d61e13 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -1536,9 +1536,9 @@ _020c273c: .word 0x54535542 _020c2740: .word 0x564c5230 arm_func_end _ZN5Actor18func_ov00_020c243cEPjPPS_ - .global _ZN5Actor12CollidesWithEPKS_ - arm_func_start _ZN5Actor12CollidesWithEPKS_ -_ZN5Actor12CollidesWithEPKS_: ; 0x020c2744 + .global _ZN5Actor12CollidesWithEPS_ + arm_func_start _ZN5Actor12CollidesWithEPS_ +_ZN5Actor12CollidesWithEPS_: ; 0x020c2744 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x20 mov r5, r1 @@ -1565,7 +1565,7 @@ _020c279c: mov r0, r4 add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, pc} - arm_func_end _ZN5Actor12CollidesWithEPKS_ + arm_func_end _ZN5Actor12CollidesWithEPS_ .global _ZN5Actor18func_ov00_020c27a8Ei arm_func_start _ZN5Actor18func_ov00_020c27a8Ei @@ -2872,7 +2872,7 @@ data_ov00_020e7234: ; 0x020e7234 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e7238 data_ov00_020e7238: ; 0x020e7238 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e723c data_ov00_020e723c: ; 0x020e723c .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index 2b9fbbea..34c722e6 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -51,7 +51,7 @@ .extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 90084886..c0a22721 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -24323,7 +24323,7 @@ data_ov00_020e2970: ; 0x020e2970 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e2974 data_ov00_020e2974: ; 0x020e2974 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e2978 data_ov00_020e2978: ; 0x020e2978 .word _ZN5Actor8vfunc_48EP9Knockback @@ -24464,7 +24464,7 @@ data_ov00_020e2a2c: ; 0x020e2a2c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e2a30 data_ov00_020e2a30: ; 0x020e2a30 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e2a34 data_ov00_020e2a34: ; 0x020e2a34 .word _ZN5Actor8vfunc_48EP9Knockback @@ -24605,7 +24605,7 @@ data_ov00_020e2ae8: ; 0x020e2ae8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e2aec data_ov00_020e2aec: ; 0x020e2aec - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e2af0 data_ov00_020e2af0: ; 0x020e2af0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index aaaf6236..2bea3e39 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -29,7 +29,7 @@ .extern _ZN14AdventureFlags6ExistsEv .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index df533b5d..84a6d219 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -24559,7 +24559,7 @@ data_ov00_020e4c90: ; 0x020e4c90 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e4c94 data_ov00_020e4c94: ; 0x020e4c94 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e4c98 data_ov00_020e4c98: ; 0x020e4c98 .word _ZN5Actor8vfunc_48EP9Knockback @@ -25022,7 +25022,7 @@ data_ov00_020e4f38: ; 0x020e4f38 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e4f3c data_ov00_020e4f3c: ; 0x020e4f3c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e4f40 data_ov00_020e4f40: ; 0x020e4f40 .word _ZN5Actor8vfunc_48EP9Knockback @@ -25716,7 +25716,7 @@ data_ov00_020e533c: ; 0x020e533c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e5340 data_ov00_020e5340: ; 0x020e5340 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e5344 data_ov00_020e5344: ; 0x020e5344 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index d81b24a2..a7e886ea 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -98,7 +98,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 35d02683..6188115c 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -23088,7 +23088,7 @@ data_ov00_020e65a0: ; 0x020e65a0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e65a4 data_ov00_020e65a4: ; 0x020e65a4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e65a8 data_ov00_020e65a8: ; 0x020e65a8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -23301,7 +23301,7 @@ data_ov00_020e66bc: ; 0x020e66bc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e66c0 data_ov00_020e66c0: ; 0x020e66c0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e66c4 data_ov00_020e66c4: ; 0x020e66c4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -23579,7 +23579,7 @@ data_ov00_020e6824: ; 0x020e6824 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e6828 data_ov00_020e6828: ; 0x020e6828 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e682c data_ov00_020e682c: ; 0x020e682c .word _ZN5Actor8vfunc_48EP9Knockback @@ -24210,7 +24210,7 @@ data_ov00_020e6d84: ; 0x020e6d84 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e6d88 data_ov00_020e6d88: ; 0x020e6d88 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e6d8c data_ov00_020e6d8c: ; 0x020e6d8c .word _ZN5Actor8vfunc_48EP9Knockback @@ -24842,7 +24842,7 @@ data_ov00_020e70e0: ; 0x020e70e0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e70e4 data_ov00_020e70e4: ; 0x020e70e4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e70e8 data_ov00_020e70e8: ; 0x020e70e8 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index 47cc2182..f6e11ef1 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -46,7 +46,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12KillInBoundsEv .extern _ZN5Actor12SetTransformEP9Transform diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index b57f6f5b..0505a536 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -31304,7 +31304,7 @@ data_ov00_020e84a0: ; 0x020e84a0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e84a4 data_ov00_020e84a4: ; 0x020e84a4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e84a8 data_ov00_020e84a8: ; 0x020e84a8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -31542,7 +31542,7 @@ data_ov00_020e8618: ; 0x020e8618 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e861c data_ov00_020e861c: ; 0x020e861c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e8620 data_ov00_020e8620: ; 0x020e8620 .word _ZN5Actor8vfunc_48EP9Knockback @@ -31764,7 +31764,7 @@ data_ov00_020e8740: ; 0x020e8740 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e8744 data_ov00_020e8744: ; 0x020e8744 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e8748 data_ov00_020e8748: ; 0x020e8748 .word _ZN5Actor8vfunc_48EP9Knockback @@ -31905,7 +31905,7 @@ data_ov00_020e87fc: ; 0x020e87fc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e8800 data_ov00_020e8800: ; 0x020e8800 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e8804 data_ov00_020e8804: ; 0x020e8804 .word func_ov00_020caeb4 @@ -32657,7 +32657,7 @@ data_ov00_020e8be0: ; 0x020e8be0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e8be4 data_ov00_020e8be4: ; 0x020e8be4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e8be8 data_ov00_020e8be8: ; 0x020e8be8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -32864,7 +32864,7 @@ data_ov00_020e8cf4: ; 0x020e8cf4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e8cf8 data_ov00_020e8cf8: ; 0x020e8cf8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e8cfc data_ov00_020e8cfc: ; 0x020e8cfc .word _ZN5Actor8vfunc_48EP9Knockback @@ -33110,7 +33110,7 @@ data_ov00_020e8e3c: ; 0x020e8e3c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e8e40 data_ov00_020e8e40: ; 0x020e8e40 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e8e44 data_ov00_020e8e44: ; 0x020e8e44 .word _ZN5Actor8vfunc_48EP9Knockback @@ -33465,7 +33465,7 @@ data_ov00_020e9000: ; 0x020e9000 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e9004 data_ov00_020e9004: ; 0x020e9004 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e9008 data_ov00_020e9008: ; 0x020e9008 .word _ZN5Actor8vfunc_48EP9Knockback @@ -33710,7 +33710,7 @@ data_ov00_020e913c: ; 0x020e913c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e9140 data_ov00_020e9140: ; 0x020e9140 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e9144 data_ov00_020e9144: ; 0x020e9144 .word _ZN5Actor8vfunc_48EP9Knockback @@ -33883,7 +33883,7 @@ data_ov00_020e9228: ; 0x020e9228 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov00_020e922c data_ov00_020e922c: ; 0x020e922c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov00_020e9230 data_ov00_020e9230: ; 0x020e9230 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov03.inc b/asm/ov03.inc index c1224c1a..14bfec7e 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -13,7 +13,7 @@ .extern _ZN14OverlayManager6UnloadEj .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov03.s b/asm/ov03.s index 3c64dddf..15c0fe03 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -44982,7 +44982,7 @@ data_ov03_021008bc: ; 0x021008bc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov03_021008c0 data_ov03_021008c0: ; 0x021008c0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov03_021008c4 data_ov03_021008c4: ; 0x021008c4 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov12.inc b/asm/ov12.inc index c60ca43b..e3e4facd 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -45,7 +45,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov12.s b/asm/ov12.s index c9059091..b15398c7 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -45825,7 +45825,7 @@ data_ov12_02135bb4: ; 0x02135bb4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov12_02135bb8 data_ov12_02135bb8: ; 0x02135bb8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov12_02135bbc data_ov12_02135bbc: ; 0x02135bbc .word func_ov12_0211514c @@ -48550,7 +48550,7 @@ data_ov12_02136b2c: ; 0x02136b2c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov12_02136b30 data_ov12_02136b30: ; 0x02136b30 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov12_02136b34 data_ov12_02136b34: ; 0x02136b34 .word _ZN5Actor8vfunc_48EP9Knockback @@ -49497,7 +49497,7 @@ data_ov12_021371b4: ; 0x021371b4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov12_021371b8 data_ov12_021371b8: ; 0x021371b8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov12_021371bc data_ov12_021371bc: ; 0x021371bc .word _ZN5Actor8vfunc_48EP9Knockback @@ -49878,7 +49878,7 @@ data_ov12_0213743c: ; 0x0213743c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov12_02137440 data_ov12_02137440: ; 0x02137440 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov12_02137444 data_ov12_02137444: ; 0x02137444 .word _ZN5Actor8vfunc_48EP9Knockback @@ -50463,7 +50463,7 @@ data_ov12_02137718: ; 0x02137718 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov12_0213771c data_ov12_0213771c: ; 0x0213771c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov12_02137720 data_ov12_02137720: ; 0x02137720 .word func_ov00_020caeb4 @@ -50712,7 +50712,7 @@ data_ov12_02137864: ; 0x02137864 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov12_02137868 data_ov12_02137868: ; 0x02137868 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov12_0213786c data_ov12_0213786c: ; 0x0213786c .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov14/Actor/ActorRupee.inc b/asm/ov14/Actor/ActorRupee.inc index 78fb26fc..df7f2a46 100644 --- a/asm/ov14/Actor/ActorRupee.inc +++ b/asm/ov14/Actor/ActorRupee.inc @@ -4,7 +4,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12KillInBoundsEv .extern _ZN5Actor12SetTransformEP9Transform diff --git a/asm/ov14/Actor/ActorRupee.s b/asm/ov14/Actor/ActorRupee.s index 2a54dbe4..43ecb25d 100644 --- a/asm/ov14/Actor/ActorRupee.s +++ b/asm/ov14/Actor/ActorRupee.s @@ -884,7 +884,7 @@ data_ov14_02158a24: ; 0x02158a24 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158a28 data_ov14_02158a28: ; 0x02158a28 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158a2c data_ov14_02158a2c: ; 0x02158a2c .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index d7c56d44..b2c2eb44 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -66,7 +66,7 @@ .extern _ZN5Actor10SetUnk_129Eb .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12KillInBoundsEv .extern _ZN5Actor12SetTransformEP9Transform diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index d0db3112..92000453 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -36153,7 +36153,7 @@ data_ov14_02155b08: ; 0x02155b08 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02155b0c data_ov14_02155b0c: ; 0x02155b0c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02155b10 data_ov14_02155b10: ; 0x02155b10 .word _ZN5Actor8vfunc_48EP9Knockback @@ -36383,7 +36383,7 @@ data_ov14_02155c30: ; 0x02155c30 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02155c34 data_ov14_02155c34: ; 0x02155c34 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02155c38 data_ov14_02155c38: ; 0x02155c38 .word _ZN5Actor8vfunc_48EP9Knockback @@ -36592,7 +36592,7 @@ data_ov14_02155d3c: ; 0x02155d3c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02155d40 data_ov14_02155d40: ; 0x02155d40 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02155d44 data_ov14_02155d44: ; 0x02155d44 .word _ZN5Actor8vfunc_48EP9Knockback @@ -36789,7 +36789,7 @@ data_ov14_02155e38: ; 0x02155e38 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02155e3c data_ov14_02155e3c: ; 0x02155e3c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02155e40 data_ov14_02155e40: ; 0x02155e40 .word _ZN5Actor8vfunc_48EP9Knockback @@ -36986,7 +36986,7 @@ data_ov14_02155f34: ; 0x02155f34 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02155f38 data_ov14_02155f38: ; 0x02155f38 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02155f3c data_ov14_02155f3c: ; 0x02155f3c .word _ZN5Actor8vfunc_48EP9Knockback @@ -41988,7 +41988,7 @@ data_ov14_02157938: ; 0x02157938 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_0215793c data_ov14_0215793c: ; 0x0215793c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157940 data_ov14_02157940: ; 0x02157940 .word _ZN5Actor8vfunc_48EP9Knockback @@ -42132,7 +42132,7 @@ data_ov14_021579f8: ; 0x021579f8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_021579fc data_ov14_021579fc: ; 0x021579fc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157a00 data_ov14_02157a00: ; 0x02157a00 .word _ZN5Actor8vfunc_48EP9Knockback @@ -42276,7 +42276,7 @@ data_ov14_02157ab8: ; 0x02157ab8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02157abc data_ov14_02157abc: ; 0x02157abc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157ac0 data_ov14_02157ac0: ; 0x02157ac0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -42420,7 +42420,7 @@ data_ov14_02157b78: ; 0x02157b78 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02157b7c data_ov14_02157b7c: ; 0x02157b7c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157b80 data_ov14_02157b80: ; 0x02157b80 .word _ZN5Actor8vfunc_48EP9Knockback @@ -42564,7 +42564,7 @@ data_ov14_02157c38: ; 0x02157c38 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02157c3c data_ov14_02157c3c: ; 0x02157c3c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157c40 data_ov14_02157c40: ; 0x02157c40 .word _ZN5Actor8vfunc_48EP9Knockback @@ -42708,7 +42708,7 @@ data_ov14_02157cf8: ; 0x02157cf8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02157cfc data_ov14_02157cfc: ; 0x02157cfc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157d00 data_ov14_02157d00: ; 0x02157d00 .word _ZN5Actor8vfunc_48EP9Knockback @@ -42924,7 +42924,7 @@ data_ov14_02157e18: ; 0x02157e18 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02157e1c data_ov14_02157e1c: ; 0x02157e1c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157e20 data_ov14_02157e20: ; 0x02157e20 .word _ZN5Actor8vfunc_48EP9Knockback @@ -43143,7 +43143,7 @@ data_ov14_02157f2c: ; 0x02157f2c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02157f30 data_ov14_02157f30: ; 0x02157f30 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02157f34 data_ov14_02157f34: ; 0x02157f34 .word _ZN5Actor8vfunc_48EP9Knockback @@ -43326,7 +43326,7 @@ data_ov14_02158020: ; 0x02158020 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158024 data_ov14_02158024: ; 0x02158024 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158028 data_ov14_02158028: ; 0x02158028 .word _ZN5Actor8vfunc_48EP9Knockback @@ -43589,7 +43589,7 @@ data_ov14_02158174: ; 0x02158174 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158178 data_ov14_02158178: ; 0x02158178 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_0215817c data_ov14_0215817c: ; 0x0215817c .word _ZN5Actor8vfunc_48EP9Knockback @@ -43730,7 +43730,7 @@ data_ov14_02158230: ; 0x02158230 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158234 data_ov14_02158234: ; 0x02158234 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158238 data_ov14_02158238: ; 0x02158238 .word _ZN5Actor8vfunc_48EP9Knockback @@ -43880,7 +43880,7 @@ data_ov14_021582f8: ; 0x021582f8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_021582fc data_ov14_021582fc: ; 0x021582fc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158300 data_ov14_02158300: ; 0x02158300 .word _ZN5Actor8vfunc_48EP9Knockback @@ -44030,7 +44030,7 @@ data_ov14_021583c0: ; 0x021583c0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_021583c4 data_ov14_021583c4: ; 0x021583c4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_021583c8 data_ov14_021583c8: ; 0x021583c8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -44180,7 +44180,7 @@ data_ov14_02158488: ; 0x02158488 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_0215848c data_ov14_0215848c: ; 0x0215848c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158490 data_ov14_02158490: ; 0x02158490 .word _ZN5Actor8vfunc_48EP9Knockback @@ -44330,7 +44330,7 @@ data_ov14_02158550: ; 0x02158550 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158554 data_ov14_02158554: ; 0x02158554 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158558 data_ov14_02158558: ; 0x02158558 .word _ZN5Actor8vfunc_48EP9Knockback @@ -44480,7 +44480,7 @@ data_ov14_02158618: ; 0x02158618 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_0215861c data_ov14_0215861c: ; 0x0215861c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158620 data_ov14_02158620: ; 0x02158620 .word _ZN5Actor8vfunc_48EP9Knockback @@ -44621,7 +44621,7 @@ data_ov14_021586d4: ; 0x021586d4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_021586d8 data_ov14_021586d8: ; 0x021586d8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_021586dc data_ov14_021586dc: ; 0x021586dc .word _ZN5Actor8vfunc_48EP9Knockback @@ -44762,7 +44762,7 @@ data_ov14_02158790: ; 0x02158790 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158794 data_ov14_02158794: ; 0x02158794 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158798 data_ov14_02158798: ; 0x02158798 .word _ZN5Actor8vfunc_48EP9Knockback @@ -44903,7 +44903,7 @@ data_ov14_0215884c: ; 0x0215884c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158850 data_ov14_02158850: ; 0x02158850 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158854 data_ov14_02158854: ; 0x02158854 .word _ZN5Actor8vfunc_48EP9Knockback @@ -45053,7 +45053,7 @@ data_ov14_02158914: ; 0x02158914 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158918 data_ov14_02158918: ; 0x02158918 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_0215891c data_ov14_0215891c: ; 0x0215891c .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 1c6004a0..ae68534f 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -76,7 +76,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index 4b8f91d5..b2309c16 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -32856,7 +32856,7 @@ data_ov14_02158ae0: ; 0x02158ae0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02158ae4 data_ov14_02158ae4: ; 0x02158ae4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02158ae8 data_ov14_02158ae8: ; 0x02158ae8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -34891,7 +34891,7 @@ data_ov14_02159500: ; 0x02159500 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02159504 data_ov14_02159504: ; 0x02159504 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02159508 data_ov14_02159508: ; 0x02159508 .word _ZN5Actor8vfunc_48EP9Knockback @@ -35074,7 +35074,7 @@ data_ov14_021595f4: ; 0x021595f4 .word func_ov14_02145974 .global data_ov14_021595f8 data_ov14_021595f8: ; 0x021595f8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_021595fc data_ov14_021595fc: ; 0x021595fc .word _ZN5Actor8vfunc_48EP9Knockback @@ -35381,7 +35381,7 @@ data_ov14_02159784: ; 0x02159784 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02159788 data_ov14_02159788: ; 0x02159788 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_0215978c data_ov14_0215978c: ; 0x0215978c .word _ZN5Actor8vfunc_48EP9Knockback @@ -35636,7 +35636,7 @@ data_ov14_021598d8: ; 0x021598d8 .word func_ov14_02145974 .global data_ov14_021598dc data_ov14_021598dc: ; 0x021598dc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_021598e0 data_ov14_021598e0: ; 0x021598e0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -35966,7 +35966,7 @@ data_ov14_02159a90: ; 0x02159a90 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02159a94 data_ov14_02159a94: ; 0x02159a94 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02159a98 data_ov14_02159a98: ; 0x02159a98 .word _ZN5Actor8vfunc_48EP9Knockback @@ -36113,7 +36113,7 @@ data_ov14_02159b54: ; 0x02159b54 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02159b58 data_ov14_02159b58: ; 0x02159b58 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02159b5c data_ov14_02159b5c: ; 0x02159b5c .word _ZN5Actor8vfunc_48EP9Knockback @@ -36484,7 +36484,7 @@ data_ov14_02159d38: ; 0x02159d38 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02159d3c data_ov14_02159d3c: ; 0x02159d3c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02159d40 data_ov14_02159d40: ; 0x02159d40 .word _ZN5Actor8vfunc_48EP9Knockback @@ -36763,7 +36763,7 @@ data_ov14_02159eac: ; 0x02159eac .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_02159eb0 data_ov14_02159eb0: ; 0x02159eb0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_02159eb4 data_ov14_02159eb4: ; 0x02159eb4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -37021,7 +37021,7 @@ data_ov14_0215a004: ; 0x0215a004 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_0215a008 data_ov14_0215a008: ; 0x0215a008 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_0215a00c data_ov14_0215a00c: ; 0x0215a00c .word _ZN5Actor8vfunc_48EP9Knockback @@ -37936,7 +37936,7 @@ data_ov14_0215a4b8: ; 0x0215a4b8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_0215a4bc data_ov14_0215a4bc: ; 0x0215a4bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_0215a4c0 data_ov14_0215a4c0: ; 0x0215a4c0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -38391,7 +38391,7 @@ data_ov14_0215a70c: ; 0x0215a70c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov14_0215a710 data_ov14_0215a710: ; 0x0215a710 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov14_0215a714 data_ov14_0215a714: ; 0x0215a714 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov15.inc b/asm/ov15.inc index 45f7ad81..12a21aa4 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -82,7 +82,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov15.s b/asm/ov15.s index 0507d52a..e61032b1 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -25933,7 +25933,7 @@ func_ov15_021353ec: ; 0x021353ec bl func_ov15_0217217c ldmia sp!, {r4, pc} _0213542c: - bl _ZN5Actor12CollidesWithEPKS_ + bl _ZN5Actor12CollidesWithEPS_ ldmia sp!, {r4, pc} .align 2, 0 _02135434: .word 0x53424f53 @@ -127959,7 +127959,7 @@ data_ov15_02189584: ; 0x02189584 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_02189588 data_ov15_02189588: ; 0x02189588 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218958c data_ov15_0218958c: ; 0x0218958c .word _ZN5Actor8vfunc_48EP9Knockback @@ -128121,7 +128121,7 @@ data_ov15_0218965c: ; 0x0218965c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_02189660 data_ov15_02189660: ; 0x02189660 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_02189664 data_ov15_02189664: ; 0x02189664 .word _ZN5Actor8vfunc_48EP9Knockback @@ -128286,7 +128286,7 @@ data_ov15_0218972c: ; 0x0218972c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_02189730 data_ov15_02189730: ; 0x02189730 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_02189734 data_ov15_02189734: ; 0x02189734 .word _ZN5Actor8vfunc_48EP9Knockback @@ -128448,7 +128448,7 @@ data_ov15_02189804: ; 0x02189804 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_02189808 data_ov15_02189808: ; 0x02189808 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218980c data_ov15_0218980c: ; 0x0218980c .word _ZN5Actor8vfunc_48EP9Knockback @@ -128628,7 +128628,7 @@ data_ov15_021898f4: ; 0x021898f4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_021898f8 data_ov15_021898f8: ; 0x021898f8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_021898fc data_ov15_021898fc: ; 0x021898fc .word func_ov15_021260a8 @@ -130795,7 +130795,7 @@ data_ov15_0218a4dc: ; 0x0218a4dc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218a4e0 data_ov15_0218a4e0: ; 0x0218a4e0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218a4e4 data_ov15_0218a4e4: ; 0x0218a4e4 .word func_ov15_0212f264 @@ -131008,7 +131008,7 @@ data_ov15_0218a5f8: ; 0x0218a5f8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218a5fc data_ov15_0218a5fc: ; 0x0218a5fc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218a600 data_ov15_0218a600: ; 0x0218a600 .word func_ov15_0213100c @@ -131251,7 +131251,7 @@ data_ov15_0218a73c: ; 0x0218a73c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218a740 data_ov15_0218a740: ; 0x0218a740 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218a744 data_ov15_0218a744: ; 0x0218a744 .word func_ov15_02133e98 @@ -132099,7 +132099,7 @@ data_ov15_0218aba4: ; 0x0218aba4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218aba8 data_ov15_0218aba8: ; 0x0218aba8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218abac data_ov15_0218abac: ; 0x0218abac .word func_ov15_0213b248 @@ -132390,7 +132390,7 @@ data_ov15_0218ad28: ; 0x0218ad28 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218ad2c data_ov15_0218ad2c: ; 0x0218ad2c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218ad30 data_ov15_0218ad30: ; 0x0218ad30 .word func_ov15_0213cce4 @@ -132558,7 +132558,7 @@ data_ov15_0218ae08: ; 0x0218ae08 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218ae0c data_ov15_0218ae0c: ; 0x0218ae0c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218ae10 data_ov15_0218ae10: ; 0x0218ae10 .byte 0x00, 0x00, 0x00, 0x00 @@ -132732,7 +132732,7 @@ data_ov15_0218aef0: ; 0x0218aef0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218aef4 data_ov15_0218aef4: ; 0x0218aef4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218aef8 data_ov15_0218aef8: ; 0x0218aef8 .word func_ov15_02141018 @@ -132963,7 +132963,7 @@ data_ov15_0218b024: ; 0x0218b024 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218b028 data_ov15_0218b028: ; 0x0218b028 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218b02c data_ov15_0218b02c: ; 0x0218b02c .word func_ov15_02141238 @@ -133256,7 +133256,7 @@ data_ov15_0218b264: ; 0x0218b264 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218b268 data_ov15_0218b268: ; 0x0218b268 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218b26c data_ov15_0218b26c: ; 0x0218b26c .word _ZN5Actor8vfunc_48EP9Knockback @@ -133462,7 +133462,7 @@ data_ov15_0218b36c: ; 0x0218b36c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218b370 data_ov15_0218b370: ; 0x0218b370 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218b374 data_ov15_0218b374: ; 0x0218b374 .word _ZN5Actor8vfunc_48EP9Knockback @@ -133621,7 +133621,7 @@ data_ov15_0218b440: ; 0x0218b440 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218b444 data_ov15_0218b444: ; 0x0218b444 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218b448 data_ov15_0218b448: ; 0x0218b448 .word _ZN5Actor8vfunc_48EP9Knockback @@ -133959,7 +133959,7 @@ data_ov15_0218b5f8: ; 0x0218b5f8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218b5fc data_ov15_0218b5fc: ; 0x0218b5fc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218b600 data_ov15_0218b600: ; 0x0218b600 .word _ZN5Actor8vfunc_48EP9Knockback @@ -134942,7 +134942,7 @@ data_ov15_0218bb5c: ; 0x0218bb5c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218bb60 data_ov15_0218bb60: ; 0x0218bb60 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218bb64 data_ov15_0218bb64: ; 0x0218bb64 .word _ZN5Actor8vfunc_48EP9Knockback @@ -135083,7 +135083,7 @@ data_ov15_0218bc18: ; 0x0218bc18 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218bc1c data_ov15_0218bc1c: ; 0x0218bc1c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218bc20 data_ov15_0218bc20: ; 0x0218bc20 .word _ZN5Actor8vfunc_48EP9Knockback @@ -135236,7 +135236,7 @@ data_ov15_0218bce4: ; 0x0218bce4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218bce8 data_ov15_0218bce8: ; 0x0218bce8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218bcec data_ov15_0218bcec: ; 0x0218bcec .word _ZN5Actor8vfunc_48EP9Knockback @@ -135389,7 +135389,7 @@ data_ov15_0218bdb0: ; 0x0218bdb0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218bdb4 data_ov15_0218bdb4: ; 0x0218bdb4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218bdb8 data_ov15_0218bdb8: ; 0x0218bdb8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -135545,7 +135545,7 @@ data_ov15_0218be80: ; 0x0218be80 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218be84 data_ov15_0218be84: ; 0x0218be84 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218be88 data_ov15_0218be88: ; 0x0218be88 .word _ZN5Actor8vfunc_48EP9Knockback @@ -135710,7 +135710,7 @@ data_ov15_0218bf50: ; 0x0218bf50 .word func_ov15_021515bc .global data_ov15_0218bf54 data_ov15_0218bf54: ; 0x0218bf54 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218bf58 data_ov15_0218bf58: ; 0x0218bf58 .word _ZN5Actor8vfunc_48EP9Knockback @@ -135926,7 +135926,7 @@ data_ov15_0218c070: ; 0x0218c070 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c074 data_ov15_0218c074: ; 0x0218c074 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c078 data_ov15_0218c078: ; 0x0218c078 .word _ZN5Actor8vfunc_48EP9Knockback @@ -136094,7 +136094,7 @@ data_ov15_0218c150: ; 0x0218c150 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c154 data_ov15_0218c154: ; 0x0218c154 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c158 data_ov15_0218c158: ; 0x0218c158 .word func_ov15_02156210 @@ -136277,7 +136277,7 @@ data_ov15_0218c244: ; 0x0218c244 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c248 data_ov15_0218c248: ; 0x0218c248 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c24c data_ov15_0218c24c: ; 0x0218c24c .word _ZN5Actor8vfunc_48EP9Knockback @@ -136430,7 +136430,7 @@ data_ov15_0218c310: ; 0x0218c310 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c314 data_ov15_0218c314: ; 0x0218c314 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c318 data_ov15_0218c318: ; 0x0218c318 .word _ZN5Actor8vfunc_48EP9Knockback @@ -136589,7 +136589,7 @@ data_ov15_0218c3e4: ; 0x0218c3e4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c3e8 data_ov15_0218c3e8: ; 0x0218c3e8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c3ec data_ov15_0218c3ec: ; 0x0218c3ec .word func_ov15_0215a214 @@ -136760,7 +136760,7 @@ data_ov15_0218c4c8: ; 0x0218c4c8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c4cc data_ov15_0218c4cc: ; 0x0218c4cc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c4d0 data_ov15_0218c4d0: ; 0x0218c4d0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -136967,7 +136967,7 @@ data_ov15_0218c5dc: ; 0x0218c5dc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c5e0 data_ov15_0218c5e0: ; 0x0218c5e0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c5e4 data_ov15_0218c5e4: ; 0x0218c5e4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -137591,7 +137591,7 @@ data_ov15_0218c91c: ; 0x0218c91c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218c920 data_ov15_0218c920: ; 0x0218c920 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218c924 data_ov15_0218c924: ; 0x0218c924 .word func_ov15_0215fa90 @@ -137842,7 +137842,7 @@ data_ov15_0218ca78: ; 0x0218ca78 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218ca7c data_ov15_0218ca7c: ; 0x0218ca7c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218ca80 data_ov15_0218ca80: ; 0x0218ca80 .word _ZN5Actor8vfunc_48EP9Knockback @@ -137995,7 +137995,7 @@ data_ov15_0218cb44: ; 0x0218cb44 .word func_ov15_021617a8 ; func_ov17_021617a8 .global data_ov15_0218cb48 data_ov15_0218cb48: ; 0x0218cb48 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218cb4c data_ov15_0218cb4c: ; 0x0218cb4c .word _ZN5Actor8vfunc_48EP9Knockback @@ -138214,7 +138214,7 @@ data_ov15_0218cc5c: ; 0x0218cc5c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218cc60 data_ov15_0218cc60: ; 0x0218cc60 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218cc64 data_ov15_0218cc64: ; 0x0218cc64 .word _ZN5Actor8vfunc_48EP9Knockback @@ -138511,7 +138511,7 @@ data_ov15_0218cde8: ; 0x0218cde8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218cdec data_ov15_0218cdec: ; 0x0218cdec - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218cdf0 data_ov15_0218cdf0: ; 0x0218cdf0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -138913,7 +138913,7 @@ data_ov15_0218d000: ; 0x0218d000 .word func_ov15_02167690 .global data_ov15_0218d004 data_ov15_0218d004: ; 0x0218d004 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d008 data_ov15_0218d008: ; 0x0218d008 .word func_ov15_0216729c @@ -139102,7 +139102,7 @@ data_ov15_0218d0f8: ; 0x0218d0f8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218d0fc data_ov15_0218d0fc: ; 0x0218d0fc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d100 data_ov15_0218d100: ; 0x0218d100 .word func_ov15_02168efc @@ -139316,7 +139316,7 @@ data_ov15_0218d220: ; 0x0218d220 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218d224 data_ov15_0218d224: ; 0x0218d224 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d228 data_ov15_0218d228: ; 0x0218d228 .word func_ov15_02169938 @@ -139630,7 +139630,7 @@ data_ov15_0218d3b8: ; 0x0218d3b8 .word func_ov15_0216b58c ; data_ov18_0216b58c .global data_ov15_0218d3bc data_ov15_0218d3bc: ; 0x0218d3bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d3c0 data_ov15_0218d3c0: ; 0x0218d3c0 .word func_ov15_0216b368 @@ -139774,7 +139774,7 @@ data_ov15_0218d478: ; 0x0218d478 .word func_ov15_0216b58c ; data_ov18_0216b58c .global data_ov15_0218d47c data_ov15_0218d47c: ; 0x0218d47c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d480 data_ov15_0218d480: ; 0x0218d480 .word func_ov15_0216b368 @@ -139918,7 +139918,7 @@ data_ov15_0218d538: ; 0x0218d538 .word func_ov15_0216b58c ; data_ov18_0216b58c .global data_ov15_0218d53c data_ov15_0218d53c: ; 0x0218d53c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d540 data_ov15_0218d540: ; 0x0218d540 .word func_ov15_0216b368 @@ -140077,7 +140077,7 @@ data_ov15_0218d60c: ; 0x0218d60c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218d610 data_ov15_0218d610: ; 0x0218d610 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d614 data_ov15_0218d614: ; 0x0218d614 .word _ZN5Actor8vfunc_48EP9Knockback @@ -140536,7 +140536,7 @@ data_ov15_0218d8cc: ; 0x0218d8cc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218d8d0 data_ov15_0218d8d0: ; 0x0218d8d0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d8d4 data_ov15_0218d8d4: ; 0x0218d8d4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -140713,7 +140713,7 @@ data_ov15_0218d9b8: ; 0x0218d9b8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218d9bc data_ov15_0218d9bc: ; 0x0218d9bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218d9c0 data_ov15_0218d9c0: ; 0x0218d9c0 .word func_ov15_02173070 @@ -140955,7 +140955,7 @@ data_ov15_0218db14: ; 0x0218db14 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218db18 data_ov15_0218db18: ; 0x0218db18 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218db1c data_ov15_0218db1c: ; 0x0218db1c .word func_ov15_02173be8 @@ -141096,7 +141096,7 @@ data_ov15_0218dbd0: ; 0x0218dbd0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218dbd4 data_ov15_0218dbd4: ; 0x0218dbd4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218dbd8 data_ov15_0218dbd8: ; 0x0218dbd8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -141326,7 +141326,7 @@ data_ov15_0218dcf8: ; 0x0218dcf8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218dcfc data_ov15_0218dcfc: ; 0x0218dcfc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218dd00 data_ov15_0218dd00: ; 0x0218dd00 .word _ZN5Actor8vfunc_48EP9Knockback @@ -141587,7 +141587,7 @@ data_ov15_0218de54: ; 0x0218de54 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218de58 data_ov15_0218de58: ; 0x0218de58 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218de5c data_ov15_0218de5c: ; 0x0218de5c .word func_ov15_0217934c ; data_ov20_0217934c, data_ov22_0217934c, data_ov23_0217934c, data_ov25_0217934c, data_ov26_0217934c, data_ov28_0217934c, data_ov29_0217934c @@ -141998,7 +141998,7 @@ data_ov15_0218e078: ; 0x0218e078 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218e07c data_ov15_0218e07c: ; 0x0218e07c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218e080 data_ov15_0218e080: ; 0x0218e080 .word func_ov15_0217bacc ; data_ov29_0217bacc, data_ov61_0217bacc @@ -142256,7 +142256,7 @@ data_ov15_0218e1f0: ; 0x0218e1f0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218e1f4 data_ov15_0218e1f4: ; 0x0218e1f4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218e1f8 data_ov15_0218e1f8: ; 0x0218e1f8 .word func_ov15_0217d288 @@ -142777,7 +142777,7 @@ data_ov15_0218e4b8: ; 0x0218e4b8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218e4bc data_ov15_0218e4bc: ; 0x0218e4bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218e4c0 data_ov15_0218e4c0: ; 0x0218e4c0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -142918,7 +142918,7 @@ data_ov15_0218e574: ; 0x0218e574 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218e578 data_ov15_0218e578: ; 0x0218e578 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218e57c data_ov15_0218e57c: ; 0x0218e57c .word _ZN5Actor8vfunc_48EP9Knockback @@ -143679,7 +143679,7 @@ data_ov15_0218e928: ; 0x0218e928 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218e92c data_ov15_0218e92c: ; 0x0218e92c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218e930 data_ov15_0218e930: ; 0x0218e930 .word func_ov15_02182fa0 ; data_ov31_02182fa0 @@ -143965,7 +143965,7 @@ data_ov15_0218eab8: ; 0x0218eab8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov15_0218eabc data_ov15_0218eabc: ; 0x0218eabc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov15_0218eac0 data_ov15_0218eac0: ; 0x0218eac0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov17.inc b/asm/ov17.inc index 2da1229c..c5036765 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -20,7 +20,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov17.s b/asm/ov17.s index b56bcb0b..1e2d7949 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -21473,7 +21473,7 @@ data_ov17_0216bd04: ; 0x0216bd04 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov17_0216bd08 data_ov17_0216bd08: ; 0x0216bd08 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov17_0216bd0c data_ov17_0216bd0c: ; 0x0216bd0c .word _ZN5Actor8vfunc_48EP9Knockback @@ -21679,7 +21679,7 @@ data_ov17_0216be0c: ; 0x0216be0c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov17_0216be10 data_ov17_0216be10: ; 0x0216be10 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov17_0216be14 data_ov17_0216be14: ; 0x0216be14 .word _ZN5Actor8vfunc_48EP9Knockback @@ -21897,7 +21897,7 @@ data_ov17_0216bf24: ; 0x0216bf24 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov17_0216bf28 data_ov17_0216bf28: ; 0x0216bf28 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov17_0216bf2c data_ov17_0216bf2c: ; 0x0216bf2c .word _ZN5Actor8vfunc_48EP9Knockback @@ -22127,7 +22127,7 @@ data_ov17_0216c04c: ; 0x0216c04c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov17_0216c050 data_ov17_0216c050: ; 0x0216c050 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov17_0216c054 data_ov17_0216c054: ; 0x0216c054 .word _ZN5Actor8vfunc_48EP9Knockback @@ -23707,7 +23707,7 @@ data_ov17_0216c87c: ; 0x0216c87c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov17_0216c880 data_ov17_0216c880: ; 0x0216c880 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov17_0216c884 data_ov17_0216c884: ; 0x0216c884 .word _ZN5Actor8vfunc_48EP9Knockback @@ -23848,7 +23848,7 @@ data_ov17_0216c938: ; 0x0216c938 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov17_0216c93c data_ov17_0216c93c: ; 0x0216c93c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov17_0216c940 data_ov17_0216c940: ; 0x0216c940 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov18.inc b/asm/ov18.inc index 7e58e54d..af5f06d2 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -18,7 +18,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14GetAngleToLinkEv diff --git a/asm/ov18.s b/asm/ov18.s index a03dbada..a716dfb6 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -21312,7 +21312,7 @@ data_ov18_0216c304: ; 0x0216c304 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov18_0216c308 data_ov18_0216c308: ; 0x0216c308 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov18_0216c30c data_ov18_0216c30c: ; 0x0216c30c .word _ZN5Actor8vfunc_48EP9Knockback @@ -24051,7 +24051,7 @@ data_ov18_0216d008: ; 0x0216d008 .word func_ov14_02145974 .global data_ov18_0216d00c data_ov18_0216d00c: ; 0x0216d00c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov18_0216d010 data_ov18_0216d010: ; 0x0216d010 .word func_ov18_021656f8 @@ -24249,7 +24249,7 @@ data_ov18_0216d10c: ; 0x0216d10c .word func_ov14_02145974 .global data_ov18_0216d110 data_ov18_0216d110: ; 0x0216d110 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov18_0216d114 data_ov18_0216d114: ; 0x0216d114 .word _ZN5Actor8vfunc_48EP9Knockback @@ -24558,7 +24558,7 @@ data_ov18_0216d2a8: ; 0x0216d2a8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov18_0216d2ac data_ov18_0216d2ac: ; 0x0216d2ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov18_0216d2b0 data_ov18_0216d2b0: ; 0x0216d2b0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -24699,7 +24699,7 @@ data_ov18_0216d364: ; 0x0216d364 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov18_0216d368 data_ov18_0216d368: ; 0x0216d368 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov18_0216d36c data_ov18_0216d36c: ; 0x0216d36c .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov19.inc b/asm/ov19.inc index 27da97c6..26162438 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -37,7 +37,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov19.s b/asm/ov19.s index 90235654..2f3ae90b 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -11129,7 +11129,7 @@ data_ov19_02176414: ; 0x02176414 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov19_02176418 data_ov19_02176418: ; 0x02176418 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov19_0217641c data_ov19_0217641c: ; 0x0217641c .word func_ov19_0216e9e8 @@ -11677,7 +11677,7 @@ data_ov19_02176774: ; 0x02176774 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov19_02176778 data_ov19_02176778: ; 0x02176778 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov19_0217677c data_ov19_0217677c: ; 0x0217677c .word _ZN5Actor8vfunc_48EP9Knockback @@ -11845,7 +11845,7 @@ data_ov19_02176854: ; 0x02176854 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov19_02176858 data_ov19_02176858: ; 0x02176858 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov19_0217685c data_ov19_0217685c: ; 0x0217685c .word _ZN5Actor8vfunc_48EP9Knockback @@ -11986,7 +11986,7 @@ data_ov19_02176910: ; 0x02176910 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov19_02176914 data_ov19_02176914: ; 0x02176914 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov19_02176918 data_ov19_02176918: ; 0x02176918 .word _ZN5Actor8vfunc_48EP9Knockback @@ -12610,7 +12610,7 @@ data_ov19_02176c50: ; 0x02176c50 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov19_02176c54 data_ov19_02176c54: ; 0x02176c54 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov19_02176c58 data_ov19_02176c58: ; 0x02176c58 .word func_ov19_02174d44 @@ -12837,7 +12837,7 @@ data_ov19_02176d98: ; 0x02176d98 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov19_02176d9c data_ov19_02176d9c: ; 0x02176d9c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov19_02176da0 data_ov19_02176da0: ; 0x02176da0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov20.inc b/asm/ov20.inc index 46eed4d2..25bd4f21 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -30,7 +30,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12KillInBoundsEv .extern _ZN5Actor12SetTransformEP9Transform diff --git a/asm/ov20.s b/asm/ov20.s index 6750c7ff..797fc3f9 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -13597,7 +13597,7 @@ data_ov20_021783e8: ; 0x021783e8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_021783ec data_ov20_021783ec: ; 0x021783ec - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_021783f0 data_ov20_021783f0: ; 0x021783f0 .word func_ov20_0216e568 @@ -13912,7 +13912,7 @@ data_ov20_0217858c: ; 0x0217858c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02178590 data_ov20_02178590: ; 0x02178590 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02178594 data_ov20_02178594: ; 0x02178594 .word func_ov00_020caeb4 @@ -14116,7 +14116,7 @@ data_ov20_0217869c: ; 0x0217869c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_021786a0 data_ov20_021786a0: ; 0x021786a0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_021786a4 data_ov20_021786a4: ; 0x021786a4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -14257,7 +14257,7 @@ data_ov20_02178758: ; 0x02178758 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_0217875c data_ov20_0217875c: ; 0x0217875c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02178760 data_ov20_02178760: ; 0x02178760 .word _ZN5Actor8vfunc_48EP9Knockback @@ -14398,7 +14398,7 @@ data_ov20_02178814: ; 0x02178814 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02178818 data_ov20_02178818: ; 0x02178818 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_0217881c data_ov20_0217881c: ; 0x0217881c .word func_ov00_020caeb4 @@ -14778,7 +14778,7 @@ data_ov20_02178a10: ; 0x02178a10 .word func_ov14_02145974 .global data_ov20_02178a14 data_ov20_02178a14: ; 0x02178a14 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02178a18 data_ov20_02178a18: ; 0x02178a18 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15054,7 +15054,7 @@ data_ov20_02178b80: ; 0x02178b80 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02178b84 data_ov20_02178b84: ; 0x02178b84 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02178b88 data_ov20_02178b88: ; 0x02178b88 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15347,7 +15347,7 @@ data_ov20_02178cfc: ; 0x02178cfc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02178d00 data_ov20_02178d00: ; 0x02178d00 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02178d04 data_ov20_02178d04: ; 0x02178d04 .word func_ov20_021749b0 @@ -15730,7 +15730,7 @@ data_ov20_02178f10: ; 0x02178f10 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02178f14 data_ov20_02178f14: ; 0x02178f14 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02178f18 data_ov20_02178f18: ; 0x02178f18 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15871,7 +15871,7 @@ data_ov20_02178fcc: ; 0x02178fcc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02178fd0 data_ov20_02178fd0: ; 0x02178fd0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02178fd4 data_ov20_02178fd4: ; 0x02178fd4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16024,7 +16024,7 @@ data_ov20_02179098: ; 0x02179098 .word func_ov14_02145974 .global data_ov20_0217909c data_ov20_0217909c: ; 0x0217909c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_021790a0 data_ov20_021790a0: ; 0x021790a0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16213,7 +16213,7 @@ data_ov20_02179194: ; 0x02179194 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02179198 data_ov20_02179198: ; 0x02179198 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_0217919c data_ov20_0217919c: ; 0x0217919c .word _ZN5Actor8vfunc_48EP9Knockback @@ -16362,7 +16362,7 @@ data_ov20_02179280: ; 0x02179280 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02179284 data_ov20_02179284: ; 0x02179284 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_02179288 data_ov20_02179288: ; 0x02179288 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16665,7 +16665,7 @@ data_ov20_02179414: ; 0x02179414 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov20_02179418 data_ov20_02179418: ; 0x02179418 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov20_0217941c data_ov20_0217941c: ; 0x0217941c .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov21.inc b/asm/ov21.inc index bebfbd35..51d5b231 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -14,7 +14,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov21.s b/asm/ov21.s index 81f74872..dcbab8c7 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -5003,7 +5003,7 @@ data_ov21_02171148: ; 0x02171148 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov21_0217114c data_ov21_0217114c: ; 0x0217114c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_02171150 data_ov21_02171150: ; 0x02171150 .word func_ov21_0216df2c @@ -5222,7 +5222,7 @@ data_ov21_0217126c: ; 0x0217126c .word func_ov14_02145974 .global data_ov21_02171270 data_ov21_02171270: ; 0x02171270 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_02171274 data_ov21_02171274: ; 0x02171274 .word _ZN5Actor8vfunc_48EP9Knockback @@ -5417,7 +5417,7 @@ data_ov21_02171370: ; 0x02171370 .word func_ov14_02145974 .global data_ov21_02171374 data_ov21_02171374: ; 0x02171374 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_02171378 data_ov21_02171378: ; 0x02171378 .word _ZN5Actor8vfunc_48EP9Knockback @@ -5612,7 +5612,7 @@ data_ov21_02171474: ; 0x02171474 .word func_ov14_02145974 .global data_ov21_02171478 data_ov21_02171478: ; 0x02171478 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_0217147c data_ov21_0217147c: ; 0x0217147c .word _ZN5Actor8vfunc_48EP9Knockback @@ -5807,7 +5807,7 @@ data_ov21_02171578: ; 0x02171578 .word func_ov14_02145974 .global data_ov21_0217157c data_ov21_0217157c: ; 0x0217157c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_02171580 data_ov21_02171580: ; 0x02171580 .word _ZN5Actor8vfunc_48EP9Knockback @@ -6002,7 +6002,7 @@ data_ov21_0217167c: ; 0x0217167c .word func_ov14_02145974 .global data_ov21_02171680 data_ov21_02171680: ; 0x02171680 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_02171684 data_ov21_02171684: ; 0x02171684 .word _ZN5Actor8vfunc_48EP9Knockback @@ -6285,7 +6285,7 @@ data_ov21_02171808: ; 0x02171808 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov21_0217180c data_ov21_0217180c: ; 0x0217180c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_02171810 data_ov21_02171810: ; 0x02171810 .word _ZN5Actor8vfunc_48EP9Knockback @@ -6603,7 +6603,7 @@ data_ov21_021719b0: ; 0x021719b0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov21_021719b4 data_ov21_021719b4: ; 0x021719b4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov21_021719b8 data_ov21_021719b8: ; 0x021719b8 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov22.inc b/asm/ov22.inc index dd8bd017..fb1afe8a 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -40,7 +40,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14DistanceToLinkEv diff --git a/asm/ov22.s b/asm/ov22.s index ba4d7374..c3ca5ea9 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -14909,7 +14909,7 @@ data_ov22_02179088: ; 0x02179088 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_0217908c data_ov22_0217908c: ; 0x0217908c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_02179090 data_ov22_02179090: ; 0x02179090 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15389,7 +15389,7 @@ data_ov22_02179308: ; 0x02179308 .word func_ov14_02145974 .global data_ov22_0217930c data_ov22_0217930c: ; 0x0217930c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_02179310 data_ov22_02179310: ; 0x02179310 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15874,7 +15874,7 @@ data_ov22_0217959c: ; 0x0217959c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_021795a0 data_ov22_021795a0: ; 0x021795a0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_021795a4 data_ov22_021795a4: ; 0x021795a4 .word func_ov22_02171aa0 @@ -16114,7 +16114,7 @@ data_ov22_021796c4: ; 0x021796c4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_021796c8 data_ov22_021796c8: ; 0x021796c8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_021796cc data_ov22_021796cc: ; 0x021796cc .word func_ov22_02173d54 @@ -16399,7 +16399,7 @@ data_ov22_02179840: ; 0x02179840 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_02179844 data_ov22_02179844: ; 0x02179844 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_02179848 data_ov22_02179848: ; 0x02179848 .word func_ov00_020caeb4 @@ -16603,7 +16603,7 @@ data_ov22_02179950: ; 0x02179950 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_02179954 data_ov22_02179954: ; 0x02179954 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_02179958 data_ov22_02179958: ; 0x02179958 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16855,7 +16855,7 @@ data_ov22_02179aa0: ; 0x02179aa0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_02179aa4 data_ov22_02179aa4: ; 0x02179aa4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_02179aa8 data_ov22_02179aa8: ; 0x02179aa8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16996,7 +16996,7 @@ data_ov22_02179b5c: ; 0x02179b5c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_02179b60 data_ov22_02179b60: ; 0x02179b60 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_02179b64 data_ov22_02179b64: ; 0x02179b64 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17550,7 +17550,7 @@ data_ov22_02179e34: ; 0x02179e34 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov22_02179e38 data_ov22_02179e38: ; 0x02179e38 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_02179e3c data_ov22_02179e3c: ; 0x02179e3c .word _ZN5Actor8vfunc_48EP9Knockback @@ -18074,7 +18074,7 @@ data_ov22_0217a108: ; 0x0217a108 .word func_ov14_02145974 .global data_ov22_0217a10c data_ov22_0217a10c: ; 0x0217a10c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_0217a110 data_ov22_0217a110: ; 0x0217a110 .word _ZN5Actor8vfunc_48EP9Knockback @@ -18269,7 +18269,7 @@ data_ov22_0217a20c: ; 0x0217a20c .word func_ov14_02145974 .global data_ov22_0217a210 data_ov22_0217a210: ; 0x0217a210 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_0217a214 data_ov22_0217a214: ; 0x0217a214 .word _ZN5Actor8vfunc_48EP9Knockback @@ -18464,7 +18464,7 @@ data_ov22_0217a310: ; 0x0217a310 .word func_ov14_02145974 .global data_ov22_0217a314 data_ov22_0217a314: ; 0x0217a314 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov22_0217a318 data_ov22_0217a318: ; 0x0217a318 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov23.inc b/asm/ov23.inc index 6dfbe2f5..9c0ed4a3 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -69,7 +69,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14DistanceToLinkEv diff --git a/asm/ov23.s b/asm/ov23.s index a5affa82..9935ded1 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -15884,7 +15884,7 @@ data_ov23_02179e04: ; 0x02179e04 .word func_ov14_02145974 .global data_ov23_02179e08 data_ov23_02179e08: ; 0x02179e08 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov23_02179e0c data_ov23_02179e0c: ; 0x02179e0c .word _ZN5Actor8vfunc_48EP9Knockback @@ -16165,7 +16165,7 @@ data_ov23_02179f70: ; 0x02179f70 .word func_ov14_02145974 .global data_ov23_02179f74 data_ov23_02179f74: ; 0x02179f74 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov23_02179f78 data_ov23_02179f78: ; 0x02179f78 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16482,7 +16482,7 @@ data_ov23_0217a118: ; 0x0217a118 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov23_0217a11c data_ov23_0217a11c: ; 0x0217a11c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov23_0217a120 data_ov23_0217a120: ; 0x0217a120 .word func_ov23_0216ffe0 @@ -16883,7 +16883,7 @@ data_ov23_0217a338: ; 0x0217a338 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov23_0217a33c data_ov23_0217a33c: ; 0x0217a33c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov23_0217a340 data_ov23_0217a340: ; 0x0217a340 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17159,7 +17159,7 @@ data_ov23_0217a4a8: ; 0x0217a4a8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov23_0217a4ac data_ov23_0217a4ac: ; 0x0217a4ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov23_0217a4b0 data_ov23_0217a4b0: ; 0x0217a4b0 .word func_ov23_021734e4 @@ -17551,7 +17551,7 @@ data_ov23_0217a6a8: ; 0x0217a6a8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov23_0217a6ac data_ov23_0217a6ac: ; 0x0217a6ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov23_0217a6b0 data_ov23_0217a6b0: ; 0x0217a6b0 .word func_ov23_02175b64 @@ -17923,7 +17923,7 @@ data_ov23_0217a898: ; 0x0217a898 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov23_0217a89c data_ov23_0217a89c: ; 0x0217a89c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov23_0217a8a0 data_ov23_0217a8a0: ; 0x0217a8a0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov24.inc b/asm/ov24.inc index bc1234a3..dbe42392 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -29,7 +29,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov24.s b/asm/ov24.s index 369d261d..873a1367 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -15844,7 +15844,7 @@ data_ov24_02179f54: ; 0x02179f54 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_02179f58 data_ov24_02179f58: ; 0x02179f58 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_02179f5c data_ov24_02179f5c: ; 0x02179f5c .word _ZN5Actor8vfunc_48EP9Knockback @@ -16013,7 +16013,7 @@ data_ov24_0217a060: ; 0x0217a060 .word func_ov24_0216ee18 .global data_ov24_0217a064 data_ov24_0217a064: ; 0x0217a064 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217a068 data_ov24_0217a068: ; 0x0217a068 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16457,7 +16457,7 @@ data_ov24_0217a2b0: ; 0x0217a2b0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_0217a2b4 data_ov24_0217a2b4: ; 0x0217a2b4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217a2b8 data_ov24_0217a2b8: ; 0x0217a2b8 .word func_ov24_021701d8 @@ -16772,7 +16772,7 @@ data_ov24_0217a454: ; 0x0217a454 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_0217a458 data_ov24_0217a458: ; 0x0217a458 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217a45c data_ov24_0217a45c: ; 0x0217a45c .word func_ov24_02171ef4 @@ -17084,7 +17084,7 @@ data_ov24_0217a5f4: ; 0x0217a5f4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_0217a5f8 data_ov24_0217a5f8: ; 0x0217a5f8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217a5fc data_ov24_0217a5fc: ; 0x0217a5fc .word func_ov24_02173408 @@ -17452,7 +17452,7 @@ data_ov24_0217a7d4: ; 0x0217a7d4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_0217a7d8 data_ov24_0217a7d8: ; 0x0217a7d8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217a7dc data_ov24_0217a7dc: ; 0x0217a7dc .word func_ov24_02174c58 @@ -17833,7 +17833,7 @@ data_ov24_0217a9d0: ; 0x0217a9d0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_0217a9d4 data_ov24_0217a9d4: ; 0x0217a9d4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217a9d8 data_ov24_0217a9d8: ; 0x0217a9d8 .word func_ov00_020caeb4 @@ -18080,7 +18080,7 @@ data_ov24_0217ab4c: ; 0x0217ab4c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_0217ab50 data_ov24_0217ab50: ; 0x0217ab50 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217ab54 data_ov24_0217ab54: ; 0x0217ab54 .word _ZN5Actor8vfunc_48EP9Knockback @@ -18527,7 +18527,7 @@ data_ov24_0217ada0: ; 0x0217ada0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov24_0217ada4 data_ov24_0217ada4: ; 0x0217ada4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov24_0217ada8 data_ov24_0217ada8: ; 0x0217ada8 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov25.inc b/asm/ov25.inc index b4a42093..a478b8b6 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -30,7 +30,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov25.s b/asm/ov25.s index cded75de..9598a5b5 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -15269,7 +15269,7 @@ data_ov25_02179ca8: ; 0x02179ca8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_02179cac data_ov25_02179cac: ; 0x02179cac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_02179cb0 data_ov25_02179cb0: ; 0x02179cb0 .word func_ov25_0216ff44 @@ -15600,7 +15600,7 @@ data_ov25_02179e8c: ; 0x02179e8c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_02179e90 data_ov25_02179e90: ; 0x02179e90 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_02179e94 data_ov25_02179e94: ; 0x02179e94 .word func_ov25_02171f9c @@ -15741,7 +15741,7 @@ data_ov25_02179f48: ; 0x02179f48 .word func_ov14_02145974 .global data_ov25_02179f4c data_ov25_02179f4c: ; 0x02179f4c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_02179f50 data_ov25_02179f50: ; 0x02179f50 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15954,7 +15954,7 @@ data_ov25_0217a064: ; 0x0217a064 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_0217a068 data_ov25_0217a068: ; 0x0217a068 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_0217a06c data_ov25_0217a06c: ; 0x0217a06c .word _ZN5Actor8vfunc_48EP9Knockback @@ -16095,7 +16095,7 @@ data_ov25_0217a120: ; 0x0217a120 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_0217a124 data_ov25_0217a124: ; 0x0217a124 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_0217a128 data_ov25_0217a128: ; 0x0217a128 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16455,7 +16455,7 @@ data_ov25_0217a300: ; 0x0217a300 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_0217a304 data_ov25_0217a304: ; 0x0217a304 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_0217a308 data_ov25_0217a308: ; 0x0217a308 .word func_ov00_020caeb4 @@ -16742,7 +16742,7 @@ data_ov25_0217a474: ; 0x0217a474 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_0217a478 data_ov25_0217a478: ; 0x0217a478 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_0217a47c data_ov25_0217a47c: ; 0x0217a47c .word _ZN5Actor8vfunc_48EP9Knockback @@ -16883,7 +16883,7 @@ data_ov25_0217a530: ; 0x0217a530 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_0217a534 data_ov25_0217a534: ; 0x0217a534 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_0217a538 data_ov25_0217a538: ; 0x0217a538 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17048,7 +17048,7 @@ data_ov25_0217a60c: ; 0x0217a60c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_0217a610 data_ov25_0217a610: ; 0x0217a610 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_0217a614 data_ov25_0217a614: ; 0x0217a614 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17285,7 +17285,7 @@ data_ov25_0217a748: ; 0x0217a748 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov25_0217a74c data_ov25_0217a74c: ; 0x0217a74c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov25_0217a750 data_ov25_0217a750: ; 0x0217a750 .word func_ov25_02178eac diff --git a/asm/ov26.inc b/asm/ov26.inc index 7dfe6655..cace4021 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -37,7 +37,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov26.s b/asm/ov26.s index 4d5d0e9e..e250dffa 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -16935,7 +16935,7 @@ data_ov26_0217a0a8: ; 0x0217a0a8 .word func_ov14_02145974 .global data_ov26_0217a0ac data_ov26_0217a0ac: ; 0x0217a0ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217a0b0 data_ov26_0217a0b0: ; 0x0217a0b0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17130,7 +17130,7 @@ data_ov26_0217a1ac: ; 0x0217a1ac .word func_ov14_02145974 .global data_ov26_0217a1b0 data_ov26_0217a1b0: ; 0x0217a1b0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217a1b4 data_ov26_0217a1b4: ; 0x0217a1b4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17325,7 +17325,7 @@ data_ov26_0217a2b0: ; 0x0217a2b0 .word func_ov14_02145974 .global data_ov26_0217a2b4 data_ov26_0217a2b4: ; 0x0217a2b4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217a2b8 data_ov26_0217a2b8: ; 0x0217a2b8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17520,7 +17520,7 @@ data_ov26_0217a3b4: ; 0x0217a3b4 .word func_ov14_02145974 .global data_ov26_0217a3b8 data_ov26_0217a3b8: ; 0x0217a3b8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217a3bc data_ov26_0217a3bc: ; 0x0217a3bc .word _ZN5Actor8vfunc_48EP9Knockback @@ -18135,7 +18135,7 @@ data_ov26_0217a744: ; 0x0217a744 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov26_0217a748 data_ov26_0217a748: ; 0x0217a748 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217a74c data_ov26_0217a74c: ; 0x0217a74c .word func_ov26_02170894 @@ -19629,7 +19629,7 @@ data_ov26_0217aef0: ; 0x0217aef0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov26_0217aef4 data_ov26_0217aef4: ; 0x0217aef4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217aef8 data_ov26_0217aef8: ; 0x0217aef8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -19878,7 +19878,7 @@ data_ov26_0217afd0: ; 0x0217afd0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov26_0217afd4 data_ov26_0217afd4: ; 0x0217afd4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217afd8 data_ov26_0217afd8: ; 0x0217afd8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -20031,7 +20031,7 @@ data_ov26_0217b09c: ; 0x0217b09c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov26_0217b0a0 data_ov26_0217b0a0: ; 0x0217b0a0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov26_0217b0a4 data_ov26_0217b0a4: ; 0x0217b0a4 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov27.inc b/asm/ov27.inc index b7f3e861..6fa6ea93 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -20,7 +20,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov27.s b/asm/ov27.s index 0464b595..f7652c28 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -14585,7 +14585,7 @@ data_ov27_0217952c: ; 0x0217952c .word func_ov14_02145974 .global data_ov27_02179530 data_ov27_02179530: ; 0x02179530 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov27_02179534 data_ov27_02179534: ; 0x02179534 .word func_ov27_0216edbc @@ -14798,7 +14798,7 @@ data_ov27_02179658: ; 0x02179658 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov27_0217965c data_ov27_0217965c: ; 0x0217965c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov27_02179660 data_ov27_02179660: ; 0x02179660 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15079,7 +15079,7 @@ data_ov27_021797c4: ; 0x021797c4 .word func_ov14_02145974 .global data_ov27_021797c8 data_ov27_021797c8: ; 0x021797c8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov27_021797cc data_ov27_021797cc: ; 0x021797cc .word _ZN5Actor8vfunc_48EP9Knockback @@ -15441,7 +15441,7 @@ data_ov27_021799ac: ; 0x021799ac .word func_ov14_02145974 .global data_ov27_021799b0 data_ov27_021799b0: ; 0x021799b0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov27_021799b4 data_ov27_021799b4: ; 0x021799b4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15686,7 +15686,7 @@ data_ov27_02179ae8: ; 0x02179ae8 .word func_ov14_02145974 .global data_ov27_02179aec data_ov27_02179aec: ; 0x02179aec - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov27_02179af0 data_ov27_02179af0: ; 0x02179af0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16174,7 +16174,7 @@ data_ov27_02179d68: ; 0x02179d68 .word func_ov14_02145974 .global data_ov27_02179d6c data_ov27_02179d6c: ; 0x02179d6c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov27_02179d70 data_ov27_02179d70: ; 0x02179d70 .word func_ov27_021776c0 @@ -16509,7 +16509,7 @@ data_ov27_02179f1c: ; 0x02179f1c .word func_ov27_021788b4 .global data_ov27_02179f20 data_ov27_02179f20: ; 0x02179f20 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov27_02179f24 data_ov27_02179f24: ; 0x02179f24 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov28.inc b/asm/ov28.inc index da41af76..272c490a 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -26,7 +26,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov28.s b/asm/ov28.s index 91a4f18d..887e9df0 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -14365,7 +14365,7 @@ data_ov28_021789a8: ; 0x021789a8 .word func_ov14_02145974 .global data_ov28_021789ac data_ov28_021789ac: ; 0x021789ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_021789b0 data_ov28_021789b0: ; 0x021789b0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -14726,7 +14726,7 @@ data_ov28_02178c08: ; 0x02178c08 .word func_ov14_02145974 .global data_ov28_02178c0c data_ov28_02178c0c: ; 0x02178c0c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02178c10 data_ov28_02178c10: ; 0x02178c10 .word _ZN5Actor8vfunc_48EP9Knockback @@ -14921,7 +14921,7 @@ data_ov28_02178d0c: ; 0x02178d0c .word func_ov14_02145974 .global data_ov28_02178d10 data_ov28_02178d10: ; 0x02178d10 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02178d14 data_ov28_02178d14: ; 0x02178d14 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15116,7 +15116,7 @@ data_ov28_02178e10: ; 0x02178e10 .word func_ov14_02145974 .global data_ov28_02178e14 data_ov28_02178e14: ; 0x02178e14 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02178e18 data_ov28_02178e18: ; 0x02178e18 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15311,7 +15311,7 @@ data_ov28_02178f14: ; 0x02178f14 .word func_ov14_02145974 .global data_ov28_02178f18 data_ov28_02178f18: ; 0x02178f18 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02178f1c data_ov28_02178f1c: ; 0x02178f1c .word _ZN5Actor8vfunc_48EP9Knockback @@ -15574,7 +15574,7 @@ data_ov28_02179068: ; 0x02179068 .word func_ov14_02145974 .global data_ov28_0217906c data_ov28_0217906c: ; 0x0217906c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02179070 data_ov28_02179070: ; 0x02179070 .word func_ov28_02170f24 @@ -16071,7 +16071,7 @@ data_ov28_021792f4: ; 0x021792f4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov28_021792f8 data_ov28_021792f8: ; 0x021792f8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_021792fc data_ov28_021792fc: ; 0x021792fc .word _ZN5Actor8vfunc_48EP9Knockback @@ -16310,7 +16310,7 @@ data_ov28_02179428: ; 0x02179428 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov28_0217942c data_ov28_0217942c: ; 0x0217942c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02179430 data_ov28_02179430: ; 0x02179430 .word func_ov28_021739f0 @@ -16541,7 +16541,7 @@ data_ov28_0217955c: ; 0x0217955c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov28_02179560 data_ov28_02179560: ; 0x02179560 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02179564 data_ov28_02179564: ; 0x02179564 .word func_ov28_021740cc @@ -16855,7 +16855,7 @@ data_ov28_021796f4: ; 0x021796f4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov28_021796f8 data_ov28_021796f8: ; 0x021796f8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_021796fc data_ov28_021796fc: ; 0x021796fc .word func_ov28_02174fc4 @@ -17059,7 +17059,7 @@ data_ov28_02179804: ; 0x02179804 .word func_ov14_02145974 .global data_ov28_02179808 data_ov28_02179808: ; 0x02179808 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_0217980c data_ov28_0217980c: ; 0x0217980c .word _ZN5Actor8vfunc_48EP9Knockback @@ -17292,7 +17292,7 @@ data_ov28_02179940: ; 0x02179940 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov28_02179944 data_ov28_02179944: ; 0x02179944 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02179948 data_ov28_02179948: ; 0x02179948 .word _ZN5Actor8vfunc_48EP9Knockback @@ -17517,7 +17517,7 @@ data_ov28_02179a6c: ; 0x02179a6c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov28_02179a70 data_ov28_02179a70: ; 0x02179a70 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov28_02179a74 data_ov28_02179a74: ; 0x02179a74 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov29.inc b/asm/ov29.inc index 022d0e59..87607c16 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -20,7 +20,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14GetAngleToLinkEv diff --git a/asm/ov29.s b/asm/ov29.s index 4eb23e5e..ceebe87d 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -14783,7 +14783,7 @@ data_ov29_02179948: ; 0x02179948 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_0217994c data_ov29_0217994c: ; 0x0217994c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_02179950 data_ov29_02179950: ; 0x02179950 .word _ZN5Actor8vfunc_48EP9Knockback @@ -14948,7 +14948,7 @@ data_ov29_02179a24: ; 0x02179a24 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_02179a28 data_ov29_02179a28: ; 0x02179a28 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_02179a2c data_ov29_02179a2c: ; 0x02179a2c .word _ZN5Actor8vfunc_48EP9Knockback @@ -15181,7 +15181,7 @@ data_ov29_02179b60: ; 0x02179b60 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_02179b64 data_ov29_02179b64: ; 0x02179b64 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_02179b68 data_ov29_02179b68: ; 0x02179b68 .word _ZN5Actor8vfunc_48EP9Knockback @@ -15411,7 +15411,7 @@ data_ov29_02179cb0: ; 0x02179cb0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_02179cb4 data_ov29_02179cb4: ; 0x02179cb4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_02179cb8 data_ov29_02179cb8: ; 0x02179cb8 .word func_ov29_02171a30 @@ -15716,7 +15716,7 @@ data_ov29_02179e54: ; 0x02179e54 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_02179e58 data_ov29_02179e58: ; 0x02179e58 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_02179e5c data_ov29_02179e5c: ; 0x02179e5c .word func_ov29_02172938 @@ -15920,7 +15920,7 @@ data_ov29_02179f8c: ; 0x02179f8c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_02179f90 data_ov29_02179f90: ; 0x02179f90 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_02179f94 data_ov29_02179f94: ; 0x02179f94 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16221,7 +16221,7 @@ data_ov29_0217a134: ; 0x0217a134 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_0217a138 data_ov29_0217a138: ; 0x0217a138 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_0217a13c data_ov29_0217a13c: ; 0x0217a13c .word _ZN5Actor8vfunc_48EP9Knockback @@ -16569,7 +16569,7 @@ data_ov29_0217a308: ; 0x0217a308 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov29_0217a30c data_ov29_0217a30c: ; 0x0217a30c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_0217a310 data_ov29_0217a310: ; 0x0217a310 .word _ZN5Actor8vfunc_48EP9Knockback @@ -16722,7 +16722,7 @@ data_ov29_0217a3d4: ; 0x0217a3d4 .word func_ov14_02145974 .global data_ov29_0217a3d8 data_ov29_0217a3d8: ; 0x0217a3d8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov29_0217a3dc data_ov29_0217a3dc: ; 0x0217a3dc .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov30.inc b/asm/ov30.inc index b92d423e..fe2bef77 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -11,7 +11,7 @@ .extern _ZN5Actor10GetAngleToEP5Vec3p .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov30.s b/asm/ov30.s index 462c6952..2105b230 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -16954,7 +16954,7 @@ data_ov30_02188d64: ; 0x02188d64 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov30_02188d68 data_ov30_02188d68: ; 0x02188d68 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov30_02188d6c data_ov30_02188d6c: ; 0x02188d6c .word func_ov30_02181364 ; data_ov61_02181364 @@ -17158,7 +17158,7 @@ data_ov30_02188e74: ; 0x02188e74 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov30_02188e78 data_ov30_02188e78: ; 0x02188e78 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov30_02188e7c data_ov30_02188e7c: ; 0x02188e7c .word func_ov30_02181364 ; data_ov61_02181364 @@ -17362,7 +17362,7 @@ data_ov30_02188f84: ; 0x02188f84 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov30_02188f88 data_ov30_02188f88: ; 0x02188f88 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov30_02188f8c data_ov30_02188f8c: ; 0x02188f8c .word func_ov30_02181364 ; data_ov61_02181364 @@ -17566,7 +17566,7 @@ data_ov30_02189094: ; 0x02189094 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov30_02189098 data_ov30_02189098: ; 0x02189098 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov30_0218909c data_ov30_0218909c: ; 0x0218909c .word func_ov30_02181364 ; data_ov61_02181364 @@ -17770,7 +17770,7 @@ data_ov30_021891a4: ; 0x021891a4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov30_021891a8 data_ov30_021891a8: ; 0x021891a8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov30_021891ac data_ov30_021891ac: ; 0x021891ac .word func_ov30_02181364 ; data_ov61_02181364 @@ -18065,7 +18065,7 @@ data_ov30_021893b8: ; 0x021893b8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov30_021893bc data_ov30_021893bc: ; 0x021893bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov30_021893c0 data_ov30_021893c0: ; 0x021893c0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov31.inc b/asm/ov31.inc index 4c13146c..8ba1b024 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -10,7 +10,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov31.s b/asm/ov31.s index 09097e50..f305a661 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -8801,7 +8801,7 @@ data_ov31_021821b0: ; 0x021821b0 .word func_ov31_0217db50 ; func_ov35_0217db50 .global data_ov31_021821b4 data_ov31_021821b4: ; 0x021821b4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_021821b8 data_ov31_021821b8: ; 0x021821b8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -9259,7 +9259,7 @@ data_ov31_02182408: ; 0x02182408 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_0218240c data_ov31_0218240c: ; 0x0218240c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182410 data_ov31_02182410: ; 0x02182410 .word _ZN5Actor8vfunc_48EP9Knockback @@ -9406,7 +9406,7 @@ data_ov31_021824cc: ; 0x021824cc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_021824d0 data_ov31_021824d0: ; 0x021824d0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_021824d4 data_ov31_021824d4: ; 0x021824d4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -9553,7 +9553,7 @@ data_ov31_02182590: ; 0x02182590 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182594 data_ov31_02182594: ; 0x02182594 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182598 data_ov31_02182598: ; 0x02182598 .word _ZN5Actor8vfunc_48EP9Knockback @@ -9700,7 +9700,7 @@ data_ov31_02182654: ; 0x02182654 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182658 data_ov31_02182658: ; 0x02182658 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_0218265c data_ov31_0218265c: ; 0x0218265c .word _ZN5Actor8vfunc_48EP9Knockback @@ -9847,7 +9847,7 @@ data_ov31_02182718: ; 0x02182718 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_0218271c data_ov31_0218271c: ; 0x0218271c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182720 data_ov31_02182720: ; 0x02182720 .word _ZN5Actor8vfunc_48EP9Knockback @@ -10024,7 +10024,7 @@ data_ov31_02182804: ; 0x02182804 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182808 data_ov31_02182808: ; 0x02182808 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_0218280c data_ov31_0218280c: ; 0x0218280c .word _ZN5Actor8vfunc_48EP9Knockback @@ -10201,7 +10201,7 @@ data_ov31_021828f0: ; 0x021828f0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_021828f4 data_ov31_021828f4: ; 0x021828f4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_021828f8 data_ov31_021828f8: ; 0x021828f8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -10378,7 +10378,7 @@ data_ov31_021829dc: ; 0x021829dc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_021829e0 data_ov31_021829e0: ; 0x021829e0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_021829e4 data_ov31_021829e4: ; 0x021829e4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -10555,7 +10555,7 @@ data_ov31_02182ac8: ; 0x02182ac8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182acc data_ov31_02182acc: ; 0x02182acc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182ad0 data_ov31_02182ad0: ; 0x02182ad0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -10732,7 +10732,7 @@ data_ov31_02182bb4: ; 0x02182bb4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182bb8 data_ov31_02182bb8: ; 0x02182bb8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182bbc data_ov31_02182bbc: ; 0x02182bbc .word _ZN5Actor8vfunc_48EP9Knockback @@ -10909,7 +10909,7 @@ data_ov31_02182ca0: ; 0x02182ca0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182ca4 data_ov31_02182ca4: ; 0x02182ca4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182ca8 data_ov31_02182ca8: ; 0x02182ca8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -11086,7 +11086,7 @@ data_ov31_02182d8c: ; 0x02182d8c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182d90 data_ov31_02182d90: ; 0x02182d90 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182d94 data_ov31_02182d94: ; 0x02182d94 .word _ZN5Actor8vfunc_48EP9Knockback @@ -11263,7 +11263,7 @@ data_ov31_02182e78: ; 0x02182e78 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182e7c data_ov31_02182e7c: ; 0x02182e7c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182e80 data_ov31_02182e80: ; 0x02182e80 .word _ZN5Actor8vfunc_48EP9Knockback @@ -11440,7 +11440,7 @@ data_ov31_02182f64: ; 0x02182f64 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02182f68 data_ov31_02182f68: ; 0x02182f68 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02182f6c data_ov31_02182f6c: ; 0x02182f6c .word _ZN5Actor8vfunc_48EP9Knockback @@ -11617,7 +11617,7 @@ data_ov31_02183050: ; 0x02183050 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02183054 data_ov31_02183054: ; 0x02183054 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02183058 data_ov31_02183058: ; 0x02183058 .word _ZN5Actor8vfunc_48EP9Knockback @@ -11794,7 +11794,7 @@ data_ov31_0218313c: ; 0x0218313c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02183140 data_ov31_02183140: ; 0x02183140 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02183144 data_ov31_02183144: ; 0x02183144 .word _ZN5Actor8vfunc_48EP9Knockback @@ -11971,7 +11971,7 @@ data_ov31_02183228: ; 0x02183228 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_0218322c data_ov31_0218322c: ; 0x0218322c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02183230 data_ov31_02183230: ; 0x02183230 .word _ZN5Actor8vfunc_48EP9Knockback @@ -12148,7 +12148,7 @@ data_ov31_02183314: ; 0x02183314 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02183318 data_ov31_02183318: ; 0x02183318 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_0218331c data_ov31_0218331c: ; 0x0218331c .word _ZN5Actor8vfunc_48EP9Knockback @@ -12325,7 +12325,7 @@ data_ov31_02183400: ; 0x02183400 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_02183404 data_ov31_02183404: ; 0x02183404 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02183408 data_ov31_02183408: ; 0x02183408 .word _ZN5Actor8vfunc_48EP9Knockback @@ -12502,7 +12502,7 @@ data_ov31_021834ec: ; 0x021834ec .word _ZN5Actor15IsHitboxTouchedEb .global data_ov31_021834f0 data_ov31_021834f0: ; 0x021834f0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_021834f4 data_ov31_021834f4: ; 0x021834f4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -12889,7 +12889,7 @@ data_ov31_02183b20: ; 0x02183b20 .word func_ov31_0217db50 ; func_ov35_0217db50 .global data_ov31_02183b24 data_ov31_02183b24: ; 0x02183b24 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02183b28 data_ov31_02183b28: ; 0x02183b28 .word _ZN5Actor8vfunc_48EP9Knockback @@ -13167,7 +13167,7 @@ data_ov31_02183c88: ; 0x02183c88 .word func_ov31_0217db50 ; func_ov35_0217db50 .global data_ov31_02183c8c data_ov31_02183c8c: ; 0x02183c8c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02183c90 data_ov31_02183c90: ; 0x02183c90 .word _ZN5Actor8vfunc_48EP9Knockback @@ -13397,7 +13397,7 @@ data_ov31_02183dbc: ; 0x02183dbc .word func_ov14_02145974 .global data_ov31_02183dc0 data_ov31_02183dc0: ; 0x02183dc0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov31_02183dc4 data_ov31_02183dc4: ; 0x02183dc4 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov32.inc b/asm/ov32.inc index 90e0f5ab..092dd4e8 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -23,7 +23,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14DistanceToLinkEv diff --git a/asm/ov32.s b/asm/ov32.s index e7f70440..d3538ab4 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -12002,7 +12002,7 @@ data_ov32_021855ec: ; 0x021855ec .word _ZN5Actor15IsHitboxTouchedEb .global data_ov32_021855f0 data_ov32_021855f0: ; 0x021855f0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov32_021855f4 data_ov32_021855f4: ; 0x021855f4 .word func_ov32_0217d478 @@ -12401,7 +12401,7 @@ data_ov32_02185800: ; 0x02185800 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov32_02185804 data_ov32_02185804: ; 0x02185804 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov32_02185808 data_ov32_02185808: ; 0x02185808 .word func_ov32_0217e730 ; data_ov61_0217e730 @@ -12980,7 +12980,7 @@ data_ov32_02185b14: ; 0x02185b14 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov32_02185b18 data_ov32_02185b18: ; 0x02185b18 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov32_02185b1c data_ov32_02185b1c: ; 0x02185b1c .word func_ov32_02180c00 ; data_ov61_02180c00 @@ -13625,7 +13625,7 @@ data_ov32_02185e70: ; 0x02185e70 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov32_02185e74 data_ov32_02185e74: ; 0x02185e74 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov32_02185e78 data_ov32_02185e78: ; 0x02185e78 .word func_ov00_020caeb4 @@ -13925,7 +13925,7 @@ data_ov32_02186000: ; 0x02186000 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov32_02186004 data_ov32_02186004: ; 0x02186004 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov32_02186008 data_ov32_02186008: ; 0x02186008 .word func_ov32_0218408c @@ -14129,7 +14129,7 @@ data_ov32_02186110: ; 0x02186110 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov32_02186114 data_ov32_02186114: ; 0x02186114 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov32_02186118 data_ov32_02186118: ; 0x02186118 .word func_ov32_02184888 ; func_ov34_02184888, func_ov35_02184888 diff --git a/asm/ov33.inc b/asm/ov33.inc index 9f15ad37..9d7ee15b 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -6,7 +6,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov33.s b/asm/ov33.s index e6daa0fb..0a9dd092 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -5249,7 +5249,7 @@ data_ov33_0217ff88: ; 0x0217ff88 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov33_0217ff8c data_ov33_0217ff8c: ; 0x0217ff8c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov33_0217ff90 data_ov33_0217ff90: ; 0x0217ff90 .word func_ov33_0217c134 ; func_ov34_0217c134, func_ov37_0217c134 @@ -5488,7 +5488,7 @@ data_ov33_021800d4: ; 0x021800d4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov33_021800d8 data_ov33_021800d8: ; 0x021800d8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov33_021800dc data_ov33_021800dc: ; 0x021800dc .word func_ov33_0217ca08 @@ -5692,7 +5692,7 @@ data_ov33_021801e4: ; 0x021801e4 .word func_ov14_02145974 .global data_ov33_021801e8 data_ov33_021801e8: ; 0x021801e8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov33_021801ec data_ov33_021801ec: ; 0x021801ec .word _ZN5Actor8vfunc_48EP9Knockback @@ -5985,7 +5985,7 @@ data_ov33_02180370: ; 0x02180370 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov33_02180374 data_ov33_02180374: ; 0x02180374 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov33_02180378 data_ov33_02180378: ; 0x02180378 .word func_ov33_0217ebf8 ; data_ov61_0217ebf8 @@ -6248,7 +6248,7 @@ data_ov33_021804e0: ; 0x021804e0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov33_021804e4 data_ov33_021804e4: ; 0x021804e4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov33_021804e8 data_ov33_021804e8: ; 0x021804e8 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov34.inc b/asm/ov34.inc index 4002a5f3..582fe3b2 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -8,7 +8,7 @@ .extern _ZN5Actor10GetAngleToEP5Vec3p .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov34.s b/asm/ov34.s index d4d0dacc..8f6f90d5 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -11931,7 +11931,7 @@ data_ov34_02185d90: ; 0x02185d90 .word func_ov34_021832c0 .global data_ov34_02185d94 data_ov34_02185d94: ; 0x02185d94 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov34_02185d98 data_ov34_02185d98: ; 0x02185d98 .word func_ov34_02183024 @@ -12283,7 +12283,7 @@ data_ov34_02185ffc: ; 0x02185ffc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov34_02186000 data_ov34_02186000: ; 0x02186000 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov34_02186004 data_ov34_02186004: ; 0x02186004 .word _ZN5Actor8vfunc_48EP9Knockback @@ -12496,7 +12496,7 @@ data_ov34_02186118: ; 0x02186118 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov34_0218611c data_ov34_0218611c: ; 0x0218611c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov34_02186120 data_ov34_02186120: ; 0x02186120 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov35.inc b/asm/ov35.inc index 54625854..537204ab 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -19,7 +19,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14DistanceToLinkEv diff --git a/asm/ov35.s b/asm/ov35.s index 18d85087..ad3daabf 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -12104,7 +12104,7 @@ data_ov35_021859cc: ; 0x021859cc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov35_021859d0 data_ov35_021859d0: ; 0x021859d0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov35_021859d4 data_ov35_021859d4: ; 0x021859d4 .word func_ov35_0217c718 @@ -12269,7 +12269,7 @@ data_ov35_02185ab0: ; 0x02185ab0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov35_02185ab4 data_ov35_02185ab4: ; 0x02185ab4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov35_02185ab8 data_ov35_02185ab8: ; 0x02185ab8 .word func_ov35_0217e3dc ; data_ov61_0217e3dc @@ -12757,7 +12757,7 @@ data_ov35_02185d30: ; 0x02185d30 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov35_02185d34 data_ov35_02185d34: ; 0x02185d34 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov35_02185d38 data_ov35_02185d38: ; 0x02185d38 .word func_ov35_0218361c @@ -12901,7 +12901,7 @@ data_ov35_02185df0: ; 0x02185df0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov35_02185df4 data_ov35_02185df4: ; 0x02185df4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov35_02185df8 data_ov35_02185df8: ; 0x02185df8 .word func_ov35_02184b28 diff --git a/asm/ov36.inc b/asm/ov36.inc index 40eb0de0..7dee2858 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -10,7 +10,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov36.s b/asm/ov36.s index 573786b4..2296cc8d 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -13184,7 +13184,7 @@ data_ov36_02186d58: ; 0x02186d58 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov36_02186d5c data_ov36_02186d5c: ; 0x02186d5c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov36_02186d60 data_ov36_02186d60: ; 0x02186d60 .word func_ov36_02183b7c @@ -13500,7 +13500,7 @@ data_ov36_02186f2c: ; 0x02186f2c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov36_02186f30 data_ov36_02186f30: ; 0x02186f30 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov36_02186f34 data_ov36_02186f34: ; 0x02186f34 .word func_ov36_02186648 diff --git a/asm/ov37.inc b/asm/ov37.inc index 8f09d789..64a7e88e 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -14,7 +14,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov37.s b/asm/ov37.s index 6dd4ade5..cee381c5 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -15802,7 +15802,7 @@ data_ov37_02188ae8: ; 0x02188ae8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov37_02188aec data_ov37_02188aec: ; 0x02188aec - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov37_02188af0 data_ov37_02188af0: ; 0x02188af0 .word func_ov00_020caeb4 @@ -16363,7 +16363,7 @@ data_ov37_02188dd0: ; 0x02188dd0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov37_02188dd4 data_ov37_02188dd4: ; 0x02188dd4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov37_02188dd8 data_ov37_02188dd8: ; 0x02188dd8 .word func_ov37_02185178 @@ -16504,7 +16504,7 @@ data_ov37_02188e8c: ; 0x02188e8c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov37_02188e90 data_ov37_02188e90: ; 0x02188e90 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov37_02188e94 data_ov37_02188e94: ; 0x02188e94 .word func_ov37_02185410 @@ -16741,7 +16741,7 @@ data_ov37_02188fc8: ; 0x02188fc8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov37_02188fcc data_ov37_02188fcc: ; 0x02188fcc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov37_02188fd0 data_ov37_02188fd0: ; 0x02188fd0 .word func_ov37_0218703c diff --git a/asm/ov38.inc b/asm/ov38.inc index c4ae7916..065cfcf8 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -15,7 +15,7 @@ .extern _ZN14AdventureFlags3SetEjb .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14GetAngleToLinkEv diff --git a/asm/ov38.s b/asm/ov38.s index fc4c7a1f..190c8700 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -15454,7 +15454,7 @@ data_ov38_02188f78: ; 0x02188f78 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov38_02188f7c data_ov38_02188f7c: ; 0x02188f7c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov38_02188f80 data_ov38_02188f80: ; 0x02188f80 .word func_ov38_02183d68 @@ -15781,7 +15781,7 @@ data_ov38_02189168: ; 0x02189168 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov38_0218916c data_ov38_0218916c: ; 0x0218916c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov38_02189170 data_ov38_02189170: ; 0x02189170 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov39.inc b/asm/ov39.inc index 3647cea4..1b6b8665 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -18,7 +18,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov39.s b/asm/ov39.s index 0641e62a..a6960a5c 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -13418,7 +13418,7 @@ data_ov39_02186a78: ; 0x02186a78 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov39_02186a7c data_ov39_02186a7c: ; 0x02186a7c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov39_02186a80 data_ov39_02186a80: ; 0x02186a80 .word func_ov39_0217dfc0 diff --git a/asm/ov40.inc b/asm/ov40.inc index 1e026e66..ddf800f0 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -17,7 +17,7 @@ .extern _ZN14AdventureFlags3SetEjb .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov40.s b/asm/ov40.s index fd29c2a6..1cae22fa 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -16755,7 +16755,7 @@ data_ov40_021886c8: ; 0x021886c8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov40_021886cc data_ov40_021886cc: ; 0x021886cc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov40_021886d0 data_ov40_021886d0: ; 0x021886d0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -18209,7 +18209,7 @@ data_ov40_02189214: ; 0x02189214 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov40_02189218 data_ov40_02189218: ; 0x02189218 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov40_0218921c data_ov40_0218921c: ; 0x0218921c .word _ZN5Actor8vfunc_48EP9Knockback @@ -18531,7 +18531,7 @@ data_ov40_021893c0: ; 0x021893c0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov40_021893c4 data_ov40_021893c4: ; 0x021893c4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov40_021893c8 data_ov40_021893c8: ; 0x021893c8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -18685,7 +18685,7 @@ data_ov40_021894a0: ; 0x021894a0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov40_021894a4 data_ov40_021894a4: ; 0x021894a4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov40_021894a8 data_ov40_021894a8: ; 0x021894a8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -19047,7 +19047,7 @@ data_ov40_02189678: ; 0x02189678 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov40_0218967c data_ov40_0218967c: ; 0x0218967c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov40_02189680 data_ov40_02189680: ; 0x02189680 .word _ZN5Actor8vfunc_48EP9Knockback @@ -19197,7 +19197,7 @@ data_ov40_02189740: ; 0x02189740 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov40_02189744 data_ov40_02189744: ; 0x02189744 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov40_02189748 data_ov40_02189748: ; 0x02189748 .word _ZN5Actor8vfunc_48EP9Knockback @@ -19609,7 +19609,7 @@ data_ov40_02189970: ; 0x02189970 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov40_02189974 data_ov40_02189974: ; 0x02189974 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov40_02189978 data_ov40_02189978: ; 0x02189978 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov41.inc b/asm/ov41.inc index 154dc42d..f0243f80 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -12,7 +12,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14DistanceToLinkEv diff --git a/asm/ov41.s b/asm/ov41.s index 10b91bd3..39657929 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -6280,7 +6280,7 @@ data_ov41_0218e388: ; 0x0218e388 .word func_ov14_02145974 .global data_ov41_0218e38c data_ov41_0218e38c: ; 0x0218e38c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov41_0218e390 data_ov41_0218e390: ; 0x0218e390 .word _ZN5Actor8vfunc_48EP9Knockback @@ -6511,7 +6511,7 @@ data_ov41_0218e4bc: ; 0x0218e4bc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov41_0218e4c0 data_ov41_0218e4c0: ; 0x0218e4c0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov41_0218e4c4 data_ov41_0218e4c4: ; 0x0218e4c4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -6694,7 +6694,7 @@ data_ov41_0218e5b0: ; 0x0218e5b0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov41_0218e5b4 data_ov41_0218e5b4: ; 0x0218e5b4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov41_0218e5b8 data_ov41_0218e5b8: ; 0x0218e5b8 .word func_ov41_0218a968 @@ -6891,7 +6891,7 @@ data_ov41_0218e6ac: ; 0x0218e6ac .word func_ov14_02145974 .global data_ov41_0218e6b0 data_ov41_0218e6b0: ; 0x0218e6b0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov41_0218e6b4 data_ov41_0218e6b4: ; 0x0218e6b4 .word func_ov41_0218b260 @@ -7080,7 +7080,7 @@ data_ov41_0218e7a8: ; 0x0218e7a8 .word func_ov14_02145974 .global data_ov41_0218e7ac data_ov41_0218e7ac: ; 0x0218e7ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov41_0218e7b0 data_ov41_0218e7b0: ; 0x0218e7b0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -7365,7 +7365,7 @@ data_ov41_0218e924: ; 0x0218e924 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov41_0218e928 data_ov41_0218e928: ; 0x0218e928 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov41_0218e92c data_ov41_0218e92c: ; 0x0218e92c .word func_ov00_020caeb4 diff --git a/asm/ov42.inc b/asm/ov42.inc index 4d170504..6cc4857a 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -8,7 +8,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov42.s b/asm/ov42.s index b9ef5dd0..db37b11f 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -4258,7 +4258,7 @@ data_ov42_0218c95c: ; 0x0218c95c .word func_ov14_02145974 .global data_ov42_0218c960 data_ov42_0218c960: ; 0x0218c960 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov42_0218c964 data_ov42_0218c964: ; 0x0218c964 .word func_ov42_0218aae8 @@ -4487,7 +4487,7 @@ data_ov42_0218cb18: ; 0x0218cb18 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov42_0218cb1c data_ov42_0218cb1c: ; 0x0218cb1c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov42_0218cb20 data_ov42_0218cb20: ; 0x0218cb20 .word func_ov42_0218bf84 @@ -4631,7 +4631,7 @@ data_ov42_0218cbd8: ; 0x0218cbd8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov42_0218cbdc data_ov42_0218cbdc: ; 0x0218cbdc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov42_0218cbe0 data_ov42_0218cbe0: ; 0x0218cbe0 .word func_ov42_0218bf84 @@ -4775,7 +4775,7 @@ data_ov42_0218cc98: ; 0x0218cc98 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov42_0218cc9c data_ov42_0218cc9c: ; 0x0218cc9c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov42_0218cca0 data_ov42_0218cca0: ; 0x0218cca0 .word func_ov42_0218bf84 diff --git a/asm/ov43.inc b/asm/ov43.inc index 9f406229..a4941674 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -9,7 +9,7 @@ .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov43.s b/asm/ov43.s index 43d17ab4..0461cdfa 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -4982,7 +4982,7 @@ data_ov43_0218d6a8: ; 0x0218d6a8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov43_0218d6ac data_ov43_0218d6ac: ; 0x0218d6ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov43_0218d6b0 data_ov43_0218d6b0: ; 0x0218d6b0 .word func_ov00_020caeb4 @@ -5186,7 +5186,7 @@ data_ov43_0218d7b8: ; 0x0218d7b8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov43_0218d7bc data_ov43_0218d7bc: ; 0x0218d7bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov43_0218d7c0 data_ov43_0218d7c0: ; 0x0218d7c0 .word func_ov00_020caeb4 @@ -5390,7 +5390,7 @@ data_ov43_0218d8c8: ; 0x0218d8c8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov43_0218d8cc data_ov43_0218d8cc: ; 0x0218d8cc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov43_0218d8d0 data_ov43_0218d8d0: ; 0x0218d8d0 .word func_ov00_020caeb4 @@ -5609,7 +5609,7 @@ data_ov43_0218d9ec: ; 0x0218d9ec .word _ZN5Actor15IsHitboxTouchedEb .global data_ov43_0218d9f0 data_ov43_0218d9f0: ; 0x0218d9f0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov43_0218d9f4 data_ov43_0218d9f4: ; 0x0218d9f4 .word func_ov43_0218ca54 diff --git a/asm/ov44.inc b/asm/ov44.inc index 9e4221a9..837dfce6 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -7,7 +7,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov44.s b/asm/ov44.s index 6d534bd2..a7c1a3f6 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -7796,7 +7796,7 @@ data_ov44_0218f2c8: ; 0x0218f2c8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218f2cc data_ov44_0218f2cc: ; 0x0218f2cc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218f2d0 data_ov44_0218f2d0: ; 0x0218f2d0 .word func_ov00_020caeb4 @@ -8167,7 +8167,7 @@ data_ov44_0218f4ac: ; 0x0218f4ac .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218f4b0 data_ov44_0218f4b0: ; 0x0218f4b0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218f4b4 data_ov44_0218f4b4: ; 0x0218f4b4 .word func_ov00_020caeb4 @@ -8427,7 +8427,7 @@ data_ov44_0218f5fc: ; 0x0218f5fc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218f600 data_ov44_0218f600: ; 0x0218f600 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218f604 data_ov44_0218f604: ; 0x0218f604 .word _ZN5Actor8vfunc_48EP9Knockback @@ -8760,7 +8760,7 @@ data_ov44_0218f7b8: ; 0x0218f7b8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218f7bc data_ov44_0218f7bc: ; 0x0218f7bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218f7c0 data_ov44_0218f7c0: ; 0x0218f7c0 .word func_ov00_020caeb4 @@ -9108,7 +9108,7 @@ data_ov44_0218f9a4: ; 0x0218f9a4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218f9a8 data_ov44_0218f9a8: ; 0x0218f9a8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218f9ac data_ov44_0218f9ac: ; 0x0218f9ac .word _ZN5Actor8vfunc_48EP9Knockback @@ -9401,7 +9401,7 @@ data_ov44_0218fb20: ; 0x0218fb20 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218fb24 data_ov44_0218fb24: ; 0x0218fb24 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218fb28 data_ov44_0218fb28: ; 0x0218fb28 .word func_ov44_0218cfc4 @@ -9792,7 +9792,7 @@ data_ov44_0218fd30: ; 0x0218fd30 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218fd34 data_ov44_0218fd34: ; 0x0218fd34 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218fd38 data_ov44_0218fd38: ; 0x0218fd38 .word func_ov00_020caeb4 @@ -10011,7 +10011,7 @@ data_ov44_0218fe54: ; 0x0218fe54 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov44_0218fe58 data_ov44_0218fe58: ; 0x0218fe58 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov44_0218fe5c data_ov44_0218fe5c: ; 0x0218fe5c .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov45.inc b/asm/ov45.inc index 997bba3e..dc3b6846 100644 --- a/asm/ov45.inc +++ b/asm/ov45.inc @@ -7,7 +7,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov45.s b/asm/ov45.s index ed438db4..0d6f80ae 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -6716,7 +6716,7 @@ data_ov45_0218e514: ; 0x0218e514 .word func_ov14_02145974 .global data_ov45_0218e518 data_ov45_0218e518: ; 0x0218e518 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov45_0218e51c data_ov45_0218e51c: ; 0x0218e51c .word _ZN5Actor8vfunc_48EP9Knockback @@ -7224,7 +7224,7 @@ data_ov45_0218e794: ; 0x0218e794 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov45_0218e798 data_ov45_0218e798: ; 0x0218e798 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov45_0218e79c data_ov45_0218e79c: ; 0x0218e79c .word _ZN5Actor8vfunc_48EP9Knockback @@ -7541,7 +7541,7 @@ data_ov45_0218e998: ; 0x0218e998 .word func_ov14_02145974 .global data_ov45_0218e99c data_ov45_0218e99c: ; 0x0218e99c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov45_0218e9a0 data_ov45_0218e9a0: ; 0x0218e9a0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov46.inc b/asm/ov46.inc index b21ef5bb..2012a9ba 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -13,7 +13,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov46.s b/asm/ov46.s index 80dcf6cb..a9c1c578 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -5491,7 +5491,7 @@ data_ov46_021946d8: ; 0x021946d8 .word func_ov14_02145974 .global data_ov46_021946dc data_ov46_021946dc: ; 0x021946dc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov46_021946e0 data_ov46_021946e0: ; 0x021946e0 .word _ZN5Actor8vfunc_48EP9Knockback @@ -5718,7 +5718,7 @@ data_ov46_02194808: ; 0x02194808 .word func_ov14_02145974 .global data_ov46_0219480c data_ov46_0219480c: ; 0x0219480c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov46_02194810 data_ov46_02194810: ; 0x02194810 .word _ZN5Actor8vfunc_48EP9Knockback @@ -6041,7 +6041,7 @@ data_ov46_021949b0: ; 0x021949b0 .word func_ov14_02145974 .global data_ov46_021949b4 data_ov46_021949b4: ; 0x021949b4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov46_021949b8 data_ov46_021949b8: ; 0x021949b8 .word _ZN5Actor8vfunc_48EP9Knockback @@ -6330,7 +6330,7 @@ data_ov46_02194b2c: ; 0x02194b2c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov46_02194b30 data_ov46_02194b30: ; 0x02194b30 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov46_02194b34 data_ov46_02194b34: ; 0x02194b34 .word func_ov46_02193cdc diff --git a/asm/ov47.inc b/asm/ov47.inc index b8e9eac5..c95fedcc 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -3,7 +3,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12KillInBoundsEv .extern _ZN5Actor12SetTransformEP9Transform diff --git a/asm/ov47.s b/asm/ov47.s index 1f7c2242..6eb75cc0 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -5352,7 +5352,7 @@ data_ov47_02194548: ; 0x02194548 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov47_0219454c data_ov47_0219454c: ; 0x0219454c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov47_02194550 data_ov47_02194550: ; 0x02194550 .word _ZN5Actor8vfunc_48EP9Knockback @@ -5493,7 +5493,7 @@ data_ov47_02194604: ; 0x02194604 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov47_02194608 data_ov47_02194608: ; 0x02194608 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov47_0219460c data_ov47_0219460c: ; 0x0219460c .word _ZN5Actor8vfunc_48EP9Knockback @@ -5810,7 +5810,7 @@ data_ov47_021947a0: ; 0x021947a0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov47_021947a4 data_ov47_021947a4: ; 0x021947a4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov47_021947a8 data_ov47_021947a8: ; 0x021947a8 .word func_ov47_02191fac @@ -6151,7 +6151,7 @@ data_ov47_0219495c: ; 0x0219495c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov47_02194960 data_ov47_02194960: ; 0x02194960 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov47_02194964 data_ov47_02194964: ; 0x02194964 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov48.inc b/asm/ov48.inc index a042a3fe..b20b41f1 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -8,7 +8,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p @@ -68,7 +68,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor12XzDistanceToEP5Vec3p diff --git a/asm/ov48.s b/asm/ov48.s index 17874aa1..038ac169 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -6279,7 +6279,7 @@ data_ov48_02194c08: ; 0x02194c08 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov48_02194c0c data_ov48_02194c0c: ; 0x02194c0c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov48_02194c10 data_ov48_02194c10: ; 0x02194c10 .word func_ov48_021907f4 @@ -6670,7 +6670,7 @@ data_ov48_02194e18: ; 0x02194e18 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov48_02194e1c data_ov48_02194e1c: ; 0x02194e1c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov48_02194e20 data_ov48_02194e20: ; 0x02194e20 .word func_ov48_021912a0 @@ -7038,7 +7038,7 @@ data_ov48_02194ff8: ; 0x02194ff8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov48_02194ffc data_ov48_02194ffc: ; 0x02194ffc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov48_02195000 data_ov48_02195000: ; 0x02195000 .word func_ov00_020caeb4 @@ -7242,7 +7242,7 @@ data_ov48_02195108: ; 0x02195108 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov48_0219510c data_ov48_0219510c: ; 0x0219510c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov48_02195110 data_ov48_02195110: ; 0x02195110 .word func_ov48_02193644 @@ -7383,7 +7383,7 @@ data_ov48_021951c4: ; 0x021951c4 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov48_021951c8 data_ov48_021951c8: ; 0x021951c8 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov48_021951cc data_ov48_021951cc: ; 0x021951cc .word func_ov48_02194028 @@ -7524,7 +7524,7 @@ data_ov48_02195280: ; 0x02195280 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov48_02195284 data_ov48_02195284: ; 0x02195284 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov48_02195288 data_ov48_02195288: ; 0x02195288 .word func_ov48_02194100 diff --git a/asm/ov49.inc b/asm/ov49.inc index b37cca55..ea9542b7 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -12,7 +12,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14DistanceToLinkEv diff --git a/asm/ov49.s b/asm/ov49.s index d55be110..c09c25e0 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -3835,7 +3835,7 @@ data_ov49_021985a8: ; 0x021985a8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov49_021985ac data_ov49_021985ac: ; 0x021985ac - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov49_021985b0 data_ov49_021985b0: ; 0x021985b0 .word func_ov49_021965f4 @@ -4237,7 +4237,7 @@ data_ov49_021987dc: ; 0x021987dc .word _ZN5Actor15IsHitboxTouchedEb .global data_ov49_021987e0 data_ov49_021987e0: ; 0x021987e0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov49_021987e4 data_ov49_021987e4: ; 0x021987e4 .word _ZN5Actor8vfunc_48EP9Knockback @@ -4378,7 +4378,7 @@ data_ov49_02198898: ; 0x02198898 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov49_0219889c data_ov49_0219889c: ; 0x0219889c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov49_021988a0 data_ov49_021988a0: ; 0x021988a0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov50.inc b/asm/ov50.inc index 4cfb2ce4..dce43e28 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -17,7 +17,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14GetAngleToLinkEv diff --git a/asm/ov50.s b/asm/ov50.s index 03871ee3..4687abb5 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -4113,7 +4113,7 @@ data_ov50_02198a44: ; 0x02198a44 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov50_02198a48 data_ov50_02198a48: ; 0x02198a48 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov50_02198a4c data_ov50_02198a4c: ; 0x02198a4c .word func_ov50_021964d0 @@ -4398,7 +4398,7 @@ data_ov50_02198bc0: ; 0x02198bc0 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov50_02198bc4 data_ov50_02198bc4: ; 0x02198bc4 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov50_02198bc8 data_ov50_02198bc8: ; 0x02198bc8 .word func_ov00_020caeb4 diff --git a/asm/ov51.inc b/asm/ov51.inc index 5d30026d..cd8df54b 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -3,7 +3,7 @@ .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor15IsHitboxTouchedEb diff --git a/asm/ov51.s b/asm/ov51.s index 80c9eb91..00f4a85e 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -3784,7 +3784,7 @@ data_ov51_02198528: ; 0x02198528 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov51_0219852c data_ov51_0219852c: ; 0x0219852c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov51_02198530 data_ov51_02198530: ; 0x02198530 .word _ZN5Actor8vfunc_48EP9Knockback @@ -3981,7 +3981,7 @@ data_ov51_02198624: ; 0x02198624 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov51_02198628 data_ov51_02198628: ; 0x02198628 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov51_0219862c data_ov51_0219862c: ; 0x0219862c .word func_ov51_02195c08 @@ -4218,7 +4218,7 @@ data_ov51_02198760: ; 0x02198760 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov51_02198764 data_ov51_02198764: ; 0x02198764 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov51_02198768 data_ov51_02198768: ; 0x02198768 .word func_ov00_020caeb4 @@ -4442,7 +4442,7 @@ data_ov51_0219889c: ; 0x0219889c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov51_021988a0 data_ov51_021988a0: ; 0x021988a0 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov51_021988a4 data_ov51_021988a4: ; 0x021988a4 .word func_ov51_02197640 @@ -4663,7 +4663,7 @@ data_ov51_021989b8: ; 0x021989b8 .word _ZN5Actor15IsHitboxTouchedEb .global data_ov51_021989bc data_ov51_021989bc: ; 0x021989bc - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov51_021989c0 data_ov51_021989c0: ; 0x021989c0 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/asm/ov52.inc b/asm/ov52.inc index 1adb57dc..4a7b7b94 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -13,7 +13,7 @@ .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12CollidesWithEPS_ .extern _ZN5Actor12GetOffsetPosEP5Vec3p .extern _ZN5Actor12SetTransformEP9Transform .extern _ZN5Actor14DistanceToLinkEv diff --git a/asm/ov52.s b/asm/ov52.s index 45fb2304..a76a2e13 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -3096,7 +3096,7 @@ data_ov52_02197a6c: ; 0x02197a6c .word _ZN5Actor15IsHitboxTouchedEb .global data_ov52_02197a70 data_ov52_02197a70: ; 0x02197a70 - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov52_02197a74 data_ov52_02197a74: ; 0x02197a74 .word func_ov52_02196978 @@ -3305,7 +3305,7 @@ data_ov52_02197b78: ; 0x02197b78 .word func_ov14_02145974 .global data_ov52_02197b7c data_ov52_02197b7c: ; 0x02197b7c - .word _ZN5Actor12CollidesWithEPKS_ + .word _ZN5Actor12CollidesWithEPS_ .global data_ov52_02197b80 data_ov52_02197b80: ; 0x02197b80 .word _ZN5Actor8vfunc_48EP9Knockback diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 43bf8b43..947caddf 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -161,7 +161,7 @@ public: /* 38 */ virtual unk32 vfunc_38(); /* 3c */ virtual bool CollidesWithLink(); /* 40 */ virtual bool IsHitboxTouched(bool param1); - /* 44 */ virtual bool CollidesWith(const Actor *other); + /* 44 */ virtual bool CollidesWith(Actor *other); /* 48 */ virtual bool vfunc_48(Knockback *param1); /* 4c */ virtual bool vfunc_4c(unk32 *param1); /* 50 */ virtual Vec3p* GetPos(); diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 36b9cf57..7c8499cc 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -496,24 +496,36 @@ bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **result) { return false; } -bool Actor::CollidesWith(const Actor *other) { - // bool collides = false; - // if (other->mAlive) { - // if (other->mHitbox.size >= 0 && mHitbox.size >= 0) { - // Cylinder a, b; - // this->GetHitbox(&a); - // other->GetHitbox(&b); - // if (a.Overlaps(&b)) { - // collides = true; - // } - // } - // } - // return collides; +bool Actor::CollidesWith(Actor *other) { + bool collides = false; + if (other->mAlive) { + if (other->mHitbox.size >= 0 && mHitbox.size >= 0) { + Cylinder a, b; + this->GetHitbox(&a); + other->GetHitbox(&b); + if (a.Overlaps(&b)) collides = true; + } + } + return collides; +} + +bool Actor::func_ov00_020c27a8(unk32 param1) { + if (mUnk_11b) return false; + if (param1 == 0) return mUnk_12c != 0; + return mUnk_12c == param1; +} + +bool Actor::CollidesWithLink() { + Cylinder hitbox; + this->GetHitbox(&hitbox); + // Link's hitbox has a radius of 1, hence why they add 1.0 here + return this->DistanceToLink() < hitbox.size + FLOAT_TO_Q20(1.0); +} + +bool Actor::IsFollowedByLink() { + // return mRef.id == gPlayerControl->mFollowRef.id; } -bool Actor::func_ov00_020c27a8(unk32 param1) {} -bool Actor::CollidesWithLink() {} -bool Actor::IsFollowedByLink() {} void Actor::StopLinkFollow() {} bool Actor::IsGrabbed() {} s32 Actor::XzDistanceTo(Vec3p *vec) {}