Skip to content

Commit 28aa6b4

Browse files
committed
Align pause menu mission text to bottom
1 parent 6cb7db8 commit 28aa6b4

File tree

4 files changed

+28
-2
lines changed

4 files changed

+28
-2
lines changed

MarathonRecomp/api/Marathon.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#include "Sonicteam/MyTexture.h"
6060
#include "Sonicteam/MyTransforms.h"
6161
#include "Sonicteam/NoSyncThread.h"
62+
#include "Sonicteam/PauseTask.h"
6263
#include "Sonicteam/Player/IDynamicLink.h"
6364
#include "Sonicteam/Player/IExportExternalFlag.h"
6465
#include "Sonicteam/Player/IExportPostureRequestFlag.h"

MarathonRecomp/api/Sonicteam/HUDPause.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ namespace Sonicteam
1111
xpointer<CsdObject> m_pCsdObject;
1212
MARATHON_INSERT_PADDING(0xA0);
1313
be<float> m_TextPriority;
14-
MARATHON_INSERT_PADDING(0x44);
14+
MARATHON_INSERT_PADDING(0x40);
15+
xpointer<HudTextParts> m_pHudTextRoot;
1516
bool m_ShowMissionWindow;
1617
};
1718
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#pragma once
2+
3+
#include <Marathon.inl>
4+
5+
namespace Sonicteam
6+
{
7+
class PauseTask : public SoX::Engine::Task
8+
{
9+
public:
10+
MARATHON_INSERT_PADDING(0x230);
11+
xpointer<TextEntity> m_pMissionText;
12+
};
13+
}

MarathonRecomp/patches/aspect_ratio_patches.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ PPC_FUNC_IMPL(__imp__sub_824E11D0);
16491649
PPC_FUNC(sub_824E11D0)
16501650
{
16511651
auto pHUDMainMenu = (Sonicteam::HUDMainMenu*)(base + ctx.r3.u32);
1652-
auto pHudTextRoot = pHUDMainMenu->m_pHudTextRoot->m_pNext;
1652+
auto pHudTextRoot = pHUDMainMenu->m_pHudTextRoot;
16531653

16541654
static bool s_preservedTextPositions{};
16551655
static float s_multiplayerTextOffsetX{};
@@ -1708,6 +1708,17 @@ PPC_FUNC(sub_824DCF40)
17081708
__imp__sub_824DCF40(ctx, base);
17091709
}
17101710

1711+
// Sonicteam::PauseTask::Update
1712+
PPC_FUNC_IMPL(__imp__sub_82509870);
1713+
PPC_FUNC(sub_82509870)
1714+
{
1715+
auto pPauseTask = (Sonicteam::PauseTask*)(base + ctx.r3.u32);
1716+
1717+
SetTextEntityModifier(pPauseTask->m_pMissionText.get(), CSD_ALIGN_BOTTOM | CSD_SCALE);
1718+
1719+
__imp__sub_82509870(ctx, base);
1720+
}
1721+
17111722
// Sonicteam::HintWindowTask::Update
17121723
PPC_FUNC_IMPL(__imp__sub_824D12F0);
17131724
PPC_FUNC(sub_824D12F0)

0 commit comments

Comments
 (0)