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

Fixed non-regional forms breeding incorrectly #4985

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

AsparagusEduardo
Copy link
Collaborator

Description

Fix to #4695

People who collaborated with me in this PR

@cawtds

Feature(s) this PR does NOT handle:

While it does add region constants, this PR doesn't handle multi-region support for now.

Discord contact info

AsparagusEduardo

src/pokemon.c Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
src/daycare.c Outdated Show resolved Hide resolved
@AsparagusEduardo AsparagusEduardo marked this pull request as draft July 16, 2024 22:36
@cawtds
Copy link

cawtds commented Jul 17, 2024

I think this covers all the form inheritance cases. Since Tauros cannot be female in vanilla games there is no definite answer to the last case. Imo since Blaze and Aqua are two different forms of the same regional form, it should default to the female species as parent and ignore the everstone like in the Shellos case, therefore Kantonian Tauros would be the egg species.
image

@AsparagusEduardo AsparagusEduardo added this to the 1.9.0 milestone Jul 19, 2024
@AsparagusEduardo AsparagusEduardo removed this from the 1.9.0 milestone Jul 20, 2024
@hedara90 hedara90 added category: pokemon Pertains to Pokémon data and functionality bugfix Bugfixes labels Jul 26, 2024
@AsparagusEduardo AsparagusEduardo marked this pull request as ready for review December 31, 2024 21:11
@AsparagusEduardo
Copy link
Collaborator Author

Finally solved the issue I was having with this. (it was parentslots which were confusing me at the time).

Ready for review!

src/pokemon.c Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
test/daycare.c Outdated Show resolved Hide resolved
test/daycare.c Outdated Show resolved Hide resolved
@AsparagusEduardo
Copy link
Collaborator Author

Comments addressed and added Shellos test to make sure that the regional changes don't affect other form breeding

@AsparagusEduardo
Copy link
Collaborator Author

Forgot to say, but ready for rereview

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Bugfixes category: pokemon Pertains to Pokémon data and functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants