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

Redo Bug Bite #2433

Merged
merged 7 commits into from
Nov 5, 2022
Merged

Redo Bug Bite #2433

merged 7 commits into from
Nov 5, 2022

Conversation

ghoulslash
Copy link
Collaborator

bugbite_cheri
bugbite_lansat

Redid Bug Bite to handle #2027

  • It does not temporarily change items anymore
  • Fixes issue where bug bite was not activating if it fainted the target
  • Save original gBattlerTarget through the move effect to fix tryfaintmon BS_TARGET following the effect
  • Jaboca/etc berries still need to be activated prior to bug bite stealing them, but that should be saved for another PR
  • Adds Lansat Berry
  • GetBattlerItemHoldEffect has been added to get the proper hold effect for the bug bite target rather than using the attacker's

@ghoulslash ghoulslash added the category: battle-mechanic Pertains to battle mechanics label Nov 4, 2022
@BuffelSaft BuffelSaft self-requested a review November 4, 2022 14:54
@BuffelSaft
Copy link
Collaborator

BuffelSaft commented Nov 5, 2022

Berry Effects Tested:

  • HOLD_EFFECT_RESTORE_HP
  • HOLD_EFFECT_RESTORE_PP Failed: Does not restore PP.
  • HOLD_EFFECT_CURE_FRZ: N/A
  • HOLD_EFFECT_CURE_BRN
  • HOLD_EFFECT_CURE_PSN
  • HOLD_EFFECT_CURE_SLP: tested via sleep talk
  • HOLD_EFFECT_CURE_PAR
  • HOLD_EFFECT_CURE_CONFUSION
  • HOLD_EFFECT_CURE_STATUS
  • HOLD_EFFECT_RESTORE_PCT_HP
  • HOLD_EFFECT_CONFUSE_SPICY Quiet attacker, not confused by stolen berry
  • HOLD_EFFECT_CONFUSE_DRY
  • HOLD_EFFECT_CONFUSE_SWEET Quiet attacker, confused by stolen berry
  • HOLD_EFFECT_CONFUSE_BITTER
  • HOLD_EFFECT_CONFUSE_SOUR
  • HOLD_EFFECT_RESIST_BERRY Eaten before it can be stolen (correct behaviour)
  • HOLD_EFFECT_ATTACK_UP
  • HOLD_EFFECT_DEFENSE_UP
  • HOLD_EFFECT_SPEED_UP
  • HOLD_EFFECT_SP_ATTACK_UP
  • HOLD_EFFECT_SP_DEFENSE_UP
  • HOLD_EFFECT_CRITICAL_UP
  • HOLD_EFFECT_RANDOM_STAT_UP Note: raises stat even if battle will end
  • HOLD_EFFECT_MICLE_BERRY Note: raises stat even if battle will end
  • HOLD_EFFECT_CUSTAP_BERRY

Not implemented yet, so not expected to work:

  • HOLD_EFFECT_JABOCA_BERRY
  • HOLD_EFFECT_ROWAP_BERRY
  • HOLD_EFFECT_KEE_BERRY
  • HOLD_EFFECT_MARANGA_BERRY
  • HOLD_EFFECT_ENIGMA_BERRY

Other:

  • Berry not eaten when target is behind Substitute
  • Attacker's item not destroyed when stolen berry effect activates

There are a couple of issues with Bug Bite, but none of them are issues with this PR; just some missing functionality. Will merge this and raise an issue for them.

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.

2 participants