forked from DizzyEggg/pokeemerald
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Add Berserk Gene Item #2893
Merged
Merged
Add Berserk Gene Item #2893
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
AsparagusEduardo
requested changes
Apr 10, 2023
remove always true if statement remove trailing whitespace move defines up move bs script declaration up fix using wrong bs call in ITEMEFFECT_NORMAL and ITEMEFFECT_MOVE_END
Almost ready for another review. want to investigate a possible edge case first. |
if a pokemon with own tempo uses baton pass, it would pass it the inf. conf. bit to the next mon. if that mon became confused then, it would be confused infinitely. So we need to make sure this bit is never set for a pokemon with own tempo. Since misty terrain prevents the confusion also, this applies aswell.
ready for another review I think |
AsparagusEduardo
requested changes
Apr 11, 2023
more descriptive weee :) Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
for own tempo cases and lum berry
RemoveConfusionStatus now unsets STATUS2_CONFUSION and STATUS4_INFINITE_CONFUSION
I think its good for another review |
u8-Salem
force-pushed
the
berserkGene
branch
2 times, most recently
from
April 19, 2023 17:07
05f85a0
to
ce502d7
Compare
own function since there is not enough overlap with canBeConfused
AsparagusEduardo
requested changes
Apr 25, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Almost there :)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
AsparagusEduardo
approved these changes
Apr 25, 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.
Adds Item Berserk Gene
Reference: https://bulbapedia.bulbagarden.net/wiki/Berserk_Gene
Credits
KryptonLion for the Berserk Gene sprite and palette
Discord contact info
Salem#3258