Fix protect recoil issue and add tests for protect (rh-hideout#3321)

* 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 <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * more recoil moves for protect test * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * rename spiky shield test --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Pawkkie · Sep 27, 2023 · de3640a · de3640a
1 parent 2464525
commit de3640a
Show file tree

Hide file tree

Showing 2 changed files with 391 additions and 0 deletions.
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -9269,6 +9269,7 @@ BattleScript_SpikyShieldEffect::
 	printstring STRINGID_PKMNHURTSWITH
 	waitmessage B_WAIT_TIME_LONG
 	tryfaintmon BS_ATTACKER
+	orhalfword gMoveResultFlags, MOVE_RESULT_MISSED
 BattleScript_SpikyShieldRet::
 	return
 
@@ -9280,13 +9281,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::