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 Kee Berry and Custap Berry + Tests #3409

Merged
merged 4 commits into from
Oct 13, 2023

Conversation

AlexOn1ine
Copy link
Collaborator

Fixes #3394
Fixes #3393

Also fixes Custap Berry

test/battle/hold_effect/attack_up.c Show resolved Hide resolved
test/battle/hold_effect/critical_hit_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/critical_hit_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/critical_hit_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/critical_hit_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/special_attack_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/special_defense_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/special_defense_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/speed_up.c Outdated Show resolved Hide resolved
test/battle/hold_effect/speed_up.c Outdated Show resolved Hide resolved
@AlexOn1ine
Copy link
Collaborator Author

Changes applied.

test/battle/hold_effect/kee_berry.c Outdated Show resolved Hide resolved
test/battle/hold_effect/rowap_berry.c Outdated Show resolved Hide resolved
@AlexOn1ine
Copy link
Collaborator Author

There is a new line missing in the maranga_berry.c file. I'll fix it right away if everything else is fine.

Copy link
Collaborator

@DizzyEggg DizzyEggg left a comment

Choose a reason for hiding this comment

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

Other than it's good

test/battle/hold_effect/kee_berry.c Outdated Show resolved Hide resolved
test/battle/hold_effect/maranga_berry.c Outdated Show resolved Hide resolved
@DizzyEggg DizzyEggg merged commit 1ae26b3 into rh-hideout:master Oct 13, 2023
1 check passed
katykat5099 pushed a commit to katykat5099/pokeemerald-expansion that referenced this pull request Oct 15, 2023
* Fix Kee Berry and Custap Berry + Tests

* add missing assumes

* fix wrong test files

* fix new line
@AlexOn1ine AlexOn1ine deleted the berry_hold_effects branch April 19, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants