Skip to content

Commit 0bc310f

Browse files
authored
Clean-up (#164)
1 parent c0dd704 commit 0bc310f

4 files changed

Lines changed: 22 additions & 36 deletions

File tree

MarathonRecomp/api/Marathon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
#include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
139139
#include "Sonicteam/StdImageFilters/SingleTechniqueFilter.h"
140140
#include "Sonicteam/System/CreateStatic.h"
141-
#include "Sonicteam/System/Diagnostics/Perfomance.h"
141+
#include "Sonicteam/System/Diagnostics/Performance.h"
142142
#include "Sonicteam/System/Singleton.h"
143143
#include "Sonicteam/TextBook.h"
144144
#include "Sonicteam/TextBookMgr.h"

MarathonRecomp/api/Sonicteam/System/Diagnostics/Perfomance.h renamed to MarathonRecomp/api/Sonicteam/System/Diagnostics/Performance.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#pragma once
22

3+
#include <Marathon.inl>
34
#include <Sonicteam/System/Singleton.h>
45
#include <Sonicteam/System/CreateStatic.h>
56

67
namespace Sonicteam::System::Diagnostics
78
{
8-
class Perfomance : public Singleton<Perfomance, 0x82D3B210, CreateStatic<Perfomance, 0x82581C88>>
9+
class Performance : public Singleton<Performance, 0x82D3B210, CreateStatic<Performance, 0x82581C88>>
910
{
1011
public:
1112
be<uint64_t> m_LastFrequency;

MarathonRecomp/patches/fps_patches.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -149,24 +149,9 @@ void PlayerObject_ProcessMsgSuckPlayer_FixDeltaTime(PPCRegister& message, PPCReg
149149
deltaTime.f64 = pMessage->DeltaTime;
150150
}
151151

152-
void ParticleHFR_82670658(PPCRegister& f1,PPCRegister& stack)
152+
void Spanverse_GE1PE_DeltaTimeFix(PPCRegister& deltaTime)
153153
{
154-
f1.f64 = App::s_deltaTime;
155-
}
156-
157-
void ParticleHFR_8266A418_1(PPCRegister& f31,PPCRegister& stack)
158-
{
159-
f31.f64 = App::s_deltaTime;
160-
}
161-
162-
void ParticleHFR_82673F88(PPCRegister& f13,PPCRegister& stack)
163-
{
164-
f13.f64 = App::s_deltaTime;
165-
}
166-
167-
void ParticleHFR_82674550(PPCRegister& f13,PPCRegister& stack)
168-
{
169-
f13.f64 = App::s_deltaTime;
154+
deltaTime.f64 = App::s_deltaTime;
170155
}
171156

172157
// Allocate more space to store the previous loading

MarathonRecompLib/config/Marathon.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -509,35 +509,35 @@ name = "PlayerObject_ProcessMsgSuckPlayer_FixDeltaTime"
509509
address = 0x8219B660
510510
registers = ["r28", "f31"]
511511

512-
# ParticleHFR_826454C8
512+
# Sonicteam::MyPE::CManageParticle::ManageParticleTask
513513
[[midasm_hook]]
514514
name = "NOP"
515515
address = 0x82645518
516516
jump_address = 0x8264551C
517517

518+
# Sonicteam::MyPE::MyEmitter / Sonicteam::GE1PE::Emitter
518519
[[midasm_hook]]
519-
name = "ParticleHFR_82670658"
520-
address = 0x82670724
521-
registers = ["f1", "r1"]
522-
after_instruction = true
520+
name = "Spanverse_GE1PE_DeltaTimeFix"
521+
address = 0x82670728
522+
registers = ["f1"]
523523

524+
# Sonicteam::Spanverse::SpangleObject / Sonicteam::Spanverse::SpkCustomObject
524525
[[midasm_hook]]
525-
name = "ParticleHFR_8266A418_1"
526-
address = 0x8266A57C
527-
registers = ["f31", "r1"]
528-
after_instruction = true
526+
name = "Spanverse_GE1PE_DeltaTimeFix"
527+
address = 0x8266A580
528+
registers = ["f31"]
529529

530+
# Sonicteam::Spanverse::SpangleParticle
530531
[[midasm_hook]]
531-
name = "ParticleHFR_82673F88"
532-
address = 0x8267402C
533-
registers = ["f13", "r1"]
534-
after_instruction = true
532+
name = "Spanverse_GE1PE_DeltaTimeFix"
533+
address = 0x82674030
534+
registers = ["f13"]
535535

536+
# Sonicteam::Spanverse::SpangleLight
536537
[[midasm_hook]]
537-
name = "ParticleHFR_82674550"
538-
address = 0x826747FC
539-
registers = ["f13", "r1"]
540-
after_instruction = true
538+
name = "Spanverse_GE1PE_DeltaTimeFix"
539+
address = 0x82674800
540+
registers = ["f13"]
541541

542542
[[midasm_hook]]
543543
name = "HUDLoadingAlloc"

0 commit comments

Comments
 (0)