ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix psychic terrain blocking moves it shouldnt block (#3521)

Browse Source
This commit is contained in:
DizzyEggg 2023-11-03 21:01:02 +01:00 committed by GitHub
parent 90d9334f0b
commit 8b359c2ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_util.c
View File

@ -3824,6 +3824,8 @@ u8 AtkCanceller_UnableToUseMove2(void)
if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN
&& IsBattlerGrounded(gBattlerTarget) && IsBattlerGrounded(gBattlerTarget)
&& GetChosenMovePriority(gBattlerAttacker) > 0 && GetChosenMovePriority(gBattlerAttacker) > 0
&& gBattleMoves[gCurrentMove].target != MOVE_TARGET_ALL_BATTLERS
&& gBattleMoves[gCurrentMove].target != MOVE_TARGET_OPPONENTS_FIELD
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)) && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
{ {
CancelMultiTurnMoves(gBattlerAttacker); CancelMultiTurnMoves(gBattlerAttacker);

3
test/battle/terrain/psychic.c
View File

@ -78,7 +78,6 @@ SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target the
SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all battlers") SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all battlers")
{ {
KNOWN_FAILING;
GIVEN { GIVEN {
PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); } PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET);
@ -93,7 +92,6 @@ SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all
SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all opponents") SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all opponents")
{ {
KNOWN_FAILING;
GIVEN { GIVEN {
PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); } PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET);
@ -124,7 +122,6 @@ DOUBLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves that target all
SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority field moves") SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority field moves")
{ {
KNOWN_FAILING;
GIVEN { GIVEN {
PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); } PLAYER(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET);