They said we'd break, they said we'd loose. But here we are, what else is new? (pret merge 2023-10-02) #3372
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
…onst Slight RTC documentation + Evolution times constants
Add friendship evo threshold constant
Solved a bunch of -Wall errors on modern
# Conflicts: # src/battle_ai_script_commands.c # src/battle_controller_player.c # src/battle_controller_recorded_opponent.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_controllers.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/mystery_gift_menu.c # src/pokemon.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
SHA1 before and after merge:
76c6011cf5e6daab3e82864693a3bb90f1db6037SHA1 after integrating upstream fixes:
645a91b751b95300e5fa279a13c663ddca92549fDiscord contact info
AsparagusEduardo