Match and link CGunController

Author: Antidote

config/GM8E01_00/symbols.txt

@@ -8947,14 +8947,14 @@ fn_801CFF50 = .text:0x801CFF50; // type:function size:0x1D8
 PreRender__10CFishCloudFR13CStateManagerRC14CFrustumPlanes = .text:0x801D0128; // type:function size:0x80 scope:global
 Think__10CFishCloudFfR13CStateManager = .text:0x801D01A8; // type:function size:0x784 scope:global
 GetTouchBounds__10CFishCloudCFv = .text:0x801D092C; // type:function size:0x70 scope:global
-fn_801D099C = .text:0x801D099C; // type:function size:0xF4
+RemoveRepulsor__10CFishCloudF9TUniqueId = .text:0x801D099C; // type:function size:0xF4
 fn_801D0A90 = .text:0x801D0A90; // type:function size:0x4C
 fn_801D0ADC = .text:0x801D0ADC; // type:function size:0xB4
-fn_801D0B90 = .text:0x801D0B90; // type:function size:0xF4
-fn_801D0C84 = .text:0x801D0C84; // type:function size:0x15C
+RemoveAttractor__10CFishCloudF9TUniqueId = .text:0x801D0B90; // type:function size:0xF4
+AddRepulsor__10CFishCloudF9TUniqueIdbff = .text:0x801D0C84; // type:function size:0x15C
 fn_801D0DE0 = .text:0x801D0DE0; // type:function size:0x8C
 fn_801D0E6C = .text:0x801D0E6C; // type:function size:0x2D8
-fn_801D1144 = .text:0x801D1144; // type:function size:0x15C
+AddAttractor__10CFishCloudF9TUniqueIdbff = .text:0x801D1144; // type:function size:0x15C
 AcceptScriptMsg__10CFishCloudF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x801D12A0; // type:function size:0x320 scope:global
 PlaceBoid__10CFishCloudFR13CStateManagerRQ210CFishCloud5CBoidRC6CAABox = .text:0x801D15C0; // type:function size:0x294 scope:global
 FindClosestPlane__10CFishCloudCFRC6CAABoxRC9CVector3f = .text:0x801D1854; // type:function size:0x46C scope:global
@@ -9089,19 +9089,19 @@ Flinch__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D7EC0; // type:funct
 Attack__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D7F60; // type:function size:0x1AC scope:global
 GetDamageVulnerability__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CDamageInfo = .text:0x801D810C; // type:function size:0x48 scope:global
 GetCollisionResponseType__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CWeaponModei = .text:0x801D8154; // type:function size:0x3C scope:global
-sub801d8190__9CJellyZapFv = .text:0x801D8190; // type:function size:0x18 scope:global
+HitShell__9CJellyZapCFRC9CVector3f = .text:0x801D8190; // type:function size:0x18 scope:global
 Suck__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D81A8; // type:function size:0x318 scope:global
 Active__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D84C0; // type:function size:0x16C scope:global
 InActive__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D862C; // type:function size:0x70 scope:global
 ShouldAttack__9CJellyZapFR13CStateManagerf = .text:0x801D869C; // type:function size:0x18 scope:global
 ShouldSpecialAttack__9CJellyZapFR13CStateManagerf = .text:0x801D86B4; // type:function size:0x20 scope:global
 InAttackPosition__9CJellyZapFR13CStateManagerf = .text:0x801D86D4; // type:function size:0x88 scope:global
 InDetectionRange__9CJellyZapFR13CStateManagerf = .text:0x801D875C; // type:function size:0x38 scope:global
-DoUserAnimEvent__9CJellyZapFR13CStateManagerRC13CInt32POINode14EUserEventType = .text:0x801D8794; // type:function size:0x120 scope:global
+DoUserAnimEvent__9CJellyZapFR13CStateManagerRC13CInt32POINode14EUserEventTypef = .text:0x801D8794; // type:function size:0x120 scope:global
 AcceptScriptMsg__9CJellyZapF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x801D88B4; // type:function size:0xAC scope:global
 Think__9CJellyZapFfR13CStateManager = .text:0x801D8960; // type:function size:0x120 scope:global
 Accept__9CJellyZapFR8IVisitor = .text:0x801D8A80; // type:function size:0x38 scope:global
