Skip to content

Commit e8c4a5b

Browse files
author
ReimousTH
committed
force
1 parent 6e831de commit e8c4a5b

2 files changed

Lines changed: 36 additions & 15 deletions

File tree

MarathonRecomp/api/Marathon.h

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,27 @@
4040
#include "Sonicteam/Player/GroundRayListener.h"
4141
#include "Sonicteam/Player/ICollisionListener.h"
4242
#include "Sonicteam/Player/ICollisionListenerTemplate.h"
43+
#include "Sonicteam/Player/IDynamicLink.h"
44+
#include "Sonicteam/Player/IExportExternalFlag.h"
45+
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
46+
#include "Sonicteam/Player/IExportWeaponRequestFlag.h"
47+
#include "Sonicteam/Player/IFlagCommunicator.h"
48+
#include "Sonicteam/Player/IGauge.h"
4349
#include "Sonicteam/Player/INotification.h"
50+
#include "Sonicteam/Player/IPlugIn.h"
4451
#include "Sonicteam/Player/IPostureControl.h"
4552
#include "Sonicteam/Player/IPosturePlugIn.h"
4653
#include "Sonicteam/Player/IPostureSupportEdge.h"
4754
#include "Sonicteam/Player/IPostureSupportInput.h"
4855
#include "Sonicteam/Player/IPostureSupportOttoto.h"
4956
#include "Sonicteam/Player/IPostureSupportRayTemplate.h"
5057
#include "Sonicteam/Player/IPostureSupportSphere.h"
51-
#include "Sonicteam/Player/PostureControl.h"
52-
#include "Sonicteam/Player/Unit/ITestCase.h"
53-
#include "Sonicteam/Player/Weapon/SonicWeapons.h"
54-
#include "Sonicteam/Player/IDynamicLink.h"
55-
#include "Sonicteam/Player/IExportExternalFlag.h"
56-
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
57-
#include "Sonicteam/Player/IExportWeaponRequestFlag.h"
58-
#include "Sonicteam/Player/IFlagCommunicator.h"
59-
#include "Sonicteam/Player/IGauge.h"
60-
#include "Sonicteam/Player/IPlugIn.h"
6158
#include "Sonicteam/Player/IScore.h"
6259
#include "Sonicteam/Player/IStepable.h"
6360
#include "Sonicteam/Player/IVariable.h"
6461
#include "Sonicteam/Player/IZock.h"
6562
#include "Sonicteam/Player/Object.h"
63+
#include "Sonicteam/Player/PostureControl.h"
6664
#include "Sonicteam/Player/RootFrame.h"
6765
#include "Sonicteam/Player/Score.h"
6866
#include "Sonicteam/Player/SonicGauge.h"
@@ -80,6 +78,8 @@
8078
#include "Sonicteam/Player/State/SonicObject.h"
8179
#include "Sonicteam/Player/State/TailsContext.h"
8280
#include "Sonicteam/Player/State/TailsFlight.h"
81+
#include "Sonicteam/Player/Unit/ITestCase.h"
82+
#include "Sonicteam/Player/Weapon/SonicWeapons.h"
8383
#include "Sonicteam/Player/Zock.h"
8484
#include "Sonicteam/SaveDataTask.h"
8585
#include "Sonicteam/SaveDataTaskXENON.h"
@@ -98,23 +98,24 @@
9898
#include "Sonicteam/SoX/Graphics/Xenon/TextureXenon.h"
9999
#include "Sonicteam/SoX/IResource.h"
100100
#include "Sonicteam/SoX/Input/Manager.h"
101+
#include "Sonicteam/SoX/LinkNode.h"
101102
#include "Sonicteam/SoX/Math/Matrix.h"
102103
#include "Sonicteam/SoX/Math/Quaternion.h"
103104
#include "Sonicteam/SoX/Math/Vector.h"
104105
#include "Sonicteam/SoX/MessageReceiver.h"
105106
#include "Sonicteam/SoX/Object.h"
106-
#include "Sonicteam/SoX/LinkNode.h"
107-
#include "Sonicteam/SoX/Physics/IntersectEvent.h"
108-
#include "Sonicteam/SoX/Physics/IntersectListener.h"
109-
#include "Sonicteam/SoX/Physics/ShapeCastEvent.h"
110-
#include "Sonicteam/SoX/Physics/ShapeCastListener.h"
107+
#include "Sonicteam/SoX/Physics/Entity.h"
111108
#include "Sonicteam/SoX/Physics/Havok/EntityHavok.h"
112109
#include "Sonicteam/SoX/Physics/Havok/EntityHavokImp.h"
113110
#include "Sonicteam/SoX/Physics/Havok/PhantomHavok.h"
114111
#include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
112+
#include "Sonicteam/SoX/Physics/IntersectEvent.h"
113+
#include "Sonicteam/SoX/Physics/IntersectListener.h"
115114
#include "Sonicteam/SoX/Physics/Phantom.h"
116115
#include "Sonicteam/SoX/Physics/PhantomListener.h"
117116
#include "Sonicteam/SoX/Physics/Shape.h"
117+
#include "Sonicteam/SoX/Physics/ShapeCastEvent.h"
118+
#include "Sonicteam/SoX/Physics/ShapeCastListener.h"
118119
#include "Sonicteam/SoX/Physics/World.h"
119120
#include "Sonicteam/SoX/RefCountObject.h"
120121
#include "Sonicteam/SoX/RefSharedPointer.h"

MarathonRecompLib/config/Marathon.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,3 +439,23 @@ name = "ObjEspSwing_DecayRateFix"
439439
address = 0x8232A4D0
440440
registers = ["f0", "f13", "f28"]
441441
jump_address = 0x8232A4D4
442+
443+
[[midasm_hook]]
444+
name = "SonicGaugeRestorationGaugeFlagFix"
445+
address = 0x822196EC
446+
registers = ["r3","r31"]
447+
448+
[[midasm_hook]]
449+
name = "SonicGaugeRestorationGaugeGemSpriteResetFix"
450+
address = 0x82185768
451+
registers = ["r30"]
452+
453+
[[midasm_hook]]
454+
name = "SonicGaugeRestorationGaugeGemSpriteResetFix"
455+
address = 0x821855A4
456+
registers = ["r29"]
457+
458+
[[midasm_hook]]
459+
name = "SonicGaugeRestorationGaugeGemSpriteResetFix"
460+
address = 0x82177DFC
461+
registers = ["r31"]

0 commit comments

Comments
 (0)