Patch

Author: ReimousTH

MarathonRecomp/api/Sonicteam/Player/Object.h

@@ -8,9 +8,25 @@
 #include <Sonicteam/SoX/RefCountObject.h>
 #include <Sonicteam/SoX/RefSharedPointer.h>
 #include <Sonicteam/Player/RootFrame.h>
+#include <Sonicteam/SoX/Math/Vector.h>
 
 namespace Sonicteam::Player
 {
+    template <const uint32_t ID>
+    struct ObjectMessage_Base:Sonicteam::SoX::Message
+    {
+        be<uint32_t> m_ID = ID;
+        static uint32_t GetID()
+        {
+            return ID;
+        }
+    };
+
+    struct ObjectMessage_SuckPlayerToPoint:ObjectMessage_Base<0x11034A>
+    {
+        Sonicteam::SoX::Math::Vector m_Point;
+    };
+
     class Object : public Actor
     {
     public:

MarathonRecomp/api/Sonicteam/SoX/MessageReceiver.h

@@ -2,13 +2,17 @@
 
 namespace Sonicteam::SoX
 {
-    struct Message;
+    struct Message
+    {
+
+    };
 
     class MessageReceiver
     {
     public:
         struct Vftable
         {
+            be<uint32_t> Destroy;
             be<uint32_t> OnMessageRecieved;
         };
 

MarathonRecomp/patches/fps_patches.cpp

@@ -86,3 +86,27 @@ void ObjEspSwing_DecayRateFix(PPCRegister& f0, PPCRegister& f13, PPCRegister& de
 {
     f0.f64 = float(f13.f64 * pow(pow(f0.f64, 60.0), deltaTime.f64));
 }
+
+struct ObjectMessage_SuckPlayerToPointEX :public Sonicteam::Player::ObjectMessage_SuckPlayerToPoint
+{
+public:
+    be<float> m_delta;
+};
+
+void ObjectInputWarp_MessageToPlayerExtraDelta(PPCRegister& Phantom, PPCRegister& Message, PPCRegister& delta)
+{
+    auto pPhantom = (Sonicteam::SoX::Physics::Phantom*)(g_memory.Translate(Phantom.u32));
+    auto pMessage = (Sonicteam::Player::ObjectMessage_SuckPlayerToPoint*)(g_memory.Translate(Message.u32));
+    auto pNewMessage = (ObjectMessage_SuckPlayerToPointEX*)g_userHeap.Alloc(sizeof(ObjectMessage_SuckPlayerToPointEX));
+    pNewMessage->m_ID = pMessage->m_ID;
+    pNewMessage->m_Point = pMessage->m_Point;
+    pNewMessage->m_delta = delta.f64;
+    pPhantom->OnMessageRecieved(pNewMessage); 
+    g_userHeap.Free(pNewMessage);
+}
+
+void ObjectPlayer_Message0x1104AExtraDelta(PPCRegister& delta, PPCRegister& Message)
+{
+    auto pMessage = (ObjectMessage_SuckPlayerToPointEX*)(g_memory.Translate(Message.u32));
+    delta.f64 = pMessage->m_delta;
+}

MarathonRecompLib/config/Marathon.toml

@@ -439,3 +439,15 @@ name = "ObjEspSwing_DecayRateFix"
 address = 0x8232A4D0
 registers = ["f0", "f13", "f28"]
 jump_address = 0x8232A4D4
+
+[[midasm_hook]]
+name = "ObjectInputWarp_MessageToPlayerExtraDelta"
+address = 0x82389E48
+registers = ["r3","r4","f25"]
+jump_address = 0x82389E4C
+
+[[midasm_hook]]
+name = "ObjectPlayer_Message0x1104AExtraDelta"
+address = 0x8219B65C
+registers = ["f31","r28"]
+after_instruction = true