From 3fc4a3b059b8bea590005f4cf30debed8fa35851 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Tue, 10 Nov 2026 21:31:06 +0100 Subject: [PATCH 1/8] cmake: /GL for five Map::Units update functions and their UnitsState callees UpdateBurningMan, UpdateMiner, UpdateQuarryMason, UpdateDrunkard and UpdateInnkeeper only match with link-time code generation. The original keeps values in registers across the calls it could see into: a constant or the unit's state in edx across checkIfCitizenUnitIsAliveBasedOnState (which leaves edx alone) in the first four, and the unit index in esi/edi across hasUnitReachedDestination, checkIfCitizenUnitIsAliveBasedOnState and getBuildingResourceAmountByUid in UpdateInnkeeper. After the calls it could not see into, it reads DAT_CurrentUnitSlotID again. The six UnitsState functions added here are 100% on main with their function resolvers on, and each stays at 100% under /GL (full build of this branch alone). Who needs them: - checkIfCitizenUnitIsAliveBasedOnState and makeUnitStopWalkingByClearingPathProgressState: all five; - hasTunnelerNotFinishedDigging: UpdateBurningMan (its last 0.8 points) and UpdateDrunkard; - hasUnitReachedDestination and commitUnitLocation: UpdateMiner, UpdateQuarryMason and UpdateInnkeeper; - resumeMovementIfNoAttackTarget: UpdateQuarryMason and UpdateDrunkard. UpdateInnkeeper's four BuildingsState callees are on main's list already and stay at 100% too: buildingIsAccessible, getStorageBuildingForResourceTypeAndAmount, getBuildingResourceAmountByUid and addResourceToStockpile. Three callees that are 100% on main stay off the list. setLastEncounteredTroopUnit (UpdateMiner, UpdateQuarryMason) makes no calls, so under /GL the caller would know it leaves DAT_CurrentUnitSlotID alone and skip the re-read the original does (with it in UpdateQuarryMason's translation unit: quick_diff 1.0000 -> 0.9901; UpdateMiner returns right after the call and stays 1.0000). setWorkplaceBuildingEntryAsTarget and resetUnitMovementState (UpdateInnkeeper) would gain nothing: they call on into functions that are not under /GL (buildingIsAccessible's callees calculateCanPlayerUnitsNavigateToAreaFromArea and determineBuildingEntranceFromKeepArea, which are not reimplemented yet, and commitPendingUnitPosition), so UpdateInnkeeper reads the slot again after them either way, and with both in its translation unit its code is identical (quick_diff 1.0000). setDestinationForUnit, computeLadderClimbPath and changeDestinationByAmount are not reimplemented yet. quick_diff here is the variant that compares absolute global addresses, run with the callees' .cpp files #included at the top of the caller; that emulates /GL for these functions to the instruction. On reimpl/map-units-updatefunctions, gynt's status lines for these five read "LTCG regs across calls" (UpdateInnkeeper: "LTCG_regs"), which is where this started. Co-Authored-By: Claude Opus 5.5 --- cmake/compiler-flags-gl.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmake/compiler-flags-gl.txt b/cmake/compiler-flags-gl.txt index 650a761a7a..c913c5d910 100644 --- a/cmake/compiler-flags-gl.txt +++ b/cmake/compiler-flags-gl.txt @@ -127,3 +127,14 @@ src/OpenSHC/UI/HoveredState/clearHoveredState.cpp src/OpenSHC/UI/HoveredState/Constructor_HoveredState.cpp src/OpenSHC/UI/Rendering/RenderCurrentButtonOnScreenMenu.cpp src/OpenSHC/UI/Rendering/RenderCurrentButtonToScreenMenuWithBlendingUnk.cpp +src/OpenSHC/Map/Units/UnitsState/checkIfCitizenUnitIsAliveBasedOnState.cpp +src/OpenSHC/Map/Units/UnitsState/hasTunnelerNotFinishedDigging.cpp +src/OpenSHC/Map/Units/UnitsState/hasUnitReachedDestination.cpp +src/OpenSHC/Map/Units/UnitsState/commitUnitLocation.cpp +src/OpenSHC/Map/Units/UnitsState/makeUnitStopWalkingByClearingPathProgressState.cpp +src/OpenSHC/Map/Units/UnitsState/resumeMovementIfNoAttackTarget.cpp +src/OpenSHC/Map/Units/UpdateBurningMan.cpp +src/OpenSHC/Map/Units/UpdateMiner.cpp +src/OpenSHC/Map/Units/UpdateQuarryMason.cpp +src/OpenSHC/Map/Units/UpdateDrunkard.cpp +src/OpenSHC/Map/Units/UpdateInnkeeper.cpp From 693de5a4cb21a3aa1958ad1f0d28f5255da271ca Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Tue, 10 Nov 2026 21:26:41 +0100 Subject: [PATCH 2/8] header: UnitState gets US_UNKNOWN_108 and US_UNKNOWN_120 Units::UpdateBurningMan (0x0053BC20) puts a unit into state 120 (mov word ptr [ecx + 0x138880C], 0x78 at 0x0053BC9D: the units array at 0x0138854C plus state at 0x2C0) and tests for it (cmp bp, 0x78 at 0x0053BCEA). Units::UpdateMiner (0x005401D0), Units::UpdateQuarryMason (0x00550A50) and Units::UpdateInnkeeper (0x00540EC0) test for state 108 (cmp ax, 0x6c at 0x005402E3, cmp dx, 0x6c at 0x00550B66, cmp ax, 0x6c at 0x00541523). The enum goes from US_MELEE_ATTACK_WALL (107) to US_JESTER_ROAM_TO (109) and from US_STONE_DEATH_03 (116) to US_UNKNOWN_121 (121); the two are named in the US_UNKNOWN_ form. Used in place of (UnitState)108 and (UnitState)120; code generation is the same. Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/States/UnitState.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/OpenSHC/Map/Units/States/UnitState.hpp b/src/OpenSHC/Map/Units/States/UnitState.hpp index 562b39d3c7..143186db34 100644 --- a/src/OpenSHC/Map/Units/States/UnitState.hpp +++ b/src/OpenSHC/Map/Units/States/UnitState.hpp @@ -29,6 +29,7 @@ namespace Map { US_MOVE_TO_DESTINATION = 101, // 0x00000065 US_MELEE_ATTACK = 106, // 0x0000006A US_MELEE_ATTACK_WALL = 107, // 0x0000006B + US_UNKNOWN_108 = 108, // 0x0000006C US_JESTER_ROAM_TO = 109, // 0x0000006D US_DISAPPEAR = 110, // 0x0000006E US_DEATH_01 = 111, // 0x0000006F @@ -37,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_120 = 120, // 0x00000078 US_UNKNOWN_121 = 121, // 0x00000079 US_APPEAR = 122, // 0x0000007A US_DIG = 125, // 0x0000007D From 28bf5d0b301d738843172e0c0e23a581f517a1d6 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Tue, 10 Nov 2026 21:26:45 +0100 Subject: [PATCH 3/8] reimplement: SHC_3BB0A8C1_0x0053BC20 100.0% Reimplemented UpdateBurningMan. Builds on gynt's bd4d1d5af ("66.14% LTCG regs across calls") as our fork's copy of his branch has it, with main merged in and main's header renames followed (43a17dfac, names only), where his draft measures 76.5% in reccmp (normalized 74.5%) in a full build with the Globals and the function resolvers on (2026-11-10). This version is 100.0% (normalized 100.0%) in a full build of this branch alone, with /GL on it and on its callees hasTunnelerNotFinishedDigging, checkIfCitizenUnitIsAliveBasedOnState and makeUnitStopWalkingByClearingPathProgressState (first commit), which all stay at 100%. The stores before the state read, the state-0 block, the unit-is-alive block and the three stores after hasTunnelerNotFinishedDigging index the units through DAT_CurrentUnitSlotID. That keeps them in the original's order and leaves edx for the constant 1 the original keeps across checkIfCitizenUnitIsAliveBasedOnState (everything through unitID: quick_diff 1.0000 -> 0.7154, in one comment above unitID). State 120 is US_UNKNOWN_120 (header commit), and computeLadderClimbPath's BOOLEnum is tested for truth. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateBurningMan.cpp | 102 +++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateBurningMan.cpp diff --git a/src/OpenSHC/Map/Units/UpdateBurningMan.cpp b/src/OpenSHC/Map/Units/UpdateBurningMan.cpp new file mode 100644 index 0000000000..4cbc36d725 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateBurningMan.cpp @@ -0,0 +1,102 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Map/Units/States/UnitState.hpp" +#include "OpenSHC/Map/Units/UnitLogicState.hpp" + +#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.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 0x0053BC20 + void Units::UpdateBurningMan() + { + // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its + // registers (all through unitID: quick_diff 1.0000 -> 0.7154) + int const unitID = DAT_CurrentUnitSlotID::instance; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].dying = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].isSelected = 0; + UnitStateShort const state = DAT_UnitsState::instance.units[unitID].state.generic; + if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirectionMapOrientationCorrected + + 1; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::computeLadderClimbPath, DAT_UnitsState::ptr)( + unitID, 0, 0, 0)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_120; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::changeDestinationByAmount, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, 4); + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STONE_DEATH_03; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::makeUnitStopWalkingByClearingPathProgressState, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance); + return; + } + if (state == OpenSHC::Map::Units::States::US_UNKNOWN_120) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 2; + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + if (MACRO_CALL_MEMBER( + OpenSHC::Map::Units::UnitsState_Func::hasTunnelerNotFinishedDigging, DAT_UnitsState::ptr)(unitID)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STONE_DEATH_03; + } + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(unitID)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 3; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0xb2c + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance] + .facingDirectionMapOrientationCorrected + + 121 + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_DISAPPEAR; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown += 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker += 1; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) { + DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE; + } + 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)(unitID); + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 4edb3f2020..76a4a498ec 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -59659,7 +59659,7 @@ SHC_3BB0A8C1_0x0053BB70 | 100.0% | Reimplemented SHC_3BB0A8C1_0x0053BB90 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x0053BC20 | 0.0% | Pending +SHC_3BB0A8C1_0x0053BC20 | 100.0% | Reimplemented SHC_3BB0A8C1_0x0053BE00 | 0.0% | Pending From fa6d51802e9535dc48f75c5e829b4aed9488f873 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Tue, 10 Nov 2026 21:26:48 +0100 Subject: [PATCH 4/8] reimplement: SHC_3BB0A8C1_0x005401D0 100.0% Reimplemented UpdateMiner. Builds on gynt's 5e964372e ("51.78% LTCG regs across calls") as our fork's copy of his branch has it, with main merged in and main's header renames followed (43a17dfac, names only), where his draft measures 58.9% in reccmp (normalized 58.9%) in a full build with the Globals and the function resolvers on (2026-11-10). This version is 100.0% (normalized 100.0%) in a full build of this branch alone, with /GL on it and on its callees checkIfCitizenUnitIsAliveBasedOnState, hasUnitReachedDestination, commitUnitLocation and makeUnitStopWalkingByClearingPathProgressState (first commit), which all stay at 100%. Ten unit accesses go through DAT_CurrentUnitSlotID, which keeps the original's load and store order and its registers (everything through unitID: quick_diff 1.0000 -> 0.9013), and the death, unit-is-alive and default blocks form one else-if chain, so the shared tail sits in the second arm as in the original (early returns: quick_diff 1.0000 -> 0.9385). The worker slot takes unitID without a (short) cast, and state 108 is US_UNKNOWN_108 (header commit). Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateMiner.cpp | 139 ++++++++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateMiner.cpp diff --git a/src/OpenSHC/Map/Units/UpdateMiner.cpp b/src/OpenSHC/Map/Units/UpdateMiner.cpp new file mode 100644 index 0000000000..40a4135a78 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateMiner.cpp @@ -0,0 +1,139 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Game/GameStateStructures.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Game/GameMode.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_GameSynchronyState.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 0x005401D0 + void Units::UpdateMiner() + { + // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its + // registers (all through unitID: quick_diff 1.0000 -> 0.9013) + int const unitID = DAT_CurrentUnitSlotID::instance; + int const workplace = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1; + if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 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].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_UnitsState::instance.units[unitID].isDisappearingUnk != 0) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown -= 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown < 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[unitID].isDisappearingUnk = 0; + } + return; + } + if (DAT_UnitsState::instance.units[unitID].goToRallyPoint != 0) { + DAT_UnitsState::instance.units[unitID].goToRallyPoint = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX_2, + DAT_UnitsState::instance.units[unitID].targetY_2, 0); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + DAT_BuildingsState::instance.buildings[workplace] + .workers[DAT_UnitsState::instance.units[unitID].workerIndex] = unitID; + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + unitID); + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_IDLEUnk; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_UNKNOWN_108) { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + return; + } + if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown += 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker += 1; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + if (DAT_UnitsState::instance.units[unitID].killedFlagUnk == 0) { + MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::setLastEncounteredTroopUnit, + DAT_GameState::ptr)(DAT_UnitsState::instance.units[unitID].owner, unitID); + } + } + return; + } + // An else-if chain keeps the shared tail in the second arm (early returns: quick_diff 1.0000 -> 0.9385) + if (state == 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[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .ANIM_Frames_UnitDeath[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 280; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 256; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_DISAPPEAR; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } + } else if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(unitID)) { + 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 + .ANIM_Frames_UnitDeath[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 304; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 280; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } + } else { + 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)(unitID); + } + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 76a4a498ec..fe215d2673 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -60331,7 +60331,7 @@ SHC_3BB0A8C1_0x005401C9 | 0.0% | Pending SHC_3BB0A8C1_0x005401CA | 0.0% | Pending -SHC_3BB0A8C1_0x005401D0 | 0.0% | Pending +SHC_3BB0A8C1_0x005401D0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00540440 | 0.0% | Pending From b8bb7b936a81d4a2a6b483d0223845810cd5e6b1 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Tue, 10 Nov 2026 21:26:51 +0100 Subject: [PATCH 5/8] reimplement: SHC_3BB0A8C1_0x00550A50 100.0% Reimplemented UpdateQuarryMason. Builds on gynt's ec8456174 ("45.27% LTCG regs across calls") as our fork's copy of his branch has it, with main merged in and main's header renames followed (43a17dfac, names only), where his draft measures 62.2% in reccmp (normalized 62.2%) in a full build with the Globals and the function resolvers on (2026-11-10). This version is 100.0% (normalized 100.0%) in a full build of this branch alone, with /GL on it and on its callees checkIfCitizenUnitIsAliveBasedOnState, hasUnitReachedDestination, commitUnitLocation, makeUnitStopWalkingByClearingPathProgressState and resumeMovementIfNoAttackTarget (first commit), which all stay at 100%. Twelve unit accesses go through DAT_CurrentUnitSlotID, which keeps the original's load and store order and its registers (everything through unitID: quick_diff 1.0000 -> 0.9059). One of them is the workplace read at the end of the disappear block, where the original reads the slot again after setLastEncounteredTroopUnit (the workplace local there: quick_diff 1.0000 -> 0.8536). The blocks from the death state on form one else-if chain (early returns: quick_diff 1.0000 -> 0.9507). The worker slot takes unitID without a (short) cast, and state 108 is US_UNKNOWN_108 (header commit). Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateQuarryMason.cpp | 160 ++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateQuarryMason.cpp diff --git a/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp b/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp new file mode 100644 index 0000000000..40c723b931 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp @@ -0,0 +1,160 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Game/GameStateStructures.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Game/GameMode.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_GameSynchronyState.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 0x00550A50 + void Units::UpdateQuarryMason() + { + // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its + // registers (all through unitID: quick_diff 1.0000 -> 0.9059) + int const unitID = DAT_CurrentUnitSlotID::instance; + int const workplace = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1; + if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 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].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_UnitsState::instance.units[unitID].isDisappearingUnk != 0) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown -= 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown < 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[unitID].isDisappearingUnk = 0; + } + return; + } + if (DAT_UnitsState::instance.units[unitID].goToRallyPoint != 0) { + DAT_UnitsState::instance.units[unitID].goToRallyPoint = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX_2, + DAT_UnitsState::instance.units[unitID].targetY_2, 0); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_IDLEUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + unitID); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_BuildingsState::instance.buildings[workplace] + .workers[DAT_UnitsState::instance.units[unitID].workerIndex] = unitID; + return; + } + if (state == OpenSHC::Map::Units::States::US_UNKNOWN_108) { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + return; + } + if (state == OpenSHC::Map::Units::States::US_MELEE_ATTACK) { + DAT_UnitsState::instance.units[unitID].animationSpeed = 3; + 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_0x41bc[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 + 305; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 297 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + MACRO_CALL_MEMBER( + OpenSHC::Map::Units::UnitsState_Func::resumeMovementIfNoAttackTarget, DAT_UnitsState::ptr)(unitID); + } + return; + } + // An else-if chain keeps the shared tail in the second arm (early returns: quick_diff 1.0000 -> 0.9507) + if (state == OpenSHC::Map::Units::States::US_DEATH_01) { + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 3; + 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_0x4ab0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 280; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 256; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + } else if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(unitID)) { + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 3; + 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_0x4ab0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 304; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 280; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + } else if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown += 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker += 1; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + if (DAT_UnitsState::instance.units[unitID].killedFlagUnk == 0) { + MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::setLastEncounteredTroopUnit, + DAT_GameState::ptr)(DAT_UnitsState::instance.units[unitID].owner, unitID); + } + } + // The slot is read again here, as the original does (the workplace local: quick_diff 1.0000 -> 0.8536) + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .idleTimerUnk = 4000; + } else { + 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)(unitID); + } + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index fe215d2673..7d9406bb18 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -62521,7 +62521,7 @@ SHC_3BB0A8C1_0x0054E6C0 | 0.0% | Pending SHC_3BB0A8C1_0x0054F860 | 0.0% | Pending -SHC_3BB0A8C1_0x00550A50 | 0.0% | Pending +SHC_3BB0A8C1_0x00550A50 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00550D70 | 0.0% | Pending From 0adeb0623aeba9a4c5c4886c5c19a6a9fdeab12e Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Tue, 10 Nov 2026 21:26:56 +0100 Subject: [PATCH 6/8] reimplement: SHC_3BB0A8C1_0x00567320 100.0% Reimplemented UpdateDrunkard. Builds on gynt's 171a6918f ("48.31% LTCG regs across calls") as our fork's copy of his branch has it, with main merged in and main's header renames followed (43a17dfac, names only), where his draft measures 53.5% in reccmp (normalized 53.5%) in a full build with the Globals and the function resolvers on (2026-11-10). This version is 100.0% (normalized 100.0%) in a full build of this branch alone, with /GL on it and on its callees checkIfCitizenUnitIsAliveBasedOnState, hasTunnelerNotFinishedDigging, makeUnitStopWalkingByClearingPathProgressState and resumeMovementIfNoAttackTarget (first commit), which all stay at 100%. Fifteen unit accesses go through DAT_CurrentUnitSlotID, which keeps the original's load and store order and its registers (everything through unitID: quick_diff 1.0000 -> 0.6877), and the next state comes from an if that tests resourceToDeposit >= 6, which gives the original's setl (< 6 with the arms swapped: quick_diff 1.0000 -> 0.9848). computeLadderClimbPath's BOOLEnum is tested for truth. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateDrunkard.cpp | 164 +++++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateDrunkard.cpp diff --git a/src/OpenSHC/Map/Units/UpdateDrunkard.cpp b/src/OpenSHC/Map/Units/UpdateDrunkard.cpp new file mode 100644 index 0000000000..cb3a436fc7 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateDrunkard.cpp @@ -0,0 +1,164 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Map/Units/Pathfinding/DestinationNeededEnum.hpp" +#include "OpenSHC/Map/Units/States/UnitState.hpp" +#include "OpenSHC/Map/Units/UnitLogicState.hpp" +#include "OpenSHC/Map/Units/UnitType.hpp" + +#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp" +#include "OpenSHC/Globals/DAT_GameState.hpp" +#include "OpenSHC/Globals/DAT_UnitHasBecomeIdle.hpp" +#include "OpenSHC/Globals/DAT_UnitPropertiesDefinedData.hpp" +#include "OpenSHC/Globals/DAT_UnitsState.hpp" +#include "OpenSHC/Globals/SEC_RNG.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x00567320 + void Units::UpdateDrunkard() + { + // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its + // registers (all through unitID: quick_diff 1.0000 -> 0.6877) + int const unitID = DAT_CurrentUnitSlotID::instance; + DAT_GameState::instance.playerDataArray[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner] + .field_0x2174 += 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 0; + if (DAT_UnitsState::instance.units[unitID].field_0x3f4 > 1) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + UnitStateShort const state = DAT_UnitsState::instance.units[unitID].state.generic; + if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) { + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_UnitsState::instance.units[unitID].destinationNeeded + != OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET) { + if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::computeLadderClimbPath, + DAT_UnitsState::ptr)(unitID, 0, 0, 0)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_DISAPPEAR; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].destinationNeeded + = OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed + = (SEC_RNG::instance.currentNumber2 & 3) + 6; + return; + } + if (MACRO_CALL_MEMBER( + OpenSHC::Map::Units::UnitsState_Func::hasTunnelerNotFinishedDigging, DAT_UnitsState::ptr)(unitID)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_3Unk; + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_3Unk) { + DAT_UnitsState::instance.units[unitID].animationSpeed = 4; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x634c[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].animationFrame + 256; + } + } 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_0x63a0[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_0x63d4[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 + 121 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].substate += 1; + if (DAT_UnitsState::instance.units[unitID].substate > 2) { + DAT_UnitsState::instance.units[unitID].substate = 0; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].destinationNeeded + = OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_NEEDED; + DAT_UnitsState::instance.units[unitID].resourceToDeposit += 1; + // >= 6 gives the original's setl (< 6 with the arms swapped: quick_diff 1.0000 -> 0.9848) + if (DAT_UnitsState::instance.units[unitID].resourceToDeposit >= 6) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } else { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_IDLEUnk; + } + } + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_TRANSITIONING; + DAT_UnitsState::instance.units[unitID].unitTypeToChangeInto = OpenSHC::Map::Units::UT_PEASANT; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state_2 = 0; + DAT_UnitsState::instance.units[unitID].buildingID = 0; + return; + } + if (state == OpenSHC::Map::Units::States::US_MELEE_ATTACK) { + DAT_UnitsState::instance.units[unitID].animationSpeed = 3; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .drunkard[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 + 1; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 7 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + MACRO_CALL_MEMBER( + OpenSHC::Map::Units::UnitsState_Func::resumeMovementIfNoAttackTarget, DAT_UnitsState::ptr)(unitID); + } + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(unitID)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_DISAPPEAR; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + return; + } + if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown += 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[unitID].updateTickTracker += 1; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) { + DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE; + } + 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)(unitID); + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 7d9406bb18..807f61aa85 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -65159,7 +65159,7 @@ SHC_3BB0A8C1_0x00566010 | 0.0% | Pending SHC_3BB0A8C1_0x00566750 | 0.0% | Pending -SHC_3BB0A8C1_0x00567320 | 0.0% | Pending +SHC_3BB0A8C1_0x00567320 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00567640 | 0.0% | Pending From c3d2da90628404804dcf55c5acb81ce2c0a5629d Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Tue, 10 Nov 2026 21:27:20 +0100 Subject: [PATCH 7/8] reimplement: SHC_3BB0A8C1_0x00540EC0 100.0% Reimplemented UpdateInnkeeper. Builds on gynt's 6b8b0c281 ("50.68% LTCG_regs") as our fork's copy of his branch has it, with main merged in and main's header renames followed (43a17dfac, names only), where his draft measures 63.4% in reccmp (normalized 58.5%) in a full build with the Globals and the function resolvers on (2026-11-10). This version is 100.0% (normalized 100.0%) in a full build of this branch alone, with /GL on it and on its callees checkIfCitizenUnitIsAliveBasedOnState, hasUnitReachedDestination, commitUnitLocation and makeUnitStopWalkingByClearingPathProgressState (first commit) and buildingIsAccessible, getStorageBuildingForResourceTypeAndAmount, getBuildingResourceAmountByUid and addResourceToStockpile (on main's list), which all stay at 100%. His draft had the ale-level tests one step off: < 150 and > 400 where the original has jg and jge, that is <= 150 and >= 400. Every unit access goes through DAT_CurrentUnitSlotID, which the original reads again after each call it cannot see into (a unitID local: quick_diff 1.0000 -> 0.6159), and the substate wraps at >= 4. Three tests that the draft wrote as early returns keep the success path in the then-arm and the failure after the if, which is where the original puts the failure blocks (it jumps forward to them): - state 2, ale fetched: when setWorkplaceBuildingEntryAsTarget fails, the unit is removed after the then-arm (an early return: quick_diff 1.0000 -> 0.9723); - state 3, ale delivered: the < 400 then-arm comes first, and the full inn's commitUnitLocation after it (0.9822); - inside that arm, the accessible-storage path comes first, and the other commitUnitLocation after it (0.9881). The other failures return early, as in the draft: the unreached destination in states 2 and 3, the storage that is not accessible after the serving animation and in state US_AIM_WEAPONUnk, and the full inn there. setWorkplaceBuildingEntryAsTarget's BOOLEnum is tested for truth, the target slot takes storage without a (short) cast, states 2 and 3 are US_STATE_2Unk and US_STATE_3Unk, and state 108 is US_UNKNOWN_108 (header commit). Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateInnkeeper.cpp | 389 ++++++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 390 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Map/Units/UpdateInnkeeper.cpp diff --git a/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp b/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp new file mode 100644 index 0000000000..48b505c093 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp @@ -0,0 +1,389 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Map/Buildings/BuildingsState.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Game/Resources/ResourceType.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_UnitHasBecomeIdle.hpp" +#include "OpenSHC/Globals/DAT_UnitPropertiesDefinedData.hpp" +#include "OpenSHC/Globals/DAT_UnitsState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x00540EC0 + void Units::UpdateInnkeeper() + { + // Every access is indexed through DAT_CurrentUnitSlotID, as the original re-reads the slot after each call + // it can't see into (all through a unitID local: quick_diff 1.0000 -> 0.6159) + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 3; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed = 3; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + UnitStateShort const state = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic; + if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].isDisappearingUnk != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown -= 1; + if ((char)DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown + < 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].isDisappearingUnk = 0; + } + return; + } + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].goToRallyPoint != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].goToRallyPoint = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_RELOAD_WEAPONUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetX_2, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetY_2, 0); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + // serving ale + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x5a70 + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 1) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x5aa4 + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 2) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x5b10 + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .DAT_InnKeeperAnimationIndices[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance] + .animationCycleNumber]; + } + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 257; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 256; + } + if (DAT_UnitHasBecomeIdle::instance == 0) { + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate += 1; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate >= 4) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + } + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + == 0) { + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + // fetching ale from the stockpile + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + <= 200) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed = 1; + } + if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) { + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::getBuildingResourceAmountByUid, + DAT_BuildingsState::ptr)( + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID, + OpenSHC::Game::Resources::RT_ALE) + <= 0) { + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID + = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0); + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setWorkplaceBuildingEntryAsTarget, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance, 1)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_RELOAD_WEAPONUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetX_2, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetY_2, 0); + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].resourceToDeposit = 1; + // The failure follows the then-arm, as in the original (an early return: quick_diff 1.0000 -> 0.9723) + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setWorkplaceBuildingEntryAsTarget, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance, 1)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_3Unk; + if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetX_2, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetY_2, 0)) { + 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; + } + MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::addResourceToStockpile, DAT_BuildingsState::ptr)( + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID, + OpenSHC::Game::Resources::RT_ALE, -1, 16, 1); + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_3Unk) { + // bringing the ale to the inn + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 129; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + <= 150) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 1; + } + if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) { + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_AIM_WEAPONUnk; + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs += 160; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].resourceToDeposit = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + // The full inn follows the then-arm, as in the original (an early return: quick_diff 1.0000 -> 0.9822) + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + < 400) { + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .field_0x28a = 300; + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + // The failure follows the then-arm, as in the original (an early return: quick_diff 1.0000 -> 0.9881) + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID + = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + return; + } + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + return; + } + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + return; + } + if (state == OpenSHC::Map::Units::States::US_RELOAD_WEAPONUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_IDLEUnk; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_AIM_WEAPONUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .field_0x28a = 300; + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + <= 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::resetUnitMovementState, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_IDLEUnk; + return; + } + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + >= 400) { + return; + } + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + == 0) { + return; + } + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::resetUnitMovementState, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + return; + } + if (state == OpenSHC::Map::Units::States::US_UNKNOWN_108) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + return; + } + if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown += 1; + if ((char)DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown + > 32) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker += 1; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker > 32) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_DEATH_01) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirection = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.ANIM_Frames_UnitDeath + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 312; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 288; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + 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_DEATH_03) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirection = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.ANIM_Frames_UnitDeath + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 360; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 336; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + 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 (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirection = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.ANIM_Frames_UnitDeath + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 336; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 312; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + 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; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_IDLEUnk; + 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 807f61aa85..9a39839496 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -60335,7 +60335,7 @@ SHC_3BB0A8C1_0x005401D0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00540440 | 0.0% | Pending -SHC_3BB0A8C1_0x00540EC0 | 0.0% | Pending +SHC_3BB0A8C1_0x00540EC0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x005416B0 | 0.0% | Pending From a57eb32ce53b4f360891aca218860b41e9db1afc Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Wed, 11 Nov 2026 12:28:47 +0100 Subject: [PATCH 8/8] style: drop the DAT_CurrentUnitSlotID comments in five Map::Units update functions gynt on #393: "These comments can go!" The top comment of UpdateBurningMan, UpdateMiner, UpdateQuarryMason, UpdateDrunkard and UpdateInnkeeper explained why their unit accesses index through DAT_CurrentUnitSlotID. Comments only; the code is unchanged. Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/Map/Units/UpdateBurningMan.cpp | 2 -- src/OpenSHC/Map/Units/UpdateDrunkard.cpp | 2 -- src/OpenSHC/Map/Units/UpdateInnkeeper.cpp | 2 -- src/OpenSHC/Map/Units/UpdateMiner.cpp | 2 -- src/OpenSHC/Map/Units/UpdateQuarryMason.cpp | 2 -- 5 files changed, 10 deletions(-) diff --git a/src/OpenSHC/Map/Units/UpdateBurningMan.cpp b/src/OpenSHC/Map/Units/UpdateBurningMan.cpp index 4cbc36d725..b78e2c48af 100644 --- a/src/OpenSHC/Map/Units/UpdateBurningMan.cpp +++ b/src/OpenSHC/Map/Units/UpdateBurningMan.cpp @@ -15,8 +15,6 @@ namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x0053BC20 void Units::UpdateBurningMan() { - // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its - // registers (all through unitID: quick_diff 1.0000 -> 0.7154) int const unitID = DAT_CurrentUnitSlotID::instance; DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner = 0; diff --git a/src/OpenSHC/Map/Units/UpdateDrunkard.cpp b/src/OpenSHC/Map/Units/UpdateDrunkard.cpp index cb3a436fc7..b12d041e8c 100644 --- a/src/OpenSHC/Map/Units/UpdateDrunkard.cpp +++ b/src/OpenSHC/Map/Units/UpdateDrunkard.cpp @@ -19,8 +19,6 @@ namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x00567320 void Units::UpdateDrunkard() { - // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its - // registers (all through unitID: quick_diff 1.0000 -> 0.6877) int const unitID = DAT_CurrentUnitSlotID::instance; DAT_GameState::instance.playerDataArray[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner] .field_0x2174 += 1; diff --git a/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp b/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp index 48b505c093..bb48047b93 100644 --- a/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp +++ b/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp @@ -18,8 +18,6 @@ namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x00540EC0 void Units::UpdateInnkeeper() { - // Every access is indexed through DAT_CurrentUnitSlotID, as the original re-reads the slot after each call - // it can't see into (all through a unitID local: quick_diff 1.0000 -> 0.6159) DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 3; DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed = 3; DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; diff --git a/src/OpenSHC/Map/Units/UpdateMiner.cpp b/src/OpenSHC/Map/Units/UpdateMiner.cpp index 40a4135a78..ad4bb43c0d 100644 --- a/src/OpenSHC/Map/Units/UpdateMiner.cpp +++ b/src/OpenSHC/Map/Units/UpdateMiner.cpp @@ -20,8 +20,6 @@ namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x005401D0 void Units::UpdateMiner() { - // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its - // registers (all through unitID: quick_diff 1.0000 -> 0.9013) int const unitID = DAT_CurrentUnitSlotID::instance; int const workplace = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1; if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY) { diff --git a/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp b/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp index 40c723b931..401eee822b 100644 --- a/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp +++ b/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp @@ -20,8 +20,6 @@ namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x00550A50 void Units::UpdateQuarryMason() { - // The accesses indexed through DAT_CurrentUnitSlotID keep the original's load and store order and its - // registers (all through unitID: quick_diff 1.0000 -> 0.9059) int const unitID = DAT_CurrentUnitSlotID::instance; int const workplace = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1; if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY) {