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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
31dc906
fix protect recoil issue and add tests for protect
DizzyEggg Sep 19, 2023
926ae5d
test for #3312 and baneful bunker fix
DizzyEggg Sep 21, 2023
b5af95c
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
6e17678
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
8acd65e
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
fb5898e
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
e89ac95
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
c198e16
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
342f13c
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
14810ec
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
dbfb591
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
30b9ada
Update test/battle/move_effect/protect.c
DizzyEggg Sep 23, 2023
3b0ed8f
Update test/battle/move_effect/protect.c
DizzyEggg Sep 25, 2023
64412ce
Update test/battle/move_effect/protect.c
DizzyEggg Sep 25, 2023
41f6b7a
Update test/battle/move_effect/protect.c
DizzyEggg Sep 25, 2023
964fb22
Update test/battle/move_effect/protect.c
DizzyEggg Sep 25, 2023
c21c208
Update test/battle/move_effect/protect.c
DizzyEggg Sep 25, 2023
e3e5d3a
more recoil moves for protect test
DizzyEggg Sep 25, 2023
1bc0434
Update test/battle/move_effect/protect.c
DizzyEggg Sep 25, 2023
e993488
rename spiky shield test
DizzyEggg Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions data/battle_scripts_1.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9321,6 +9321,7 @@ BattleScript_SpikyShieldEffect::
printstring STRINGID_PKMNHURTSWITH
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
orhalfword gMoveResultFlags, MOVE_RESULT_MISSED
BattleScript_SpikyShieldRet::
return

Expand All @@ -9332,13 +9333,15 @@ BattleScript_KingsShieldEffect::
copybyte sBATTLER, gBattlerTarget
copybyte gBattlerTarget, gBattlerAttacker
copybyte gBattlerAttacker, sBATTLER
orhalfword gMoveResultFlags, MOVE_RESULT_MISSED
return

BattleScript_BanefulBunkerEffect::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_PASSIVE_DAMAGE
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
seteffectsecondary
setmoveeffect 0
orhalfword gMoveResultFlags, MOVE_RESULT_MISSED
return

BattleScript_CuteCharmActivates::
Expand Down
Loading
Loading