Match & link CScriptCameraPitchVolume (#528)

* Match & link CScriptCameraPitchVolume

* Use implicit CScriptCameraPitchVolume destructor

Author: henriquegemignani

config/GM8P01_00/splits.txt

@@ -1534,9 +1534,10 @@ MetroidPrime/CIkChain.cpp:
 	.sdata2     start:0x8046F3C0 end:0x8046F3D0
 
 MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.cpp:
-	.text       start:0x802174B4 end:0x802174CC
+	.text       start:0x802170CC end:0x802174CC
 	.ctors      start:0x803B505C end:0x803B5060
 	.bss        start:0x804341D4 end:0x804341E0 align:4 common
+	.sdata      start:0x8046A200 end:0x8046A208
 	.sdata2     start:0x8046F3D0 end:0x8046F3D8
 
 MetroidPrime/RumbleFxTable.cpp:

config/GM8P01_00/symbols.txt

@@ -7649,12 +7649,12 @@ Deactivate__8CIkChainFv = .text:0x80216614; // type:function size:0x14
 PreRender__8CIkChainFR9CAnimDataRC12CTransform4fRC9CVector3f = .text:0x80216628; // type:function size:0x3EC
 Activate__8CIkChainFRC9CAnimData6CSegIdRC12CTransform4f = .text:0x80216A14; // type:function size:0x214
 Solve__8CIkChainFR11CQuaternionR11CQuaternionRC9CVector3f = .text:0x80216C28; // type:function size:0x4A4
-fn_802170CC = .text:0x802170CC; // type:function size:0x30
-fn_802170FC = .text:0x802170FC; // type:function size:0x34
-fn_80217130 = .text:0x80217130; // type:function size:0x88
-fn_802171B8 = .text:0x802171B8; // type:function size:0xC4
-fn_8021727C = .text:0x8021727C; // type:function size:0x7C
-fn_802172F8 = .text:0x802172F8; // type:function size:0x1BC
+Exited__24CScriptCameraPitchVolumeFR13CStateManager = .text:0x802170CC; // type:function size:0x30
+Entered__24CScriptCameraPitchVolumeFR13CStateManager = .text:0x802170FC; // type:function size:0x34
+Think__24CScriptCameraPitchVolumeFfR13CStateManager = .text:0x80217130; // type:function size:0x88
+Touch__24CScriptCameraPitchVolumeFR6CActorR13CStateManager = .text:0x802171B8; // type:function size:0xC4
+GetTouchBounds__24CScriptCameraPitchVolumeCFv = .text:0x8021727C; // type:function size:0x7C
+__ct__24CScriptCameraPitchVolumeF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fRC9CRelAngleRC9CRelAnglef = .text:0x802172F8; // type:function size:0x1BC
 __sinit_CScriptCameraPitchVolume_cpp = .text:0x802174B4; // type:function size:0x18 scope:local
 __sinit_RumbleFxTable_cpp = .text:0x802174CC; // type:function size:0x9DC scope:local
 fn_80217EA8 = .text:0x80217EA8; // type:function size:0x8
@@ -18788,7 +18788,7 @@ skEyeLocator__8CEyeBall = .sdata:0x8046A1D8; // type:object size:0x8 data:4byte
 @475 = .sdata:0x8046A1F4; // type:object size:0x4 scope:local
 @544 = .sdata:0x8046A1F8; // type:object size:0x4 scope:local
 @546 = .sdata:0x8046A1FC; // type:object size:0x4 scope:local
-lbl_8046A200 = .sdata:0x8046A200; // type:object size:0x8 data:4byte
+@666 = .sdata:0x8046A200; // type:object size:0x4 scope:local data:4byte
 lbl_8046A208 = .sdata:0x8046A208; // type:object size:0x4 data:4byte
 lbl_8046A20C = .sdata:0x8046A20C; // type:object size:0x4 data:4byte
 lbl_8046A210 = .sdata:0x8046A210; // type:object size:0x4 data:4byte
@@ -23421,7 +23421,7 @@ lbl_8046F3BC = .sdata2:0x8046F3BC; // type:object size:0x4 align:4 data:float
 @775 = .sdata2:0x8046F3C4; // type:object size:0x4 scope:local align:4 data:float
 @1134 = .sdata2:0x8046F3C8; // type:object size:0x4 scope:local align:4 data:float
 @1135 = .sdata2:0x8046F3CC; // type:object size:0x4 scope:local align:4 data:float
-@616 = .sdata2:0x8046F3D0; // type:object size:0x8 scope:local align:4 data:float
+@616 = .sdata2:0x8046F3D0; // type:object size:0x4 scope:local align:4 data:float
 @66 = .sdata2:0x8046F3D8; // type:object size:0x4 scope:local align:4 data:float
 @67 = .sdata2:0x8046F3DC; // type:object size:0x4 scope:local align:4 data:float
 @68 = .sdata2:0x8046F3E0; // type:object size:0x4 scope:local align:4 data:float

configure.py

@@ -1230,7 +1230,7 @@ def EquivalentFor(*versions):
                 MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/CIkChain.cpp"
             ),
             Object(
-                MatchingFor("GM8E01_00", "GM8E01_01"),
+                MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),
                 "MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.cpp",
             ),
             Object(

include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp

@@ -11,7 +11,6 @@ class CScriptCameraPitchVolume : public CActor {
   CScriptCameraPitchVolume(TUniqueId, bool, const rstl::string&, const CEntityInfo&,
                            const CVector3f&, const CTransform4f&, const CRelAngle&,
                            const CRelAngle&, float);
-  ~CScriptCameraPitchVolume();
 
   DECLARE_TYPES_MATCH_OR_ACCEPT;
   void Think(float, CStateManager&) override;

src/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.cpp

@@ -64,5 +64,3 @@ void CScriptCameraPitchVolume::Exited(CStateManager& mgr) {
   x13c_25_occupied = false;
   mgr.CameraManager()->FirstPersonCamera()->SetScriptPitchId(kInvalidUniqueId);
 }
-
-CScriptCameraPitchVolume::~CScriptCameraPitchVolume() {}