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 Magician Life orb recoil when stealing #3753

Merged
merged 2 commits into from
Dec 17, 2023

Conversation

DizzyEggg
Copy link
Collaborator

Fixes #3678 with test

GIVEN {
ASSUME(gItems[ITEM_LIFE_ORB].holdEffect == HOLD_EFFECT_LIFE_ORB);
ASSUME(gBattleMoves[MOVE_TACKLE].power != 0);
ASSUME(P_GEN_6_POKEMON == TRUE);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Edu changed it so that pokemon gen assumes are no longer needed. Maybe they can clarify on how it works.

Copy link
Collaborator

Choose a reason for hiding this comment

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

PLAYER and OPPONENT essentially check for IsSpeciesEnabled. If it returns FALSE, the test automatically ends as ASSUMPTION_FAIL with a message that says that the species was disabled.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's a great change! I removed the assume

@AlexOn1ine AlexOn1ine merged commit 76a7513 into rh-hideout:master Dec 17, 2023
1 check passed
@DizzyEggg DizzyEggg deleted the magician_lifeorb branch June 22, 2024 10: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.

Magician stealing a life orb deals self damage
3 participants