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.

Sign up for GitHub

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

Jump to bottom

Bug Bite and Stuff Cheeks #1581

Merged
merged 7 commits into from
Oct 14, 2021
Merged

Bug Bite and Stuff Cheeks #1581

merged 7 commits into from
Oct 14, 2021

Conversation

ghoulslash
Copy link
Collaborator

@ghoulslash ghoulslash commented Jul 25, 2021 •
edited
Loading

Add Bug Bite and Stuff Cheeks

Bug Bite:
bugbite

Stuff Cheeks:
stuff_cheeks

@ghoulslash ghoulslash added category: battle-mechanic Pertains to battle mechanics category: move effect Pertains to move effects labels Jul 25, 2021
@ghoulslash ghoulslash changed the title Bug Bite Bug Bite and Stuff Cheeks Jul 27, 2021
@ultima-soul ultima-soul added type: data Changes focus on data gen: 4 new-feature Adds a feature labels Sep 12, 2021
@AsparagusEduardo
Copy link
Collaborator

Works well, just need to fix conflicts.

@ghoulslash
Copy link
Collaborator Author

merged. ready for re review

AsparagusEduardo
AsparagusEduardo requested changes Sep 27, 2021
View reviewed changes
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
@BuffelSaft
Copy link
Collaborator

There are a couple of issues with Pluck and Bug Bite:

  • If a berry that restores HP is eaten and the user is at full HP, it still says the user's HP was restored
  • If the user already has an item and eats the target's berry, its original item is permanently lost

Gif showing both issues:
pluck bug

@ultima-soul ultima-soul linked an issue Oct 4, 2021 that may be closed by this pull request
MOVE_STUFF_CHEEKS Effect #1054
Closed
@ghoulslash
Copy link
Collaborator Author

Both issues are fixed as shown in this GIF. Ready for review

bugbite_fixes
:

@AsparagusEduardo AsparagusEduardo merged commit 8a6aee7 into rh-hideout:battle_engine Oct 14, 2021
@BuffelSaft BuffelSaft mentioned this pull request Oct 16, 2021
Closed
@LOuroboros LOuroboros mentioned this pull request Oct 17, 2021
Closed
@ghoulslash ghoulslash deleted the bug_bite branch October 26, 2021 18:20
@SonikkuA-DatH SonikkuA-DatH mentioned this pull request Nov 29, 2021
Merged
@eatthepear eatthepear mentioned this pull request Jan 7, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AsparagusEduardo AsparagusEduardo AsparagusEduardo approved these changes

Assignees
No one assigned
Labels
category: battle-mechanic Pertains to battle mechanics category: move effect Pertains to move effects new-feature Adds a feature type: data Changes focus on data
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MOVE_STUFF_CHEEKS Effect
4 participants
@ghoulslash @AsparagusEduardo @BuffelSaft @ultima-soul