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

Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit's effect ID instead of its move ID #3231

Merged
merged 2 commits into from
Aug 14, 2023

Conversation

LOuroboros
Copy link
Collaborator

@LOuroboros LOuroboros commented Aug 14, 2023

Description

For whatever reason, right now the expansion's Cmd_jumpifnopursuitswitchdmg battle script function (which handles the usage of Pursuit when an opponent is about to switch out their Pokémon) uses Pursuit's move ID instead of its effect ID.
This is a bit limiting for a user who may very well want to add add copies/clones of Pursuit, as they would have to go there and modify things by themselves.
This PR addresses that by making the function read the effect of Pursuit, which is EFFECT_PURSUIT, instead of hardcoding gCurrentMove to Pursuit's move ID. That way, any moves that a user may want to add and that also use that same effect besides Pursuit itself can work normally too.

Discord contact info

lunos4026

@LOuroboros LOuroboros changed the title Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit's effect ID instead of move ID Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit's effect ID instead of its move ID Aug 14, 2023
@AsparagusEduardo AsparagusEduardo merged commit c414a01 into upcoming Aug 14, 2023
@AsparagusEduardo AsparagusEduardo deleted the LOuroboros-patch-2 branch August 14, 2023 12:45
@LOuroboros LOuroboros restored the LOuroboros-patch-2 branch August 14, 2023 19:12
@LOuroboros LOuroboros deleted the LOuroboros-patch-2 branch August 14, 2023 19:12
@LOuroboros
Copy link
Collaborator Author

Sorry. I clicked the button to delete the branch out of habit, without noticing that you already had deleted it Eduardo 🤣

@AsparagusEduardo AsparagusEduardo mentioned this pull request Sep 27, 2023
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.

2 participants