From e0e49a993374eabf12980677a84561b21ae11fb2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 26 Sep 2023 12:26:23 +0200 Subject: [PATCH] Fix protect recoil issue and add tests for protect (#3321) * fix protect recoil issue and add tests for protect * test for #3312 and baneful bunker fix * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * more recoil moves for protect test * Update test/battle/move_effect/protect.c Co-authored-by: Eduardo Quezada D'Ottone * rename spiky shield test --------- Co-authored-by: Eduardo Quezada D'Ottone --- data/battle_scripts_1.s | 3 + test/battle/move_effect/protect.c | 388 ++++++++++++++++++++++++++++++ 2 files changed, 391 insertions(+) create mode 100644 test/battle/move_effect/protect.c diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 5aa5a72bb..62d619f9f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -9304,6 +9304,7 @@ BattleScript_SpikyShieldEffect:: printstring STRINGID_PKMNHURTSWITH waitmessage B_WAIT_TIME_LONG tryfaintmon BS_ATTACKER + orhalfword gMoveResultFlags, MOVE_RESULT_MISSED BattleScript_SpikyShieldRet:: return @@ -9315,6 +9316,7 @@ BattleScript_KingsShieldEffect:: copybyte sBATTLER, gBattlerTarget copybyte gBattlerTarget, gBattlerAttacker copybyte gBattlerAttacker, sBATTLER + orhalfword gMoveResultFlags, MOVE_RESULT_MISSED return BattleScript_BanefulBunkerEffect:: @@ -9322,6 +9324,7 @@ BattleScript_BanefulBunkerEffect:: bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT seteffectsecondary setmoveeffect 0 + orhalfword gMoveResultFlags, MOVE_RESULT_MISSED return BattleScript_CuteCharmActivates:: diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c new file mode 100644 index 000000000..bd7a73292 --- /dev/null +++ b/test/battle/move_effect/protect.c @@ -0,0 +1,388 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_PROTECT].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_DETECT].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_KINGS_SHIELD].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_SILK_TRAP].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_SPIKY_SHIELD].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_WIDE_GUARD].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_QUICK_GUARD].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_CRAFTY_SHIELD].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_BANEFUL_BUNKER].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].flags & FLAG_MAKES_CONTACT); + ASSUME(gBattleMoves[MOVE_LEER].split == SPLIT_STATUS); + ASSUME(gBattleMoves[MOVE_WATER_GUN].split == SPLIT_SPECIAL); + ASSUME(!(gBattleMoves[MOVE_WATER_GUN].flags & FLAG_MAKES_CONTACT)); +} + +SINGLE_BATTLE_TEST("Protect, Detect, Spiky Shield and Baneful Bunker protect from all moves") +{ + u32 j; + static const u16 protectMoves[] = { + MOVE_PROTECT, + MOVE_DETECT, + MOVE_SPIKY_SHIELD, + MOVE_BANEFUL_BUNKER, + }; + u16 protectMove = MOVE_NONE; + u16 usedMove = MOVE_NONE; + + for (j = 0; j < ARRAY_COUNT(protectMoves); j++) + { + PARAMETRIZE { protectMove = protectMoves[j]; usedMove = MOVE_TACKLE; } + PARAMETRIZE { protectMove = protectMoves[j]; usedMove = MOVE_LEER; } + PARAMETRIZE { protectMove = protectMoves[j]; usedMove = MOVE_WATER_GUN; } + } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, protectMove); MOVE(player, usedMove); } + TURN {} + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, protectMove, opponent); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT ANIMATION(ANIM_TYPE_MOVE, usedMove, player); + MESSAGE("Foe Wobbuffet protected itself!"); + if (usedMove == MOVE_LEER) { + NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + } else { + NOT HP_BAR(opponent); + } + } +} + +SINGLE_BATTLE_TEST("King's Shield, Silk Trap and Obstruct protect from damaging moves and lower stats on contact") +{ + u32 j; + static const u16 protectMoves[][3] = + { // Move Stat Stages + {MOVE_KINGS_SHIELD, STAT_ATK, 1}, + {MOVE_SILK_TRAP, STAT_SPEED, 1}, + {MOVE_OBSTRUCT, STAT_DEF, 2}, + }; + u16 protectMove = MOVE_NONE; + u16 usedMove = MOVE_NONE; + u16 statId = 0, lowersBy = 0; + + for (j = 0; j < ARRAY_COUNT(protectMoves); j++) + { + PARAMETRIZE { usedMove = MOVE_TACKLE; protectMove = protectMoves[j][0]; statId = protectMoves[j][1]; lowersBy = protectMoves[j][2]; } + PARAMETRIZE { usedMove = MOVE_LEER; protectMove = protectMoves[j][0]; statId = 0; lowersBy = 0; } + PARAMETRIZE { usedMove = MOVE_WATER_GUN; protectMove = protectMoves[j][0]; statId = 0; lowersBy = 0; } + } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, protectMove); MOVE(player, usedMove); } + TURN {} + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, protectMove, opponent); + MESSAGE("Foe Wobbuffet protected itself!"); + if (usedMove == MOVE_LEER) { + ANIMATION(ANIM_TYPE_MOVE, usedMove, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + NOT MESSAGE("Foe Wobbuffet protected itself!"); + } else { + NOT ANIMATION(ANIM_TYPE_MOVE, usedMove, player); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(opponent); + if (usedMove == MOVE_TACKLE) { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + if (statId == STAT_ATK) { + MESSAGE("Wobbuffet's Attack fell!"); + } else if (statId == STAT_SPEED) { + MESSAGE("Wobbuffet's Speed fell!"); + } else if (statId == STAT_DEF) { + if (lowersBy == 2) { + MESSAGE("Wobbuffet's Defense harshly fell!"); + } + } + } else { + NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + } + } + } THEN { + if (usedMove == MOVE_TACKLE) { + EXPECT_EQ(player->statStages[statId], DEFAULT_STAT_STAGE - lowersBy); + } + } +} + +SINGLE_BATTLE_TEST("Spiky Shield does 1/8 dmg of max hp of attackers making contact and may faint them") +{ + u16 usedMove = MOVE_NONE; + u16 hp = 400, maxHp = 400; + + PARAMETRIZE { usedMove = MOVE_TACKLE; hp = 1;} + PARAMETRIZE { usedMove = MOVE_TACKLE;} + PARAMETRIZE { usedMove = MOVE_LEER;} + PARAMETRIZE { usedMove = MOVE_WATER_GUN;} + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) {HP(hp); MaxHP(maxHp); } + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + if (hp == 1) { + TURN { MOVE(opponent, MOVE_SPIKY_SHIELD); MOVE(player, usedMove); SEND_OUT(player, 1); } + } else { + TURN { MOVE(opponent, MOVE_SPIKY_SHIELD); MOVE(player, usedMove); } + } + TURN {} + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_SPIKY_SHIELD, opponent); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT ANIMATION(ANIM_TYPE_MOVE, usedMove, player); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(opponent); + if (usedMove == MOVE_TACKLE) { + HP_BAR(player, maxHp / 8); + if (hp == 1) { + MESSAGE("Wobbuffet fainted!"); + MESSAGE("Go! Wobbuffet!"); + } + } + } +} + +SINGLE_BATTLE_TEST("Baneful Bunker poisons pokemon for moves making contact") +{ + u16 usedMove = MOVE_NONE; + + PARAMETRIZE {usedMove = MOVE_TACKLE; } + PARAMETRIZE {usedMove = MOVE_LEER; } + PARAMETRIZE {usedMove = MOVE_WATER_GUN; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_BANEFUL_BUNKER); MOVE(player, usedMove); } + TURN {} + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_BANEFUL_BUNKER, opponent); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT ANIMATION(ANIM_TYPE_MOVE, usedMove, player); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(opponent); + if (usedMove == MOVE_TACKLE) { + STATUS_ICON(player, STATUS1_POISON); + } else { + NOT STATUS_ICON(player, STATUS1_POISON); + } + } +} + +SINGLE_BATTLE_TEST("Recoil damage is not applied if target was protected") +{ + u32 j, k; + static const u16 protectMoves[] = { MOVE_PROTECT, MOVE_DETECT, MOVE_KINGS_SHIELD, MOVE_BANEFUL_BUNKER, MOVE_SILK_TRAP, MOVE_OBSTRUCT, MOVE_SPIKY_SHIELD }; + static const u16 recoilMoves[] = { MOVE_VOLT_TACKLE, MOVE_HEAD_SMASH, MOVE_TAKE_DOWN, MOVE_DOUBLE_EDGE }; + u16 protectMove = MOVE_NONE; + u16 recoilMove = MOVE_NONE; + + for (j = 0; j < ARRAY_COUNT(protectMoves); j++) + { + for (k = 0; k < ARRAY_COUNT(recoilMoves); k++) + { + PARAMETRIZE { protectMove = protectMoves[j]; recoilMove = recoilMoves[k]; } + } + } + + + GIVEN { + ASSUME(gBattleMoves[MOVE_VOLT_TACKLE].effect == EFFECT_RECOIL_33_STATUS); + ASSUME(gBattleMoves[MOVE_HEAD_SMASH].effect == EFFECT_RECOIL_50); + ASSUME(gBattleMoves[MOVE_TAKE_DOWN].effect == EFFECT_RECOIL_25); + ASSUME(gBattleMoves[MOVE_DOUBLE_EDGE].effect == EFFECT_RECOIL_33); + PLAYER(SPECIES_RAPIDASH); + OPPONENT(SPECIES_BEAUTIFLY); + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); MOVE(player, MOVE_TACKLE); } + TURN { MOVE(opponent, protectMove); MOVE(player, recoilMove); } + TURN {} + } SCENE { + // 1st turn + MESSAGE("Foe Beautifly used Tackle!"); + MESSAGE("Rapidash used Tackle!"); + // 2nd turn + ANIMATION(ANIM_TYPE_MOVE, protectMove, opponent); + MESSAGE("Foe Beautifly protected itself!"); + // MESSAGE("Rapidash used recoilMove!"); + NOT ANIMATION(ANIM_TYPE_MOVE, recoilMove, player); + NOT MESSAGE("Rapidash is hit with recoil!"); + } +} + +SINGLE_BATTLE_TEST("Multi-hit moves don't hit a protected target and fail only once") +{ + u16 move = MOVE_NONE; + + PARAMETRIZE { move = MOVE_PROTECT; } + PARAMETRIZE { move = MOVE_DETECT; } + PARAMETRIZE { move = MOVE_KINGS_SHIELD; } + PARAMETRIZE { move = MOVE_BANEFUL_BUNKER; } + PARAMETRIZE { move = MOVE_SILK_TRAP; } + PARAMETRIZE { move = MOVE_OBSTRUCT; } + PARAMETRIZE { move = MOVE_SPIKY_SHIELD; } + + GIVEN { + ASSUME(gBattleMoves[MOVE_ARM_THRUST].effect == EFFECT_MULTI_HIT); + PLAYER(SPECIES_RAPIDASH); + OPPONENT(SPECIES_BEAUTIFLY); + } WHEN { + TURN { MOVE(opponent, move); MOVE(player, MOVE_ARM_THRUST); } + TURN {} + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + MESSAGE("Foe Beautifly protected itself!"); + MESSAGE("Rapidash used Arm Thrust!"); + NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_ARM_THRUST, player); + MESSAGE("Foe Beautifly protected itself!"); + // Each effect happens only once. + if (move == MOVE_KINGS_SHIELD || move == MOVE_SILK_TRAP || move == MOVE_OBSTRUCT) { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + } + else if (move == MOVE_SPIKY_SHIELD) { + HP_BAR(player); + NOT HP_BAR(player); + } + else if (move == MOVE_BANEFUL_BUNKER) { + STATUS_ICON(player, STATUS1_POISON); + } + NONE_OF { + MESSAGE("Hit 2 time(s)!"); + MESSAGE("Hit 3 time(s)!"); + MESSAGE("Hit 4 time(s)!"); + MESSAGE("Hit 5 time(s)!"); + } + } +} + +DOUBLE_BATTLE_TEST("Wide Guard protects self and ally from multi-target moves") +{ + u16 move = MOVE_NONE; + + PARAMETRIZE { move = MOVE_TACKLE; } // Single target + PARAMETRIZE { move = MOVE_SURF; } // All targets + PARAMETRIZE { move = MOVE_HYPER_VOICE; } // 2 foes + + GIVEN { + ASSUME(gBattleMoves[MOVE_TACKLE].target == MOVE_TARGET_SELECTED); + ASSUME(gBattleMoves[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY); + ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_WIDE_GUARD); MOVE(playerLeft, move, target:opponentLeft); } + TURN {} + } SCENE { + MESSAGE("Foe Wobbuffet used Wide Guard!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_WIDE_GUARD, opponentLeft); + if (move == MOVE_TACKLE) { + MESSAGE("Wobbuffet used Tackle!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, playerLeft); + HP_BAR(opponentLeft); + } else if (move == MOVE_HYPER_VOICE) { + NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_HYPER_VOICE, playerLeft); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(opponentLeft); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(opponentRight); + } else { // Surf + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(opponentLeft); + HP_BAR(playerRight); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(opponentRight); + } + } +} + +DOUBLE_BATTLE_TEST("Quick Guard protects self and ally from priority moves") +{ + u16 move = MOVE_NONE; + struct BattlePokemon *targetOpponent = NULL; + + PARAMETRIZE { move = MOVE_TACKLE; targetOpponent = opponentLeft; } + PARAMETRIZE { move = MOVE_TACKLE; targetOpponent = opponentRight; } + PARAMETRIZE { move = MOVE_QUICK_ATTACK; targetOpponent = opponentLeft; } + PARAMETRIZE { move = MOVE_QUICK_ATTACK; targetOpponent = opponentRight; } + + GIVEN { + ASSUME(gBattleMoves[MOVE_TACKLE].priority == 0); + ASSUME(gBattleMoves[MOVE_QUICK_ATTACK].priority == 1); + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_QUICK_GUARD); MOVE(playerLeft, move, target:targetOpponent); } + TURN {} + } SCENE { + MESSAGE("Foe Wobbuffet used Quick Guard!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_QUICK_GUARD, opponentLeft); + if (move == MOVE_TACKLE) { + MESSAGE("Wobbuffet used Tackle!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, playerLeft); + HP_BAR(targetOpponent); + } else if (move == MOVE_QUICK_ATTACK) { + NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_QUICK_ATTACK, playerLeft); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT HP_BAR(targetOpponent); + } + } +} + +DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from status moves") +{ + u16 move = MOVE_NONE; + struct BattlePokemon *targetOpponent = NULL; + + PARAMETRIZE { move = MOVE_HYPER_VOICE; } + PARAMETRIZE { move = MOVE_LEER; } + PARAMETRIZE { move = MOVE_TACKLE; targetOpponent = opponentLeft; } + PARAMETRIZE { move = MOVE_TACKLE; targetOpponent = opponentRight; } + + GIVEN { + ASSUME(gBattleMoves[MOVE_LEER].target == MOVE_TARGET_BOTH); + ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); + ASSUME(gBattleMoves[MOVE_HYPER_VOICE].split == SPLIT_SPECIAL); + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_CRAFTY_SHIELD); (move == MOVE_TACKLE) ? MOVE(playerLeft, move, target:targetOpponent) : MOVE(playerLeft, move); } + TURN {} + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_CRAFTY_SHIELD, opponentLeft); + if (move == MOVE_LEER) { + MESSAGE("Wobbuffet used Leer!"); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight); + } else { + if (move == MOVE_HYPER_VOICE || targetOpponent == opponentLeft) { + NOT MESSAGE("Foe Wobbuffet protected itself!"); + HP_BAR(opponentLeft); + } else if (move == MOVE_HYPER_VOICE || targetOpponent == opponentRight) { + NOT MESSAGE("Foe Wobbuffet protected itself!"); + HP_BAR(opponentRight); + } + } + } +}