mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-11 14:38:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp Actor

Browse Source
This commit is contained in:
Aetias
2024-05-23 19:53:26 +02:00
parent 552101cc26
commit b32a2702e8
81 changed files with 419 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Actor/Actor.s
+5 -5
View File
@@ -707,12 +707,12 @@ _ZN5Actor18func_ov00_020c1c20Eii: ; 0x020c1c20
_020c1c44: .word gMapManager
arm_func_end _ZN5Actor18func_ov00_020c1c20Eii
.global _ZN5Actor8vfunc_48Ei
arm_func_start _ZN5Actor8vfunc_48Ei
_ZN5Actor8vfunc_48Ei: ; 0x020c1c48
.global _ZN5Actor8vfunc_48EP9Knockback
arm_func_start _ZN5Actor8vfunc_48EP9Knockback
_ZN5Actor8vfunc_48EP9Knockback: ; 0x020c1c48
mov r0, #1
bx lr
arm_func_end _ZN5Actor8vfunc_48Ei
arm_func_end _ZN5Actor8vfunc_48EP9Knockback
.global _ZN5Actor8vfunc_4cEPi
arm_func_start _ZN5Actor8vfunc_4cEPi
@@ -2875,7 +2875,7 @@ data_ov00_020e7238: ; 0x020e7238
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e723c
data_ov00_020e723c: ; 0x020e723c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e7240
data_ov00_020e7240: ; 0x020e7240
.word _ZN5Actor8vfunc_4cEPi
asm/ov00/ov00_02086cd0.inc
+1 -1
View File
@@ -72,7 +72,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov00/ov00_02086cd0.s
+3 -3
View File
@@ -24326,7 +24326,7 @@ data_ov00_020e2974: ; 0x020e2974
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e2978
data_ov00_020e2978: ; 0x020e2978
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e297c
data_ov00_020e297c: ; 0x020e297c
.word _ZN5Actor8vfunc_4cEPi
@@ -24467,7 +24467,7 @@ data_ov00_020e2a30: ; 0x020e2a30
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e2a34
data_ov00_020e2a34: ; 0x020e2a34
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e2a38
data_ov00_020e2a38: ; 0x020e2a38
.word _ZN5Actor8vfunc_4cEPi
@@ -24608,7 +24608,7 @@ data_ov00_020e2aec: ; 0x020e2aec
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e2af0
data_ov00_020e2af0: ; 0x020e2af0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e2af4
data_ov00_020e2af4: ; 0x020e2af4
.word _ZN5Actor8vfunc_4cEPi
asm/ov00/ov00_020980f4.inc
+1 -1
View File
@@ -49,7 +49,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov00/ov00_020980f4.s
+3 -3
View File
@@ -24562,7 +24562,7 @@ data_ov00_020e4c94: ; 0x020e4c94
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e4c98
data_ov00_020e4c98: ; 0x020e4c98
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e4c9c
data_ov00_020e4c9c: ; 0x020e4c9c
.word _ZN5Actor8vfunc_4cEPi
@@ -25025,7 +25025,7 @@ data_ov00_020e4f3c: ; 0x020e4f3c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e4f40
data_ov00_020e4f40: ; 0x020e4f40
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e4f44
data_ov00_020e4f44: ; 0x020e4f44
.word _ZN5Actor8vfunc_4cEPi
@@ -25719,7 +25719,7 @@ data_ov00_020e5340: ; 0x020e5340
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e5344
data_ov00_020e5344: ; 0x020e5344
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e5348
data_ov00_020e5348: ; 0x020e5348
.word _ZN5Actor8vfunc_4cEPi
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -121,7 +121,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov00/ov00_020b1498.s
+5 -5
View File
@@ -23091,7 +23091,7 @@ data_ov00_020e65a4: ; 0x020e65a4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e65a8
data_ov00_020e65a8: ; 0x020e65a8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e65ac
data_ov00_020e65ac: ; 0x020e65ac
.word _ZN5Actor8vfunc_4cEPi
@@ -23304,7 +23304,7 @@ data_ov00_020e66c0: ; 0x020e66c0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e66c4
data_ov00_020e66c4: ; 0x020e66c4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e66c8
data_ov00_020e66c8: ; 0x020e66c8
.word _ZN5Actor8vfunc_4cEPi
@@ -23582,7 +23582,7 @@ data_ov00_020e6828: ; 0x020e6828
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e682c
data_ov00_020e682c: ; 0x020e682c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e6830
data_ov00_020e6830: ; 0x020e6830
.word _ZN5Actor8vfunc_4cEPi
@@ -24213,7 +24213,7 @@ data_ov00_020e6d88: ; 0x020e6d88
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e6d8c
data_ov00_020e6d8c: ; 0x020e6d8c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e6d90
data_ov00_020e6d90: ; 0x020e6d90
.word _ZN5Actor8vfunc_4cEPi
@@ -24845,7 +24845,7 @@ data_ov00_020e70e4: ; 0x020e70e4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e70e8
data_ov00_020e70e8: ; 0x020e70e8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e70ec
data_ov00_020e70ec: ; 0x020e70ec
.word _ZN5Actor8vfunc_4cEPi
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -82,7 +82,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov00/ov00_020c3e54.s
+9 -9
View File
@@ -31307,7 +31307,7 @@ data_ov00_020e84a4: ; 0x020e84a4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e84a8
data_ov00_020e84a8: ; 0x020e84a8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e84ac
data_ov00_020e84ac: ; 0x020e84ac
.word _ZN5Actor8vfunc_4cEPi
@@ -31545,7 +31545,7 @@ data_ov00_020e861c: ; 0x020e861c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e8620
data_ov00_020e8620: ; 0x020e8620
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e8624
data_ov00_020e8624: ; 0x020e8624
.word _ZN5Actor8vfunc_4cEPi
@@ -31767,7 +31767,7 @@ data_ov00_020e8744: ; 0x020e8744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e8748
data_ov00_020e8748: ; 0x020e8748
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e874c
data_ov00_020e874c: ; 0x020e874c
.word _ZN5Actor8vfunc_4cEPi
@@ -32660,7 +32660,7 @@ data_ov00_020e8be4: ; 0x020e8be4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e8be8
data_ov00_020e8be8: ; 0x020e8be8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e8bec
data_ov00_020e8bec: ; 0x020e8bec
.word _ZN5Actor8vfunc_4cEPi
@@ -32867,7 +32867,7 @@ data_ov00_020e8cf8: ; 0x020e8cf8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e8cfc
data_ov00_020e8cfc: ; 0x020e8cfc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e8d00
data_ov00_020e8d00: ; 0x020e8d00
.word _ZN5Actor8vfunc_4cEPi
@@ -33113,7 +33113,7 @@ data_ov00_020e8e40: ; 0x020e8e40
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e8e44
data_ov00_020e8e44: ; 0x020e8e44
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e8e48
data_ov00_020e8e48: ; 0x020e8e48
.word _ZN5Actor8vfunc_4cEPi
@@ -33468,7 +33468,7 @@ data_ov00_020e9004: ; 0x020e9004
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e9008
data_ov00_020e9008: ; 0x020e9008
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e900c
data_ov00_020e900c: ; 0x020e900c
.word _ZN5Actor8vfunc_4cEPi
@@ -33713,7 +33713,7 @@ data_ov00_020e9140: ; 0x020e9140
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e9144
data_ov00_020e9144: ; 0x020e9144
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e9148
data_ov00_020e9148: ; 0x020e9148
.word _ZN5Actor8vfunc_4cEPi
@@ -33886,7 +33886,7 @@ data_ov00_020e922c: ; 0x020e922c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov00_020e9230
data_ov00_020e9230: ; 0x020e9230
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e9234
data_ov00_020e9234: ; 0x020e9234
.word _ZN5Actor8vfunc_4cEPi
asm/ov03.inc
+1 -1
View File
@@ -28,7 +28,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov03.s
+1 -1
View File
@@ -44985,7 +44985,7 @@ data_ov03_021008c0: ; 0x021008c0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov03_021008c4
data_ov03_021008c4: ; 0x021008c4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov03_021008c8
data_ov03_021008c8: ; 0x021008c8
.word _ZN5Actor8vfunc_4cEPi
asm/ov12.inc
+1 -1
View File
@@ -69,7 +69,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov12.s
+4 -4
View File
@@ -48553,7 +48553,7 @@ data_ov12_02136b30: ; 0x02136b30
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov12_02136b34
data_ov12_02136b34: ; 0x02136b34
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov12_02136b38
data_ov12_02136b38: ; 0x02136b38
.word _ZN5Actor8vfunc_4cEPi
@@ -49500,7 +49500,7 @@ data_ov12_021371b8: ; 0x021371b8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov12_021371bc
data_ov12_021371bc: ; 0x021371bc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov12_021371c0
data_ov12_021371c0: ; 0x021371c0
.word _ZN5Actor8vfunc_4cEPi
@@ -49881,7 +49881,7 @@ data_ov12_02137440: ; 0x02137440
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov12_02137444
data_ov12_02137444: ; 0x02137444
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov12_02137448
data_ov12_02137448: ; 0x02137448
.word _ZN5Actor8vfunc_4cEPi
@@ -50715,7 +50715,7 @@ data_ov12_02137868: ; 0x02137868
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov12_0213786c
data_ov12_0213786c: ; 0x0213786c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov12_02137870
data_ov12_02137870: ; 0x02137870
.word _ZN5Actor8vfunc_4cEPi
asm/ov14/Actor/ActorRupee.inc
+1 -1
View File
@@ -28,7 +28,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_68Ev
asm/ov14/Actor/ActorRupee.s
+1 -1
View File
@@ -887,7 +887,7 @@ data_ov14_02158a28: ; 0x02158a28
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158a2c
data_ov14_02158a2c: ; 0x02158a2c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158a30
data_ov14_02158a30: ; 0x02158a30
.word _ZN5Actor8vfunc_4cEPi
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -107,7 +107,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov14/ov14_0211f640.s
+25 -25
View File
@@ -36156,7 +36156,7 @@ data_ov14_02155b0c: ; 0x02155b0c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02155b10
data_ov14_02155b10: ; 0x02155b10
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02155b14
data_ov14_02155b14: ; 0x02155b14
.word _ZN5Actor8vfunc_4cEPi
@@ -36386,7 +36386,7 @@ data_ov14_02155c34: ; 0x02155c34
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02155c38
data_ov14_02155c38: ; 0x02155c38
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02155c3c
data_ov14_02155c3c: ; 0x02155c3c
.word _ZN5Actor8vfunc_4cEPi
@@ -36595,7 +36595,7 @@ data_ov14_02155d40: ; 0x02155d40
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02155d44
data_ov14_02155d44: ; 0x02155d44
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02155d48
data_ov14_02155d48: ; 0x02155d48
.word _ZN5Actor8vfunc_4cEPi
@@ -36792,7 +36792,7 @@ data_ov14_02155e3c: ; 0x02155e3c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02155e40
data_ov14_02155e40: ; 0x02155e40
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02155e44
data_ov14_02155e44: ; 0x02155e44
.word _ZN5Actor8vfunc_4cEPi
@@ -36989,7 +36989,7 @@ data_ov14_02155f38: ; 0x02155f38
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02155f3c
data_ov14_02155f3c: ; 0x02155f3c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02155f40
data_ov14_02155f40: ; 0x02155f40
.word _ZN5Actor8vfunc_4cEPi
@@ -41991,7 +41991,7 @@ data_ov14_0215793c: ; 0x0215793c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157940
data_ov14_02157940: ; 0x02157940
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157944
data_ov14_02157944: ; 0x02157944
.word _ZN5Actor8vfunc_4cEPi
@@ -42135,7 +42135,7 @@ data_ov14_021579fc: ; 0x021579fc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157a00
data_ov14_02157a00: ; 0x02157a00
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157a04
data_ov14_02157a04: ; 0x02157a04
.word _ZN5Actor8vfunc_4cEPi
@@ -42279,7 +42279,7 @@ data_ov14_02157abc: ; 0x02157abc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157ac0
data_ov14_02157ac0: ; 0x02157ac0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157ac4
data_ov14_02157ac4: ; 0x02157ac4
.word _ZN5Actor8vfunc_4cEPi
@@ -42423,7 +42423,7 @@ data_ov14_02157b7c: ; 0x02157b7c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157b80
data_ov14_02157b80: ; 0x02157b80
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157b84
data_ov14_02157b84: ; 0x02157b84
.word _ZN5Actor8vfunc_4cEPi
@@ -42567,7 +42567,7 @@ data_ov14_02157c3c: ; 0x02157c3c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157c40
data_ov14_02157c40: ; 0x02157c40
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157c44
data_ov14_02157c44: ; 0x02157c44
.word _ZN5Actor8vfunc_4cEPi
@@ -42711,7 +42711,7 @@ data_ov14_02157cfc: ; 0x02157cfc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157d00
data_ov14_02157d00: ; 0x02157d00
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157d04
data_ov14_02157d04: ; 0x02157d04
.word _ZN5Actor8vfunc_4cEPi
@@ -42927,7 +42927,7 @@ data_ov14_02157e1c: ; 0x02157e1c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157e20
data_ov14_02157e20: ; 0x02157e20
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157e24
data_ov14_02157e24: ; 0x02157e24
.word _ZN5Actor8vfunc_4cEPi
@@ -43146,7 +43146,7 @@ data_ov14_02157f30: ; 0x02157f30
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02157f34
data_ov14_02157f34: ; 0x02157f34
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02157f38
data_ov14_02157f38: ; 0x02157f38
.word _ZN5Actor8vfunc_4cEPi
@@ -43329,7 +43329,7 @@ data_ov14_02158024: ; 0x02158024
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158028
data_ov14_02158028: ; 0x02158028
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215802c
data_ov14_0215802c: ; 0x0215802c
.word _ZN5Actor8vfunc_4cEPi
@@ -43592,7 +43592,7 @@ data_ov14_02158178: ; 0x02158178
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_0215817c
data_ov14_0215817c: ; 0x0215817c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158180
data_ov14_02158180: ; 0x02158180
.word _ZN5Actor8vfunc_4cEPi
@@ -43733,7 +43733,7 @@ data_ov14_02158234: ; 0x02158234
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158238
data_ov14_02158238: ; 0x02158238
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215823c
data_ov14_0215823c: ; 0x0215823c
.word _ZN5Actor8vfunc_4cEPi
@@ -43883,7 +43883,7 @@ data_ov14_021582fc: ; 0x021582fc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158300
data_ov14_02158300: ; 0x02158300
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158304
data_ov14_02158304: ; 0x02158304
.word _ZN5Actor8vfunc_4cEPi
@@ -44033,7 +44033,7 @@ data_ov14_021583c4: ; 0x021583c4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_021583c8
data_ov14_021583c8: ; 0x021583c8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_021583cc
data_ov14_021583cc: ; 0x021583cc
.word _ZN5Actor8vfunc_4cEPi
@@ -44183,7 +44183,7 @@ data_ov14_0215848c: ; 0x0215848c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158490
data_ov14_02158490: ; 0x02158490
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158494
data_ov14_02158494: ; 0x02158494
.word _ZN5Actor8vfunc_4cEPi
@@ -44333,7 +44333,7 @@ data_ov14_02158554: ; 0x02158554
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158558
data_ov14_02158558: ; 0x02158558
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215855c
data_ov14_0215855c: ; 0x0215855c
.word _ZN5Actor8vfunc_4cEPi
@@ -44483,7 +44483,7 @@ data_ov14_0215861c: ; 0x0215861c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158620
data_ov14_02158620: ; 0x02158620
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158624
data_ov14_02158624: ; 0x02158624
.word _ZN5Actor8vfunc_4cEPi
@@ -44624,7 +44624,7 @@ data_ov14_021586d8: ; 0x021586d8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_021586dc
data_ov14_021586dc: ; 0x021586dc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_021586e0
data_ov14_021586e0: ; 0x021586e0
.word _ZN5Actor8vfunc_4cEPi
@@ -44765,7 +44765,7 @@ data_ov14_02158794: ; 0x02158794
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158798
data_ov14_02158798: ; 0x02158798
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215879c
data_ov14_0215879c: ; 0x0215879c
.word _ZN5Actor8vfunc_4cEPi
@@ -44906,7 +44906,7 @@ data_ov14_02158850: ; 0x02158850
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158854
data_ov14_02158854: ; 0x02158854
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158858
data_ov14_02158858: ; 0x02158858
.word _ZN5Actor8vfunc_4cEPi
@@ -45056,7 +45056,7 @@ data_ov14_02158918: ; 0x02158918
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_0215891c
data_ov14_0215891c: ; 0x0215891c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158920
data_ov14_02158920: ; 0x02158920
.word _ZN5Actor8vfunc_4cEPi
asm/ov14/ov14_0213b778.inc
+1 -1
View File
@@ -102,7 +102,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov14/ov14_0213b778.s
+12 -12
View File
@@ -32859,7 +32859,7 @@ data_ov14_02158ae4: ; 0x02158ae4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158ae8
data_ov14_02158ae8: ; 0x02158ae8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158aec
data_ov14_02158aec: ; 0x02158aec
.word _ZN5Actor8vfunc_4cEPi
@@ -34894,7 +34894,7 @@ data_ov14_02159504: ; 0x02159504
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02159508
data_ov14_02159508: ; 0x02159508
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215950c
data_ov14_0215950c: ; 0x0215950c
.word _ZN5Actor8vfunc_4cEPi
@@ -35077,7 +35077,7 @@ data_ov14_021595f8: ; 0x021595f8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_021595fc
data_ov14_021595fc: ; 0x021595fc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02159600
data_ov14_02159600: ; 0x02159600
.word _ZN5Actor8vfunc_4cEPi
@@ -35384,7 +35384,7 @@ data_ov14_02159788: ; 0x02159788
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_0215978c
data_ov14_0215978c: ; 0x0215978c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02159790
data_ov14_02159790: ; 0x02159790
.word _ZN5Actor8vfunc_4cEPi
@@ -35639,7 +35639,7 @@ data_ov14_021598dc: ; 0x021598dc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_021598e0
data_ov14_021598e0: ; 0x021598e0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_021598e4
data_ov14_021598e4: ; 0x021598e4
.word _ZN5Actor8vfunc_4cEPi
@@ -35969,7 +35969,7 @@ data_ov14_02159a94: ; 0x02159a94
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02159a98
data_ov14_02159a98: ; 0x02159a98
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02159a9c
data_ov14_02159a9c: ; 0x02159a9c
.word _ZN5Actor8vfunc_4cEPi
@@ -36116,7 +36116,7 @@ data_ov14_02159b58: ; 0x02159b58
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02159b5c
data_ov14_02159b5c: ; 0x02159b5c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02159b60
data_ov14_02159b60: ; 0x02159b60
.word _ZN5Actor8vfunc_4cEPi
@@ -36487,7 +36487,7 @@ data_ov14_02159d3c: ; 0x02159d3c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02159d40
data_ov14_02159d40: ; 0x02159d40
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02159d44
data_ov14_02159d44: ; 0x02159d44
.word _ZN5Actor8vfunc_4cEPi
@@ -36766,7 +36766,7 @@ data_ov14_02159eb0: ; 0x02159eb0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02159eb4
data_ov14_02159eb4: ; 0x02159eb4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02159eb8
data_ov14_02159eb8: ; 0x02159eb8
.word _ZN5Actor8vfunc_4cEPi
@@ -37024,7 +37024,7 @@ data_ov14_0215a008: ; 0x0215a008
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_0215a00c
data_ov14_0215a00c: ; 0x0215a00c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215a010
data_ov14_0215a010: ; 0x0215a010
.word _ZN5Actor8vfunc_4cEPi
@@ -37939,7 +37939,7 @@ data_ov14_0215a4bc: ; 0x0215a4bc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_0215a4c0
data_ov14_0215a4c0: ; 0x0215a4c0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215a4c4
data_ov14_0215a4c4: ; 0x0215a4c4
.word _ZN5Actor8vfunc_4cEPi
@@ -38394,7 +38394,7 @@ data_ov14_0215a710: ; 0x0215a710
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_0215a714
data_ov14_0215a714: ; 0x0215a714
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_0215a718
data_ov14_0215a718: ; 0x0215a718
.word _ZN5Actor8vfunc_4cEPi
asm/ov15.inc
+1 -1
View File
@@ -118,7 +118,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov15.s
+30 -30
View File
@@ -127962,7 +127962,7 @@ data_ov15_02189588: ; 0x02189588
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218958c
data_ov15_0218958c: ; 0x0218958c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_02189590
data_ov15_02189590: ; 0x02189590
.word _ZN5Actor8vfunc_4cEPi
@@ -128124,7 +128124,7 @@ data_ov15_02189660: ; 0x02189660
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_02189664
data_ov15_02189664: ; 0x02189664
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_02189668
data_ov15_02189668: ; 0x02189668
.word _ZN5Actor8vfunc_4cEPi
@@ -128289,7 +128289,7 @@ data_ov15_02189730: ; 0x02189730
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_02189734
data_ov15_02189734: ; 0x02189734
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_02189738
data_ov15_02189738: ; 0x02189738
.word _ZN5Actor8vfunc_4cEPi
@@ -128451,7 +128451,7 @@ data_ov15_02189808: ; 0x02189808
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218980c
data_ov15_0218980c: ; 0x0218980c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_02189810
data_ov15_02189810: ; 0x02189810
.word _ZN5Actor8vfunc_4cEPi
@@ -133259,7 +133259,7 @@ data_ov15_0218b268: ; 0x0218b268
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218b26c
data_ov15_0218b26c: ; 0x0218b26c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218b270
data_ov15_0218b270: ; 0x0218b270
.word _ZN5Actor8vfunc_4cEPi
@@ -133465,7 +133465,7 @@ data_ov15_0218b370: ; 0x0218b370
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218b374
data_ov15_0218b374: ; 0x0218b374
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218b378
data_ov15_0218b378: ; 0x0218b378
.word _ZN5Actor8vfunc_4cEPi
@@ -133624,7 +133624,7 @@ data_ov15_0218b444: ; 0x0218b444
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218b448
data_ov15_0218b448: ; 0x0218b448
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218b44c
data_ov15_0218b44c: ; 0x0218b44c
.word _ZN5Actor8vfunc_4cEPi
@@ -133962,7 +133962,7 @@ data_ov15_0218b5fc: ; 0x0218b5fc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218b600
data_ov15_0218b600: ; 0x0218b600
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218b604
data_ov15_0218b604: ; 0x0218b604
.word _ZN5Actor8vfunc_4cEPi
@@ -134945,7 +134945,7 @@ data_ov15_0218bb60: ; 0x0218bb60
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218bb64
data_ov15_0218bb64: ; 0x0218bb64
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218bb68
data_ov15_0218bb68: ; 0x0218bb68
.word _ZN5Actor8vfunc_4cEPi
@@ -135086,7 +135086,7 @@ data_ov15_0218bc1c: ; 0x0218bc1c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218bc20
data_ov15_0218bc20: ; 0x0218bc20
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218bc24
data_ov15_0218bc24: ; 0x0218bc24
.word _ZN5Actor8vfunc_4cEPi
@@ -135239,7 +135239,7 @@ data_ov15_0218bce8: ; 0x0218bce8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218bcec
data_ov15_0218bcec: ; 0x0218bcec
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218bcf0
data_ov15_0218bcf0: ; 0x0218bcf0
.word _ZN5Actor8vfunc_4cEPi
@@ -135392,7 +135392,7 @@ data_ov15_0218bdb4: ; 0x0218bdb4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218bdb8
data_ov15_0218bdb8: ; 0x0218bdb8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218bdbc
data_ov15_0218bdbc: ; 0x0218bdbc
.word _ZN5Actor8vfunc_4cEPi
@@ -135548,7 +135548,7 @@ data_ov15_0218be84: ; 0x0218be84
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218be88
data_ov15_0218be88: ; 0x0218be88
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218be8c
data_ov15_0218be8c: ; 0x0218be8c
.word _ZN5Actor8vfunc_4cEPi
@@ -135713,7 +135713,7 @@ data_ov15_0218bf54: ; 0x0218bf54
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218bf58
data_ov15_0218bf58: ; 0x0218bf58
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218bf5c
data_ov15_0218bf5c: ; 0x0218bf5c
.word _ZN5Actor8vfunc_4cEPi
@@ -135929,7 +135929,7 @@ data_ov15_0218c074: ; 0x0218c074
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218c078
data_ov15_0218c078: ; 0x0218c078
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218c07c
data_ov15_0218c07c: ; 0x0218c07c
.word _ZN5Actor8vfunc_4cEPi
@@ -136280,7 +136280,7 @@ data_ov15_0218c248: ; 0x0218c248
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218c24c
data_ov15_0218c24c: ; 0x0218c24c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218c250
data_ov15_0218c250: ; 0x0218c250
.word _ZN5Actor8vfunc_4cEPi
@@ -136433,7 +136433,7 @@ data_ov15_0218c314: ; 0x0218c314
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218c318
data_ov15_0218c318: ; 0x0218c318
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218c31c
data_ov15_0218c31c: ; 0x0218c31c
.word _ZN5Actor8vfunc_4cEPi
@@ -136763,7 +136763,7 @@ data_ov15_0218c4cc: ; 0x0218c4cc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218c4d0
data_ov15_0218c4d0: ; 0x0218c4d0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218c4d4
data_ov15_0218c4d4: ; 0x0218c4d4
.word _ZN5Actor8vfunc_4cEPi
@@ -136970,7 +136970,7 @@ data_ov15_0218c5e0: ; 0x0218c5e0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218c5e4
data_ov15_0218c5e4: ; 0x0218c5e4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218c5e8
data_ov15_0218c5e8: ; 0x0218c5e8
.word _ZN5Actor8vfunc_4cEPi
@@ -137845,7 +137845,7 @@ data_ov15_0218ca7c: ; 0x0218ca7c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218ca80
data_ov15_0218ca80: ; 0x0218ca80
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218ca84
data_ov15_0218ca84: ; 0x0218ca84
.word _ZN5Actor8vfunc_4cEPi
@@ -137998,7 +137998,7 @@ data_ov15_0218cb48: ; 0x0218cb48
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218cb4c
data_ov15_0218cb4c: ; 0x0218cb4c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218cb50
data_ov15_0218cb50: ; 0x0218cb50
.word _ZN5Actor8vfunc_4cEPi
@@ -138217,7 +138217,7 @@ data_ov15_0218cc60: ; 0x0218cc60
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218cc64
data_ov15_0218cc64: ; 0x0218cc64
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218cc68
data_ov15_0218cc68: ; 0x0218cc68
.word _ZN5Actor8vfunc_4cEPi
@@ -138514,7 +138514,7 @@ data_ov15_0218cdec: ; 0x0218cdec
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218cdf0
data_ov15_0218cdf0: ; 0x0218cdf0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218cdf4
data_ov15_0218cdf4: ; 0x0218cdf4
.word _ZN5Actor8vfunc_4cEPi
@@ -140080,7 +140080,7 @@ data_ov15_0218d610: ; 0x0218d610
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218d614
data_ov15_0218d614: ; 0x0218d614
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218d618
data_ov15_0218d618: ; 0x0218d618
.word _ZN5Actor8vfunc_4cEPi
@@ -140539,7 +140539,7 @@ data_ov15_0218d8d0: ; 0x0218d8d0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218d8d4
data_ov15_0218d8d4: ; 0x0218d8d4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218d8d8
data_ov15_0218d8d8: ; 0x0218d8d8
.word _ZN5Actor8vfunc_4cEPi
@@ -141099,7 +141099,7 @@ data_ov15_0218dbd4: ; 0x0218dbd4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218dbd8
data_ov15_0218dbd8: ; 0x0218dbd8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218dbdc
data_ov15_0218dbdc: ; 0x0218dbdc
.word _ZN5Actor8vfunc_4cEPi
@@ -141329,7 +141329,7 @@ data_ov15_0218dcfc: ; 0x0218dcfc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218dd00
data_ov15_0218dd00: ; 0x0218dd00
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218dd04
data_ov15_0218dd04: ; 0x0218dd04
.word _ZN5Actor8vfunc_4cEPi
@@ -142780,7 +142780,7 @@ data_ov15_0218e4bc: ; 0x0218e4bc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218e4c0
data_ov15_0218e4c0: ; 0x0218e4c0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218e4c4
data_ov15_0218e4c4: ; 0x0218e4c4
.word _ZN5Actor8vfunc_4cEPi
@@ -142921,7 +142921,7 @@ data_ov15_0218e578: ; 0x0218e578
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218e57c
data_ov15_0218e57c: ; 0x0218e57c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218e580
data_ov15_0218e580: ; 0x0218e580
.word _ZN5Actor8vfunc_4cEPi
@@ -143968,7 +143968,7 @@ data_ov15_0218eabc: ; 0x0218eabc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov15_0218eac0
data_ov15_0218eac0: ; 0x0218eac0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov15_0218eac4
data_ov15_0218eac4: ; 0x0218eac4
.word _ZN5Actor8vfunc_4cEPi
asm/ov17.inc
+1 -1
View File
@@ -50,7 +50,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov17.s
+6 -6
View File
@@ -21476,7 +21476,7 @@ data_ov17_0216bd08: ; 0x0216bd08
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov17_0216bd0c
data_ov17_0216bd0c: ; 0x0216bd0c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov17_0216bd10
data_ov17_0216bd10: ; 0x0216bd10
.word _ZN5Actor8vfunc_4cEPi
@@ -21682,7 +21682,7 @@ data_ov17_0216be10: ; 0x0216be10
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov17_0216be14
data_ov17_0216be14: ; 0x0216be14
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov17_0216be18
data_ov17_0216be18: ; 0x0216be18
.word _ZN5Actor8vfunc_4cEPi
@@ -21900,7 +21900,7 @@ data_ov17_0216bf28: ; 0x0216bf28
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov17_0216bf2c
data_ov17_0216bf2c: ; 0x0216bf2c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov17_0216bf30
data_ov17_0216bf30: ; 0x0216bf30
.word _ZN5Actor8vfunc_4cEPi
@@ -22130,7 +22130,7 @@ data_ov17_0216c050: ; 0x0216c050
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov17_0216c054
data_ov17_0216c054: ; 0x0216c054
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov17_0216c058
data_ov17_0216c058: ; 0x0216c058
.word _ZN5Actor8vfunc_4cEPi
@@ -23710,7 +23710,7 @@ data_ov17_0216c880: ; 0x0216c880
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov17_0216c884
data_ov17_0216c884: ; 0x0216c884
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov17_0216c888
data_ov17_0216c888: ; 0x0216c888
.word _ZN5Actor8vfunc_4cEPi
@@ -23851,7 +23851,7 @@ data_ov17_0216c93c: ; 0x0216c93c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov17_0216c940
data_ov17_0216c940: ; 0x0216c940
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov17_0216c944
data_ov17_0216c944: ; 0x0216c944
.word _ZN5Actor8vfunc_4cEPi
asm/ov18.inc
+1 -1
View File
@@ -42,7 +42,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov18.s
+4 -4
View File
@@ -21315,7 +21315,7 @@ data_ov18_0216c308: ; 0x0216c308
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov18_0216c30c
data_ov18_0216c30c: ; 0x0216c30c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov18_0216c310
data_ov18_0216c310: ; 0x0216c310
.word _ZN5Actor8vfunc_4cEPi
@@ -24252,7 +24252,7 @@ data_ov18_0216d110: ; 0x0216d110
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov18_0216d114
data_ov18_0216d114: ; 0x0216d114
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov18_0216d118
data_ov18_0216d118: ; 0x0216d118
.word _ZN5Actor8vfunc_4cEPi
@@ -24561,7 +24561,7 @@ data_ov18_0216d2ac: ; 0x0216d2ac
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov18_0216d2b0
data_ov18_0216d2b0: ; 0x0216d2b0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov18_0216d2b4
data_ov18_0216d2b4: ; 0x0216d2b4
.word _ZN5Actor8vfunc_4cEPi
@@ -24702,7 +24702,7 @@ data_ov18_0216d368: ; 0x0216d368
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov18_0216d36c
data_ov18_0216d36c: ; 0x0216d36c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov18_0216d370
data_ov18_0216d370: ; 0x0216d370
.word _ZN5Actor8vfunc_4cEPi
asm/ov19.inc
+1 -1
View File
@@ -72,7 +72,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov19.s
+4 -4
View File
@@ -11680,7 +11680,7 @@ data_ov19_02176778: ; 0x02176778
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov19_0217677c
data_ov19_0217677c: ; 0x0217677c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov19_02176780
data_ov19_02176780: ; 0x02176780
.word _ZN5Actor8vfunc_4cEPi
@@ -11848,7 +11848,7 @@ data_ov19_02176858: ; 0x02176858
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov19_0217685c
data_ov19_0217685c: ; 0x0217685c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov19_02176860
data_ov19_02176860: ; 0x02176860
.word _ZN5Actor8vfunc_4cEPi
@@ -11989,7 +11989,7 @@ data_ov19_02176914: ; 0x02176914
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov19_02176918
data_ov19_02176918: ; 0x02176918
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov19_0217691c
data_ov19_0217691c: ; 0x0217691c
.word _ZN5Actor8vfunc_4cEPi
@@ -12840,7 +12840,7 @@ data_ov19_02176d9c: ; 0x02176d9c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov19_02176da0
data_ov19_02176da0: ; 0x02176da0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov19_02176da4
data_ov19_02176da4: ; 0x02176da4
.word _ZN5Actor8vfunc_4cEPi
asm/ov20.inc
+1 -1
View File
@@ -67,7 +67,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov20.s
+10 -10
View File
@@ -14119,7 +14119,7 @@ data_ov20_021786a0: ; 0x021786a0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_021786a4
data_ov20_021786a4: ; 0x021786a4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_021786a8
data_ov20_021786a8: ; 0x021786a8
.word _ZN5Actor8vfunc_4cEPi
@@ -14260,7 +14260,7 @@ data_ov20_0217875c: ; 0x0217875c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_02178760
data_ov20_02178760: ; 0x02178760
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_02178764
data_ov20_02178764: ; 0x02178764
.word _ZN5Actor8vfunc_4cEPi
@@ -14781,7 +14781,7 @@ data_ov20_02178a14: ; 0x02178a14
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_02178a18
data_ov20_02178a18: ; 0x02178a18
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_02178a1c
data_ov20_02178a1c: ; 0x02178a1c
.word _ZN5Actor8vfunc_4cEPi
@@ -15057,7 +15057,7 @@ data_ov20_02178b84: ; 0x02178b84
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_02178b88
data_ov20_02178b88: ; 0x02178b88
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_02178b8c
data_ov20_02178b8c: ; 0x02178b8c
.word _ZN5Actor8vfunc_4cEPi
@@ -15733,7 +15733,7 @@ data_ov20_02178f14: ; 0x02178f14
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_02178f18
data_ov20_02178f18: ; 0x02178f18
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_02178f1c
data_ov20_02178f1c: ; 0x02178f1c
.word _ZN5Actor8vfunc_4cEPi
@@ -15874,7 +15874,7 @@ data_ov20_02178fd0: ; 0x02178fd0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_02178fd4
data_ov20_02178fd4: ; 0x02178fd4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_02178fd8
data_ov20_02178fd8: ; 0x02178fd8
.word _ZN5Actor8vfunc_4cEPi
@@ -16027,7 +16027,7 @@ data_ov20_0217909c: ; 0x0217909c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_021790a0
data_ov20_021790a0: ; 0x021790a0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_021790a4
data_ov20_021790a4: ; 0x021790a4
.word _ZN5Actor8vfunc_4cEPi
@@ -16216,7 +16216,7 @@ data_ov20_02179198: ; 0x02179198
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_0217919c
data_ov20_0217919c: ; 0x0217919c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_021791a0
data_ov20_021791a0: ; 0x021791a0
.word _ZN5Actor8vfunc_4cEPi
@@ -16365,7 +16365,7 @@ data_ov20_02179284: ; 0x02179284
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_02179288
data_ov20_02179288: ; 0x02179288
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_0217928c
data_ov20_0217928c: ; 0x0217928c
.word _ZN5Actor8vfunc_4cEPi
@@ -16668,7 +16668,7 @@ data_ov20_02179418: ; 0x02179418
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov20_0217941c
data_ov20_0217941c: ; 0x0217941c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov20_02179420
data_ov20_02179420: ; 0x02179420
.word _ZN5Actor8vfunc_4cEPi
asm/ov21.inc
+1 -1
View File
@@ -38,7 +38,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov21.s
+7 -7
View File
@@ -5225,7 +5225,7 @@ data_ov21_02171270: ; 0x02171270
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov21_02171274
data_ov21_02171274: ; 0x02171274
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171278
data_ov21_02171278: ; 0x02171278
.word _ZN5Actor8vfunc_4cEPi
@@ -5420,7 +5420,7 @@ data_ov21_02171374: ; 0x02171374
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov21_02171378
data_ov21_02171378: ; 0x02171378
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_0217137c
data_ov21_0217137c: ; 0x0217137c
.word _ZN5Actor8vfunc_4cEPi
@@ -5615,7 +5615,7 @@ data_ov21_02171478: ; 0x02171478
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov21_0217147c
data_ov21_0217147c: ; 0x0217147c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171480
data_ov21_02171480: ; 0x02171480
.word _ZN5Actor8vfunc_4cEPi
@@ -5810,7 +5810,7 @@ data_ov21_0217157c: ; 0x0217157c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov21_02171580
data_ov21_02171580: ; 0x02171580
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171584
data_ov21_02171584: ; 0x02171584
.word _ZN5Actor8vfunc_4cEPi
@@ -6005,7 +6005,7 @@ data_ov21_02171680: ; 0x02171680
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov21_02171684
data_ov21_02171684: ; 0x02171684
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171688
data_ov21_02171688: ; 0x02171688
.word _ZN5Actor8vfunc_4cEPi
@@ -6288,7 +6288,7 @@ data_ov21_0217180c: ; 0x0217180c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov21_02171810
data_ov21_02171810: ; 0x02171810
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171814
data_ov21_02171814: ; 0x02171814
.word _ZN5Actor8vfunc_4cEPi
@@ -6606,7 +6606,7 @@ data_ov21_021719b4: ; 0x021719b4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov21_021719b8
data_ov21_021719b8: ; 0x021719b8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_021719bc
data_ov21_021719bc: ; 0x021719bc
.word _ZN5Actor8vfunc_4cEPi
asm/ov22.inc
+1 -1
View File
@@ -72,7 +72,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov22.s
+9 -9
View File
@@ -14912,7 +14912,7 @@ data_ov22_0217908c: ; 0x0217908c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_02179090
data_ov22_02179090: ; 0x02179090
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_02179094
data_ov22_02179094: ; 0x02179094
.word _ZN5Actor8vfunc_4cEPi
@@ -15392,7 +15392,7 @@ data_ov22_0217930c: ; 0x0217930c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_02179310
data_ov22_02179310: ; 0x02179310
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_02179314
data_ov22_02179314: ; 0x02179314
.word _ZN5Actor8vfunc_4cEPi
@@ -16606,7 +16606,7 @@ data_ov22_02179954: ; 0x02179954
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_02179958
data_ov22_02179958: ; 0x02179958
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_0217995c
data_ov22_0217995c: ; 0x0217995c
.word _ZN5Actor8vfunc_4cEPi
@@ -16858,7 +16858,7 @@ data_ov22_02179aa4: ; 0x02179aa4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_02179aa8
data_ov22_02179aa8: ; 0x02179aa8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_02179aac
data_ov22_02179aac: ; 0x02179aac
.word _ZN5Actor8vfunc_4cEPi
@@ -16999,7 +16999,7 @@ data_ov22_02179b60: ; 0x02179b60
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_02179b64
data_ov22_02179b64: ; 0x02179b64
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_02179b68
data_ov22_02179b68: ; 0x02179b68
.word _ZN5Actor8vfunc_4cEPi
@@ -17553,7 +17553,7 @@ data_ov22_02179e38: ; 0x02179e38
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_02179e3c
data_ov22_02179e3c: ; 0x02179e3c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_02179e40
data_ov22_02179e40: ; 0x02179e40
.word _ZN5Actor8vfunc_4cEPi
@@ -18077,7 +18077,7 @@ data_ov22_0217a10c: ; 0x0217a10c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_0217a110
data_ov22_0217a110: ; 0x0217a110
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_0217a114
data_ov22_0217a114: ; 0x0217a114
.word _ZN5Actor8vfunc_4cEPi
@@ -18272,7 +18272,7 @@ data_ov22_0217a210: ; 0x0217a210
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_0217a214
data_ov22_0217a214: ; 0x0217a214
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_0217a218
data_ov22_0217a218: ; 0x0217a218
.word _ZN5Actor8vfunc_4cEPi
@@ -18467,7 +18467,7 @@ data_ov22_0217a314: ; 0x0217a314
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov22_0217a318
data_ov22_0217a318: ; 0x0217a318
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov22_0217a31c
data_ov22_0217a31c: ; 0x0217a31c
.word _ZN5Actor8vfunc_4cEPi
asm/ov23.inc
+1 -1
View File
@@ -95,7 +95,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov23.s
+5 -5
View File
@@ -10081,7 +10081,7 @@ _02175be0:
_02175bec:
mov r0, r5
mov r1, r4
bl _ZN5Actor8vfunc_48Ei
bl _ZN5Actor8vfunc_48EP9Knockback
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02175bfc: .word 0x424d5459
@@ -15887,7 +15887,7 @@ data_ov23_02179e08: ; 0x02179e08
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov23_02179e0c
data_ov23_02179e0c: ; 0x02179e0c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov23_02179e10
data_ov23_02179e10: ; 0x02179e10
.word _ZN5Actor8vfunc_4cEPi
@@ -16168,7 +16168,7 @@ data_ov23_02179f74: ; 0x02179f74
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov23_02179f78
data_ov23_02179f78: ; 0x02179f78
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov23_02179f7c
data_ov23_02179f7c: ; 0x02179f7c
.word _ZN5Actor8vfunc_4cEPi
@@ -16886,7 +16886,7 @@ data_ov23_0217a33c: ; 0x0217a33c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov23_0217a340
data_ov23_0217a340: ; 0x0217a340
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov23_0217a344
data_ov23_0217a344: ; 0x0217a344
.word _ZN5Actor8vfunc_4cEPi
@@ -17926,7 +17926,7 @@ data_ov23_0217a89c: ; 0x0217a89c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov23_0217a8a0
data_ov23_0217a8a0: ; 0x0217a8a0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov23_0217a8a4
data_ov23_0217a8a4: ; 0x0217a8a4
.word _ZN5Actor8vfunc_4cEPi
asm/ov24.inc
+1 -1
View File
@@ -66,7 +66,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov24.s
+4 -4
View File
@@ -15847,7 +15847,7 @@ data_ov24_02179f58: ; 0x02179f58
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov24_02179f5c
data_ov24_02179f5c: ; 0x02179f5c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov24_02179f60
data_ov24_02179f60: ; 0x02179f60
.word _ZN5Actor8vfunc_4cEPi
@@ -16016,7 +16016,7 @@ data_ov24_0217a064: ; 0x0217a064
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov24_0217a068
data_ov24_0217a068: ; 0x0217a068
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov24_0217a06c
data_ov24_0217a06c: ; 0x0217a06c
.word _ZN5Actor8vfunc_4cEPi
@@ -18083,7 +18083,7 @@ data_ov24_0217ab50: ; 0x0217ab50
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov24_0217ab54
data_ov24_0217ab54: ; 0x0217ab54
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov24_0217ab58
data_ov24_0217ab58: ; 0x0217ab58
.word _ZN5Actor8vfunc_4cEPi
@@ -18530,7 +18530,7 @@ data_ov24_0217ada4: ; 0x0217ada4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov24_0217ada8
data_ov24_0217ada8: ; 0x0217ada8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov24_0217adac
data_ov24_0217adac: ; 0x0217adac
.word _ZN5Actor8vfunc_4cEPi
asm/ov25.inc
+1 -1
View File
@@ -68,7 +68,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov25.s
+6 -6
View File
@@ -15744,7 +15744,7 @@ data_ov25_02179f4c: ; 0x02179f4c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov25_02179f50
data_ov25_02179f50: ; 0x02179f50
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov25_02179f54
data_ov25_02179f54: ; 0x02179f54
.word _ZN5Actor8vfunc_4cEPi
@@ -15957,7 +15957,7 @@ data_ov25_0217a068: ; 0x0217a068
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov25_0217a06c
data_ov25_0217a06c: ; 0x0217a06c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov25_0217a070
data_ov25_0217a070: ; 0x0217a070
.word _ZN5Actor8vfunc_4cEPi
@@ -16098,7 +16098,7 @@ data_ov25_0217a124: ; 0x0217a124
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov25_0217a128
data_ov25_0217a128: ; 0x0217a128
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov25_0217a12c
data_ov25_0217a12c: ; 0x0217a12c
.word _ZN5Actor8vfunc_4cEPi
@@ -16745,7 +16745,7 @@ data_ov25_0217a478: ; 0x0217a478
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov25_0217a47c
data_ov25_0217a47c: ; 0x0217a47c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov25_0217a480
data_ov25_0217a480: ; 0x0217a480
.word _ZN5Actor8vfunc_4cEPi
@@ -16886,7 +16886,7 @@ data_ov25_0217a534: ; 0x0217a534
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov25_0217a538
data_ov25_0217a538: ; 0x0217a538
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov25_0217a53c
data_ov25_0217a53c: ; 0x0217a53c
.word _ZN5Actor8vfunc_4cEPi
@@ -17051,7 +17051,7 @@ data_ov25_0217a610: ; 0x0217a610
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov25_0217a614
data_ov25_0217a614: ; 0x0217a614
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov25_0217a618
data_ov25_0217a618: ; 0x0217a618
.word _ZN5Actor8vfunc_4cEPi
asm/ov26.inc
+1 -1
View File
@@ -61,7 +61,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov26.s
+7 -7
View File
@@ -16938,7 +16938,7 @@ data_ov26_0217a0ac: ; 0x0217a0ac
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov26_0217a0b0
data_ov26_0217a0b0: ; 0x0217a0b0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov26_0217a0b4
data_ov26_0217a0b4: ; 0x0217a0b4
.word _ZN5Actor8vfunc_4cEPi
@@ -17133,7 +17133,7 @@ data_ov26_0217a1b0: ; 0x0217a1b0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov26_0217a1b4
data_ov26_0217a1b4: ; 0x0217a1b4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov26_0217a1b8
data_ov26_0217a1b8: ; 0x0217a1b8
.word _ZN5Actor8vfunc_4cEPi
@@ -17328,7 +17328,7 @@ data_ov26_0217a2b4: ; 0x0217a2b4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov26_0217a2b8
data_ov26_0217a2b8: ; 0x0217a2b8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov26_0217a2bc
data_ov26_0217a2bc: ; 0x0217a2bc
.word _ZN5Actor8vfunc_4cEPi
@@ -17523,7 +17523,7 @@ data_ov26_0217a3b8: ; 0x0217a3b8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov26_0217a3bc
data_ov26_0217a3bc: ; 0x0217a3bc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov26_0217a3c0
data_ov26_0217a3c0: ; 0x0217a3c0
.word _ZN5Actor8vfunc_4cEPi
@@ -19632,7 +19632,7 @@ data_ov26_0217aef4: ; 0x0217aef4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov26_0217aef8
data_ov26_0217aef8: ; 0x0217aef8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov26_0217aefc
data_ov26_0217aefc: ; 0x0217aefc
.word _ZN5Actor8vfunc_4cEPi
@@ -19881,7 +19881,7 @@ data_ov26_0217afd4: ; 0x0217afd4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov26_0217afd8
data_ov26_0217afd8: ; 0x0217afd8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov26_0217afdc
data_ov26_0217afdc: ; 0x0217afdc
.word _ZN5Actor8vfunc_4cEPi
@@ -20034,7 +20034,7 @@ data_ov26_0217b0a0: ; 0x0217b0a0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov26_0217b0a4
data_ov26_0217b0a4: ; 0x0217b0a4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov26_0217b0a8
data_ov26_0217b0a8: ; 0x0217b0a8
.word _ZN5Actor8vfunc_4cEPi
asm/ov27.inc
+1 -1
View File
@@ -49,7 +49,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov27.s
+5 -5
View File
@@ -14801,7 +14801,7 @@ data_ov27_0217965c: ; 0x0217965c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov27_02179660
data_ov27_02179660: ; 0x02179660
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov27_02179664
data_ov27_02179664: ; 0x02179664
.word _ZN5Actor8vfunc_4cEPi
@@ -15082,7 +15082,7 @@ data_ov27_021797c8: ; 0x021797c8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov27_021797cc
data_ov27_021797cc: ; 0x021797cc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov27_021797d0
data_ov27_021797d0: ; 0x021797d0
.word _ZN5Actor8vfunc_4cEPi
@@ -15444,7 +15444,7 @@ data_ov27_021799b0: ; 0x021799b0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov27_021799b4
data_ov27_021799b4: ; 0x021799b4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov27_021799b8
data_ov27_021799b8: ; 0x021799b8
.word _ZN5Actor8vfunc_4cEPi
@@ -15689,7 +15689,7 @@ data_ov27_02179aec: ; 0x02179aec
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov27_02179af0
data_ov27_02179af0: ; 0x02179af0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov27_02179af4
data_ov27_02179af4: ; 0x02179af4
.word _ZN5Actor8vfunc_4cEPi
@@ -16512,7 +16512,7 @@ data_ov27_02179f20: ; 0x02179f20
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov27_02179f24
data_ov27_02179f24: ; 0x02179f24
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov27_02179f28
data_ov27_02179f28: ; 0x02179f28
.word _ZN5Actor8vfunc_4cEPi
asm/ov28.inc
+1 -1
View File
@@ -55,7 +55,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov28.s
+9 -9
View File
@@ -14368,7 +14368,7 @@ data_ov28_021789ac: ; 0x021789ac
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_021789b0
data_ov28_021789b0: ; 0x021789b0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_021789b4
data_ov28_021789b4: ; 0x021789b4
.word _ZN5Actor8vfunc_4cEPi
@@ -14729,7 +14729,7 @@ data_ov28_02178c0c: ; 0x02178c0c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_02178c10
data_ov28_02178c10: ; 0x02178c10
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_02178c14
data_ov28_02178c14: ; 0x02178c14
.word _ZN5Actor8vfunc_4cEPi
@@ -14924,7 +14924,7 @@ data_ov28_02178d10: ; 0x02178d10
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_02178d14
data_ov28_02178d14: ; 0x02178d14
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_02178d18
data_ov28_02178d18: ; 0x02178d18
.word _ZN5Actor8vfunc_4cEPi
@@ -15119,7 +15119,7 @@ data_ov28_02178e14: ; 0x02178e14
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_02178e18
data_ov28_02178e18: ; 0x02178e18
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_02178e1c
data_ov28_02178e1c: ; 0x02178e1c
.word _ZN5Actor8vfunc_4cEPi
@@ -15314,7 +15314,7 @@ data_ov28_02178f18: ; 0x02178f18
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_02178f1c
data_ov28_02178f1c: ; 0x02178f1c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_02178f20
data_ov28_02178f20: ; 0x02178f20
.word _ZN5Actor8vfunc_4cEPi
@@ -16074,7 +16074,7 @@ data_ov28_021792f8: ; 0x021792f8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_021792fc
data_ov28_021792fc: ; 0x021792fc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_02179300
data_ov28_02179300: ; 0x02179300
.word _ZN5Actor8vfunc_4cEPi
@@ -17062,7 +17062,7 @@ data_ov28_02179808: ; 0x02179808
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_0217980c
data_ov28_0217980c: ; 0x0217980c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_02179810
data_ov28_02179810: ; 0x02179810
.word _ZN5Actor8vfunc_4cEPi
@@ -17295,7 +17295,7 @@ data_ov28_02179944: ; 0x02179944
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_02179948
data_ov28_02179948: ; 0x02179948
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_0217994c
data_ov28_0217994c: ; 0x0217994c
.word _ZN5Actor8vfunc_4cEPi
@@ -17520,7 +17520,7 @@ data_ov28_02179a70: ; 0x02179a70
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov28_02179a74
data_ov28_02179a74: ; 0x02179a74
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov28_02179a78
data_ov28_02179a78: ; 0x02179a78
.word _ZN5Actor8vfunc_4cEPi
asm/ov29.inc
+1 -1
View File
@@ -43,7 +43,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov29.s
+7 -7
View File
@@ -14786,7 +14786,7 @@ data_ov29_0217994c: ; 0x0217994c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov29_02179950
data_ov29_02179950: ; 0x02179950
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov29_02179954
data_ov29_02179954: ; 0x02179954
.word _ZN5Actor8vfunc_4cEPi
@@ -14951,7 +14951,7 @@ data_ov29_02179a28: ; 0x02179a28
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov29_02179a2c
data_ov29_02179a2c: ; 0x02179a2c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov29_02179a30
data_ov29_02179a30: ; 0x02179a30
.word _ZN5Actor8vfunc_4cEPi
@@ -15184,7 +15184,7 @@ data_ov29_02179b64: ; 0x02179b64
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov29_02179b68
data_ov29_02179b68: ; 0x02179b68
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov29_02179b6c
data_ov29_02179b6c: ; 0x02179b6c
.word _ZN5Actor8vfunc_4cEPi
@@ -15923,7 +15923,7 @@ data_ov29_02179f90: ; 0x02179f90
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov29_02179f94
data_ov29_02179f94: ; 0x02179f94
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov29_02179f98
data_ov29_02179f98: ; 0x02179f98
.word _ZN5Actor8vfunc_4cEPi
@@ -16224,7 +16224,7 @@ data_ov29_0217a138: ; 0x0217a138
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov29_0217a13c
data_ov29_0217a13c: ; 0x0217a13c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov29_0217a140
data_ov29_0217a140: ; 0x0217a140
.word _ZN5Actor8vfunc_4cEPi
@@ -16572,7 +16572,7 @@ data_ov29_0217a30c: ; 0x0217a30c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov29_0217a310
data_ov29_0217a310: ; 0x0217a310
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov29_0217a314
data_ov29_0217a314: ; 0x0217a314
.word _ZN5Actor8vfunc_4cEPi
@@ -16725,7 +16725,7 @@ data_ov29_0217a3d8: ; 0x0217a3d8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov29_0217a3dc
data_ov29_0217a3dc: ; 0x0217a3dc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov29_0217a3e0
data_ov29_0217a3e0: ; 0x0217a3e0
.word _ZN5Actor8vfunc_4cEPi
asm/ov30.inc
+1 -1
View File
@@ -43,7 +43,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov30.s
+1 -1
View File
@@ -18068,7 +18068,7 @@ data_ov30_021893bc: ; 0x021893bc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov30_021893c0
data_ov30_021893c0: ; 0x021893c0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov30_021893c4
data_ov30_021893c4: ; 0x021893c4
.word _ZN5Actor8vfunc_4cEPi
asm/ov31.inc
+1 -1
View File
@@ -28,7 +28,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov31.s
+24 -24
View File
@@ -8804,7 +8804,7 @@ data_ov31_021821b4: ; 0x021821b4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_021821b8
data_ov31_021821b8: ; 0x021821b8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021821bc
data_ov31_021821bc: ; 0x021821bc
.word _ZN5Actor8vfunc_4cEPi
@@ -9262,7 +9262,7 @@ data_ov31_0218240c: ; 0x0218240c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182410
data_ov31_02182410: ; 0x02182410
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182414
data_ov31_02182414: ; 0x02182414
.word _ZN5Actor8vfunc_4cEPi
@@ -9409,7 +9409,7 @@ data_ov31_021824d0: ; 0x021824d0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_021824d4
data_ov31_021824d4: ; 0x021824d4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021824d8
data_ov31_021824d8: ; 0x021824d8
.word _ZN5Actor8vfunc_4cEPi
@@ -9556,7 +9556,7 @@ data_ov31_02182594: ; 0x02182594
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182598
data_ov31_02182598: ; 0x02182598
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_0218259c
data_ov31_0218259c: ; 0x0218259c
.word _ZN5Actor8vfunc_4cEPi
@@ -9703,7 +9703,7 @@ data_ov31_02182658: ; 0x02182658
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_0218265c
data_ov31_0218265c: ; 0x0218265c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182660
data_ov31_02182660: ; 0x02182660
.word _ZN5Actor8vfunc_4cEPi
@@ -9850,7 +9850,7 @@ data_ov31_0218271c: ; 0x0218271c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182720
data_ov31_02182720: ; 0x02182720
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182724
data_ov31_02182724: ; 0x02182724
.word _ZN5Actor8vfunc_4cEPi
@@ -10027,7 +10027,7 @@ data_ov31_02182808: ; 0x02182808
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_0218280c
data_ov31_0218280c: ; 0x0218280c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182810
data_ov31_02182810: ; 0x02182810
.word _ZN5Actor8vfunc_4cEPi
@@ -10204,7 +10204,7 @@ data_ov31_021828f4: ; 0x021828f4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_021828f8
data_ov31_021828f8: ; 0x021828f8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021828fc
data_ov31_021828fc: ; 0x021828fc
.word _ZN5Actor8vfunc_4cEPi
@@ -10381,7 +10381,7 @@ data_ov31_021829e0: ; 0x021829e0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_021829e4
data_ov31_021829e4: ; 0x021829e4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021829e8
data_ov31_021829e8: ; 0x021829e8
.word _ZN5Actor8vfunc_4cEPi
@@ -10558,7 +10558,7 @@ data_ov31_02182acc: ; 0x02182acc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182ad0
data_ov31_02182ad0: ; 0x02182ad0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182ad4
data_ov31_02182ad4: ; 0x02182ad4
.word _ZN5Actor8vfunc_4cEPi
@@ -10735,7 +10735,7 @@ data_ov31_02182bb8: ; 0x02182bb8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182bbc
data_ov31_02182bbc: ; 0x02182bbc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182bc0
data_ov31_02182bc0: ; 0x02182bc0
.word _ZN5Actor8vfunc_4cEPi
@@ -10912,7 +10912,7 @@ data_ov31_02182ca4: ; 0x02182ca4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182ca8
data_ov31_02182ca8: ; 0x02182ca8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182cac
data_ov31_02182cac: ; 0x02182cac
.word _ZN5Actor8vfunc_4cEPi
@@ -11089,7 +11089,7 @@ data_ov31_02182d90: ; 0x02182d90
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182d94
data_ov31_02182d94: ; 0x02182d94
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182d98
data_ov31_02182d98: ; 0x02182d98
.word _ZN5Actor8vfunc_4cEPi
@@ -11266,7 +11266,7 @@ data_ov31_02182e7c: ; 0x02182e7c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182e80
data_ov31_02182e80: ; 0x02182e80
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182e84
data_ov31_02182e84: ; 0x02182e84
.word _ZN5Actor8vfunc_4cEPi
@@ -11443,7 +11443,7 @@ data_ov31_02182f68: ; 0x02182f68
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02182f6c
data_ov31_02182f6c: ; 0x02182f6c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182f70
data_ov31_02182f70: ; 0x02182f70
.word _ZN5Actor8vfunc_4cEPi
@@ -11620,7 +11620,7 @@ data_ov31_02183054: ; 0x02183054
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02183058
data_ov31_02183058: ; 0x02183058
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_0218305c
data_ov31_0218305c: ; 0x0218305c
.word _ZN5Actor8vfunc_4cEPi
@@ -11797,7 +11797,7 @@ data_ov31_02183140: ; 0x02183140
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02183144
data_ov31_02183144: ; 0x02183144
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183148
data_ov31_02183148: ; 0x02183148
.word _ZN5Actor8vfunc_4cEPi
@@ -11974,7 +11974,7 @@ data_ov31_0218322c: ; 0x0218322c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02183230
data_ov31_02183230: ; 0x02183230
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183234
data_ov31_02183234: ; 0x02183234
.word _ZN5Actor8vfunc_4cEPi
@@ -12151,7 +12151,7 @@ data_ov31_02183318: ; 0x02183318
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_0218331c
data_ov31_0218331c: ; 0x0218331c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183320
data_ov31_02183320: ; 0x02183320
.word _ZN5Actor8vfunc_4cEPi
@@ -12328,7 +12328,7 @@ data_ov31_02183404: ; 0x02183404
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02183408
data_ov31_02183408: ; 0x02183408
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_0218340c
data_ov31_0218340c: ; 0x0218340c
.word _ZN5Actor8vfunc_4cEPi
@@ -12505,7 +12505,7 @@ data_ov31_021834f0: ; 0x021834f0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_021834f4
data_ov31_021834f4: ; 0x021834f4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021834f8
data_ov31_021834f8: ; 0x021834f8
.word _ZN5Actor8vfunc_4cEPi
@@ -12892,7 +12892,7 @@ data_ov31_02183b24: ; 0x02183b24
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02183b28
data_ov31_02183b28: ; 0x02183b28
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183b2c
data_ov31_02183b2c: ; 0x02183b2c
.word _ZN5Actor8vfunc_4cEPi
@@ -13170,7 +13170,7 @@ data_ov31_02183c8c: ; 0x02183c8c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02183c90
data_ov31_02183c90: ; 0x02183c90
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183c94
data_ov31_02183c94: ; 0x02183c94
.word _ZN5Actor8vfunc_4cEPi
@@ -13400,7 +13400,7 @@ data_ov31_02183dc0: ; 0x02183dc0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov31_02183dc4
data_ov31_02183dc4: ; 0x02183dc4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183dc8
data_ov31_02183dc8: ; 0x02183dc8
.word _ZN5Actor8vfunc_4cEPi
asm/ov33.inc
+1 -1
View File
@@ -34,7 +34,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov33.s
+2 -2
View File
@@ -5695,7 +5695,7 @@ data_ov33_021801e8: ; 0x021801e8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov33_021801ec
data_ov33_021801ec: ; 0x021801ec
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov33_021801f0
data_ov33_021801f0: ; 0x021801f0
.word _ZN5Actor8vfunc_4cEPi
@@ -6251,7 +6251,7 @@ data_ov33_021804e4: ; 0x021804e4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov33_021804e8
data_ov33_021804e8: ; 0x021804e8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov33_021804ec
data_ov33_021804ec: ; 0x021804ec
.word _ZN5Actor8vfunc_4cEPi
asm/ov34.inc
+1 -1
View File
@@ -36,7 +36,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov34.s
+2 -2
View File
@@ -12286,7 +12286,7 @@ data_ov34_02186000: ; 0x02186000
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov34_02186004
data_ov34_02186004: ; 0x02186004
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov34_02186008
data_ov34_02186008: ; 0x02186008
.word _ZN5Actor8vfunc_4cEPi
@@ -12499,7 +12499,7 @@ data_ov34_0218611c: ; 0x0218611c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov34_02186120
data_ov34_02186120: ; 0x02186120
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov34_02186124
data_ov34_02186124: ; 0x02186124
.word _ZN5Actor8vfunc_4cEPi
asm/ov37.inc
+1 -1
View File
@@ -44,7 +44,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov37.s
+1 -1
View File
@@ -16225,7 +16225,7 @@ data_ov37_02188d18: ; 0x02188d18
.word func_ov37_0218468c
.global data_ov37_02188d1c
data_ov37_02188d1c: ; 0x02188d1c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov37_02188d20
data_ov37_02188d20: ; 0x02188d20
.word _ZN5Actor8vfunc_4cEPi
asm/ov38.inc
+1 -1
View File
@@ -38,7 +38,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov38.s
+1 -1
View File
@@ -15784,7 +15784,7 @@ data_ov38_0218916c: ; 0x0218916c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov38_02189170
data_ov38_02189170: ; 0x02189170
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov38_02189174
data_ov38_02189174: ; 0x02189174
.word _ZN5Actor8vfunc_4cEPi
asm/ov40.inc
+1 -1
View File
@@ -37,7 +37,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov40.s
+7 -7
View File
@@ -16758,7 +16758,7 @@ data_ov40_021886cc: ; 0x021886cc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov40_021886d0
data_ov40_021886d0: ; 0x021886d0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov40_021886d4
data_ov40_021886d4: ; 0x021886d4
.word _ZN5Actor8vfunc_4cEPi
@@ -18212,7 +18212,7 @@ data_ov40_02189218: ; 0x02189218
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov40_0218921c
data_ov40_0218921c: ; 0x0218921c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov40_02189220
data_ov40_02189220: ; 0x02189220
.word _ZN5Actor8vfunc_4cEPi
@@ -18534,7 +18534,7 @@ data_ov40_021893c4: ; 0x021893c4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov40_021893c8
data_ov40_021893c8: ; 0x021893c8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov40_021893cc
data_ov40_021893cc: ; 0x021893cc
.word _ZN5Actor8vfunc_4cEPi
@@ -18688,7 +18688,7 @@ data_ov40_021894a4: ; 0x021894a4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov40_021894a8
data_ov40_021894a8: ; 0x021894a8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov40_021894ac
data_ov40_021894ac: ; 0x021894ac
.word _ZN5Actor8vfunc_4cEPi
@@ -19050,7 +19050,7 @@ data_ov40_0218967c: ; 0x0218967c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov40_02189680
data_ov40_02189680: ; 0x02189680
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov40_02189684
data_ov40_02189684: ; 0x02189684
.word _ZN5Actor8vfunc_4cEPi
@@ -19200,7 +19200,7 @@ data_ov40_02189744: ; 0x02189744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov40_02189748
data_ov40_02189748: ; 0x02189748
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov40_0218974c
data_ov40_0218974c: ; 0x0218974c
.word _ZN5Actor8vfunc_4cEPi
@@ -19612,7 +19612,7 @@ data_ov40_02189974: ; 0x02189974
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov40_02189978
data_ov40_02189978: ; 0x02189978
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov40_0218997c
data_ov40_0218997c: ; 0x0218997c
.word _ZN5Actor8vfunc_4cEPi
asm/ov41.inc
+1 -1
View File
@@ -40,7 +40,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov41.s
+3 -3
View File
@@ -6283,7 +6283,7 @@ data_ov41_0218e38c: ; 0x0218e38c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov41_0218e390
data_ov41_0218e390: ; 0x0218e390
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov41_0218e394
data_ov41_0218e394: ; 0x0218e394
.word _ZN5Actor8vfunc_4cEPi
@@ -6514,7 +6514,7 @@ data_ov41_0218e4c0: ; 0x0218e4c0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov41_0218e4c4
data_ov41_0218e4c4: ; 0x0218e4c4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov41_0218e4c8
data_ov41_0218e4c8: ; 0x0218e4c8
.word _ZN5Actor8vfunc_4cEPi
@@ -7083,7 +7083,7 @@ data_ov41_0218e7ac: ; 0x0218e7ac
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov41_0218e7b0
data_ov41_0218e7b0: ; 0x0218e7b0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov41_0218e7b4
data_ov41_0218e7b4: ; 0x0218e7b4
.word _ZN5Actor8vfunc_4cEPi
asm/ov44.inc
+1 -1
View File
@@ -35,7 +35,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov44.s
+3 -3
View File
@@ -8430,7 +8430,7 @@ data_ov44_0218f600: ; 0x0218f600
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov44_0218f604
data_ov44_0218f604: ; 0x0218f604
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov44_0218f608
data_ov44_0218f608: ; 0x0218f608
.word _ZN5Actor8vfunc_4cEPi
@@ -9111,7 +9111,7 @@ data_ov44_0218f9a8: ; 0x0218f9a8
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov44_0218f9ac
data_ov44_0218f9ac: ; 0x0218f9ac
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov44_0218f9b0
data_ov44_0218f9b0: ; 0x0218f9b0
.word _ZN5Actor8vfunc_4cEPi
@@ -10014,7 +10014,7 @@ data_ov44_0218fe58: ; 0x0218fe58
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov44_0218fe5c
data_ov44_0218fe5c: ; 0x0218fe5c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov44_0218fe60
data_ov44_0218fe60: ; 0x0218fe60
.word _ZN5Actor8vfunc_4cEPi
asm/ov45.inc
+1 -1
View File
@@ -22,7 +22,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov45.s
+3 -3
View File
@@ -6719,7 +6719,7 @@ data_ov45_0218e518: ; 0x0218e518
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov45_0218e51c
data_ov45_0218e51c: ; 0x0218e51c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov45_0218e520
data_ov45_0218e520: ; 0x0218e520
.word _ZN5Actor8vfunc_4cEPi
@@ -7227,7 +7227,7 @@ data_ov45_0218e798: ; 0x0218e798
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov45_0218e79c
data_ov45_0218e79c: ; 0x0218e79c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov45_0218e7a0
data_ov45_0218e7a0: ; 0x0218e7a0
.word _ZN5Actor8vfunc_4cEPi
@@ -7544,7 +7544,7 @@ data_ov45_0218e99c: ; 0x0218e99c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov45_0218e9a0
data_ov45_0218e9a0: ; 0x0218e9a0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov45_0218e9a4
data_ov45_0218e9a4: ; 0x0218e9a4
.word _ZN5Actor8vfunc_4cEPi
asm/ov46.inc
+1 -1
View File
@@ -33,7 +33,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov46.s
+3 -3
View File
@@ -5494,7 +5494,7 @@ data_ov46_021946dc: ; 0x021946dc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov46_021946e0
data_ov46_021946e0: ; 0x021946e0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov46_021946e4
data_ov46_021946e4: ; 0x021946e4
.word _ZN5Actor8vfunc_4cEPi
@@ -5721,7 +5721,7 @@ data_ov46_0219480c: ; 0x0219480c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov46_02194810
data_ov46_02194810: ; 0x02194810
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov46_02194814
data_ov46_02194814: ; 0x02194814
.word _ZN5Actor8vfunc_4cEPi
@@ -6044,7 +6044,7 @@ data_ov46_021949b4: ; 0x021949b4
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov46_021949b8
data_ov46_021949b8: ; 0x021949b8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov46_021949bc
data_ov46_021949bc: ; 0x021949bc
.word _ZN5Actor8vfunc_4cEPi
asm/ov47.inc
+1 -1
View File
@@ -34,7 +34,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov47.s
+3 -3
View File
@@ -5355,7 +5355,7 @@ data_ov47_0219454c: ; 0x0219454c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov47_02194550
data_ov47_02194550: ; 0x02194550
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov47_02194554
data_ov47_02194554: ; 0x02194554
.word _ZN5Actor8vfunc_4cEPi
@@ -5496,7 +5496,7 @@ data_ov47_02194608: ; 0x02194608
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov47_0219460c
data_ov47_0219460c: ; 0x0219460c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov47_02194610
data_ov47_02194610: ; 0x02194610
.word _ZN5Actor8vfunc_4cEPi
@@ -6154,7 +6154,7 @@ data_ov47_02194960: ; 0x02194960
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov47_02194964
data_ov47_02194964: ; 0x02194964
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov47_02194968
data_ov47_02194968: ; 0x02194968
.word _ZN5Actor8vfunc_4cEPi
asm/ov49.inc
+1 -1
View File
@@ -43,7 +43,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov49.s
+2 -2
View File
@@ -4240,7 +4240,7 @@ data_ov49_021987e0: ; 0x021987e0
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov49_021987e4
data_ov49_021987e4: ; 0x021987e4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov49_021987e8
data_ov49_021987e8: ; 0x021987e8
.word _ZN5Actor8vfunc_4cEPi
@@ -4381,7 +4381,7 @@ data_ov49_0219889c: ; 0x0219889c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov49_021988a0
data_ov49_021988a0: ; 0x021988a0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov49_021988a4
data_ov49_021988a4: ; 0x021988a4
.word _ZN5Actor8vfunc_4cEPi
asm/ov51.inc
+1 -1
View File
@@ -32,7 +32,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov51.s
+2 -2
View File
@@ -3787,7 +3787,7 @@ data_ov51_0219852c: ; 0x0219852c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov51_02198530
data_ov51_02198530: ; 0x02198530
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov51_02198534
data_ov51_02198534: ; 0x02198534
.word _ZN5Actor8vfunc_4cEPi
@@ -4666,7 +4666,7 @@ data_ov51_021989bc: ; 0x021989bc
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov51_021989c0
data_ov51_021989c0: ; 0x021989c0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov51_021989c4
data_ov51_021989c4: ; 0x021989c4
.word _ZN5Actor8vfunc_4cEPi
asm/ov52.inc
+1 -1
View File
@@ -36,7 +36,7 @@
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
asm/ov52.s
+1 -1
View File
@@ -3308,7 +3308,7 @@ data_ov52_02197b7c: ; 0x02197b7c
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov52_02197b80
data_ov52_02197b80: ; 0x02197b80
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov52_02197b84
data_ov52_02197b84: ; 0x02197b84
.word _ZN5Actor8vfunc_4cEPi
include/Actor/Actor.hpp
+9 -2
View File
@@ -63,6 +63,13 @@ enum PlayerCollide_ {
PlayerCollide_Hammer = 0x10,
};
struct Knockback {
/* 00 */ u8 mUnk_00;
/* 04 */ Vec3p vec;
/* 10 */ unk32 mUnk_10;
/* 14 */ unk32 mUnk_14;
};
class Actor : public SysObject {
public:
/* 000 (vtable) */
@@ -85,7 +92,7 @@ public:
/* 06c */ unk32 mGravity;
/* 070 */ unk32 mMaxFall;
/* 074 */ unk32 mUnk_074;
/* 078 */ s16 mRotation;
/* 078 */ s16 mAngle;
/* 07a */ u16 mUnk_07a;
/* 07c */ Cylinder mHitbox;
/* 08c */ Cylinder mUnk_08c;
@@ -155,7 +162,7 @@ public:
/* 3c */ virtual bool CollidesWithLink();
/* 40 */ virtual bool IsHitboxTouched(bool param1);
/* 44 */ virtual bool CollidesWith(const Actor *other);
/* 48 */ virtual bool vfunc_48(unk32 param1);
/* 48 */ virtual bool vfunc_48(Knockback *param1);
/* 4c */ virtual bool vfunc_4c(unk32 *param1);
/* 50 */ virtual Vec3p* GetPos();
/* 54 */ virtual void vfunc_54();
include/Actor/ActorType.hpp
+99 -53
View File
@@ -3,71 +3,117 @@
#include "global.h"
#include "types.h"
#define __ACTOR_TYPE_ID(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
#define __ACTOR_TYPE_A 'A'
#define __ACTOR_TYPE_B 'B'
#define __ACTOR_TYPE_C 'C'
#define __ACTOR_TYPE_D 'D'
#define __ACTOR_TYPE_E 'E'
#define __ACTOR_TYPE_F 'F'
#define __ACTOR_TYPE_G 'G'
#define __ACTOR_TYPE_H 'H'
#define __ACTOR_TYPE_I 'I'
#define __ACTOR_TYPE_J 'J'
#define __ACTOR_TYPE_K 'K'
#define __ACTOR_TYPE_L 'L'
#define __ACTOR_TYPE_M 'M'
#define __ACTOR_TYPE_N 'N'
#define __ACTOR_TYPE_O 'O'
#define __ACTOR_TYPE_P 'P'
#define __ACTOR_TYPE_Q 'Q'
#define __ACTOR_TYPE_R 'R'
#define __ACTOR_TYPE_S 'S'
#define __ACTOR_TYPE_T 'T'
#define __ACTOR_TYPE_U 'U'
#define __ACTOR_TYPE_V 'V'
#define __ACTOR_TYPE_W 'W'
#define __ACTOR_TYPE_X 'X'
#define __ACTOR_TYPE_Y 'Y'
#define __ACTOR_TYPE_Z 'Z'
#define __ACTOR_TYPE_0 '0'
#define __ACTOR_TYPE_1 '1'
#define __ACTOR_TYPE_2 '2'
#define __ACTOR_TYPE_3 '3'
#define __ACTOR_TYPE_4 '4'
#define __ACTOR_TYPE_4 '4'
#define __ACTOR_TYPE_5 '5'
#define __ACTOR_TYPE_6 '6'
#define __ACTOR_TYPE_7 '7'
#define __ACTOR_TYPE_8 '8'
#define __ACTOR_TYPE_9 '9'
#define __CONCAT(a,b) a ## b
#define __EVAL(x) x
#define __ACTOR_TYPE_ID(a,b,c,d) ( \
(__EVAL(__CONCAT(__ACTOR_TYPE_,a)) << 24) \
| (__EVAL(__CONCAT(__ACTOR_TYPE_,b)) << 16) \
| (__EVAL(__CONCAT(__ACTOR_TYPE_,c)) << 8) \
| (__EVAL(__CONCAT(__ACTOR_TYPE_,d))) \
)
typedef u32 ActorTypeId;
enum ActorTypeId_ {
ActorTypeId_Navi = __ACTOR_TYPE_ID('N','A','V','I'),
ActorTypeId_ForceNavi = __ACTOR_TYPE_ID('F','C','N','V'),
ActorTypeId_WisdomNavi = __ACTOR_TYPE_ID('W','S','N','V'),
ActorTypeId_Navi = __ACTOR_TYPE_ID(N,A,V,I),
ActorTypeId_ForceNavi = __ACTOR_TYPE_ID(F,C,N,V),
ActorTypeId_WisdomNavi = __ACTOR_TYPE_ID(W,S,N,V),
ActorTypeId_TreasureMap = __ACTOR_TYPE_ID('T','M','A','P'),
ActorTypeId_DigSpot = __ACTOR_TYPE_ID('D','G','T','G'),
ActorTypeId_TreasureMap = __ACTOR_TYPE_ID(T,M,A,P),
ActorTypeId_DigSpot = __ACTOR_TYPE_ID(D,G,T,G),
ActorTypeId_ShopItemBombchus = __ACTOR_TYPE_ID('I','T','B','T'),
ActorTypeId_ShopItemBombs = __ACTOR_TYPE_ID('I','T','B','M'),
ActorTypeId_ShopItemTreasure = __ACTOR_TYPE_ID('I','T','T','R'),
ActorTypeId_ShopItemHeartContainer = __ACTOR_TYPE_ID('I','T','H','U'),
ActorTypeId_ShopItemQuiver = __ACTOR_TYPE_ID('I','T','A','P'),
ActorTypeId_ShopItemBombBag = __ACTOR_TYPE_ID('I','T','B','B'),
ActorTypeId_ShopItemRedPotion = __ACTOR_TYPE_ID('I','T','P','B'),
ActorTypeId_ShopItemCourageGem = __ACTOR_TYPE_ID('I','T','S','R'),
ActorTypeId_ShopItemShield = __ACTOR_TYPE_ID('I','T','S','L'),
ActorTypeId_ShopItemSoldOut = __ACTOR_TYPE_ID('I','T','S','O'),
ActorTypeId_ShopItemBombchus = __ACTOR_TYPE_ID(I,T,B,T),
ActorTypeId_ShopItemBombs = __ACTOR_TYPE_ID(I,T,B,M),
ActorTypeId_ShopItemTreasure = __ACTOR_TYPE_ID(I,T,T,R),
ActorTypeId_ShopItemHeartContainer = __ACTOR_TYPE_ID(I,T,H,U),
ActorTypeId_ShopItemQuiver = __ACTOR_TYPE_ID(I,T,A,P),
ActorTypeId_ShopItemBombBag = __ACTOR_TYPE_ID(I,T,B,B),
ActorTypeId_ShopItemRedPotion = __ACTOR_TYPE_ID(I,T,P,B),
ActorTypeId_ShopItemCourageGem = __ACTOR_TYPE_ID(I,T,S,R),
ActorTypeId_ShopItemShield = __ACTOR_TYPE_ID(I,T,S,L),
ActorTypeId_ShopItemSoldOut = __ACTOR_TYPE_ID(I,T,S,O),
ActorTypeId_Heart = __ACTOR_TYPE_ID('H','A','R','T'),
ActorTypeId_Rupee = __ACTOR_TYPE_ID('R','U','P','Y'),
ActorTypeId_Heart = __ACTOR_TYPE_ID(H,A,R,T),
ActorTypeId_Rupee = __ACTOR_TYPE_ID(R,U,P,Y),
ActorTypeId_Bomb = __ACTOR_TYPE_ID('B','O','M','B'),
ActorTypeId_Arrow = __ACTOR_TYPE_ID('A','R','R','W'),
ActorTypeId_Bomb = __ACTOR_TYPE_ID(B,O,M,B),
ActorTypeId_Arrow = __ACTOR_TYPE_ID(A,R,R,W),
ActorTypeId_PlayerDummy = __ACTOR_TYPE_ID('P','L','D','M'),
ActorTypeId_PushBlock = __ACTOR_TYPE_ID('P','S','B','L'),
ActorTypeId_WindBlock = __ACTOR_TYPE_ID('W','B','L','K'),
ActorTypeId_StorageDrum = __ACTOR_TYPE_ID('D','R','U','M'),
ActorTypeId_PlayerDummy = __ACTOR_TYPE_ID(P,L,D,M),
ActorTypeId_PushBlock = __ACTOR_TYPE_ID(P,S,B,L),
ActorTypeId_WindBlock = __ACTOR_TYPE_ID(W,B,L,K),
ActorTypeId_StorageDrum = __ACTOR_TYPE_ID(D,R,U,M),
ActorTypeId_SmallKey = __ACTOR_TYPE_ID('N','K','E','Y'),
ActorTypeId_SmallKey = __ACTOR_TYPE_ID(N,K,E,Y),
ActorTypeId_Sandworm = __ACTOR_TYPE_ID('M','L','D','W'),
ActorTypeId_Tektite = __ACTOR_TYPE_ID('T','E','K','T'),
ActorTypeId_PolsVoice = __ACTOR_TYPE_ID('P','L','S','V'),
ActorTypeId_Yook = __ACTOR_TYPE_ID('Y','E','T','I'),
ActorTypeId_Armos = __ACTOR_TYPE_ID('A','M','O','S'),
ActorTypeId_Stalfos = __ACTOR_TYPE_ID('S','T','L','F'),
ActorTypeId_StalfosWarrior = __ACTOR_TYPE_ID('S','T','L','W'),
ActorTypeId_ChuChu = __ACTOR_TYPE_ID('C','H','U','C'),
ActorTypeId_Gel = __ACTOR_TYPE_ID('G','E','L','L'),
ActorTypeId_Bee = __ACTOR_TYPE_ID('B','E','E','0'),
ActorTypeId_BeeHive = __ACTOR_TYPE_ID('B','E','E','H'),
ActorTypeId_Cucco = __ACTOR_TYPE_ID('K','O','K','O'),
ActorTypeId_Rope = __ACTOR_TYPE_ID('S','N','A','K'),
ActorTypeId_Octorok = __ACTOR_TYPE_ID('O','C','T','A'),
ActorTypeId_Keese = __ACTOR_TYPE_ID('K','E','T','H'),
ActorTypeId_Rat = __ACTOR_TYPE_ID('R','A','T','0'),
ActorTypeId_Beamos = __ACTOR_TYPE_ID('B','M','O','S'),
ActorTypeId_LikeLike = __ACTOR_TYPE_ID('L','K','L','K'),
ActorTypeId_Crow = __ACTOR_TYPE_ID('C','R','O','W'),
ActorTypeId_Sandworm = __ACTOR_TYPE_ID(M,L,D,W),
ActorTypeId_Tektite = __ACTOR_TYPE_ID(T,E,K,T),
ActorTypeId_PolsVoice = __ACTOR_TYPE_ID(P,L,S,V),
ActorTypeId_Yook = __ACTOR_TYPE_ID(Y,E,T,I),
ActorTypeId_Armos = __ACTOR_TYPE_ID(A,M,O,S),
ActorTypeId_Stalfos = __ACTOR_TYPE_ID(S,T,L,F),
ActorTypeId_StalfosWarrior = __ACTOR_TYPE_ID(S,T,L,W),
ActorTypeId_ChuChu = __ACTOR_TYPE_ID(C,H,U,C),
ActorTypeId_Gel = __ACTOR_TYPE_ID(G,E,L,L),
ActorTypeId_Bee = __ACTOR_TYPE_ID(B,E,E,0),
ActorTypeId_BeeHive = __ACTOR_TYPE_ID(B,E,E,H),
ActorTypeId_Cucco = __ACTOR_TYPE_ID(K,O,K,O),
ActorTypeId_Rope = __ACTOR_TYPE_ID(S,N,A,K),
ActorTypeId_Octorok = __ACTOR_TYPE_ID(O,C,T,A),
ActorTypeId_Keese = __ACTOR_TYPE_ID(K,E,T,H),
ActorTypeId_Rat = __ACTOR_TYPE_ID(R,A,T,0),
ActorTypeId_Beamos = __ACTOR_TYPE_ID(B,M,O,S),
ActorTypeId_LikeLike = __ACTOR_TYPE_ID(L,K,L,K),
ActorTypeId_Crow = __ACTOR_TYPE_ID(C,R,O,W),
ActorTypeId_Linebeck = __ACTOR_TYPE_ID('L','N','B','K'),
ActorTypeId_Mailbox = __ACTOR_TYPE_ID('P','O','S','T'),
ActorTypeId_Postman = __ACTOR_TYPE_ID('P','S','T','M'),
ActorTypeId_Linebeck = __ACTOR_TYPE_ID(L,N,B,K),
ActorTypeId_Mailbox = __ACTOR_TYPE_ID(P,O,S,T),
ActorTypeId_Postman = __ACTOR_TYPE_ID(P,S,T,M),
ActorTypeId_BMRN = __ACTOR_TYPE_ID('B','M','R','N'),
ActorTypeId_BMTY = __ACTOR_TYPE_ID('B','M','T','Y'),
ActorTypeId_FLAL = __ACTOR_TYPE_ID('F','L','A','L'),
ActorTypeId_FLBM = __ACTOR_TYPE_ID('F','L','B','M'),
ActorTypeId_FLBT = __ACTOR_TYPE_ID('F','L','B','T'),
ActorTypeId_FLTM = __ACTOR_TYPE_ID('F','L','T','M'),
ActorTypeId_BMRN = __ACTOR_TYPE_ID(B,M,R,N),
ActorTypeId_BMTY = __ACTOR_TYPE_ID(B,M,T,Y),
ActorTypeId_FLAL = __ACTOR_TYPE_ID(F,L,A,L),
ActorTypeId_FLBM = __ACTOR_TYPE_ID(F,L,B,M),
ActorTypeId_FLBT = __ACTOR_TYPE_ID(F,L,B,T),
ActorTypeId_FLTM = __ACTOR_TYPE_ID(F,L,T,M),
ActorTypeId_SBEM = __ACTOR_TYPE_ID(S,B,E,M),
ActorTypeId_VLR0 = __ACTOR_TYPE_ID(V,L,R,0),
};
class Actor;
include/Physics/Transform.hpp
+1 -1
View File
@@ -7,6 +7,6 @@
struct Transform {
Vec3p pos;
s16 rotation;
s16 angle;
bool visible;
};
src/00_Core/Actor/Actor.cpp
+33 -19
View File
@@ -208,7 +208,7 @@ void Actor::KillPickupItemActors() {
bool Actor::TrySetTransform(Transform *transform) {
mPrevPos = mPos;
mPos = transform->pos;
mRotation = transform->rotation;
mAngle = transform->angle;
mVisible = transform->visible;
return true;
}
@@ -216,7 +216,7 @@ bool Actor::TrySetTransform(Transform *transform) {
void Actor::SetTransform(Transform *transform) {
mPrevPos = mPos;
mPos = transform->pos;
mRotation = transform->rotation;
mAngle = transform->angle;
mVisible = transform->visible;
}
@@ -230,7 +230,7 @@ void Actor::func_ov00_020c1c20(s32 param1, unk32 param2) {
gMapManager->func_ov00_02084b38(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1], param2);
}
bool Actor::vfunc_48(unk32 param1) {
bool Actor::vfunc_48(Knockback *param1) {
return true;
}
@@ -319,13 +319,6 @@ bool Actor::func_ov00_020c1f5c(Vec3p *param1, Vec3p *param2, s32 param3, Vec3p *
return false;
}
struct Knockback {
u8 mUnk_0c;
Vec3p vec;
unk32 mUnk_10;
unk32 mUnk_14;
};
bool Actor::func_ov00_020c1fc8(PlayerCollide flags) {
if (gAdventureFlags->func_ov00_02097738()) return false;
bool result = false;
@@ -334,17 +327,17 @@ bool Actor::func_ov00_020c1fc8(PlayerCollide flags) {
Vec3p_Sub(&mPos, &gPlayerPos, &vecFromPlayer);
if (this->CollidesWithPlayer(flags & PlayerCollide_Sword)) {
Knockback knockback;
knockback.mUnk_0c = 0;
knockback.mUnk_00 = 0;
knockback.mUnk_10 = 0xb;
knockback.mUnk_14 = 0;
gPlayer->EquipItem_vfunc_2c();
knockback.vec = vecFromPlayer;
result = this->vfunc_48((unk32) &knockback);
result = this->vfunc_48(&knockback);
} else if (this->CollidesWithPlayer(flags & PlayerCollide_Shield)) {
Knockback knockback;
knockback.mUnk_10 = 0xb;
knockback.mUnk_14 = 0;
knockback.mUnk_0c = 0;
knockback.mUnk_00 = 0;
knockback.vec = vecFromPlayer;
s32 wisdomLvl = gItemManager->GetActiveFairyLevel(FairyId_Wisdom);
if (wisdomLvl >= 1) {
@@ -352,18 +345,18 @@ bool Actor::func_ov00_020c1fc8(PlayerCollide flags) {
} else {
knockback.mUnk_10 = 2;
}
result = this->vfunc_48((unk32) &knockback);
result = this->vfunc_48(&knockback);
} else if (this->CollidesWithPlayer(flags & PlayerCollide_Hammer)) {
Knockback knockback;
knockback.mUnk_0c = 0;
knockback.mUnk_00 = 0;
knockback.mUnk_10 = 0xb;
knockback.mUnk_14 = 0;
gPlayer->EquipItem_vfunc_2c();
knockback.vec = vecFromPlayer;
result = this->vfunc_48((unk32) &knockback);
result = this->vfunc_48(&knockback);
} else if (this->CollidesWithPlayer(flags & PlayerCollide_Gongoron)) {
Knockback knockback;
knockback.mUnk_0c = 0;
knockback.mUnk_00 = 0;
knockback.mUnk_10 = 0xb;
knockback.mUnk_14 = 0;
u8 unk1 = gPlayerLink->vfunc_78();
@@ -373,7 +366,7 @@ bool Actor::func_ov00_020c1fc8(PlayerCollide flags) {
} else {
knockback.mUnk_10 = 2;
}
result = this->vfunc_48((unk32) &knockback);
result = this->vfunc_48(&knockback);
}
}
return result;
@@ -431,7 +424,28 @@ void Actor::func_ov00_020c23d4(ActorRef *ref, Actor *actor, Cylinder *cylinder)
bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, s32 *param2) {
if (param2) *param2 = 0;
if (gAdventureFlags->func_ov00_02097738()) return false;
if (mHitbox.size < 0 || !gActorManager->func_ov00_020c39ac(mRef.index, actorTypes, false)) return false;
if (mHitbox.size < 0) return false;
Actor *actor = gActorManager->func_ov00_020c39ac(mRef.index, actorTypes, false);
if (!actor) return false;
Knockback knockback;
knockback.mUnk_10 = 0xb;
Vec3p vec;
if (actor->mType != ActorTypeId_Arrow && actor->mType != ActorTypeId_SBEM) {
Vec3p_Sub(&mPos, &actor->mPrevPos, &vec);
} else {
vec.x = SIN(actor->mAngle);
vec.z = COS(actor->mAngle);
vec.y = 0;
}
switch (actor->mType) {
case ActorTypeId_VLR0: {
knockback.mUnk_10 = 4;
} break;
}
this->vfunc_48(&knockback);
}
bool Actor::CollidesWith(const Actor *other) {}