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

Updated Knock Off #4333

Merged
merged 4 commits into from
Apr 3, 2024
Merged

Updated Knock Off #4333

merged 4 commits into from
Apr 3, 2024

Conversation

AgustinGDLV
Copy link
Collaborator

Description

In Gen 5+, Knock Off removes the item from the target altogether, as opposed to making it unusable. This updated behavior allows for Knocked Off targets to gain another item later in the battle. Otherwise, it is almost entirely aesthetic as other edge cases seem unaffected: Unburden seems to trigger from Knock Off in Gen 4 and Symbiosis never triggers after Knock Off.

This PR adds more tests for Knock Off's basic interactions, this updated behavior, and some other small edge cases.

Images

Gen 3 and 4:
https://github.com/rh-hideout/pokeemerald-expansion/assets/103095241/02afedb3-6c3a-4694-ac75-9ad16b905769

Gen 5+:
https://github.com/rh-hideout/pokeemerald-expansion/assets/103095241/787e48ae-305b-4efe-a380-83ece229565e

Issue(s) that this PR fixes

Fixes #1903 (wow that's old)

People who collaborated with me in this PR

Thanks @AlexOn1ine and @Bassoonian for reminding me to update my old PR.

Discord contact info

agustingdlv

@AgustinGDLV AgustinGDLV changed the base branch from master to upcoming April 2, 2024 19:39
@Bassoonian Bassoonian mentioned this pull request Apr 2, 2024
9 tasks
@AlexOn1ine
Copy link
Collaborator

Agustin, could you include an item check in the tests at the end? See White Herb tests.

@AgustinGDLV
Copy link
Collaborator Author

How does that look? Ignore my messed up git history lol

@AlexOn1ine
Copy link
Collaborator

How does that look? Ignore my messed up git history lol

Isn't there an expect missing EXPECT(player->item == ITEM_NONE);?

@AlexOn1ine AlexOn1ine merged commit c340ae0 into rh-hideout:upcoming Apr 3, 2024
1 check passed
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.

Update Knock Off Effect
2 participants