Skip to content

BDSP: consume pinned Simulation map resources and pickup identities - #249

Merged
dayfine merged 14 commits into
bdsp/maps-v4from
bdsp/map-resource-adoption
Nov 8, 2026
Merged

dayfine merged 14 commits into
bdsp/maps-v4from
bdsp/map-resource-adoption

Conversation

@dayfine

@dayfine dayfine commented Nov 7, 2026 •

Copy link
Copy Markdown
Owner

Base: bdsp/maps-v4 (#134). Also merges nav-core #114's existing shared v2 reader as a prerequisite; no new decoder implementation is added here. This is the BDSP resource handoff corresponding to FRLG #238.

BDSP's 22 maps now match Simulation's reviewed baseline. Build the existing bdsp_map_json() API from pinned prepared Packages resources, remove the authored source-map copies, and retire the duplicate builder/Sinnoh parser and their copied Python tests. The decomp CLI forwards to Simulation; native tests remain in Arduino.

PokemonSimulation #65 is merged. Both data and validator tools now pin its approved squash 4de7742a764d27293b4525d6ad2a6fc8a95f3e3a; its manifest/license and all 22 map bytes match the reviewed candidate. Normal resource preparation passes. The shared #114 reader restores omitted pickup names from source_event, defaults quantity to one and retains explicit overrides. No controller or story-execution behavior changes.

Native full build/test CI at 3d3dd565f (current c5e7823a6 differs only in setup documentation): macOS, Windows Clang, Ubuntu GCC (all passed).

For a fresh manual setup, clone Packages before preparing its map subdirectory, then supply the pinned tools/cache paths to CMake. Existing builds need explicit resource preparation and those paths too.

How to review

Review by commit: first the dependency merge from #114, then the BDSP resource change. In the latter, read SerialPrograms/CMakeLists.txt, the resource lock and CI preparation, then devtools/maps/RESOURCE_MAPS.md. Most deleted lines are the 22 map copies and authoring code already owned by Simulation. The public native JSON API stays the same.

git diff --color-moved=dimmed-zebra --color-moved-ws=allow-indentation-change origin/bdsp/maps-v4...bdsp/map-resource-adoption

Validation: native schema and legacy CTest targets pass; production native decoders compare all 150 complete plain/enriched map records from the exact candidate; nine retained overlay tests pass; the forwarded decomp CLI works against the existing cache; code health passes against bdsp/maps-v4. Resource prepare accepts the approved publishing pin. Full native application builds/tests pass on macOS, Windows Clang and Ubuntu GCC; this does not claim live-console validation or BDSP verification of Diamond/Platinum item rewards/flags.

…ce-adoption

# Conflicts:
#	SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.cpp
Keep bdsp_map_json as the native API, using validated Packages resources instead of source JSON. Retire duplicate authoring and forward the decomp CLI to Simulation. Pin the enriched candidate from Simulation #65, with resource preparation intentionally blocked until that revision is approved on publishing main. Native schema/legacy tests and 150 complete candidate decoder comparisons pass; full app builds follow publication.
@dayfine
dayfine marked this pull request as ready for review November 8, 2026 00:16
@dayfine
dayfine merged commit d2b8956 into bdsp/maps-v4 Nov 8, 2026
18 checks passed
@dayfine
dayfine deleted the bdsp/map-resource-adoption branch November 8, 2026 00:17
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