diff --git a/src/OpenSHC/UI/MenuModals/AlliesOrder/MenuModalRenderFunction_AlliesOrder.cpp b/src/OpenSHC/UI/MenuModals/AlliesOrder/MenuModalRenderFunction_AlliesOrder.cpp new file mode 100644 index 0000000000..17c8a6919d --- /dev/null +++ b/src/OpenSHC/UI/MenuModals/AlliesOrder/MenuModalRenderFunction_AlliesOrder.cpp @@ -0,0 +1,28 @@ +#include "../AlliesOrder.func.hpp" + +#include "OpenSHC/Text/TextManager.func.hpp" +#include "OpenSHC/UI/Helpers.func.hpp" +#include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Rendering/Colors/ColorsEnum.hpp" +#include "OpenSHC/Text/TextAlignment.hpp" + +#include "OpenSHC/Globals/DAT_TextManagerObject.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuModals { + + // FUNCTION: STRONGHOLDCRUSADER 0x004AD2B0 + void AlliesOrder::MenuModalRenderFunction_AlliesOrder(int x, int y, int width, int height) + { + MACRO_CALL(OpenSHC::UI::Helpers_Func::BuildEnemyPlayerList)(); + // "Set Orders" + 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::TEXT_ALLIES, 5), + x + 30, y + 25, OpenSHC::Text::TTA_LEFT, OpenSHC::Rendering::Colors::COL_CCFAFF, 15, FALSE, 0); + } + + } +} +} diff --git a/src/OpenSHC/UI/MenuModals/AlliesRequestGoods/MenuModalRenderFunction_AlliesRequestGoods.cpp b/src/OpenSHC/UI/MenuModals/AlliesRequestGoods/MenuModalRenderFunction_AlliesRequestGoods.cpp new file mode 100644 index 0000000000..73b444d235 --- /dev/null +++ b/src/OpenSHC/UI/MenuModals/AlliesRequestGoods/MenuModalRenderFunction_AlliesRequestGoods.cpp @@ -0,0 +1,26 @@ +#include "../AlliesRequestGoods.func.hpp" + +#include "OpenSHC/Text/TextManager.func.hpp" +#include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Rendering/Colors/ColorsEnum.hpp" +#include "OpenSHC/Text/TextAlignment.hpp" + +#include "OpenSHC/Globals/DAT_TextManagerObject.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuModals { + + // FUNCTION: STRONGHOLDCRUSADER 0x004AD780 + void AlliesRequestGoods::MenuModalRenderFunction_AlliesRequestGoods(int x, int y, int width, int height) + { + // "Request Goods" + 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::TEXT_ALLIES, 7), + x + 20, y + 25, OpenSHC::Text::TTA_LEFT, OpenSHC::Rendering::Colors::COL_CCFAFF, 15, FALSE, 0); + } + + } +} +} diff --git a/src/OpenSHC/UI/MenuModals/AlliesSendGoods/MenuModalRenderFunction_AlliesSendGoods.cpp b/src/OpenSHC/UI/MenuModals/AlliesSendGoods/MenuModalRenderFunction_AlliesSendGoods.cpp new file mode 100644 index 0000000000..ecefb444d8 --- /dev/null +++ b/src/OpenSHC/UI/MenuModals/AlliesSendGoods/MenuModalRenderFunction_AlliesSendGoods.cpp @@ -0,0 +1,26 @@ +#include "../AlliesSendGoods.func.hpp" + +#include "OpenSHC/Text/TextManager.func.hpp" +#include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Rendering/Colors/ColorsEnum.hpp" +#include "OpenSHC/Text/TextAlignment.hpp" + +#include "OpenSHC/Globals/DAT_TextManagerObject.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuModals { + + // FUNCTION: STRONGHOLDCRUSADER 0x004ADD90 + void AlliesSendGoods::MenuModalRenderFunction_AlliesSendGoods(int x, int y, int width, int height) + { + // "Send Goods" + 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::TEXT_ALLIES, 6), + x + 20, y + 25, OpenSHC::Text::TTA_LEFT, OpenSHC::Rendering::Colors::COL_CCFAFF, 15, FALSE, 0); + } + + } +} +} diff --git a/src/OpenSHC/UI/MenuModals/ChooseRandomNumberOfEnemies/MenuModalRenderFunction_ChooseRandomNumberOfEnemies.cpp b/src/OpenSHC/UI/MenuModals/ChooseRandomNumberOfEnemies/MenuModalRenderFunction_ChooseRandomNumberOfEnemies.cpp new file mode 100644 index 0000000000..27fc3ec4c8 --- /dev/null +++ b/src/OpenSHC/UI/MenuModals/ChooseRandomNumberOfEnemies/MenuModalRenderFunction_ChooseRandomNumberOfEnemies.cpp @@ -0,0 +1,32 @@ +#include "../ChooseRandomNumberOfEnemies.func.hpp" + +#include "OpenSHC/Text/TextManager.func.hpp" +#include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Rendering/Colors/ColorsEnum.hpp" +#include "OpenSHC/Text/TextAlignment.hpp" + +#include "OpenSHC/Globals/DAT_TextManagerObject.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuModals { + + // FUNCTION: STRONGHOLDCRUSADER 0x004AE070 + void ChooseRandomNumberOfEnemies::MenuModalRenderFunction_ChooseRandomNumberOfEnemies( + int x, int y, int width, int height) + { + // "How many opponents can you handle!" + 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::TEXT_NEW_TEXT, 1), + x + 300, y + 100, OpenSHC::Text::TTA_CENTER, OpenSHC::Rendering::Colors::COL_CCFAFF, 17, FALSE, 0); + // "This will create some random opponents for you. You can still change opponent types afterwards." + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::renderMultilineText5Unk, DAT_TextManagerObject::ptr)( + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::getTextStringInGroupAtOffset, + DAT_TextManagerObject::ptr)(OpenSHC::DE::SHCDE::TEXT_NEW_TEXT, 2), + x + 100, y + 300, 400, OpenSHC::Rendering::Colors::COL_CCFAFF, 18, 0); + } + + } +} +} diff --git a/src/OpenSHC/UI/MenuModals/WaitingForHost/MenuModalRenderFunction_WaitingForHost.cpp b/src/OpenSHC/UI/MenuModals/WaitingForHost/MenuModalRenderFunction_WaitingForHost.cpp new file mode 100644 index 0000000000..c2037fe1a7 --- /dev/null +++ b/src/OpenSHC/UI/MenuModals/WaitingForHost/MenuModalRenderFunction_WaitingForHost.cpp @@ -0,0 +1,26 @@ +#include "../WaitingForHost.func.hpp" + +#include "OpenSHC/Text/TextManager.func.hpp" +#include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Rendering/Colors/ColorsEnum.hpp" +#include "OpenSHC/Text/TextAlignment.hpp" + +#include "OpenSHC/Globals/DAT_TextManagerObject.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuModals { + + // FUNCTION: STRONGHOLDCRUSADER 0x0047E3A0 + void WaitingForHost::MenuModalRenderFunction_WaitingForHost(int x, int y, int width, int height) + { + // "Waiting for host..." + 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::TEXT_MULTIPLAYER_CONNECTION, 20), + x + width / 2, y + 23, OpenSHC::Text::TTA_CENTER, OpenSHC::Rendering::Colors::COL_C2F0EB, 17, FALSE, 0); + } + + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index a105efbb9b..6e036f9340 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -22361,7 +22361,7 @@ SHC_3BB0A8C1_0x0047E1A0 | 0.0% | Pending SHC_3BB0A8C1_0x0047E240 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x0047E3A0 | 0.0% | Pending +SHC_3BB0A8C1_0x0047E3A0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x0047E3E0 | 0.0% | Pending @@ -25801,19 +25801,19 @@ SHC_3BB0A8C1_0x004AD110 | 0.0% | Pending SHC_3BB0A8C1_0x004AD1E0 | 0.0% | Pending -SHC_3BB0A8C1_0x004AD2B0 | 0.0% | Pending +SHC_3BB0A8C1_0x004AD2B0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004AD2F0 | 0.0% | Pending SHC_3BB0A8C1_0x004AD480 | 0.0% | Pending -SHC_3BB0A8C1_0x004AD780 | 0.0% | Pending +SHC_3BB0A8C1_0x004AD780 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004AD7C0 | 0.0% | Pending SHC_3BB0A8C1_0x004AD920 | 0.0% | Pending -SHC_3BB0A8C1_0x004ADD90 | 0.0% | Pending +SHC_3BB0A8C1_0x004ADD90 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004ADDD0 | 0.0% | Pending @@ -25863,7 +25863,7 @@ SHC_3BB0A8C1_0x004AE002 | 0.0% | Pending SHC_3BB0A8C1_0x004AE010 | 0.0% | Pending -SHC_3BB0A8C1_0x004AE070 | 0.0% | Pending +SHC_3BB0A8C1_0x004AE070 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004AE0F0 | 0.0% | Pending