forked from DizzyEggg/pokeemerald
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Implementing Teatime effect #1956
Merged
AsparagusEduardo
merged 37 commits into
rh-hideout:upcoming
from
SonikkuA-DatH:SonikkuA-DatH-Teatime2
Dec 30, 2022
Merged
Implementing Teatime effect #1956
AsparagusEduardo
merged 37 commits into
rh-hideout:upcoming
from
SonikkuA-DatH:SonikkuA-DatH-Teatime2
Dec 30, 2022
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
Not sure why it works better with User than "All targets"
Teapot sprited by me. Based on this: https://cdn.discordapp.com/attachments/425852970689626123/914062336476708874/unknown.png
evanonline
added a commit
to evanonline/Complete-Fire-Red-Upgrade
that referenced
this pull request
Jul 20, 2022
Credit to pokeemerald expansion for the graphic rh-hideout/pokeemerald-expansion#1956 (edited down to 32x32 and recolored to match its pink appearance in SwSh)
AsparagusEduardo
requested changes
Sep 9, 2022
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.
I thought I had submitted this review, but I found it as pending. I'm really sorry :(
Fixed spacing
It's not building. |
LOuroboros
reviewed
Dec 19, 2022
LOuroboros
requested changes
Dec 19, 2022
Need to replace with current...
Base upload. Need to apply Teatime changes...
Added required tags
removes various description Co-authored-by: LOuroboros <[email protected]>
Spacing refix Co-authored-by: LOuroboros <[email protected]>
Bracket fixing Co-authored-by: LOuroboros <[email protected]>
Fixes spacing. Thanks Lunos! Co-authored-by: LOuroboros <[email protected]>
Whoops, forgot the to copy paste various
Changed STAT_BUFF_ALLOW_PTR to STAT_CHANGE_ALLOW_PTR
LOuroboros
requested changes
Dec 20, 2022
Co-authored-by: LOuroboros <[email protected]>
Co-authored-by: LOuroboros <[email protected]>
Co-authored-by: LOuroboros <[email protected]>
AsparagusEduardo
requested changes
Dec 21, 2022
-_- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
Did you end up confirming the TODOs? |
Compensating Substitute, removing item
Noted Protection Bypassing
fix ORs
AsparagusEduardo
approved these changes
Dec 30, 2022
Closed
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.
Note: requires the Bugbite/Stuffed Cheeks PR here
Solves #1059
This PR implements Teatime's effect. Has an edge case for Electrify -> Lightningrod to enable the move to cycle through all battlers with Lightning Rod/Motor Drive/Volt Absorb, and invulnerable mons
TODO [✓]: Confirm if there's ways to block Teatime outside Max Guard. Embargo and Protect don't
-There isn't other than no berry failing, Crafty Shield doesn't protect either
TODO [✓]: Confirm if ground types are affected if Teatime is Electrified
-Teatime is just considered status, works
Discord: Dat.H A#697