Flat Merge Friday (Weekly merge) #2286
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
Incorporate commented bug fixes in contest AI scripts
Cleanup based on previous PRs
Automatized the contents of some sideof in src/item.c
Updated a couple of sizeofs in src/battle_pyramid_bag.c
Standardize judgement vs judgment spelling
Renamed TM flags to keep consistency with the rest of the repo
…0902 # Conflicts: # include/battle.h # include/battle_controllers.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controllers.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c
Further uses of GET_BATTLER_SIDE macros'
…0902 # Conflicts: # src/battle_util.c
|
Btw, when I merge from upstream after opening the PR, I make sure that it still matches. |
ghoulslash
approved these changes
Sep 6, 2022
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
Conflicts:
field_52->scriptPartyIdxsrc/battle_ai_switch_items.c,src/battle_controller_opponent.c,src/battle_controller_player.c,src/battle_main.c,src/battle_script_commands.c,src/battle_util.c^ BIT_SIDEand^ BIT_FLANKtoBATTLE_OPPOSITEandBATTLE_PARTNERsrc/battle_controllers.c,src/battle_message.cfield_52->scriptPartyIdxbakScriptPartyIdx->scriptPartyIdxAdditionally, looked for the rest of the instances of
^ BIT_SIDEand^ BIT_FLANKnot handled upstream and updated them.SHA1 before and after merge: AC8764900956D00715D3264A446F239176267008
Discord contact info
AsparagusEduardo#6051