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

Fix Magic Bounce targets #2260

Merged
merged 2 commits into from
Sep 1, 2022
Merged

Conversation

DizzyEggg
Copy link
Collaborator

@DizzyEggg DizzyEggg commented Aug 26, 2022

This fixes #1774.

There were two issues present:

  1. When Magic Bounce bounced a move hitting two targets(i.e Growl), it didn't always affect two targets. This was an easy fix adding
    bicword gHitMarker, HITMARKER_NO_ATTACKSTRING
    to the battle script.
  2. When Magic Bounce bounced a move hitting two targets(i.e Growl), the original attacker would stop its move execution there. Simply put, attacker's Growl should affect both mons, one with Magic Bounce - gets bounced, and the other one. This was was a bit trickier to handle and I needed to create two additional fields in BattleStruct.

Here are the videos with edge cases covered.
 MagicBounce_1
MagicBounce_2
magicBounceAll

@AsparagusEduardo AsparagusEduardo linked an issue Aug 27, 2022 that may be closed by this pull request
@DizzyEggg
Copy link
Collaborator Author

Fixed conflicts.
Note: This also fixes an issue Lunos mentioned here #1771. That is, using a move which hits 3 targets(such as Surf) would not affect all of the possible targets.
surf

@AsparagusEduardo AsparagusEduardo merged commit 59f1f10 into rh-hideout:master Sep 1, 2022
@DizzyEggg DizzyEggg deleted the magic_bounce branch June 23, 2024 11:20
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.

Magic bounce bug in double battles Magic Coat only blocks a single move
2 participants