Pret Merge (7th of August) #5116
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
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo * Changed monType1 and monType2 to monTypes to match gSpeciesInfo
Bassoonian
requested changes
Aug 7, 2024
Bassoonian
changed the title
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Bassoonian
approved these changes
Aug 8, 2024
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.
This is a pret merge - DO NOT SQUASH!
Description
No merge conflicts.
Reason behind change: Changed typeX to types[X]
checksum
Before
26a728f1855b6c956f1ff7bba5e1b749f93553d8After
26a728f1855b6c956f1ff7bba5e1b749f93553d8Discord contact info
pkmnsnfr