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

Fix Clear Amulet visual bug + Tests #3074

Merged
merged 2 commits into from
Jun 28, 2023

Conversation

AlexOn1ine
Copy link
Collaborator

@AlexOn1ine AlexOn1ine commented Jun 23, 2023

Description

Fixes Clear Amulet visual bug. A wrong message was displayed when Intimidate on Clear Amulet was used.
Also removed some code in the Intimidate script that was not needed and added a couple of tests.

pokeemerald-5
pokeemerald-6

**Issue(s) that this PR fixes **

Fixes #3054

Discord contact info

rainonline

test/ability_hyper_cutter.c Show resolved Hide resolved
test/ability_clear_body.c Show resolved Hide resolved
test/ability_white_smoke.c Show resolved Hide resolved
test/ability_full_metal_body.c Show resolved Hide resolved
test/ability_inner_focus.c Show resolved Hide resolved
test/ability_own_tempo.c Show resolved Hide resolved
test/ability_scrappy.c Show resolved Hide resolved
test/hold_effect_clear_amulet.c Show resolved Hide resolved
test/hold_effect_clear_amulet.c Show resolved Hide resolved
TODO Tests, additional tests + Triple Kick pp bug
@AlexOn1ine
Copy link
Collaborator Author

Added all the TODO tests, wrote some additional tests for Own Tempo, Inner Focus, Scrappy and added the missing Clear Amulet checks. Also fixed a tiny Triple Kick bug (issue #3054)

@PacFire
Copy link

PacFire commented Jun 26, 2023

swag

@AsparagusEduardo
Copy link
Collaborator

Please avoid doing force pushes, it makes it harder to tell what was changed in a PR.

@AlexOn1ine
Copy link
Collaborator Author

Please avoid doing force pushes, it makes it harder to tell what was changed in a PR.

Oh will avoid doing it, sorry. I have done that to have a clean commit history but I understand.

@mrgriffin
Copy link
Collaborator

mrgriffin commented Jun 26, 2023

Please avoid doing force pushes, it makes it harder to tell what was changed in a PR.

Oh will avoid doing it, sorry. I have done that to have a clean commit history but I understand.

Something I often do as a PR author is write a message saying that I intend to rebase and force push to clean up the history once the PR is accepted :)

@AlexOn1ine
Copy link
Collaborator Author

Please avoid doing force pushes, it makes it harder to tell what was changed in a PR.

Oh will avoid doing it, sorry. I have done that to have a clean commit history but I understand.

Something I often do as a PR author is write a message saying that I intend to rebase and force push to clean up the history once the PR is accepted :)

Good suggestion! 👍

@AsparagusEduardo
Copy link
Collaborator

Please avoid doing force pushes, it makes it harder to tell what was changed in a PR.

Oh will avoid doing it, sorry. I have done that to have a clean commit history but I understand.

Something I often do as a PR author is write a message saying that I intend to rebase and force push to clean up the history once the PR is accepted :)

Good suggestion! 👍

Even then, if it's intended to be a single commit, we can squash it ourselves upon merging thanks to GitHub's Squash and Merge option :)

test/ability_own_tempo.c Outdated Show resolved Hide resolved
test/ability_own_tempo.c Outdated Show resolved Hide resolved
test/ability_scrappy.c Outdated Show resolved Hide resolved
test/hold_effect_clear_amulet.c Outdated Show resolved Hide resolved
test/ability_pastel_veil.c Outdated Show resolved Hide resolved
@AlexOn1ine
Copy link
Collaborator Author

AlexOn1ine commented Jun 27, 2023

Added the Wonder Guard message, changed if to switch and fixed misalignment.

@AsparagusEduardo AsparagusEduardo merged commit 2009927 into rh-hideout:master Jun 28, 2023
1 check passed
@AlexOn1ine AlexOn1ine deleted the clear_amulet_v2 branch July 5, 2023 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Triple Kick calls attackstring and ppreduce twice
4 participants