Fix buggy pokemon anims with Illusion #2639
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
Jaizu
suggested changes
Feb 13, 2023
src/data/pokemon/species_info.h
Outdated
| @@ -7063,7 +7063,7 @@ const struct SpeciesInfo gSpeciesInfo[] = | |||
| .friendship = 70, | |||
| .growthRate = GROWTH_MEDIUM_SLOW, | |||
| .eggGroups = { EGG_GROUP_WATER_1, EGG_GROUP_GRASS}, | |||
| .abilities = {ABILITY_SWIFT_SWIM, ABILITY_RAIN_DISH, ABILITY_OWN_TEMPO}, | |||
| .abilities = {ABILITY_ILLUSION, ABILITY_ILLUSION}, | |||
There was a problem hiding this comment.
You should avoid submiting changes that you made for testing.
Also, revert since it's not a draft anymore o/
src/battle_util.c
Outdated
| struct Pokemon *illusionMon = GetIllusionMonPtr(battlerId); | ||
| if (illusionMon != NULL) | ||
| return GetMonData(illusionMon, MON_DATA_SPECIES); | ||
| return 0; |
There was a problem hiding this comment.
Suggested change
| return 0; | |
| return SPECIES_NONE; |
|
Ready for review |
Jaizu
approved these changes
Feb 17, 2023
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.
Fixes #2624
There is an other Illusion issue opened atm, but it will be done in a separate PR(if and when no idea :D )