Epsilon_02/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion synced 2025-10-06 02:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Endure lasting forever (#7838)

Browse Source
This commit is contained in:
Alex
2025-10-03 15:04:56 +02:00
committed by GitHub
parent 13f392987a
commit d2e8afa13a
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/battle_main.c
View File

@@ -5143,6 +5143,7 @@ static void TurnValuesCleanUp(bool8 var0)
gSpecialStatuses[i].parentalBondState = PARENTAL_BOND_OFF;
gBattleStruct->battlerState[i].usedEjectItem = FALSE;
gProtectStructs[i].lashOutAffected = FALSE;
gDisableStructs[i].endured = FALSE;
}
gSideTimers[B_SIDE_PLAYER].followmeTimer = 0;

23
test/battle/move_effect/endure.c
View File

@@ -1,13 +1,17 @@
#include "global.h"
#include "test/battle.h"
ASSUMPTIONS
{
ASSUME(GetMoveEffect(MOVE_ENDURE) == EFFECT_ENDURE);
}
TO_DO_BATTLE_TEST("Endure allows the user to survive any attack with 1 HP left");
SINGLE_BATTLE_TEST("Endure does not prevent multiple hits and stat changes occur at the end of the turn")
{
GIVEN {
ASSUME(GetMoveEffect(MOVE_SCALE_SHOT) == EFFECT_MULTI_HIT);
ASSUME(GetMoveEffect(MOVE_ENDURE) == EFFECT_ENDURE);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET) { HP(1); }
} WHEN {
@@ -54,6 +58,23 @@ DOUBLE_BATTLE_TEST("Endure is not transferred to a mon that is switched in due t
}
}
SINGLE_BATTLE_TEST("Endure only lasts for one turn")
{
GIVEN {
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET) { HP(1); }
} WHEN {
TURN { MOVE(opponent, MOVE_ENDURE); MOVE(player, MOVE_POUND); }
TURN { MOVE(player, MOVE_POUND); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_ENDURE, opponent);
ANIMATION(ANIM_TYPE_MOVE, MOVE_POUND, player);
MESSAGE("The opposing Wobbuffet endured the hit!");
ANIMATION(ANIM_TYPE_MOVE, MOVE_POUND, player);
NOT MESSAGE("The opposing Wobbuffet endured the hit!");
}
}
TO_DO_BATTLE_TEST("Endure's success rate decreases for every consecutively used turn");
TO_DO_BATTLE_TEST("Endure uses the same counter as Protect");
TO_DO_BATTLE_TEST("Endure doesn't trigger effects that require damage to be done to the Pokémon (Gen 2-4)"); // Eg. Rough Skin