Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/CreateOrTriggerInvasion.func.hpp"
#include "../CreateOrTriggerInvasion.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004AB540
void MenuModalRenderFunction_CreateOrTriggerInvasion(int x, int y, int width, int height)
{
// "Invasion"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(199, 0x2e, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_SCENARIO, 46, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/DisableTroops.func.hpp"
#include "../DisableTroops.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004ABCB0
void MenuModalRenderFunction_DisableTroops(int x, int y, int width, int height)
{
// "Troops"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(199, 0xbc, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_SCENARIO, 188, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/DisableWeapon.func.hpp"
#include "../DisableWeapon.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004ABCE0
void MenuModalRenderFunction_DisableWeapon(int x, int y, int width, int height)
{
// "Weapons"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(199, 0xbd, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_SCENARIO, 189, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/EnterTitleOnGameStart.func.hpp"
#include "../EnterTitleOnGameStart.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x00491BF0
void MenuModalRenderFunction_EnterTitleOnGameStart(int x, int y, int width, int height)
{
// "Enter Your Title"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(5, 6, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_MAINOPTIONS, 6, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/GameplayOptions.func.hpp"
#include "../GameplayOptions.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x00491E80
void MenuModalRenderFunction_GameplayOptions(int x, int y, int width, int height)
{
// "Game Play Options"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(0x4a, 0x19, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_GAME_OPTIONS, 25, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/NetworkOptions.func.hpp"
#include "../NetworkOptions.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x00492A60
void MenuModalRenderFunction_NetworkOptions(int x, int y, int width, int height)
{
// "Network Options"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(0x4a, 6, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_GAME_OPTIONS, 6, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/OnlineQuitGame.func.hpp"
#include "../OnlineQuitGame.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004937B0
void MenuModalRenderFunction_OnlineQuitGame(int x, int y, int width, int height)
{
// "Quit Mission"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(0x4a, 7, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_GAME_OPTIONS, 7, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/OptionsMenu.func.hpp"
#include "../OptionsMenu.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x00491810
void MenuModalRenderFunction_OptionsMenu(int x, int y, int width, int height)
{
// "Game Options"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(0x4a, 1, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_GAME_OPTIONS, 1, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/SkirmishConnectionOptions.func.hpp"
#include "../SkirmishConnectionOptions.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004ABE50
void MenuModalRenderFunction_SkirmishConnectionOptions(int x, int y, int width, int height)
{
// "Connection options"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(0x4f, 0x5d, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_XPLAY_WAITING_ROOM, 93, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/SkirmishPlayOptions.func.hpp"
#include "../SkirmishPlayOptions.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004ABE80
void MenuModalRenderFunction_SkirmishPlayOptions(int x, int y, int width, int height)
{
// "Play Options"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(0x4f, 0x67, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_XPLAY_WAITING_ROOM, 103, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/SoundOptions.func.hpp"
#include "../SoundOptions.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x00492660
void MenuModalRenderFunction_SoundOptions(int x, int y, int width, int height)
{
// "Sound Options"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(0x4a, 5, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_GAME_OPTIONS, 5, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/StartGoods.func.hpp"
#include "../StartGoods.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004AB4E0
void MenuModalRenderFunction_StartGoods(int x, int y, int width, int height)
{
// "Start Goods"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(199, 0x29, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_SCENARIO, 41, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/TraderSettings.func.hpp"
#include "../TraderSettings.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004AB4B0
void MenuModalRenderFunction_TraderSettings(int x, int y, int width, int height)
{
// "Trader"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(199, 0x26, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_SCENARIO, 38, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/TriggerEvent.func.hpp"
#include "../TriggerEvent.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004AC250
void MenuModalRenderFunction_TriggerEvent(int x, int y, int width, int height)
{
// "Events"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(199, 0x17, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_SCENARIO, 23, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "OpenSHC/UI/MenuModals/UnusedSiegeAttackingForceUnk.func.hpp"
#include "../UnusedSiegeAttackingForceUnk.func.hpp"

#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp"
#include "OpenSHC/DE/SHCDE/eTextSections.hpp"

#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp"

Expand All @@ -11,8 +13,9 @@ namespace UI {
// FUNCTION: STRONGHOLDCRUSADER 0x004AB510
void MenuModalRenderFunction_UnusedSiegeAttackingForceUnk(int x, int y, int width, int height)
{
// "Attacking Force"
MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderTextBanner,
DAT_PencilRenderCore::ptr)(199, 0xa4, x, y, width, height);
DAT_PencilRenderCore::ptr)(OpenSHC::DE::SHCDE::TEXT_SCENARIO, 164, x, y, width, height);
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace UI {

// FUNCTION: STRONGHOLDCRUSADER 0x00475CC0
void PencilRenderCore::drawHeaderTextBanner(
int textGroupIndex, int textNumInGroup, int xPos, int yPos, int width, int height)
eTextSections textGroupIndex, int textNumInGroup, int xPos, int yPos, int width, int height)
{
// drawHeaderBanner's banner, with a text centred on it
// The banner is one tile inside the box at the top and on both sides; width becomes the banner's own.
Expand Down Expand Up @@ -76,7 +76,7 @@ namespace UI {
yPos + 9, OpenSHC::IO::Graphics::GID_INTERFACE_ICONS_3, BANNER_CAP_MASK, 0);
MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::renderTextToScreen, DAT_TextManagerObject::ptr)(
MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::getTextStringInGroupAtOffset,
DAT_TextManagerObject::ptr)((OpenSHC::DE::SHCDE::eTextSections)textGroupIndex, textNumInGroup),
DAT_TextManagerObject::ptr)(textGroupIndex, textNumInGroup),
width / 2 + left, yPos + 14, OpenSHC::Text::TTA_CENTER, OpenSHC::Rendering::Colors::COL_C2F0EB,
BANNER_TEXT_FONT_SIZE, FALSE, 0);
}
Expand Down
Loading