diff --git a/SWA/Player/Character/EvilSonic/EvilSonicContext.h b/SWA/Player/Character/EvilSonic/EvilSonicContext.h index d8f38ae..6bd1647 100644 --- a/SWA/Player/Character/EvilSonic/EvilSonicContext.h +++ b/SWA/Player/Character/EvilSonic/EvilSonicContext.h @@ -8,7 +8,12 @@ namespace SWA::Player class CEvilSonicContext // : public CPlayerContext { public: - SWA_INSERT_PADDING(0x688); + SWA_INSERT_PADDING(0x660); + be m_Rings; + SWA_INSERT_PADDING(0x10); + be m_CrushScore; + be m_ComboScore; + SWA_INSERT_PADDING(0xC); be m_DarkGaiaEnergy; SWA_INSERT_PADDING(0x138); be m_AnimationID; diff --git a/SWA/System/GameDocument.h b/SWA/System/GameDocument.h index d701301..f66f142 100644 --- a/SWA/System/GameDocument.h +++ b/SWA/System/GameDocument.h @@ -20,13 +20,17 @@ namespace SWA be BRank; be CRank; be DRank; - SWA_INSERT_PADDING(0x0C); - be PointMarkerRecordSpeed; - SWA_INSERT_PADDING(0x0C); + SWA_INSERT_PADDING(0x04); + be TimeBonusTimeLimit; + be PointMarkerMaxCount; + be PointMarkerRecordSpeed[3]; + be GoalRingSpeed; be PointMarkerCount; be EnemyScore; be TrickScore; - SWA_INSERT_PADDING(0x10); + SWA_INSERT_PADDING(0x8); + be TimeBonusPerSecond; + SWA_INSERT_PADDING(0x4); }; SWA_INSERT_PADDING(0x1C); @@ -53,10 +57,14 @@ namespace SWA SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, BRank, 0x08); SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, CRank, 0x0C); SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, DRank, 0x10); + SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, TimeBonusTimeLimit, 0x18); + SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, PointMarkerMaxCount, 0x1C); SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, PointMarkerRecordSpeed, 0x20); + SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, GoalRingSpeed, 0x2C); SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, PointMarkerCount, 0x30); SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, EnemyScore, 0x34); SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, TrickScore, 0x38); + SWA_ASSERT_OFFSETOF(CGameDocument::CMember::SScoreInfo, TimeBonusPerSecond, 0x44); SWA_ASSERT_SIZEOF(CGameDocument::CMember::SScoreInfo, 0x4C); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spDatabase, 0x1C);