It's ya boi, pret merge! (pret merge 2023/02/16) #2697
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
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
Make contest opponents an enum
Document remaining field_specials task data
Document window IDs
Clarify AI_CV_AttackDown_UnknownTypeList
# Conflicts: # src/battle_main.c # src/field_specials.c # src/trade.c
# Conflicts: # data/battle_ai_scripts.s # src/menu_specialized.c # src/mystery_gift_menu.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
Before/After Merge:
029c85f5e1da481cc3420ee14b6ff13d69c32fdcAfter bugfixes:
c2d92188d6ac78bf89c98a8f78a85d5a8ba68d7eDiscord contact info
AsparagusEduardo#6051