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

Implementing Teatime effect #1956

Merged
merged 37 commits into from
Dec 30, 2022
Merged

Implementing Teatime effect #1956

merged 37 commits into from
Dec 30, 2022

Conversation

SonikkuA-DatH
Copy link

@SonikkuA-DatH SonikkuA-DatH commented Nov 29, 2021

Note: requires the Bugbite/Stuffed Cheeks PR here

Teatimeeo

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

@ghoulslash ghoulslash added category: battle-mechanic Pertains to battle mechanics gen: 8 labels Dec 2, 2021
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 AsparagusEduardo changed the base branch from battle_engine to master August 24, 2022 04:39
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.

I thought I had submitted this review, but I found it as pending. I'm really sorry :(

data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
@AsparagusEduardo AsparagusEduardo changed the base branch from master to dev September 10, 2022 01:36
@AsparagusEduardo AsparagusEduardo changed the base branch from dev to dev_1.x September 16, 2022 17:34
@AsparagusEduardo
Copy link
Collaborator

It's not building.

data/battle_scripts_1.s Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
Need to replace with current...
Base upload. Need to apply Teatime changes...
SonikkuA-DatH and others added 8 commits December 18, 2022 22:23
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
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
src/battle_anim_effects_1.c Outdated Show resolved Hide resolved
include/constants/battle_script_commands.h Outdated Show resolved Hide resolved
src/battle_util.c Outdated Show resolved Hide resolved
SonikkuA-DatH and others added 4 commits December 20, 2022 18:08
-_-

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@AsparagusEduardo
Copy link
Collaborator

Did you end up confirming the TODOs?

Compensating Substitute, removing item
Noted Protection Bypassing
@AsparagusEduardo AsparagusEduardo merged commit 4dc72dc into rh-hideout:upcoming Dec 30, 2022
@AsparagusEduardo AsparagusEduardo mentioned this pull request Feb 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: battle-mechanic Pertains to battle mechanics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants