From 7724c546600ff731b23cbde2801a676112940351 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 14 Nov 2026 04:37:30 +0100 Subject: [PATCH 1/6] header: UnitState gets US_UNKNOWN_117, 202, 203, 204, 205 and 209 Units::UpdateDeer (0x00541DE0) and Units::UpdateRabbit (0x00542630) dispatch on the unit's state through jump tables that run to 209 (cmp ecx, 0xd1 at 0x00541E5F with tables at 0x00542558 and 0x00542528; cmp eax, 0xd1 at 0x0054276E with tables at 0x00542C34 and 0x00542C0C). Deer's table has its own entries for 117, 202 to 205 and 209, Rabbit's for 117, 203, 204 and 209 (202 and 205 go to its default). They store these states (mov word ptr [reg + 0x138880C]: the units array at 0x0138854C plus state at 0x2C0): Deer 205, 203 and 204 at 0x00541EBC, 0x00541ED5 and 0x00541EE0 and 117 at 0x0054244B and 0x0054249C, Rabbit 203, 204 and 117 at 0x005427C6, 0x005427D3 and 0x00542B0E, and TribesState::scatterTribeUnitsRandomly stores 209 at 0x00523A0A. The enum goes from US_STONE_DEATH_03 (116) to US_UNKNOWN_120 and ends at US_ASSASSIN_CLIMBING_DOWN (129); the six are named in the US_UNKNOWN_ form. Used in place of (UnitState)N and the numeric case labels; code generation is the same. Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/States/UnitState.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/OpenSHC/Map/Units/States/UnitState.hpp b/src/OpenSHC/Map/Units/States/UnitState.hpp index 143186db34..70aef1ffbd 100644 --- a/src/OpenSHC/Map/Units/States/UnitState.hpp +++ b/src/OpenSHC/Map/Units/States/UnitState.hpp @@ -38,6 +38,7 @@ namespace Map { US_STONE_DEATH_01 = 114, // 0x00000072 US_STONE_DEATH_02 = 115, // 0x00000073 US_STONE_DEATH_03 = 116, // 0x00000074 + US_UNKNOWN_117 = 117, // 0x00000075 US_UNKNOWN_120 = 120, // 0x00000078 US_UNKNOWN_121 = 121, // 0x00000079 US_APPEAR = 122, // 0x0000007A @@ -46,6 +47,11 @@ namespace Map { US_ASSASSIN_CLIMBING_UP = 127, // 0x0000007F US_ASSASSIN_START_CLIMBING_DOWN = 128, // 0x00000080 US_ASSASSIN_CLIMBING_DOWN = 129, // 0x00000081 + US_UNKNOWN_202 = 202, // 0x000000CA + US_UNKNOWN_203 = 203, // 0x000000CB + US_UNKNOWN_204 = 204, // 0x000000CC + US_UNKNOWN_205 = 205, // 0x000000CD + US_UNKNOWN_209 = 209, // 0x000000D1 UnitStateInt__US_APPLEFARMER_PLUCK_APPLES = 2, // 0x00000002 UnitStateInt__US_Appear = 122, // 0x0000007A UnitStateInt__US_Dig = 125 // 0x0000007D From 80db584f3fd9eff58b6ac74a2cb832720ac414e7 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 14 Nov 2026 03:57:26 +0100 Subject: [PATCH 2/6] reimplement: SHC_3BB0A8C1_0x0053A020 100.0% Reimplemented Units::CurrentUnitHasHealer, from Gynt's draft on sourcehold's reimpl/map-units-updatefunctions, the branch of PR #204 (6d8ad8887, 89.29%, "loop precheck scheduling"; the file last changed in 974c32fcf; 92.9 on main's headers in the 43a17dfac baseline). The current player is read into a const local, currentPlayer, before the loop, as the original loads currentPlayerSlotID before the loop's precheck, the way PlayArmoryIsFullWarning and WarnIfPlayersGranaryIsFull read theirs (read in the condition: quick_diff 0.9259 -> 0.8519). maxUnitCount is an int, so the (int) cast goes, and the loop counts unitID as main's unit loops do. reccmp 100.0%. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- .../Map/Units/CurrentUnitHasHealer.cpp | 30 +++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp diff --git a/src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp b/src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp new file mode 100644 index 0000000000..2f5ed89884 --- /dev/null +++ b/src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp @@ -0,0 +1,30 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Map/Units/UnitLogicState.hpp" +#include "OpenSHC/Map/Units/UnitType.hpp" +#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp" + +#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp" +#include "OpenSHC/Globals/DAT_UnitsState.hpp" + +namespace OpenSHC { +namespace Map { + + using OpenSHC::WindowsHelper::Enums::BOOLEnum; + + // FUNCTION: STRONGHOLDCRUSADER 0x0053A020 + BOOLEnum Units::CurrentUnitHasHealer() + { + int const currentPlayer = DAT_GameSynchronyState::instance.currentPlayerSlotID; + for (int unitID = 1; unitID < DAT_UnitsState::instance.maxUnitCount; ++unitID) { + if (DAT_UnitsState::instance.units[unitID].logicalState != OpenSHC::Map::Units::ULS_INVISIBLE + && DAT_UnitsState::instance.units[unitID].owner == currentPlayer + && DAT_UnitsState::instance.units[unitID].unitType == OpenSHC::Map::Units::UT_HEALER) { + return TRUE; + } + } + return FALSE; + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 826f7fa80e..63bfc5290b 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -59425,7 +59425,7 @@ SHC_3BB0A8C1_0x0053A017 | 0.0% | Pending SHC_3BB0A8C1_0x0053A018 | 0.0% | Pending -SHC_3BB0A8C1_0x0053A020 | 0.0% | Pending +SHC_3BB0A8C1_0x0053A020 | 100.0% | Reimplemented SHC_3BB0A8C1_0x0053A070 | 0.0% | Pending From 4f5c9b2598bfbc00797ff1b9e9a5b87c13b118fb Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 14 Nov 2026 03:57:26 +0100 Subject: [PATCH 3/6] reimplement: SHC_3BB0A8C1_0x00542630 100.0% Reimplemented Units::UpdateRabbit, from Gynt's draft on sourcehold's reimpl/map-units-updatefunctions (209f6d43b at 69.32%, 49bd9c959 at 79.00%): - units[] is indexed through unitID or through DAT_CurrentUnitSlotID::instance per statement, as a greedy quick_diff search picked them one statement per step; - the US_UNKNOWN_203 path sits inside the `> 0` test, the slowdown is an int compare with (fixedRng & 0xf), and the death cases test animationFrame <= 0 first, the original's branch directions (structural_diff.py); - tribe is an int local, so its load is movsx as in the original; it is read at the top, as reading it where it is used loses the match (quick_diff 1.0000 -> 0.5216); - when hasUnitReachedDestination returns TRUE in the movement case, animationCycleNumber and substate are written through a local Unit pointer. The scheduler (Schedule, called from dop2_PreEncode) cannot tell those two stores apart from the state.generic store through units[unitID] and gives each a memory edge to it, so they come before pop edi and pop edi before the third store, as in the original; with all three through units[unitID] the stores are independent and pop edi went first. Found with cdb: tuple_dump.py shows the block in source order at dop2_PreEncode entry and reordered when it returns, and a breakpoint on DagMakeDep lists the edges; - states 117, 203, 204 and 209 use the US_UNKNOWN_ names of the header commit. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateRabbit.cpp | 303 +++++++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 304 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateRabbit.cpp diff --git a/src/OpenSHC/Map/Units/UpdateRabbit.cpp b/src/OpenSHC/Map/Units/UpdateRabbit.cpp new file mode 100644 index 0000000000..aac324410b --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateRabbit.cpp @@ -0,0 +1,303 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Audio/SFX/SFXState.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/DE/SHCDE/eSFX.hpp" +#include "OpenSHC/Map/LogicHelpers/Logic1.hpp" +#include "OpenSHC/Map/Units/States/UnitState.hpp" +#include "OpenSHC/Map/Units/UnitLogicState.hpp" + +#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_GameState.hpp" +#include "OpenSHC/Globals/DAT_SFXState.hpp" +#include "OpenSHC/Globals/DAT_TileMapState.hpp" +#include "OpenSHC/Globals/DAT_TribesState.hpp" +#include "OpenSHC/Globals/DAT_UnitHasBecomeIdle.hpp" +#include "OpenSHC/Globals/DAT_UnitPropertiesDefinedData.hpp" +#include "OpenSHC/Globals/DAT_UnitsState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x00542630 + void Units::UpdateRabbit() + { + int const unitID = DAT_CurrentUnitSlotID::instance; + DAT_GameState::instance.mapAndTime.wildlifeCount++; + // read at the top: reading it where it is used loses the match + int const tribe = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].tribeID; + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex + = DAT_UnitsState::instance.units[unitID].fixedRng & 0xf; + if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 9) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 2; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 10 + || DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 11) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 3; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 12) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 4; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 13) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 6; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 14) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 8; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 15) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 3; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 0 + && DAT_UnitsState::instance.units[unitID].state.generic != OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown--; + } + // rabbits eat the crops on their tile and on the four neighbouring tiles + int const tile = DAT_UnitsState::instance.units[unitID].tile; + if ((DAT_TileMapState::instance.LogicLayer[tile] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[tile] = 0; + } + int neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][0] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][4] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][2] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][6] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + switch (DAT_UnitsState::instance.units[unitID].state.generic) { + case OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + if (DAT_UnitsState::instance.units[unitID].closestEnemyMicroDistance > 0) { + if ((unitID & 1) != 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setUnitFacingDirectionTowardsTarget, + DAT_UnitsState::ptr)(unitID, DAT_TribesState::instance.tribes[tribe].selectionTargetUnitID); + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_203; + return; + } + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_UNKNOWN_204; + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_209: + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + if (((DAT_UnitsState::instance.units[unitID].fixedRng ^ DAT_GameCore::instance.mapTimeInTicks) & 0x7f) + == 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX, + DAT_UnitsState::instance.units[unitID].targetY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION; + } + return; + case OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION: + case OpenSHC::Map::Units::States::US_UNKNOWN_120: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].moveInstructionSpeedDelayTracker = 0; + DAT_UnitsState::instance.units[unitID].moveDelay = 0; + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[unitID].field_0x32d = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 1; + if (DAT_UnitsState::instance.units[unitID].substate == 100) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 40; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 4; + DAT_UnitsState::instance.units[unitID].rabbitMovementSlowdown++; + if (DAT_UnitsState::instance.units[unitID].rabbitMovementSlowdown + > (DAT_UnitsState::instance.units[unitID].fixedRng & 0xf)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + DAT_UnitsState::instance.units[unitID].movementSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 1) + 1; + } + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x720c[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].seated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + DAT_UnitsState::instance.units[unitID].movementSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 1) + 1; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + return; + } + DAT_UnitsState::instance.units[unitID].movementSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 1) + 1; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + // through a pointer, so these two stores stay ahead of the epilogue, as in the original + Unit* const unit = &DAT_UnitsState::instance.units[unitID]; + unit->animationCycleNumber = 0; + unit->substate = 0; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_203: + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x3c2 = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].seated = 1; + if ((unitID & 3) == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x7178[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if ((unitID & 3) == 1) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x71a0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if ((unitID & 3) == 2) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x71d4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x7268[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitHasBecomeIdle::instance = 1; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + return; + } + if ((unitID & 3) == 3) { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 121 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_204: + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].seated = 1; + if (DAT_UnitsState::instance.units[unitID].substate == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x7268[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[unitID].substate == 1) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x72a0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].substate++; + if (DAT_UnitsState::instance.units[unitID].substate > 1) { + DAT_UnitsState::instance.units[unitID].substate = 0; + } + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_DEATH_01: + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 4; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x72e0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 384; + } + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented + && DAT_UnitsState::instance.units[unitID].animationCycleNumber == 1) { + MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playSFXAtLocation, DAT_SFXState::ptr)( + DAT_UnitsState::instance.units[unitID].x, DAT_UnitsState::instance.units[unitID].y, + OpenSHC::DE::SHCDE::FX_RABBIT_DIE); + } + return; + case OpenSHC::Map::Units::States::US_DEATH_02: + case OpenSHC::Map::Units::States::US_DEATH_03: + case OpenSHC::Map::Units::States::US_STONE_DEATH_01: + case OpenSHC::Map::Units::States::US_STONE_DEATH_02: + case OpenSHC::Map::Units::States::US_STONE_DEATH_03: + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 4; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x7310[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 408; + } + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented + && DAT_UnitsState::instance.units[unitID].animationCycleNumber == 1) { + MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playSFXAtLocation, DAT_SFXState::ptr)( + DAT_UnitsState::instance.units[unitID].x, DAT_UnitsState::instance.units[unitID].y, + OpenSHC::DE::SHCDE::FX_RABBIT_DIE); + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_117: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 5) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + return; + case OpenSHC::Map::Units::States::US_DISAPPEAR: + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown++; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) { + DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE; + } + return; + } + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 63bfc5290b..c7cb3fd796 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -60787,7 +60787,7 @@ SHC_3BB0A8C1_0x00542628 | 0.0% | Pending SHC_3BB0A8C1_0x00542629 | 0.0% | Pending -SHC_3BB0A8C1_0x00542630 | 0.0% | Pending +SHC_3BB0A8C1_0x00542630 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00542C0C | 0.0% | Pending From a65adfc805dd717101812928c29eb5291e689246 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 14 Nov 2026 03:57:27 +0100 Subject: [PATCH 4/6] reimplement: SHC_3BB0A8C1_0x00541DE0 100.0% Reimplemented Units::UpdateDeer, from Gynt's draft on sourcehold's reimpl/map-units-updatefunctions (f7d126fb0 at 36.18%, 6458bca40 at 64.64%, cases in jump-table order): - units[] is indexed through unitID or through DAT_CurrentUnitSlotID::instance per statement, as a greedy quick_diff search picked them one statement per step; in states 204 and 205 the two forms were picked over every combination: 204 tests substate through the slot, as 203 does, so its substate is not kept in a register for the increment and the two states share one idle tail as in the original; - when hasUnitReachedDestination returns TRUE, animationCycleNumber and substate are written through a local Unit pointer, so the two stores stay ahead of the epilogue's pop edi as in the original (the same lever as in UpdateRabbit); - in both seated branches of state 205 the frame-0 path sets DAT_UnitHasBecomeIdle and falls through to the shared idle block instead of repeating it and returning: the original has that block copied into each path; - frameOffset is declared at the top: the original holds its 1 in edx from the prologue, where it also adds it to deerCount (declared in the movement case: quick_diff 0.8300); tribe is read at the top too (just before the switch: 0.9122); - states 117, 202 to 205 and 209 use the US_UNKNOWN_ names of the header commit. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateDeer.cpp | 335 +++++++++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateDeer.cpp diff --git a/src/OpenSHC/Map/Units/UpdateDeer.cpp b/src/OpenSHC/Map/Units/UpdateDeer.cpp new file mode 100644 index 0000000000..46c10ef2a4 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateDeer.cpp @@ -0,0 +1,335 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Audio/SFX/SFXState.func.hpp" +#include "OpenSHC/Map/Units/TribesState.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/DE/SHCDE/eSFX.hpp" +#include "OpenSHC/Map/Units/SomeTribeBehaviorType.hpp" +#include "OpenSHC/Map/Units/States/UnitState.hpp" +#include "OpenSHC/Map/Units/UnitLogicState.hpp" + +#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_GameState.hpp" +#include "OpenSHC/Globals/DAT_SFXState.hpp" +#include "OpenSHC/Globals/DAT_TribesState.hpp" +#include "OpenSHC/Globals/DAT_UnitHasBecomeIdle.hpp" +#include "OpenSHC/Globals/DAT_UnitPropertiesDefinedData.hpp" +#include "OpenSHC/Globals/DAT_UnitsState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x00541DE0 + void Units::UpdateDeer() + { + int const unitID = DAT_CurrentUnitSlotID::instance; + // declared at the top: declaring it in the movement case loses the match + int frameOffset = 1; + // read at the top: reading it just before the switch loses the match + int const tribe = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].tribeID; + DAT_GameState::instance.mapAndTime.deerCount++; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + if (DAT_UnitsState::instance.units[unitID].antelopeBasedRngValue == 0) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 1; + } else if (DAT_UnitsState::instance.units[unitID].antelopeBasedRngValue == 1) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 2; + } else if (DAT_UnitsState::instance.units[unitID].antelopeBasedRngValue == 2) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 3; + } + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 0 + && DAT_UnitsState::instance.units[unitID].state.generic != OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown--; + } + switch (DAT_UnitsState::instance.units[unitID].state.generic) { + case OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + if (DAT_UnitsState::instance.units[unitID].closestEnemyMicroDistance > 200) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setUnitFacingDirectionTowardsTarget, + DAT_UnitsState::ptr)(unitID, DAT_TribesState::instance.tribes[tribe].selectionTargetUnitID); + if (DAT_TribesState::instance.tribes[tribe].tribeBehaviorType == OpenSHC::Map::Units::STBT_1) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_205; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_203; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_204; + DAT_UnitsState::instance.units[unitID].field_0x3f2++; + if (DAT_UnitsState::instance.units[unitID].field_0x3f2 > 10) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::TribesState_Func::scatterTribeUnitsRandomly, + DAT_TribesState::ptr)(DAT_UnitsState::instance.units[unitID].tribeID); + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_209: + DAT_UnitsState::instance.units[unitID].field_0x3f2 = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + if (((DAT_UnitsState::instance.units[unitID].fixedRng ^ DAT_GameCore::instance.mapTimeInTicks) & 0x7f) + == 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX, + DAT_UnitsState::instance.units[unitID].targetY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION; + } + return; + case OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x3f2 = 0; + if (DAT_UnitsState::instance.units[unitID].substate == 100) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 20; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 7) + 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 321; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x69a8[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].substate = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].seated = 0; + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected; + return; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 8 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + return; + } + if (DAT_UnitsState::instance.units[unitID].field_0x3c2 != 0) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 20; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 5; + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented) { + DAT_UnitsState::instance.units[unitID].animationFrame--; + } + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].substate = 0; + DAT_UnitsState::instance.units[unitID].seated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance] + .facingDirectionMapOrientationCorrected + + 257; + DAT_UnitsState::instance.units[unitID].field_0x3c2 = 0; + return; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + return; + } + if (DAT_TribesState::instance.tribes[tribe].predatorNearby == 0 + || DAT_UnitsState::instance.units[unitID].currentIndexInPathPlan + > DAT_UnitsState::instance.units[unitID].totalSizeOfPathPlan - 2) { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 8; + } else { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 1; + DAT_UnitsState::instance.units[unitID].moveInstructionSpeedDelayTracker = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + frameOffset = 129; + DAT_UnitsState::instance.units[unitID].movementSpeed = 1; + } + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = frameOffset; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + // through a pointer, so these two stores stay ahead of the epilogue, as in the original + Unit* const unit = &DAT_UnitsState::instance.units[unitID]; + unit->animationCycleNumber = 0; + unit->substate = 0; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_202: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x3f2 = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 129; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_203: + DAT_UnitsState::instance.units[unitID].field_0x3f2 = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[unitID].field_0x3c2 = 1; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x671c[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 1) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x6804[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 2) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x6784[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 3) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x6804[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 257; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].substate++; + if (DAT_UnitsState::instance.units[unitID].substate > 3) { + DAT_UnitsState::instance.units[unitID].substate = 0; + } + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_204: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x68a4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 1) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x68f4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 2) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x68a4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 3) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x68f4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 257; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].substate++; + if (DAT_UnitsState::instance.units[unitID].substate > 3) { + DAT_UnitsState::instance.units[unitID].substate = 0; + } + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_205: + DAT_UnitsState::instance.units[unitID].field_0x3f2 = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 4; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 321; + if (DAT_UnitsState::instance.units[unitID].seated == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x6984[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 88; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 8 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + } else { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x69cc[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 96; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 8 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].seated = 1; + } + return; + case OpenSHC::Map::Units::States::US_DEATH_01: + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x6acc + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented + && DAT_UnitsState::instance.units[unitID].animationCycleNumber == 15) { + MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playSFXAtLocation, DAT_SFXState::ptr)( + DAT_UnitsState::instance.units[unitID].x, DAT_UnitsState::instance.units[unitID].y, + OpenSHC::DE::SHCDE::FX_DEER_FALL); + } + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 480; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 460; + return; + case OpenSHC::Map::Units::States::US_DEATH_02: + case OpenSHC::Map::Units::States::US_DEATH_03: + case OpenSHC::Map::Units::States::US_STONE_DEATH_01: + case OpenSHC::Map::Units::States::US_STONE_DEATH_02: + case OpenSHC::Map::Units::States::US_STONE_DEATH_03: + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x6b0c[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + return; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 448; + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_117: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 500) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + return; + case OpenSHC::Map::Units::States::US_DISAPPEAR: + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown++; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) { + DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE; + } + return; + } + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index c7cb3fd796..139a0fb19d 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -60341,7 +60341,7 @@ SHC_3BB0A8C1_0x005416B0 | 0.0% | Pending SHC_3BB0A8C1_0x00541A30 | 0.0% | Pending -SHC_3BB0A8C1_0x00541DE0 | 0.0% | Pending +SHC_3BB0A8C1_0x00541DE0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00542528 | 0.0% | Pending From 53601a69196d14dc6185ffc5a6ffb14f10b955a0 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 14 Nov 2026 03:57:28 +0100 Subject: [PATCH 5/6] reimplement: SHC_3BB0A8C1_0x005416B0 100.0% Reimplemented Units::UpdateMerchant, from Gynt's draft on sourcehold's reimpl/map-units-updatefunctions (0adb26427 at 53.39%, 8372c0824 at 63.80%), under /GL: - every call that takes the unit passes DAT_CurrentUnitSlotID::instance, and units[] is indexed through unitID or through the slot per statement, as a greedy quick_diff search picked them one statement per step; - in state 3 the three stores after the destination test go through the slot, which the original reads again after setDestinationForUnit, and gfxNumber and field_0x30_animRelated are written through a local Unit pointer, so they come after the stateBasedSpeed store as in the original; - states 2 and 3 are US_STATE_2Unk and US_STATE_3Unk, and state 2's fade step is written as -2 (the byte the original stores, 0xFE; same code); - compiler-flags-gl.txt lists UpdateMerchant.cpp: 100% with the line, 78.0% without it. The original keeps values in registers across checkIfCitizenUnitIsAliveBasedOnState and hasUnitReachedDestination, which main's list already has, and reads DAT_CurrentUnitSlotID again after activateTraderState, which stays off the list: with its body visible the slot stays in esi across the call (90.0% instead of 100%). Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- cmake/compiler-flags-gl.txt | 1 + src/OpenSHC/Map/Units/UpdateMerchant.cpp | 162 +++++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 3 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateMerchant.cpp diff --git a/cmake/compiler-flags-gl.txt b/cmake/compiler-flags-gl.txt index 226cdc7ca6..18dce0ff70 100644 --- a/cmake/compiler-flags-gl.txt +++ b/cmake/compiler-flags-gl.txt @@ -136,3 +136,4 @@ src/OpenSHC/Map/Units/UpdateMiner.cpp src/OpenSHC/Map/Units/UpdateQuarryMason.cpp src/OpenSHC/Map/Units/UpdateDrunkard.cpp src/OpenSHC/Map/Units/UpdateInnkeeper.cpp +src/OpenSHC/Map/Units/UpdateMerchant.cpp diff --git a/src/OpenSHC/Map/Units/UpdateMerchant.cpp b/src/OpenSHC/Map/Units/UpdateMerchant.cpp new file mode 100644 index 0000000000..ca45e4697c --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateMerchant.cpp @@ -0,0 +1,162 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Game/GameStateStructures.func.hpp" +#include "OpenSHC/Map/Buildings/BuildingsState.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Game/Player/Enums/BuildingEntryInfoEnum.hpp" +#include "OpenSHC/Map/Units/Pathfinding/DestinationNeededEnum.hpp" +#include "OpenSHC/Map/Units/States/UnitState.hpp" +#include "OpenSHC/Map/Units/UnitLogicState.hpp" + +#include "OpenSHC/Globals/DAT_BuildingsState.hpp" +#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp" +#include "OpenSHC/Globals/DAT_GameState.hpp" +#include "OpenSHC/Globals/DAT_TroopValueState.hpp" +#include "OpenSHC/Globals/DAT_UnitsState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x005416B0 + void Units::UpdateMerchant() + { + int const unitID = DAT_CurrentUnitSlotID::instance; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 1; + UnitStateShort const state = DAT_UnitsState::instance.units[unitID].state.generic; + if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + int const marketplace + = DAT_GameState::instance.playerDataArray[DAT_GameState::instance.mapAndTime.traderVisitsPlayer] + .buildingEntryInfos[OpenSHC::Game::Player::Enums::BEIE_MARKETPLACE] + .id; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(marketplace, 1) + != 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[marketplace].buildingEntryX, + DAT_BuildingsState::instance.buildings[marketplace].buildingEntryY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_IDLEUnk; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed + = DAT_TroopValueState::instance.attackInfo.aiTroops > 1; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::clearHiddenFlagAndUpdatePosition, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance)) { + MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::activateTraderState, DAT_GameState::ptr)(); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_JESTER_ROAM_TO; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].engineerManningSiegeStateRef_checkType + = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].cachedState + = OpenSHC::Map::Units::States::US_STATE_2Unk; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + if (DAT_GameState::instance.mapAndTime.traderRelated2 == 1) { + DAT_UnitsState::instance.units[unitID].destinationNeeded + = OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_NEEDED; + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_JESTER_ROAM_TO; + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + DAT_UnitsState::instance.units[unitID].engineerManningSiegeStateRef_checkType = -2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].cachedState + = OpenSHC::Map::Units::States::US_STATE_3Unk; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::resetUnitMovementState, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_3Unk) { + if (DAT_UnitsState::instance.units[unitID].destinationNeeded + != OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_GameState::instance.mapAndTime.signpostsMapEdge[0][0].x, + DAT_GameState::instance.mapAndTime.signpostsMapEdge[0][0].y, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].destinationNeeded + = OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed + = DAT_TroopValueState::instance.attackInfo.aiTroops > 1; + // through a pointer, so these two stores come after the stateBasedSpeed store as in the original + Unit* const unit = &DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance]; + unit->gfxNumber = 1; + unit->field_0x30_animRelated = 16; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::clearHiddenFlagAndUpdatePosition, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + } + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::clearHiddenFlagAndUpdatePosition, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_DISAPPEAR; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + return; + } + if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown++; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) { + DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_JESTER_ROAM_TO) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown + += DAT_UnitsState::instance.units[unitID].engineerManningSiegeStateRef_checkType; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown < 0) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 0; + } else if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown >= 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 31; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 16) { + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].cachedState; + if ((char)DAT_UnitsState::instance.units[unitID].engineerManningSiegeStateRef_checkType > 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + } + MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::updateBuildingSignpostCounter, + DAT_BuildingsState::ptr)(DAT_UnitsState::instance.units[unitID].workplaceBuildingID_1, 2); + } + return; + } + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::makeUnitStopWalkingByClearingPathProgressState, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance); + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 139a0fb19d..6f7c8b81b8 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -60337,7 +60337,7 @@ SHC_3BB0A8C1_0x00540440 | 0.0% | Pending SHC_3BB0A8C1_0x00540EC0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x005416B0 | 0.0% | Pending +SHC_3BB0A8C1_0x005416B0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00541A30 | 0.0% | Pending From 558163d18060ba40ae84a5144c9ff22aa6430883 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 14 Nov 2026 04:37:31 +0100 Subject: [PATCH 6/6] reimplement: SHC_3BB0A8C1_0x004BC790 100.0% Reimplemented UI::Rendering::RenderAnimatedTutorialFloatOverlay, from 0287fe51b on reimpl/batch1-development, in the form TheRedDaemon worked out in his review: x and y step down by 8 and 32 before the per-resolution offset, and by 28 and 69 after the draw buffer is saved, and the offset comes from a chain of plain ifs. The original pushes the trailing 0 before it computes the other arguments, and this form gives that order; one subtraction of 36 and 101 loses the match (quick_diff 0.8035 in the first place, 0.6356 in the second), so the two steps stay, with a comment. The 1680x1050 offset is the original's 4050, where every other offset is the screen height - 600; a fixme says so. The function is Gynt's: 5236e9845 (60.79%) and 63cc49fb3 on his fork's reimpl/UI-Rendering-development, and e8e27aad0 (60.8%) on reimpl/UI-Rendering (his #255); ce6bd1e86 took it to 67.2% on reimpl/batch1-development. Co-authored-by: TheRedDaemon <66257843+TheRedDaemon@users.noreply.github.com> Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- .../RenderAnimatedTutorialFloatOverlay.cpp | 98 +++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/Rendering/RenderAnimatedTutorialFloatOverlay.cpp diff --git a/src/OpenSHC/UI/Rendering/RenderAnimatedTutorialFloatOverlay.cpp b/src/OpenSHC/UI/Rendering/RenderAnimatedTutorialFloatOverlay.cpp new file mode 100644 index 0000000000..161d29cb16 --- /dev/null +++ b/src/OpenSHC/UI/Rendering/RenderAnimatedTutorialFloatOverlay.cpp @@ -0,0 +1,98 @@ +#include "../Rendering.func.hpp" + +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/IO/Graphics/GmID.hpp" +#include "OpenSHC/Rendering/Enums/RenderTarget.hpp" +#include "OpenSHC/Rendering/ScreenResolutionEnum.hpp" + +#include "OpenSHC/Globals/DAT_00df5540.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_ViewportRenderState.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" +#include "OpenSHC/Globals/INT_00df563c.hpp" +#include "OpenSHC/Globals/INT_00df5640.hpp" + +namespace OpenSHC { +namespace UI { + + // Draws the animated GID_FLOATS_NEW frames to the screen menu and, with the camera offset, to the map. + // FUNCTION: STRONGHOLDCRUSADER 0x004BC790 + void Rendering::RenderAnimatedTutorialFloatOverlay(int x, int y) + { + if (DAT_00df5540::instance != 0) { + return; + } + if (!(INT_00df5640::instance & 1)) { + INT_00df5640::instance |= 1; + INT_00df563c::instance = timeGetTime(); + } + DWORD const now = timeGetTime(); + int frame = (now - INT_00df563c::instance) / 60; + if (frame >= 10) { + frame = 0; + INT_00df563c::instance = now; + } + // two steps: one subtraction loses the match + x -= 8; + y -= 32; + int resolutionYOffset = 0; + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { + resolutionYOffset = 168; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { + resolutionYOffset = 424; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { + resolutionYOffset = 600; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { + resolutionYOffset = 120; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { + resolutionYOffset = 300; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { + resolutionYOffset = 480; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { + resolutionYOffset = 600; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { + resolutionYOffset = 840; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { + resolutionYOffset = 1000; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { + resolutionYOffset = 168; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { + resolutionYOffset = 168; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { + // fixme: every other offset is the screen height - 600 (450 here); the original has 4050 + resolutionYOffset = 4050; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { + resolutionYOffset = 300; + } + RenderTargetInt const previousDrawBuffer = DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue; + x -= 28; + y -= 69; + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGMWithAlphaMask, + DAT_TextureRenderCoreObject::ptr)(OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 261, + DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth + x, y + resolutionYOffset, + OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 271, 0); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGMWithAlphaMask, + DAT_TextureRenderCoreObject::ptr)(OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 261, + DAT_ViewportRenderState::instance.viewportState.currentCameraOffsetX + + DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth + x, + DAT_ViewportRenderState::instance.viewportState.currentCameraOffsetY + resolutionYOffset + y, + OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 271, 0); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = previousDrawBuffer; + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 6f7c8b81b8..532f51d132 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -30097,7 +30097,7 @@ SHC_3BB0A8C1_0x004BC6F0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004BC770 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004BC790 | 0.0% | Pending +SHC_3BB0A8C1_0x004BC790 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004BC910 | 100.0% | Reimplemented