Rename ActorUnkSZKU to ActorTearLight (#126)

This commit is contained in:
Alessevan
2026-08-07 21:42:48 -04:00
committed by GitHub
parent 7232214eca
commit 9ada2de150
11 changed files with 204 additions and 208 deletions
+1 -1
View File
@@ -76,7 +76,7 @@ _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf8f4
_ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf938
func_ov017_020bf99c kind:function(arm,size=0x2c) addr:0x020bf99c
_ZN5Actor19func_ov017_020bf9c8EPS_ kind:function(arm,size=0x88) addr:0x020bf9c8
func_ov017_020bfa50 kind:function(arm,size=0x84) addr:0x020bfa50
_ZN5Actor19func_ov017_020bfa50EP7VecFx32i kind:function(arm,size=0x84) addr:0x020bfa50
func_ov017_020bfad4 kind:function(arm,size=0x44) addr:0x020bfad4
_ZN5Actor19func_ov017_020bfb18EP8Actor_9C kind:function(arm,size=0x238) addr:0x020bfb18
_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020bfd50
+1 -1
View File
@@ -5,7 +5,7 @@
.data start:0x02164100 end:0x02165100 kind:data align:32
.bss start:0x02165100 end:0x021658a0 kind:bss align:32
src/071_Tower/Actor/ActorUnkSZKU.cpp:
src/071_Tower/Actor/ActorTearLight.cpp:
.text start:0x0215f210 end:0x02160118
.init start:0x02163dd0 end:0x02163e44
.ctor start:0x021640bc end:0x021640c0
+49 -49
View File
@@ -180,9 +180,9 @@ func_ov071_0215b4c0 kind:function(arm,size=0x50) addr:0x0215b4c0
func_ov071_0215b510 kind:function(arm,size=0x30) addr:0x0215b510
func_ov071_0215b540 kind:function(arm,size=0x70) addr:0x0215b540
func_ov071_0215b5b0 kind:function(arm,size=0x70) addr:0x0215b5b0
_ZN17ActorUnkSKZU_Base8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215b620
_ZN17ActorUnkSKZU_Base8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0215b644
_ZN17ActorUnkSKZU_Base8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0215b654
_ZN23ActorTearLight_104_Base8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215b620
_ZN23ActorTearLight_104_Base8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0215b644
_ZN23ActorTearLight_104_Base8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0215b654
func_ov071_0215b65c kind:function(arm,size=0x2c) addr:0x0215b65c
func_ov071_0215b688 kind:function(arm,size=0x24) addr:0x0215b688
func_ov071_0215b6ac kind:function(arm,size=0xc) addr:0x0215b6ac
@@ -288,44 +288,44 @@ func_ov071_0215f110 kind:function(arm,size=0x34) addr:0x0215f110
func_ov071_0215f144 kind:function(arm,size=0xa8) addr:0x0215f144
func_ov071_0215f1ec kind:function(arm,size=0x10) addr:0x0215f1ec
func_ov071_0215f1fc kind:function(arm,size=0x14) addr:0x0215f1fc
_ZN19ActorProfileUnkSZKU10GetProfileEv kind:function(arm,size=0xc) addr:0x0215f210
_ZN19ActorProfileUnkSZKU6CreateEv kind:function(arm,size=0x24) addr:0x0215f21c
_ZN19ActorProfileUnkSZKUC1Ev kind:function(arm,size=0x50) addr:0x0215f240
_ZN12ActorUnkSZKUC1Ev kind:function(arm,size=0x194) addr:0x0215f290
_ZN16ActorUnkSKZU_104D1Ev kind:function(arm,size=0x14) addr:0x0215f424
_ZN12ActorUnkSZKUD1Ev kind:function(arm,size=0x78) addr:0x0215f438
_ZN12ActorUnkSZKUD0Ev kind:function(arm,size=0x80) addr:0x0215f4b0
_ZN12ActorUnkSZKU8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f530
_ZN12ActorUnkSZKU8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f5dc
_ZN12ActorUnkSZKU8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f608
_ZN12ActorUnkSZKU8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f654
_ZN12ActorUnkSZKU8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f714
_ZN12ActorUnkSZKU8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7dc
_ZN12ActorUnkSZKU19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f7f4
_ZN12ActorUnkSZKU19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f80c
_ZN12ActorUnkSZKU19func_ov071_0215f824Ev kind:function(arm,size=0x108) addr:0x0215f824
_ZN12ActorUnkSZKU19func_ov071_0215f92cEv kind:function(arm,size=0x2e0) addr:0x0215f92c
_ZN12ActorUnkSZKU19func_ov071_0215fc0cEv kind:function(arm,size=0x48) addr:0x0215fc0c
_ZN12ActorUnkSZKU19func_ov071_0215fc54Ev kind:function(arm,size=0x50) addr:0x0215fc54
_ZN12ActorUnkSZKU19func_ov071_0215fca4Ev kind:function(arm,size=0x60) addr:0x0215fca4
_ZN12ActorUnkSZKU19func_ov071_0215fd04Ev kind:function(arm,size=0x7c) addr:0x0215fd04
_ZN12ActorUnkSZKU19func_ov071_0215fd80Ev kind:function(arm,size=0x54) addr:0x0215fd80
_ZN12ActorUnkSZKU19func_ov071_0215fdd4Ev kind:function(arm,size=0x80) addr:0x0215fdd4
_ZN12ActorUnkSZKU19func_ov071_0215fe54Ev kind:function(arm,size=0x40) addr:0x0215fe54
_ZN12ActorUnkSZKU19func_ov071_0215fe94Ev kind:function(arm,size=0x40) addr:0x0215fe94
_ZN12ActorUnkSZKU19func_ov071_0215fed4Ev kind:function(arm,size=0x34) addr:0x0215fed4
_ZN12ActorUnkSZKU19func_ov071_0215ff08Ev kind:function(arm,size=0x34) addr:0x0215ff08
_ZN12ActorUnkSZKU19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0215ff3c
_ZN12ActorUnkSZKU19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x0215ffb8
_ZN12ActorUnkSZKU19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x0215ffbc
_ZN16ActorUnkSZKU_194C2EP12ActorUnkSZKU kind:function(arm,size=0x38) addr:0x02160000
_ZN16ActorUnkSZKU_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x02160038
_ZN16ActorUnkSZKU_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02160078
_ZN16ActorUnkSZKU_1948vfunc_0CEi kind:function(arm,size=0x24) addr:0x02160094
_ZN16ActorUnkSZKU_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x021600b8
_ZN16ActorUnkSZKU_204C1Ev kind:function(arm,size=0x14) addr:0x021600d4
_ZN16ActorUnkSKZU_104D0Ev kind:function(arm,size=0x1c) addr:0x021600e8
_ZN19ActorProfileUnkSZKUD1Ev kind:function(arm,size=0x14) addr:0x02160104
_ZN21ActorProfileTearLight10GetProfileEv kind:function(arm,size=0xc) addr:0x0215f210
_ZN21ActorProfileTearLight6CreateEv kind:function(arm,size=0x24) addr:0x0215f21c
_ZN21ActorProfileTearLightC1Ev kind:function(arm,size=0x50) addr:0x0215f240
_ZN14ActorTearLightC1Ev kind:function(arm,size=0x194) addr:0x0215f290
_ZN18ActorTearLight_104D1Ev kind:function(arm,size=0x14) addr:0x0215f424
_ZN14ActorTearLightD1Ev kind:function(arm,size=0x78) addr:0x0215f438
_ZN14ActorTearLightD0Ev kind:function(arm,size=0x80) addr:0x0215f4b0
_ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0215f530
_ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0215f5dc
_ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x0215f608
_ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x0215f654
_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x0215f714
_ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x0215f7dc
_ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x0215f7f4
_ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x0215f80c
_ZN14ActorTearLight19func_ov071_0215f824Ev kind:function(arm,size=0x108) addr:0x0215f824
_ZN14ActorTearLight19func_ov071_0215f92cEv kind:function(arm,size=0x2e0) addr:0x0215f92c
_ZN14ActorTearLight19func_ov071_0215fc0cEv kind:function(arm,size=0x48) addr:0x0215fc0c
_ZN14ActorTearLight19func_ov071_0215fc54Ev kind:function(arm,size=0x50) addr:0x0215fc54
_ZN14ActorTearLight19func_ov071_0215fca4Ev kind:function(arm,size=0x60) addr:0x0215fca4
_ZN14ActorTearLight19func_ov071_0215fd04Ev kind:function(arm,size=0x7c) addr:0x0215fd04
_ZN14ActorTearLight19func_ov071_0215fd80Ev kind:function(arm,size=0x54) addr:0x0215fd80
_ZN14ActorTearLight19func_ov071_0215fdd4Ev kind:function(arm,size=0x80) addr:0x0215fdd4
_ZN14ActorTearLight19func_ov071_0215fe54Ev kind:function(arm,size=0x40) addr:0x0215fe54
_ZN14ActorTearLight19func_ov071_0215fe94Ev kind:function(arm,size=0x40) addr:0x0215fe94
_ZN14ActorTearLight19func_ov071_0215fed4Ev kind:function(arm,size=0x34) addr:0x0215fed4
_ZN14ActorTearLight19func_ov071_0215ff08Ev kind:function(arm,size=0x34) addr:0x0215ff08
_ZN14ActorTearLight19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0215ff3c
_ZN14ActorTearLight19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x0215ffb8
_ZN14ActorTearLight19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x0215ffbc
_ZN18ActorTearLight_194C2EP14ActorTearLight kind:function(arm,size=0x38) addr:0x02160000
_ZN18ActorTearLight_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x02160038
_ZN18ActorTearLight_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x02160078
_ZN18ActorTearLight_1948vfunc_0CEi kind:function(arm,size=0x24) addr:0x02160094
_ZN18ActorTearLight_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x021600b8
_ZN18ActorTearLight_204C2Ev kind:function(arm,size=0x14) addr:0x021600d4
_ZN18ActorTearLight_104D0Ev kind:function(arm,size=0x1c) addr:0x021600e8
_ZN21ActorProfileTearLightD1Ev kind:function(arm,size=0x14) addr:0x02160104
_ZN19ActorProfileUnkKMSO10GetProfileEv kind:function(arm,size=0xc) addr:0x02160118
_ZN19ActorProfileUnkKMSO6CreateEv kind:function(arm,size=0x24) addr:0x02160124
_ZN19ActorProfileUnkKMSOC1Ev kind:function(arm,size=0x44) addr:0x02160148
@@ -477,7 +477,7 @@ __sinit_ov071_02163d44 kind:function(arm,size=0x28) addr:0x02163d44
__sinit_ov071_02163d6c kind:function(arm,size=0x18) addr:0x02163d6c
__sinit_ov071_02163d84 kind:function(arm,size=0x34) addr:0x02163d84
__sinit_ov071_02163db8 kind:function(arm,size=0x18) addr:0x02163db8
__sinit_ActorUnkSZKU.cpp kind:function(arm,size=0x74) addr:0x02163dd0
__sinit_ActorTearLight.cpp kind:function(arm,size=0x74) addr:0x02163dd0
__sinit_ActorUnkKMSO.cpp kind:function(arm,size=0x50) addr:0x02163e44
__sinit_MapObjectUnkRNBO.cpp kind:function(arm,size=0x50) addr:0x02163e94
__sinit_MapObjectUnkRPFL.cpp kind:function(arm,size=0x50) addr:0x02163ee4
@@ -490,7 +490,7 @@ __sinit_ov071_02164094 kind:function(arm,size=0x18) addr:0x02164094
.p__sinit_ov071_02163d6c kind:data(word) addr:0x021640b0
.p__sinit_ov071_02163d84 kind:data(word) addr:0x021640b4
.p__sinit_ov071_02163db8 kind:data(word) addr:0x021640b8
.p__sinit_ActorUnkSZKU.cpp kind:data(word) addr:0x021640bc
.p__sinit_ActorTearLight.cpp kind:data(word) addr:0x021640bc
.p__sinit_ActorUnkKMSO.cpp kind:data(word) addr:0x021640c0
.p__sinit_MapObjectUnkRNBO.cpp kind:data(word) addr:0x021640c4
.p__sinit_MapObjectUnkRPFL.cpp kind:data(word) addr:0x021640c8
@@ -530,10 +530,10 @@ data_ov071_021649c4 kind:data(any) addr:0x021649c4
data_ov071_02164acc kind:data(any) addr:0x02164acc
data_ov071_02164bd4 kind:data(any) addr:0x02164bd4
data_ov071_02164be0 kind:data(any) addr:0x02164be0
_ZTV16ActorUnkSZKU_194 kind:data(any) addr:0x02164bf8
_ZTV19ActorProfileUnkSZKU kind:data(any) addr:0x02164c10
_ZTV16ActorUnkSKZU_104 kind:data(any) addr:0x02164c34
_ZTV12ActorUnkSZKU kind:data(any) addr:0x02164c7c
_ZTV18ActorTearLight_194 kind:data(any) addr:0x02164bf8
_ZTV21ActorProfileTearLight kind:data(any) addr:0x02164c10
_ZTV18ActorTearLight_104 kind:data(any) addr:0x02164c34
_ZTV14ActorTearLight kind:data(any) addr:0x02164c7c
data_ov071_02164cd8 kind:data(any) addr:0x02164cd8
data_ov071_02164ce0 kind:data(any) addr:0x02164ce0
data_ov071_02164ce8 kind:data(any) addr:0x02164ce8
@@ -572,9 +572,9 @@ data_ov071_02165128 kind:bss addr:0x02165128
data_ov071_02165134 kind:bss addr:0x02165134
data_ov071_02165140 kind:bss addr:0x02165140
data_ov071_0216514c kind:bss addr:0x0216514c
_ZGVN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x02165150
_ZGVN15ProfileInstanceI21ActorProfileTearLightE8sProfileE kind:bss addr:0x02165150
@13264 kind:bss addr:0x0216515c
_ZN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x02165168
_ZN15ProfileInstanceI21ActorProfileTearLightE8sProfileE kind:bss addr:0x02165168
_ZGVN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x02165240
@13270 kind:bss addr:0x02165244
_ZN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x02165250
+1 -1
View File
@@ -2377,7 +2377,7 @@ func_ov000_0209b248 kind:function(thumb,size=0x48) addr:0x0209b248
func_ov000_0209b290 kind:function(thumb,size=0x28) addr:0x0209b290
func_ov000_0209b2b8 kind:function(thumb,size=0x2) addr:0x0209b2b8
_ZN19func_ov000_0209b2bcD0Ev kind:function(thumb,size=0xc) addr:0x0209b2bc
_ZN17ActorUnkSKZU_BaseD2Ev kind:function(thumb,size=0x2) addr:0x0209b2c8
_ZN23ActorTearLight_104_BaseD2Ev kind:function(thumb,size=0x2) addr:0x0209b2c8
_ZN24UnkStruct_ov000_020b31a88vfunc_08Ev kind:function(arm,size=0x38) addr:0x0209b2cc
_ZN24UnkStruct_ov000_020b31a88vfunc_0CEv kind:function(arm,size=0x68) addr:0x0209b304
_ZN24UnkStruct_ov000_020b31a88vfunc_20Ev kind:function(arm,size=0x110) addr:0x0209b36c
+1 -1
View File
@@ -5,7 +5,7 @@
.data start:0x02166360 end:0x02167360 kind:data align:32
.bss start:0x02167360 end:0x02167b00 kind:bss align:32
src/071_Tower/Actor/ActorUnkSZKU.cpp:
src/071_Tower/Actor/ActorTearLight.cpp:
.text start:0x02161450 end:0x02162358
.init start:0x02166030 end:0x021660a4
.ctor start:0x0216631c end:0x02166320
+49 -49
View File
@@ -181,9 +181,9 @@ func_ov071_0215d6a8 kind:function(arm,size=0x50) addr:0x0215d6a8
func_ov071_0215d6f8 kind:function(arm,size=0x30) addr:0x0215d6f8
func_ov071_0215d728 kind:function(arm,size=0x70) addr:0x0215d728
func_ov071_0215d798 kind:function(arm,size=0x70) addr:0x0215d798
_ZN17ActorUnkSKZU_Base8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215d808
_ZN17ActorUnkSKZU_Base8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0215d82c
_ZN17ActorUnkSKZU_Base8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0215d83c
_ZN23ActorTearLight_104_Base8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215d808
_ZN23ActorTearLight_104_Base8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0215d82c
_ZN23ActorTearLight_104_Base8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0215d83c
func_ov071_0215d844 kind:function(arm,size=0x2c) addr:0x0215d844
func_ov071_0215d870 kind:function(arm,size=0x24) addr:0x0215d870
func_ov071_0215d894 kind:function(arm,size=0xc) addr:0x0215d894
@@ -289,44 +289,44 @@ func_ov071_02161350 kind:function(arm,size=0x34) addr:0x02161350
func_ov071_02161384 kind:function(arm,size=0xa8) addr:0x02161384
func_ov071_0216142c kind:function(arm,size=0x10) addr:0x0216142c
func_ov071_0216143c kind:function(arm,size=0x14) addr:0x0216143c
_ZN19ActorProfileUnkSZKU10GetProfileEv kind:function(arm,size=0xc) addr:0x02161450
_ZN19ActorProfileUnkSZKU6CreateEv kind:function(arm,size=0x24) addr:0x0216145c
_ZN19ActorProfileUnkSZKUC1Ev kind:function(arm,size=0x50) addr:0x02161480
_ZN12ActorUnkSZKUC1Ev kind:function(arm,size=0x194) addr:0x021614d0
_ZN16ActorUnkSKZU_104D1Ev kind:function(arm,size=0x14) addr:0x02161664
_ZN12ActorUnkSZKUD1Ev kind:function(arm,size=0x78) addr:0x02161678
_ZN12ActorUnkSZKUD0Ev kind:function(arm,size=0x80) addr:0x021616f0
_ZN12ActorUnkSZKU8vfunc_18Ei kind:function(arm,size=0xac) addr:0x02161770
_ZN12ActorUnkSZKU8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0216181c
_ZN12ActorUnkSZKU8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x02161848
_ZN12ActorUnkSZKU8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x02161894
_ZN12ActorUnkSZKU8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x02161954
_ZN12ActorUnkSZKU8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x02161a1c
_ZN12ActorUnkSZKU19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x02161a34
_ZN12ActorUnkSZKU19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x02161a4c
_ZN12ActorUnkSZKU19func_ov071_0215f824Ev kind:function(arm,size=0x108) addr:0x02161a64
_ZN12ActorUnkSZKU19func_ov071_0215f92cEv kind:function(arm,size=0x2e0) addr:0x02161b6c
_ZN12ActorUnkSZKU19func_ov071_0215fc0cEv kind:function(arm,size=0x48) addr:0x02161e4c
_ZN12ActorUnkSZKU19func_ov071_0215fc54Ev kind:function(arm,size=0x50) addr:0x02161e94
_ZN12ActorUnkSZKU19func_ov071_0215fca4Ev kind:function(arm,size=0x60) addr:0x02161ee4
_ZN12ActorUnkSZKU19func_ov071_0215fd04Ev kind:function(arm,size=0x7c) addr:0x02161f44
_ZN12ActorUnkSZKU19func_ov071_0215fd80Ev kind:function(arm,size=0x54) addr:0x02161fc0
_ZN12ActorUnkSZKU19func_ov071_0215fdd4Ev kind:function(arm,size=0x80) addr:0x02162014
_ZN12ActorUnkSZKU19func_ov071_0215fe54Ev kind:function(arm,size=0x40) addr:0x02162094
_ZN12ActorUnkSZKU19func_ov071_0215fe94Ev kind:function(arm,size=0x40) addr:0x021620d4
_ZN12ActorUnkSZKU19func_ov071_0215fed4Ev kind:function(arm,size=0x34) addr:0x02162114
_ZN12ActorUnkSZKU19func_ov071_0215ff08Ev kind:function(arm,size=0x34) addr:0x02162148
_ZN12ActorUnkSZKU19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0216217c
_ZN12ActorUnkSZKU19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x021621f8
_ZN12ActorUnkSZKU19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x021621fc
_ZN16ActorUnkSZKU_194C2EP12ActorUnkSZKU kind:function(arm,size=0x38) addr:0x02162240
_ZN16ActorUnkSZKU_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x02162278
_ZN16ActorUnkSZKU_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x021622b8
_ZN16ActorUnkSZKU_1948vfunc_0CEi kind:function(arm,size=0x24) addr:0x021622d4
_ZN16ActorUnkSZKU_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x021622f8
_ZN16ActorUnkSZKU_204C1Ev kind:function(arm,size=0x14) addr:0x02162314
_ZN16ActorUnkSKZU_104D0Ev kind:function(arm,size=0x1c) addr:0x02162328
_ZN19ActorProfileUnkSZKUD1Ev kind:function(arm,size=0x14) addr:0x02162344
_ZN21ActorProfileTearLight10GetProfileEv kind:function(arm,size=0xc) addr:0x02161450
_ZN21ActorProfileTearLight6CreateEv kind:function(arm,size=0x24) addr:0x0216145c
_ZN21ActorProfileTearLightC1Ev kind:function(arm,size=0x50) addr:0x02161480
_ZN14ActorTearLightC1Ev kind:function(arm,size=0x194) addr:0x021614d0
_ZN18ActorTearLight_104D1Ev kind:function(arm,size=0x14) addr:0x02161664
_ZN14ActorTearLightD1Ev kind:function(arm,size=0x78) addr:0x02161678
_ZN14ActorTearLightD0Ev kind:function(arm,size=0x80) addr:0x021616f0
_ZN14ActorTearLight8vfunc_18Ei kind:function(arm,size=0xac) addr:0x02161770
_ZN14ActorTearLight8vfunc_1CEv kind:function(arm,size=0x2c) addr:0x0216181c
_ZN14ActorTearLight8vfunc_20Ev kind:function(arm,size=0x4c) addr:0x02161848
_ZN14ActorTearLight8vfunc_24Ev kind:function(arm,size=0xc0) addr:0x02161894
_ZN14ActorTearLight8vfunc_2CEi kind:function(arm,size=0xc8) addr:0x02161954
_ZN14ActorTearLight8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x18) addr:0x02161a1c
_ZN14ActorTearLight19func_ov071_0215f7f4Es kind:function(arm,size=0x18) addr:0x02161a34
_ZN14ActorTearLight19func_ov071_0215f80cEv kind:function(arm,size=0x18) addr:0x02161a4c
_ZN14ActorTearLight19func_ov071_0215f824Ev kind:function(arm,size=0x108) addr:0x02161a64
_ZN14ActorTearLight19func_ov071_0215f92cEv kind:function(arm,size=0x2e0) addr:0x02161b6c
_ZN14ActorTearLight19func_ov071_0215fc0cEv kind:function(arm,size=0x48) addr:0x02161e4c
_ZN14ActorTearLight19func_ov071_0215fc54Ev kind:function(arm,size=0x50) addr:0x02161e94
_ZN14ActorTearLight19func_ov071_0215fca4Ev kind:function(arm,size=0x60) addr:0x02161ee4
_ZN14ActorTearLight19func_ov071_0215fd04Ev kind:function(arm,size=0x7c) addr:0x02161f44
_ZN14ActorTearLight19func_ov071_0215fd80Ev kind:function(arm,size=0x54) addr:0x02161fc0
_ZN14ActorTearLight19func_ov071_0215fdd4Ev kind:function(arm,size=0x80) addr:0x02162014
_ZN14ActorTearLight19func_ov071_0215fe54Ev kind:function(arm,size=0x40) addr:0x02162094
_ZN14ActorTearLight19func_ov071_0215fe94Ev kind:function(arm,size=0x40) addr:0x021620d4
_ZN14ActorTearLight19func_ov071_0215fed4Ev kind:function(arm,size=0x34) addr:0x02162114
_ZN14ActorTearLight19func_ov071_0215ff08Ev kind:function(arm,size=0x34) addr:0x02162148
_ZN14ActorTearLight19func_ov071_0215ff3cEv kind:function(arm,size=0x7c) addr:0x0216217c
_ZN14ActorTearLight19func_ov071_0215ffb8Ev kind:function(arm,size=0x4) addr:0x021621f8
_ZN14ActorTearLight19func_ov071_0215ffbcEv kind:function(arm,size=0x44) addr:0x021621fc
_ZN18ActorTearLight_194C2EP14ActorTearLight kind:function(arm,size=0x38) addr:0x02162240
_ZN18ActorTearLight_1948vfunc_00E8ActorRefi kind:function(arm,size=0x40) addr:0x02162278
_ZN18ActorTearLight_1948vfunc_04Ev kind:function(arm,size=0x1c) addr:0x021622b8
_ZN18ActorTearLight_1948vfunc_0CEi kind:function(arm,size=0x24) addr:0x021622d4
_ZN18ActorTearLight_1948vfunc_08Ev kind:function(arm,size=0x1c) addr:0x021622f8
_ZN18ActorTearLight_204C2Ev kind:function(arm,size=0x14) addr:0x02162314
_ZN18ActorTearLight_104D0Ev kind:function(arm,size=0x1c) addr:0x02162328
_ZN21ActorProfileTearLightD1Ev kind:function(arm,size=0x14) addr:0x02162344
_ZN19ActorProfileUnkKMSO10GetProfileEv kind:function(arm,size=0xc) addr:0x02162358
_ZN19ActorProfileUnkKMSO6CreateEv kind:function(arm,size=0x24) addr:0x02162364
_ZN19ActorProfileUnkKMSOC1Ev kind:function(arm,size=0x44) addr:0x02162388
@@ -478,7 +478,7 @@ __sinit_ov071_02165fa4 kind:function(arm,size=0x28) addr:0x02165fa4
__sinit_ov071_02165fcc kind:function(arm,size=0x18) addr:0x02165fcc
__sinit_ov071_02165fe4 kind:function(arm,size=0x34) addr:0x02165fe4
__sinit_ov071_02166018 kind:function(arm,size=0x18) addr:0x02166018
__sinit_ActorUnkSZKU.cpp kind:function(arm,size=0x74) addr:0x02166030
__sinit_ActorTearLight.cpp kind:function(arm,size=0x74) addr:0x02166030
__sinit_ActorUnkKMSO.cpp kind:function(arm,size=0x50) addr:0x021660a4
__sinit_MapObjectUnkRNBO.cpp kind:function(arm,size=0x50) addr:0x021660f4
__sinit_MapObjectUnkRPFL.cpp kind:function(arm,size=0x50) addr:0x02166144
@@ -491,7 +491,7 @@ __sinit_ov071_021662f4 kind:function(arm,size=0x18) addr:0x021662f4
.p__sinit_ov071_02165fcc kind:data(word) addr:0x02166310
.p__sinit_ov071_02165fe4 kind:data(word) addr:0x02166314
.p__sinit_ov071_02166018 kind:data(word) addr:0x02166318
.p__sinit_ActorUnkSZKU.cpp kind:data(word) addr:0x0216631c
.p__sinit_ActorTearLight.cpp kind:data(word) addr:0x0216631c
.p__sinit_ActorUnkKMSO.cpp kind:data(word) addr:0x02166320
.p__sinit_MapObjectUnkRNBO.cpp kind:data(word) addr:0x02166324
.p__sinit_MapObjectUnkRPFL.cpp kind:data(word) addr:0x02166328
@@ -528,10 +528,10 @@ data_ov071_02166c24 kind:data(any) addr:0x02166c24
data_ov071_02166d2c kind:data(any) addr:0x02166d2c
data_ov071_02166e34 kind:data(any) addr:0x02166e34
data_ov071_02166e40 kind:data(any) addr:0x02166e40
_ZTV16ActorUnkSZKU_194 kind:data(any) addr:0x02166e58
_ZTV19ActorProfileUnkSZKU kind:data(any) addr:0x02166e70
_ZTV16ActorUnkSKZU_104 kind:data(any) addr:0x02166e94
_ZTV12ActorUnkSZKU kind:data(any) addr:0x02166edc
_ZTV18ActorTearLight_194 kind:data(any) addr:0x02166e58
_ZTV21ActorProfileTearLight kind:data(any) addr:0x02166e70
_ZTV18ActorTearLight_104 kind:data(any) addr:0x02166e94
_ZTV14ActorTearLight kind:data(any) addr:0x02166edc
data_ov071_02166f38 kind:data(any) addr:0x02166f38
data_ov071_02164ce0 kind:data(any) addr:0x02166f40
data_ov071_02164ce8 kind:data(any) addr:0x02166f48
@@ -570,9 +570,9 @@ data_ov071_02167388 kind:bss addr:0x02167388
data_ov071_02167394 kind:bss addr:0x02167394
data_ov071_021673a0 kind:bss addr:0x021673a0
data_ov071_021673ac kind:bss addr:0x021673ac
_ZGVN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x021673b0
_ZGVN15ProfileInstanceI21ActorProfileTearLightE8sProfileE kind:bss addr:0x021673b0
@33275 kind:bss addr:0x021673bc
_ZN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x021673c8
_ZN15ProfileInstanceI21ActorProfileTearLightE8sProfileE kind:bss addr:0x021673c8
_ZGVN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x021674a0
@33281 kind:bss addr:0x021674a4
_ZN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x021674b0
+1 -1
View File
@@ -449,7 +449,7 @@ DEFINE_ACTOR_TYPE('SYWA', SYWA)
DEFINE_ACTOR_TYPE('SYWL', SYWL)
DEFINE_ACTOR_TYPE('SYWS', SYWS)
DEFINE_ACTOR_TYPE('SZKL', SZKL)
DEFINE_ACTOR_TYPE('SZKU', SZKU)
DEFINE_ACTOR_TYPE('SZKU', TearLight)
DEFINE_ACTOR_TYPE('SZRD', SZRD)
DEFINE_ACTOR_TYPE('TBRD', TBRD)
DEFINE_ACTOR_TYPE('TCAM', TCAM)
@@ -9,31 +9,31 @@
#include "global.h"
#include "types.h"
class ActorUnkSZKU;
class ActorProfileUnkSZKU;
class ActorTearLight;
class ActorProfileTearLight;
struct ActorUnkZSKU_UnkStruct {
/* 00 */ void (ActorUnkSZKU::*fct)();
struct ActorTearLight_UnkStruct {
/* 00 */ void (ActorTearLight::*fct)();
/* 08 */
};
class ActorUnkSZKU_204 : public UnkStruct_PlayerGet_ec {
class ActorTearLight_204 : public UnkStruct_PlayerGet_ec {
public:
/* 00 (base) */
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */
ActorUnkSZKU_204();
~ActorUnkSZKU_204(); // func_ov071_02151d24
ActorTearLight_204();
~ActorTearLight_204(); // func_ov071_02151d24
};
class ActorUnkSZKU_194 : public Actor_C4 {
class ActorTearLight_194 : public Actor_C4 {
public:
/* 00 (base) */
/* 24 */
ActorUnkSZKU_194(ActorUnkSZKU *param1);
ActorTearLight_194(ActorTearLight *param1);
// data_ov071_02164c00
/* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override;
@@ -42,31 +42,31 @@ public:
/* 0C */ virtual void vfunc_0C(unk32 param1) override;
};
class ActorUnkSKZU_Base : public UnkStruct_ov000_020b31a8 {
class ActorTearLight_104_Base : public UnkStruct_ov000_020b31a8 {
public:
/* 00 (base) */
/* 1C */
ActorUnkSKZU_Base(UnkSystem5 *param1, ModelRender *param2, unk32 param3) :
ActorTearLight_104_Base(UnkSystem5 *param1, ModelRender *param2, unk32 param3) :
UnkStruct_ov000_020b31a8(param1, param2, param3) {}
// data_ov071_021641e0
/* 00 */ virtual ~ActorUnkSKZU_Base(); // func_ov071_02151d10 & func_ov071_0215b744
/* 00 */ virtual ~ActorTearLight_104_Base(); // func_ov071_02151d10 & func_ov071_0215b744
/* 30 */ virtual s8 vfunc_30();
/* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2) override;
/* 3C */ virtual void vfunc_3C() override;
};
class ActorUnkSKZU_104 : public ActorUnkSKZU_Base {
class ActorTearLight_104 : public ActorTearLight_104_Base {
public:
/* 00 (base) */
/* 1C */
ActorUnkSKZU_104(UnkSystem5 *param1, ModelRender *param2, unk32 param3) :
ActorUnkSKZU_Base(param1, param2, param3) {}
ActorTearLight_104(UnkSystem5 *param1, ModelRender *param2, unk32 param3) :
ActorTearLight_104_Base(param1, param2, param3) {}
// data_ov071_02164c3c
/* 00 */ virtual ~ActorUnkSKZU_104();
/* 00 */ virtual ~ActorTearLight_104();
};
enum ActorUnkSZKUState_ {
@@ -82,30 +82,30 @@ enum ActorUnkSZKUState_ {
ActorUnkSZKUState_Max,
};
class ActorUnkSZKU : public Actor {
class ActorTearLight : public Actor {
public:
/* 000 (base) */
/* 094 */ VecFx32 mUnk_094;
/* 0A0 */ ItemId mItemId;
/* 0A4 */ ModelRender mUnk_0A4;
/* 104 */ ActorUnkSKZU_104 mUnk_104;
/* 104 */ ActorTearLight_104 mUnk_104;
/* 120 */ UnkSystem5 mUnk_120;
/* 140 */ unk32 mUnk_140;
/* 144 */ STRUCT_PAD(0x144, 0x160);
/* 160 */ ActorUnkZSKU_UnkStruct mUnk_160;
/* 160 */ ActorTearLight_UnkStruct mUnk_160;
/* 168 */ Actor_9C mUnk_168;
/* 188 */ unk32 mUnk_188;
/* 18C */ bool mUnk_18C;
/* 18D */ bool mUnk_18D;
/* 190 */ ActorRef mUnk_190;
/* 194 */ ActorUnkSZKU_194 mUnk_194;
/* 194 */ ActorTearLight_194 mUnk_194;
/* 1B8 */ u8 mUnk_1B8;
/* 1B9 */ unk8 mUnk_1B9;
/* 1BC */ UnkStruct_ov031_Items_02 mUnk_1BC;
/* 1C8 */ STRUCT_PAD(0x1C8, 0x204);
/* 204 */ ActorUnkSZKU_204 mUnk_204[0x2];
/* 204 */ ActorTearLight_204 mUnk_204[0x2];
ActorUnkSZKU();
ActorTearLight();
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
/* 1C */ virtual void vfunc_1C() override;
@@ -113,36 +113,33 @@ public:
/* 24 */ virtual void vfunc_24() override;
/* 2C */ virtual void vfunc_2C(unk32 param1) override;
/* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override;
/* 4C */ virtual ~ActorUnkSZKU() override;
void func_ov071_0215f7f4(ActorState state);
void func_ov071_0215f80c(void);
void func_ov071_0215f824(void);
void func_ov071_0215f92c(void);
void func_ov071_0215fc0c(void);
void func_ov071_0215fc54(void);
void func_ov071_0215fca4(void);
void func_ov071_0215fd04(void);
void func_ov071_0215fd80(void);
void func_ov071_0215fdd4(void);
void func_ov071_0215fe54(void);
void func_ov071_0215fe94(void);
void func_ov071_0215fed4(void);
void func_ov071_0215ff08(void);
void func_ov071_0215ff3c(void);
void func_ov071_0215ffb8(void);
void func_ov071_0215ffbc(void);
void func_ov071_021600d4(void);
void func_ov071_0215f80c();
void func_ov071_0215f824();
void func_ov071_0215f92c();
void func_ov071_0215fc0c();
void func_ov071_0215fc54();
void func_ov071_0215fca4();
void func_ov071_0215fd04();
void func_ov071_0215fd80();
void func_ov071_0215fdd4();
void func_ov071_0215fe54();
void func_ov071_0215fe94();
void func_ov071_0215fed4();
void func_ov071_0215ff08();
void func_ov071_0215ff3c();
void func_ov071_0215ffb8();
void func_ov071_0215ffbc();
};
class ActorProfileUnkSZKU : public ActorProfile_Derived1 {
class ActorProfileTearLight : public ActorProfile_Derived1 {
public:
/* 00 (base) */
ActorProfileUnkSZKU();
~ActorProfileUnkSZKU();
ActorProfileTearLight();
/* 0C */ virtual Actor *Create();
static ActorProfileUnkSZKU *GetProfile();
static ActorProfileTearLight *GetProfile();
};
+1 -1
View File
@@ -130,7 +130,7 @@ void Inventory::func_ov001_020bba6c() {
unk32 actorId;
} uStack_18;
uStack_18.ptr = &data_ov000_020b3000;
uStack_18.actorId = ActorId_SZKU;
uStack_18.actorId = ActorId_TearLight;
Actor **ppActor = gpActorManager->func_01fff350(&uStack_18, gpActorManager->mActorTable);
while (ppActor != gpActorManager->mUnk_08) {
@@ -1,4 +1,4 @@
#include "Actor/ActorUnkSZKU.hpp"
#include "Actor/ActorTearLight.hpp"
#include "Actor/ActorManager.hpp"
#include "System/SysNew.hpp"
@@ -37,33 +37,33 @@ extern "C" fx32 func_ov000_02080068(fx32 x);
extern "C" fx32 func_ov000_02080080(fx32 x);
static ActorUnkZLSL_AnimationTag data_ov071_02164be0 = {0x0, "szku"};
static ActorUnkZSKU_UnkStruct data_ov071_02164cd8 = {.fct = 0x0};
static ActorUnkZSKU_UnkStruct data_ov071_02164ce0 = {.fct = ActorUnkSZKU::func_ov071_0215fed4};
static ActorUnkZSKU_UnkStruct data_ov071_02164ce8 = {.fct = ActorUnkSZKU::func_ov071_0215ff08};
static ActorUnkZSKU_UnkStruct data_ov071_02164cf0 = {.fct = ActorUnkSZKU::func_ov071_0215ff3c};
static ActorUnkZSKU_UnkStruct data_ov071_02164cf8 = {.fct = ActorUnkSZKU::func_ov071_0215ff3c};
static ActorUnkZSKU_UnkStruct data_ov071_02164d00 = {.fct = ActorUnkSZKU::func_ov071_0215ffb8};
static ActorUnkZSKU_UnkStruct data_ov071_02164d08 = {.fct = ActorUnkSZKU::func_ov071_0215ffbc};
static ActorTearLight_UnkStruct data_ov071_02164cd8 = {.fct = 0x0};
static ActorTearLight_UnkStruct data_ov071_02164ce0 = {.fct = ActorTearLight::func_ov071_0215fed4};
static ActorTearLight_UnkStruct data_ov071_02164ce8 = {.fct = ActorTearLight::func_ov071_0215ff08};
static ActorTearLight_UnkStruct data_ov071_02164cf0 = {.fct = ActorTearLight::func_ov071_0215ff3c};
static ActorTearLight_UnkStruct data_ov071_02164cf8 = {.fct = ActorTearLight::func_ov071_0215ff3c};
static ActorTearLight_UnkStruct data_ov071_02164d00 = {.fct = ActorTearLight::func_ov071_0215ffb8};
static ActorTearLight_UnkStruct data_ov071_02164d08 = {.fct = ActorTearLight::func_ov071_0215ffbc};
DECL_PROFILE(ActorProfileUnkSZKU);
DECL_PROFILE(ActorProfileTearLight);
Actor *ActorProfileUnkSZKU::Create() {
return new(HeapIndex_2) ActorUnkSZKU();
Actor *ActorProfileTearLight::Create() {
return new(HeapIndex_2) ActorTearLight();
}
ActorProfileUnkSZKU::ActorProfileUnkSZKU() :
ActorProfile_Derived1(ActorId_SZKU) {
ActorProfileTearLight::ActorProfileTearLight() :
ActorProfile_Derived1(ActorId_TearLight) {
this->mUnk_18 = 0x0;
this->mUnk_1A = 0x1000;
this->mUnk_04.Init(FLOAT_TO_FX32(0.4f));
}
// non-matching
ActorUnkSZKU::ActorUnkSZKU() :
mUnk_0A4(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkSZKU)->mUnk_3C.mUnk_50)),
mUnk_104(&this->mUnk_120, &this->mUnk_0A4, GET_PROFILE(ActorProfileUnkSZKU)->vfunc_04()),
ActorTearLight::ActorTearLight() :
mUnk_0A4(G3d_GetModelPtr(GET_PROFILE(ActorProfileTearLight)->mUnk_3C.mUnk_50)),
mUnk_104(&this->mUnk_120, &this->mUnk_0A4, GET_PROFILE(ActorProfileTearLight)->vfunc_04()),
mUnk_120(&this->mUnk_140, NULL),
mUnk_160(*(ActorUnkZSKU_UnkStruct *) &data_020431b8),
mUnk_160(*(ActorTearLight_UnkStruct *) &data_020431b8),
mUnk_188(0x0),
mUnk_18C(0x1),
mUnk_18D(false),
@@ -79,7 +79,7 @@ ActorUnkSZKU::ActorUnkSZKU() :
}
// non-matching
bool ActorUnkSZKU::vfunc_18(unk32 param1) {
bool ActorTearLight::vfunc_18(unk32 param1) {
SET_FLAG(this->mFlags, ActorFlag_11);
this->mItemId = ItemId_ForceGem_60;
@@ -95,14 +95,14 @@ bool ActorUnkSZKU::vfunc_18(unk32 param1) {
return true;
}
void ActorUnkSZKU::vfunc_1C() {
void ActorTearLight::vfunc_1C() {
if (this->mUnk_5C.mParams[0] != 0x1) {
return;
}
data_027e0cd8->mUnk_0C->func_ov000_02080a5c(&this->mUnk_1BC.mUnk_00);
}
void ActorUnkSZKU::vfunc_20() {
void ActorTearLight::vfunc_20() {
this->func_ov071_0215f92c();
this->func_ov071_0215f824();
@@ -115,7 +115,7 @@ void ActorUnkSZKU::vfunc_20() {
VecFx32_Copy(&this->mPos, &this->mUnk_1BC.mUnk_00);
}
void ActorUnkSZKU::vfunc_24() {
void ActorTearLight::vfunc_24() {
if (this->mState == ActorUnkSZKUState_3) {
this->func_ov071_0215f92c();
}
@@ -143,7 +143,7 @@ void ActorUnkSZKU::vfunc_24() {
this->mUnk_104.vfunc_34();
}
void ActorUnkSZKU::vfunc_2C(unk32 param1) {
void ActorTearLight::vfunc_2C(unk32 param1) {
if (!this->func_01fff5d0(param1, 0x0)) {
return;
}
@@ -159,26 +159,26 @@ void ActorUnkSZKU::vfunc_2C(unk32 param1) {
}
// non-matching
void ActorUnkSZKU::vfunc_30(Actor_vfunc_30 *param1) {
this->func_ov017_020bef88(param1, GET_PROFILE(ActorProfileUnkSZKU), 0x1);
void ActorTearLight::vfunc_30(Actor_vfunc_30 *param1) {
this->func_ov017_020bef88(param1, GET_PROFILE(ActorProfileTearLight), 0x1);
}
void ActorUnkSZKU::func_ov071_0215f7f4(ActorState state) {
void ActorTearLight::func_ov071_0215f7f4(ActorState state) {
this->mState = state;
this->mUnk_2C = data_ov000_020aecf8;
}
void ActorUnkSZKU::func_ov071_0215f80c() {
void ActorTearLight::func_ov071_0215f80c() {
UNSET_FLAG(this->mFlags, ActorFlag_5);
this->func_ov071_0215fca4();
}
void ActorUnkSZKU::func_ov071_0215f824() {
void ActorTearLight::func_ov071_0215f824() {
switch (this->mState) {
case ActorUnkSZKUState_3:
case ActorUnkSZKUState_8: {
UnkStruct_027e0cec *data = data_027e0cec;
for (ActorUnkSZKU_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204);
for (ActorTearLight_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204);
++playerGet) {
data->func_ov000_020a0110(playerGet);
}
@@ -189,14 +189,14 @@ void ActorUnkSZKU::func_ov071_0215f824() {
VecFx32 vec = this->mPos;
vec.y += FLOAT_TO_FX32(0.5f);
UnkStruct_027e0cec *data = data_027e0cec;
for (ActorUnkSZKU_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204);
for (ActorTearLight_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204);
++playerGet) {
data->func_ov000_020a0140(playerGet, &vec);
}
break;
}
UnkStruct_027e0cec *data = data_027e0cec;
for (ActorUnkSZKU_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204);
for (ActorTearLight_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204);
++playerGet) {
data->func_ov000_020a0110(playerGet);
}
@@ -205,7 +205,7 @@ void ActorUnkSZKU::func_ov071_0215f824() {
}
// non-matching
void ActorUnkSZKU::func_ov071_0215f92c() {
void ActorTearLight::func_ov071_0215f92c() {
if (this->mState != ActorUnkSZKUState_8 && !this->func_ov017_020beeec(0x4000)) {
return;
}
@@ -281,16 +281,17 @@ void ActorUnkSZKU::func_ov071_0215f92c() {
}
}
void ActorUnkSZKU::func_ov071_0215fc0c() {
void ActorTearLight::func_ov071_0215fc0c() {
UnkStruct_027e0cec *data = data_027e0cec;
for (ActorUnkSZKU_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204); ++playerGet) {
for (ActorTearLight_204 *playerGet = this->mUnk_204; playerGet != this->mUnk_204 + ARRAY_LEN(this->mUnk_204);
++playerGet) {
data->func_ov000_020a0110(playerGet);
}
this->func_ov071_0215fd80();
}
// non-matching
void ActorUnkSZKU::func_ov071_0215fc54() {
void ActorTearLight::func_ov071_0215fc54() {
this->func_ov071_0215f7f4(ActorUnkSZKUState_0);
this->mUnk_18D = false;
@@ -304,7 +305,7 @@ void ActorUnkSZKU::func_ov071_0215fc54() {
}
// non-matching
void ActorUnkSZKU::func_ov071_0215fca4() {
void ActorTearLight::func_ov071_0215fca4() {
this->func_ov071_0215f7f4(ActorUnkSZKUState_1);
this->mUnk_52 = 0xFFFF;
@@ -320,7 +321,7 @@ void ActorUnkSZKU::func_ov071_0215fca4() {
}
// non-matching
void ActorUnkSZKU::func_ov071_0215fd04() {
void ActorTearLight::func_ov071_0215fd04() {
this->func_ov071_0215f7f4(ActorUnkSZKUState_2);
bool temp_r0 = this->mUnk_5C.mUnk_0F;
@@ -345,7 +346,7 @@ void ActorUnkSZKU::func_ov071_0215fd04() {
}
// non-matching
void ActorUnkSZKU::func_ov071_0215fd80() {
void ActorTearLight::func_ov071_0215fd80() {
this->func_ov071_0215f7f4(ActorUnkSZKUState_3);
this->mUnk_52 = 0xFFFF;
@@ -359,7 +360,7 @@ void ActorUnkSZKU::func_ov071_0215fd80() {
}
// non-matching
void ActorUnkSZKU::func_ov071_0215fdd4() {
void ActorTearLight::func_ov071_0215fdd4() {
this->func_ov071_0215f7f4(ActorUnkSZKUState_4);
this->mUnk_52 = 0xFFFF;
@@ -380,7 +381,7 @@ void ActorUnkSZKU::func_ov071_0215fdd4() {
}
// non-matching
void ActorUnkSZKU::func_ov071_0215fe54() {
void ActorTearLight::func_ov071_0215fe54() {
this->func_ov071_0215f7f4(ActorUnkSZKUState_6);
this->mUnk_2C = 0x0;
VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel);
@@ -389,7 +390,7 @@ void ActorUnkSZKU::func_ov071_0215fe54() {
}
// non-matching
void ActorUnkSZKU::func_ov071_0215fe94() {
void ActorTearLight::func_ov071_0215fe94() {
this->func_ov071_0215f7f4(ActorUnkSZKUState_7);
this->mUnk_2C = 0x0;
VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mVel);
@@ -397,19 +398,19 @@ void ActorUnkSZKU::func_ov071_0215fe94() {
this->mUnk_160 = data_ov071_02164d08;
}
void ActorUnkSZKU::func_ov071_0215fed4() {
void ActorTearLight::func_ov071_0215fed4() {
this->IsTimerOut();
this->func_ov000_02098838();
this->mUnk_3C = &this->mUnk_168;
}
void ActorUnkSZKU::func_ov071_0215ff08() {
void ActorTearLight::func_ov071_0215ff08() {
this->IsTimerOut();
this->mAngle += 0x222; // TODO DEG_ANGLE
this->mUnk_3C = &this->mUnk_168;
}
void ActorUnkSZKU::func_ov071_0215ff3c() {
void ActorTearLight::func_ov071_0215ff3c() {
this->IsTimerOut();
if (!data_027e09b8->func_01ffd420()) {
@@ -421,9 +422,9 @@ void ActorUnkSZKU::func_ov071_0215ff3c() {
}
}
void ActorUnkSZKU::func_ov071_0215ffb8() {}
void ActorTearLight::func_ov071_0215ffb8() {}
void ActorUnkSZKU::func_ov071_0215ffbc() {
void ActorTearLight::func_ov071_0215ffbc() {
UnkActor_ov071_0215ffbc *actor = (UnkActor_ov071_0215ffbc *) gpActorManager->func_01fff3b4(this->mUnk_190);
if (actor == NULL) {
this->func_ov071_0215fca4();
@@ -432,41 +433,39 @@ void ActorUnkSZKU::func_ov071_0215ffbc() {
func_01ffb714(&actor->mUnk_E8, &this->mPos, &this->mVel);
}
ActorUnkSZKU_194::ActorUnkSZKU_194(ActorUnkSZKU *param1) :
ActorTearLight_194::ActorTearLight_194(ActorTearLight *param1) :
Actor_C4(param1) {
this->mUnk_20 = param1;
this->mUnk_04 = 0x1;
}
bool ActorUnkSZKU_194::vfunc_00(ActorRef ref, unk32 param2) {
bool ActorTearLight_194::vfunc_00(ActorRef ref, unk32 param2) {
if (param2 != 0x0) {
ActorUnkSZKU *actor = this->GetActorPtr<ActorUnkSZKU>();
actor->mUnk_190 = ref;
ActorTearLight *actor = this->GetActorPtr<ActorTearLight>();
actor->mUnk_190 = ref;
actor->func_ov071_0215fe54();
}
return this->Actor_C4::vfunc_00(ref, param2);
}
bool ActorUnkSZKU_194::vfunc_04() {
this->GetActorPtr<ActorUnkSZKU>()->func_ov071_0215fe94();
bool ActorTearLight_194::vfunc_04() {
this->GetActorPtr<ActorTearLight>()->func_ov071_0215fe94();
return this->Actor_C4::vfunc_04();
}
void ActorUnkSZKU_194::vfunc_0C(unk32 param1) {
this->GetActorPtr<ActorUnkSZKU>()->func_ov071_0215fca4();
void ActorTearLight_194::vfunc_0C(unk32 param1) {
this->GetActorPtr<ActorTearLight>()->func_ov071_0215fca4();
return this->Actor_C4::vfunc_0C(param1);
}
void ActorUnkSZKU_194::vfunc_08() {
this->GetActorPtr<ActorUnkSZKU>()->func_ov071_0215fc0c();
void ActorTearLight_194::vfunc_08() {
this->GetActorPtr<ActorTearLight>()->func_ov071_0215fc0c();
return this->Actor_C4::vfunc_08();
}
ActorUnkSZKU_204::ActorUnkSZKU_204() :
ActorTearLight_204::ActorTearLight_204() :
UnkStruct_PlayerGet_ec(NULL),
mUnk_04(-0x1),
mUnk_08(0x0) {}
ActorUnkSZKU::~ActorUnkSZKU() {}
ActorProfileUnkSZKU::~ActorProfileUnkSZKU() {}
ActorUnkSKZU_104::~ActorUnkSKZU_104() {}
ActorTearLight_104::~ActorTearLight_104() {}
+1 -1
View File
@@ -1053,7 +1053,7 @@ config.libs = [
"Overlay 71",
[
Object("071_Tower/Actor/ActorUnkKMSO.cpp"),
Object("071_Tower/Actor/ActorUnkSZKU.cpp"),
Object("071_Tower/Actor/ActorTearLight.cpp"),
Object("071_Tower/MapObject/MapObjectUnkBLCE.cpp"),
Object("071_Tower/MapObject/MapObjectUnkBLCT.cpp"),
Object("071_Tower/MapObject/MapObjectUnkBRGS.cpp"),