Merge remote-tracking branch 'origin/main' into beetle

Author: encounter

config/GM8E01_00/splits.txt

@@ -162,14 +162,14 @@ MetroidPrime/Tweaks/CTweakGame.cpp:
 	.data       start:0x803D9CD0 end:0x803D9CE0
 
 MetroidPrime/Weapons/CGameProjectile.cpp:
-	.text       start:0x80037400 end:0x8003A7A4
+	.text       start:0x80037400 end:0x8003A820
 	.rodata     start:0x803CCE20 end:0x803CCE38
 	.data       start:0x803D9CE0 end:0x803D9D50
 	.sdata      start:0x805A6DB8 end:0x805A6DE0
 	.sdata2     start:0x805AA120 end:0x805AA168
 
 MetroidPrime/Player/CPlayerGun.cpp:
-	.text       start:0x8003A7A4 end:0x80043DE0
+	.text       start:0x8003A820 end:0x80043DE0
 	.ctors      start:0x803CB1E0 end:0x803CB1E4
 	.rodata     start:0x803CCE38 end:0x803CCEE0
 	.data       start:0x803D9D50 end:0x803D9E30
@@ -2093,7 +2093,7 @@ MetroidPrime/Enemies/CBurrower.cpp:
 	.bss        start:0x80572694 end:0x805726FC align:4 common
 	.sdata2     start:0x805AD8D8 end:0x805AD8F0
 
-MetroidPrime/Enemies/CMetroidPrimeExo.cpp:
+MetroidPrime/Enemies/CMetroidPrime.cpp:
 	.text       start:0x802712AC end:0x8027C5CC
 	.ctors      start:0x803CB2C0 end:0x803CB2C4
 	.rodata     start:0x803D5428 end:0x803D5868
@@ -2108,7 +2108,7 @@ MetroidPrime/ScriptObjects/CScriptBeam.cpp:
 	.rodata     start:0x803D5868 end:0x803D5880
 	.data       start:0x803EB180 end:0x803EB1F0
 
-MetroidPrime/Enemies/CMetroidPrimeEssence.cpp:
+MetroidPrime/Enemies/CMetroidPrimeStage2.cpp:
 	.text       start:0x8027CB38 end:0x80280460
 	.ctors      start:0x803CB2C4 end:0x803CB2C8
 	.rodata     start:0x803D5880 end:0x803D58D8
@@ -2238,7 +2238,7 @@ MetroidPrime/ScriptObjects/CSustainedPlayerDamage.cpp:
 	.sdata      start:0x805A8608 end:0x805A8610
 	.sdata2     start:0x805ADE28 end:0x805ADE30
 
-MetroidPrime/Enemies/CMetroidPrimeProjectile.cpp:
+MetroidPrime/Enemies/CPoisonProjectile.cpp:
 	.text       start:0x802A0338 end:0x802A07F0
 	.rodata     start:0x803D5EE8 end:0x803D5EF0
 	.data       start:0x803EC390 end:0x803EC408

config/GM8E01_00/symbols.txt

@@ -1601,7 +1601,7 @@ MetroidPrime/Enemies/CThardus.cpp:
 	.sbss       start:0x805A9258 end:0x805A9260
 	.sdata2     start:0x805ACBC8 end:0x805ACC80
 
-MetroidPrime/CActorParticles.cpp:
+MetroidPrime/CActorModelParticles.cpp:
 	.text       start:0x801E3920 end:0x801E75D4
 	.rodata     start:0x803D2078 end:0x803D2100
 	.sdata      start:0x805A7FC8 end:0x805A7FD8
@@ -2093,7 +2093,7 @@ MetroidPrime/Enemies/CBurrower.cpp:
 	.bss        start:0x80572874 end:0x805728DC align:4 common
 	.sdata2     start:0x805ADAB8 end:0x805ADAD0
 
-MetroidPrime/Enemies/CMetroidPrimeExo.cpp:
+MetroidPrime/Enemies/CMetroidPrime.cpp:
 	.text       start:0x80271328 end:0x8027C648
 	.ctors      start:0x803CB4A0 end:0x803CB4A4
 	.rodata     start:0x803D5608 end:0x803D5A48
@@ -2108,7 +2108,7 @@ MetroidPrime/ScriptObjects/CScriptBeam.cpp:
 	.rodata     start:0x803D5A48 end:0x803D5A60
 	.data       start:0x803EB360 end:0x803EB3D0
 
-MetroidPrime/Enemies/CMetroidPrimeEssence.cpp:
+MetroidPrime/Enemies/CMetroidPrimeStage2.cpp:
 	.text       start:0x8027CBB4 end:0x802804DC
 	.ctors      start:0x803CB4A4 end:0x803CB4A8
 	.rodata     start:0x803D5A60 end:0x803D5AB8
@@ -2238,7 +2238,7 @@ MetroidPrime/ScriptObjects/CSustainedPlayerDamage.cpp:
 	.sdata      start:0x805A87E8 end:0x805A87F0
 	.sdata2     start:0x805AE008 end:0x805AE010
 
-MetroidPrime/Enemies/CMetroidPrimeProjectile.cpp:
+MetroidPrime/Enemies/CPoisonProjectile.cpp:
 	.text       start:0x802A03E4 end:0x802A089C
 	.rodata     start:0x803D60C8 end:0x803D60D0
 	.data       start:0x803EC570 end:0x803EC5E8

config/GM8E01_01/splits.txt

@@ -1100,7 +1100,7 @@ musyx/runtime/hardware.c:
 
 musyx/runtime/dsp_import.c:
 	.data       start:0x803F4760 end:0x803F6140
-	.sdata      start:0x805A88C0 end:0x805A88C4
+	.sdata      start:0x805A88C0 end:0x805A88C8
 
 musyx/runtime/hw_aramdma.c:
 	.text       start:0x803B4074 end:0x803B4D40
@@ -1162,7 +1162,7 @@ Dolphin/card/CARDBios.c:
 Dolphin/card/CARDUnlock.c:
 	.text       start:0x803B9190 end:0x803BA3F0
 	.data       start:0x803F69E0 end:0x803F6B40
-	.sdata      start:0x805A88D0 end:0x805A88D4
+	.sdata      start:0x805A88D0 end:0x805A88D8
 
 Dolphin/card/CARDRdwr.c:
 	.text       start:0x803BA3F0 end:0x803BA670
@@ -1206,7 +1206,7 @@ Dolphin/card/CARDRename.c:
 
 Dolphin/card/CARDNet.c:
 	.text       start:0x803BE6EC end:0x803BE7B0
-	.sdata      start:0x805A88D8 end:0x805A88DC
+	.sdata      start:0x805A88D8 end:0x805A88E0
 
 Dolphin/si/SIBios.c:
 	.text       start:0x803BE7B0 end:0x803C0010
@@ -1222,7 +1222,7 @@ Dolphin/si/SISamplingRate.c:
 
 Dolphin/exi/EXIBios.c:
 	.text       start:0x803C0118 end:0x803C19F4
-	.data       start:0x803F6D30 end:0x803F6DFC
+	.data       start:0x803F6D30 end:0x803F6E00
 	.bss        start:0x80569B78 end:0x80569C38
 	.sdata      start:0x805A88E8 end:0x805A88EC
 

config/GM8E01_01/symbols.txt

@@ -127,9 +127,9 @@ SetPathCamera__14CCameraManagerF9TUniqueIdR13CStateManager = .text:0x8000933C; /
 HasCameraHint__14CCameraManagerCFR13CStateManager = .text:0x800093E8; // type:function size:0x5C
 GetCameraHint__14CCameraManagerCFR13CStateManager = .text:0x80009444; // type:function size:0x40
 SetupBallCamera__14CCameraManagerFR13CStateManager = .text:0x80009484; // type:function size:0xB0
-AddInactiveCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager = .text:0x80009534; // type:function size:0xBC
-DeleteCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager = .text:0x800095F0; // type:function size:0xE8
-AddActiveCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager = .text:0x800096D8; // type:function size:0xCC
+DeleteCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager = .text:0x80009534; // type:function size:0xBC
+ReallyRemoveCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager = .text:0x800095F0; // type:function size:0xE8
+AddCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager = .text:0x800096D8; // type:function size:0xCC
 HasBallCameraInitialPositionHint__14CCameraManagerCFR13CStateManager = .text:0x800097A4; // type:function size:0x7C
 UpdateCameraHints__14CCameraManagerFfR13CStateManager = .text:0x80009820; // type:function size:0xAF0
 NoCameraHintsLeft__14CCameraManagerFR13CStateManager = .text:0x8000A310; // type:function size:0x1EC
@@ -13611,7 +13611,7 @@ __apl__13CNUQuaternionFRC13CNUQuaternion = .text:0x80311000; // type:function si
 __ml__13CNUQuaternionCFRC13CNUQuaternion = .text:0x80311044; // type:function size:0x118
 __ct__13CNUQuaternionFffff = .text:0x8031115C; // type:function size:0x14
 __ct__13CNUQuaternionFfRC9CVector3f = .text:0x80311170; // type:function size:0x20
-ClampedRotateTo__11CQuaternionFRC10UnitVectorRC10UnitVectorRC9CRelAngle = .text:0x80311190; // type:function size:0xD8
+ClampedRotateTo__11CQuaternionFRC13CUnitVector3fRC13CUnitVector3fRC9CRelAngle = .text:0x80311190; // type:function size:0xD8
 ZRotation__11CQuaternionFRC9CRelAngle = .text:0x80311268; // type:function size:0x38
 YRotation__11CQuaternionFRC9CRelAngle = .text:0x803112A0; // type:function size:0x38
 XRotation__11CQuaternionFRC9CRelAngle = .text:0x803112D8; // type:function size:0x38
@@ -14060,7 +14060,7 @@ construct<Q215CParticleSwoosh11SSwooshData>__4rstlFPvRCQ215CParticleSwoosh11SSwo
 __ct__Q215CParticleSwoosh11SSwooshDataFRCQ215CParticleSwoosh11SSwooshData = .text:0x8032F7D4; // type:function size:0xE4
 __ct__Q215CParticleSwoosh11SSwooshDataFRC9CVector3fRC9CVector3fffibRC12CTransform4fRC9CVector3fffRC6CColor = .text:0x8032F8B8; // type:function size:0xDC
 reserve__Q24rstl67vector<Q215CParticleSwoosh11SSwooshData,Q24rstl17rmemory_allocator>Fi = .text:0x8032F994; // type:function size:0xD8
-uninitialized_copy<Q24rstl154pointer_iterator<Q215CParticleSwoosh11SSwooshData,Q24rstl67vector<Q215CParticleSwoosh11SSwooshData,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q215CParticleSwoosh11SSwooshData>__4rstlFQ24rstl154pointer_iterator<Q215CParticleSwoosh11SSwooshData,Q24rstl67vector<Q215CParticleSwoosh11SSwooshData,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl154pointer_iterator<Q215CParticleSwoosh11SSwooshData,Q24rstl67vector<Q215CParticleSwoosh11SSwooshData,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>PQ215CParticleSwoosh11SSwooshData = .text:0x8032FA6C; // type:function size:0x68
+uninitialized_copy<Q24rstl154pointer_iterator<Q215CParticleSwoosh11SSwooshData,Q24rstl67vector<Q215CParticleSwoosh11SSwooshData,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,PQ215CParticleSwoosh11SSwooshData>__4rstlFQ24rstl154pointer_iterator<Q215CParticleSwoosh11SSwooshData,Q24rstl67vector<Q215CParticleSwoosh11SSwooshData,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl154pointer_iterator<Q215CParticleSwoosh11SSwooshData,Q24rstl67vector<Q215CParticleSwoosh11SSwooshData,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>PQ215CParticleSwoosh11SSwooshData = .text:0x8032FA6C; // type:function size:0x68
 CreateWPSM__26CParticleSwooshDataFactoryFP18CSwooshDescriptionR12CInputStreamP11CSimplePool = .text:0x8032FAD4; // type:function size:0x4DC
 CreateGeneratorDescription__26CParticleSwooshDataFactoryFR12CInputStreamP11CSimplePool = .text:0x8032FFB0; // type:function size:0x8C
 GetGeneratorDesc__26CParticleSwooshDataFactoryFR12CInputStreamP11CSimplePool = .text:0x8033003C; // type:function size:0x84

config/GM8E01_48/splits.txt

@@ -185,7 +185,7 @@
 config.dtk_tag = "v1.8.3"
 config.objdiff_tag = "v3.7.0"
 config.sjiswrap_tag = "v1.2.2"
-config.wibo_tag = "1.0.0"
+config.wibo_tag = "1.0.3"
 
 # Project
 config.config_path = Path("config") / config.version / "config.yml"
@@ -1111,12 +1111,12 @@ def MatchingFor(*versions):
             Object(NonMatching, "MetroidPrime/Factories/CWorldSaveGameInfoFactory.cpp"),
             Object(NonMatching, "MetroidPrime/CFluidPlaneRender.cpp"),
             Object(NonMatching, "MetroidPrime/Enemies/CBurrower.cpp"),
-            Object(NonMatching, "MetroidPrime/Enemies/CMetroidPrimeExo.cpp"),
+            Object(NonMatching, "MetroidPrime/Enemies/CMetroidPrime.cpp"),
             Object(
                 MatchingFor("GM8E01_00", "GM8E01_01"),
                 "MetroidPrime/ScriptObjects/CScriptBeam.cpp",
             ),
-            Object(NonMatching, "MetroidPrime/Enemies/CMetroidPrimeEssence.cpp"),
+            Object(NonMatching, "MetroidPrime/Enemies/CMetroidPrimeStage2.cpp"),
             Object(NonMatching, "MetroidPrime/Enemies/CMetroidPrimeRelay.cpp"),
             Object(NonMatching, "MetroidPrime/Player/CPlayerDynamics.cpp"),
             Object(
@@ -1150,7 +1150,7 @@ def MatchingFor(*versions):
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/ScriptObjects/CSustainedPlayerDamage.cpp"),
             Object(
                 MatchingFor("GM8E01_00", "GM8E01_01"),
-                "MetroidPrime/Enemies/CMetroidPrimeProjectile.cpp",
+                "MetroidPrime/Enemies/CPoisonProjectile.cpp",
             ),
             Object(
                 MatchingFor("GM8E01_00", "GM8E01_01"),
@@ -1491,7 +1491,7 @@ def MatchingFor(*versions):
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector3d.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector3f.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/CVector3i.cpp"),
-            Object(NonMatching, "Kyoto/Math/RMathUtils.cpp"),
+            Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Math/RMathUtils.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/CCrc32.cpp"),
             Object(
                 MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Alloc/CCircularBuffer.cpp"

config/GM8E01_48/symbols.txt

@@ -11,6 +11,8 @@ class CCollidableSphere : public CCollisionPrimitive {
 public:
   CCollidableSphere(const CSphere& sphere, const CMaterialList& material)
   : CCollisionPrimitive(material), x10_sphere(sphere) {}
+  CCollidableSphere(const CCollidableSphere& other)
+  : CCollisionPrimitive(other), x10_sphere(other.x10_sphere) {}
 
   static bool CollideMovingAABox(const CInternalCollisionStructure& collision, const CVector3f& dir,
                                  double& dOut, CCollisionInfo& infoOut);
@@ -23,6 +25,7 @@ class CCollidableSphere : public CCollisionPrimitive {
   FourCC GetPrimType() const override;
   CSphere Transform(const CTransform4f& xf) const;
   const CSphere& GetSphere() const { return x10_sphere; }
+  void SetSphereCenter(const CVector3f& center) { x10_sphere = CSphere(center, x10_sphere.GetRadius()); }
   ~CCollidableSphere() override {}
   CRayCastResult CastRayInternal(const CInternalRayCastStructure& internalRayCast) const override;
 

configure.py

@@ -38,8 +38,6 @@ class CCollisionInfoList {
   const_iterator End() const { return x0_list.end(); }
   iterator Begin() { return x0_list.begin(); }
   const_iterator Begin() const { return x0_list.begin(); }
-
-  CCollisionInfoList& operator=(const CCollisionInfoList& other);
 };
 
 #endif // _CCOLLISIONINFOLIST

include/Collision/CCollidableSphere.hpp

@@ -88,6 +88,7 @@ class CCollisionPrimitive {
   };
 
   CCollisionPrimitive(const CMaterialList& list);
+  CCollisionPrimitive(const CCollisionPrimitive& other) : x8_material(other.x8_material) {}
 
   virtual uint GetTableIndex() const = 0;
   virtual void SetMaterial(const CMaterialList& other) { x8_material = other; }