Repository navigation
decomp: give 104 data labels one name each - #182
Merged
mateuszklysz merged 1 commit intoOct 15, 2026
Merged
Conversation
Suffixed aliases of a label (D_0013D510_2607d0, D_0015ED64_k, ...) now use the label itself, keeping a _gp/_lui/_macro alias where a declaration needs another placement, and D_0013D428 is weapon_ammo_counts everywhere. Four files are left as they were: three declare a label with types that only look alike, and in one (l14 002460f8.c) the second name keeps FUN_L14_002aee28 exact. scripts/data-decls.py: 717 -> 613 labels with more than one type or name; KNOWN_CONFLICTS lowered to match. make elf: PASS: reconstructed boot ELF matches retail make overlays: PASS: all 2822 overlay functions in C match retail make check: 99 tests OK
Decompilation progress
No function changed its match state compared with main (6db3f55). Compared with main (6db3f55). C_FUZZY uses main's last measurement. |
2 of 3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Before
scripts/data-decls.pylisted 717 data labels declared with more than one type or name. Many were file-suffixed aliases of the same label (D_0013D510_2607d0,D_0015ED64_k, ...), andD_0013D428appeared asD_0013D428,D_0013D428_2c5be8andweapon_ammo_counts.After
_gp/_lui/_macroalias where a declaration needs another placement (docs/code-cleanup.md, Data).D_0013D428isweapon_ammo_countsin every file.KNOWN_CONFLICTSlowered from 720 to 613 (data-decls.py: 717 -> 613).l08/.../002e9b70.c,l18/.../002a7220.candshared/.../002d6810.c(their declarations differ in type, not only in name), andl14/.../002460f8.c, where the second name keepsFUN_L14_002aee28exact.D_001B3200keeps its plain name, whichselect_world_object_resource_tablesneeds to match.43 files, renames only.
Verification
make elfends withPASS: reconstructed boot ELF matches retailmake overlaysends withPASS(all 2822 overlay functions in C match retail)make checkpasses (99 tests OK)