-__ct__9CJellyZapF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC11CDamageInfofffffffffffRC14CPatternedInfoRC16CActorParameters = .text:0x801D8AB8; // type:function size:0x23C scope:global
+__ct__9CJellyZapF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC11CDamageInfobffffffffffffRC14CPatternedInfoRC16CActorParameters = .text:0x801D8AB8; // type:function size:0x23C scope:global
 __dt__23CScriptControllerActionFv = .text:0x801D8CF4; // type:function size:0x60 scope:weak
 GetCommand__23CScriptControllerActionFQ223CScriptControllerAction9ECommands = .text:0x801D8D54; // type:function size:0x4 scope:global
 Think__23CScriptControllerActionFfR13CStateManager = .text:0x801D8D58; // type:function size:0x14C scope:global
@@ -18552,7 +18552,7 @@ __vt__15CScriptVisorGoo = .data:0x803E58C0; // type:object size:0x6C scope:globa
 lbl_803E5930 = .data:0x803E5930; // type:object size:0xC data:4byte
 lbl_803E593C = .data:0x803E593C; // type:object size:0xC data:4byte
 lbl_803E5948 = .data:0x803E5948; // type:object size:0xC data:4byte
-lbl_803E5954 = .data:0x803E5954; // type:object size:0x2CC
+__vt__9CJellyZap = .data:0x803E5954; // type:object size:0x2CC
 __vt__23CScriptControllerAction = .data:0x803E5C20; // type:object size:0x20 scope:global
 __vt__13CScriptSwitch = .data:0x803E5C40; // type:object size:0x20 scope:global
 __vt__8CABSIdle = .data:0x803E5C60; // type:object size:0x20 scope:global
@@ -18562,7 +18562,7 @@ __vt__24CScriptPlayerStateChange = .data:0x803E5CC0; // type:object size:0x20 sc
 lbl_803E5CE0 = .data:0x803E5CE0; // type:object size:0x2CC
 jumptable_803E5FAC = .data:0x803E5FAC; // type:object size:0x48 scope:local
 jumptable_803E5FF4 = .data:0x803E5FF4; // type:object size:0x80 scope:local
-lbl_803E6074 = .data:0x803E6074; // type:object size:0x294
+__vt__16CDestroyableRock = .data:0x803E6074; // type:object size:0x294
 lbl_803E6308 = .data:0x803E6308; // type:object size:0x6C
 jumptable_803E6374 = .data:0x803E6374; // type:object size:0x20 scope:local
 __vt__18CScriptAiJumpPoint = .data:0x803E6398; // type:object size:0x6C scope:global
@@ -25022,9 +25022,9 @@ lbl_805AC87C = .sdata2:0x805AC87C; // type:object size:0x4 align:4 data:float
 lbl_805AC880 = .sdata2:0x805AC880; // type:object size:0x4 align:4 data:float
 lbl_805AC884 = .sdata2:0x805AC884; // type:object size:0x4 align:4 data:float
 lbl_805AC888 = .sdata2:0x805AC888; // type:object size:0x8 align:4 data:float
-lbl_805AC890 = .sdata2:0x805AC890; // type:object size:0x4 align:4 data:float
-lbl_805AC894 = .sdata2:0x805AC894; // type:object size:0x4 align:4 data:float
-lbl_805AC898 = .sdata2:0x805AC898; // type:object size:0x8 align:4 data:float
+@520 = .sdata2:0x805AC890; // type:object size:0x4 align:4 data:float
+@653 = .sdata2:0x805AC894; // type:object size:0x4 align:4 data:float
+@654 = .sdata2:0x805AC898; // type:object size:0x4 align:4 data:float
 lbl_805AC8A0 = .sdata2:0x805AC8A0; // type:object size:0x4 align:4 data:float
 lbl_805AC8A4 = .sdata2:0x805AC8A4; // type:object size:0x4 align:4 data:float
 lbl_805AC8A8 = .sdata2:0x805AC8A8; // type:object size:0x8 align:4 data:float

config/GM8E01_01/symbols.txt

@@ -8947,14 +8947,14 @@ fn_801CFF50 = .text:0x801CFFCC; // type:function size:0x1D8 scope:global
 PreRender__10CFishCloudFR13CStateManagerRC14CFrustumPlanes = .text:0x801D01A4; // type:function size:0x80 scope:global
 Think__10CFishCloudFfR13CStateManager = .text:0x801D0224; // type:function size:0x784 scope:global
 GetTouchBounds__10CFishCloudCFv = .text:0x801D09A8; // type:function size:0x70 scope:global
-fn_801D099C = .text:0x801D0A18; // type:function size:0xF4 scope:global
+RemoveRepulsor__10CFishCloudF9TUniqueId = .text:0x801D0A18; // type:function size:0xF4 scope:global
 fn_801D0A90 = .text:0x801D0B0C; // type:function size:0x4C scope:global
 fn_801D0ADC = .text:0x801D0B58; // type:function size:0xB4 scope:global
-fn_801D0B90 = .text:0x801D0C0C; // type:function size:0xF4 scope:global
-fn_801D0C84 = .text:0x801D0D00; // type:function size:0x15C scope:global
+RemoveAttractor__10CFishCloudF9TUniqueId = .text:0x801D0C0C; // type:function size:0xF4 scope:global
+AddRepulsor__10CFishCloudF9TUniqueIdbff = .text:0x801D0D00; // type:function size:0x15C scope:global
 fn_801D0DE0 = .text:0x801D0E5C; // type:function size:0x8C scope:global
 fn_801D0E6C = .text:0x801D0EE8; // type:function size:0x2D8 scope:global
-fn_801D1144 = .text:0x801D11C0; // type:function size:0x15C scope:global
+AddAttractor__10CFishCloudF9TUniqueIdbff = .text:0x801D11C0; // type:function size:0x15C scope:global
 AcceptScriptMsg__10CFishCloudF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x801D131C; // type:function size:0x320 scope:global
 PlaceBoid__10CFishCloudFR13CStateManagerRQ210CFishCloud5CBoidRC6CAABox = .text:0x801D163C; // type:function size:0x294 scope:global
 FindClosestPlane__10CFishCloudCFRC6CAABoxRC9CVector3f = .text:0x801D18D0; // type:function size:0x46C scope:global
@@ -9089,19 +9089,19 @@ Flinch__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D7F3C; // type:funct
 Attack__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D7FDC; // type:function size:0x1AC scope:global
 GetDamageVulnerability__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CDamageInfo = .text:0x801D8188; // type:function size:0x48 scope:global
 GetCollisionResponseType__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CWeaponModei = .text:0x801D81D0; // type:function size:0x3C scope:global
-sub801d8190__9CJellyZapFv = .text:0x801D820C; // type:function size:0x18 scope:global
+HitShell__9CJellyZapCFRC9CVector3f = .text:0x801D820C; // type:function size:0x18 scope:global
 Suck__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D8224; // type:function size:0x318 scope:global
 Active__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D853C; // type:function size:0x16C scope:global
 InActive__9CJellyZapFR13CStateManager9EStateMsgf = .text:0x801D86A8; // type:function size:0x70 scope:global
 ShouldAttack__9CJellyZapFR13CStateManagerf = .text:0x801D8718; // type:function size:0x18 scope:global
 ShouldSpecialAttack__9CJellyZapFR13CStateManagerf = .text:0x801D8730; // type:function size:0x20 scope:global
 InAttackPosition__9CJellyZapFR13CStateManagerf = .text:0x801D8750; // type:function size:0x88 scope:global
 InDetectionRange__9CJellyZapFR13CStateManagerf = .text:0x801D87D8; // type:function size:0x38 scope:global
-DoUserAnimEvent__9CJellyZapFR13CStateManagerRC13CInt32POINode14EUserEventType = .text:0x801D8810; // type:function size:0x120 scope:global
+DoUserAnimEvent__9CJellyZapFR13CStateManagerRC13CInt32POINode14EUserEventTypef = .text:0x801D8810; // type:function size:0x120 scope:global
 AcceptScriptMsg__9CJellyZapF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x801D8930; // type:function size:0xAC scope:global
 Think__9CJellyZapFfR13CStateManager = .text:0x801D89DC; // type:function size:0x120 scope:global
 Accept__9CJellyZapFR8IVisitor = .text:0x801D8AFC; // type:function size:0x38 scope:global
-__ct__9CJellyZapF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC11CDamageInfofffffffffffRC14CPatternedInfoRC16CActorParameters = .text:0x801D8B34; // type:function size:0x23C scope:global
+__ct__9CJellyZapF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC11CDamageInfobffffffffffffRC14CPatternedInfoRC16CActorParameters = .text:0x801D8B34; // type:function size:0x23C scope:global
 __dt__23CScriptControllerActionFv = .text:0x801D8D70; // type:function size:0x60 scope:weak
 GetCommand__23CScriptControllerActionFQ223CScriptControllerAction9ECommands = .text:0x801D8DD0; // type:function size:0x4 scope:global
 Think__23CScriptControllerActionFfR13CStateManager = .text:0x801D8DD4; // type:function size:0x14C scope:global

configure.py

@@ -948,7 +948,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "MetroidPrime/PathFinding/CPathFindRegion.cpp"),
             Object(NonMatching, "MetroidPrime/PathFinding/CPathFindArea.cpp"),
             Object(
-                NonMatching, "MetroidPrime/Weapons/GunController/CGunController.cpp"
+                MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/Weapons/GunController/CGunController.cpp"
             ),
             Object(NonMatching, "MetroidPrime/Weapons/GunController/CGSFreeLook.cpp"),
             Object(

include/MetroidPrime/CActor.hpp

@@ -157,6 +157,8 @@ class CActor : public CEntity {
 
   TUniqueId InFluidId() const { return xc4_fluidId; }
 
+  void SetDamageMag(const float d) { xd0_damageMag = d; }
+
   bool GetTransformDirty() const { return xe4_27_notInSortedLists; }
   bool GetTransformDirtySpare() const { return xe4_28_transformDirty; }
   bool GetPreRenderHasMoved() const { return xe4_29_actorLightsDirty; }
@@ -182,6 +184,7 @@ class CActor : public CEntity {
   void SetMuted(bool b);
   void SetThermalFlags(EThermalFlags flags) { xe6_27_thermalVisorFlags = flags; }
   void SetRenderParticleDatabaseInside(bool b) { xe6_29_renderParticleDBInside = b; }
+  void SetDoTargetDistanceTest(const bool b) { xe7_30_doTargetDistanceTest = b; }
   void SetTargetable(bool b) { xe7_31_targetable = b; }
 
   void RemoveMaterial(EMaterialTypes, EMaterialTypes, EMaterialTypes, EMaterialTypes,

include/MetroidPrime/CAnimData.hpp

@@ -52,8 +52,8 @@ class CAnimData {
 
   void SetIsAnimating(bool v) { x220_24_animating = v; }
   void SetParticleEffectState(const rstl::string& name, const bool active, CStateManager& mgr) {
-     x120_particleDB.SetParticleEffectState(name, active, mgr);
-   }
+    x120_particleDB.SetParticleEffectState(name, active, mgr);
+  }
 
   int GetCharacterIndex() const { return x204_charIdx; }
   float GetAverageVelocity(int idx) const;
@@ -94,7 +94,7 @@ class CAnimData {
   // AdvanceIgnoreParticles__9CAnimDataFfR9CRandom16b
   // Advance__9CAnimDataFfRC9CVector3fR13CStateManagerb
   // DoAdvance__9CAnimDataFfRbR9CRandom16b
-  void SetAnimation(const CAnimPlaybackParms& parms, bool noTrans);
+  void SetAnimation(const CAnimPlaybackParms& parms, const bool noTrans);
   void GetAnimationPrimitives(const CAnimPlaybackParms& parms,
                               rstl::set< CPrimitive >& primsOut) const;
   // PrimitiveSetToTokenVector__9CAnimDataFRCQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b

include/MetroidPrime/CAnimPlaybackParms.hpp

@@ -21,7 +21,8 @@ class CAnimPlaybackParms {
   const CVector3f* x24_objectScale;
 
 public:
-  CAnimPlaybackParms(int animA, int animB, float blendWeight, bool animating)
+  CAnimPlaybackParms(const int animA, const int animB, const float blendWeight,
+                     const bool animating)
   : x0_animA(animA)
   , x4_animB(animB)
   , x8_blendWeight(blendWeight)

include/MetroidPrime/CModelData.hpp

@@ -70,6 +70,7 @@ class CModelData {
   CModelData();
   CModelData(const CAnimRes&);
   CModelData(const CStaticRes&);
+  //CModelData(const CModelData&);
   ~CModelData();
 
   CAdvancementDeltas AdvanceAnimation(float dt, CStateManager& mgr, TAreaId aid, bool advTree);

include/MetroidPrime/Enemies/CJellyZap.hpp

@@ -4,7 +4,60 @@
 #include "MetroidPrime/Enemies/CPatterned.hpp"
 
 class CJellyZap : public CPatterned {
+public:
+  CJellyZap(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
+            const CTransform4f& xf, const CModelData& mData, const CDamageInfo& attackDamage,
+            bool b1, float attackRadius, float f2, float f3, float f4, float attackDelay, float f6,
+            float f7, float f8, float priority, float repulseRadius, float attractRadius, float f12,
+            const CPatternedInfo& pInfo, const CActorParameters& actParms);
 
+  void Accept(IVisitor& visitor) override;
+  void Think(float dt, CStateManager& mgr) override;
+  void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
+  void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type,
+                       float dt) override;
+
+  bool InDetectionRange(CStateManager& mgr, float arg) override;
+  bool InAttackPosition(CStateManager& mgr, float arg) override;
+  bool ShouldSpecialAttack(CStateManager& mgr, float arg) override;
+  bool ShouldAttack(CStateManager& mgr, float arg) override;
+  void InActive(CStateManager& mgr, EStateMsg msg, float arg) override;
+  void Active(CStateManager& mgr, EStateMsg msg, float arg) override;
+  void Suck(CStateManager& mgr, EStateMsg msg, float arg) override;
+  EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
+                                                         const CWeaponMode&, int) const override;
+  const CDamageVulnerability* GetDamageVulnerability(const CVector3f& pos, const CVector3f& dir,
+                                                     const CDamageInfo& info) const override;
+  void Attack(CStateManager& mgr, EStateMsg msg, float arg) override;
+  void Flinch(CStateManager& mgr, EStateMsg msg, float arg) override;
+  void KnockBack(const CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type,
+                 bool inDeferred, float magnitude) override;
+
+private:
+  void AddAttractor(CStateManager& mgr);
+  void RemoveAllAttractors(CStateManager& mgr);
+  void AddRepulsor(CStateManager& mgr);
+  void AddSelfToFishCloud(CStateManager& mgr, float radius, float priority, bool repulsor);
+  void RemoveSelfFromFishCloud(CStateManager& mgr);
+  bool ClosestToPlayer(CStateManager& mgr) const;
+  bool HitShell(const CVector3f&) const;
+  uint x568_;
+  CDamageInfo x56c_attackDamage;
+  float x588_attackRadius;
+  float x58c_;
+  float x590_;
+  float x594_;
+  float x598_;
+  float x59c_priority;
+  float x5a0_repulseRadius;
+  float x5a4_attractRadius;
+  float x5a8_attackDelay;
+  float x5ac_;
+  float x5b0_;
+  float x5b4_;
+  bool x5b8_24_ : 1;
+  bool x5b8_25_ : 1;
+  bool x5b8_26_ : 1;
 };
 
 #endif // _CJELLYZAP

include/MetroidPrime/Enemies/CPatterned.hpp

@@ -274,11 +274,16 @@ class CPatterned : public CAi {
   const CVector3f& GetMoveVector() const { return x310_moveVec; }
   void SetMoveVector(const CVector3f& vec) { x310_moveVec = vec; }
 
+  float GetFreezeDuration() const { return x4fc_freezeDur; }
+
+  void SetBaseDamageMag(const float mag) { x50c_baseDamageMag = mag; }
+
   bool ApplyBoneTracking() const;
 
   template < class T >
   static T* CastTo(const TPatternedCast< T >& ent);
 
+  void TryKnockBack(CStateManager& mgr, int arg);
   void TryLoopReaction(CStateManager& mgr, int arg);
   void TryCommand(CStateManager& mgr, int state, FTryCommandCallback cb, int arg);
 
@@ -289,6 +294,8 @@ class CPatterned : public CAi {
 
   float GetAnimationDistance(const CPASAnimParmData& data) const;
 
+  void UpdateThermalFrozenState(const bool thawed);
+
 protected:
   EPatrolState x2d8_patrolState;
   TUniqueId x2dc_destObj;

include/MetroidPrime/Enemies/CThardus.hpp

@@ -1,8 +1,34 @@
 #ifndef _CTHARDUS
 #define _CTHARDUS
+#include "MetroidPrime/Enemies/CPatterned.hpp"
+
+class CDestroyableRock : public CAi {
+public:
+  CDestroyableRock(TUniqueId id, bool active, const rstl::string& name, const CEntityInfo& info,
+                   const CTransform4f& xf, const CModelData& modelData, float mass,
+                   const CHealthInfo& health, const CDamageVulnerability& vulnerability,
+                   const CMaterialList& matList, CAssetId fsm, const CActorParameters& actParams,
+                   const CModelData& phazonModel, int w1);
+
+  void PreThink(float dt, CStateManager& mgr) override;
+  void Think(float dt, CStateManager& mgr) override;
+
+private:
+  CModelData x2d8_phazonModel;
+  float x324_;
+  float x328_;
+  float x32c_thermalMag;
+  CColor x330_;
+  bool x334_isCold;
+  bool x335_usePhazonModel;
+  CHealthInfo x338_healthInfo;
+  bool x340_;
+  bool x341_;
+};
 
 class CThardus : public CPatterned {
 public:
+  void RenderThermalSpot(float dt) const;
   void ShakeScreen(CStateManager& mgr, const CVector3f& position, const float, const float,
                    const float);
   void StartTimedThermalFlash(CStateManager& mgr, float, CActor& actor);