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

Convert max effects to normal move effects #6143

Open
wants to merge 4 commits into
base: upcoming
Choose a base branch
from

Conversation

AlexOn1ine
Copy link
Collaborator

@AlexOn1ine AlexOn1ine commented Jan 30, 2025

Converted Max Move Effects to normal Move Effects so they can be used for all moves.

@AlexOn1ine AlexOn1ine marked this pull request as ready for review January 30, 2025 19:19
@AlexOn1ine
Copy link
Collaborator Author

Ready for review.

Note: the function for move effects is getting bigger and bigger so I think it would make sense to turn it into a function table but should be a separate PR

#define MOVE_EFFECT_TERA_BLAST 78
#define MOVE_EFFECT_ORDER_UP 79
#define MOVE_EFFECT_ION_DELUGE 80
#define MOVE_EFFECT_AROMATHERAPY 81 // No functionality yet
Copy link
Collaborator

Choose a reason for hiding this comment

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

Since you implemented MOVE_EFFECT_AROMATHERAPY, can you take the chance to apply it to Sparkly Swirl?
(non-blocking)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

can I do it in a follow up pr? I don't want to write a test right now.

include/constants/battle.h Show resolved Hide resolved
include/move.h Show resolved Hide resolved
case MAX_EFFECT_EFFECT_SPORE_FOES:
case MAX_EFFECT_YAWN_FOE:
case MOVE_EFFECT_EFFECT_SPORE_FOES:
case MOVE_EFFECT_YAWN_FOE:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should MOVE_EFFECT_SLEEP be added here too?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't know. Idr but I think there was a reason why it wasn't added here but we would need to ask Pawkkie. I would say this is out of scope in this pr though

Comment on lines +4349 to +4353
case MOVE_EFFECT_LOWER_ATTACK:
case MOVE_EFFECT_LOWER_DEFENSE:
case MOVE_EFFECT_LOWER_SPEED:
case MOVE_EFFECT_LOWER_SP_ATK:
case MOVE_EFFECT_LOWER_SP_DEF:
Copy link
Collaborator

Choose a reason for hiding this comment

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

All of these effects affect both opponents, so they should at least have the _FOES suffix

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants