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.

Sign up for GitHub

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

Jump to bottom

Fix protect recoil issue and add tests for protect #3321

Merged
merged 20 commits into from
Sep 26, 2023
Merged

Fix protect recoil issue and add tests for protect #3321

merged 20 commits into from
Sep 26, 2023

Conversation

DizzyEggg
Copy link
Collaborator

@DizzyEggg DizzyEggg commented Sep 19, 2023 •
edited
Loading

Fixes #3304
Fixes #3312

Adds tests for all protect moves.

@AsparagusEduardo AsparagusEduardo added this to the Bugfixes for 1.6.0 milestone Sep 21, 2023
@AsparagusEduardo
Copy link
Collaborator

Note for the reviewer: also check #3312

@DizzyEggg
Copy link
Collaborator Author

@AsparagusEduardo

The answer was: yes, it also fixed #3312. BUT good thing I wrote a test for all protect moves, because baneful bunker needed the same fix as the other two. Which is now fixed too

AsparagusEduardo
AsparagusEduardo requested changes Sep 22, 2023
View reviewed changes
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
test/battle/move_effect/protect.c Outdated Show resolved Hide resolved
DizzyEggg and others added 17 commits September 23, 2023 10:44
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
b5af95c 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
6e17678 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
8acd65e 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
fb5898e 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
e89ac95 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
c198e16 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
342f13c 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
14810ec 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
dbfb591 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
30b9ada 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
3b0ed8f 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
64412ce 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
41f6b7a 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
964fb22 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
c21c208 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg
more recoil moves for protect test
e3e5d3a
@DizzyEggg @AsparagusEduardo
Update test/battle/move_effect/protect.c
1bc0434 
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
@DizzyEggg
Copy link
Collaborator Author

I removed the comment to the issue's github number, this should be ready to merge now.

@DizzyEggg
Copy link
Collaborator Author

@AsparagusEduardo Should be ready to merge 👀

@AsparagusEduardo AsparagusEduardo merged commit e0e49a9 into rh-hideout:master Sep 26, 2023
1 check passed
@DizzyEggg DizzyEggg deleted the protect_recoil branch September 26, 2023 11:33
@AsparagusEduardo AsparagusEduardo mentioned this pull request Sep 27, 2023
Merged
Pawkkie pushed a commit to Pawkkie/pokeemerald-expansion that referenced this pull request Sep 27, 2023
@DizzyEggg @AsparagusEduardo @Pawkkie
Fix protect recoil issue and add tests for protect (rh-hideout#3321)
de3640a 
* fix protect recoil issue and add tests for protect

* test for rh-hideout#3312 and baneful bunker fix

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* more recoil moves for protect test

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

* rename spiky shield test

---------

Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AsparagusEduardo AsparagusEduardo AsparagusEduardo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Bugfixes for 1.6.0
Development

Successfully merging this pull request may close these issues.

Multi-hit moves damage pokemon using silk-trap Recoil moves cause recoil damage against Protect like moves
2 participants
@DizzyEggg @AsparagusEduardo