Skip to content

Reimpl/PathFindingState development - #267

Draft
gynt wants to merge 521 commits into
mainfrom
reimpl/PathFindingState-development
Draft

gynt wants to merge 521 commits into
mainfrom
reimpl/PathFindingState-development

Conversation

@gynt

@gynt gynt commented Oct 14, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@gynt
gynt changed the base branch from main to reimpl/PathFindingState-100 October 14, 2026 21:43
gynt added 29 commits October 15, 2026 11:36
gynt and others added 30 commits October 23, 2026 11:07
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…8.5%

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…te-development

# Conflicts:
#	AGENTS.md
#	src/OpenSHC/Map/Navigation/PathFindingState/Constructor_PathFindingState.cpp
#	src/OpenSHC/Map/Navigation/PathFindingState/LinkageNeighbourAsm.hpp
#	src/OpenSHC/Map/Navigation/PathFindingState/clearActiveClimbDataOfType6And7.cpp
#	src/OpenSHC/Map/Navigation/PathFindingState/clearPathFindingTileMaps.cpp
#	src/OpenSHC/Map/Navigation/PathFindingState/computeAttackVectorsBasedOnXAndY.cpp
#	status/addresses-SHC-3BB0A8C1.txt
…ent main

47 commits behind main and uncompilable against its regenerated headers, so
this branch had never been measured. All 114 sources now build, link and
score, with none excluded.

Merge resolution, file by file rather than wholesale:
- AGENTS.md and the status ledger take main's side. The ledger's five
  conflicts are addresses this branch had reset to "0.0% Pending" where main
  records real progress.
- Constructor_PathFindingState, clearActiveClimbDataOfType6And7,
  clearPathFindingTileMaps and computeAttackVectorsBasedOnXAndY take main's
  side too: main's copies are the cleaned-up landed versions, using
  sizeof(layer) where this branch still had 0x27420 and 0x13a10 and carrying
  neither the decompiler comment blocks nor the trailing `return;`. None of
  the branch's recent commits touch these four, so nothing in-flight is lost.
- LinkageNeighbourAsm.hpp keeps the branch's side. Main renamed
  MACRO_LINKAGE_AREA_PUSHES to MACRO_LINKAGE_EXPAND_AREA_NEIGHBOURS, folded the
  edx/edi/ebx loads into it and deleted MACRO_LINKAGE_AREA_LOOP; nothing on
  main uses the result, because main has no copy of
  updateSeparateAreaTileMap.cpp, this branch's only consumer. Main's version is
  a refactor with no caller, the branch's is self-consistent with the file that
  needs it, and this is a hand-written asm helper rather than a generated
  header.

Source fixes:
- somePairArray was a single XYPair at MapAndTimeState +0x520 and is now
  XYPair[40] at the same offset, so the old scalar is element 0.
- MC_MAP_TILES_COUNT still lives in Map/MapConstants.hpp but no longer arrives
  transitively, so two files include it directly.
- Two stale generated field references rewritten by the project's
  refactor_struct_fields.py.

Derived against the branch tip as of 4b09f0c, after its 24 style-pass commits,
rather than pasted over them.

First measurement, reimplemented data and all 114 resolvers enabled: BUILD_OK,
avg 73.46 over 114, 98 functions below 100. No match work is attempted here -
none was possible until it built.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Fzi11pcBU1Y7Y4oanrZQL

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant