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

Merge pull request #1672 from rh-hideout/revert-1671-scaldThawConfig

Browse source 
Revert "Scald thaw flag config for Gen 5"
This commit is contained in:
ghoulslash 2021-09-22 11:48:29 -06:00 committed by GitHub
commit a10a8714fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/data/battle_moves.h
View file

@ -7935,11 +7935,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SCALD] =
{
#if B_UPDATED_MOVE_DATA >= GEN_6
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_THAW_USER,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST,
#endif
.effect = EFFECT_SCALD,
.power = 80,
.type = TYPE_WATER,
@ -7948,6 +7943,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 30,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_THAW_USER,
.split = SPLIT_SPECIAL,
},