From 55f9fa23c87bbbd6c380f71d3f0cb721e1853183 Mon Sep 17 00:00:00 2001 From: Mike Date: Fri, 3 May 2024 15:36:27 -0400 Subject: [PATCH 1/4] Update ActorType ctor arg type --- asm/ov00/ov00_02086cd0.inc | 2 +- asm/ov00/ov00_02086cd0.s | 6 +- asm/ov00/ov00_020980f4.inc | 2 +- asm/ov00/ov00_020980f4.s | 4 +- asm/ov00/ov00_020b1498.inc | 2 +- asm/ov00/ov00_020b1498.s | 10 ++-- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 14 ++--- asm/ov03.inc | 2 +- asm/ov03.s | 2 +- asm/ov12.inc | 2 +- asm/ov12.s | 12 ++-- asm/ov14/Actor/ActorRupee.inc | 2 +- asm/ov14/Actor/ActorRupee.s | 2 +- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 44 +++++++-------- asm/ov14/ov14_0213b778.inc | 2 +- asm/ov14/ov14_0213b778.s | 18 +++--- asm/ov15.inc | 2 +- asm/ov15.s | 102 +++++++++++++++++----------------- asm/ov17.inc | 2 +- asm/ov17.s | 12 ++-- asm/ov18.inc | 2 +- asm/ov18.s | 10 ++-- asm/ov19.inc | 2 +- asm/ov19.s | 12 ++-- asm/ov20.inc | 2 +- asm/ov20.s | 28 +++++----- asm/ov21.inc | 2 +- asm/ov21.s | 16 +++--- asm/ov22.inc | 2 +- asm/ov22.s | 26 ++++----- asm/ov23.inc | 2 +- asm/ov23.s | 22 ++++---- asm/ov24.inc | 2 +- asm/ov24.s | 20 +++---- asm/ov25.inc | 2 +- asm/ov25.s | 20 +++---- asm/ov26.inc | 2 +- asm/ov26.s | 32 +++++------ asm/ov27.inc | 2 +- asm/ov27.s | 14 ++--- asm/ov28.inc | 2 +- asm/ov28.s | 26 ++++----- asm/ov29.inc | 2 +- asm/ov29.s | 18 +++--- asm/ov30.inc | 2 +- asm/ov30.s | 10 ++-- asm/ov31.inc | 2 +- asm/ov31.s | 44 +++++++-------- asm/ov32.inc | 2 +- asm/ov32.s | 12 ++-- asm/ov33.inc | 2 +- asm/ov33.s | 10 ++-- asm/ov34.inc | 2 +- asm/ov34.s | 6 +- asm/ov35.inc | 2 +- asm/ov35.s | 8 +-- asm/ov36.inc | 2 +- asm/ov36.s | 4 +- asm/ov37.inc | 2 +- asm/ov37.s | 10 ++-- asm/ov38.inc | 2 +- asm/ov38.s | 4 +- asm/ov39.inc | 2 +- asm/ov39.s | 2 +- asm/ov40.inc | 2 +- asm/ov40.s | 14 ++--- asm/ov41.inc | 2 +- asm/ov41.s | 12 ++-- asm/ov42.inc | 2 +- asm/ov42.s | 6 +- asm/ov43.inc | 2 +- asm/ov43.s | 6 +- asm/ov44.inc | 2 +- asm/ov44.s | 16 +++--- asm/ov45.inc | 2 +- asm/ov45.s | 6 +- asm/ov46.inc | 2 +- asm/ov46.s | 8 +-- asm/ov47.inc | 2 +- asm/ov47.s | 8 +-- asm/ov48.inc | 2 +- asm/ov48.s | 12 ++-- asm/ov49.inc | 2 +- asm/ov49.s | 6 +- asm/ov50.inc | 2 +- asm/ov50.s | 4 +- asm/ov51.inc | 2 +- asm/ov51.s | 10 ++-- asm/ov52.inc | 2 +- asm/ov52.s | 4 +- include/Actor/ActorType.hpp | 6 +- 93 files changed, 395 insertions(+), 395 deletions(-) diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index 42b8f47b..404c0a5f 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -100,7 +100,7 @@ .extern _ZN7MapBase18func_ov00_0207e968Ev .extern _ZN7MapBase18func_ov00_0207e96cEv .extern _ZN7MapBase18func_ov00_0207f100Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 52220a92..46841fbf 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -21687,7 +21687,7 @@ func_ov00_020df678: ; 0x020df678 ldr r1, _020df6a8 ; =0x53574f42 ldr r2, _020df6ac ; =func_ov00_0208fa70 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020df6a4 ; =data_ov00_020ecd70 ldr r1, _020df6b0 ; =_ZN9ActorTypeD1Ev ldr r2, _020df6b4 ; =data_ov00_020ecd64 @@ -21709,7 +21709,7 @@ func_ov00_020df6b8: ; 0x020df6b8 ldr r1, _020df6e8 ; =0x53574453 ldr r2, _020df6ec ; =func_ov00_020903a8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020df6e4 ; =data_ov00_020ecd90 ldr r1, _020df6f0 ; =_ZN9ActorTypeD1Ev ldr r2, _020df6f4 ; =data_ov00_020ecd84 @@ -21731,7 +21731,7 @@ func_ov00_020df6f8: ; 0x020df6f8 ldr r1, _020df728 ; =0x45564943 ldr r2, _020df72c ; =func_ov00_020904f4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020df724 ; =data_ov00_020ecdb0 ldr r1, _020df730 ; =_ZN9ActorTypeD1Ev ldr r2, _020df734 ; =data_ov00_020ecda4 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index 04091b0a..7d328428 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -73,7 +73,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index bc9cb609..f20fca71 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -21964,7 +21964,7 @@ func_ov00_020e105c: ; 0x020e105c ldr r1, _020e108c ; =0x43414d41 ldr r2, _020e1090 ; =func_ov00_0209e8b8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1088 ; =data_ov00_020ee0f4 ldr r1, _020e1094 ; =_ZN9ActorTypeD1Ev ldr r2, _020e1098 ; =data_ov00_020ee0e8 @@ -22006,7 +22006,7 @@ func_ov00_020e10d4: ; 0x020e10d4 ldr r1, _020e1104 ; =0x5357524e ldr r2, _020e1108 ; =func_ov00_020a1c98 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1100 ; =data_ov00_020ee128 ldr r1, _020e110c ; =_ZN9ActorTypeD1Ev ldr r2, _020e1110 ; =data_ov00_020ee11c diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index a9e87b3c..df048cff 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -148,7 +148,7 @@ .extern _ZN5ActorD2Ev .extern _ZN7MapBase18func_ov00_0207e968Ev .extern _ZN7MapBase18func_ov00_0207e96cEv -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 07ecf977..3c7ec67c 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -21526,7 +21526,7 @@ func_ov00_020e1250: ; 0x020e1250 ldr r1, _020e1280 ; =0x45464f42 ldr r2, _020e1284 ; =func_ov00_020a5ef8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e127c ; =data_ov00_020ee184 ldr r1, _020e1288 ; =_ZN9ActorTypeD1Ev ldr r2, _020e128c ; =data_ov00_020ee178 @@ -21572,7 +21572,7 @@ func_ov00_020e12d8: ; 0x020e12d8 ldr r1, _020e1320 ; =0x4e415649 ldr r2, _020e1324 ; =func_ov00_020b80e0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e131c ; =data_ov00_020ee1ac ldr r1, _020e1328 ; =_ZN9ActorTypeD1Ev ldr r2, _020e132c ; =data_ov00_020ee1a0 @@ -21603,7 +21603,7 @@ func_ov00_020e133c: ; 0x020e133c ldr r1, _020e136c ; =0x46434e56 ldr r2, _020e1370 ; =func_ov00_020b862c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1368 ; =data_ov00_020ee1e4 ldr r1, _020e1374 ; =_ZN9ActorTypeD1Ev ldr r2, _020e1378 ; =data_ov00_020ee1d8 @@ -22117,7 +22117,7 @@ func_ov00_020e1b14: ; 0x020e1b14 ldr r1, _020e1b44 ; =0x41434f42 ldr r2, _020e1b48 ; =func_ov00_020be198 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1b40 ; =data_ov00_020ee568 ldr r1, _020e1b4c ; =_ZN9ActorTypeD1Ev ldr r2, _020e1b50 ; =data_ov00_020ee55c @@ -22139,7 +22139,7 @@ func_ov00_020e1b54: ; 0x020e1b54 ldr r1, _020e1b84 ; =0x57534e56 ldr r2, _020e1b88 ; =func_ov00_020c0b64 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1b80 ; =data_ov00_020ee59c ldr r1, _020e1b8c ; =_ZN9ActorTypeD1Ev ldr r2, _020e1b90 ; =data_ov00_020ee590 diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index 840dc10a..c84f3e83 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -108,7 +108,7 @@ .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev .extern _ZN9ActorType4FindEj -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 7236a01d..29f7c8f2 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -28406,7 +28406,7 @@ func_ov00_020e1b94: ; 0x020e1b94 ldr r1, _020e1bc4 ; =0x45465756 ldr r2, _020e1bc8 ; =func_ov00_020c96a4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1bc0 ; =data_ov00_020ee5bc ldr r1, _020e1bcc ; =_ZN9ActorTypeD1Ev ldr r2, _020e1bd0 ; =data_ov00_020ee5b0 @@ -28428,7 +28428,7 @@ func_ov00_020e1bd4: ; 0x020e1bd4 ldr r1, _020e1c04 ; =0x45465250 ldr r2, _020e1c08 ; =func_ov00_020c9ca4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1c00 ; =data_ov00_020ee5dc ldr r1, _020e1c0c ; =_ZN9ActorTypeD1Ev ldr r2, _020e1c10 ; =data_ov00_020ee5d0 @@ -28450,7 +28450,7 @@ func_ov00_020e1c14: ; 0x020e1c14 ldr r1, _020e1c44 ; =0x4c4f4e44 ldr r2, _020e1c48 ; =func_ov00_020ca20c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1c40 ; =data_ov00_020ee5fc ldr r1, _020e1c4c ; =_ZN9ActorTypeD1Ev ldr r2, _020e1c50 ; =data_ov00_020ee5f0 @@ -28498,7 +28498,7 @@ func_ov00_020e1c8c: ; 0x020e1c8c ldr r1, _020e1cbc ; =0x4d534741 ldr r2, _020e1cc0 ; =func_ov00_020d3020 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1cb8 ; =data_ov00_020ee61c ldr r1, _020e1cc4 ; =_ZN9ActorTypeD1Ev ldr r2, _020e1cc8 ; =data_ov00_020ee610 @@ -28520,7 +28520,7 @@ func_ov00_020e1ccc: ; 0x020e1ccc ldr r1, _020e1cfc ; =0x464d5347 ldr r2, _020e1d00 ; =func_ov00_020d32e4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1cf8 ; =data_ov00_020ee63c ldr r1, _020e1d04 ; =_ZN9ActorTypeD1Ev ldr r2, _020e1d08 ; =data_ov00_020ee630 @@ -28542,7 +28542,7 @@ func_ov00_020e1d0c: ; 0x020e1d0c ldr r1, _020e1d3c ; =0x4e4d5347 ldr r2, _020e1d40 ; =func_ov00_020d3fc8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1d38 ; =data_ov00_020ee65c ldr r1, _020e1d44 ; =_ZN9ActorTypeD1Ev ldr r2, _020e1d48 ; =data_ov00_020ee650 @@ -28599,7 +28599,7 @@ func_ov00_020e1da8: ; 0x020e1da8 ldr r1, _020e1dd8 ; =0x4546524c ldr r2, _020e1ddc ; =func_ov00_020d5284 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020e1dd4 ; =data_ov00_020ee6d4 ldr r1, _020e1de0 ; =_ZN9ActorTypeD1Ev ldr r2, _020e1de4 ; =data_ov00_020ee6c8 diff --git a/asm/ov03.inc b/asm/ov03.inc index 826e9d78..79cbd34f 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -221,7 +221,7 @@ .extern func_0203d77c .extern func_0203d7b8 .extern func_0203d7e0 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0203eadc .extern func_0203eba8 diff --git a/asm/ov03.s b/asm/ov03.s index 86db22ed..d057a5bc 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -43041,7 +43041,7 @@ func_ov03_020fff54: ; 0x020fff54 ldr r1, _020fff84 ; =0x4d544354 ldr r2, _020fff88 ; =func_ov03_020fb41c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _020fff80 ; =data_ov03_02100a98 ldr r1, _020fff8c ; =_ZN9ActorTypeD1Ev ldr r2, _020fff90 ; =data_ov03_02100a8c diff --git a/asm/ov12.inc b/asm/ov12.inc index 0303dc97..1a29adc5 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -114,7 +114,7 @@ .extern _ZN7MapBase8vfunc_b4Ev .extern _ZN7MapBase8vfunc_b8Ev .extern _ZN7MapBaseD1Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov12.s b/asm/ov12.s index 70704064..13c3d805 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -44951,7 +44951,7 @@ func_ov12_021354cc: ; 0x021354cc ldr r1, _02135638 ; =0x42544348 ldr r2, _0213563c ; =func_ov12_021136f0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02135634 ; =data_ov12_02137c74 ldr r1, _02135640 ; =_ZN9ActorTypeD1Ev ldr r2, _02135644 ; =data_ov12_02137c68 @@ -45101,7 +45101,7 @@ func_ov12_021356e0: ; 0x021356e0 ldr r1, _02135710 ; =0x42545246 ldr r2, _02135714 ; =func_ov12_02129668 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0213570c ; =data_ov12_0213dc94 ldr r1, _02135718 ; =_ZN9ActorTypeD1Ev ldr r2, _0213571c ; =data_ov12_0213dc88 @@ -45123,7 +45123,7 @@ func_ov12_02135720: ; 0x02135720 ldr r1, _02135794 ; =0x42544954 ldr r2, _02135798 ; =func_ov12_0212c734 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02135790 ; =data_ov12_0213dcbc ldr r1, _0213579c ; =_ZN9ActorTypeD1Ev ldr r2, _021357a0 ; =data_ov12_0213dcb0 @@ -45169,7 +45169,7 @@ func_ov12_021357c0: ; 0x021357c0 ldr r1, _0213580c ; =0x4254444c ldr r2, _02135810 ; =func_ov12_0212e1f8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02135808 ; =data_ov12_0213dd1c ldr r1, _02135814 ; =_ZN9ActorTypeD1Ev ldr r2, _02135818 ; =data_ov12_0213dd10 @@ -45221,7 +45221,7 @@ func_ov12_02135860: ; 0x02135860 ldr r1, _02135890 ; =0x42544443 ldr r2, _02135894 ; =func_ov12_02130834 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0213588c ; =data_ov12_0213dd78 ldr r1, _02135898 ; =_ZN9ActorTypeD1Ev ldr r2, _0213589c ; =data_ov12_0213dd6c @@ -45243,7 +45243,7 @@ func_ov12_021358a0: ; 0x021358a0 ldr r1, _021358d0 ; =0x434d5347 ldr r2, _021358d4 ; =func_ov12_02131fa0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021358cc ; =data_ov12_0213dd9c ldr r1, _021358d8 ; =_ZN9ActorTypeD1Ev ldr r2, _021358dc ; =data_ov12_0213dd90 diff --git a/asm/ov14/Actor/ActorRupee.inc b/asm/ov14/Actor/ActorRupee.inc index 809631b5..3d481870 100644 --- a/asm/ov14/Actor/ActorRupee.inc +++ b/asm/ov14/Actor/ActorRupee.inc @@ -50,7 +50,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov14/Actor/ActorRupee.s b/asm/ov14/Actor/ActorRupee.s index b8548347..1e6f6640 100644 --- a/asm/ov14/Actor/ActorRupee.s +++ b/asm/ov14/Actor/ActorRupee.s @@ -740,7 +740,7 @@ func_ov14_0215517c: ; 0x0215517c ldr r1, _021551c0 ; =0x52555059 ldr r2, _021551c4 ; =_ZN10ActorRupee6CreateEv mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021551bc ; =_ZN10ActorRupee5gTypeE ldr r1, _021551c8 ; =_ZN9ActorTypeD1Ev ldr r2, _021551cc ; =_ZN10ActorRupee9gResourceE diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index f23b93a8..bede5bb4 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -133,7 +133,7 @@ .extern _ZN5Actor9IsGrabbedEv .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 21002b8b..688ccc95 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -34411,7 +34411,7 @@ func_ov14_021541ec: ; 0x021541ec ldr r1, _02154238 ; =0x41525257 ldr r2, _0215423c ; =func_ov14_0211fd50 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154234 ; =data_ov14_0215abcc ldr r1, _02154240 ; =_ZN9ActorTypeD1Ev ldr r2, _02154244 ; =data_ov14_0215abc0 @@ -34443,7 +34443,7 @@ func_ov14_02154254: ; 0x02154254 ldr r1, _02154284 ; =0x424c5354 ldr r2, _02154288 ; =func_ov14_021213dc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154280 ; =data_ov14_0215ac08 ldr r1, _0215428c ; =_ZN9ActorTypeD1Ev ldr r2, _02154290 ; =data_ov14_0215abfc @@ -34465,7 +34465,7 @@ func_ov14_02154294: ; 0x02154294 ldr r1, _021542d8 ; =0x424f4d42 ldr r2, _021542dc ; =func_ov14_02121aa4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021542d4 ; =data_ov14_0215ac28 ldr r1, _021542e0 ; =_ZN9ActorTypeD1Ev ldr r2, _021542e4 ; =data_ov14_0215ac1c @@ -34495,7 +34495,7 @@ func_ov14_021542f4: ; 0x021542f4 ldr r1, _02154324 ; =0x424d524e ldr r2, _02154328 ; =func_ov14_02123078 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154320 ; =data_ov14_0215ac68 ldr r1, _0215432c ; =_ZN9ActorTypeD1Ev ldr r2, _02154330 ; =data_ov14_0215ac5c @@ -34517,7 +34517,7 @@ func_ov14_02154334: ; 0x02154334 ldr r1, _02154364 ; =0x524f5045 ldr r2, _02154368 ; =func_ov14_021237fc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154360 ; =data_ov14_0215ac88 ldr r1, _0215436c ; =_ZN9ActorTypeD1Ev ldr r2, _02154370 ; =data_ov14_0215ac7c @@ -34539,7 +34539,7 @@ func_ov14_02154374: ; 0x02154374 ldr r1, _021543d4 ; =0x424d5459 ldr r2, _021543d8 ; =func_ov14_02124004 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021543d0 ; =data_ov14_0215aca8 ldr r1, _021543dc ; =_ZN9ActorTypeD1Ev ldr r2, _021543e0 ; =data_ov14_0215ac9c @@ -35301,7 +35301,7 @@ func_ov14_02154c14: ; 0x02154c14 ldr r1, _02154cd4 ; =0x464c424d ldr r2, _02154cd8 ; =func_ov14_02134e24 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154cd0 ; =data_ov14_0215afa0 ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev ldr r2, _02154ce0 ; =data_ov14_0215af94 @@ -35310,7 +35310,7 @@ func_ov14_02154c14: ; 0x02154c14 ldr r1, _02154ce8 ; =0x464c4254 ldr r2, _02154cec ; =func_ov14_02134e54 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154ce4 ; =data_ov14_0215afc0 ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev ldr r2, _02154cf0 ; =data_ov14_0215afb4 @@ -35319,7 +35319,7 @@ func_ov14_02154c14: ; 0x02154c14 ldr r1, _02154cf8 ; =0x464c414c ldr r2, _02154cfc ; =func_ov14_02134e84 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154cf4 ; =data_ov14_0215afe0 ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev ldr r2, _02154d00 ; =data_ov14_0215afd4 @@ -35328,7 +35328,7 @@ func_ov14_02154c14: ; 0x02154c14 ldr r1, _02154d08 ; =0x464c544d ldr r2, _02154d0c ; =func_ov14_02134eb4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154d04 ; =data_ov14_0215b000 ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev ldr r2, _02154d10 ; =data_ov14_0215aff4 @@ -35337,7 +35337,7 @@ func_ov14_02154c14: ; 0x02154c14 ldr r1, _02154d18 ; =0x4c53544d ldr r2, _02154d1c ; =func_ov14_02134ee4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154d14 ; =data_ov14_0215b020 ldr r1, _02154cdc ; =_ZN9ActorTypeD1Ev ldr r2, _02154d20 ; =data_ov14_0215b014 @@ -35375,7 +35375,7 @@ func_ov14_02154d24: ; 0x02154d24 ldr r1, _02154e9c ; =0x5053424c ldr r2, _02154ea0 ; =func_ov14_02135940 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154e98 ; =data_ov14_0215b040 ldr r1, _02154ea4 ; =_ZN9ActorTypeD1Ev ldr r2, _02154ea8 ; =data_ov14_0215b034 @@ -35499,7 +35499,7 @@ func_ov14_02154efc: ; 0x02154efc ldr r1, _02154f2c ; =0x57424c4b ldr r2, _02154f30 ; =func_ov14_021368c8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154f28 ; =data_ov14_0215b0c0 ldr r1, _02154f34 ; =_ZN9ActorTypeD1Ev ldr r2, _02154f38 ; =data_ov14_0215b0b4 @@ -35521,7 +35521,7 @@ func_ov14_02154f3c: ; 0x02154f3c ldr r1, _02154f6c ; =0x44475447 ldr r2, _02154f70 ; =func_ov14_02138298 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154f68 ; =data_ov14_0215b0e0 ldr r1, _02154f74 ; =_ZN9ActorTypeD1Ev ldr r2, _02154f78 ; =data_ov14_0215b0d4 @@ -35543,7 +35543,7 @@ func_ov14_02154f7c: ; 0x02154f7c ldr r1, _02154fac ; =0x54415255 ldr r2, _02154fb0 ; =func_ov14_02138e10 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154fa8 ; =data_ov14_0215b100 ldr r1, _02154fb4 ; =_ZN9ActorTypeD1Ev ldr r2, _02154fb8 ; =data_ov14_0215b0f4 @@ -35565,7 +35565,7 @@ func_ov14_02154fbc: ; 0x02154fbc ldr r1, _02154fec ; =0x53544e45 ldr r2, _02154ff0 ; =func_ov14_021390f0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02154fe8 ; =data_ov14_0215b120 ldr r1, _02154ff4 ; =_ZN9ActorTypeD1Ev ldr r2, _02154ff8 ; =data_ov14_0215b114 @@ -35587,7 +35587,7 @@ func_ov14_02154ffc: ; 0x02154ffc ldr r1, _0215502c ; =0x54535542 ldr r2, _02155030 ; =func_ov14_02139380 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155028 ; =data_ov14_0215b140 ldr r1, _02155034 ; =_ZN9ActorTypeD1Ev ldr r2, _02155038 ; =data_ov14_0215b134 @@ -35609,7 +35609,7 @@ func_ov14_0215503c: ; 0x0215503c ldr r1, _0215506c ; =0x54534248 ldr r2, _02155070 ; =func_ov14_0213979c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155068 ; =data_ov14_0215b160 ldr r1, _02155074 ; =_ZN9ActorTypeD1Ev ldr r2, _02155078 ; =data_ov14_0215b154 @@ -35631,7 +35631,7 @@ func_ov14_0215507c: ; 0x0215507c ldr r1, _021550ac ; =0x454e4745 ldr r2, _021550b0 ; =func_ov14_02139904 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021550a8 ; =data_ov14_0215b180 ldr r1, _021550b4 ; =_ZN9ActorTypeD1Ev ldr r2, _021550b8 ; =data_ov14_0215b174 @@ -35653,7 +35653,7 @@ func_ov14_021550bc: ; 0x021550bc ldr r1, _021550ec ; =0x49544745 ldr r2, _021550f0 ; =func_ov14_02139e54 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021550e8 ; =data_ov14_0215b1a0 ldr r1, _021550f4 ; =_ZN9ActorTypeD1Ev ldr r2, _021550f8 ; =data_ov14_0215b194 @@ -35675,7 +35675,7 @@ func_ov14_021550fc: ; 0x021550fc ldr r1, _0215512c ; =0x48415254 ldr r2, _02155130 ; =func_ov14_0213a2a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155128 ; =data_ov14_0215b1c0 ldr r1, _02155134 ; =_ZN9ActorTypeD1Ev ldr r2, _02155138 ; =data_ov14_0215b1b4 @@ -35697,7 +35697,7 @@ func_ov14_0215513c: ; 0x0215513c ldr r1, _0215516c ; =0x544d4150 ldr r2, _02155170 ; =func_ov14_0213a99c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155168 ; =data_ov14_0215b1e0 ldr r1, _02155174 ; =_ZN9ActorTypeD1Ev ldr r2, _02155178 ; =data_ov14_0215b1d4 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index eaf3fe77..c8fbd2eb 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -127,7 +127,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index c98d4af6..5bd9fec2 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -32155,7 +32155,7 @@ func_ov14_021551d8: ; 0x021551d8 ldr r1, _02155208 ; =0x4452554d ldr r2, _0215520c ; =func_ov14_0213b9a8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155204 ; =data_ov14_0215b220 ldr r1, _02155210 ; =_ZN9ActorTypeD1Ev ldr r2, _02155214 ; =data_ov14_0215b214 @@ -32272,7 +32272,7 @@ func_ov14_0215531c: ; 0x0215531c ldr r1, _02155374 ; =0x5342454d ldr r2, _02155378 ; =func_ov14_02146198 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155370 ; =data_ov14_0215b28c ldr r1, _0215537c ; =_ZN9ActorTypeD1Ev ldr r2, _02155380 ; =data_ov14_0215b280 @@ -32334,7 +32334,7 @@ func_ov14_021553e4: ; 0x021553e4 ldr r1, _02155414 ; =0x524d5447 ldr r2, _02155418 ; =func_ov14_02148698 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155410 ; =data_ov14_0215b2d0 ldr r1, _0215541c ; =_ZN9ActorTypeD1Ev ldr r2, _02155420 ; =data_ov14_0215b2c4 @@ -32376,7 +32376,7 @@ func_ov14_0215545c: ; 0x0215545c ldr r1, _021554b0 ; =0x4e434d41 ldr r2, _021554b4 ; =func_ov14_0214ab30 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021554ac ; =data_ov14_0215b304 ldr r1, _021554b8 ; =_ZN9ActorTypeD1Ev ldr r2, _021554bc ; =data_ov14_0215b2f8 @@ -32385,7 +32385,7 @@ func_ov14_0215545c: ; 0x0215545c ldr r1, _021554c4 ; =0x4e434d32 ldr r2, _021554c8 ; =func_ov14_0214ab60 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021554c0 ; =data_ov14_0215b324 ldr r1, _021554b8 ; =_ZN9ActorTypeD1Ev ldr r2, _021554cc ; =data_ov14_0215b318 @@ -32411,7 +32411,7 @@ func_ov14_021554d0: ; 0x021554d0 ldr r1, _02155500 ; =0x564f4341 ldr r2, _02155504 ; =func_ov14_0214bed8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021554fc ; =data_ov14_0215b344 ldr r1, _02155508 ; =_ZN9ActorTypeD1Ev ldr r2, _0215550c ; =data_ov14_0215b338 @@ -32453,7 +32453,7 @@ func_ov14_02155548: ; 0x02155548 ldr r1, _02155578 ; =0x45564152 ldr r2, _0215557c ; =func_ov14_0214c9c0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155574 ; =data_ov14_0215b378 ldr r1, _02155580 ; =_ZN9ActorTypeD1Ev ldr r2, _02155584 ; =data_ov14_0215b36c @@ -32600,7 +32600,7 @@ func_ov14_021556ec: ; 0x021556ec ldr r1, _0215571c ; =0x41544152 ldr r2, _02155720 ; =func_ov14_0214fa74 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02155718 ; =data_ov14_0215b410 ldr r1, _02155724 ; =_ZN9ActorTypeD1Ev ldr r2, _02155728 ; =data_ov14_0215b404 @@ -32662,7 +32662,7 @@ func_ov14_0215579c: ; 0x0215579c ldr r1, _021557cc ; =0x42524d54 ldr r2, _021557d0 ; =func_ov14_0215130c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021557c8 ; =data_ov14_0215b458 ldr r1, _021557d4 ; =_ZN9ActorTypeD1Ev ldr r2, _021557d8 ; =data_ov14_0215b44c diff --git a/asm/ov15.inc b/asm/ov15.inc index 769579e3..81e39202 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -166,7 +166,7 @@ .extern _ZN7MapBase8vfunc_c0Ev .extern _ZN7MapBase9SetBoundsEii .extern _ZN7MapBaseD1Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov15.s b/asm/ov15.s index 305cfb66..45b0076b 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -124990,7 +124990,7 @@ func_ov15_02187408: ; 0x02187408 ldr r1, _02187438 ; =0x534e4745 ldr r2, _0218743c ; =func_ov15_02121a94 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187434 ; =data_ov15_0218ec64 ldr r1, _02187440 ; =_ZN9ActorTypeD1Ev ldr r2, _02187444 ; =data_ov15_0218ec58 @@ -125012,7 +125012,7 @@ func_ov15_02187448: ; 0x02187448 ldr r1, _02187478 ; =0x534e4741 ldr r2, _0218747c ; =func_ov15_021220b4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187474 ; =data_ov15_0218ec84 ldr r1, _02187480 ; =_ZN9ActorTypeD1Ev ldr r2, _02187484 ; =data_ov15_0218ec78 @@ -125034,7 +125034,7 @@ func_ov15_02187488: ; 0x02187488 ldr r1, _021874b8 ; =0x53454f43 ldr r2, _021874bc ; =func_ov15_02123bec mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021874b4 ; =data_ov15_0218eca8 ldr r1, _021874c0 ; =_ZN9ActorTypeD1Ev ldr r2, _021874c4 ; =data_ov15_0218ec9c @@ -125056,7 +125056,7 @@ func_ov15_021874c8: ; 0x021874c8 ldr r1, _0218752c ; =0x53454b45 ldr r2, _02187530 ; =func_ov15_02125388 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187528 ; =data_ov15_0218ecc8 ldr r1, _02187534 ; =_ZN9ActorTypeD1Ev ldr r2, _02187538 ; =data_ov15_0218ecbc @@ -125385,7 +125385,7 @@ func_ov15_02187884: ; 0x02187884 ldr r1, _021878d8 ; =0x50534950 ldr r2, _021878dc ; =func_ov15_0212c734 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021878d4 ; =data_ov15_0218ee24 ldr r1, _021878e0 ; =_ZN9ActorTypeD1Ev ldr r2, _021878e4 ; =data_ov15_0218ee18 @@ -125420,7 +125420,7 @@ func_ov15_021878f8: ; 0x021878f8 ldr r1, _02187928 ; =0x47534950 ldr r2, _0218792c ; =func_ov15_0212f398 ldr r3, _02187930 ; =func_ov15_0212f36c - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187924 ; =data_ov15_0218ee44 ldr r1, _02187934 ; =_ZN9ActorTypeD1Ev ldr r2, _02187938 ; =data_ov15_0218ee38 @@ -125443,7 +125443,7 @@ func_ov15_0218793c: ; 0x0218793c ldr r1, _02187978 ; =0x53544e44 ldr r2, _0218797c ; =func_ov15_0213296c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187974 ; =data_ov15_0218ee64 ldr r1, _02187980 ; =_ZN9ActorTypeD1Ev ldr r2, _02187984 ; =data_ov15_0218ee58 @@ -125469,7 +125469,7 @@ func_ov15_0218798c: ; 0x0218798c ldr r1, _021879bc ; =0x434e424c ldr r2, _021879c0 ; =func_ov15_02134040 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021879b8 ; =data_ov15_0218ee84 ldr r1, _021879c4 ; =_ZN9ActorTypeD1Ev ldr r2, _021879c8 ; =data_ov15_0218ee78 @@ -125530,7 +125530,7 @@ func_ov15_02187a38: ; 0x02187a38 ldr r1, _02187a68 ; =0x53504b4e ldr r2, _02187a6c ; =func_ov15_0213a634 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187a64 ; =data_ov15_0218eee8 ldr r1, _02187a70 ; =_ZN9ActorTypeD1Ev ldr r2, _02187a74 ; =data_ov15_0218eedc @@ -125552,7 +125552,7 @@ func_ov15_02187a78: ; 0x02187a78 ldr r1, _02187aa8 ; =0x4b4d4d45 ldr r2, _02187aac ; =func_ov15_0213b2dc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187aa4 ; =data_ov15_0218ef08 ldr r1, _02187ab0 ; =_ZN9ActorTypeD1Ev ldr r2, _02187ab4 ; =data_ov15_0218eefc @@ -125575,7 +125575,7 @@ func_ov15_02187ab8: ; 0x02187ab8 ldr r1, _02187b1c ; =0x53504b4c ldr r2, _02187b20 ; =func_ov15_0213e400 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187b18 ; =data_ov15_0218ef2c ldr r1, _02187b24 ; =_ZN9ActorTypeD1Ev ldr r2, _02187b28 ; =data_ov15_0218ef20 @@ -125614,7 +125614,7 @@ func_ov15_02187b40: ; 0x02187b40 ldr r1, _02187b70 ; =0x53504b48 ldr r2, _02187b74 ; =func_ov15_02141064 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187b6c ; =data_ov15_0218ef58 ldr r1, _02187b78 ; =_ZN9ActorTypeD1Ev ldr r2, _02187b7c ; =data_ov15_0218ef4c @@ -125671,7 +125671,7 @@ func_ov15_02187bf4: ; 0x02187bf4 ldr r1, _02187c24 ; =0x46534152 ldr r2, _02187c28 ; =func_ov15_02145ea0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187c20 ; =data_ov15_0218efe8 ldr r1, _02187c2c ; =_ZN9ActorTypeD1Ev ldr r2, _02187c30 ; =data_ov15_0218efdc @@ -125693,7 +125693,7 @@ func_ov15_02187c34: ; 0x02187c34 ldr r1, _02187c64 ; =0x534c4152 ldr r2, _02187c68 ; =func_ov15_02146010 ldr r3, _02187c6c ; =func_ov15_02145fe0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187c60 ; =data_ov15_0218f40c ldr r1, _02187c70 ; =_ZN9ActorTypeD1Ev ldr r2, _02187c74 ; =data_ov15_0218f400 @@ -125716,7 +125716,7 @@ func_ov15_02187c78: ; 0x02187c78 ldr r1, _02187cf0 ; =0x534c5452 ldr r2, _02187cf4 ; =func_ov15_02146614 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187cec ; =data_ov15_0218f4fc ldr r1, _02187cf8 ; =_ZN9ActorTypeD1Ev ldr r2, _02187cfc ; =data_ov15_0218f4f0 @@ -125784,7 +125784,7 @@ func_ov15_02187d58: ; 0x02187d58 ldr r1, _02187d88 ; =0x534c4653 ldr r2, _02187d8c ; =func_ov15_02146f4c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187d84 ; =data_ov15_0218f548 ldr r1, _02187d90 ; =_ZN9ActorTypeD1Ev ldr r2, _02187d94 ; =data_ov15_0218f53c @@ -125932,7 +125932,7 @@ func_ov15_02187f48: ; 0x02187f48 ldr r1, _02187f78 ; =0x53525059 ldr r2, _02187f7c ; =func_ov15_0214d258 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187f74 ; =data_ov15_0218f5f8 ldr r1, _02187f80 ; =_ZN9ActorTypeD1Ev ldr r2, _02187f84 ; =data_ov15_0218f5ec @@ -125954,7 +125954,7 @@ func_ov15_02187f88: ; 0x02187f88 ldr r1, _02187fb8 ; =0x53485254 ldr r2, _02187fbc ; =func_ov15_0214d518 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187fb4 ; =data_ov15_0218f618 ldr r1, _02187fc0 ; =_ZN9ActorTypeD1Ev ldr r2, _02187fc4 ; =data_ov15_0218f60c @@ -125976,7 +125976,7 @@ func_ov15_02187fc8: ; 0x02187fc8 ldr r1, _02187ff8 ; =0x43424c53 ldr r2, _02187ffc ; =func_ov15_0214d754 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02187ff4 ; =data_ov15_0218f638 ldr r1, _02188000 ; =_ZN9ActorTypeD1Ev ldr r2, _02188004 ; =data_ov15_0218f62c @@ -126035,7 +126035,7 @@ func_ov15_02188084: ; 0x02188084 ldr r1, _021880b4 ; =0x47534d47 ldr r2, _021880b8 ; =func_ov15_0214ee58 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021880b0 ; =data_ov15_0218f674 ldr r1, _021880bc ; =_ZN9ActorTypeD1Ev ldr r2, _021880c0 ; =data_ov15_0218f668 @@ -126057,7 +126057,7 @@ func_ov15_021880c4: ; 0x021880c4 ldr r1, _021880f4 ; =0x54534950 ldr r2, _021880f8 ; =func_ov15_0214ffc8 ldr r3, _021880fc ; =func_ov15_0214ff48 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021880f0 ; =data_ov15_0218f694 ldr r1, _02188100 ; =_ZN9ActorTypeD1Ev ldr r2, _02188104 ; =data_ov15_0218f688 @@ -126080,7 +126080,7 @@ func_ov15_02188108: ; 0x02188108 ldr r1, _02188138 ; =0x4b4d4741 ldr r2, _0218813c ; =func_ov15_02151720 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188134 ; =data_ov15_0218f6b4 ldr r1, _02188140 ; =_ZN9ActorTypeD1Ev ldr r2, _02188144 ; =data_ov15_0218f6a8 @@ -126102,7 +126102,7 @@ func_ov15_02188148: ; 0x02188148 ldr r1, _021881b4 ; =0x42554949 ldr r2, _021881b8 ; =func_ov15_02155680 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021881b0 ; =data_ov15_0218f6e0 ldr r1, _021881bc ; =_ZN9ActorTypeD1Ev ldr r2, _021881c0 ; =data_ov15_0218f6d4 @@ -126144,7 +126144,7 @@ func_ov15_021881d8: ; 0x021881d8 ldr r1, _02188248 ; =0x53524f50 ldr r2, _0218824c ; =func_ov15_02157610 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188244 ; =data_ov15_0218f70c ldr r1, _02188250 ; =_ZN9ActorTypeD1Ev ldr r2, _02188254 ; =data_ov15_0218f700 @@ -126188,7 +126188,7 @@ func_ov15_02188270: ; 0x02188270 ldr r1, _021882a0 ; =0x47594d47 ldr r2, _021882a4 ; =func_ov15_02157d10 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218829c ; =data_ov15_0218f738 ldr r1, _021882a8 ; =_ZN9ActorTypeD1Ev ldr r2, _021882ac ; =data_ov15_0218f72c @@ -126210,7 +126210,7 @@ func_ov15_021882b0: ; 0x021882b0 ldr r1, _021882f0 ; =0x47595247 ldr r2, _021882f4 ; =func_ov15_02158574 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021882ec ; =data_ov15_0218f758 ldr r1, _021882f8 ; =_ZN9ActorTypeD1Ev ldr r2, _021882fc ; =data_ov15_0218f74c @@ -126237,7 +126237,7 @@ func_ov15_02188304: ; 0x02188304 ldr r1, _02188348 ; =0x4647474e ldr r2, _0218834c ; =func_ov15_0215a318 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188344 ; =data_ov15_0218f778 ldr r1, _02188350 ; =_ZN9ActorTypeD1Ev ldr r2, _02188354 ; =data_ov15_0218f76c @@ -126265,7 +126265,7 @@ func_ov15_0218835c: ; 0x0218835c ldr r1, _0218838c ; =0x43435447 ldr r2, _02188390 ; =func_ov15_0215bb3c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188388 ; =data_ov15_0218f798 ldr r1, _02188394 ; =_ZN9ActorTypeD1Ev ldr r2, _02188398 ; =data_ov15_0218f78c @@ -126367,7 +126367,7 @@ func_ov15_0218847c: ; 0x0218847c ldr r1, _021884d4 ; =0x47464953 ldr r2, _021884d8 ; =func_ov15_0215d708 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021884d0 ; =data_ov15_0218f808 ldr r1, _021884dc ; =_ZN9ActorTypeD1Ev ldr r2, _021884e0 ; =data_ov15_0218f7fc @@ -126403,7 +126403,7 @@ func_ov15_021884f4: ; 0x021884f4 ldr r1, _02188524 ; =0x46474d47 ldr r2, _02188528 ; =func_ov15_02160448 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188520 ; =data_ov15_0218f868 ldr r1, _0218852c ; =_ZN9ActorTypeD1Ev ldr r2, _02188530 ; =data_ov15_0218f85c @@ -126425,7 +126425,7 @@ func_ov15_02188534: ; 0x02188534 ldr r1, _02188564 ; =0x444e5043 ldr r2, _02188568 ; =func_ov15_021605d0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188560 ; =data_ov15_0218f888 ldr r1, _0218856c ; =_ZN9ActorTypeD1Ev ldr r2, _02188570 ; =data_ov15_0218f87c @@ -126447,7 +126447,7 @@ func_ov15_02188574: ; 0x02188574 ldr r1, _021885a4 ; =0x504c5350 ldr r2, _021885a8 ; =func_ov15_0216196c ldr r3, _021885ac ; =func_ov15_02161920 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021885a0 ; =data_ov15_0218f8a8 ldr r1, _021885b0 ; =_ZN9ActorTypeD1Ev ldr r2, _021885b4 ; =data_ov15_0218f89c @@ -126470,7 +126470,7 @@ func_ov15_021885b8: ; 0x021885b8 ldr r1, _021885e8 ; =0x544f5044 ldr r2, _021885ec ; =func_ov15_02165fc8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021885e4 ; =data_ov15_0218f8dc ldr r1, _021885f0 ; =_ZN9ActorTypeD1Ev ldr r2, _021885f4 ; =data_ov15_0218f8d0 @@ -126532,7 +126532,7 @@ func_ov15_02188668: ; 0x02188668 ldr r1, _02188698 ; =0x424a4653 ldr r2, _0218869c ; =func_ov15_02166ad4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188694 ; =data_ov15_0218f924 ldr r1, _021886a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021886a4 ; =data_ov15_0218f918 @@ -126554,7 +126554,7 @@ func_ov15_021886a8: ; 0x021886a8 ldr r1, _021886fc ; =0x464c5052 ldr r2, _02188700 ; =func_ov15_0216771c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021886f8 ; =data_ov15_0218f944 ldr r1, _02188704 ; =_ZN9ActorTypeD1Ev ldr r2, _02188708 ; =data_ov15_0218f938 @@ -126588,7 +126588,7 @@ func_ov15_02188718: ; 0x02188718 ldr r1, _02188748 ; =0x49434247 ldr r2, _0218874c ; =func_ov15_0216901c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188744 ; =data_ov15_0218f964 ldr r1, _02188750 ; =_ZN9ActorTypeD1Ev ldr r2, _02188754 ; =data_ov15_0218f958 @@ -126610,7 +126610,7 @@ func_ov15_02188758: ; 0x02188758 ldr r1, _021887ac ; =0x534d5453 ldr r2, _021887b0 ; =func_ov15_0216abe8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021887a8 ; =data_ov15_0218f984 ldr r1, _021887b4 ; =_ZN9ActorTypeD1Ev ldr r2, _021887b8 ; =data_ov15_0218f978 @@ -126619,7 +126619,7 @@ func_ov15_02188758: ; 0x02188758 ldr r1, _021887c0 ; =0x534d544c ldr r2, _021887c4 ; =func_ov15_0216ac18 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021887bc ; =data_ov15_0218f9a4 ldr r1, _021887b4 ; =_ZN9ActorTypeD1Ev ldr r2, _021887c8 ; =data_ov15_0218f998 @@ -126645,7 +126645,7 @@ func_ov15_021887cc: ; 0x021887cc ldr r1, _02188844 ; =0x534c4f43 ldr r2, _02188848 ; =func_ov15_0216be78 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188840 ; =data_ov15_0218f9c4 ldr r1, _0218884c ; =_ZN9ActorTypeD1Ev ldr r2, _02188850 ; =data_ov15_0218f9b8 @@ -126694,7 +126694,7 @@ func_ov15_02188878: ; 0x02188878 ldr r1, _021888a8 ; =0x534e4156 ldr r2, _021888ac ; =func_ov15_0216ee14 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021888a4 ; =data_ov15_0218fadc ldr r1, _021888b0 ; =_ZN9ActorTypeD1Ev ldr r2, _021888b4 ; =data_ov15_0218fad0 @@ -126716,7 +126716,7 @@ func_ov15_021888b8: ; 0x021888b8 ldr r1, _021888e8 ; =0x53424f53 ldr r2, _021888ec ; =func_ov15_0216f470 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021888e4 ; =data_ov15_0218fafc ldr r1, _021888f0 ; =_ZN9ActorTypeD1Ev ldr r2, _021888f4 ; =data_ov15_0218faf0 @@ -126738,7 +126738,7 @@ func_ov15_021888f8: ; 0x021888f8 ldr r1, _02188928 ; =0x53424559 ldr r2, _0218892c ; =func_ov15_02173738 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188924 ; =data_ov15_0218fb1c ldr r1, _02188930 ; =_ZN9ActorTypeD1Ev ldr r2, _02188934 ; =data_ov15_0218fb10 @@ -126760,7 +126760,7 @@ func_ov15_02188938: ; 0x02188938 ldr r1, _02188968 ; =0x534c5444 ldr r2, _0218896c ; =func_ov15_02174060 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188964 ; =data_ov15_0218fb3c ldr r1, _02188970 ; =_ZN9ActorTypeD1Ev ldr r2, _02188974 ; =data_ov15_0218fb30 @@ -126782,7 +126782,7 @@ func_ov15_02188978: ; 0x02188978 ldr r1, _02188a1c ; =0x534c5250 ldr r2, _02188a20 ; =func_ov15_021742ac mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188a18 ; =data_ov15_0218fb5c ldr r1, _02188a24 ; =_ZN9ActorTypeD1Ev ldr r2, _02188a28 ; =data_ov15_0218fb50 @@ -126843,7 +126843,7 @@ func_ov15_02188a54: ; 0x02188a54 ldr r1, _02188b14 ; =0x474f4332 ldr r2, _02188b18 ; =func_ov15_021773a8 ldr r3, _02188b1c ; =func_ov15_02177330 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188b10 ; =data_ov15_021902a0 ldr r1, _02188b20 ; =_ZN9ActorTypeD1Ev ldr r2, _02188b24 ; =data_ov15_02190294 @@ -126914,7 +126914,7 @@ func_ov15_02188b58: ; 0x02188b58 ldr r1, _02188df0 ; =0x474f3245 ldr r2, _02188df4 ; =func_ov15_0217ab9c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188dec ; =data_ov15_021902e4 ldr r1, _02188df8 ; =_ZN9ActorTypeD1Ev ldr r2, _02188dfc ; =data_ov15_021902d8 @@ -127138,7 +127138,7 @@ func_ov15_02188ec0: ; 0x02188ec0 ldr r1, _02188ef0 ; =0x474f3242 ldr r2, _02188ef4 ; =func_ov15_0217c02c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188eec ; =data_ov15_021903b8 ldr r1, _02188ef8 ; =_ZN9ActorTypeD1Ev ldr r2, _02188efc ; =data_ov15_021903ac @@ -127160,7 +127160,7 @@ func_ov15_02188f00: ; 0x02188f00 ldr r1, _02188f30 ; =0x534c5243 ldr r2, _02188f34 ; =func_ov15_0217d690 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188f2c ; =data_ov15_021903d8 ldr r1, _02188f38 ; =_ZN9ActorTypeD1Ev ldr r2, _02188f3c ; =data_ov15_021903cc @@ -127182,7 +127182,7 @@ func_ov15_02188f40: ; 0x02188f40 ldr r1, _02188f70 ; =0x534c5347 ldr r2, _02188f74 ; =func_ov15_0217db44 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188f6c ; =data_ov15_021903f8 ldr r1, _02188f78 ; =_ZN9ActorTypeD1Ev ldr r2, _02188f7c ; =data_ov15_021903ec @@ -127369,7 +127369,7 @@ func_ov15_021891fc: ; 0x021891fc ldr r1, _02189240 ; =0x4852434e ldr r2, _02189244 ; =func_ov15_0217f800 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218923c ; =data_ov15_02190424 ldr r1, _02189248 ; =_ZN9ActorTypeD1Ev ldr r2, _0218924c ; =data_ov15_02190418 @@ -127399,7 +127399,7 @@ func_ov15_0218925c: ; 0x0218925c ldr r1, _0218928c ; =0x4653524c ldr r2, _02189290 ; =func_ov15_02183b94 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02189288 ; =data_ov15_02190444 ldr r1, _02189294 ; =_ZN9ActorTypeD1Ev ldr r2, _02189298 ; =data_ov15_02190438 diff --git a/asm/ov17.inc b/asm/ov17.inc index c8e656d3..47aec804 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -186,7 +186,7 @@ .extern func_020349cc .extern func_02034bc8 .extern func_02034cc4 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0203eba8 .extern func_0203ebc8 diff --git a/asm/ov17.s b/asm/ov17.s index cb50764d..847f2202 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -20258,7 +20258,7 @@ func_ov17_0216b378: ; 0x0216b378 ldr r1, _0216b3a8 ; =0x424b4559 ldr r2, _0216b3ac ; =func_ov17_0215cef4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216b3a4 ; =data_ov17_0216ceec ldr r1, _0216b3b0 ; =_ZN9ActorTypeD1Ev ldr r2, _0216b3b4 ; =data_ov17_0216cee0 @@ -20280,7 +20280,7 @@ func_ov17_0216b3b8: ; 0x0216b3b8 ldr r1, _0216b3e8 ; =0x464f5243 ldr r2, _0216b3ec ; =func_ov17_0215e1c0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216b3e4 ; =data_ov17_0216cf0c ldr r1, _0216b3f0 ; =_ZN9ActorTypeD1Ev ldr r2, _0216b3f4 ; =data_ov17_0216cf00 @@ -20302,7 +20302,7 @@ func_ov17_0216b3f8: ; 0x0216b3f8 ldr r1, _0216b428 ; =0x43525953 ldr r2, _0216b42c ; =func_ov17_0215f068 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216b424 ; =data_ov17_0216cf2c ldr r1, _0216b430 ; =_ZN9ActorTypeD1Ev ldr r2, _0216b434 ; =data_ov17_0216cf20 @@ -20340,7 +20340,7 @@ func_ov17_0216b460: ; 0x0216b460 ldr r1, _0216b490 ; =0x4e4b4559 ldr r2, _0216b494 ; =func_ov17_02160730 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216b48c ; =data_ov17_0216cf4c ldr r1, _0216b498 ; =_ZN9ActorTypeD1Ev ldr r2, _0216b49c ; =data_ov17_0216cf40 @@ -20592,7 +20592,7 @@ func_ov17_0216b748: ; 0x0216b748 ldr r1, _0216b778 ; =0x5750484c ldr r2, _0216b77c ; =func_ov17_02165404 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216b774 ; =data_ov17_0216d044 ldr r1, _0216b780 ; =_ZN9ActorTypeD1Ev ldr r2, _0216b784 ; =data_ov17_0216d038 @@ -20614,7 +20614,7 @@ func_ov17_0216b788: ; 0x0216b788 ldr r1, _0216b7b8 ; =0x52464c52 ldr r2, _0216b7bc ; =func_ov17_02166420 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216b7b4 ; =data_ov17_0216d064 ldr r1, _0216b7c0 ; =_ZN9ActorTypeD1Ev ldr r2, _0216b7c4 ; =data_ov17_0216d058 diff --git a/asm/ov18.inc b/asm/ov18.inc index dbc0595e..1d228df3 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -203,7 +203,7 @@ .extern func_0203d1b4 .extern func_0203d7e0 .extern func_0203e2e8 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0203eba8 .extern func_0203ebc8 diff --git a/asm/ov18.s b/asm/ov18.s index b6f5cf06..17931538 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -20171,7 +20171,7 @@ func_ov18_0216b780: ; 0x0216b780 ldr r1, _0216b870 ; =0x414e4353 ldr r2, _0216b874 ; =func_ov18_0215cf60 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216b86c ; =data_ov18_0216d44c ldr r1, _0216b878 ; =_ZN9ActorTypeD1Ev ldr r2, _0216b87c ; =data_ov18_0216d440 @@ -20748,7 +20748,7 @@ func_ov18_0216bed4: ; 0x0216bed4 ldr r1, _0216bf04 ; =0x504f5354 ldr r2, _0216bf08 ; =func_ov18_02164bbc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216bf00 ; =data_ov18_0216d5f0 ldr r1, _0216bf0c ; =_ZN9ActorTypeD1Ev ldr r2, _0216bf10 ; =data_ov18_0216d5e4 @@ -20770,7 +20770,7 @@ func_ov18_0216bf14: ; 0x0216bf14 ldr r1, _0216bf44 ; =0x5053544d ldr r2, _0216bf48 ; =func_ov18_02165b3c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216bf40 ; =data_ov18_0216d610 ldr r1, _0216bf4c ; =_ZN9ActorTypeD1Ev ldr r2, _0216bf50 ; =data_ov18_0216d604 @@ -20812,7 +20812,7 @@ func_ov18_0216bf8c: ; 0x0216bf8c ldr r1, _0216bfe8 ; =0x43534546 ldr r2, _0216bfec ; =func_ov18_02168f84 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216bfe4 ; =data_ov18_0216d654 ldr r1, _0216bff0 ; =_ZN9ActorTypeD1Ev ldr r2, _0216bff4 ; =data_ov18_0216d648 @@ -20850,7 +20850,7 @@ func_ov18_0216c00c: ; 0x0216c00c ldr r1, _0216c03c ; =0x48534b42 ldr r2, _0216c040 ; =func_ov18_0216a0e0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0216c038 ; =data_ov18_0216d684 ldr r1, _0216c044 ; =_ZN9ActorTypeD1Ev ldr r2, _0216c048 ; =data_ov18_0216d678 diff --git a/asm/ov19.inc b/asm/ov19.inc index 7d8152e9..ccbfb469 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -97,7 +97,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov19.s b/asm/ov19.s index 627744b2..747c2556 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -10590,7 +10590,7 @@ func_ov19_02175f04: ; 0x02175f04 ldr r1, _02176000 ; =0x57425353 ldr r2, _02176004 ; =func_ov19_0216d6a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02175ffc ; =data_ov19_02176e8c ldr r1, _02176008 ; =_ZN9ActorTypeD1Ev ldr r2, _0217600c ; =data_ov19_02176e80 @@ -10666,7 +10666,7 @@ func_ov19_02176020: ; 0x02176020 ldr r1, _02176050 ; =0x57425341 ldr r2, _02176054 ; =func_ov19_02171614 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217604c ; =data_ov19_02176ebc ldr r1, _02176058 ; =_ZN9ActorTypeD1Ev ldr r2, _0217605c ; =data_ov19_02176eb0 @@ -10688,7 +10688,7 @@ func_ov19_02176060: ; 0x02176060 ldr r1, _02176090 ; =0x57425354 ldr r2, _02176094 ; =func_ov19_02171fb0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217608c ; =data_ov19_021775bc ldr r1, _02176098 ; =_ZN9ActorTypeD1Ev ldr r2, _0217609c ; =data_ov19_021775b0 @@ -10710,7 +10710,7 @@ func_ov19_021760a0: ; 0x021760a0 ldr r1, _021760d0 ; =0x574e4152 ldr r2, _021760d4 ; =func_ov19_021724b4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021760cc ; =data_ov19_021775dc ldr r1, _021760d8 ; =_ZN9ActorTypeD1Ev ldr r2, _021760dc ; =data_ov19_021775d0 @@ -10793,7 +10793,7 @@ func_ov19_02176188: ; 0x02176188 ldr r1, _02176278 ; =0x4d4c4457 ldr r2, _0217627c ; =func_ov19_02174078 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02176274 ; =data_ov19_02177638 ldr r1, _02176280 ; =_ZN9ActorTypeD1Ev ldr r2, _02176284 ; =data_ov19_0217762c @@ -10865,7 +10865,7 @@ func_ov19_02176294: ; 0x02176294 ldr r1, _021762c4 ; =0x45465357 ldr r2, _021762c8 ; =func_ov19_021756c4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021762c0 ; =data_ov19_02177664 ldr r1, _021762cc ; =_ZN9ActorTypeD1Ev ldr r2, _021762d0 ; =data_ov19_02177658 diff --git a/asm/ov20.inc b/asm/ov20.inc index 5fc86e7f..59f87e40 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -92,7 +92,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov20.s b/asm/ov20.s index 43e594fa..01a8faf2 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -12750,7 +12750,7 @@ func_ov20_02177af4: ; 0x02177af4 ldr r1, _02177bf4 ; =0x46425353 ldr r2, _02177bf8 ; =func_ov20_0216d6a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02177bf0 ; =data_ov20_0217950c ldr r1, _02177bfc ; =_ZN9ActorTypeD1Ev ldr r2, _02177c00 ; =data_ov20_02179500 @@ -12829,7 +12829,7 @@ func_ov20_02177c18: ; 0x02177c18 ldr r1, _02177d04 ; =0x46425331 ldr r2, _02177d08 ; =func_ov20_02170108 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02177d00 ; =data_ov20_02179538 ldr r1, _02177d0c ; =_ZN9ActorTypeD1Ev ldr r2, _02177d10 ; =data_ov20_0217952c @@ -12901,7 +12901,7 @@ func_ov20_02177d24: ; 0x02177d24 ldr r1, _02177d54 ; =0x46425334 ldr r2, _02177d58 ; =func_ov20_0217176c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02177d50 ; =data_ov20_02179564 ldr r1, _02177d5c ; =_ZN9ActorTypeD1Ev ldr r2, _02177d60 ; =data_ov20_02179558 @@ -12923,7 +12923,7 @@ func_ov20_02177d64: ; 0x02177d64 ldr r1, _02177d94 ; =0x564c5230 ldr r2, _02177d98 ; =func_ov20_02171c58 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02177d90 ; =data_ov20_02179584 ldr r1, _02177d9c ; =_ZN9ActorTypeD1Ev ldr r2, _02177da0 ; =data_ov20_02179578 @@ -12945,7 +12945,7 @@ func_ov20_02177da4: ; 0x02177da4 ldr r1, _02177dd4 ; =0x564c5247 ldr r2, _02177dd8 ; =func_ov20_021726dc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02177dd0 ; =data_ov20_021795a4 ldr r1, _02177ddc ; =_ZN9ActorTypeD1Ev ldr r2, _02177de0 ; =data_ov20_02179598 @@ -13043,7 +13043,7 @@ func_ov20_02177efc: ; 0x02177efc ldr r1, _02177f2c ; =0x4346544c ldr r2, _02177f30 ; =func_ov20_02173958 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02177f28 ; =data_ov20_021795e4 ldr r1, _02177f34 ; =_ZN9ActorTypeD1Ev ldr r2, _02177f38 ; =data_ov20_021795d8 @@ -13065,7 +13065,7 @@ func_ov20_02177f3c: ; 0x02177f3c ldr r1, _02177f6c ; =0x564c4352 ldr r2, _02177f70 ; =func_ov20_02174110 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02177f68 ; =data_ov20_02179604 ldr r1, _02177f74 ; =_ZN9ActorTypeD1Ev ldr r2, _02177f78 ; =data_ov20_021795f8 @@ -13088,7 +13088,7 @@ func_ov20_02177f7c: ; 0x02177f7c ldr r1, _02178084 ; =0x54454b54 ldr r2, _02178088 ; =func_ov20_02174314 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178080 ; =data_ov20_02179624 ldr r1, _0217808c ; =_ZN9ActorTypeD1Ev ldr r2, _02178090 ; =data_ov20_02179618 @@ -13188,7 +13188,7 @@ func_ov20_021780e0: ; 0x021780e0 ldr r1, _02178110 ; =0x564c4344 ldr r2, _02178114 ; =func_ov20_021758f4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217810c ; =data_ov20_02179664 ldr r1, _02178118 ; =_ZN9ActorTypeD1Ev ldr r2, _0217811c ; =data_ov20_02179658 @@ -13210,7 +13210,7 @@ func_ov20_02178120: ; 0x02178120 ldr r1, _02178150 ; =0x42524d46 ldr r2, _02178154 ; =func_ov20_02175fb8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217814c ; =data_ov20_02179684 ldr r1, _02178158 ; =_ZN9ActorTypeD1Ev ldr r2, _0217815c ; =data_ov20_02179678 @@ -13232,7 +13232,7 @@ func_ov20_02178160: ; 0x02178160 ldr r1, _02178190 ; =0x4b415349 ldr r2, _02178194 ; =func_ov20_0217611c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217818c ; =data_ov20_021796a4 ldr r1, _02178198 ; =_ZN9ActorTypeD1Ev ldr r2, _0217819c ; =data_ov20_02179698 @@ -13254,7 +13254,7 @@ func_ov20_021781a0: ; 0x021781a0 ldr r1, _021781d0 ; =0x524d4654 ldr r2, _021781d4 ; =func_ov20_02176874 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021781cc ; =data_ov20_021796c4 ldr r1, _021781d8 ; =_ZN9ActorTypeD1Ev ldr r2, _021781dc ; =data_ov20_021796b8 @@ -13276,7 +13276,7 @@ func_ov20_021781e0: ; 0x021781e0 ldr r1, _02178210 ; =0x4c415641 ldr r2, _02178214 ; =func_ov20_02176e00 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217820c ; =data_ov20_021796e4 ldr r1, _02178218 ; =_ZN9ActorTypeD1Ev ldr r2, _0217821c ; =data_ov20_021796d8 @@ -13318,7 +13318,7 @@ func_ov20_02178258: ; 0x02178258 ldr r1, _02178288 ; =0x4546574c ldr r2, _0217828c ; =func_ov20_021775d0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178284 ; =data_ov20_02179718 ldr r1, _02178290 ; =_ZN9ActorTypeD1Ev ldr r2, _02178294 ; =data_ov20_0217970c diff --git a/asm/ov21.inc b/asm/ov21.inc index 198d1eea..b117ffbb 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -62,7 +62,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov21.s b/asm/ov21.s index 0b89e000..eaf4b295 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -4476,7 +4476,7 @@ func_ov21_02170d24: ; 0x02170d24 ldr r1, _02170d54 ; =0x504c5356 ldr r2, _02170d58 ; =func_ov21_0216dae0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170d50 ; =data_ov21_02171b00 ldr r1, _02170d5c ; =_ZN9ActorTypeD1Ev ldr r2, _02170d60 ; =data_ov21_02171af4 @@ -4498,7 +4498,7 @@ func_ov21_02170d64: ; 0x02170d64 ldr r1, _02170e24 ; =0x434d4d4c ldr r2, _02170e28 ; =func_ov21_0216ece8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170e20 ; =data_ov21_02171b20 ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev ldr r2, _02170e30 ; =data_ov21_02171b14 @@ -4507,7 +4507,7 @@ func_ov21_02170d64: ; 0x02170d64 ldr r1, _02170e38 ; =0x434d4d53 ldr r2, _02170e3c ; =func_ov21_0216ed74 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170e34 ; =data_ov21_02171b40 ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev ldr r2, _02170e40 ; =data_ov21_02171b34 @@ -4516,7 +4516,7 @@ func_ov21_02170d64: ; 0x02170d64 ldr r1, _02170e48 ; =0x43434c44 ldr r2, _02170e4c ; =func_ov21_0216edf0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170e44 ; =data_ov21_02171b60 ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev ldr r2, _02170e50 ; =data_ov21_02171b54 @@ -4525,7 +4525,7 @@ func_ov21_02170d64: ; 0x02170d64 ldr r1, _02170e58 ; =0x43534f4e ldr r2, _02170e5c ; =func_ov21_0216eed8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170e54 ; =data_ov21_02171b80 ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev ldr r2, _02170e60 ; =data_ov21_02171b74 @@ -4534,7 +4534,7 @@ func_ov21_02170d64: ; 0x02170d64 ldr r1, _02170e68 ; =0x43574946 ldr r2, _02170e6c ; =func_ov21_0216ef54 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170e64 ; =data_ov21_02171ba0 ldr r1, _02170e2c ; =_ZN9ActorTypeD1Ev ldr r2, _02170e70 ; =data_ov21_02171b94 @@ -4572,7 +4572,7 @@ func_ov21_02170e74: ; 0x02170e74 ldr r1, _02170ea4 ; =0x50464c52 ldr r2, _02170ea8 ; =func_ov21_0216f100 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170ea0 ; =data_ov21_02171bc0 ldr r1, _02170eac ; =_ZN9ActorTypeD1Ev ldr r2, _02170eb0 ; =data_ov21_02171bb4 @@ -4614,7 +4614,7 @@ func_ov21_02170eec: ; 0x02170eec ldr r1, _02170f1c ; =0x5352574c ldr r2, _02170f20 ; =func_ov21_02170714 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02170f18 ; =data_ov21_02171c8c ldr r1, _02170f24 ; =_ZN9ActorTypeD1Ev ldr r2, _02170f28 ; =data_ov21_02171c80 diff --git a/asm/ov22.inc b/asm/ov22.inc index c97233e2..ec735364 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -96,7 +96,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov22.s b/asm/ov22.s index a61ee8f5..bb1eb7ee 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -14307,7 +14307,7 @@ func_ov22_021789c8: ; 0x021789c8 ldr r1, _021789f8 ; =0x424c4152 ldr r2, _021789fc ; =func_ov22_0216d6a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021789f4 ; =data_ov22_0217a40c ldr r1, _02178a00 ; =_ZN9ActorTypeD1Ev ldr r2, _02178a04 ; =data_ov22_0217a400 @@ -14370,7 +14370,7 @@ func_ov22_02178a78: ; 0x02178a78 ldr r1, _02178b30 ; =0x534e574d ldr r2, _02178b34 ; =func_ov22_0216f2d4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178b2c ; =data_ov22_0217a454 ldr r1, _02178b38 ; =_ZN9ActorTypeD1Ev ldr r2, _02178b3c ; =data_ov22_0217a448 @@ -14379,7 +14379,7 @@ func_ov22_02178a78: ; 0x02178a78 ldr r1, _02178b44 ; =0x534e4d42 ldr r2, _02178b48 ; =func_ov22_0216f308 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178b40 ; =data_ov22_0217a474 ldr r1, _02178b38 ; =_ZN9ActorTypeD1Ev ldr r2, _02178b4c ; =data_ov22_0217a468 @@ -14388,7 +14388,7 @@ func_ov22_02178a78: ; 0x02178a78 ldr r1, _02178b54 ; =0x534e4d59 ldr r2, _02178b58 ; =func_ov22_0216f33c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178b50 ; =data_ov22_0217a494 ldr r1, _02178b38 ; =_ZN9ActorTypeD1Ev ldr r2, _02178b5c ; =data_ov22_0217a488 @@ -14436,7 +14436,7 @@ func_ov22_02178b68: ; 0x02178b68 ldr r1, _02178c74 ; =0x59455449 ldr r2, _02178c78 ; =func_ov22_021713bc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178c70 ; =data_ov22_0217a4b4 ldr r1, _02178c7c ; =_ZN9ActorTypeD1Ev ldr r2, _02178c80 ; =data_ov22_0217a4a8 @@ -14517,7 +14517,7 @@ func_ov22_02178c98: ; 0x02178c98 ldr r1, _02178cc8 ; =0x48504c50 ldr r2, _02178ccc ; =func_ov22_02173758 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178cc4 ; =data_ov22_0217a4e0 ldr r1, _02178cd0 ; =_ZN9ActorTypeD1Ev ldr r2, _02178cd4 ; =data_ov22_0217a4d4 @@ -14539,7 +14539,7 @@ func_ov22_02178cd8: ; 0x02178cd8 ldr r1, _02178d08 ; =0x484c4d4b ldr r2, _02178d0c ; =func_ov22_021748a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178d04 ; =data_ov22_0217a500 ldr r1, _02178d10 ; =_ZN9ActorTypeD1Ev ldr r2, _02178d14 ; =data_ov22_0217a4f4 @@ -14561,7 +14561,7 @@ func_ov22_02178d18: ; 0x02178d18 ldr r1, _02178d48 ; =0x49434645 ldr r2, _02178d4c ; =func_ov22_02174dbc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178d44 ; =data_ov22_0217a520 ldr r1, _02178d50 ; =_ZN9ActorTypeD1Ev ldr r2, _02178d54 ; =data_ov22_0217a514 @@ -14603,7 +14603,7 @@ func_ov22_02178d90: ; 0x02178d90 ldr r1, _02178dc0 ; =0x534e4546 ldr r2, _02178dc4 ; =func_ov22_0217562c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178dbc ; =data_ov22_0217a554 ldr r1, _02178dc8 ; =_ZN9ActorTypeD1Ev ldr r2, _02178dcc ; =data_ov22_0217a548 @@ -14625,7 +14625,7 @@ func_ov22_02178dd0: ; 0x02178dd0 ldr r1, _02178e00 ; =0x42524d49 ldr r2, _02178e04 ; =func_ov22_02175a78 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178dfc ; =data_ov22_0217a578 ldr r1, _02178e08 ; =_ZN9ActorTypeD1Ev ldr r2, _02178e0c ; =data_ov22_0217a56c @@ -14688,7 +14688,7 @@ func_ov22_02178e80: ; 0x02178e80 ldr r1, _02178ef8 ; =0x54534e4d ldr r2, _02178efc ; =func_ov22_021769d4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178ef4 ; =data_ov22_0217a5c0 ldr r1, _02178f00 ; =_ZN9ActorTypeD1Ev ldr r2, _02178f04 ; =data_ov22_0217a5b4 @@ -14769,7 +14769,7 @@ func_ov22_02178f80: ; 0x02178f80 ldr r1, _02178fd4 ; =0x59455457 ldr r2, _02178fd8 ; =func_ov22_021782d8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178fd0 ; =data_ov22_0217a60c ldr r1, _02178fdc ; =_ZN9ActorTypeD1Ev ldr r2, _02178fe0 ; =data_ov22_0217a600 @@ -14778,7 +14778,7 @@ func_ov22_02178f80: ; 0x02178f80 ldr r1, _02178fe8 ; =0x59455442 ldr r2, _02178fec ; =func_ov22_02178308 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178fe4 ; =data_ov22_0217a62c ldr r1, _02178fdc ; =_ZN9ActorTypeD1Ev ldr r2, _02178ff0 ; =data_ov22_0217a620 diff --git a/asm/ov23.inc b/asm/ov23.inc index 694a2f3f..8fa3bee6 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -120,7 +120,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov23.s b/asm/ov23.s index 4e6986ee..3f6067dd 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -15208,7 +15208,7 @@ func_ov23_02179698: ; 0x02179698 str r4, [sp] str lr, [sp, #4] str lr, [ip, #0x8c] - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179798 ; =data_ov23_0217ab6c ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev ldr r2, _021797a8 ; =data_ov23_0217ab60 @@ -15217,7 +15217,7 @@ func_ov23_02179698: ; 0x02179698 ldr r1, _021797b0 ; =0x47524e57 ldr r2, _021797b4 ; =func_ov23_0216e818 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021797ac ; =data_ov23_0217ab8c ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev ldr r2, _021797b8 ; =data_ov23_0217ab80 @@ -15226,7 +15226,7 @@ func_ov23_02179698: ; 0x02179698 ldr r1, _021797c0 ; =0x47524e43 ldr r2, _021797c4 ; =func_ov23_0216e848 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021797bc ; =data_ov23_0217abac ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev ldr r2, _021797c8 ; =data_ov23_0217aba0 @@ -15235,7 +15235,7 @@ func_ov23_02179698: ; 0x02179698 ldr r1, _021797d0 ; =0x47524342 ldr r2, _021797d4 ; =func_ov23_0216e878 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021797cc ; =data_ov23_0217abcc ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev ldr r2, _021797d8 ; =data_ov23_0217abc0 @@ -15244,7 +15244,7 @@ func_ov23_02179698: ; 0x02179698 ldr r1, _021797e0 ; =0x47524d47 ldr r2, _021797e4 ; =func_ov23_0216e8a8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021797dc ; =data_ov23_0217abec ldr r1, _021797a4 ; =_ZN9ActorTypeD1Ev ldr r2, _021797e8 ; =data_ov23_0217abe0 @@ -15285,7 +15285,7 @@ func_ov23_021797ec: ; 0x021797ec ldr r1, _02179834 ; =0x47524e45 ldr r2, _02179838 ; =func_ov23_0216e8d8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179830 ; =data_ov23_0217ac0c ldr r1, _0217983c ; =_ZN9ActorTypeD1Ev ldr r2, _02179840 ; =data_ov23_0217ac00 @@ -15316,7 +15316,7 @@ func_ov23_0217984c: ; 0x0217984c ldr r1, _02179958 ; =0x414d4f53 ldr r2, _0217995c ; =func_ov23_0216f0c4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179954 ; =data_ov23_0217ac2c ldr r1, _02179960 ; =_ZN9ActorTypeD1Ev ldr r2, _02179964 ; =data_ov23_0217ac20 @@ -15410,7 +15410,7 @@ func_ov23_02179998: ; 0x02179998 ldr r1, _021799c8 ; =0x50534241 ldr r2, _021799cc ; =func_ov23_021721e0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799c4 ; =data_ov23_0217ac6c ldr r1, _021799d0 ; =_ZN9ActorTypeD1Ev ldr r2, _021799d4 ; =data_ov23_0217ac60 @@ -15433,7 +15433,7 @@ func_ov23_021799d8: ; 0x021799d8 ldr r1, _02179ae4 ; =0x484e4b53 ldr r2, _02179ae8 ; =func_ov23_02172534 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179ae0 ; =data_ov23_0217ac8c ldr r1, _02179aec ; =_ZN9ActorTypeD1Ev ldr r2, _02179af0 ; =data_ov23_0217ac80 @@ -15514,7 +15514,7 @@ func_ov23_02179b08: ; 0x02179b08 ldr r1, _02179b38 ; =0x504c444d ldr r2, _02179b3c ; =func_ov23_02174ef4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179b34 ; =data_ov23_0217acb8 ldr r1, _02179b40 ; =_ZN9ActorTypeD1Ev ldr r2, _02179b44 ; =data_ov23_0217acac @@ -15592,7 +15592,7 @@ func_ov23_02179bf8: ; 0x02179bf8 ldr r1, _02179c28 ; =0x42524d50 ldr r2, _02179c2c ; =func_ov23_02176d88 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179c24 ; =data_ov23_0217ad28 ldr r1, _02179c30 ; =_ZN9ActorTypeD1Ev ldr r2, _02179c34 ; =data_ov23_0217ad1c diff --git a/asm/ov24.inc b/asm/ov24.inc index 8a711a56..ea5f0a8c 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -91,7 +91,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov24.s b/asm/ov24.s index 7db058c7..9db17212 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -15015,7 +15015,7 @@ func_ov24_02179608: ; 0x02179608 ldr r1, _021796f8 ; =0x574c4354 ldr r2, _021796fc ; =func_ov24_0216dd60 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021796f4 ; =data_ov24_0217af80 ldr r1, _02179700 ; =_ZN9ActorTypeD1Ev ldr r2, _02179704 ; =data_ov24_0217af74 @@ -15088,7 +15088,7 @@ func_ov24_02179714: ; 0x02179714 ldr r1, _02179768 ; =0x4350534b ldr r2, _0217976c ; =func_ov24_0216e8f8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179764 ; =data_ov24_0217afa0 ldr r1, _02179770 ; =_ZN9ActorTypeD1Ev ldr r2, _02179774 ; =data_ov24_0217af94 @@ -15097,7 +15097,7 @@ func_ov24_02179714: ; 0x02179714 ldr r1, _0217977c ; =0x4d55544f ldr r2, _02179780 ; =func_ov24_0216e92c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179778 ; =data_ov24_0217afc0 ldr r1, _02179770 ; =_ZN9ActorTypeD1Ev ldr r2, _02179784 ; =data_ov24_0217afb4 @@ -15144,7 +15144,7 @@ func_ov24_021797c0: ; 0x021797c0 ldr r1, _02179850 ; =0x504d4554 ldr r2, _02179854 ; =func_ov24_0216fd70 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217984c ; =data_ov24_0217aff4 ldr r1, _02179858 ; =_ZN9ActorTypeD1Ev ldr r2, _0217985c ; =data_ov24_0217afe8 @@ -15192,7 +15192,7 @@ func_ov24_02179868: ; 0x02179868 ldr r1, _02179958 ; =0x53544c46 ldr r2, _0217995c ; =func_ov24_02171210 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179954 ; =data_ov24_0217b014 ldr r1, _02179960 ; =_ZN9ActorTypeD1Ev ldr r2, _02179964 ; =data_ov24_0217b008 @@ -15265,7 +15265,7 @@ func_ov24_02179974: ; 0x02179974 ldr r1, _02179a6c ; =0x53544c50 ldr r2, _02179a70 ; =func_ov24_02172f1c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a68 ; =data_ov24_0217b040 ldr r1, _02179a74 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a78 ; =data_ov24_0217b034 @@ -15341,7 +15341,7 @@ func_ov24_02179a8c: ; 0x02179a8c ldr r1, _02179b84 ; =0x53544c57 ldr r2, _02179b88 ; =func_ov24_02173db8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179b80 ; =data_ov24_0217b06c ldr r1, _02179b8c ; =_ZN9ActorTypeD1Ev ldr r2, _02179b90 ; =data_ov24_0217b060 @@ -15417,7 +15417,7 @@ func_ov24_02179ba4: ; 0x02179ba4 ldr r1, _02179c9c ; =0x53544c48 ldr r2, _02179ca0 ; =func_ov24_02176558 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179c98 ; =data_ov24_0217b098 ldr r1, _02179ca4 ; =_ZN9ActorTypeD1Ev ldr r2, _02179ca8 ; =data_ov24_0217b08c @@ -15492,7 +15492,7 @@ func_ov24_02179cbc: ; 0x02179cbc ldr r1, _02179cec ; =0x53544c42 ldr r2, _02179cf0 ; =func_ov24_0217735c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179ce8 ; =data_ov24_0217b0c4 ldr r1, _02179cf4 ; =_ZN9ActorTypeD1Ev ldr r2, _02179cf8 ; =data_ov24_0217b0b8 @@ -15554,7 +15554,7 @@ func_ov24_02179d6c: ; 0x02179d6c ldr r1, _02179d9c ; =0x42524d57 ldr r2, _02179da0 ; =func_ov24_021786b0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179d98 ; =data_ov24_0217b120 ldr r1, _02179da4 ; =_ZN9ActorTypeD1Ev ldr r2, _02179da8 ; =data_ov24_0217b114 diff --git a/asm/ov25.inc b/asm/ov25.inc index 73781d8b..c7957b5c 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -92,7 +92,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov25.s b/asm/ov25.s index 89154597..8df456e8 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -14695,7 +14695,7 @@ func_ov25_02179680: ; 0x02179680 ldr r1, _02179764 ; =0x43425330 ldr r2, _02179768 ; =func_ov25_0216dcd8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179760 ; =data_ov25_0217a88c ldr r1, _0217976c ; =_ZN9ActorTypeD1Ev ldr r2, _02179770 ; =data_ov25_0217a880 @@ -14765,7 +14765,7 @@ func_ov25_02179784: ; 0x02179784 ldr r1, _021797b4 ; =0x43425332 ldr r2, _021797b8 ; =func_ov25_02171bfc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021797b0 ; =data_ov25_0217a8bc ldr r1, _021797bc ; =_ZN9ActorTypeD1Ev ldr r2, _021797c0 ; =data_ov25_0217a8b0 @@ -14787,7 +14787,7 @@ func_ov25_021797c4: ; 0x021797c4 ldr r1, _021797f4 ; =0x43425331 ldr r2, _021797f8 ; =func_ov25_02172978 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021797f0 ; =data_ov25_0217a8dc ldr r1, _021797fc ; =_ZN9ActorTypeD1Ev ldr r2, _02179800 ; =data_ov25_0217a8d0 @@ -14809,7 +14809,7 @@ func_ov25_02179804: ; 0x02179804 ldr r1, _02179834 ; =0x43425333 ldr r2, _02179838 ; =func_ov25_02175a80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179830 ; =data_ov25_0217a8fc ldr r1, _0217983c ; =_ZN9ActorTypeD1Ev ldr r2, _02179840 ; =data_ov25_0217a8f0 @@ -14831,7 +14831,7 @@ func_ov25_02179844: ; 0x02179844 ldr r1, _02179874 ; =0x43425334 ldr r2, _02179878 ; =func_ov25_021769e8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179870 ; =data_ov25_0217a91c ldr r1, _0217987c ; =_ZN9ActorTypeD1Ev ldr r2, _02179880 ; =data_ov25_0217a910 @@ -14874,7 +14874,7 @@ func_ov25_021798bc: ; 0x021798bc ldr r1, _021799ac ; =0x45475354 ldr r2, _021799b0 ; =func_ov25_0217736c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799a8 ; =data_ov25_0217a950 ldr r1, _021799b4 ; =_ZN9ActorTypeD1Ev ldr r2, _021799b8 ; =data_ov25_0217a944 @@ -14947,7 +14947,7 @@ func_ov25_021799cc: ; 0x021799cc ldr r1, _021799fc ; =0x47534642 ldr r2, _02179a00 ; =func_ov25_02177d64 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799f8 ; =data_ov25_0217a97c ldr r1, _02179a04 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a08 ; =data_ov25_0217a970 @@ -14969,7 +14969,7 @@ func_ov25_02179a0c: ; 0x02179a0c ldr r1, _02179a3c ; =0x42524d47 ldr r2, _02179a40 ; =func_ov25_02178588 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a38 ; =data_ov25_0217a9b0 ldr r1, _02179a44 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a48 ; =data_ov25_0217a9a4 @@ -14991,7 +14991,7 @@ func_ov25_02179a4c: ; 0x02179a4c ldr r1, _02179a7c ; =0x4753574c ldr r2, _02179a80 ; =func_ov25_02178800 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a78 ; =data_ov25_0217a9d0 ldr r1, _02179a84 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a88 ; =data_ov25_0217a9c4 @@ -15014,7 +15014,7 @@ func_ov25_02179a8c: ; 0x02179a8c ldr r1, _02179b7c ; =0x53504452 ldr r2, _02179b80 ; =func_ov25_021789e0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179b78 ; =data_ov25_0217a9f0 ldr r1, _02179b84 ; =_ZN9ActorTypeD1Ev ldr r2, _02179b88 ; =data_ov25_0217a9e4 diff --git a/asm/ov26.inc b/asm/ov26.inc index 4d0b53c4..5ecfb24f 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -86,7 +86,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov26.s b/asm/ov26.s index 49805e0d..ec4c4d0a 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -16217,7 +16217,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _02179998 ; =0x434d414e ldr r2, _0217999c ; =func_ov26_0216d780 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179994 ; =data_ov26_0217b2cc ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021799a4 ; =data_ov26_0217b2c0 @@ -16226,7 +16226,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _021799ac ; =0x434d4e42 ldr r2, _021799b0 ; =func_ov26_0216d7c0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799a8 ; =data_ov26_0217b2ec ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021799b4 ; =data_ov26_0217b2e0 @@ -16235,7 +16235,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _021799bc ; =0x43574d4e ldr r2, _021799c0 ; =func_ov26_0216d800 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799b8 ; =data_ov26_0217b30c ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021799c4 ; =data_ov26_0217b300 @@ -16244,7 +16244,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _021799cc ; =0x43574d42 ldr r2, _021799d0 ; =func_ov26_0216d840 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799c8 ; =data_ov26_0217b32c ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021799d4 ; =data_ov26_0217b320 @@ -16253,7 +16253,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _021799dc ; =0x43574d43 ldr r2, _021799e0 ; =func_ov26_0216d880 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799d8 ; =data_ov26_0217b34c ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021799e4 ; =data_ov26_0217b340 @@ -16262,7 +16262,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _021799ec ; =0x434f4d41 ldr r2, _021799f0 ; =func_ov26_0216d8c0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799e8 ; =data_ov26_0217b36c ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021799f4 ; =data_ov26_0217b360 @@ -16271,7 +16271,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _021799fc ; =0x434f4d42 ldr r2, _02179a00 ; =func_ov26_0216d900 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021799f8 ; =data_ov26_0217b38c ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a04 ; =data_ov26_0217b380 @@ -16280,7 +16280,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _02179a0c ; =0x434d4547 ldr r2, _02179a10 ; =func_ov26_0216d940 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a08 ; =data_ov26_0217b3ac ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a14 ; =data_ov26_0217b3a0 @@ -16289,7 +16289,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _02179a1c ; =0x434d4e43 ldr r2, _02179a20 ; =func_ov26_0216dabc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a18 ; =data_ov26_0217b3cc ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a24 ; =data_ov26_0217b3c0 @@ -16298,7 +16298,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _02179a2c ; =0x434f4153 ldr r2, _02179a30 ; =func_ov26_0216dba0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a28 ; =data_ov26_0217b3ec ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a34 ; =data_ov26_0217b3e0 @@ -16307,7 +16307,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _02179a3c ; =0x434f4253 ldr r2, _02179a40 ; =func_ov26_0216dbe0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a38 ; =data_ov26_0217b40c ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a44 ; =data_ov26_0217b400 @@ -16316,7 +16316,7 @@ func_ov26_021797dc: ; 0x021797dc ldr r1, _02179a4c ; =0x424d5354 ldr r2, _02179a50 ; =func_ov26_0216dd64 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179a48 ; =data_ov26_0217b42c ldr r1, _021799a0 ; =_ZN9ActorTypeD1Ev ldr r2, _02179a54 ; =data_ov26_0217b420 @@ -16403,7 +16403,7 @@ func_ov26_02179a90: ; 0x02179a90 ldr r1, _02179b8c ; =0x57544352 ldr r2, _02179b90 ; =func_ov26_0216f58c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179b88 ; =data_ov26_0217b460 ldr r1, _02179b94 ; =_ZN9ActorTypeD1Ev ldr r2, _02179b98 ; =data_ov26_0217b454 @@ -16642,7 +16642,7 @@ func_ov26_02179d90: ; 0x02179d90 ldr r1, _02179dcc ; =0x48474f4a ldr r2, _02179dd0 ; =func_ov26_021779dc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179dc8 ; =data_ov26_0217b534 ldr r1, _02179dd4 ; =_ZN9ActorTypeD1Ev ldr r2, _02179dd8 ; =data_ov26_0217b528 @@ -16669,7 +16669,7 @@ func_ov26_02179de4: ; 0x02179de4 ldr r1, _02179f18 ; =0x42454143 ldr r2, _02179f1c ; =func_ov26_02177c08 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179f14 ; =data_ov26_0217b554 ldr r1, _02179f20 ; =_ZN9ActorTypeD1Ev ldr r2, _02179f24 ; =data_ov26_0217b548 @@ -16774,7 +16774,7 @@ func_ov26_02179f70: ; 0x02179f70 ldr r1, _02179fa0 ; =0x4d445441 ldr r2, _02179fa4 ; =func_ov26_021780d4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179f9c ; =data_ov26_0217b574 ldr r1, _02179fa8 ; =_ZN9ActorTypeD1Ev ldr r2, _02179fac ; =data_ov26_0217b568 diff --git a/asm/ov27.inc b/asm/ov27.inc index 619f9277..7c9c1668 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -73,7 +73,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov27.s b/asm/ov27.s index 62c89b51..984e4b64 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -14194,7 +14194,7 @@ func_ov27_0217913c: ; 0x0217913c ldr r1, _02179178 ; =0x50524c44 ldr r2, _0217917c ; =func_ov27_0216d6a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179174 ; =data_ov27_0217a0cc ldr r1, _02179180 ; =_ZN9ActorTypeD1Ev ldr r2, _02179184 ; =data_ov27_0217a0c0 @@ -14221,7 +14221,7 @@ func_ov27_02179190: ; 0x02179190 ldr r1, _021791c0 ; =0x504c5344 ldr r2, _021791c4 ; =func_ov27_02171d0c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021791bc ; =data_ov27_0217a0ec ldr r1, _021791c8 ; =_ZN9ActorTypeD1Ev ldr r2, _021791cc ; =data_ov27_0217a0e0 @@ -14243,7 +14243,7 @@ func_ov27_021791d0: ; 0x021791d0 ldr r1, _02179200 ; =0x504c4c42 ldr r2, _02179204 ; =func_ov27_02172d14 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021791fc ; =data_ov27_0217a10c ldr r1, _02179208 ; =_ZN9ActorTypeD1Ev ldr r2, _0217920c ; =data_ov27_0217a100 @@ -14266,7 +14266,7 @@ func_ov27_02179210: ; 0x02179210 ldr r1, _02179288 ; =0x574e4452 ldr r2, _0217928c ; =func_ov27_02174014 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179284 ; =data_ov27_0217a12c ldr r1, _02179290 ; =_ZN9ActorTypeD1Ev ldr r2, _02179294 ; =data_ov27_0217a120 @@ -14307,7 +14307,7 @@ func_ov27_021792a0: ; 0x021792a0 ldr r1, _021792d0 ; =0x46534d4e ldr r2, _021792d4 ; =func_ov27_02174a94 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021792cc ; =data_ov27_0217a14c ldr r1, _021792d8 ; =_ZN9ActorTypeD1Ev ldr r2, _021792dc ; =data_ov27_0217a140 @@ -14330,7 +14330,7 @@ func_ov27_021792e0: ; 0x021792e0 ldr r1, _021793a0 ; =0x464c4e4b ldr r2, _021793a4 ; =func_ov27_02174d6c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217939c ; =data_ov27_0217a16c ldr r1, _021793a8 ; =_ZN9ActorTypeD1Ev ldr r2, _021793ac ; =data_ov27_0217a160 @@ -14391,7 +14391,7 @@ func_ov27_021793bc: ; 0x021793bc ldr r1, _02179424 ; =0x47444d4e ldr r2, _02179428 ; =func_ov27_02177ca4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179420 ; =data_ov27_0217a18c ldr r1, _0217942c ; =_ZN9ActorTypeD1Ev ldr r2, _02179430 ; =data_ov27_0217a180 diff --git a/asm/ov28.inc b/asm/ov28.inc index 861283c8..490b4a69 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -80,7 +80,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov28.s b/asm/ov28.s index efb5b4a4..ffd97d81 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -13871,7 +13871,7 @@ func_ov28_02178504: ; 0x02178504 ldr r1, _02178534 ; =0x534d544e ldr r2, _02178538 ; =func_ov28_0216d6a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178530 ; =data_ov28_02179b0c ldr r1, _0217853c ; =_ZN9ActorTypeD1Ev ldr r2, _02178540 ; =data_ov28_02179b00 @@ -13893,7 +13893,7 @@ func_ov28_02178544: ; 0x02178544 ldr r1, _021785e0 ; =0x43485342 ldr r2, _021785e4 ; =func_ov28_0216fd0c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021785dc ; =data_ov28_02179b30 ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev ldr r2, _021785ec ; =data_ov28_02179b24 @@ -13902,7 +13902,7 @@ func_ov28_02178544: ; 0x02178544 ldr r1, _021785f4 ; =0x4d4e5254 ldr r2, _021785f8 ; =func_ov28_02170008 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021785f0 ; =data_ov28_02179b50 ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev ldr r2, _021785fc ; =data_ov28_02179b44 @@ -13911,7 +13911,7 @@ func_ov28_02178544: ; 0x02178544 ldr r1, _02178604 ; =0x46554a49 ldr r2, _02178608 ; =func_ov28_02170434 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178600 ; =data_ov28_02179b70 ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev ldr r2, _0217860c ; =data_ov28_02179b64 @@ -13920,7 +13920,7 @@ func_ov28_02178544: ; 0x02178544 ldr r1, _02178614 ; =0x43484d54 ldr r2, _02178618 ; =func_ov28_02170644 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178610 ; =data_ov28_02179b90 ldr r1, _021785e8 ; =_ZN9ActorTypeD1Ev ldr r2, _0217861c ; =data_ov28_02179b84 @@ -13954,7 +13954,7 @@ func_ov28_02178620: ; 0x02178620 ldr r1, _02178650 ; =0x4d4d4944 ldr r2, _02178654 ; =func_ov28_021707a4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217864c ; =data_ov28_02179bb0 ldr r1, _02178658 ; =_ZN9ActorTypeD1Ev ldr r2, _0217865c ; =data_ov28_02179ba4 @@ -14016,7 +14016,7 @@ func_ov28_021786d0: ; 0x021786d0 ldr r1, _02178700 ; =0x53505350 ldr r2, _02178704 ; =func_ov28_0217267c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021786fc ; =data_ov28_02179bf8 ldr r1, _02178708 ; =_ZN9ActorTypeD1Ev ldr r2, _0217870c ; =data_ov28_02179bec @@ -14038,7 +14038,7 @@ func_ov28_02178710: ; 0x02178710 ldr r1, _02178740 ; =0x5354474e ldr r2, _02178744 ; =func_ov28_02172f34 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217873c ; =data_ov28_02179c18 ldr r1, _02178748 ; =_ZN9ActorTypeD1Ev ldr r2, _0217874c ; =data_ov28_02179c0c @@ -14060,7 +14060,7 @@ func_ov28_02178750: ; 0x02178750 ldr r1, _02178780 ; =0x53544754 ldr r2, _02178784 ; =func_ov28_02173cd0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217877c ; =data_ov28_02179c3c ldr r1, _02178788 ; =_ZN9ActorTypeD1Ev ldr r2, _0217878c ; =data_ov28_02179c30 @@ -14082,7 +14082,7 @@ func_ov28_02178790: ; 0x02178790 ldr r1, _021787c0 ; =0x53545357 ldr r2, _021787c4 ; =func_ov28_02174c0c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021787bc ; =data_ov28_02179c60 ldr r1, _021787c8 ; =_ZN9ActorTypeD1Ev ldr r2, _021787cc ; =data_ov28_02179c54 @@ -14104,7 +14104,7 @@ func_ov28_021787d0: ; 0x021787d0 ldr r1, _02178800 ; =0x5341555a ldr r2, _02178804 ; =func_ov28_021754b0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021787fc ; =data_ov28_02179c84 ldr r1, _02178808 ; =_ZN9ActorTypeD1Ev ldr r2, _0217880c ; =data_ov28_02179c78 @@ -14126,7 +14126,7 @@ func_ov28_02178810: ; 0x02178810 ldr r1, _02178840 ; =0x46524253 ldr r2, _02178844 ; =func_ov28_02176d8c ldr r3, _02178848 ; =func_ov28_02176d80 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217883c ; =data_ov28_02179ca4 ldr r1, _0217884c ; =_ZN9ActorTypeD1Ev ldr r2, _02178850 ; =data_ov28_02179c98 @@ -14149,7 +14149,7 @@ func_ov28_02178854: ; 0x02178854 ldr r1, _02178884 ; =0x46524348 ldr r2, _02178888 ; =func_ov28_02177900 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02178880 ; =data_ov28_02179cc4 ldr r1, _0217888c ; =_ZN9ActorTypeD1Ev ldr r2, _02178890 ; =data_ov28_02179cb8 diff --git a/asm/ov29.inc b/asm/ov29.inc index 36a8a66f..5bbb2191 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -68,7 +68,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov29.s b/asm/ov29.s index 81c19ba6..16e3555a 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -14280,7 +14280,7 @@ func_ov29_021794dc: ; 0x021794dc ldr r1, _02179564 ; =0x42524d4c ldr r2, _02179568 ; =func_ov29_0216e048 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179560 ; =data_ov29_0217a5c0 ldr r1, _0217956c ; =_ZN9ActorTypeD1Ev ldr r2, _02179570 ; =data_ov29_0217a5b4 @@ -14330,7 +14330,7 @@ func_ov29_0217958c: ; 0x0217958c ldr r1, _021795bc ; =0x42524d31 ldr r2, _021795c0 ; =func_ov29_0216f144 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021795b8 ; =data_ov29_0217a5f8 ldr r1, _021795c4 ; =_ZN9ActorTypeD1Ev ldr r2, _021795c8 ; =data_ov29_0217a5ec @@ -14352,7 +14352,7 @@ func_ov29_021795cc: ; 0x021795cc ldr r1, _021795fc ; =0x474f3154 ldr r2, _02179600 ; =func_ov29_0216ff60 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021795f8 ; =data_ov29_0217a618 ldr r1, _02179604 ; =_ZN9ActorTypeD1Ev ldr r2, _02179608 ; =data_ov29_0217a60c @@ -14374,7 +14374,7 @@ func_ov29_0217960c: ; 0x0217960c ldr r1, _0217963c ; =0x474f314d ldr r2, _02179640 ; =func_ov29_02171540 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179638 ; =data_ov29_0217bc3c ldr r1, _02179644 ; =_ZN9ActorTypeD1Ev ldr r2, _02179648 ; =data_ov29_0217bc30 @@ -14396,7 +14396,7 @@ func_ov29_0217964c: ; 0x0217964c ldr r1, _0217967c ; =0x474f3145 ldr r2, _02179680 ; =func_ov29_021726cc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179678 ; =data_ov29_0217bc64 ldr r1, _02179684 ; =_ZN9ActorTypeD1Ev ldr r2, _02179688 ; =data_ov29_0217bc58 @@ -14418,7 +14418,7 @@ func_ov29_0217968c: ; 0x0217968c ldr r1, _021796bc ; =0x474f3150 ldr r2, _021796c0 ; =func_ov29_02174f6c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021796b8 ; =data_ov29_0217bc84 ldr r1, _021796c4 ; =_ZN9ActorTypeD1Ev ldr r2, _021796c8 ; =data_ov29_0217bc78 @@ -14460,7 +14460,7 @@ func_ov29_02179704: ; 0x02179704 ldr r1, _02179734 ; =0x474f3143 ldr r2, _02179738 ; =func_ov29_0217679c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179730 ; =data_ov29_0217bcc4 ldr r1, _0217973c ; =_ZN9ActorTypeD1Ev ldr r2, _02179740 ; =data_ov29_0217bcb8 @@ -14494,7 +14494,7 @@ func_ov29_0217975c: ; 0x0217975c ldr r1, _0217978c ; =0x54535350 ldr r2, _02179790 ; =func_ov29_021778f8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02179788 ; =data_ov29_0217bd14 ldr r1, _02179794 ; =_ZN9ActorTypeD1Ev ldr r2, _02179798 ; =data_ov29_0217bd08 @@ -14516,7 +14516,7 @@ func_ov29_0217979c: ; 0x0217979c ldr r1, _021797cc ; =0x444d534f ldr r2, _021797d0 ; =func_ov29_02178358 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021797c8 ; =data_ov29_0217bd38 ldr r1, _021797d4 ; =_ZN9ActorTypeD1Ev ldr r2, _021797d8 ; =data_ov29_0217bd2c diff --git a/asm/ov30.inc b/asm/ov30.inc index 4913a1a2..b17f1027 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -131,7 +131,7 @@ .extern func_020367ec .extern func_02036da8 .extern func_02036edc -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f558 .extern func_0204f754 diff --git a/asm/ov30.s b/asm/ov30.s index d903a630..6f8ada66 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -16196,7 +16196,7 @@ func_ov30_02188824: ; 0x02188824 ldr r1, _0218898c ; =0x43485352 ldr r2, _02188990 ; =func_ov30_02180628 ldr r3, _02188994 ; =func_ov30_02180548 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188988 ; =data_ov30_021894ac ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev ldr r2, _0218899c ; =data_ov30_021894a0 @@ -16205,7 +16205,7 @@ func_ov30_02188824: ; 0x02188824 ldr r1, _021889a4 ; =0x43485332 ldr r2, _021889a8 ; =func_ov30_0218066c ldr r3, _021889ac ; =func_ov30_021805ac - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021889a0 ; =data_ov30_021894cc ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev ldr r2, _021889b0 ; =data_ov30_021894c0 @@ -16214,7 +16214,7 @@ func_ov30_02188824: ; 0x02188824 ldr r1, _021889b8 ; =0x43485336 ldr r2, _021889bc ; =func_ov30_021806b0 ldr r3, _021889c0 ; =func_ov30_02180610 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021889b4 ; =data_ov30_021894ec ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev ldr r2, _021889c4 ; =data_ov30_021894e0 @@ -16223,7 +16223,7 @@ func_ov30_02188824: ; 0x02188824 ldr r1, _021889cc ; =0x43485334 ldr r2, _021889d0 ; =func_ov30_021806f4 ldr r3, _021889d4 ; =func_ov30_0218061c - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021889c8 ; =data_ov30_0218950c ldr r1, _02188998 ; =_ZN9ActorTypeD1Ev ldr r2, _021889d8 ; =data_ov30_02189500 @@ -16315,7 +16315,7 @@ func_ov30_021889ec: ; 0x021889ec ldr r1, _02188a1c ; =0x43484f42 ldr r2, _02188a20 ; =func_ov30_021847b0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188a18 ; =data_ov30_0218953c ldr r1, _02188a24 ; =_ZN9ActorTypeD1Ev ldr r2, _02188a28 ; =data_ov30_02189530 diff --git a/asm/ov31.inc b/asm/ov31.inc index 0a95d7f1..b56b1c7c 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -144,7 +144,7 @@ .extern func_020376c0 .extern func_02038b40 .extern func_02039250 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_ov00_02079e68 .extern func_ov00_02079ed8 diff --git a/asm/ov31.s b/asm/ov31.s index e6d08795..9bda8e30 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -8220,7 +8220,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181e44 ; =0x4954444d ldr r2, _02181e48 ; =func_ov31_0217dbdc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181e40 ; =data_ov31_02183e94 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181e50 ; =data_ov31_02183e88 @@ -8229,7 +8229,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181e58 ; =0x4954534f ldr r2, _02181e5c ; =func_ov31_0217dc1c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181e54 ; =data_ov31_02183eb4 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181e60 ; =data_ov31_02183ea8 @@ -8238,7 +8238,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181e68 ; =0x49544855 ldr r2, _02181e6c ; =func_ov31_0217dc5c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181e64 ; =data_ov31_02183ed4 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181e70 ; =data_ov31_02183ec8 @@ -8247,7 +8247,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181e78 ; =0x49544152 ldr r2, _02181e7c ; =func_ov31_0217dc9c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181e74 ; =data_ov31_02183ef4 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181e80 ; =data_ov31_02183ee8 @@ -8256,7 +8256,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181e88 ; =0x4954424d ldr r2, _02181e8c ; =func_ov31_0217dcdc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181e84 ; =data_ov31_02183f14 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181e90 ; =data_ov31_02183f08 @@ -8265,7 +8265,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181e98 ; =0x49544254 ldr r2, _02181e9c ; =func_ov31_0217dd1c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181e94 ; =data_ov31_02183f34 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181ea0 ; =data_ov31_02183f28 @@ -8274,7 +8274,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181ea8 ; =0x49544150 ldr r2, _02181eac ; =func_ov31_0217dd5c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181ea4 ; =data_ov31_02183f54 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181eb0 ; =data_ov31_02183f48 @@ -8283,7 +8283,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181eb8 ; =0x49544242 ldr r2, _02181ebc ; =func_ov31_0217dd9c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181eb4 ; =data_ov31_02183f74 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181ec0 ; =data_ov31_02183f68 @@ -8292,7 +8292,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181ec8 ; =0x49544232 ldr r2, _02181ecc ; =func_ov31_0217dddc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181ec4 ; =data_ov31_02183f94 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181ed0 ; =data_ov31_02183f88 @@ -8301,7 +8301,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181ed8 ; =0x49545452 ldr r2, _02181edc ; =func_ov31_0217de1c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181ed4 ; =data_ov31_02183fb4 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181ee0 ; =data_ov31_02183fa8 @@ -8310,7 +8310,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181ee8 ; =0x49545350 ldr r2, _02181eec ; =func_ov31_0217de4c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181ee4 ; =data_ov31_02183fd4 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181ef0 ; =data_ov31_02183fc8 @@ -8319,7 +8319,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181ef8 ; =0x49545352 ldr r2, _02181efc ; =func_ov31_0217de7c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181ef4 ; =data_ov31_02183ff4 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181f00 ; =data_ov31_02183fe8 @@ -8328,7 +8328,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181f08 ; =0x4954534c ldr r2, _02181f0c ; =func_ov31_0217debc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181f04 ; =data_ov31_02184014 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181f10 ; =data_ov31_02184008 @@ -8337,7 +8337,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181f18 ; =0x49545042 ldr r2, _02181f1c ; =func_ov31_0217defc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181f14 ; =data_ov31_02184034 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181f20 ; =data_ov31_02184028 @@ -8346,7 +8346,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181f28 ; =0x4954424b ldr r2, _02181f2c ; =func_ov31_0217df3c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181f24 ; =data_ov31_02184054 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181f30 ; =data_ov31_02184048 @@ -8355,7 +8355,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181f38 ; =0x49544343 ldr r2, _02181f3c ; =func_ov31_0217df7c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181f34 ; =data_ov31_02184074 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181f40 ; =data_ov31_02184068 @@ -8364,7 +8364,7 @@ func_ov31_02181b6c: ; 0x02181b6c ldr r1, _02181f48 ; =0x49544259 ldr r2, _02181f4c ; =func_ov31_0217dfbc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181f44 ; =data_ov31_02184094 ldr r1, _02181e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02181f50 ; =data_ov31_02184088 @@ -8477,7 +8477,7 @@ func_ov31_02181f58: ; 0x02181f58 ldr r1, _02181fd0 ; =0x4954534e ldr r2, _02181fd4 ; =func_ov31_02180708 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181fcc ; =data_ov31_02184160 ldr r1, _02181fd8 ; =_ZN9ActorTypeD1Ev ldr r2, _02181fdc ; =data_ov31_02184154 @@ -8486,7 +8486,7 @@ func_ov31_02181f58: ; 0x02181f58 ldr r1, _02181fe4 ; =0x49545332 ldr r2, _02181fe8 ; =func_ov31_0218074c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181fe0 ; =data_ov31_02184180 ldr r1, _02181fd8 ; =_ZN9ActorTypeD1Ev ldr r2, _02181fec ; =data_ov31_02184174 @@ -8495,7 +8495,7 @@ func_ov31_02181f58: ; 0x02181f58 ldr r1, _02181ff4 ; =0x49545333 ldr r2, _02181ff8 ; =func_ov31_02180790 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02181ff0 ; =data_ov31_021841a0 ldr r1, _02181fd8 ; =_ZN9ActorTypeD1Ev ldr r2, _02181ffc ; =data_ov31_02184194 @@ -8525,7 +8525,7 @@ func_ov31_02182000: ; 0x02182000 ldr r1, _02182030 ; =0x53495453 ldr r2, _02182034 ; =func_ov31_02180a84 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218202c ; =data_ov31_021841c0 ldr r1, _02182038 ; =_ZN9ActorTypeD1Ev ldr r2, _0218203c ; =data_ov31_021841b4 @@ -8547,7 +8547,7 @@ func_ov31_02182040: ; 0x02182040 ldr r1, _02182070 ; =0x54455452 ldr r2, _02182074 ; =func_ov31_02181448 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218206c ; =data_ov31_021841e0 ldr r1, _02182078 ; =_ZN9ActorTypeD1Ev ldr r2, _0218207c ; =data_ov31_021841d4 diff --git a/asm/ov32.inc b/asm/ov32.inc index 28d66cbe..d4db3dfb 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -72,7 +72,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov32.s b/asm/ov32.s index b13b71aa..f8bfdc3c 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -11153,7 +11153,7 @@ func_ov32_02184d3c: ; 0x02184d3c ldr r1, _02184e44 ; =0x43485543 ldr r2, _02184e48 ; =func_ov32_0217c81c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02184e40 ; =data_ov32_021861ec ldr r1, _02184e4c ; =_ZN9ActorTypeD1Ev ldr r2, _02184e50 ; =data_ov32_021861e0 @@ -11234,7 +11234,7 @@ func_ov32_02184e68: ; 0x02184e68 ldr r1, _02184f6c ; =0x49434843 ldr r2, _02184f70 ; =func_ov32_0217dd10 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02184f68 ; =data_ov32_02186218 ldr r1, _02184f74 ; =_ZN9ActorTypeD1Ev ldr r2, _02184f78 ; =data_ov32_0218620c @@ -11314,7 +11314,7 @@ func_ov32_02184f90: ; 0x02184f90 ldr r1, _02185094 ; =0x47454c4c ldr r2, _02185098 ; =func_ov32_0217f878 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02185090 ; =data_ov32_02186244 ldr r1, _0218509c ; =_ZN9ActorTypeD1Ev ldr r2, _021850a0 ; =data_ov32_02186238 @@ -11450,7 +11450,7 @@ func_ov32_02185168: ; 0x02185168 ldr r1, _0218525c ; =0x42454530 ldr r2, _02185260 ; =func_ov32_02183034 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02185258 ; =data_ov32_021862a4 ldr r1, _02185264 ; =_ZN9ActorTypeD1Ev ldr r2, _02185268 ; =data_ov32_02186298 @@ -11524,7 +11524,7 @@ func_ov32_02185278: ; 0x02185278 ldr r1, _0218536c ; =0x42454548 ldr r2, _02185370 ; =func_ov32_02183d28 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02185368 ; =data_ov32_021862d0 ldr r1, _02185374 ; =_ZN9ActorTypeD1Ev ldr r2, _02185378 ; =data_ov32_021862c4 @@ -11597,7 +11597,7 @@ func_ov32_02185388: ; 0x02185388 ldr r1, _021853b8 ; =0x49434848 ldr r2, _021853bc ; =func_ov32_0218468c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021853b4 ; =data_ov32_021862fc ldr r1, _021853c0 ; =_ZN9ActorTypeD1Ev ldr r2, _021853c4 ; =data_ov32_021862f0 diff --git a/asm/ov33.inc b/asm/ov33.inc index 48d15b00..a5afea63 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -107,7 +107,7 @@ .extern func_02036f68 .extern func_02037628 .extern func_02038b40 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov33.s b/asm/ov33.s index 23556bb9..952c6f0b 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -4862,7 +4862,7 @@ func_ov33_0217fb90: ; 0x0217fb90 ldr r1, _0217fc90 ; =0x504f4f4e ldr r2, _0217fc94 ; =func_ov33_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217fc8c ; =data_ov33_0218058c ldr r1, _0217fc98 ; =_ZN9ActorTypeD1Ev ldr r2, _0217fc9c ; =data_ov33_02180580 @@ -4939,7 +4939,7 @@ func_ov33_0217fcb0: ; 0x0217fcb0 ldr r1, _0217fce0 ; =0x464c5442 ldr r2, _0217fce4 ; =func_ov33_0217c44c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217fcdc ; =data_ov33_021805b8 ldr r1, _0217fce8 ; =_ZN9ActorTypeD1Ev ldr r2, _0217fcec ; =data_ov33_021805ac @@ -4961,7 +4961,7 @@ func_ov33_0217fcf0: ; 0x0217fcf0 ldr r1, _0217fd20 ; =0x4d524547 ldr r2, _0217fd24 ; =func_ov33_0217cfa8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217fd1c ; =data_ov33_021805d8 ldr r1, _0217fd28 ; =_ZN9ActorTypeD1Ev ldr r2, _0217fd2c ; =data_ov33_021805cc @@ -4984,7 +4984,7 @@ func_ov33_0217fd30: ; 0x0217fd30 ldr r1, _0217fe34 ; =0x4b4f4b4f ldr r2, _0217fe38 ; =func_ov33_0217ddfc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217fe30 ; =data_ov33_021805f8 ldr r1, _0217fe3c ; =_ZN9ActorTypeD1Ev ldr r2, _0217fe40 ; =data_ov33_021805ec @@ -5062,7 +5062,7 @@ func_ov33_0217fe54: ; 0x0217fe54 ldr r1, _0217fe84 ; =0x4b4f4b41 ldr r2, _0217fe88 ; =func_ov33_0217f658 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0217fe80 ; =data_ov33_02180624 ldr r1, _0217fe8c ; =_ZN9ActorTypeD1Ev ldr r2, _0217fe90 ; =data_ov33_02180618 diff --git a/asm/ov34.inc b/asm/ov34.inc index bda56769..abc71f63 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -118,7 +118,7 @@ .extern func_0202e310 .extern func_0202e544 .extern func_0202e58c -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov34.s b/asm/ov34.s index 0e2e4280..e3fb0c35 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -11162,7 +11162,7 @@ func_ov34_02185818: ; 0x02185818 ldr r1, _0218593c ; =0x47524f4b ldr r2, _02185940 ; =func_ov34_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02185938 ; =data_ov34_021861ac ldr r1, _02185944 ; =_ZN9ActorTypeD1Ev ldr r2, _02185948 ; =data_ov34_021861a0 @@ -11254,7 +11254,7 @@ func_ov34_02185974: ; 0x02185974 ldr r1, _021859c0 ; =0x47524f42 ldr r2, _021859c4 ; =func_ov34_02184728 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021859bc ; =data_ov34_02186374 ldr r1, _021859c8 ; =_ZN9ActorTypeD1Ev ldr r2, _021859cc ; =data_ov34_02186368 @@ -11287,7 +11287,7 @@ func_ov34_021859dc: ; 0x021859dc ldr r1, _02185a4c ; =0x47524254 ldr r2, _02185a50 ; =func_ov34_02185034 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02185a48 ; =data_ov34_021863ac ldr r1, _02185a54 ; =_ZN9ActorTypeD1Ev ldr r2, _02185a58 ; =data_ov34_021863a0 diff --git a/asm/ov35.inc b/asm/ov35.inc index ae55a040..f209197e 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -72,7 +72,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov35.s b/asm/ov35.s index be34b773..5080520d 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -11807,7 +11807,7 @@ func_ov35_02185668: ; 0x02185668 ldr r1, _021856cc ; =0x52594453 ldr r2, _021856d0 ; =func_ov35_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021856c8 ; =data_ov35_02185ecc ldr r1, _021856d4 ; =_ZN9ActorTypeD1Ev ldr r2, _021856d8 ; =data_ov35_02185ec0 @@ -11846,7 +11846,7 @@ func_ov35_021856f0: ; 0x021856f0 ldr r1, _02185720 ; =0x5259444d ldr r2, _02185724 ; =func_ov35_0217d854 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218571c ; =data_ov35_02185ef8 ldr r1, _02185728 ; =_ZN9ActorTypeD1Ev ldr r2, _0218572c ; =data_ov35_02185eec @@ -11868,7 +11868,7 @@ func_ov35_02185730: ; 0x02185730 ldr r1, _0218585c ; =0x52595244 ldr r2, _02185860 ; =func_ov35_0217e940 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02185858 ; =data_ov35_02186f9c ldr r1, _02185864 ; =_ZN9ActorTypeD1Ev ldr r2, _02185868 ; =data_ov35_02186f90 @@ -11974,7 +11974,7 @@ func_ov35_021858c0: ; 0x021858c0 ldr r1, _021858f0 ; =0x52594448 ldr r2, _021858f4 ; =func_ov35_02184810 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021858ec ; =data_ov35_02186ff8 ldr r1, _021858f8 ; =_ZN9ActorTypeD1Ev ldr r2, _021858fc ; =data_ov35_02186fec diff --git a/asm/ov36.inc b/asm/ov36.inc index 69cbd0f8..06ae4519 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -142,7 +142,7 @@ .extern func_02033e70 .extern func_020368f4 .extern func_02036ce4 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov36.s b/asm/ov36.s index 57175a4b..0961cd1d 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -12916,7 +12916,7 @@ func_ov36_02186bb4: ; 0x02186bb4 ldr r1, _02186be4 ; =0x50574253 ldr r2, _02186be8 ; =func_ov36_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02186be0 ; =data_ov36_02186fac ldr r1, _02186bec ; =_ZN9ActorTypeD1Ev ldr r2, _02186bf0 ; =data_ov36_02186fa0 @@ -12938,7 +12938,7 @@ func_ov36_02186bf4: ; 0x02186bf4 ldr r1, _02186c24 ; =0x50424652 ldr r2, _02186c28 ; =func_ov36_02185ffc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02186c20 ; =data_ov36_02186fcc ldr r1, _02186c2c ; =_ZN9ActorTypeD1Ev ldr r2, _02186c30 ; =data_ov36_02186fc0 diff --git a/asm/ov37.inc b/asm/ov37.inc index ea051adb..b86f3704 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -69,7 +69,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov37.s b/asm/ov37.s index ce4eff94..f063340a 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -15351,7 +15351,7 @@ func_ov37_02188690: ; 0x02188690 ldr r1, _02188794 ; =0x57534253 ldr r2, _02188798 ; =func_ov37_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188790 ; =data_ov37_0218916c ldr r1, _0218879c ; =_ZN9ActorTypeD1Ev ldr r2, _021887a0 ; =data_ov37_02189160 @@ -15429,7 +15429,7 @@ func_ov37_021887b4: ; 0x021887b4 ldr r1, _02188800 ; =0x57534242 ldr r2, _02188804 ; =func_ov37_021843a4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021887fc ; =data_ov37_021891a0 ldr r1, _02188808 ; =_ZN9ActorTypeD1Ev ldr r2, _0218880c ; =data_ov37_02189194 @@ -15461,7 +15461,7 @@ func_ov37_0218881c: ; 0x0218881c ldr r1, _0218884c ; =0x57534246 ldr r2, _02188850 ; =func_ov37_02185068 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188848 ; =data_ov37_021891d8 ldr r1, _02188854 ; =_ZN9ActorTypeD1Ev ldr r2, _02188858 ; =data_ov37_021891cc @@ -15483,7 +15483,7 @@ func_ov37_0218885c: ; 0x0218885c ldr r1, _0218888c ; =0x57534243 ldr r2, _02188890 ; =func_ov37_021853ac mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188888 ; =data_ov37_021891f8 ldr r1, _02188894 ; =_ZN9ActorTypeD1Ev ldr r2, _02188898 ; =data_ov37_021891ec @@ -15506,7 +15506,7 @@ func_ov37_0218889c: ; 0x0218889c ldr r1, _02188998 ; =0x57534248 ldr r2, _0218899c ; =func_ov37_0218553c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188994 ; =data_ov37_02189218 ldr r1, _021889a0 ; =_ZN9ActorTypeD1Ev ldr r2, _021889a4 ; =data_ov37_0218920c diff --git a/asm/ov38.inc b/asm/ov38.inc index 6b3fc53a..59d54df1 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -63,7 +63,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov38.s b/asm/ov38.s index 966dfbbc..0aaf64e7 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -14764,7 +14764,7 @@ func_ov38_02188ae4: ; 0x02188ae4 ldr r1, _02188be0 ; =0x47444f46 ldr r2, _02188be4 ; =func_ov38_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188bdc ; =data_ov38_021891ec ldr r1, _02188be8 ; =_ZN9ActorTypeD1Ev ldr r2, _02188bec ; =data_ov38_021891e0 @@ -14848,7 +14848,7 @@ func_ov38_02188c20: ; 0x02188c20 ldr r1, _02188c50 ; =0x4e564d4d ldr r2, _02188c54 ; =func_ov38_021884dc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188c4c ; =data_ov38_02189470 ldr r1, _02188c58 ; =_ZN9ActorTypeD1Ev ldr r2, _02188c5c ; =data_ov38_02189464 diff --git a/asm/ov39.inc b/asm/ov39.inc index 88466feb..4c02cca9 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -66,7 +66,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov39.s b/asm/ov39.s index 362cbf5b..d6949491 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -13266,7 +13266,7 @@ func_ov39_02186968: ; 0x02186968 ldr r1, _021869a4 ; =0x474f4354 ldr r2, _021869a8 ; =func_ov39_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021869a0 ; =data_ov39_02186ccc ldr r1, _021869ac ; =_ZN9ActorTypeD1Ev ldr r2, _021869b0 ; =data_ov39_02186cc0 diff --git a/asm/ov40.inc b/asm/ov40.inc index 6a455933..785fa3e5 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -241,7 +241,7 @@ .extern func_0203d7e0 .extern func_0203dcb4 .extern func_0203e0c8 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_02042190 .extern func_02043594 diff --git a/asm/ov40.s b/asm/ov40.s index 0843b9f9..eadf899b 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -16338,7 +16338,7 @@ func_ov40_02188360: ; 0x02188360 ldr r1, _02188390 ; =0x444d4348 ldr r2, _02188394 ; =func_ov40_0217bd80 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218838c ; =data_ov40_02189acc ldr r1, _02188398 ; =_ZN9ActorTypeD1Ev ldr r2, _0218839c ; =data_ov40_02189ac0 @@ -16360,7 +16360,7 @@ func_ov40_021883a0: ; 0x021883a0 ldr r1, _021883d0 ; =0x444d4b53 ldr r2, _021883d4 ; =func_ov40_02183e24 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021883cc ; =data_ov40_0219a0ec ldr r1, _021883d8 ; =_ZN9ActorTypeD1Ev ldr r2, _021883dc ; =data_ov40_0219a0e0 @@ -16382,7 +16382,7 @@ func_ov40_021883e0: ; 0x021883e0 ldr r1, _02188410 ; =0x444d5452 ldr r2, _02188414 ; =func_ov40_02184a4c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218840c ; =data_ov40_0219a10c ldr r1, _02188418 ; =_ZN9ActorTypeD1Ev ldr r2, _0218841c ; =data_ov40_0219a100 @@ -16404,7 +16404,7 @@ func_ov40_02188420: ; 0x02188420 ldr r1, _02188450 ; =0x444d5345 ldr r2, _02188454 ; =func_ov40_02184e58 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218844c ; =data_ov40_0219a12c ldr r1, _02188458 ; =_ZN9ActorTypeD1Ev ldr r2, _0218845c ; =data_ov40_0219a120 @@ -16467,7 +16467,7 @@ func_ov40_021884ac: ; 0x021884ac ldr r1, _021884dc ; =0x444d5350 ldr r2, _021884e0 ; =func_ov40_021853f0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021884d8 ; =data_ov40_0219a14c ldr r1, _021884e4 ; =_ZN9ActorTypeD1Ev ldr r2, _021884e8 ; =data_ov40_0219a140 @@ -16489,7 +16489,7 @@ func_ov40_021884ec: ; 0x021884ec ldr r1, _0218851c ; =0x444d4556 ldr r2, _02188520 ; =func_ov40_021857cc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02188518 ; =data_ov40_0219a16c ldr r1, _02188524 ; =_ZN9ActorTypeD1Ev ldr r2, _02188528 ; =data_ov40_0219a160 @@ -16593,7 +16593,7 @@ func_ov40_021885c4: ; 0x021885c4 ldr r1, _021885f4 ; =0x444d4847 ldr r2, _021885f8 ; =func_ov40_02187380 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021885f0 ; =data_ov40_0219a18c ldr r1, _021885fc ; =_ZN9ActorTypeD1Ev ldr r2, _02188600 ; =data_ov40_0219a180 diff --git a/asm/ov41.inc b/asm/ov41.inc index c4f6c7ce..fb7fb6f9 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -65,7 +65,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov41.s b/asm/ov41.s index d4fa1d52..1c63e529 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -6015,7 +6015,7 @@ func_ov41_0218e098: ; 0x0218e098 ldr r1, _0218e0c8 ; =0x53574f4e ldr r2, _0218e0cc ; =func_ov41_02189560 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e0c4 ; =data_ov41_0218ea8c ldr r1, _0218e0d0 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e0d4 ; =data_ov41_0218ea80 @@ -6037,7 +6037,7 @@ func_ov41_0218e0d8: ; 0x0218e0d8 ldr r1, _0218e120 ; =0x43525053 ldr r2, _0218e124 ; =func_ov41_02189be4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e11c ; =data_ov41_0218eaac ldr r1, _0218e128 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e12c ; =data_ov41_0218eaa0 @@ -6067,7 +6067,7 @@ func_ov41_0218e138: ; 0x0218e138 ldr r1, _0218e168 ; =0x4f53574f ldr r2, _0218e16c ; =func_ov41_0218a2fc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e164 ; =data_ov41_0218eacc ldr r1, _0218e170 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e174 ; =data_ov41_0218eac0 @@ -6089,7 +6089,7 @@ func_ov41_0218e178: ; 0x0218e178 ldr r1, _0218e1a8 ; =0x4353574d ldr r2, _0218e1ac ; =func_ov41_0218aac0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e1a4 ; =data_ov41_0218eaec ldr r1, _0218e1b0 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e1b4 ; =data_ov41_0218eae0 @@ -6111,7 +6111,7 @@ func_ov41_0218e1b8: ; 0x0218e1b8 ldr r1, _0218e1e8 ; =0x4353544d ldr r2, _0218e1ec ; =func_ov41_0218c45c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e1e4 ; =data_ov41_0218eb10 ldr r1, _0218e1f0 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e1f4 ; =data_ov41_0218eb04 @@ -6134,7 +6134,7 @@ func_ov41_0218e1f8: ; 0x0218e1f8 ldr r1, _0218e2ec ; =0x4b4d4244 ldr r2, _0218e2f0 ; =func_ov41_0218ce94 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e2e8 ; =data_ov41_0218eb30 ldr r1, _0218e2f4 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e2f8 ; =data_ov41_0218eb24 diff --git a/asm/ov42.inc b/asm/ov42.inc index c91bb449..d4addeab 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -49,7 +49,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov42.s b/asm/ov42.s index 4b73f54e..9f5070dd 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -3942,7 +3942,7 @@ func_ov42_0218c744: ; 0x0218c744 ldr r1, _0218c774 ; =0x4d544e50 ldr r2, _0218c778 ; =func_ov42_0218a760 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218c770 ; =data_ov42_0218cd30 ldr r1, _0218c77c ; =_ZN9ActorTypeD1Ev ldr r2, _0218c780 ; =data_ov42_0218cd24 @@ -3964,7 +3964,7 @@ func_ov42_0218c784: ; 0x0218c784 ldr r1, _0218c7d8 ; =0x4d544748 ldr r2, _0218c7dc ; =func_ov42_0218b914 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218c7d4 ; =data_ov42_0218cd54 ldr r1, _0218c7e0 ; =_ZN9ActorTypeD1Ev ldr r2, _0218c7e4 ; =data_ov42_0218cd48 @@ -3973,7 +3973,7 @@ func_ov42_0218c784: ; 0x0218c784 ldr r1, _0218c7ec ; =0x4d544752 ldr r2, _0218c7f0 ; =func_ov42_0218b944 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218c7e8 ; =data_ov42_0218cd74 ldr r1, _0218c7e0 ; =_ZN9ActorTypeD1Ev ldr r2, _0218c7f4 ; =data_ov42_0218cd68 diff --git a/asm/ov43.inc b/asm/ov43.inc index 7b5ae442..e16801bc 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -90,7 +90,7 @@ .extern func_0202e58c .extern func_02036ce4 .extern func_02036da8 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f754 .extern __register_global_object diff --git a/asm/ov43.s b/asm/ov43.s index 0539e50f..500404b1 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -4708,7 +4708,7 @@ func_ov43_0218d414: ; 0x0218d414 ldr r1, _0218d548 ; =0x50424c4e ldr r2, _0218d54c ; =func_ov43_02189560 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218d544 ; =data_ov43_0218db0c ldr r1, _0218d550 ; =_ZN9ActorTypeD1Ev ldr r2, _0218d554 ; =data_ov43_0218db00 @@ -4717,7 +4717,7 @@ func_ov43_0218d414: ; 0x0218d414 ldr r1, _0218d55c ; =0x55424c4e ldr r2, _0218d560 ; =func_ov43_021895a0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218d558 ; =data_ov43_0218db2c ldr r1, _0218d550 ; =_ZN9ActorTypeD1Ev ldr r2, _0218d564 ; =data_ov43_0218db20 @@ -4804,7 +4804,7 @@ func_ov43_0218d580: ; 0x0218d580 ldr r1, _0218d5b0 ; =0x50425a4b ldr r2, _0218d5b4 ; =func_ov43_0218b018 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218d5ac ; =data_ov43_0218db58 ldr r1, _0218d5b8 ; =_ZN9ActorTypeD1Ev ldr r2, _0218d5bc ; =data_ov43_0218db4c diff --git a/asm/ov44.inc b/asm/ov44.inc index 080ba9c4..b8293509 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -100,7 +100,7 @@ .extern func_0202dc38 .extern func_0202e310 .extern func_0202e58c -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_02042f74 .extern func_0204f614 diff --git a/asm/ov44.s b/asm/ov44.s index 1157f439..fb650139 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -7115,7 +7115,7 @@ func_ov44_0218ea9c: ; 0x0218ea9c ldr r1, _0218eba4 ; =0x534e414b ldr r2, _0218eba8 ; =func_ov44_02189560 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218eba0 ; =data_ov44_0218feec ldr r1, _0218ebac ; =_ZN9ActorTypeD1Ev ldr r2, _0218ebb0 ; =data_ov44_0218fee0 @@ -7196,7 +7196,7 @@ func_ov44_0218ebc8: ; 0x0218ebc8 ldr r1, _0218ecc4 ; =0x52415431 ldr r2, _0218ecc8 ; =func_ov44_0218a0a8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218ecc0 ; =data_ov44_0218ff18 ldr r1, _0218eccc ; =_ZN9ActorTypeD1Ev ldr r2, _0218ecd0 ; =data_ov44_0218ff0c @@ -7272,7 +7272,7 @@ func_ov44_0218ece4: ; 0x0218ece4 ldr r1, _0218ed14 ; =0x4b455930 ldr r2, _0218ed18 ; =func_ov44_0218aa98 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218ed10 ; =data_ov44_0218ff44 ldr r1, _0218ed1c ; =_ZN9ActorTypeD1Ev ldr r2, _0218ed20 ; =data_ov44_0218ff38 @@ -7295,7 +7295,7 @@ func_ov44_0218ed24: ; 0x0218ed24 ldr r1, _0218eee4 ; =0x4f435441 ldr r2, _0218eee8 ; =func_ov44_0218b084 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218eee0 ; =data_ov44_0218ff64 ldr r1, _0218eeec ; =_ZN9ActorTypeD1Ev ldr r2, _0218eef0 ; =data_ov44_0218ff58 @@ -7422,7 +7422,7 @@ func_ov44_0218ef0c: ; 0x0218ef0c ldr r1, _0218ef3c ; =0x4f435348 ldr r2, _0218ef40 ; =func_ov44_0218c288 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218ef38 ; =data_ov44_0218ff9c ldr r1, _0218ef44 ; =_ZN9ActorTypeD1Ev ldr r2, _0218ef48 ; =data_ov44_0218ff90 @@ -7445,7 +7445,7 @@ func_ov44_0218ef4c: ; 0x0218ef4c ldr r1, _0218f04c ; =0x4b455448 ldr r2, _0218f050 ; =func_ov44_0218c6d8 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218f048 ; =data_ov44_0218ffd0 ldr r1, _0218f054 ; =_ZN9ActorTypeD1Ev ldr r2, _0218f058 ; =data_ov44_0218ffc4 @@ -7524,7 +7524,7 @@ func_ov44_0218f070: ; 0x0218f070 ldr r1, _0218f16c ; =0x52415430 ldr r2, _0218f170 ; =func_ov44_0218d510 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218f168 ; =data_ov44_0218fffc ldr r1, _0218f174 ; =_ZN9ActorTypeD1Ev ldr r2, _0218f178 ; =data_ov44_0218fff0 @@ -7600,7 +7600,7 @@ func_ov44_0218f18c: ; 0x0218f18c ldr r1, _0218f1bc ; =0x52415448 ldr r2, _0218f1c0 ; =func_ov44_0218e320 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218f1b8 ; =data_ov44_02190028 ldr r1, _0218f1c4 ; =_ZN9ActorTypeD1Ev ldr r2, _0218f1c8 ; =data_ov44_0219001c diff --git a/asm/ov45.inc b/asm/ov45.inc index c49e3b9e..e4ea15e2 100644 --- a/asm/ov45.inc +++ b/asm/ov45.inc @@ -107,7 +107,7 @@ .extern func_020376c0 .extern func_02039250 .extern func_0203d77c -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_ov00_0207b1fc .extern func_ov00_0207c1b0 diff --git a/asm/ov45.s b/asm/ov45.s index a1c29d5c..2096492a 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -6579,7 +6579,7 @@ func_ov45_0218e3e8: ; 0x0218e3e8 ldr r1, _0218e418 ; =0x54524144 ldr r2, _0218e41c ; =func_ov45_02189560 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e414 ; =data_ov45_0218ed8c ldr r1, _0218e420 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e424 ; =data_ov45_0218ed80 @@ -6601,7 +6601,7 @@ func_ov45_0218e428: ; 0x0218e428 ldr r1, _0218e458 ; =0x54524142 ldr r2, _0218e45c ; =func_ov45_0218a838 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e454 ; =data_ov45_0218edb0 ldr r1, _0218e460 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e464 ; =data_ov45_0218eda4 @@ -6623,7 +6623,7 @@ func_ov45_0218e468: ; 0x0218e468 ldr r1, _0218e498 ; =0x4a554447 ldr r2, _0218e49c ; =func_ov45_0218c4c4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0218e494 ; =data_ov45_0218edd4 ldr r1, _0218e4a0 ; =_ZN9ActorTypeD1Ev ldr r2, _0218e4a4 ; =data_ov45_0218edc8 diff --git a/asm/ov46.inc b/asm/ov46.inc index 094317f1..ad641334 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -58,7 +58,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov46.s b/asm/ov46.s index 58abc6f7..bc337b41 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -5269,7 +5269,7 @@ func_ov46_021944ac: ; 0x021944ac ldr r1, _021944dc ; =0x4c4e424b ldr r2, _021944e0 ; =func_ov46_02190040 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021944d8 ; =data_ov46_02194bac ldr r1, _021944e4 ; =_ZN9ActorTypeD1Ev ldr r2, _021944e8 ; =data_ov46_02194ba0 @@ -5291,7 +5291,7 @@ func_ov46_021944ec: ; 0x021944ec ldr r1, _0219451c ; =0x4c4e4232 ldr r2, _02194520 ; =func_ov46_02190978 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02194518 ; =data_ov46_02194bcc ldr r1, _02194524 ; =_ZN9ActorTypeD1Ev ldr r2, _02194528 ; =data_ov46_02194bc0 @@ -5314,7 +5314,7 @@ func_ov46_0219452c: ; 0x0219452c ldr r1, _02194594 ; =0x4d524848 ldr r2, _02194598 ; =func_ov46_02191e5c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02194590 ; =data_ov46_02194c54 ldr r1, _0219459c ; =_ZN9ActorTypeD1Ev ldr r2, _021945a0 ; =data_ov46_02194c48 @@ -5352,7 +5352,7 @@ func_ov46_021945ac: ; 0x021945ac ldr r1, _02194624 ; =0x54534e49 ldr r2, _02194628 ; =func_ov46_02192930 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02194620 ; =data_ov46_02194c74 ldr r1, _0219462c ; =_ZN9ActorTypeD1Ev ldr r2, _02194630 ; =data_ov46_02194c68 diff --git a/asm/ov47.inc b/asm/ov47.inc index af2f158f..85980699 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -98,7 +98,7 @@ .extern func_0201e388 .extern func_0202e310 .extern func_0202e58c -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov47.s b/asm/ov47.s index 3e0b40d6..447e5da9 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -5136,7 +5136,7 @@ func_ov47_021942f0: ; 0x021942f0 ldr r1, _02194320 ; =0x524c5347 ldr r2, _02194324 ; =func_ov47_02190040 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0219431c ; =data_ov47_02194a0c ldr r1, _02194328 ; =_ZN9ActorTypeD1Ev ldr r2, _0219432c ; =data_ov47_02194a00 @@ -5158,7 +5158,7 @@ func_ov47_02194330: ; 0x02194330 ldr r1, _02194360 ; =0x524c5354 ldr r2, _02194364 ; =func_ov47_02190334 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0219435c ; =data_ov47_02194a2c ldr r1, _02194368 ; =_ZN9ActorTypeD1Ev ldr r2, _0219436c ; =data_ov47_02194a20 @@ -5181,7 +5181,7 @@ func_ov47_02194370: ; 0x02194370 ldr r1, _02194484 ; =0x4653484d ldr r2, _02194488 ; =func_ov47_02191438 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02194480 ; =data_ov47_02194a4c ldr r1, _0219448c ; =_ZN9ActorTypeD1Ev ldr r2, _02194490 ; =data_ov47_02194a40 @@ -5264,7 +5264,7 @@ func_ov47_021944a8: ; 0x021944a8 ldr r1, _021944d8 ; =0x46534842 ldr r2, _021944dc ; =func_ov47_02193a54 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021944d4 ; =data_ov47_02194a78 ldr r1, _021944e0 ; =_ZN9ActorTypeD1Ev ldr r2, _021944e4 ; =data_ov47_02194a6c diff --git a/asm/ov48.inc b/asm/ov48.inc index f897a1c1..83d1fe0e 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -162,7 +162,7 @@ .extern func_0201e544 .extern func_0202b154 .extern func_0202e58c -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov48.s b/asm/ov48.s index e0ffa4b0..1535c91f 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -5759,7 +5759,7 @@ func_ov48_021946c0: ; 0x021946c0 ldr r1, _021947b4 ; =0x42424c45 ldr r2, _021947b8 ; =func_ov48_02190040 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021947b0 ; =data_ov48_0219540c ldr r1, _021947bc ; =_ZN9ActorTypeD1Ev ldr r2, _021947c0 ; =data_ov48_02195400 @@ -5833,7 +5833,7 @@ func_ov48_021947d0: ; 0x021947d0 ldr r1, _021948d8 ; =0x424d4f53 ldr r2, _021948dc ; =func_ov48_02190c34 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021948d4 ; =data_ov48_02195438 ldr r1, _021948e0 ; =_ZN9ActorTypeD1Ev ldr r2, _021948e4 ; =data_ov48_0219542c @@ -5913,7 +5913,7 @@ func_ov48_021948f8: ; 0x021948f8 ldr r1, _021949f4 ; =0x5441494c ldr r2, _021949f8 ; =func_ov48_02191d48 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021949f0 ; =data_ov48_02195478 ldr r1, _021949fc ; =_ZN9ActorTypeD1Ev ldr r2, _02194a00 ; =data_ov48_0219546c @@ -5989,7 +5989,7 @@ func_ov48_02194a14: ; 0x02194a14 ldr r1, _02194a44 ; =0x46495242 ldr r2, _02194a48 ; =func_ov48_02193414 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02194a40 ; =data_ov48_021954a4 ldr r1, _02194a4c ; =_ZN9ActorTypeD1Ev ldr r2, _02194a50 ; =data_ov48_02195498 @@ -6011,7 +6011,7 @@ func_ov48_02194a54: ; 0x02194a54 ldr r1, _02194a84 ; =0x54414c42 ldr r2, _02194a88 ; =func_ov48_02193fd4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02194a80 ; =data_ov48_021954c4 ldr r1, _02194a8c ; =_ZN9ActorTypeD1Ev ldr r2, _02194a90 ; =data_ov48_021954b8 @@ -6033,7 +6033,7 @@ func_ov48_02194a94: ; 0x02194a94 ldr r1, _02194ac4 ; =0x424d5345 ldr r2, _02194ac8 ; =func_ov48_021940ac mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02194ac0 ; =data_ov48_021954e4 ldr r1, _02194acc ; =_ZN9ActorTypeD1Ev ldr r2, _02194ad0 ; =data_ov48_021954d8 diff --git a/asm/ov49.inc b/asm/ov49.inc index 7ff8c456..b77fe9ce 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -110,7 +110,7 @@ .extern func_0202b154 .extern func_0202e310 .extern func_0202e58c -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f754 .extern func_ov00_02079e68 diff --git a/asm/ov49.s b/asm/ov49.s index cdf531cb..cf315d82 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -3496,7 +3496,7 @@ func_ov49_021982c8: ; 0x021982c8 ldr r1, _021983d0 ; =0x4c4b4c4b ldr r2, _021983d4 ; =func_ov49_02195500 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021983cc ; =data_ov49_0219892c ldr r1, _021983d8 ; =_ZN9ActorTypeD1Ev ldr r2, _021983dc ; =data_ov49_02198920 @@ -3576,7 +3576,7 @@ func_ov49_021983f4: ; 0x021983f4 ldr r1, _02198424 ; =0x4e534844 ldr r2, _02198428 ; =func_ov49_0219763c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02198420 ; =data_ov49_02198958 ldr r1, _0219842c ; =_ZN9ActorTypeD1Ev ldr r2, _02198430 ; =data_ov49_0219894c @@ -3598,7 +3598,7 @@ func_ov49_02198434: ; 0x02198434 ldr r1, _02198464 ; =0x45514152 ldr r2, _02198468 ; =func_ov49_02197cf4 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02198460 ; =data_ov49_02198978 ldr r1, _0219846c ; =_ZN9ActorTypeD1Ev ldr r2, _02198470 ; =data_ov49_0219896c diff --git a/asm/ov50.inc b/asm/ov50.inc index cde44167..b6644b51 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -67,7 +67,7 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5Actor9IsGrabbedEv .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov50.s b/asm/ov50.s index af947e52..3ca9af3a 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -3898,7 +3898,7 @@ func_ov50_0219882c: ; 0x0219882c ldr r1, _02198878 ; =0x42494752 ldr r2, _0219887c ; =func_ov50_02195500 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02198874 ; =data_ov50_02198cac ldr r1, _02198880 ; =_ZN9ActorTypeD1Ev ldr r2, _02198884 ; =data_ov50_02198ca0 @@ -3930,7 +3930,7 @@ func_ov50_02198890: ; 0x02198890 ldr r1, _02198988 ; =0x43524f57 ldr r2, _0219898c ; =func_ov50_02197580 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02198984 ; =data_ov50_02198ccc ldr r1, _02198990 ; =_ZN9ActorTypeD1Ev ldr r2, _02198994 ; =data_ov50_02198cc0 diff --git a/asm/ov51.inc b/asm/ov51.inc index c6a423aa..43a42cd2 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -95,7 +95,7 @@ .extern func_0202bb98 .extern func_0202bba8 .extern func_0202bbbc -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov51.s b/asm/ov51.s index c620ed3a..c2693ea5 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -3553,7 +3553,7 @@ func_ov51_021982a0: ; 0x021982a0 ldr r1, _021982d0 ; =0x46495247 ldr r2, _021982d4 ; =func_ov51_02195500 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _021982cc ; =data_ov51_02198a6c ldr r1, _021982d8 ; =_ZN9ActorTypeD1Ev ldr r2, _021982dc ; =data_ov51_02198a60 @@ -3575,7 +3575,7 @@ func_ov51_021982e0: ; 0x021982e0 ldr r1, _02198310 ; =0x46495245 ldr r2, _02198314 ; =func_ov51_0219590c mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0219830c ; =data_ov51_02198a8c ldr r1, _02198318 ; =_ZN9ActorTypeD1Ev ldr r2, _0219831c ; =data_ov51_02198a80 @@ -3598,7 +3598,7 @@ func_ov51_02198320: ; 0x02198320 ldr r1, _02198410 ; =0x46495253 ldr r2, _02198414 ; =func_ov51_02195efc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0219840c ; =data_ov51_02198ac0 ldr r1, _02198418 ; =_ZN9ActorTypeD1Ev ldr r2, _0219841c ; =data_ov51_02198ab4 @@ -3671,7 +3671,7 @@ func_ov51_02198430: ; 0x02198430 ldr r1, _02198460 ; =0x4e545250 ldr r2, _02198464 ; =func_ov51_02196698 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0219845c ; =data_ov51_02198aec ldr r1, _02198468 ; =_ZN9ActorTypeD1Ev ldr r2, _0219846c ; =data_ov51_02198ae0 @@ -3693,7 +3693,7 @@ func_ov51_02198470: ; 0x02198470 ldr r1, _021984a0 ; =0x5350524c ldr r2, _021984a4 ; =func_ov51_021977d0 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _0219849c ; =data_ov51_02198b0c ldr r1, _021984a8 ; =_ZN9ActorTypeD1Ev ldr r2, _021984ac ; =data_ov51_02198b00 diff --git a/asm/ov52.inc b/asm/ov52.inc index 98a301f7..9b4eb2c7 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -60,7 +60,7 @@ .extern _ZN5Actor8vfunc_b0Ev .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE .extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/ov52.s b/asm/ov52.s index 13915b53..a0acf51f 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -2842,7 +2842,7 @@ func_ov52_021978d4: ; 0x021978d4 ldr r1, _02197904 ; =0x4154474d ldr r2, _02197908 ; =func_ov52_02196510 mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02197900 ; =data_ov52_02197c54 ldr r1, _0219790c ; =_ZN9ActorTypeD1Ev ldr r2, _02197910 ; =data_ov52_02197c48 @@ -2864,7 +2864,7 @@ func_ov52_02197914: ; 0x02197914 ldr r1, _02197944 ; =0x4154474e ldr r2, _02197948 ; =func_ov52_02196ddc mov r3, #0 - bl _ZN9ActorTypeC1EjPFP5ActorvEPv + bl _ZN9ActorTypeC1EjPFP5ActorvEPFivE ldr r0, _02197940 ; =data_ov52_02197c80 ldr r1, _0219794c ; =_ZN9ActorTypeD1Ev ldr r2, _02197950 ; =data_ov52_02197c74 diff --git a/include/Actor/ActorType.hpp b/include/Actor/ActorType.hpp index 29031faf..dcbc9409 100644 --- a/include/Actor/ActorType.hpp +++ b/include/Actor/ActorType.hpp @@ -70,14 +70,14 @@ typedef Actor* (*ActorCreateFunc)(); struct ActorType { /* 00 */ ActorTypeId id; /* 04 */ ActorCreateFunc create; - /* 08 */ void *unk_08; + /* 08 */ unk32 (*unk_08)(); /* 0c */ unk32 unk_0c; /* 10 */ ActorType *next; /* 14 */ - ActorType(ActorTypeId id, ActorCreateFunc create, void *unk_08); + ActorType(ActorTypeId id, ActorCreateFunc create, unk32 (*unk_08)()); ~ActorType(); - void func_0203e7c8(); + unk32 func_0203e7c8(); void Register(); void Unregister(); static ActorType* Find(ActorTypeId id); From af20c468f130cb9458ab5da7de117f11deda3164 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 24 Apr 2024 18:28:11 -0400 Subject: [PATCH 2/4] Match `ActorType.s` --- asm/main/Actor/ActorType.inc | 1 - asm/main/Actor/ActorType.s | 120 ------------------------ asm/main/Actor/ActorType_Unregister.inc | 21 +++++ src/Main/Actor/ActorType.cpp | 77 +++++++++++++-- tools/lcf.py | 1 - 5 files changed, 89 insertions(+), 131 deletions(-) delete mode 100644 asm/main/Actor/ActorType.inc delete mode 100644 asm/main/Actor/ActorType.s create mode 100644 asm/main/Actor/ActorType_Unregister.inc diff --git a/asm/main/Actor/ActorType.inc b/asm/main/Actor/ActorType.inc deleted file mode 100644 index 6f70f09b..00000000 --- a/asm/main/Actor/ActorType.inc +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/asm/main/Actor/ActorType.s b/asm/main/Actor/ActorType.s deleted file mode 100644 index f7a61967..00000000 --- a/asm/main/Actor/ActorType.s +++ /dev/null @@ -1,120 +0,0 @@ - .include "main/Actor/ActorType.inc" - .include "macros/function.inc" - - .text - - .global _ZN9ActorTypeC1EjPFP5ActorvEPv - arm_func_start _ZN9ActorTypeC1EjPFP5ActorvEPv -_ZN9ActorTypeC1EjPFP5ActorvEPv: ; 0x0203e784 - stmdb sp!, {r4, lr} - mov r4, r0 - stmia r4, {r1, r2, r3} - mov r1, #0 - str r1, [r4, #0xc] - str r1, [r4, #0x10] - bl _ZN9ActorType8RegisterEv - ldr r1, _0203e7b0 ; =sActorTypeList - mov r0, r4 - str r4, [r1, #4] - ldmia sp!, {r4, pc} - .align 2, 0 - arm_func_end _ZN9ActorTypeC1EjPFP5ActorvEPv -_0203e7b0: .word sActorTypeList - - .global _ZN9ActorTypeD1Ev - arm_func_start _ZN9ActorTypeD1Ev -_ZN9ActorTypeD1Ev: ; 0x0203e7b4 - stmdb sp!, {r4, lr} - mov r4, r0 - bl _ZN9ActorType10UnregisterEv - mov r0, r4 - ldmia sp!, {r4, pc} - arm_func_end _ZN9ActorTypeD1Ev - - .global _ZN9ActorType13func_0203e7c8Ev - arm_func_start _ZN9ActorType13func_0203e7c8Ev -_ZN9ActorType13func_0203e7c8Ev: ; 0x0203e7c8 - stmdb sp!, {r3, lr} - ldr r0, [r0, #8] - cmp r0, #0 - moveq r0, #0 - ldmeqia sp!, {r3, pc} - blx r0 - ldmia sp!, {r3, pc} - arm_func_end _ZN9ActorType13func_0203e7c8Ev - - .global _ZN9ActorType8RegisterEv - arm_func_start _ZN9ActorType8RegisterEv -_ZN9ActorType8RegisterEv: ; 0x0203e7e4 - ldr r1, _0203e810 ; =sActorTypeList - ldr r2, _0203e814 ; =sActorTypeList - ldr r1, [r1] - cmp r1, #0 - beq _0203e808 -_0203e7f8: - add r2, r1, #0x10 - ldr r1, [r1, #0x10] - cmp r1, #0 - bne _0203e7f8 -_0203e808: - str r0, [r2] - bx lr - .align 2, 0 - arm_func_end _ZN9ActorType8RegisterEv -_0203e810: .word sActorTypeList -_0203e814: .word sActorTypeList - - .global _ZN9ActorType10UnregisterEv - arm_func_start _ZN9ActorType10UnregisterEv -_ZN9ActorType10UnregisterEv: ; 0x0203e818 - ldr r1, _0203e860 ; =sActorTypeList - ldr r2, _0203e864 ; =sActorTypeList - ldr r1, [r1] - mov r3, #0 - cmp r1, #0 - beq _0203e84c -_0203e830: - cmp r1, r0 - beq _0203e84c - mov r3, r2 - add r2, r1, #0x10 - ldr r1, [r1, #0x10] - cmp r1, #0 - bne _0203e830 -_0203e84c: - cmp r3, #0 - ldrne r1, [r0, #0x10] - ldrne r0, [r3] - strne r1, [r0, #0x10] - bx lr - .align 2, 0 - arm_func_end _ZN9ActorType10UnregisterEv -_0203e860: .word sActorTypeList -_0203e864: .word sActorTypeList - - .global _ZN9ActorType4FindEj - arm_func_start _ZN9ActorType4FindEj -_ZN9ActorType4FindEj: ; 0x0203e868 - ldr r1, _0203e89c ; =sActorTypeList - ldr r2, [r1] - cmp r2, #0 - beq _0203e894 -_0203e878: - ldr r1, [r2] - cmp r0, r1 - moveq r0, r2 - bxeq lr - ldr r2, [r2, #0x10] - cmp r2, #0 - bne _0203e878 -_0203e894: - mov r0, #0 - bx lr - .align 2, 0 - arm_func_end _ZN9ActorType4FindEj -_0203e89c: .word sActorTypeList - - .bss - .global sActorTypeList -sActorTypeList: - .space 0x8 diff --git a/asm/main/Actor/ActorType_Unregister.inc b/asm/main/Actor/ActorType_Unregister.inc new file mode 100644 index 00000000..fe27d9f9 --- /dev/null +++ b/asm/main/Actor/ActorType_Unregister.inc @@ -0,0 +1,21 @@ + + ldr r1, sActorTypeList + ldr r2, sActorTypeList2 + ldr r1, [r1] + mov r3, #0 + cmp r1, #0 + beq _0203e84c +_0203e830: + cmp r1, r0 + beq _0203e84c + mov r3, r2 + add r2, r1, #0x10 + ldr r1, [r1, #0x10] + cmp r1, #0 + bne _0203e830 +_0203e84c: + cmp r3, #0 + ldrne r1, [r0, #0x10] + ldrne r0, [r3] + strne r1, [r0, #0x10] + bx lr diff --git a/src/Main/Actor/ActorType.cpp b/src/Main/Actor/ActorType.cpp index bf8f54ae..b6ece417 100644 --- a/src/Main/Actor/ActorType.cpp +++ b/src/Main/Actor/ActorType.cpp @@ -1,14 +1,73 @@ #include "Actor/ActorType.hpp" -#ifdef STUBS - ActorTypeList sActorTypeList; +ActorTypeList sActorTypeList2; -ActorType::ActorType(ActorTypeId id, ActorCreateFunc create, void *unk_08) {} -ActorType::~ActorType() {} -void ActorType::func_0203e7c8() {} -void ActorType::Register() {} -void ActorType::Unregister() {} -ActorType* ActorType::Find(ActorTypeId id) {} +// Kill duplicate dtors +KILL(_ZN9ActorTypeC2EjPFP5ActorvEPFivE) +KILL(_ZN9ActorTypeD2Ev) -#endif +ARM ActorType::ActorType(ActorTypeId id, ActorCreateFunc create, unk32 (*unk_08)()) { + this->id = id; + this->create = create; + this->unk_08 = unk_08; + this->unk_0c = 0; + this->next = NULL; + this->Register(); + sActorTypeList.tail = this; +} + +ARM ActorType::~ActorType() { + this->Unregister(); +} + +ARM unk32 ActorType::func_0203e7c8() { + if (this->unk_08 == NULL) { + return 0; + } + return (*unk_08)(); +} + +ARM void ActorType::Register() { + ActorType *actorType; + ActorType **tail = &sActorTypeList.tail; + + for (actorType = sActorTypeList.head; actorType != NULL; actorType = actorType->next) { + tail = &actorType->next; + } + + *tail = this; +} + +ARM void NONMATCH(ActorType::Unregister)() { + #ifndef NONMATCHING + #include "../asm/main/Actor/ActorType_Unregister.inc" + #else + ActorType *actorType; + + ActorType **current = &sActorTypeList2.head; + ActorType **previous = NULL; + + for (actorType = sActorTypeList.head; actorType != NULL; actorType = actorType->next) { + if (actorType == this) break; + previous = current; + current = &actorType->next; + } + + if (previous != NULL) { + (*previous)->next = this->next; + } + #endif +} + +ARM ActorType *ActorType::Find(ActorTypeId id) { + ActorType *actorType; + + for (actorType = sActorTypeList.head; actorType != NULL; actorType = actorType->next) { + if (id == actorType->id) { + return actorType; + } + } + + return NULL; +} diff --git a/tools/lcf.py b/tools/lcf.py index a77690d9..084d03a9 100644 --- a/tools/lcf.py +++ b/tools/lcf.py @@ -14,7 +14,6 @@ ARM9_OBJECTS = [ 'asm/main/main_02000000.s', 'src/Main/Actor/ActorType.cpp', - 'asm/main/Actor/ActorType.s', 'asm/main/main_0203e8a0.s', From ce86feb21de96b651e0ce9f50415a4053b6cd245 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 4 May 2024 10:57:15 -0400 Subject: [PATCH 3/4] Match `ActorType::Unregister` --- asm/main/Actor/ActorType_Unregister.inc | 21 --------------------- src/Main/Actor/ActorType.cpp | 9 ++------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 asm/main/Actor/ActorType_Unregister.inc diff --git a/asm/main/Actor/ActorType_Unregister.inc b/asm/main/Actor/ActorType_Unregister.inc deleted file mode 100644 index fe27d9f9..00000000 --- a/asm/main/Actor/ActorType_Unregister.inc +++ /dev/null @@ -1,21 +0,0 @@ - - ldr r1, sActorTypeList - ldr r2, sActorTypeList2 - ldr r1, [r1] - mov r3, #0 - cmp r1, #0 - beq _0203e84c -_0203e830: - cmp r1, r0 - beq _0203e84c - mov r3, r2 - add r2, r1, #0x10 - ldr r1, [r1, #0x10] - cmp r1, #0 - bne _0203e830 -_0203e84c: - cmp r3, #0 - ldrne r1, [r0, #0x10] - ldrne r0, [r3] - strne r1, [r0, #0x10] - bx lr diff --git a/src/Main/Actor/ActorType.cpp b/src/Main/Actor/ActorType.cpp index b6ece417..41b3269d 100644 --- a/src/Main/Actor/ActorType.cpp +++ b/src/Main/Actor/ActorType.cpp @@ -1,7 +1,6 @@ #include "Actor/ActorType.hpp" ActorTypeList sActorTypeList; -ActorTypeList sActorTypeList2; // Kill duplicate dtors KILL(_ZN9ActorTypeC2EjPFP5ActorvEPFivE) @@ -39,13 +38,10 @@ ARM void ActorType::Register() { *tail = this; } -ARM void NONMATCH(ActorType::Unregister)() { - #ifndef NONMATCHING - #include "../asm/main/Actor/ActorType_Unregister.inc" - #else +ARM void ActorType::Unregister() { ActorType *actorType; - ActorType **current = &sActorTypeList2.head; + ActorType **current = &sActorTypeList.head; ActorType **previous = NULL; for (actorType = sActorTypeList.head; actorType != NULL; actorType = actorType->next) { @@ -57,7 +53,6 @@ ARM void NONMATCH(ActorType::Unregister)() { if (previous != NULL) { (*previous)->next = this->next; } - #endif } ARM ActorType *ActorType::Find(ActorTypeId id) { From 16b0d3b4453332ea404e598473f2f765a857c004 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 4 May 2024 12:28:46 -0400 Subject: [PATCH 4/4] Fix error --- src/Main/Actor/ActorType.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Main/Actor/ActorType.cpp b/src/Main/Actor/ActorType.cpp index 41b3269d..39579811 100644 --- a/src/Main/Actor/ActorType.cpp +++ b/src/Main/Actor/ActorType.cpp @@ -29,7 +29,7 @@ ARM unk32 ActorType::func_0203e7c8() { ARM void ActorType::Register() { ActorType *actorType; - ActorType **tail = &sActorTypeList.tail; + ActorType **tail = &sActorTypeList.head; for (actorType = sActorTypeList.head; actorType != NULL; actorType = actorType->next) { tail = &actorType->next;