Generate '.d' files for 'maps.s' and 'map_events.s'#2279
Merged
huderlem merged 1 commit intopret:masterfrom Apr 7, 2026
Merged
Generate '.d' files for 'maps.s' and 'map_events.s'#2279huderlem merged 1 commit intopret:masterfrom
huderlem merged 1 commit intopret:masterfrom
Conversation
Previously, 'data/maps.o' and 'data/map_events.o' were not rebuilt if
any of the header files they '#include' are modified. You can verify
this via 'make' with something like:
$ make -n -W include/constants/songs.h | grep maps.o
which shows that 'data/maps.o' is not rebuilt. Or by modifying a header
included in 'data/maps.s' in a way that should break assembling it (e.g.
by removing a '#define' that is only used in 'data/maps.s').
Additionally, fixes a bug in Expansion from an interaction between
'preproc -e' generating (global) symbols and those symbols being
generated for multiple object files, and thus falling out of sync
between (e.g.) 'data/map_events.o' and 'data/event_scripts.o', resulting
in an unhelpful multiple definition error from the linker like:
arm-none-eabi-ld: data/map_events.o: in function `ITEM_TM01':
(*ABS*+0x247): multiple definition of `ITEM_TM01'
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
2 participants
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.
Previously,
data/maps.oanddata/map_events.owere not rebuilt if any of the header files they#includeare modified. You can verify this viamakewith something like:$ make -n -W include/constants/songs.h | grep maps.owhich shows that
data/maps.ois not rebuilt. Or by modifying a header included indata/maps.sin a way that should break assembling it (e.g. by removing a#definethat is only used indata/maps.s).Additionally, fixes a bug in Expansion from an interaction between
preproc -egenerating (global) symbols and those symbols being generated for multiple object files, and thus falling out of sync between (e.g.)data/map_events.oanddata/event_scripts.o, resulting in an unhelpful multiple definition error from the linker like: