Pret merge (September 9th) #5352
Closed
Conversation
This file contains 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
Removed generated files (layouts.h, map_groups.h) from git.
Added some documentation and simplified dependency scanning.
Slight storage system documentation
Clean up defines lacking spaces
UB fix in battle_transition.c
preproc: support arbitrary expressions in enums
…ld-makefile-cleanup
[Build System Rewrite] Refactored `Makefile`
AsparagusEduardo
changed the title
Merged
# Conflicts: # Makefile # include/battle.h # include/battle_main.h # include/battle_util.h # include/data.h # make_tools.mk # map_data_rules.mk # src/battle_setup.c # src/fieldmap.c
AsparagusEduardo
force-pushed
the
_RHH/pr/master/pretSync20240909
branch
from
960b510 to
5954d66
Compare
|
I managed to fix the issues I was having with this merge. However, in the time it took me to solve them, more incoming changes happened and once again I had issues with it. Since I won't be able to put more time into this merge, I'm marking it as ready for review. |
|
Should this be updated? |
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.
This is a pret merge - DO NOT SQUASH!
Description
Makefilepret/pokeemerald#1950Conflicts:
checksum
Before
3d2641b756f2f46b421ce32dd0e68009453d85ceAfter
2d05b4cf787b4116c06e35512960ff3beb4b5554Confirmed that pret#2007 is the reason for this change.
Discord contact info
AsparagusEduardo