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

Add newer generation Heal Bell interactions with Soundproof #4732

Merged
merged 4 commits into from
Jun 7, 2024

Conversation

Sneed69
Copy link

@Sneed69 Sneed69 commented Jun 6, 2024

Addresses #4704

Discord contact info

duke5614

@Bassoonian
Copy link
Collaborator

Tests failing

@Sneed69 Sneed69 marked this pull request as draft June 6, 2024 23:19
Copy link
Collaborator

@AlexOn1ine AlexOn1ine left a comment

Choose a reason for hiding this comment

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

Can IsBattlerAlive not be used in those cases?

src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
Comment on lines 2969 to 2970
if ((GetMonData(&party[battlerOnField2], MON_DATA_STATUS) != STATUS1_NONE)
&& (GetBattlerAbility(battlerOnField2) != ABILITY_SOUNDPROOF
Copy link
Collaborator

@AlexOn1ine AlexOn1ine Jun 7, 2024

Choose a reason for hiding this comment

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

I would make 2 bools for those things since they are checked twice and would make the code a little bit cleaner

You could go even as far as making a bool for the whole soundproof condition or at least part of it.

Copy link
Author

Choose a reason for hiding this comment

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

Sadly these aren't checked twice, it's a different battler in each case.

@Sneed69 Sneed69 marked this pull request as ready for review June 7, 2024 12:35
@Sneed69 Sneed69 marked this pull request as draft June 7, 2024 12:53
@Sneed69 Sneed69 marked this pull request as ready for review June 7, 2024 14:57
@AlexOn1ine AlexOn1ine merged commit fa81861 into rh-hideout:upcoming Jun 7, 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.

3 participants