From c5430ca4ace6649ace77748fd66aebe895fcb04f Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 18 May 2024 16:46:33 +0200 Subject: [PATCH] Update `Actor` --- asm/ov00/Actor/Actor.s | 10 ++-- asm/ov00/ov00_02086cd0.inc | 2 +- asm/ov00/ov00_02086cd0.s | 4 +- asm/ov00/ov00_020980f4.inc | 2 +- asm/ov00/ov00_020980f4.s | 6 +-- asm/ov00/ov00_020b1498.inc | 2 +- asm/ov00/ov00_020b1498.s | 10 ++-- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 18 +++---- asm/ov03.inc | 2 +- asm/ov03.s | 2 +- asm/ov12.inc | 2 +- asm/ov12.s | 2 +- asm/ov14/Actor/ActorRupee.inc | 2 +- asm/ov14/Actor/ActorRupee.s | 2 +- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 50 +++++++++---------- asm/ov14/ov14_0213b778.inc | 2 +- asm/ov14/ov14_0213b778.s | 24 ++++----- asm/ov15.inc | 2 +- asm/ov15.s | 92 +++++++++++++++++------------------ asm/ov17.inc | 2 +- asm/ov17.s | 4 +- asm/ov18.inc | 2 +- asm/ov18.s | 8 +-- 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 | 24 ++++----- asm/ov23.inc | 2 +- asm/ov23.s | 12 ++--- asm/ov24.inc | 2 +- asm/ov24.s | 18 +++---- asm/ov25.inc | 2 +- asm/ov25.s | 20 ++++---- asm/ov26.inc | 2 +- asm/ov26.s | 14 +++--- asm/ov27.inc | 2 +- asm/ov27.s | 12 ++--- asm/ov28.inc | 2 +- asm/ov28.s | 26 +++++----- asm/ov29.inc | 2 +- asm/ov29.s | 18 +++---- asm/ov30.inc | 2 +- asm/ov30.s | 2 +- asm/ov31.inc | 2 +- asm/ov31.s | 40 +++++++-------- 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 | 2 +- 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 | 8 +-- asm/ov43.inc | 2 +- asm/ov43.s | 8 +-- 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 | 4 +- 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 | 2 +- include/Actor/Actor.hpp | 10 ++-- src/00_Core/Actor/Actor.cpp | 72 ++++++++++++++++++++++++--- 95 files changed, 437 insertions(+), 381 deletions(-) diff --git a/asm/ov00/Actor/Actor.s b/asm/ov00/Actor/Actor.s index dc835a5a..08bdb814 100644 --- a/asm/ov00/Actor/Actor.s +++ b/asm/ov00/Actor/Actor.s @@ -247,9 +247,9 @@ _ZN5Actor8vfunc_18Ej: ; 0x020c17bc _020c17d0: .word func_ov00_0207a1c8 arm_func_end _ZN5Actor8vfunc_18Ej - .global _ZN5Actor8vfunc_1cEt - arm_func_start _ZN5Actor8vfunc_1cEt -_ZN5Actor8vfunc_1cEt: ; 0x020c17d4 + .global _ZN5Actor8vfunc_1cEPt + arm_func_start _ZN5Actor8vfunc_1cEPt +_ZN5Actor8vfunc_1cEPt: ; 0x020c17d4 stmdb sp!, {r4, lr} sub sp, sp, #0x38 mov ip, r0 @@ -300,7 +300,7 @@ _020c181c: _020c1888: .word 0x0000ffff _020c188c: .word data_027e0d3c _020c1890: .word data_02063e4c - arm_func_end _ZN5Actor8vfunc_1cEt + arm_func_end _ZN5Actor8vfunc_1cEPt .global _ZN5Actor8vfunc_20Ei arm_func_start _ZN5Actor8vfunc_20Ei @@ -2842,7 +2842,7 @@ data_ov00_020e720c: ; 0x020e720c .word _ZN5Actor8vfunc_18Ej .global data_ov00_020e7210 data_ov00_020e7210: ; 0x020e7210 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e7214 data_ov00_020e7214: ; 0x020e7214 .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov00/ov00_02086cd0.inc b/asm/ov00/ov00_02086cd0.inc index 404c0a5f..7224cdaf 100644 --- a/asm/ov00/ov00_02086cd0.inc +++ b/asm/ov00/ov00_02086cd0.inc @@ -65,7 +65,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov00/ov00_02086cd0.s b/asm/ov00/ov00_02086cd0.s index 840176db..9e4b27fb 100644 --- a/asm/ov00/ov00_02086cd0.s +++ b/asm/ov00/ov00_02086cd0.s @@ -24293,7 +24293,7 @@ data_ov00_020e2948: ; 0x020e2948 .word func_ov00_0208fbfc .global data_ov00_020e294c data_ov00_020e294c: ; 0x020e294c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e2950 data_ov00_020e2950: ; 0x020e2950 .word _ZN5Actor8vfunc_20Ei @@ -24434,7 +24434,7 @@ data_ov00_020e2a04: ; 0x020e2a04 .word _ZN5Actor8vfunc_18Ej .global data_ov00_020e2a08 data_ov00_020e2a08: ; 0x020e2a08 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e2a0c data_ov00_020e2a0c: ; 0x020e2a0c .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index 7d328428..23a37910 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -42,7 +42,7 @@ .extern _ZN5Actor8vfunc_08Ev .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov00/ov00_020980f4.s b/asm/ov00/ov00_020980f4.s index fe9fc301..ee573198 100644 --- a/asm/ov00/ov00_020980f4.s +++ b/asm/ov00/ov00_020980f4.s @@ -24529,7 +24529,7 @@ data_ov00_020e4c68: ; 0x020e4c68 .word _ZN5Actor8vfunc_18Ej .global data_ov00_020e4c6c data_ov00_020e4c6c: ; 0x020e4c6c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e4c70 data_ov00_020e4c70: ; 0x020e4c70 .word _ZN5Actor8vfunc_20Ei @@ -24992,7 +24992,7 @@ data_ov00_020e4f10: ; 0x020e4f10 .word _ZN5Actor8vfunc_18Ej .global data_ov00_020e4f14 data_ov00_020e4f14: ; 0x020e4f14 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e4f18 data_ov00_020e4f18: ; 0x020e4f18 .word _ZN5Actor8vfunc_20Ei @@ -25686,7 +25686,7 @@ data_ov00_020e5314: ; 0x020e5314 .word _ZN5Actor8vfunc_18Ej .global data_ov00_020e5318 data_ov00_020e5318: ; 0x020e5318 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e531c data_ov00_020e531c: ; 0x020e531c .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index df048cff..ed10c623 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -114,7 +114,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 7832204c..f56f0a6b 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -23058,7 +23058,7 @@ data_ov00_020e6578: ; 0x020e6578 .word func_ov00_020b9ccc .global data_ov00_020e657c data_ov00_020e657c: ; 0x020e657c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e6580 data_ov00_020e6580: ; 0x020e6580 .word func_ov00_020b8418 @@ -23271,7 +23271,7 @@ data_ov00_020e6694: ; 0x020e6694 .word func_ov00_020b9ccc .global data_ov00_020e6698 data_ov00_020e6698: ; 0x020e6698 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e669c data_ov00_020e669c: ; 0x020e669c .word func_ov00_020ba0d4 @@ -23549,7 +23549,7 @@ data_ov00_020e67fc: ; 0x020e67fc .word func_ov00_020b9ccc .global data_ov00_020e6800 data_ov00_020e6800: ; 0x020e6800 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e6804 data_ov00_020e6804: ; 0x020e6804 .word func_ov00_020ba0d4 @@ -24180,7 +24180,7 @@ data_ov00_020e6d5c: ; 0x020e6d5c .word func_ov00_020be40c .global data_ov00_020e6d60 data_ov00_020e6d60: ; 0x020e6d60 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e6d64 data_ov00_020e6d64: ; 0x020e6d64 .word _ZN5Actor8vfunc_20Ei @@ -24812,7 +24812,7 @@ data_ov00_020e70b8: ; 0x020e70b8 .word func_ov00_020b9ccc .global data_ov00_020e70bc data_ov00_020e70bc: ; 0x020e70bc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e70c0 data_ov00_020e70c0: ; 0x020e70c0 .word func_ov00_020ba0d4 diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index c84f3e83..c99fea26 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -75,7 +75,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index d52cef5b..c3c834dd 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -31274,7 +31274,7 @@ data_ov00_020e8478: ; 0x020e8478 .word func_ov00_020c9bd4 .global data_ov00_020e847c data_ov00_020e847c: ; 0x020e847c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e8480 data_ov00_020e8480: ; 0x020e8480 .word func_ov00_020c9be8 @@ -31512,7 +31512,7 @@ data_ov00_020e85f0: ; 0x020e85f0 .word func_ov00_020ca148 .global data_ov00_020e85f4 data_ov00_020e85f4: ; 0x020e85f4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e85f8 data_ov00_020e85f8: ; 0x020e85f8 .word func_ov00_020ca15c @@ -31734,7 +31734,7 @@ data_ov00_020e8718: ; 0x020e8718 .word _ZN5Actor8vfunc_18Ej .global data_ov00_020e871c data_ov00_020e871c: ; 0x020e871c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e8720 data_ov00_020e8720: ; 0x020e8720 .word _ZN5Actor8vfunc_20Ei @@ -31875,7 +31875,7 @@ data_ov00_020e87d4: ; 0x020e87d4 .word func_ov00_020cad30 .global data_ov00_020e87d8 data_ov00_020e87d8: ; 0x020e87d8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e87dc data_ov00_020e87dc: ; 0x020e87dc .word func_ov00_020cb1c0 @@ -32627,7 +32627,7 @@ data_ov00_020e8bb8: ; 0x020e8bb8 .word func_ov00_020d3b44 .global data_ov00_020e8bbc data_ov00_020e8bbc: ; 0x020e8bbc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e8bc0 data_ov00_020e8bc0: ; 0x020e8bc0 .word _ZN5Actor8vfunc_20Ei @@ -32834,7 +32834,7 @@ data_ov00_020e8ccc: ; 0x020e8ccc .word func_ov00_020d3b44 .global data_ov00_020e8cd0 data_ov00_020e8cd0: ; 0x020e8cd0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e8cd4 data_ov00_020e8cd4: ; 0x020e8cd4 .word _ZN5Actor8vfunc_20Ei @@ -33080,7 +33080,7 @@ data_ov00_020e8e14: ; 0x020e8e14 .word func_ov00_020d3b44 .global data_ov00_020e8e18 data_ov00_020e8e18: ; 0x020e8e18 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e8e1c data_ov00_020e8e1c: ; 0x020e8e1c .word _ZN5Actor8vfunc_20Ei @@ -33435,7 +33435,7 @@ data_ov00_020e8fd8: ; 0x020e8fd8 .word func_ov00_020d40d8 .global data_ov00_020e8fdc data_ov00_020e8fdc: ; 0x020e8fdc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e8fe0 data_ov00_020e8fe0: ; 0x020e8fe0 .word _ZN5Actor8vfunc_20Ei @@ -33853,7 +33853,7 @@ data_ov00_020e9200: ; 0x020e9200 .word func_ov00_020d58ac .global data_ov00_020e9204 data_ov00_020e9204: ; 0x020e9204 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov00_020e9208 data_ov00_020e9208: ; 0x020e9208 .word func_ov00_020d58c0 diff --git a/asm/ov03.inc b/asm/ov03.inc index 79cbd34f..5753f0c5 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -22,7 +22,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov03.s b/asm/ov03.s index 4ef6cdd3..5bd6f849 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -44952,7 +44952,7 @@ data_ov03_02100894: ; 0x02100894 .word func_ov03_020fbb34 - 1 .global data_ov03_02100898 data_ov03_02100898: ; 0x02100898 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov03_0210089c data_ov03_0210089c: ; 0x0210089c .word func_ov03_020fbca8 - 1 diff --git a/asm/ov12.inc b/asm/ov12.inc index 1a29adc5..c28c8677 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -62,7 +62,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov12.s b/asm/ov12.s index 7931490b..97912b81 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -50682,7 +50682,7 @@ data_ov12_0213783c: ; 0x0213783c .word func_ov00_020d3b44 .global data_ov12_02137840 data_ov12_02137840: ; 0x02137840 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov12_02137844 data_ov12_02137844: ; 0x02137844 .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov14/Actor/ActorRupee.inc b/asm/ov14/Actor/ActorRupee.inc index 3d481870..8bd367e9 100644 --- a/asm/ov14/Actor/ActorRupee.inc +++ b/asm/ov14/Actor/ActorRupee.inc @@ -22,7 +22,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov14/Actor/ActorRupee.s b/asm/ov14/Actor/ActorRupee.s index 05691138..8cbc0a01 100644 --- a/asm/ov14/Actor/ActorRupee.s +++ b/asm/ov14/Actor/ActorRupee.s @@ -854,7 +854,7 @@ data_ov14_021589fc: ; 0x021589fc .word _ZN10ActorRupee8vfunc_18Ej .global data_ov14_02158a00 data_ov14_02158a00: ; 0x02158a00 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158a04 data_ov14_02158a04: ; 0x02158a04 .word _ZN10ActorRupee8vfunc_20Ei diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index bede5bb4..b7ebbfc8 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -100,7 +100,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 0d84c235..064151c0 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -35955,7 +35955,7 @@ data_ov14_02155a00: ; 0x02155a00 .word func_ov14_02120780 - 1 .global data_ov14_02155a04 data_ov14_02155a04: ; 0x02155a04 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02155a08 data_ov14_02155a08: ; 0x02155a08 .word func_ov14_02120ee4 - 1 @@ -36123,7 +36123,7 @@ data_ov14_02155ae0: ; 0x02155ae0 .word func_ov14_021219f8 - 1 .global data_ov14_02155ae4 data_ov14_02155ae4: ; 0x02155ae4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02155ae8 data_ov14_02155ae8: ; 0x02155ae8 .word _ZN5Actor8vfunc_20Ei @@ -36353,7 +36353,7 @@ data_ov14_02155c08: ; 0x02155c08 .word func_ov14_02122b20 - 1 .global data_ov14_02155c0c data_ov14_02155c0c: ; 0x02155c0c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02155c10 data_ov14_02155c10: ; 0x02155c10 .word func_ov14_02122cb4 - 1 @@ -36562,7 +36562,7 @@ data_ov14_02155d14: ; 0x02155d14 .word func_ov14_02123568 - 1 .global data_ov14_02155d18 data_ov14_02155d18: ; 0x02155d18 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02155d1c data_ov14_02155d1c: ; 0x02155d1c .word func_ov14_0212373c - 1 @@ -36759,7 +36759,7 @@ data_ov14_02155e10: ; 0x02155e10 .word func_ov14_02123ba8 - 1 ; func_ov15_02123ba8 .global data_ov14_02155e14 data_ov14_02155e14: ; 0x02155e14 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02155e18 data_ov14_02155e18: ; 0x02155e18 .word func_ov14_02123f04 - 1 @@ -41958,7 +41958,7 @@ data_ov14_02157910: ; 0x02157910 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02157914 data_ov14_02157914: ; 0x02157914 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02157918 data_ov14_02157918: ; 0x02157918 .word func_ov14_021353b8 - 1 @@ -42102,7 +42102,7 @@ data_ov14_021579d0: ; 0x021579d0 .word _ZN5Actor8vfunc_18Ej .global data_ov14_021579d4 data_ov14_021579d4: ; 0x021579d4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021579d8 data_ov14_021579d8: ; 0x021579d8 .word func_ov14_021353b8 - 1 @@ -42246,7 +42246,7 @@ data_ov14_02157a90: ; 0x02157a90 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02157a94 data_ov14_02157a94: ; 0x02157a94 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02157a98 data_ov14_02157a98: ; 0x02157a98 .word func_ov14_021353b8 - 1 @@ -42390,7 +42390,7 @@ data_ov14_02157b50: ; 0x02157b50 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02157b54 data_ov14_02157b54: ; 0x02157b54 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02157b58 data_ov14_02157b58: ; 0x02157b58 .word func_ov14_021353b8 - 1 @@ -42534,7 +42534,7 @@ data_ov14_02157c10: ; 0x02157c10 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02157c14 data_ov14_02157c14: ; 0x02157c14 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02157c18 data_ov14_02157c18: ; 0x02157c18 .word func_ov14_021353b8 - 1 @@ -42678,7 +42678,7 @@ data_ov14_02157cd0: ; 0x02157cd0 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02157cd4 data_ov14_02157cd4: ; 0x02157cd4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02157cd8 data_ov14_02157cd8: ; 0x02157cd8 .word func_ov14_021353b8 - 1 @@ -42894,7 +42894,7 @@ data_ov14_02157df0: ; 0x02157df0 .word func_ov14_02136450 - 1 .global data_ov14_02157df4 data_ov14_02157df4: ; 0x02157df4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02157df8 data_ov14_02157df8: ; 0x02157df8 .word func_ov14_02136490 - 1 @@ -43113,7 +43113,7 @@ data_ov14_02157f04: ; 0x02157f04 .word func_ov14_02136450 - 1 .global data_ov14_02157f08 data_ov14_02157f08: ; 0x02157f08 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02157f0c data_ov14_02157f0c: ; 0x02157f0c .word func_ov14_021373d8 - 1 @@ -43296,7 +43296,7 @@ data_ov14_02157ff8: ; 0x02157ff8 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02157ffc data_ov14_02157ffc: ; 0x02157ffc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158000 data_ov14_02158000: ; 0x02158000 .word func_ov14_02138128 - 1 @@ -43559,7 +43559,7 @@ data_ov14_0215814c: ; 0x0215814c .word _ZN5Actor8vfunc_18Ej .global data_ov14_02158150 data_ov14_02158150: ; 0x02158150 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158154 data_ov14_02158154: ; 0x02158154 .word _ZN5Actor8vfunc_20Ei @@ -43700,7 +43700,7 @@ data_ov14_02158208: ; 0x02158208 .word func_ov14_021389d8 - 1 .global data_ov14_0215820c data_ov14_0215820c: ; 0x0215820c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158210 data_ov14_02158210: ; 0x02158210 .word _ZN5Actor8vfunc_20Ei @@ -43850,7 +43850,7 @@ data_ov14_021582d0: ; 0x021582d0 .word func_ov14_021389d8 - 1 .global data_ov14_021582d4 data_ov14_021582d4: ; 0x021582d4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021582d8 data_ov14_021582d8: ; 0x021582d8 .word func_ov14_0213905c - 1 @@ -44000,7 +44000,7 @@ data_ov14_02158398: ; 0x02158398 .word func_ov14_021389d8 - 1 .global data_ov14_0215839c data_ov14_0215839c: ; 0x0215839c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021583a0 data_ov14_021583a0: ; 0x021583a0 .word func_ov14_021392ec - 1 @@ -44150,7 +44150,7 @@ data_ov14_02158460: ; 0x02158460 .word func_ov14_021389d8 - 1 .global data_ov14_02158464 data_ov14_02158464: ; 0x02158464 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158468 data_ov14_02158468: ; 0x02158468 .word func_ov14_02139708 - 1 @@ -44300,7 +44300,7 @@ data_ov14_02158528: ; 0x02158528 .word func_ov14_021389d8 - 1 .global data_ov14_0215852c data_ov14_0215852c: ; 0x0215852c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158530 data_ov14_02158530: ; 0x02158530 .word func_ov14_02139708 - 1 @@ -44450,7 +44450,7 @@ data_ov14_021585f0: ; 0x021585f0 .word _ZN5Actor8vfunc_18Ej .global data_ov14_021585f4 data_ov14_021585f4: ; 0x021585f4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021585f8 data_ov14_021585f8: ; 0x021585f8 .word _ZN5Actor8vfunc_20Ei @@ -44591,7 +44591,7 @@ data_ov14_021586ac: ; 0x021586ac .word func_ov14_0213a14c - 1 .global data_ov14_021586b0 data_ov14_021586b0: ; 0x021586b0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021586b4 data_ov14_021586b4: ; 0x021586b4 .word _ZN5Actor8vfunc_20Ei @@ -44732,7 +44732,7 @@ data_ov14_02158768: ; 0x02158768 .word func_ov14_0213a858 - 1 .global data_ov14_0215876c data_ov14_0215876c: ; 0x0215876c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158770 data_ov14_02158770: ; 0x02158770 .word func_ov14_0213a890 - 1 @@ -44873,7 +44873,7 @@ data_ov14_02158824: ; 0x02158824 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02158828 data_ov14_02158828: ; 0x02158828 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_0215882c data_ov14_0215882c: ; 0x0215882c .word func_ov14_0213acb8 - 1 @@ -45023,7 +45023,7 @@ data_ov14_021588ec: ; 0x021588ec .word _ZN5Actor8vfunc_18Ej .global data_ov14_021588f0 data_ov14_021588f0: ; 0x021588f0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021588f4 data_ov14_021588f4: ; 0x021588f4 .word func_ov14_0213acb8 - 1 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index c8fbd2eb..01df1dad 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -95,7 +95,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index a394abbb..fa25f9e0 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -32826,7 +32826,7 @@ data_ov14_02158ab8: ; 0x02158ab8 .word func_ov14_021389d8 .global data_ov14_02158abc data_ov14_02158abc: ; 0x02158abc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02158ac0 data_ov14_02158ac0: ; 0x02158ac0 .word func_ov14_0213bba0 @@ -34861,7 +34861,7 @@ data_ov14_021594d8: ; 0x021594d8 .word func_ov14_02144b64 .global data_ov14_021594dc data_ov14_021594dc: ; 0x021594dc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021594e0 data_ov14_021594e0: ; 0x021594e0 .word _ZN5Actor8vfunc_20Ei @@ -35044,7 +35044,7 @@ data_ov14_021595cc: ; 0x021595cc .word func_ov14_02144b64 .global data_ov14_021595d0 data_ov14_021595d0: ; 0x021595d0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021595d4 data_ov14_021595d4: ; 0x021595d4 .word func_ov14_02145100 @@ -35351,7 +35351,7 @@ data_ov14_0215975c: ; 0x0215975c .word func_ov14_02146608 .global data_ov14_02159760 data_ov14_02159760: ; 0x02159760 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02159764 data_ov14_02159764: ; 0x02159764 .word func_ov14_021467b8 @@ -35606,7 +35606,7 @@ data_ov14_021598b0: ; 0x021598b0 .word func_ov14_02144b64 .global data_ov14_021598b4 data_ov14_021598b4: ; 0x021598b4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_021598b8 data_ov14_021598b8: ; 0x021598b8 .word func_ov14_02145100 @@ -35936,7 +35936,7 @@ data_ov14_02159a68: ; 0x02159a68 .word _ZN5Actor8vfunc_18Ej .global data_ov14_02159a6c data_ov14_02159a6c: ; 0x02159a6c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02159a70 data_ov14_02159a70: ; 0x02159a70 .word _ZN5Actor8vfunc_20Ei @@ -36083,7 +36083,7 @@ data_ov14_02159b2c: ; 0x02159b2c .word func_ov14_02149894 ; func_ov15_02149894 .global data_ov14_02159b30 data_ov14_02159b30: ; 0x02159b30 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02159b34 data_ov14_02159b34: ; 0x02159b34 .word func_ov14_0214996c @@ -36454,7 +36454,7 @@ data_ov14_02159d10: ; 0x02159d10 .word func_ov00_020d3b44 .global data_ov14_02159d14 data_ov14_02159d14: ; 0x02159d14 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02159d18 data_ov14_02159d18: ; 0x02159d18 .word _ZN5Actor8vfunc_20Ei @@ -36733,7 +36733,7 @@ data_ov14_02159e84: ; 0x02159e84 .word func_ov14_0214c0e4 .global data_ov14_02159e88 data_ov14_02159e88: ; 0x02159e88 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02159e8c data_ov14_02159e8c: ; 0x02159e8c .word _ZN5Actor8vfunc_20Ei @@ -36991,7 +36991,7 @@ data_ov14_02159fdc: ; 0x02159fdc .word func_ov14_0214cb9c .global data_ov14_02159fe0 data_ov14_02159fe0: ; 0x02159fe0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_02159fe4 data_ov14_02159fe4: ; 0x02159fe4 .word _ZN5Actor8vfunc_20Ei @@ -37906,7 +37906,7 @@ data_ov14_0215a490: ; 0x0215a490 .word func_ov14_0214fc90 .global data_ov14_0215a494 data_ov14_0215a494: ; 0x0215a494 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_0215a498 data_ov14_0215a498: ; 0x0215a498 .word _ZN5Actor8vfunc_20Ei @@ -38361,7 +38361,7 @@ data_ov14_0215a6e4: ; 0x0215a6e4 .word _ZN5Actor8vfunc_18Ej .global data_ov14_0215a6e8 data_ov14_0215a6e8: ; 0x0215a6e8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov14_0215a6ec data_ov14_0215a6ec: ; 0x0215a6ec .word func_ov14_0215152c diff --git a/asm/ov15.inc b/asm/ov15.inc index 81e39202..62a5bb15 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -111,7 +111,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov15.s b/asm/ov15.s index 9d5af179..39a28665 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -127929,7 +127929,7 @@ data_ov15_0218955c: ; 0x0218955c .word _ZN5Actor8vfunc_18Ej .global data_ov15_02189560 data_ov15_02189560: ; 0x02189560 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_02189564 data_ov15_02189564: ; 0x02189564 .word _ZN5Actor8vfunc_20Ei @@ -128091,7 +128091,7 @@ data_ov15_02189634: ; 0x02189634 .word _ZN5Actor8vfunc_18Ej .global data_ov15_02189638 data_ov15_02189638: ; 0x02189638 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218963c data_ov15_0218963c: ; 0x0218963c .word _ZN5Actor8vfunc_20Ei @@ -128256,7 +128256,7 @@ data_ov15_02189704: ; 0x02189704 .word func_ov15_02123b78 .global data_ov15_02189708 data_ov15_02189708: ; 0x02189708 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218970c data_ov15_0218970c: ; 0x0218970c .word _ZN5Actor8vfunc_20Ei @@ -128418,7 +128418,7 @@ data_ov15_021897dc: ; 0x021897dc .word func_ov15_02123b78 .global data_ov15_021897e0 data_ov15_021897e0: ; 0x021897e0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_021897e4 data_ov15_021897e4: ; 0x021897e4 .word func_ov15_021251ec @@ -128598,7 +128598,7 @@ data_ov15_021898cc: ; 0x021898cc .word func_ov15_02123b78 .global data_ov15_021898d0 data_ov15_021898d0: ; 0x021898d0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_021898d4 data_ov15_021898d4: ; 0x021898d4 .word func_ov15_0212602c @@ -130765,7 +130765,7 @@ data_ov15_0218a4b4: ; 0x0218a4b4 .word func_ov15_0212e1c8 .global data_ov15_0218a4b8 data_ov15_0218a4b8: ; 0x0218a4b8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218a4bc data_ov15_0218a4bc: ; 0x0218a4bc .word func_ov15_0212f0b8 @@ -130978,7 +130978,7 @@ data_ov15_0218a5d0: ; 0x0218a5d0 .word func_ov15_021307e8 .global data_ov15_0218a5d4 data_ov15_0218a5d4: ; 0x0218a5d4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218a5d8 data_ov15_0218a5d8: ; 0x0218a5d8 .word func_ov15_02130d24 @@ -131221,7 +131221,7 @@ data_ov15_0218a714: ; 0x0218a714 .word func_ov15_02133150 .global data_ov15_0218a718 data_ov15_0218a718: ; 0x0218a718 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218a71c data_ov15_0218a71c: ; 0x0218a71c .word func_ov15_02133f70 @@ -131498,7 +131498,7 @@ data_ov15_0218a89c: ; 0x0218a89c .word func_ov15_02134594 .global data_ov15_0218a8a0 data_ov15_0218a8a0: ; 0x0218a8a0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218a8a4 data_ov15_0218a8a4: ; 0x0218a8a4 .word func_ov15_0213513c @@ -132069,7 +132069,7 @@ data_ov15_0218ab7c: ; 0x0218ab7c .word func_ov15_02123b78 .global data_ov15_0218ab80 data_ov15_0218ab80: ; 0x0218ab80 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218ab84 data_ov15_0218ab84: ; 0x0218ab84 .word func_ov15_0213b21c @@ -132360,7 +132360,7 @@ data_ov15_0218ad00: ; 0x0218ad00 .word func_ov15_0213cc98 .global data_ov15_0218ad04 data_ov15_0218ad04: ; 0x0218ad04 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218ad08 data_ov15_0218ad08: ; 0x0218ad08 .word func_ov15_0213cd5c @@ -132528,7 +132528,7 @@ data_ov15_0218ade0: ; 0x0218ade0 .word func_ov15_02123b78 .global data_ov15_0218ade4 data_ov15_0218ade4: ; 0x0218ade4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218ade8 data_ov15_0218ade8: ; 0x0218ade8 .byte 0x00, 0x00, 0x00, 0x00 @@ -132702,7 +132702,7 @@ data_ov15_0218aec8: ; 0x0218aec8 .word func_ov15_0213f578 .global data_ov15_0218aecc data_ov15_0218aecc: ; 0x0218aecc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218aed0 data_ov15_0218aed0: ; 0x0218aed0 .word func_ov15_02140efc @@ -132933,7 +132933,7 @@ data_ov15_0218affc: ; 0x0218affc .word _ZN5Actor8vfunc_18Ej .global data_ov15_0218b000 data_ov15_0218b000: ; 0x0218b000 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218b004 data_ov15_0218b004: ; 0x0218b004 .word _ZN5Actor8vfunc_20Ei @@ -133591,7 +133591,7 @@ data_ov15_0218b418: ; 0x0218b418 .word func_ov15_021468a4 .global data_ov15_0218b41c data_ov15_0218b41c: ; 0x0218b41c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218b420 data_ov15_0218b420: ; 0x0218b420 .word func_ov15_021468f8 @@ -133929,7 +133929,7 @@ data_ov15_0218b5d0: ; 0x0218b5d0 .word func_ov15_021475f0 .global data_ov15_0218b5d4 data_ov15_0218b5d4: ; 0x0218b5d4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218b5d8 data_ov15_0218b5d8: ; 0x0218b5d8 .word func_ov15_02148adc @@ -134912,7 +134912,7 @@ data_ov15_0218bb34: ; 0x0218bb34 .word func_ov15_0214d418 .global data_ov15_0218bb38 data_ov15_0218bb38: ; 0x0218bb38 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218bb3c data_ov15_0218bb3c: ; 0x0218bb3c .word func_ov15_0214d47c @@ -135053,7 +135053,7 @@ data_ov15_0218bbf0: ; 0x0218bbf0 .word func_ov15_0214d69c .global data_ov15_0218bbf4 data_ov15_0218bbf4: ; 0x0218bbf4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218bbf8 data_ov15_0218bbf8: ; 0x0218bbf8 .word func_ov15_0214d6b0 @@ -135206,7 +135206,7 @@ data_ov15_0218bcbc: ; 0x0218bcbc .word func_ov15_0214dc1c .global data_ov15_0218bcc0 data_ov15_0218bcc0: ; 0x0218bcc0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218bcc4 data_ov15_0218bcc4: ; 0x0218bcc4 .word _ZN5Actor8vfunc_20Ei @@ -135359,7 +135359,7 @@ data_ov15_0218bd88: ; 0x0218bd88 .word _ZN5Actor8vfunc_18Ej .global data_ov15_0218bd8c data_ov15_0218bd8c: ; 0x0218bd8c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218bd90 data_ov15_0218bd90: ; 0x0218bd90 .word _ZN5Actor8vfunc_20Ei @@ -135515,7 +135515,7 @@ data_ov15_0218be58: ; 0x0218be58 .word func_ov15_0214f754 .global data_ov15_0218be5c data_ov15_0218be5c: ; 0x0218be5c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218be60 data_ov15_0218be60: ; 0x0218be60 .word _ZN5Actor8vfunc_20Ei @@ -135896,7 +135896,7 @@ data_ov15_0218c048: ; 0x0218c048 .word func_ov15_0215200c ; func_ov61_0215200c .global data_ov15_0218c04c data_ov15_0218c04c: ; 0x0218c04c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218c050 data_ov15_0218c050: ; 0x0218c050 .word _ZN5Actor8vfunc_20Ei @@ -136064,7 +136064,7 @@ data_ov15_0218c128: ; 0x0218c128 .word func_ov15_0215619c .global data_ov15_0218c12c data_ov15_0218c12c: ; 0x0218c12c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218c130 data_ov15_0218c130: ; 0x0218c130 .word func_ov15_021575b0 @@ -136247,7 +136247,7 @@ data_ov15_0218c21c: ; 0x0218c21c .word func_ov15_02157c4c .global data_ov15_0218c220 data_ov15_0218c220: ; 0x0218c220 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218c224 data_ov15_0218c224: ; 0x0218c224 .word func_ov15_02157c9c @@ -136400,7 +136400,7 @@ data_ov15_0218c2e8: ; 0x0218c2e8 .word _ZN5Actor8vfunc_18Ej .global data_ov15_0218c2ec data_ov15_0218c2ec: ; 0x0218c2ec - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218c2f0 data_ov15_0218c2f0: ; 0x0218c2f0 .word _ZN5Actor8vfunc_20Ei @@ -136559,7 +136559,7 @@ data_ov15_0218c3bc: ; 0x0218c3bc .word func_ov15_02123b78 .global data_ov15_0218c3c0 data_ov15_0218c3c0: ; 0x0218c3c0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218c3c4 data_ov15_0218c3c4: ; 0x0218c3c4 .word func_ov15_0215a2f4 @@ -136730,7 +136730,7 @@ data_ov15_0218c4a0: ; 0x0218c4a0 .word func_ov15_0215a95c .global data_ov15_0218c4a4 data_ov15_0218c4a4: ; 0x0218c4a4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218c4a8 data_ov15_0218c4a8: ; 0x0218c4a8 .word func_ov15_0215b654 @@ -136937,7 +136937,7 @@ data_ov15_0218c5b4: ; 0x0218c5b4 .word func_ov15_0215c6a4 .global data_ov15_0218c5b8 data_ov15_0218c5b8: ; 0x0218c5b8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218c5bc data_ov15_0218c5bc: ; 0x0218c5bc .word _ZN5Actor8vfunc_20Ei @@ -137812,7 +137812,7 @@ data_ov15_0218ca50: ; 0x0218ca50 .word _ZN5Actor8vfunc_18Ej .global data_ov15_0218ca54 data_ov15_0218ca54: ; 0x0218ca54 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218ca58 data_ov15_0218ca58: ; 0x0218ca58 .word _ZN5Actor8vfunc_20Ei @@ -138481,7 +138481,7 @@ data_ov15_0218cdc0: ; 0x0218cdc0 .word func_ov15_02166394 .global data_ov15_0218cdc4 data_ov15_0218cdc4: ; 0x0218cdc4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218cdc8 data_ov15_0218cdc8: ; 0x0218cdc8 .word func_ov15_02166690 @@ -138883,7 +138883,7 @@ data_ov15_0218cfd8: ; 0x0218cfd8 .word func_ov15_02123b78 .global data_ov15_0218cfdc data_ov15_0218cfdc: ; 0x0218cfdc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218cfe0 data_ov15_0218cfe0: ; 0x0218cfe0 .word func_ov15_021676ec @@ -139072,7 +139072,7 @@ data_ov15_0218d0d0: ; 0x0218d0d0 .word func_ov15_02168e60 .global data_ov15_0218d0d4 data_ov15_0218d0d4: ; 0x0218d0d4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218d0d8 data_ov15_0218d0d8: ; 0x0218d0d8 .word func_ov15_02168f98 @@ -139600,7 +139600,7 @@ data_ov15_0218d390: ; 0x0218d390 .word func_ov15_0216b354 ; func_ov18_0216b354 .global data_ov15_0218d394 data_ov15_0218d394: ; 0x0218d394 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218d398 data_ov15_0218d398: ; 0x0218d398 .word func_ov15_0216bc5c ; data_ov17_0216bc5c @@ -139744,7 +139744,7 @@ data_ov15_0218d450: ; 0x0218d450 .word func_ov15_0216b354 ; func_ov18_0216b354 .global data_ov15_0218d454 data_ov15_0218d454: ; 0x0218d454 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218d458 data_ov15_0218d458: ; 0x0218d458 .word func_ov15_0216ba40 ; data_ov17_0216ba40 @@ -139888,7 +139888,7 @@ data_ov15_0218d510: ; 0x0218d510 .word func_ov15_0216b354 ; func_ov18_0216b354 .global data_ov15_0218d514 data_ov15_0218d514: ; 0x0218d514 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218d518 data_ov15_0218d518: ; 0x0218d518 .word _ZN5Actor8vfunc_20Ei @@ -140047,7 +140047,7 @@ data_ov15_0218d5e4: ; 0x0218d5e4 .word func_ov15_0216c650 ; data_ov17_0216c650, data_ov18_0216c650 .global data_ov15_0218d5e8 data_ov15_0218d5e8: ; 0x0218d5e8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218d5ec data_ov15_0218d5ec: ; 0x0218d5ec .word func_ov15_0216d03c ; data_ov17_0216d03c, data_ov18_0216d03c @@ -140506,7 +140506,7 @@ data_ov15_0218d8a4: ; 0x0218d8a4 .word func_ov15_0216f32c ; func_ov19_0216f32c .global data_ov15_0218d8a8 data_ov15_0218d8a8: ; 0x0218d8a8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218d8ac data_ov15_0218d8ac: ; 0x0218d8ac .word func_ov15_0216f340 @@ -140683,7 +140683,7 @@ data_ov15_0218d990: ; 0x0218d990 .word func_ov15_021706b4 ; func_ov28_021706b4 .global data_ov15_0218d994 data_ov15_0218d994: ; 0x0218d994 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218d998 data_ov15_0218d998: ; 0x0218d998 .word func_ov15_02173034 @@ -140925,7 +140925,7 @@ data_ov15_0218daec: ; 0x0218daec .word func_ov15_021739b8 .global data_ov15_0218daf0 data_ov15_0218daf0: ; 0x0218daf0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218daf4 data_ov15_0218daf4: ; 0x0218daf4 .word _ZN5Actor8vfunc_20Ei @@ -141066,7 +141066,7 @@ data_ov15_0218dba8: ; 0x0218dba8 .word _ZN5Actor8vfunc_18Ej .global data_ov15_0218dbac data_ov15_0218dbac: ; 0x0218dbac - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218dbb0 data_ov15_0218dbb0: ; 0x0218dbb0 .word _ZN5Actor8vfunc_20Ei @@ -141296,7 +141296,7 @@ data_ov15_0218dcd0: ; 0x0218dcd0 .word func_ov15_021744e0 .global data_ov15_0218dcd4 data_ov15_0218dcd4: ; 0x0218dcd4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218dcd8 data_ov15_0218dcd8: ; 0x0218dcd8 .word func_ov15_021744f4 @@ -141968,7 +141968,7 @@ data_ov15_0218e050: ; 0x0218e050 .word func_ov15_0217b828 ; data_ov29_0217b828 .global data_ov15_0218e054 data_ov15_0218e054: ; 0x0218e054 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218e058 data_ov15_0218e058: ; 0x0218e058 .word func_ov15_0217b848 ; data_ov29_0217b848 @@ -142226,7 +142226,7 @@ data_ov15_0218e1c8: ; 0x0218e1c8 .word func_ov15_0217c7f8 .global data_ov15_0218e1cc data_ov15_0218e1cc: ; 0x0218e1cc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218e1d0 data_ov15_0218e1d0: ; 0x0218e1d0 .word func_ov15_0217d21c @@ -142747,7 +142747,7 @@ data_ov15_0218e490: ; 0x0218e490 .word func_ov15_0217d980 ; data_ov61_0217d980 .global data_ov15_0218e494 data_ov15_0218e494: ; 0x0218e494 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218e498 data_ov15_0218e498: ; 0x0218e498 .word func_ov15_0217d86c @@ -142888,7 +142888,7 @@ data_ov15_0218e54c: ; 0x0218e54c .word _ZN5Actor8vfunc_18Ej .global data_ov15_0218e550 data_ov15_0218e550: ; 0x0218e550 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218e554 data_ov15_0218e554: ; 0x0218e554 .word func_ov15_0217dc4c @@ -143649,7 +143649,7 @@ data_ov15_0218e900: ; 0x0218e900 .word func_ov15_02180c60 ; data_ov61_02180c60 .global data_ov15_0218e904 data_ov15_0218e904: ; 0x0218e904 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov15_0218e908 data_ov15_0218e908: ; 0x0218e908 .word func_ov15_02182eec ; data_ov31_02182eec diff --git a/asm/ov17.inc b/asm/ov17.inc index 47aec804..cb2eb36b 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -44,7 +44,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov17.s b/asm/ov17.s index 165c250d..5ad78b6b 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -22097,7 +22097,7 @@ data_ov17_0216c024: ; 0x0216c024 .word func_ov17_02160ea4 .global data_ov17_0216c028 data_ov17_0216c028: ; 0x0216c028 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov17_0216c02c data_ov17_0216c02c: ; 0x0216c02c .word func_ov17_02160ee4 @@ -23818,7 +23818,7 @@ data_ov17_0216c910: ; 0x0216c910 .word _ZN5Actor8vfunc_18Ej .global data_ov17_0216c914 data_ov17_0216c914: ; 0x0216c914 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov17_0216c918 data_ov17_0216c918: ; 0x0216c918 .word func_ov14_02138128 diff --git a/asm/ov18.inc b/asm/ov18.inc index 1d228df3..2eb307f4 100644 --- a/asm/ov18.inc +++ b/asm/ov18.inc @@ -35,7 +35,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov18.s b/asm/ov18.s index ab5b0bb5..68470a41 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -24021,7 +24021,7 @@ data_ov18_0216cfe0: ; 0x0216cfe0 .word func_ov14_02144b64 .global data_ov18_0216cfe4 data_ov18_0216cfe4: ; 0x0216cfe4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov18_0216cfe8 data_ov18_0216cfe8: ; 0x0216cfe8 .word func_ov18_02165acc @@ -24219,7 +24219,7 @@ data_ov18_0216d0e4: ; 0x0216d0e4 .word func_ov14_02144b64 .global data_ov18_0216d0e8 data_ov18_0216d0e8: ; 0x0216d0e8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov18_0216d0ec data_ov18_0216d0ec: ; 0x0216d0ec .word func_ov18_021682f8 @@ -24528,7 +24528,7 @@ data_ov18_0216d280: ; 0x0216d280 .word func_ov18_02169230 .global data_ov18_0216d284 data_ov18_0216d284: ; 0x0216d284 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov18_0216d288 data_ov18_0216d288: ; 0x0216d288 .word _ZN5Actor8vfunc_20Ei @@ -24669,7 +24669,7 @@ data_ov18_0216d33c: ; 0x0216d33c .word _ZN5Actor8vfunc_18Ej .global data_ov18_0216d340 data_ov18_0216d340: ; 0x0216d340 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov18_0216d344 data_ov18_0216d344: ; 0x0216d344 .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov19.inc b/asm/ov19.inc index ccbfb469..dc6be292 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -65,7 +65,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov19.s b/asm/ov19.s index bdb1cbcf..fd6322cf 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -11099,7 +11099,7 @@ data_ov19_021763ec: ; 0x021763ec .word func_ov00_020cad30 .global data_ov19_021763f0 data_ov19_021763f0: ; 0x021763f0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov19_021763f4 data_ov19_021763f4: ; 0x021763f4 .word func_ov19_0216ed04 @@ -11647,7 +11647,7 @@ data_ov19_0217674c: ; 0x0217674c .word _ZN5Actor8vfunc_18Ej .global data_ov19_02176750 data_ov19_02176750: ; 0x02176750 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov19_02176754 data_ov19_02176754: ; 0x02176754 .word func_ov19_02171ebc @@ -11815,7 +11815,7 @@ data_ov19_0217682c: ; 0x0217682c .word func_ov19_02172428 .global data_ov19_02176830 data_ov19_02176830: ; 0x02176830 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov19_02176834 data_ov19_02176834: ; 0x02176834 .word func_ov19_021723d4 ; func_ov26_021723d4 @@ -11956,7 +11956,7 @@ data_ov19_021768e8: ; 0x021768e8 .word _ZN5Actor8vfunc_18Ej .global data_ov19_021768ec data_ov19_021768ec: ; 0x021768ec - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov19_021768f0 data_ov19_021768f0: ; 0x021768f0 .word _ZN5Actor8vfunc_20Ei @@ -12580,7 +12580,7 @@ data_ov19_02176c28: ; 0x02176c28 .word func_ov00_020cad30 .global data_ov19_02176c2c data_ov19_02176c2c: ; 0x02176c2c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov19_02176c30 data_ov19_02176c30: ; 0x02176c30 .word func_ov00_020cb1c0 @@ -12807,7 +12807,7 @@ data_ov19_02176d70: ; 0x02176d70 .word func_ov19_0217595c .global data_ov19_02176d74 data_ov19_02176d74: ; 0x02176d74 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov19_02176d78 data_ov19_02176d78: ; 0x02176d78 .word func_ov19_02175970 diff --git a/asm/ov20.inc b/asm/ov20.inc index 59f87e40..d3b4f5ea 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -60,7 +60,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov20.s b/asm/ov20.s index 9c43d7eb..2b2fdb7e 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -13567,7 +13567,7 @@ data_ov20_021783c0: ; 0x021783c0 .word func_ov00_020cad30 .global data_ov20_021783c4 data_ov20_021783c4: ; 0x021783c4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_021783c8 data_ov20_021783c8: ; 0x021783c8 .word func_ov00_020cb1c0 @@ -13882,7 +13882,7 @@ data_ov20_02178564: ; 0x02178564 .word func_ov00_020cad30 .global data_ov20_02178568 data_ov20_02178568: ; 0x02178568 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_0217856c data_ov20_0217856c: ; 0x0217856c .word func_ov00_020cb1c0 @@ -14086,7 +14086,7 @@ data_ov20_02178674: ; 0x02178674 .word _ZN5Actor8vfunc_18Ej .global data_ov20_02178678 data_ov20_02178678: ; 0x02178678 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_0217867c data_ov20_0217867c: ; 0x0217867c .word func_ov20_02171bfc ; data_ov21_02171bfc, func_ov25_02171bfc @@ -14227,7 +14227,7 @@ data_ov20_02178730: ; 0x02178730 .word func_ov20_0217255c .global data_ov20_02178734 data_ov20_02178734: ; 0x02178734 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02178738 data_ov20_02178738: ; 0x02178738 .word func_ov20_02172570 @@ -14368,7 +14368,7 @@ data_ov20_021787ec: ; 0x021787ec .word func_ov00_020cad30 .global data_ov20_021787f0 data_ov20_021787f0: ; 0x021787f0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_021787f4 data_ov20_021787f4: ; 0x021787f4 .word func_ov00_020cb1c0 @@ -14748,7 +14748,7 @@ data_ov20_021789e8: ; 0x021789e8 .word func_ov14_02144b64 .global data_ov20_021789ec data_ov20_021789ec: ; 0x021789ec - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_021789f0 data_ov20_021789f0: ; 0x021789f0 .word func_ov20_02173e60 ; func_ov61_02173e60 @@ -15024,7 +15024,7 @@ data_ov20_02178b58: ; 0x02178b58 .word _ZN5Actor8vfunc_18Ej .global data_ov20_02178b5c data_ov20_02178b5c: ; 0x02178b5c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02178b60 data_ov20_02178b60: ; 0x02178b60 .word _ZN5Actor8vfunc_20Ei @@ -15317,7 +15317,7 @@ data_ov20_02178cd4: ; 0x02178cd4 .word func_ov00_020cad30 .global data_ov20_02178cd8 data_ov20_02178cd8: ; 0x02178cd8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02178cdc data_ov20_02178cdc: ; 0x02178cdc .word func_ov00_020cb1c0 @@ -15700,7 +15700,7 @@ data_ov20_02178ee8: ; 0x02178ee8 .word func_ov20_02175f68 ; func_ov26_02175f68 .global data_ov20_02178eec data_ov20_02178eec: ; 0x02178eec - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02178ef0 data_ov20_02178ef0: ; 0x02178ef0 .word _ZN5Actor8vfunc_20Ei @@ -15841,7 +15841,7 @@ data_ov20_02178fa4: ; 0x02178fa4 .word func_ov20_02176108 ; func_ov61_02176108 .global data_ov20_02178fa8 data_ov20_02178fa8: ; 0x02178fa8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02178fac data_ov20_02178fac: ; 0x02178fac .word func_ov14_0215152c @@ -15994,7 +15994,7 @@ data_ov20_02179070: ; 0x02179070 .word func_ov14_02144b64 .global data_ov20_02179074 data_ov20_02179074: ; 0x02179074 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02179078 data_ov20_02179078: ; 0x02179078 .word func_ov20_021767c4 @@ -16183,7 +16183,7 @@ data_ov20_0217916c: ; 0x0217916c .word func_ov20_02176ae8 .global data_ov20_02179170 data_ov20_02179170: ; 0x02179170 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02179174 data_ov20_02179174: ; 0x02179174 .word func_ov14_0214996c @@ -16332,7 +16332,7 @@ data_ov20_02179258: ; 0x02179258 .word func_ov20_0217708c .global data_ov20_0217925c data_ov20_0217925c: ; 0x0217925c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_02179260 data_ov20_02179260: ; 0x02179260 .word func_ov20_021770a0 @@ -16635,7 +16635,7 @@ data_ov20_021793ec: ; 0x021793ec .word func_ov20_021777a8 .global data_ov20_021793f0 data_ov20_021793f0: ; 0x021793f0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov20_021793f4 data_ov20_021793f4: ; 0x021793f4 .word func_ov20_021777bc diff --git a/asm/ov21.inc b/asm/ov21.inc index b117ffbb..589c157d 100644 --- a/asm/ov21.inc +++ b/asm/ov21.inc @@ -32,7 +32,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov21.s b/asm/ov21.s index 7097c627..9e502795 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -4973,7 +4973,7 @@ data_ov21_02171120: ; 0x02171120 .word func_ov00_020cad30 .global data_ov21_02171124 data_ov21_02171124: ; 0x02171124 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_02171128 data_ov21_02171128: ; 0x02171128 .word func_ov00_020cb1c0 @@ -5192,7 +5192,7 @@ data_ov21_02171244: ; 0x02171244 .word func_ov14_02144b64 .global data_ov21_02171248 data_ov21_02171248: ; 0x02171248 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_0217124c data_ov21_0217124c: ; 0x0217124c .word func_ov14_02145100 @@ -5387,7 +5387,7 @@ data_ov21_02171348: ; 0x02171348 .word func_ov14_02144b64 .global data_ov21_0217134c data_ov21_0217134c: ; 0x0217134c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_02171350 data_ov21_02171350: ; 0x02171350 .word func_ov14_02145100 @@ -5582,7 +5582,7 @@ data_ov21_0217144c: ; 0x0217144c .word func_ov14_02144b64 .global data_ov21_02171450 data_ov21_02171450: ; 0x02171450 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_02171454 data_ov21_02171454: ; 0x02171454 .word func_ov14_02145100 @@ -5777,7 +5777,7 @@ data_ov21_02171550: ; 0x02171550 .word func_ov14_02144b64 .global data_ov21_02171554 data_ov21_02171554: ; 0x02171554 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_02171558 data_ov21_02171558: ; 0x02171558 .word func_ov14_02145100 @@ -5972,7 +5972,7 @@ data_ov21_02171654: ; 0x02171654 .word func_ov14_02144b64 .global data_ov21_02171658 data_ov21_02171658: ; 0x02171658 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_0217165c data_ov21_0217165c: ; 0x0217165c .word func_ov14_02145100 @@ -6255,7 +6255,7 @@ data_ov21_021717e0: ; 0x021717e0 .word func_ov21_0216f618 ; func_ov22_0216f618, func_ov24_0216f618, func_ov28_0216f618 .global data_ov21_021717e4 data_ov21_021717e4: ; 0x021717e4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_021717e8 data_ov21_021717e8: ; 0x021717e8 .word func_ov14_02138128 @@ -6573,7 +6573,7 @@ data_ov21_02171988: ; 0x02171988 .word _ZN5Actor8vfunc_18Ej .global data_ov21_0217198c data_ov21_0217198c: ; 0x0217198c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov21_02171990 data_ov21_02171990: ; 0x02171990 .word func_ov21_02170954 diff --git a/asm/ov22.inc b/asm/ov22.inc index ec735364..9f52c325 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -65,7 +65,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov22.s b/asm/ov22.s index 2b727c48..f527e509 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -14879,7 +14879,7 @@ data_ov22_02179060: ; 0x02179060 .word func_ov22_0216dab0 .global data_ov22_02179064 data_ov22_02179064: ; 0x02179064 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_02179068 data_ov22_02179068: ; 0x02179068 .word _ZN5Actor8vfunc_20Ei @@ -15359,7 +15359,7 @@ data_ov22_021792e0: ; 0x021792e0 .word func_ov14_02144b64 .global data_ov22_021792e4 data_ov22_021792e4: ; 0x021792e4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_021792e8 data_ov22_021792e8: ; 0x021792e8 .word func_ov22_02170be8 @@ -15844,7 +15844,7 @@ data_ov22_02179574: ; 0x02179574 .word func_ov00_020cad30 .global data_ov22_02179578 data_ov22_02179578: ; 0x02179578 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_0217957c data_ov22_0217957c: ; 0x0217957c .word func_ov00_020cb1c0 @@ -16084,7 +16084,7 @@ data_ov22_0217969c: ; 0x0217969c .word func_ov00_020cad30 .global data_ov22_021796a0 data_ov22_021796a0: ; 0x021796a0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_021796a4 data_ov22_021796a4: ; 0x021796a4 .word func_ov00_020cb1c0 @@ -16369,7 +16369,7 @@ data_ov22_02179818: ; 0x02179818 .word func_ov00_020cad30 .global data_ov22_0217981c data_ov22_0217981c: ; 0x0217981c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_02179820 data_ov22_02179820: ; 0x02179820 .word func_ov00_020cb1c0 @@ -16573,7 +16573,7 @@ data_ov22_02179928: ; 0x02179928 .word func_ov22_02175068 .global data_ov22_0217992c data_ov22_0217992c: ; 0x0217992c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_02179930 data_ov22_02179930: ; 0x02179930 .word _ZN5Actor8vfunc_20Ei @@ -16825,7 +16825,7 @@ data_ov22_02179a78: ; 0x02179a78 .word func_ov22_021757ac .global data_ov22_02179a7c data_ov22_02179a7c: ; 0x02179a7c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_02179a80 data_ov22_02179a80: ; 0x02179a80 .word _ZN5Actor8vfunc_20Ei @@ -16966,7 +16966,7 @@ data_ov22_02179b34: ; 0x02179b34 .word _ZN5Actor8vfunc_18Ej .global data_ov22_02179b38 data_ov22_02179b38: ; 0x02179b38 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_02179b3c data_ov22_02179b3c: ; 0x02179b3c .word func_ov14_0215152c @@ -17520,7 +17520,7 @@ data_ov22_02179e0c: ; 0x02179e0c .word func_ov22_02177104 .global data_ov22_02179e10 data_ov22_02179e10: ; 0x02179e10 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_02179e14 data_ov22_02179e14: ; 0x02179e14 .word func_ov22_0217712c @@ -18044,7 +18044,7 @@ data_ov22_0217a0e0: ; 0x0217a0e0 .word func_ov14_02144b64 .global data_ov22_0217a0e4 data_ov22_0217a0e4: ; 0x0217a0e4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_0217a0e8 data_ov22_0217a0e8: ; 0x0217a0e8 .word func_ov14_02145100 @@ -18239,7 +18239,7 @@ data_ov22_0217a1e4: ; 0x0217a1e4 .word func_ov14_02144b64 .global data_ov22_0217a1e8 data_ov22_0217a1e8: ; 0x0217a1e8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_0217a1ec data_ov22_0217a1ec: ; 0x0217a1ec .word func_ov14_02145100 @@ -18434,7 +18434,7 @@ data_ov22_0217a2e8: ; 0x0217a2e8 .word func_ov14_02144b64 .global data_ov22_0217a2ec data_ov22_0217a2ec: ; 0x0217a2ec - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov22_0217a2f0 data_ov22_0217a2f0: ; 0x0217a2f0 .word func_ov14_02145100 diff --git a/asm/ov23.inc b/asm/ov23.inc index 8fa3bee6..6f62475f 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -89,7 +89,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov23.s b/asm/ov23.s index 3b487bd1..a401966c 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -15854,7 +15854,7 @@ data_ov23_02179ddc: ; 0x02179ddc .word func_ov14_02144b64 .global data_ov23_02179de0 data_ov23_02179de0: ; 0x02179de0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov23_02179de4 data_ov23_02179de4: ; 0x02179de4 .word func_ov14_02145100 @@ -16135,7 +16135,7 @@ data_ov23_02179f48: ; 0x02179f48 .word func_ov14_02144b64 .global data_ov23_02179f4c data_ov23_02179f4c: ; 0x02179f4c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov23_02179f50 data_ov23_02179f50: ; 0x02179f50 .word func_ov23_0216f03c @@ -16452,7 +16452,7 @@ data_ov23_0217a0f0: ; 0x0217a0f0 .word func_ov00_020cad30 .global data_ov23_0217a0f4 data_ov23_0217a0f4: ; 0x0217a0f4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov23_0217a0f8 data_ov23_0217a0f8: ; 0x0217a0f8 .word func_ov00_020cb1c0 @@ -16853,7 +16853,7 @@ data_ov23_0217a310: ; 0x0217a310 .word func_ov14_02136450 .global data_ov23_0217a314 data_ov23_0217a314: ; 0x0217a314 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov23_0217a318 data_ov23_0217a318: ; 0x0217a318 .word func_ov23_021723c4 @@ -17129,7 +17129,7 @@ data_ov23_0217a480: ; 0x0217a480 .word func_ov00_020cad30 .global data_ov23_0217a484 data_ov23_0217a484: ; 0x0217a484 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov23_0217a488 data_ov23_0217a488: ; 0x0217a488 .word func_ov00_020cb1c0 @@ -17893,7 +17893,7 @@ data_ov23_0217a870: ; 0x0217a870 .word func_ov23_02176ed8 .global data_ov23_0217a874 data_ov23_0217a874: ; 0x0217a874 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov23_0217a878 data_ov23_0217a878: ; 0x0217a878 .word func_ov14_0215152c diff --git a/asm/ov24.inc b/asm/ov24.inc index ea5f0a8c..f2563373 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -60,7 +60,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov24.s b/asm/ov24.s index 692b9dd9..b0df3784 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -15814,7 +15814,7 @@ data_ov24_02179f2c: ; 0x02179f2c .word func_ov24_0216e17c .global data_ov24_02179f30 data_ov24_02179f30: ; 0x02179f30 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_02179f34 data_ov24_02179f34: ; 0x02179f34 .word func_ov24_0216e6f8 @@ -15983,7 +15983,7 @@ data_ov24_0217a038: ; 0x0217a038 .word func_ov14_02144b64 .global data_ov24_0217a03c data_ov24_0217a03c: ; 0x0217a03c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217a040 data_ov24_0217a040: ; 0x0217a040 .word func_ov24_0216f5d0 @@ -16427,7 +16427,7 @@ data_ov24_0217a288: ; 0x0217a288 .word func_ov00_020cad30 .global data_ov24_0217a28c data_ov24_0217a28c: ; 0x0217a28c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217a290 data_ov24_0217a290: ; 0x0217a290 .word func_ov00_020cb1c0 @@ -16742,7 +16742,7 @@ data_ov24_0217a42c: ; 0x0217a42c .word func_ov00_020cad30 .global data_ov24_0217a430 data_ov24_0217a430: ; 0x0217a430 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217a434 data_ov24_0217a434: ; 0x0217a434 .word func_ov00_020cb1c0 @@ -17054,7 +17054,7 @@ data_ov24_0217a5cc: ; 0x0217a5cc .word func_ov00_020cad30 .global data_ov24_0217a5d0 data_ov24_0217a5d0: ; 0x0217a5d0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217a5d4 data_ov24_0217a5d4: ; 0x0217a5d4 .word func_ov00_020cb1c0 @@ -17422,7 +17422,7 @@ data_ov24_0217a7ac: ; 0x0217a7ac .word func_ov00_020cad30 .global data_ov24_0217a7b0 data_ov24_0217a7b0: ; 0x0217a7b0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217a7b4 data_ov24_0217a7b4: ; 0x0217a7b4 .word func_ov00_020cb1c0 @@ -17803,7 +17803,7 @@ data_ov24_0217a9a8: ; 0x0217a9a8 .word func_ov00_020cad30 .global data_ov24_0217a9ac data_ov24_0217a9ac: ; 0x0217a9ac - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217a9b0 data_ov24_0217a9b0: ; 0x0217a9b0 .word func_ov00_020cb1c0 @@ -18050,7 +18050,7 @@ data_ov24_0217ab24: ; 0x0217ab24 .word _ZN5Actor8vfunc_18Ej .global data_ov24_0217ab28 data_ov24_0217ab28: ; 0x0217ab28 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217ab2c data_ov24_0217ab2c: ; 0x0217ab2c .word func_ov24_02177718 @@ -18497,7 +18497,7 @@ data_ov24_0217ad78: ; 0x0217ad78 .word _ZN5Actor8vfunc_18Ej .global data_ov24_0217ad7c data_ov24_0217ad7c: ; 0x0217ad7c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov24_0217ad80 data_ov24_0217ad80: ; 0x0217ad80 .word func_ov14_0215152c diff --git a/asm/ov25.inc b/asm/ov25.inc index c7957b5c..91d773a3 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -61,7 +61,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov25.s b/asm/ov25.s index d10ebcbc..1de90bf3 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -15239,7 +15239,7 @@ data_ov25_02179c80: ; 0x02179c80 .word func_ov00_020cad30 .global data_ov25_02179c84 data_ov25_02179c84: ; 0x02179c84 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_02179c88 data_ov25_02179c88: ; 0x02179c88 .word func_ov25_02170db8 @@ -15570,7 +15570,7 @@ data_ov25_02179e64: ; 0x02179e64 .word func_ov25_021724ec ; func_ov61_021724ec .global data_ov25_02179e68 data_ov25_02179e68: ; 0x02179e68 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_02179e6c data_ov25_02179e6c: ; 0x02179e6c .word func_ov25_021724f8 @@ -15711,7 +15711,7 @@ data_ov25_02179f20: ; 0x02179f20 .word func_ov14_02144b64 .global data_ov25_02179f24 data_ov25_02179f24: ; 0x02179f24 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_02179f28 data_ov25_02179f28: ; 0x02179f28 .word func_ov25_0217536c @@ -15924,7 +15924,7 @@ data_ov25_0217a03c: ; 0x0217a03c .word func_ov25_0217696c .global data_ov25_0217a040 data_ov25_0217a040: ; 0x0217a040 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_0217a044 data_ov25_0217a044: ; 0x0217a044 .word _ZN5Actor8vfunc_20Ei @@ -16065,7 +16065,7 @@ data_ov25_0217a0f8: ; 0x0217a0f8 .word func_ov25_02176d74 .global data_ov25_0217a0fc data_ov25_0217a0fc: ; 0x0217a0fc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_0217a100 data_ov25_0217a100: ; 0x0217a100 .word func_ov25_02176d80 @@ -16425,7 +16425,7 @@ data_ov25_0217a2d8: ; 0x0217a2d8 .word func_ov00_020cad30 .global data_ov25_0217a2dc data_ov25_0217a2dc: ; 0x0217a2dc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_0217a2e0 data_ov25_0217a2e0: ; 0x0217a2e0 .word func_ov00_020cb1c0 @@ -16712,7 +16712,7 @@ data_ov25_0217a44c: ; 0x0217a44c .word _ZN5Actor8vfunc_18Ej .global data_ov25_0217a450 data_ov25_0217a450: ; 0x0217a450 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_0217a454 data_ov25_0217a454: ; 0x0217a454 .word func_ov25_0217851c @@ -16853,7 +16853,7 @@ data_ov25_0217a508: ; 0x0217a508 .word func_ov25_021787ec .global data_ov25_0217a50c data_ov25_0217a50c: ; 0x0217a50c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_0217a510 data_ov25_0217a510: ; 0x0217a510 .word func_ov14_0215152c @@ -17018,7 +17018,7 @@ data_ov25_0217a5e4: ; 0x0217a5e4 .word _ZN5Actor8vfunc_18Ej .global data_ov25_0217a5e8 data_ov25_0217a5e8: ; 0x0217a5e8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_0217a5ec data_ov25_0217a5ec: ; 0x0217a5ec .word func_ov25_021789c0 @@ -17255,7 +17255,7 @@ data_ov25_0217a720: ; 0x0217a720 .word func_ov00_020cad30 .global data_ov25_0217a724 data_ov25_0217a724: ; 0x0217a724 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov25_0217a728 data_ov25_0217a728: ; 0x0217a728 .word func_ov00_020cb1c0 diff --git a/asm/ov26.inc b/asm/ov26.inc index 5ecfb24f..4ea03f82 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -54,7 +54,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov26.s b/asm/ov26.s index 3dc94461..70c88372 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -16905,7 +16905,7 @@ data_ov26_0217a080: ; 0x0217a080 .word func_ov14_02144b64 .global data_ov26_0217a084 data_ov26_0217a084: ; 0x0217a084 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov26_0217a088 data_ov26_0217a088: ; 0x0217a088 .word func_ov14_02145100 @@ -17100,7 +17100,7 @@ data_ov26_0217a184: ; 0x0217a184 .word func_ov14_02144b64 .global data_ov26_0217a188 data_ov26_0217a188: ; 0x0217a188 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov26_0217a18c data_ov26_0217a18c: ; 0x0217a18c .word func_ov26_0216dd38 @@ -17295,7 +17295,7 @@ data_ov26_0217a288: ; 0x0217a288 .word func_ov14_02144b64 .global data_ov26_0217a28c data_ov26_0217a28c: ; 0x0217a28c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov26_0217a290 data_ov26_0217a290: ; 0x0217a290 .word func_ov14_02145100 @@ -17490,7 +17490,7 @@ data_ov26_0217a38c: ; 0x0217a38c .word func_ov14_02144b64 .global data_ov26_0217a390 data_ov26_0217a390: ; 0x0217a390 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov26_0217a394 data_ov26_0217a394: ; 0x0217a394 .word func_ov14_02145100 @@ -19599,7 +19599,7 @@ data_ov26_0217aec8: ; 0x0217aec8 .word _ZN5Actor8vfunc_18Ej .global data_ov26_0217aecc data_ov26_0217aecc: ; 0x0217aecc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov26_0217aed0 data_ov26_0217aed0: ; 0x0217aed0 .word func_ov26_02177ba8 ; func_ov28_02177ba8 @@ -19848,7 +19848,7 @@ data_ov26_0217afa8: ; 0x0217afa8 .word func_ov26_02177f94 .global data_ov26_0217afac data_ov26_0217afac: ; 0x0217afac - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov26_0217afb0 data_ov26_0217afb0: ; 0x0217afb0 .word func_ov26_02177fa8 @@ -20001,7 +20001,7 @@ data_ov26_0217b074: ; 0x0217b074 .word _ZN5Actor8vfunc_18Ej .global data_ov26_0217b078 data_ov26_0217b078: ; 0x0217b078 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov26_0217b07c data_ov26_0217b07c: ; 0x0217b07c .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov27.inc b/asm/ov27.inc index 7c9c1668..7c34116a 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -43,7 +43,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov27.s b/asm/ov27.s index dbbec93e..d1604007 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -14555,7 +14555,7 @@ data_ov27_02179504: ; 0x02179504 .word func_ov14_02144b64 .global data_ov27_02179508 data_ov27_02179508: ; 0x02179508 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov27_0217950c data_ov27_0217950c: ; 0x0217950c .word func_ov27_0216e97c @@ -14768,7 +14768,7 @@ data_ov27_02179630: ; 0x02179630 .word func_ov27_0217249c .global data_ov27_02179634 data_ov27_02179634: ; 0x02179634 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov27_02179638 data_ov27_02179638: ; 0x02179638 .word func_ov27_02172598 @@ -15049,7 +15049,7 @@ data_ov27_0217979c: ; 0x0217979c .word func_ov14_02144b64 .global data_ov27_021797a0 data_ov27_021797a0: ; 0x021797a0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov27_021797a4 data_ov27_021797a4: ; 0x021797a4 .word func_ov27_02173d78 @@ -15411,7 +15411,7 @@ data_ov27_02179984: ; 0x02179984 .word func_ov14_02144b64 .global data_ov27_02179988 data_ov27_02179988: ; 0x02179988 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov27_0217998c data_ov27_0217998c: ; 0x0217998c .word func_ov27_0217497c @@ -15656,7 +15656,7 @@ data_ov27_02179ac0: ; 0x02179ac0 .word func_ov14_02144b64 .global data_ov27_02179ac4 data_ov27_02179ac4: ; 0x02179ac4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov27_02179ac8 data_ov27_02179ac8: ; 0x02179ac8 .word func_ov14_02145100 @@ -16479,7 +16479,7 @@ data_ov27_02179ef4: ; 0x02179ef4 .word func_ov14_02144b64 .global data_ov27_02179ef8 data_ov27_02179ef8: ; 0x02179ef8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov27_02179efc data_ov27_02179efc: ; 0x02179efc .word func_ov27_021783a8 diff --git a/asm/ov28.inc b/asm/ov28.inc index 490b4a69..e28bd1f8 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -48,7 +48,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov28.s b/asm/ov28.s index 27e2193e..9254ef4c 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -14335,7 +14335,7 @@ data_ov28_02178980: ; 0x02178980 .word func_ov14_02144b64 .global data_ov28_02178984 data_ov28_02178984: ; 0x02178984 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02178988 data_ov28_02178988: ; 0x02178988 .word func_ov28_0216f228 @@ -14696,7 +14696,7 @@ data_ov28_02178be0: ; 0x02178be0 .word func_ov14_02144b64 .global data_ov28_02178be4 data_ov28_02178be4: ; 0x02178be4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02178be8 data_ov28_02178be8: ; 0x02178be8 .word func_ov14_02145100 @@ -14891,7 +14891,7 @@ data_ov28_02178ce4: ; 0x02178ce4 .word func_ov14_02144b64 .global data_ov28_02178ce8 data_ov28_02178ce8: ; 0x02178ce8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02178cec data_ov28_02178cec: ; 0x02178cec .word func_ov14_02145100 @@ -15086,7 +15086,7 @@ data_ov28_02178de8: ; 0x02178de8 .word func_ov14_02144b64 .global data_ov28_02178dec data_ov28_02178dec: ; 0x02178dec - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02178df0 data_ov28_02178df0: ; 0x02178df0 .word func_ov14_02145100 @@ -15281,7 +15281,7 @@ data_ov28_02178eec: ; 0x02178eec .word func_ov14_02144b64 .global data_ov28_02178ef0 data_ov28_02178ef0: ; 0x02178ef0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02178ef4 data_ov28_02178ef4: ; 0x02178ef4 .word func_ov14_02145100 @@ -15544,7 +15544,7 @@ data_ov28_02179040: ; 0x02179040 .word func_ov14_02144b64 .global data_ov28_02179044 data_ov28_02179044: ; 0x02179044 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02179048 data_ov28_02179048: ; 0x02179048 .word func_ov28_02171aa4 @@ -16041,7 +16041,7 @@ data_ov28_021792cc: ; 0x021792cc .word func_ov14_02144b64 .global data_ov28_021792d0 data_ov28_021792d0: ; 0x021792d0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_021792d4 data_ov28_021792d4: ; 0x021792d4 .word _ZN5Actor8vfunc_20Ei @@ -16280,7 +16280,7 @@ data_ov28_02179400: ; 0x02179400 .word func_ov14_02144b64 .global data_ov28_02179404 data_ov28_02179404: ; 0x02179404 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02179408 data_ov28_02179408: ; 0x02179408 .word func_ov28_02173c74 @@ -16511,7 +16511,7 @@ data_ov28_02179534: ; 0x02179534 .word func_ov14_02144b64 .global data_ov28_02179538 data_ov28_02179538: ; 0x02179538 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_0217953c data_ov28_0217953c: ; 0x0217953c .word func_ov28_02174830 @@ -16825,7 +16825,7 @@ data_ov28_021796cc: ; 0x021796cc .word func_ov28_02174f44 .global data_ov28_021796d0 data_ov28_021796d0: ; 0x021796d0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_021796d4 data_ov28_021796d4: ; 0x021796d4 .word func_ov28_0217547c @@ -17029,7 +17029,7 @@ data_ov28_021797dc: ; 0x021797dc .word func_ov14_02144b64 .global data_ov28_021797e0 data_ov28_021797e0: ; 0x021797e0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_021797e4 data_ov28_021797e4: ; 0x021797e4 .word func_ov28_02176bd8 @@ -17262,7 +17262,7 @@ data_ov28_02179918: ; 0x02179918 .word func_ov28_02177238 .global data_ov28_0217991c data_ov28_0217991c: ; 0x0217991c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02179920 data_ov28_02179920: ; 0x02179920 .word func_ov28_02177494 @@ -17487,7 +17487,7 @@ data_ov28_02179a44: ; 0x02179a44 .word func_ov28_02177bd8 .global data_ov28_02179a48 data_ov28_02179a48: ; 0x02179a48 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov28_02179a4c data_ov28_02179a4c: ; 0x02179a4c .word func_ov28_02178058 diff --git a/asm/ov29.inc b/asm/ov29.inc index 5bbb2191..257b327e 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -37,7 +37,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov29.s b/asm/ov29.s index bba48869..e6e404ce 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -14753,7 +14753,7 @@ data_ov29_02179920: ; 0x02179920 .word func_ov29_0216ea08 .global data_ov29_02179924 data_ov29_02179924: ; 0x02179924 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_02179928 data_ov29_02179928: ; 0x02179928 .word func_ov29_0216ea6c @@ -14918,7 +14918,7 @@ data_ov29_021799fc: ; 0x021799fc .word func_ov29_0216f8f8 .global data_ov29_02179a00 data_ov29_02179a00: ; 0x02179a00 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_02179a04 data_ov29_02179a04: ; 0x02179a04 .word func_ov29_0216fd80 @@ -15151,7 +15151,7 @@ data_ov29_02179b38: ; 0x02179b38 .word _ZN5Actor8vfunc_18Ej .global data_ov29_02179b3c data_ov29_02179b3c: ; 0x02179b3c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_02179b40 data_ov29_02179b40: ; 0x02179b40 .word func_ov29_021711f0 @@ -15381,7 +15381,7 @@ data_ov29_02179c88: ; 0x02179c88 .word func_ov00_020cad30 .global data_ov29_02179c8c data_ov29_02179c8c: ; 0x02179c8c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_02179c90 data_ov29_02179c90: ; 0x02179c90 .word func_ov29_021723f0 @@ -15686,7 +15686,7 @@ data_ov29_02179e2c: ; 0x02179e2c .word func_ov29_02174eac .global data_ov29_02179e30 data_ov29_02179e30: ; 0x02179e30 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_02179e34 data_ov29_02179e34: ; 0x02179e34 .word func_ov29_02174f30 ; func_ov61_02174f30 @@ -15890,7 +15890,7 @@ data_ov29_02179f64: ; 0x02179f64 .word _ZN5Actor8vfunc_18Ej .global data_ov29_02179f68 data_ov29_02179f68: ; 0x02179f68 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_02179f6c data_ov29_02179f6c: ; 0x02179f6c .word func_ov29_02175ed0 @@ -16191,7 +16191,7 @@ data_ov29_0217a10c: ; 0x0217a10c .word _ZN5Actor8vfunc_18Ej .global data_ov29_0217a110 data_ov29_0217a110: ; 0x0217a110 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_0217a114 data_ov29_0217a114: ; 0x0217a114 .word func_ov29_02176d10 @@ -16539,7 +16539,7 @@ data_ov29_0217a2e0: ; 0x0217a2e0 .word func_ov29_02178234 .global data_ov29_0217a2e4 data_ov29_0217a2e4: ; 0x0217a2e4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_0217a2e8 data_ov29_0217a2e8: ; 0x0217a2e8 .word func_ov29_021782cc @@ -16692,7 +16692,7 @@ data_ov29_0217a3ac: ; 0x0217a3ac .word func_ov14_02144b64 .global data_ov29_0217a3b0 data_ov29_0217a3b0: ; 0x0217a3b0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov29_0217a3b4 data_ov29_0217a3b4: ; 0x0217a3b4 .word func_ov29_02178db8 diff --git a/asm/ov30.inc b/asm/ov30.inc index b17f1027..6fdb1e9f 100644 --- a/asm/ov30.inc +++ b/asm/ov30.inc @@ -36,7 +36,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov30.s b/asm/ov30.s index 4dadd512..f86ddab5 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -18035,7 +18035,7 @@ data_ov30_02189390: ; 0x02189390 .word _ZN5Actor8vfunc_18Ej .global data_ov30_02189394 data_ov30_02189394: ; 0x02189394 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov30_02189398 data_ov30_02189398: ; 0x02189398 .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov31.inc b/asm/ov31.inc index b56b1c7c..78d436fd 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -21,7 +21,7 @@ .extern _ZN5Actor8vfunc_08Ev .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov31.s b/asm/ov31.s index 5ff16018..9f697c02 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -8771,7 +8771,7 @@ data_ov31_02182188: ; 0x02182188 .word func_ov14_02144b64 .global data_ov31_0218218c data_ov31_0218218c: ; 0x0218218c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02182190 data_ov31_02182190: ; 0x02182190 .word func_ov31_0217d414 ; data_ov61_0217d414 @@ -9817,7 +9817,7 @@ data_ov31_021826f0: ; 0x021826f0 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_021826f4 data_ov31_021826f4: ; 0x021826f4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_021826f8 data_ov31_021826f8: ; 0x021826f8 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -9994,7 +9994,7 @@ data_ov31_021827dc: ; 0x021827dc .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_021827e0 data_ov31_021827e0: ; 0x021827e0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_021827e4 data_ov31_021827e4: ; 0x021827e4 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -10171,7 +10171,7 @@ data_ov31_021828c8: ; 0x021828c8 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_021828cc data_ov31_021828cc: ; 0x021828cc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_021828d0 data_ov31_021828d0: ; 0x021828d0 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -10348,7 +10348,7 @@ data_ov31_021829b4: ; 0x021829b4 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_021829b8 data_ov31_021829b8: ; 0x021829b8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_021829bc data_ov31_021829bc: ; 0x021829bc .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -10525,7 +10525,7 @@ data_ov31_02182aa0: ; 0x02182aa0 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02182aa4 data_ov31_02182aa4: ; 0x02182aa4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02182aa8 data_ov31_02182aa8: ; 0x02182aa8 .word func_ov31_0217f4a4 ; data_ov61_0217f4a4 @@ -10702,7 +10702,7 @@ data_ov31_02182b8c: ; 0x02182b8c .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02182b90 data_ov31_02182b90: ; 0x02182b90 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02182b94 data_ov31_02182b94: ; 0x02182b94 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -10879,7 +10879,7 @@ data_ov31_02182c78: ; 0x02182c78 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02182c7c data_ov31_02182c7c: ; 0x02182c7c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02182c80 data_ov31_02182c80: ; 0x02182c80 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -11056,7 +11056,7 @@ data_ov31_02182d64: ; 0x02182d64 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02182d68 data_ov31_02182d68: ; 0x02182d68 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02182d6c data_ov31_02182d6c: ; 0x02182d6c .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -11233,7 +11233,7 @@ data_ov31_02182e50: ; 0x02182e50 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02182e54 data_ov31_02182e54: ; 0x02182e54 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02182e58 data_ov31_02182e58: ; 0x02182e58 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -11410,7 +11410,7 @@ data_ov31_02182f3c: ; 0x02182f3c .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02182f40 data_ov31_02182f40: ; 0x02182f40 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02182f44 data_ov31_02182f44: ; 0x02182f44 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -11587,7 +11587,7 @@ data_ov31_02183028: ; 0x02183028 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_0218302c data_ov31_0218302c: ; 0x0218302c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02183030 data_ov31_02183030: ; 0x02183030 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -11764,7 +11764,7 @@ data_ov31_02183114: ; 0x02183114 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02183118 data_ov31_02183118: ; 0x02183118 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_0218311c data_ov31_0218311c: ; 0x0218311c .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -11941,7 +11941,7 @@ data_ov31_02183200: ; 0x02183200 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_02183204 data_ov31_02183204: ; 0x02183204 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02183208 data_ov31_02183208: ; 0x02183208 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -12118,7 +12118,7 @@ data_ov31_021832ec: ; 0x021832ec .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_021832f0 data_ov31_021832f0: ; 0x021832f0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_021832f4 data_ov31_021832f4: ; 0x021832f4 .word func_ov31_0217f638 ; data_ov61_0217f638 @@ -12295,7 +12295,7 @@ data_ov31_021833d8: ; 0x021833d8 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_021833dc data_ov31_021833dc: ; 0x021833dc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_021833e0 data_ov31_021833e0: ; 0x021833e0 .word func_ov31_0217f454 ; data_ov61_0217f454 @@ -12472,7 +12472,7 @@ data_ov31_021834c4: ; 0x021834c4 .word func_ov31_0217f090 ; data_ov61_0217f090 .global data_ov31_021834c8 data_ov31_021834c8: ; 0x021834c8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_021834cc data_ov31_021834cc: ; 0x021834cc .word _ZN5Actor8vfunc_20Ei @@ -12859,7 +12859,7 @@ data_ov31_02183af8: ; 0x02183af8 .word func_ov14_02144b64 .global data_ov31_02183afc data_ov31_02183afc: ; 0x02183afc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02183b00 data_ov31_02183b00: ; 0x02183b00 .word func_ov31_0217d414 ; data_ov61_0217d414 @@ -13137,7 +13137,7 @@ data_ov31_02183c60: ; 0x02183c60 .word func_ov14_02144b64 .global data_ov31_02183c64 data_ov31_02183c64: ; 0x02183c64 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02183c68 data_ov31_02183c68: ; 0x02183c68 .word func_ov31_0217d414 ; data_ov61_0217d414 @@ -13367,7 +13367,7 @@ data_ov31_02183d94: ; 0x02183d94 .word func_ov14_02144b64 .global data_ov31_02183d98 data_ov31_02183d98: ; 0x02183d98 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov31_02183d9c data_ov31_02183d9c: ; 0x02183d9c .word func_ov31_021815e0 ; data_ov61_021815e0 diff --git a/asm/ov32.inc b/asm/ov32.inc index d4db3dfb..deaf2dfb 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -44,7 +44,7 @@ .extern _ZN5Actor4KillEv .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov32.s b/asm/ov32.s index 7ce826e8..b3cf9ebc 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -11972,7 +11972,7 @@ data_ov32_021855c4: ; 0x021855c4 .word func_ov00_020cad30 .global data_ov32_021855c8 data_ov32_021855c8: ; 0x021855c8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov32_021855cc data_ov32_021855cc: ; 0x021855cc .word func_ov00_020cb1c0 @@ -12371,7 +12371,7 @@ data_ov32_021857d8: ; 0x021857d8 .word func_ov00_020cad30 .global data_ov32_021857dc data_ov32_021857dc: ; 0x021857dc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov32_021857e0 data_ov32_021857e0: ; 0x021857e0 .word func_ov00_020cb1c0 @@ -12950,7 +12950,7 @@ data_ov32_02185aec: ; 0x02185aec .word func_ov00_020cad30 .global data_ov32_02185af0 data_ov32_02185af0: ; 0x02185af0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov32_02185af4 data_ov32_02185af4: ; 0x02185af4 .word func_ov00_020cb1c0 @@ -13595,7 +13595,7 @@ data_ov32_02185e48: ; 0x02185e48 .word func_ov00_020cad30 .global data_ov32_02185e4c data_ov32_02185e4c: ; 0x02185e4c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov32_02185e50 data_ov32_02185e50: ; 0x02185e50 .word func_ov00_020cb1c0 @@ -13895,7 +13895,7 @@ data_ov32_02185fd8: ; 0x02185fd8 .word func_ov00_020cad30 .global data_ov32_02185fdc data_ov32_02185fdc: ; 0x02185fdc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov32_02185fe0 data_ov32_02185fe0: ; 0x02185fe0 .word func_ov00_020cb1c0 @@ -14099,7 +14099,7 @@ data_ov32_021860e8: ; 0x021860e8 .word func_ov00_020cad30 .global data_ov32_021860ec data_ov32_021860ec: ; 0x021860ec - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov32_021860f0 data_ov32_021860f0: ; 0x021860f0 .word func_ov00_020cb1c0 diff --git a/asm/ov33.inc b/asm/ov33.inc index a5afea63..73fe194a 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -28,7 +28,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov33.s b/asm/ov33.s index fd209419..06c96977 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -5219,7 +5219,7 @@ data_ov33_0217ff60: ; 0x0217ff60 .word func_ov00_020cad30 .global data_ov33_0217ff64 data_ov33_0217ff64: ; 0x0217ff64 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov33_0217ff68 data_ov33_0217ff68: ; 0x0217ff68 .word func_ov00_020cb1c0 @@ -5458,7 +5458,7 @@ data_ov33_021800ac: ; 0x021800ac .word func_ov00_020cad30 .global data_ov33_021800b0 data_ov33_021800b0: ; 0x021800b0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov33_021800b4 data_ov33_021800b4: ; 0x021800b4 .word func_ov33_0217cf2c @@ -5662,7 +5662,7 @@ data_ov33_021801bc: ; 0x021801bc .word func_ov14_02144b64 .global data_ov33_021801c0 data_ov33_021801c0: ; 0x021801c0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov33_021801c4 data_ov33_021801c4: ; 0x021801c4 .word func_ov14_02145100 @@ -5955,7 +5955,7 @@ data_ov33_02180348: ; 0x02180348 .word func_ov00_020cad30 .global data_ov33_0218034c data_ov33_0218034c: ; 0x0218034c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov33_02180350 data_ov33_02180350: ; 0x02180350 .word func_ov00_020cb1c0 @@ -6218,7 +6218,7 @@ data_ov33_021804b8: ; 0x021804b8 .word _ZN5Actor8vfunc_18Ej .global data_ov33_021804bc data_ov33_021804bc: ; 0x021804bc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov33_021804c0 data_ov33_021804c0: ; 0x021804c0 .word func_ov33_0217fa5c ; data_ov61_0217fa5c diff --git a/asm/ov34.inc b/asm/ov34.inc index abc71f63..e33bc311 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -29,7 +29,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov34.s b/asm/ov34.s index fb91d737..2a190adf 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -11901,7 +11901,7 @@ data_ov34_02185d68: ; 0x02185d68 .word func_ov34_02184408 .global data_ov34_02185d6c data_ov34_02185d6c: ; 0x02185d6c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov34_02185d70 data_ov34_02185d70: ; 0x02185d70 .word func_ov34_02184698 @@ -12253,7 +12253,7 @@ data_ov34_02185fd4: ; 0x02185fd4 .word _ZN5Actor8vfunc_18Ej .global data_ov34_02185fd8 data_ov34_02185fd8: ; 0x02185fd8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov34_02185fdc data_ov34_02185fdc: ; 0x02185fdc .word _ZN5Actor8vfunc_20Ei @@ -12466,7 +12466,7 @@ data_ov34_021860f0: ; 0x021860f0 .word _ZN5Actor8vfunc_18Ej .global data_ov34_021860f4 data_ov34_021860f4: ; 0x021860f4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov34_021860f8 data_ov34_021860f8: ; 0x021860f8 .word func_ov34_021855d4 diff --git a/asm/ov35.inc b/asm/ov35.inc index f209197e..1720b5cd 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -42,7 +42,7 @@ .extern _ZN5Actor4KillEv .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov35.s b/asm/ov35.s index 6fc10aca..4a1314cf 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -12074,7 +12074,7 @@ data_ov35_021859a4: ; 0x021859a4 .word func_ov35_0217c704 .global data_ov35_021859a8 data_ov35_021859a8: ; 0x021859a8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov35_021859ac data_ov35_021859ac: ; 0x021859ac .word func_ov35_0217cea4 @@ -12239,7 +12239,7 @@ data_ov35_02185a88: ; 0x02185a88 .word func_ov35_0217dc7c .global data_ov35_02185a8c data_ov35_02185a8c: ; 0x02185a8c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov35_02185a90 data_ov35_02185a90: ; 0x02185a90 .word func_ov35_0217e320 ; data_ov61_0217e320 @@ -12727,7 +12727,7 @@ data_ov35_02185d08: ; 0x02185d08 .word func_ov35_02180b68 ; data_ov61_02180b68 .global data_ov35_02185d0c data_ov35_02185d0c: ; 0x02185d0c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov35_02185d10 data_ov35_02185d10: ; 0x02185d10 .word func_ov35_02183848 @@ -12871,7 +12871,7 @@ data_ov35_02185dc8: ; 0x02185dc8 .word func_ov35_02184b14 .global data_ov35_02185dcc data_ov35_02185dcc: ; 0x02185dcc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov35_02185dd0 data_ov35_02185dd0: ; 0x02185dd0 .word func_ov35_02184f30 diff --git a/asm/ov36.inc b/asm/ov36.inc index 06ae4519..2b1b1b20 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -34,7 +34,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov36.s b/asm/ov36.s index 8302771f..39fd8db4 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -13470,7 +13470,7 @@ data_ov36_02186f04: ; 0x02186f04 .word _ZN5Actor8vfunc_18Ej .global data_ov36_02186f08 data_ov36_02186f08: ; 0x02186f08 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov36_02186f0c data_ov36_02186f0c: ; 0x02186f0c .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov37.inc b/asm/ov37.inc index b86f3704..d9dc3647 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -37,7 +37,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov37.s b/asm/ov37.s index 81f6d41e..b15bd621 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -15772,7 +15772,7 @@ data_ov37_02188ac0: ; 0x02188ac0 .word func_ov37_0217d68c .global data_ov37_02188ac4 data_ov37_02188ac4: ; 0x02188ac4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov37_02188ac8 data_ov37_02188ac8: ; 0x02188ac8 .word func_ov37_0217f120 @@ -16192,7 +16192,7 @@ data_ov37_02188cec: ; 0x02188cec .word func_ov37_0218494c .global data_ov37_02188cf0 data_ov37_02188cf0: ; 0x02188cf0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov37_02188cf4 data_ov37_02188cf4: ; 0x02188cf4 .word func_ov37_02184bc0 @@ -16333,7 +16333,7 @@ data_ov37_02188da8: ; 0x02188da8 .word _ZN5Actor8vfunc_18Ej .global data_ov37_02188dac data_ov37_02188dac: ; 0x02188dac - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov37_02188db0 data_ov37_02188db0: ; 0x02188db0 .word _ZN5Actor8vfunc_20Ei @@ -16474,7 +16474,7 @@ data_ov37_02188e64: ; 0x02188e64 .word _ZN5Actor8vfunc_18Ej .global data_ov37_02188e68 data_ov37_02188e68: ; 0x02188e68 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov37_02188e6c data_ov37_02188e6c: ; 0x02188e6c .word _ZN5Actor8vfunc_20Ei @@ -16711,7 +16711,7 @@ data_ov37_02188fa0: ; 0x02188fa0 .word func_ov00_020cad30 .global data_ov37_02188fa4 data_ov37_02188fa4: ; 0x02188fa4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov37_02188fa8 data_ov37_02188fa8: ; 0x02188fa8 .word func_ov00_020cb1c0 diff --git a/asm/ov38.inc b/asm/ov38.inc index 59d54df1..b919ad14 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -31,7 +31,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov38.s b/asm/ov38.s index 6b9c8b22..f25e1439 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -15424,7 +15424,7 @@ data_ov38_02188f50: ; 0x02188f50 .word func_ov38_02183aa4 .global data_ov38_02188f54 data_ov38_02188f54: ; 0x02188f54 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov38_02188f58 data_ov38_02188f58: ; 0x02188f58 .word func_ov38_02184c94 @@ -15751,7 +15751,7 @@ data_ov38_02189140: ; 0x02189140 .word func_ov38_021888a0 ; data_ov40_021888a0 .global data_ov38_02189144 data_ov38_02189144: ; 0x02189144 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov38_02189148 data_ov38_02189148: ; 0x02189148 .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov39.inc b/asm/ov39.inc index 4c02cca9..74711d51 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -37,7 +37,7 @@ .extern _ZN5Actor20IncreaseActiveFramesEv .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov39.s b/asm/ov39.s index cbf8d756..5ddab6b7 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -13388,7 +13388,7 @@ data_ov39_02186a50: ; 0x02186a50 .word func_ov39_0217d704 .global data_ov39_02186a54 data_ov39_02186a54: ; 0x02186a54 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov39_02186a58 data_ov39_02186a58: ; 0x02186a58 .word func_ov39_0217dd1c diff --git a/asm/ov40.inc b/asm/ov40.inc index 785fa3e5..79d1229e 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -30,7 +30,7 @@ .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_14Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov40.s b/asm/ov40.s index 2692cb98..d7e60a1e 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -16725,7 +16725,7 @@ data_ov40_021886a0: ; 0x021886a0 .word func_ov40_0217d3f8 .global data_ov40_021886a4 data_ov40_021886a4: ; 0x021886a4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov40_021886a8 data_ov40_021886a8: ; 0x021886a8 .word func_ov40_0217d40c @@ -18179,7 +18179,7 @@ data_ov40_021891ec: ; 0x021891ec .word func_ov40_02184188 .global data_ov40_021891f0 data_ov40_021891f0: ; 0x021891f0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov40_021891f4 data_ov40_021891f4: ; 0x021891f4 .word func_ov40_0218419c @@ -18501,7 +18501,7 @@ data_ov40_02189398: ; 0x02189398 .word func_ov40_0217d3f8 .global data_ov40_0218939c data_ov40_0218939c: ; 0x0218939c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov40_021893a0 data_ov40_021893a0: ; 0x021893a0 .word func_ov40_02184dc4 @@ -18655,7 +18655,7 @@ data_ov40_02189478: ; 0x02189478 .word func_ov40_0218502c .global data_ov40_0218947c data_ov40_0218947c: ; 0x0218947c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov40_02189480 data_ov40_02189480: ; 0x02189480 .word func_ov40_02185040 @@ -19017,7 +19017,7 @@ data_ov40_02189650: ; 0x02189650 .word func_ov40_0217d3f8 .global data_ov40_02189654 data_ov40_02189654: ; 0x02189654 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov40_02189658 data_ov40_02189658: ; 0x02189658 .word func_ov40_02185514 @@ -19167,7 +19167,7 @@ data_ov40_02189718: ; 0x02189718 .word _ZN5Actor8vfunc_18Ej .global data_ov40_0218971c data_ov40_0218971c: ; 0x0218971c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov40_02189720 data_ov40_02189720: ; 0x02189720 .word _ZN5Actor8vfunc_20Ei @@ -19579,7 +19579,7 @@ data_ov40_02189948: ; 0x02189948 .word func_ov40_0217d3f8 .global data_ov40_0218994c data_ov40_0218994c: ; 0x0218994c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov40_02189950 data_ov40_02189950: ; 0x02189950 .word func_ov40_0218755c diff --git a/asm/ov41.inc b/asm/ov41.inc index fb7fb6f9..ddaa4059 100644 --- a/asm/ov41.inc +++ b/asm/ov41.inc @@ -34,7 +34,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov41.s b/asm/ov41.s index 4e3b0628..05720efe 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -6250,7 +6250,7 @@ data_ov41_0218e360: ; 0x0218e360 .word func_ov14_02144b64 .global data_ov41_0218e364 data_ov41_0218e364: ; 0x0218e364 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov41_0218e368 data_ov41_0218e368: ; 0x0218e368 .word func_ov41_02189b10 @@ -6481,7 +6481,7 @@ data_ov41_0218e494: ; 0x0218e494 .word func_ov14_02144b64 .global data_ov41_0218e498 data_ov41_0218e498: ; 0x0218e498 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov41_0218e49c data_ov41_0218e49c: ; 0x0218e49c .word func_ov41_0218a2c8 @@ -6664,7 +6664,7 @@ data_ov41_0218e588: ; 0x0218e588 .word func_ov41_0218a8a4 .global data_ov41_0218e58c data_ov41_0218e58c: ; 0x0218e58c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov41_0218e590 data_ov41_0218e590: ; 0x0218e590 .word func_ov41_0218a9c0 @@ -6861,7 +6861,7 @@ data_ov41_0218e684: ; 0x0218e684 .word func_ov14_02144b64 .global data_ov41_0218e688 data_ov41_0218e688: ; 0x0218e688 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov41_0218e68c data_ov41_0218e68c: ; 0x0218e68c .word func_ov41_0218c3d4 @@ -7050,7 +7050,7 @@ data_ov41_0218e780: ; 0x0218e780 .word func_ov14_02144b64 .global data_ov41_0218e784 data_ov41_0218e784: ; 0x0218e784 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov41_0218e788 data_ov41_0218e788: ; 0x0218e788 .word func_ov14_02145100 @@ -7335,7 +7335,7 @@ data_ov41_0218e8fc: ; 0x0218e8fc .word func_ov00_020cad30 .global data_ov41_0218e900 data_ov41_0218e900: ; 0x0218e900 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov41_0218e904 data_ov41_0218e904: ; 0x0218e904 .word func_ov00_020cb1c0 diff --git a/asm/ov42.inc b/asm/ov42.inc index d4addeab..6a4b399e 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -20,7 +20,7 @@ .extern _ZN5Actor8vfunc_08Ev .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov42.s b/asm/ov42.s index 8ea76ad3..0e0adc55 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -4228,7 +4228,7 @@ data_ov42_0218c934: ; 0x0218c934 .word func_ov14_02144b64 .global data_ov42_0218c938 data_ov42_0218c938: ; 0x0218c938 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov42_0218c93c data_ov42_0218c93c: ; 0x0218c93c .word func_ov42_0218b7fc @@ -4457,7 +4457,7 @@ data_ov42_0218caf0: ; 0x0218caf0 .word func_ov42_0218bf70 .global data_ov42_0218caf4 data_ov42_0218caf4: ; 0x0218caf4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov42_0218caf8 data_ov42_0218caf8: ; 0x0218caf8 .word func_ov42_0218c034 @@ -4601,7 +4601,7 @@ data_ov42_0218cbb0: ; 0x0218cbb0 .word func_ov42_0218bf70 .global data_ov42_0218cbb4 data_ov42_0218cbb4: ; 0x0218cbb4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov42_0218cbb8 data_ov42_0218cbb8: ; 0x0218cbb8 .word func_ov42_0218c034 @@ -4745,7 +4745,7 @@ data_ov42_0218cc70: ; 0x0218cc70 .word func_ov42_0218bf70 .global data_ov42_0218cc74 data_ov42_0218cc74: ; 0x0218cc74 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov42_0218cc78 data_ov42_0218cc78: ; 0x0218cc78 .word func_ov42_0218c034 diff --git a/asm/ov43.inc b/asm/ov43.inc index e16801bc..cb3e2b09 100644 --- a/asm/ov43.inc +++ b/asm/ov43.inc @@ -27,7 +27,7 @@ .extern _ZN5Actor18func_ov00_020c3200Ei .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov43.s b/asm/ov43.s index 4542ea1e..4194549a 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -4952,7 +4952,7 @@ data_ov43_0218d680: ; 0x0218d680 .word func_ov00_020cad30 .global data_ov43_0218d684 data_ov43_0218d684: ; 0x0218d684 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov43_0218d688 data_ov43_0218d688: ; 0x0218d688 .word func_ov00_020cb1c0 @@ -5156,7 +5156,7 @@ data_ov43_0218d790: ; 0x0218d790 .word func_ov00_020cad30 .global data_ov43_0218d794 data_ov43_0218d794: ; 0x0218d794 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov43_0218d798 data_ov43_0218d798: ; 0x0218d798 .word func_ov00_020cb1c0 @@ -5360,7 +5360,7 @@ data_ov43_0218d8a0: ; 0x0218d8a0 .word func_ov00_020cad30 .global data_ov43_0218d8a4 data_ov43_0218d8a4: ; 0x0218d8a4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov43_0218d8a8 data_ov43_0218d8a8: ; 0x0218d8a8 .word func_ov00_020cb1c0 @@ -5579,7 +5579,7 @@ data_ov43_0218d9c4: ; 0x0218d9c4 .word func_ov43_0218c9ec .global data_ov43_0218d9c8 data_ov43_0218d9c8: ; 0x0218d9c8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov43_0218d9cc data_ov43_0218d9cc: ; 0x0218d9cc .word func_ov00_020cb1c0 diff --git a/asm/ov44.inc b/asm/ov44.inc index b8293509..eecca701 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -29,7 +29,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov44.s b/asm/ov44.s index dc1c6591..1a948961 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -7766,7 +7766,7 @@ data_ov44_0218f2a0: ; 0x0218f2a0 .word func_ov00_020cad30 .global data_ov44_0218f2a4 data_ov44_0218f2a4: ; 0x0218f2a4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218f2a8 data_ov44_0218f2a8: ; 0x0218f2a8 .word func_ov00_020cb1c0 @@ -8137,7 +8137,7 @@ data_ov44_0218f484: ; 0x0218f484 .word func_ov00_020cad30 .global data_ov44_0218f488 data_ov44_0218f488: ; 0x0218f488 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218f48c data_ov44_0218f48c: ; 0x0218f48c .word func_ov00_020cb1c0 @@ -8397,7 +8397,7 @@ data_ov44_0218f5d4: ; 0x0218f5d4 .word _ZN5Actor8vfunc_18Ej .global data_ov44_0218f5d8 data_ov44_0218f5d8: ; 0x0218f5d8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218f5dc data_ov44_0218f5dc: ; 0x0218f5dc .word func_ov44_0218ae78 @@ -8730,7 +8730,7 @@ data_ov44_0218f790: ; 0x0218f790 .word func_ov00_020cad30 .global data_ov44_0218f794 data_ov44_0218f794: ; 0x0218f794 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218f798 data_ov44_0218f798: ; 0x0218f798 .word func_ov00_020cb1c0 @@ -9078,7 +9078,7 @@ data_ov44_0218f97c: ; 0x0218f97c .word _ZN5Actor8vfunc_18Ej .global data_ov44_0218f980 data_ov44_0218f980: ; 0x0218f980 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218f984 data_ov44_0218f984: ; 0x0218f984 .word func_ov44_0218c5f0 @@ -9371,7 +9371,7 @@ data_ov44_0218faf8: ; 0x0218faf8 .word func_ov00_020cad30 .global data_ov44_0218fafc data_ov44_0218fafc: ; 0x0218fafc - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218fb00 data_ov44_0218fb00: ; 0x0218fb00 .word func_ov00_020cb1c0 @@ -9762,7 +9762,7 @@ data_ov44_0218fd08: ; 0x0218fd08 .word func_ov00_020cad30 .global data_ov44_0218fd0c data_ov44_0218fd0c: ; 0x0218fd0c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218fd10 data_ov44_0218fd10: ; 0x0218fd10 .word func_ov00_020cb1c0 @@ -9981,7 +9981,7 @@ data_ov44_0218fe2c: ; 0x0218fe2c .word _ZN5Actor8vfunc_18Ej .global data_ov44_0218fe30 data_ov44_0218fe30: ; 0x0218fe30 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov44_0218fe34 data_ov44_0218fe34: ; 0x0218fe34 .word func_ov44_0218e3e0 diff --git a/asm/ov45.inc b/asm/ov45.inc index e4ea15e2..9d7d2150 100644 --- a/asm/ov45.inc +++ b/asm/ov45.inc @@ -16,7 +16,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov45.s b/asm/ov45.s index f7dfb2be..34ddc417 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -6686,7 +6686,7 @@ data_ov45_0218e4ec: ; 0x0218e4ec .word func_ov14_02144b64 .global data_ov45_0218e4f0 data_ov45_0218e4f0: ; 0x0218e4f0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov45_0218e4f4 data_ov45_0218e4f4: ; 0x0218e4f4 .word func_ov45_02189d20 @@ -7194,7 +7194,7 @@ data_ov45_0218e76c: ; 0x0218e76c .word func_ov14_02144b64 .global data_ov45_0218e770 data_ov45_0218e770: ; 0x0218e770 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov45_0218e774 data_ov45_0218e774: ; 0x0218e774 .word func_ov45_0218b024 @@ -7511,7 +7511,7 @@ data_ov45_0218e970: ; 0x0218e970 .word func_ov14_02144b64 .global data_ov45_0218e974 data_ov45_0218e974: ; 0x0218e974 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov45_0218e978 data_ov45_0218e978: ; 0x0218e978 .word func_ov14_02145100 diff --git a/asm/ov46.inc b/asm/ov46.inc index ad641334..03ef6467 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -27,7 +27,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov46.s b/asm/ov46.s index a18c2500..0ab1eb2a 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -5461,7 +5461,7 @@ data_ov46_021946b0: ; 0x021946b0 .word func_ov14_02144b64 .global data_ov46_021946b4 data_ov46_021946b4: ; 0x021946b4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov46_021946b8 data_ov46_021946b8: ; 0x021946b8 .word func_ov14_02145100 @@ -5688,7 +5688,7 @@ data_ov46_021947e0: ; 0x021947e0 .word func_ov14_02144b64 .global data_ov46_021947e4 data_ov46_021947e4: ; 0x021947e4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov46_021947e8 data_ov46_021947e8: ; 0x021947e8 .word func_ov46_0219194c @@ -6011,7 +6011,7 @@ data_ov46_02194988: ; 0x02194988 .word func_ov14_02144b64 .global data_ov46_0219498c data_ov46_0219498c: ; 0x0219498c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov46_02194990 data_ov46_02194990: ; 0x02194990 .word func_ov46_021925c4 @@ -6300,7 +6300,7 @@ data_ov46_02194b04: ; 0x02194b04 .word _ZN5Actor8vfunc_18Ej .global data_ov46_02194b08 data_ov46_02194b08: ; 0x02194b08 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov46_02194b0c data_ov46_02194b0c: ; 0x02194b0c .word func_ov46_02193018 diff --git a/asm/ov47.inc b/asm/ov47.inc index 85980699..2baf44fc 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -27,7 +27,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov47.s b/asm/ov47.s index 6101347c..47a47ed9 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -5322,7 +5322,7 @@ data_ov47_02194520: ; 0x02194520 .word _ZN5Actor8vfunc_18Ej .global data_ov47_02194524 data_ov47_02194524: ; 0x02194524 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov47_02194528 data_ov47_02194528: ; 0x02194528 .word _ZN5Actor8vfunc_20Ei @@ -5463,7 +5463,7 @@ data_ov47_021945dc: ; 0x021945dc .word _ZN5Actor8vfunc_18Ej .global data_ov47_021945e0 data_ov47_021945e0: ; 0x021945e0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov47_021945e4 data_ov47_021945e4: ; 0x021945e4 .word func_ov47_021910fc @@ -5780,7 +5780,7 @@ data_ov47_02194778: ; 0x02194778 .word func_ov00_020cad30 .global data_ov47_0219477c data_ov47_0219477c: ; 0x0219477c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov47_02194780 data_ov47_02194780: ; 0x02194780 .word func_ov00_020cb1c0 @@ -6121,7 +6121,7 @@ data_ov47_02194934: ; 0x02194934 .word _ZN5Actor8vfunc_18Ej .global data_ov47_02194938 data_ov47_02194938: ; 0x02194938 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov47_0219493c data_ov47_0219493c: ; 0x0219493c .word func_ov47_02194110 diff --git a/asm/ov48.inc b/asm/ov48.inc index 83d1fe0e..307123cb 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -32,7 +32,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev @@ -92,7 +92,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov48.s b/asm/ov48.s index ab91b4a8..dc27c371 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -6249,7 +6249,7 @@ data_ov48_02194be0: ; 0x02194be0 .word func_ov00_020cad30 .global data_ov48_02194be4 data_ov48_02194be4: ; 0x02194be4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov48_02194be8 data_ov48_02194be8: ; 0x02194be8 .word func_ov00_020cb1c0 @@ -6640,7 +6640,7 @@ data_ov48_02194df0: ; 0x02194df0 .word func_ov00_020cad30 .global data_ov48_02194df4 data_ov48_02194df4: ; 0x02194df4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov48_02194df8 data_ov48_02194df8: ; 0x02194df8 .word func_ov48_02191c74 @@ -7008,7 +7008,7 @@ data_ov48_02194fd0: ; 0x02194fd0 .word func_ov00_020cad30 .global data_ov48_02194fd4 data_ov48_02194fd4: ; 0x02194fd4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov48_02194fd8 data_ov48_02194fd8: ; 0x02194fd8 .word func_ov00_020cb1c0 @@ -7212,7 +7212,7 @@ data_ov48_021950e0: ; 0x021950e0 .word _ZN5Actor8vfunc_18Ej .global data_ov48_021950e4 data_ov48_021950e4: ; 0x021950e4 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov48_021950e8 data_ov48_021950e8: ; 0x021950e8 .word func_ov48_02193f48 @@ -7353,7 +7353,7 @@ data_ov48_0219519c: ; 0x0219519c .word _ZN5Actor8vfunc_18Ej .global data_ov48_021951a0 data_ov48_021951a0: ; 0x021951a0 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov48_021951a4 data_ov48_021951a4: ; 0x021951a4 .word _ZN5Actor8vfunc_20Ei @@ -7494,7 +7494,7 @@ data_ov48_02195258: ; 0x02195258 .word _ZN5Actor8vfunc_18Ej .global data_ov48_0219525c data_ov48_0219525c: ; 0x0219525c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov48_02195260 data_ov48_02195260: ; 0x02195260 .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov49.inc b/asm/ov49.inc index b77fe9ce..3caafb2f 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -36,7 +36,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_20Ei .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev diff --git a/asm/ov49.s b/asm/ov49.s index e55eb9d2..dc33190a 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -3805,7 +3805,7 @@ data_ov49_02198580: ; 0x02198580 .word func_ov00_020cad30 .global data_ov49_02198584 data_ov49_02198584: ; 0x02198584 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov49_02198588 data_ov49_02198588: ; 0x02198588 .word func_ov00_020cb1c0 @@ -4207,7 +4207,7 @@ data_ov49_021987b4: ; 0x021987b4 .word func_ov49_02197b58 .global data_ov49_021987b8 data_ov49_021987b8: ; 0x021987b8 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov49_021987bc data_ov49_021987bc: ; 0x021987bc .word func_ov49_02197b98 @@ -4348,7 +4348,7 @@ data_ov49_02198870: ; 0x02198870 .word func_ov49_02197f04 .global data_ov49_02198874 data_ov49_02198874: ; 0x02198874 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov49_02198878 data_ov49_02198878: ; 0x02198878 .word _ZN5Actor8vfunc_20Ei diff --git a/asm/ov50.inc b/asm/ov50.inc index b6644b51..3e64b0a5 100644 --- a/asm/ov50.inc +++ b/asm/ov50.inc @@ -37,7 +37,7 @@ .extern _ZN5Actor6GetPosEv .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov50.s b/asm/ov50.s index 02321634..8ac4a8e5 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -4083,7 +4083,7 @@ data_ov50_02198a1c: ; 0x02198a1c .word func_ov50_02195cd4 .global data_ov50_02198a20 data_ov50_02198a20: ; 0x02198a20 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov50_02198a24 data_ov50_02198a24: ; 0x02198a24 .word func_ov50_021963f0 @@ -4368,7 +4368,7 @@ data_ov50_02198b98: ; 0x02198b98 .word func_ov00_020cad30 .global data_ov50_02198b9c data_ov50_02198b9c: ; 0x02198b9c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov50_02198ba0 data_ov50_02198ba0: ; 0x02198ba0 .word func_ov00_020cb1c0 diff --git a/asm/ov51.inc b/asm/ov51.inc index 43a42cd2..0efec726 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -26,7 +26,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov51.s b/asm/ov51.s index 1628f352..57ab5736 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -3754,7 +3754,7 @@ data_ov51_02198500: ; 0x02198500 .word _ZN5Actor8vfunc_18Ej .global data_ov51_02198504 data_ov51_02198504: ; 0x02198504 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov51_02198508 data_ov51_02198508: ; 0x02198508 .word func_ov51_02195800 @@ -3951,7 +3951,7 @@ data_ov51_021985fc: ; 0x021985fc .word _ZN5Actor8vfunc_18Ej .global data_ov51_02198600 data_ov51_02198600: ; 0x02198600 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov51_02198604 data_ov51_02198604: ; 0x02198604 .word func_ov51_02195ea0 @@ -4188,7 +4188,7 @@ data_ov51_02198738: ; 0x02198738 .word func_ov00_020cad30 .global data_ov51_0219873c data_ov51_0219873c: ; 0x0219873c - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov51_02198740 data_ov51_02198740: ; 0x02198740 .word func_ov00_020cb1c0 @@ -4412,7 +4412,7 @@ data_ov51_02198874: ; 0x02198874 .word _ZN5Actor8vfunc_18Ej .global data_ov51_02198878 data_ov51_02198878: ; 0x02198878 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov51_0219887c data_ov51_0219887c: ; 0x0219887c .word func_ov51_02197690 @@ -4633,7 +4633,7 @@ data_ov51_02198990: ; 0x02198990 .word _ZN5Actor8vfunc_18Ej .global data_ov51_02198994 data_ov51_02198994: ; 0x02198994 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov51_02198998 data_ov51_02198998: ; 0x02198998 .word func_ov51_02197e08 diff --git a/asm/ov52.inc b/asm/ov52.inc index 9b4eb2c7..69f2b529 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -30,7 +30,7 @@ .extern _ZN5Actor8vfunc_0cEv .extern _ZN5Actor8vfunc_10Ej .extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_1cEPt .extern _ZN5Actor8vfunc_24Ev .extern _ZN5Actor8vfunc_28Ev .extern _ZN5Actor8vfunc_2cEv diff --git a/asm/ov52.s b/asm/ov52.s index 570ffa82..ed06a8f5 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -3275,7 +3275,7 @@ data_ov52_02197b50: ; 0x02197b50 .word func_ov14_02144b64 .global data_ov52_02197b54 data_ov52_02197b54: ; 0x02197b54 - .word _ZN5Actor8vfunc_1cEt + .word _ZN5Actor8vfunc_1cEPt .global data_ov52_02197b58 data_ov52_02197b58: ; 0x02197b58 .word func_ov14_02145100 diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index c5b71193..ab81bb99 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -66,8 +66,8 @@ public: /* 004 */ unk32 mType; /* 008 */ unk32 mId; /* 00c */ unk32 mIndex; - /* 010 */ unk8 mUnk_010; - /* 011 */ unk8 mUnk_011; + /* 010 */ u8 mUnk_010; + /* 011 */ u8 mUnk_011; /* 012 */ unk16 mUnk_012; /* 014 */ unk32 mUnk_014; /* 018 */ unk32 mUnk_018; @@ -116,7 +116,7 @@ public: /* 11b */ unk8 mUnk_11b; /* 11c */ unk8 mUnk_11c; /* 11d */ unk8 mUnk_11d; - /* 11e */ q4 yOffset; + /* 11e */ q4 mYOffset; /* 120 */ s16 mUnk_120; /* 122 */ unk16 mUnk_122; /* 124 */ unk8 mUnk_124; @@ -143,7 +143,7 @@ public: /* 10 */ virtual void vfunc_10(u32 param1); /* 14 */ virtual void vfunc_14(u32 param1); /* 18 */ virtual void vfunc_18(u32 param1); - /* 1c */ virtual void vfunc_1c(u16 param1); + /* 1c */ virtual void vfunc_1c(u16 *param1); /* 20 */ virtual void vfunc_20(s32 param1); /* 24 */ virtual void vfunc_24(); /* 28 */ virtual void vfunc_28(); @@ -184,7 +184,7 @@ public: /* b4 */ Actor(); - void func_ov00_020c1788(); + unk8 func_ov00_020c1788(); void SetUnk_129(bool value); void SetUnk_11c(unk8 value); bool func_ov00_020c195c(); diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index d0b2d086..e7d1bbcc 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -1,22 +1,79 @@ #include "Actor/Actor.hpp" +#include "Map/MapManager.hpp" -#ifdef STUBS +KILL(_ZN5ActorC1Ev) Actor::Actor() {} Actor::~Actor() {} -bool Actor::vfunc_08() {} + +bool Actor::vfunc_08() { + return true; +} + void Actor::vfunc_0c() {} void Actor::vfunc_10(u32 param1) {} void Actor::vfunc_24() {} void Actor::vfunc_28() {} -void Actor::GetOffsetPos(Vec3p *pos) {} -unk32 Actor::vfunc_38() {} -void Actor::func_ov00_020c1788() {} + +void Actor::GetOffsetPos(Vec3p *pos) { + *pos = mPos; + pos->y += mYOffset; +} + +extern unk32 func_ov00_02087ef0(); +unk32 Actor::vfunc_38() { + return func_ov00_02087ef0(); +} + +unk8 Actor::func_ov00_020c1788() { + return gMapManager->func_ov00_02083570(mUnk_010, mUnk_011); +} + s32 Actor::vfunc_2c() {} unk32 Actor::vfunc_30() {} void Actor::vfunc_14(u32 param1) {} -void Actor::vfunc_18(u32 param1) {} -void Actor::vfunc_1c(u16 param1) {} + +extern void func_ov00_0207a1c8(Actor_UnkStruct_0a4 *param1, u32 param2, Vec3p *param3); +void Actor::vfunc_18(u32 param1) { + func_ov00_0207a1c8(&mUnk_0a4, param1, &mPos); +} + +struct UnkStruct1 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk8 mUnk_08; + /* 09 */ unk8 mUnk_09; + /* 0a */ unk8 mUnk_0a; + /* 0b */ unk8 mUnk_0b; + /* 0c */ unk32 mUnk_0c; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk8 mUnk_14; + /* 15 */ unk8 mUnk_15; + /* 16 */ unk16 mUnk_16; + /* 18 */ unk32 mUnk_18; + /* 1c */ unk32 mUnk_1c; + /* 20 */ +}; +extern void *data_027e0d3c; +extern void *data_02063e4c; +extern "C" bool func_ov00_02079470(void *param1, Vec3p *param2, unk32 param3, unk32 param4, unk32 *param5, unk32 *param6, unk32 param7, unk32 param8); +extern "C" void func_01ffbe34(UnkStruct1 *param1); +extern "C" void func_020313c8(void *param1, unk32 *param2, unk32 *param3, u32 param4, UnkStruct1 *param5); +void Actor::vfunc_1c(u16 *param1) { + unk16 unk1 = mUnk_129 ? mUnk_126 : mUnk_07a; + if (unk1 != -1) { + if ((*param1 & 4) == 0 && (*param1 & 8) == 0) return; + unk32 unk2; + unk32 unk3; + if (func_ov00_02079470(data_027e0d3c, &mPos, 0, 0, &unk2, &unk3, 0, 0)) { + UnkStruct1 unk4; + func_01ffbe34(&unk4); + unk4.mUnk_04 = 1; + func_020313c8(data_02063e4c, &unk2, &unk3, unk1, &unk4); + } + } +} + void Actor::vfunc_20(s32 param1) {} void Actor::SetUnk_129(bool value) {} void Actor::SetUnk_11b() {} @@ -106,4 +163,3 @@ void Actor::GetLinkPos(Vec3p *result) {} void Actor::GetLinkDummyPos(Vec3p *result) {} Actor_UnkStruct_09c::Actor_UnkStruct_09c() {} -#endif