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.

Sign up for GitHub

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

Jump to bottom

Fixed Mega Evolved Pokémon being able to get Friendship effects in battle #2262

Merged
merged 5 commits into from
Oct 7, 2022
Merged

Fixed Mega Evolved Pokémon being able to get Friendship effects in battle #2262

merged 5 commits into from
Oct 7, 2022

Conversation

LOuroboros
Copy link
Collaborator

@LOuroboros LOuroboros commented Aug 27, 2022 •
edited by AsparagusEduardo
Loading

Description

Fixes #2261.

Discord contact info

Lunos#4026

@LOuroboros
Updated GetMonFriendshipScore
922bbac 
-Moved it to src/pokemon.c
-Made a battle specific variant called GetBattlerFriendshipScore.
-Made that variant return 0 for Mega Evolved 'mons and if called on link battles.
@LOuroboros
I forgot to replace the function calls where appropriate :P
452b135
@AsparagusEduardo AsparagusEduardo changed the base branch from master to dev September 10, 2022 01:32
@AsparagusEduardo AsparagusEduardo changed the title Updated GetMonFriendshipScore Fixed Mega Evolved Pokémon being able to get Friendship effects in battle Sep 16, 2022
@AsparagusEduardo AsparagusEduardo added category: battle-mechanic Pertains to battle mechanics bugfix Bugfixes labels Sep 16, 2022
@AsparagusEduardo AsparagusEduardo changed the base branch from dev to dev_1.x September 16, 2022 17:30
AsparagusEduardo
AsparagusEduardo reviewed Sep 27, 2022
View reviewed changes
include/battle.h Outdated Show resolved Hide resolved
@AsparagusEduardo AsparagusEduardo mentioned this pull request Sep 27, 2022
Merged
@AsparagusEduardo AsparagusEduardo marked this pull request as draft September 27, 2022 17:54
@LOuroboros LOuroboros marked this pull request as ready for review October 7, 2022 15:35
@LOuroboros
Copy link
Collaborator Author

Should be ready for a re-review 👀

AsparagusEduardo
AsparagusEduardo reviewed Oct 7, 2022
View reviewed changes
src/battle_util.c Outdated Show resolved Hide resolved
AsparagusEduardo
AsparagusEduardo approved these changes Oct 7, 2022
View reviewed changes
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just in time!

@AsparagusEduardo AsparagusEduardo merged commit 2ce340e into rh-hideout:upcoming Oct 7, 2022
@LOuroboros LOuroboros deleted the becomingAHero branch October 7, 2022 21:30
@AsparagusEduardo AsparagusEduardo mentioned this pull request Oct 7, 2022
Merged
@DizzyEggg DizzyEggg mentioned this pull request Mar 7, 2023
Open
23 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AsparagusEduardo AsparagusEduardo AsparagusEduardo approved these changes

Assignees
No one assigned
Labels
bugfix Bugfixes category: battle-mechanic Pertains to battle mechanics
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Reminder: re-review Affection mechanics PR
2 participants
@LOuroboros @AsparagusEduardo