Master -> Upcoming merge 2024-10-17 #5537
Merged
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.
Secondary expansion is redundant.
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`
…ld-scaninc-speed
…ld-music-config
Fix incorrect point macros in contest_ai_script.inc
# 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
Bugfix for cable car hikerGraphicsIds array
Remove explicit symbol sizes in sym_common.txt
Ignore mGBA screenshots
Yes, this is honestly overkill, as it doesn't actually fix any behavioral bugs, but I was suggested to do this. This was a typo made in the source that GameFreak made, and the compiler warns against this. I opened a PR in pokeemerald expansion and was suggested to open one here.
Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
* Fixes Partner targeting and Acupressure/Ally Switch interaction * More tests * Update test/battle/move.c
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.
Description
Made a PR instead of merging directly because I can't open the emulator at this moment.
My main approach with Makefile was using the version present in
masterand then reimplementing the following PRs:Discord contact info
AsparagusEduardo