Style

Author: ReimousTH

MarathonRecomp/api/Sonicteam/DocMarathonImp.h

@@ -6,7 +6,6 @@
 #include <boost/smart_ptr/shared_ptr.h>
 #include <api/stdx/vector.h>
 
-
 namespace Sonicteam
 {
     class DocMarathonImp : public SoX::Engine::Doc

MarathonRecomp/api/Sonicteam/GameImp.h

@@ -37,7 +37,7 @@ namespace Sonicteam
         template <typename T>
         inline T* GetPhysicsWorld();
 
-        uint32_t PlayerActorIDToIndex(uint32_t ActorID)
+        int32_t PlayerActorIDToIndex(int32_t ActorID)
         {
             for (int i = 0; i < 4; i++)
             {

MarathonRecomp/api/Sonicteam/Player/Object.h

@@ -11,9 +11,9 @@ namespace Sonicteam::Player
         MARATHON_INSERT_PADDING(0x40);
         be<uint32_t> m_PlayerIndex;
         MARATHON_INSERT_PADDING(0x2C);
-        uint8_t isPlayer;
-        uint8_t isPosture;
-        uint8_t isAI;
+        bool m_IsPlayer;
+        bool m_IsPosture;
+        bool m_IsAmigo; //AI::Amigo
         MARATHON_INSERT_PADDING(0x19);
         boost::shared_ptr<State::Machine2> m_spStateMachine;
         MARATHON_INSERT_PADDING(0x10);

MarathonRecomp/api/Sonicteam/SoX/Input/Manager.h

@@ -5,31 +5,48 @@
 namespace Sonicteam::SoX::Input
 {
     static const uint32_t XENON_GAMEPAD_BACK = 2048;
-    struct MGamepad
+
+    enum KeyState
+    {
+        KeyState_DpadUp = 0x40,
+        KeyState_DpadDown = 0x80,
+        KeyState_DpadLeft = 0x100,
+        KeyState_DpadRight = 0x200,
+        KeyState_Start = 0x400,
+        KeyState_Select = 0x800,
+        KeyState_LeftStick = 0x10000,
+        KeyState_RightStick = 0x20000,
+        KeyState_LeftBumper = 0x1000,
+        KeyState_RightBumper = 0x2000,
+        KeyState_A = 0x1,
+        KeyState_B = 0x2,
+        KeyState_X = 0x8,
+        KeyState_Y = 0x10,
+    };
+
+    struct PadState
     {
-        be<uint32_t> wLastButtons;
-        be<uint32_t> wCLastButtons; // ~wLastButtons
+        be<uint32_t> LastButtons;
+        be<uint32_t> InvertedLastButtons; // ~wLastButtons
         MARATHON_INSERT_PADDING(8);
 
-        //Left Stick
-        be<float> fX1;
-        be<float> fY1;
-        be<short> sThumbLX;
-        be<short> sThumbLY;
+        be<float> LeftStickHorizontal;
+        be<float> LeftStickVertical;
+        be<short> LeftStickHorizontalS16;
+        be<short> LeftStickVerticalS16;
 
-        //Right Stick
-        be<float> fX2;
-        be<float> fY2;
-        be<short> sThumbRX;
-        be<short> sThumbRY;
+        be<float> RightStickHorizontal;
+        be<float> RightStickVertical;
+        be<short> RightStickHorizontalS16;
+        be<short> RightStickVerticalS16;
     };
 
     class Manager
     {
     public:
         be<uint32_t> m_ControllerID;
         MARATHON_INSERT_PADDING(0xC);
-        MGamepad m_Gamepad;
+        PadState m_PadState;
         MARATHON_INSERT_PADDING(0x28);
     };
 }

MarathonRecomp/api/stdx/string.h

@@ -3,7 +3,6 @@
 #include <kernel/heap.h>
 #include <kernel/function.h>
 
-
 namespace stdx
 {
     class string
@@ -68,7 +67,6 @@ namespace stdx
             _bx._buffer[0] = '\0';
         }
 
-
         void cleanup()
         {
             if (!is_short()) {

MarathonRecomp/api/stdx/vector.h

@@ -17,9 +17,11 @@ namespace stdx
         {
             return *(Type*)((uint64_t)_MyFirst.get() + (index * sizeof(Type)));
         }
+
         size_t size()
         {
             return (_MyLast.ptr.get() - _MyFirst.ptr.get()) / sizeof(Type);
         }
     };
-}
+}
+

MarathonRecomp/patches/player_patches.cpp

@@ -100,7 +100,6 @@ bool MidairSnowboardControl3()
     return Config::MidairControlForSnowboards;
 }
 
-
 //Add Missing SetupModuleDebug to table
 void DebugPlayerSwitch_0(PPCRegister& r_sstring, PPCRegister& r_index)
 {

MarathonRecompLib/config/Marathon.toml

@@ -200,8 +200,6 @@ name = "FurtherObjectShadows"
 address = 0x8260D7E0
 registers = ["r26"]
 
-
-
 [[midasm_hook]]
 name = "DebugPlayerSwitch_0"
 address = 0x82195AD0