atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster

Browse source
This commit is contained in:
ghoulslash 2021-09-09 09:44:25 -04:00
commit d7938bc2dc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/battle_config.h
View file

@ -125,7 +125,7 @@
#define B_FLASH_FIRE_FROZEN GEN_7 // In Gen5+, Flash Fire can trigger even when frozen, when it couldn't before.
#define B_SYNCHRONIZE_NATURE GEN_8 // In Gen8, if the Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same ability, as opposed to 50% previously.
#define B_UPDATED_INTIMIDATE GEN_8 // In Gen8, Intimidate doesn't work on opponents with the Inner Focus, Scrappy, Own Tempo or Oblivious abilities.
#define B_PRANKSTER GEN_7 // In Gen7, Prankster-elevated status moves do not affect Dark type Pokemon
#define B_PRANKSTER_DARK_TYPES GEN_7 // In Gen7, Prankster-elevated status moves do not affect Dark type Pokémon.
// Item settings
#define B_HP_BERRIES GEN_7 // In Gen4+, berries which restore hp activate immediately after HP drops to half. In Gen3, the effect occurs at the end of the turn.

2
src/battle_util.c
View file

@ -3402,7 +3402,7 @@ u8 AtkCanceller_UnableToUseMove(void)
gBattleStruct->atkCancellerTracker++;
break;
case CANCELLER_PRANKSTER:
#if B_PRANKSTER >= GEN_7
#if B_PRANKSTER_DARK_TYPES >= GEN_7
if (GetBattlerAbility(gBattlerAttacker) == ABILITY_PRANKSTER
&& IS_MOVE_STATUS(gCurrentMove)
&& gBattlerAttacker != gBattlerTarget