Kept you waiting, huh? (pret sync 2023/03/03) #2801
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
…stants-num-frames
… needing to beat the champion in both RSE and FRLG.
Fixed minor spelling mistake
Fix spelling mistake for item flag
Fix wrong route in hidden item flag name
Fix wrong route in item flag name
…Whitelist Whitelist instead of Blacklist for TOOLDIRS in Makefiles
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarity
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
Add/correct some union room chat documentation
Rename eventLegal to modernFatefulEncounter
# Conflicts: # Makefile # include/constants/pokemon.h # include/pokemon.h # make_tools.mk # src/battle_ai_script_commands.c # src/battle_controllers.c # src/battle_main.c # src/battle_script_commands.c # src/party_menu.c # src/pokemon.c # src/trade.c # src/trainer_pokemon_sprites.c
Merged
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:
2f2d8b7808776181d18704e80cb50030f6c6fa08Conflicts:
Makefileinclude/constants/pokemon.hinclude/pokemon.hmake_tools.mksrc/battle_ai_script_commands.csrc/battle_controllers.csrc/battle_main.csrc/battle_script_commands.csrc/party_menu.csrc/pokemon.csrc/trade.csrc/trainer_pokemon_sprites.cDiscord contact info