Skip to content

Commit

Permalink
Merge pull request pret#1748 from ghoulslash/memento
Browse files Browse the repository at this point in the history
Fix memento Gen 7 fail condition
  • Loading branch information
AsparagusEduardo authored Oct 14, 2021
2 parents 8be9e4a + 11626d5 commit 9b20fd4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/battle_script_commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -11580,7 +11580,7 @@ static void Cmd_jumpifattackandspecialattackcannotfall(void) // memento
&& gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == MIN_STAT_STAGE
&& gBattleCommunication[MISS_TYPE] != B_MSG_PROTECTED)
#else
if (gBattleCommunication[MISS_TYPE] != B_MSG_PROTECTED
if (gBattleCommunication[MISS_TYPE] == B_MSG_PROTECTED
|| gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE
|| IsBattlerProtected(gBattlerTarget, gCurrentMove)
|| DoesSubstituteBlockMove(gBattlerAttacker, gBattlerTarget, gCurrentMove))
Expand Down

0 comments on commit 9b20fd4

Please sign in to comment.