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

Adds Move Psychic Noise #4005

Merged
merged 4 commits into from
Jan 16, 2024
Merged

Conversation

AlexOn1ine
Copy link
Collaborator

Closes #3844

data/battle_scripts_1.s Outdated Show resolved Hide resolved
@cfmnephrite
Copy link

Given that Psychic Noisecs effect is a secondary effect blocked by Sheer Force and Shield Dust, do you think you could encapsulate it as a move effect? If you don't feel like doing that, then you need to check for those two abilities in the script.

@AlexOn1ine
Copy link
Collaborator Author

Given that Psychic Noisecs effect is a secondary effect blocked by Sheer Force and Shield Dust, do you think you could encapsulate it as a move effect? If you don't feel like doing that, then you need to check for those two abilities in the script.

will do

@AlexOn1ine
Copy link
Collaborator Author

reviews applied

@Bassoonian Bassoonian merged commit 8f99ef1 into rh-hideout:upcoming Jan 16, 2024
1 check passed
{
gBattlerAbility = gEffectBattler;
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_AromaVeilProtectsRet;
Copy link

@Skeli789 Skeli789 Jan 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few things:

  1. The "proper" way to do this is to use AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE.... That way you don't run the risk of checking the partner's data in a single battle.
  2. You should check ingame if there should be an Ability pop-up here. Usually when a secondary effect is blocked by an Ability (eg. Water Veil blocking burn) no Ability pop-up is shown -- the effect just doesn't happen.
  3. If there is supposed to be an Ability pop-up, it'll say the wrong Pokemon's Ability in the case where it's the partner's Ability that blocks it (you're setting gBattlerAbility to gEffectBattler regardless of the Ability holder)/.

Copy link
Collaborator Author

@AlexOn1ine AlexOn1ine Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. There is the function IsAbilityOnSide that is used for ABILITY_AROMA_VEIL. Would that suffice?
  2. On showdown the ability pop up does show up.
  3. Correct. Should have been obvious 🫣

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.

5 participants