Skip to content

fix: place select_world_object_resource_tables data after its promotion - #178

Merged
mateuszklysz merged 1 commit into
mainfrom
fix/select-world-data-overlay
Oct 14, 2026
Merged

mateuszklysz merged 1 commit into
mainfrom
fix/select-world-data-overlay

Conversation

@mateuszklysz

@mateuszklysz mateuszklysz commented Oct 14, 2026 •

Copy link
Copy Markdown
Collaborator

Before

textbin/world/data/select_world_object_resource_tables moved out of assembly/ (#177), but its DATA_OVERLAYS key in configure.py kept the old assembly/... path. Keys are matched with endswith, so the unit's .data (0x480 B, class_material_maps) landed in the linker's discarded sections and the retail blob supplied those bytes. make elf still passed, so nothing flagged it.

After

  • The key now reads textbin/world/data/select_world_object_resource_tables, so the section is placed at 0x1CBBE0 again (checked in the link map).
  • Duplicate #include lines left over from the old #else body are removed.

Verification

  • make elf ends with PASS: reconstructed boot ELF matches retail
  • make overlays ends with PASS (overlay changes): n/a, no overlay changes
  • make check passes

The unit moved out of assembly/, but its DATA_OVERLAYS key kept the old
path, so its .data (class_material_maps, 0x480 B) was discarded at link
time and the retail blob supplied those bytes. Rename the key so the
section is placed at 0x1CBBE0 again, and drop the duplicate includes left
from the old #else body.
@mateuszklysz mateuszklysz added the bug Something isn't working label Oct 14, 2026 — with Claude
@mateuszklysz mateuszklysz self-assigned this Oct 14, 2026
@decomp-dev

decomp-dev Bot commented Oct 14, 2026

Copy link
Copy Markdown

Report for SCUS_971.99 (ce39091 - 4fad4f7)

No changes

@github-actions

Copy link
Copy Markdown

Decompilation progress

C_EXACT Change Matched bytes Functions C_FUZZY
All code 87.79 % — 3,113,144 / 3,546,268 B (—) 3,967 / 4,233 (—) 89.03 %
Boot executable 85.65 % — 302,216 / 352,840 B (—) 1,163 / 1,219 (—) 98.13 %
Game 84.51 % — 230,576 / 272,844 B (—) 866 / 905 (—) 98.40 %
SDK 89.55 % — 71,640 / 79,996 B (—) 297 / 314 (—) 97.21 %
Level overlays 88.02 % — 2,810,928 / 3,193,428 B (—) 2,804 / 3,014 (—) 88.02 %
Shared level code 79.95 % — 903,868 / 1,130,492 B (—) 1,438 / 1,583 (—) 79.95 %
Per-level code 92.44 % — 1,907,060 / 2,062,936 B (—) 1,366 / 1,431 (—) 92.44 %

No function changed its match state compared with main (ce39091).

Compared with main (ce39091). C_FUZZY uses main's last measurement.

@mateuszklysz
mateuszklysz merged commit 5fe15c8 into main Oct 14, 2026
3 checks passed
@mateuszklysz
mateuszklysz deleted the fix/select-world-data-overlay branch October 14, 2026 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant