Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pret Merge (7th of August) #5114

Closed
wants to merge 2 commits into from

Conversation

pkmnsnfrn
Copy link
Collaborator

This is a pret merge - DO NOT SQUASH!

Description

No merge conflicts

Reason behind change: Changed typeX to types[X]

Discord contact info

pkmnsnfr

pkmnsnfrn and others added 2 commits August 7, 2024 07:12
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
@Bassoonian Bassoonian added the type: sync Syncing with pret's upstream label Aug 7, 2024
@Bassoonian Bassoonian marked this pull request as draft August 7, 2024 18:00
include/battle.h Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: sync Syncing with pret's upstream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants